diff --git a/règles/rémunération-travail/entités/ok/contrat-salarié.yaml b/règles/rémunération-travail/entités/ok/contrat-salarié.yaml index be64664fe..ea0e68a65 100644 --- a/règles/rémunération-travail/entités/ok/contrat-salarié.yaml +++ b/règles/rémunération-travail/entités/ok/contrat-salarié.yaml @@ -58,7 +58,7 @@ inversions possibles: - salaire net - - salaire super brut + - super brut - coût du travail références: diff --git a/source/components/Results.css b/source/components/Results.css index 97b2e9786..605da6284 100644 --- a/source/components/Results.css +++ b/source/components/Results.css @@ -1,7 +1,4 @@ #results { - position: fixed; - left: 50%; - bottom: 2.5%; width: 90%; max-width: 45em; margin: 0 auto; @@ -11,18 +8,7 @@ color: white; font-size: 120%; box-shadow: 0px 0px 20px 2px rgba(0, 0, 0, 0.25); - - opacity: 0; - transform: translate(-50%, 12em); - transition: transform .5s; - transition-delay: .3s; - transition-timing-function: cubic-bezier(0, 1.01, 0.24, 1) } -#results.show { - transform: translate(-50%, 0); - opacity: 1; -} - #results-actions { background: #333350; diff --git a/source/components/Results.js b/source/components/Results.js index 02619eb1b..5251b5af3 100644 --- a/source/components/Results.js +++ b/source/components/Results.js @@ -21,17 +21,12 @@ import RuleValueVignette from './rule/RuleValueVignette' }) ) export default class Results extends Component { - componentDidMount(){ - setTimeout(() => - this.el && this.props.setElementHeight(this.el.offsetHeight) - , 1) - } render() { let { analysis, targetName, conversationStarted, - conversationFirstAnswer: showResults, + conversationFirstAnswer, location } = this.props @@ -43,7 +38,7 @@ export default class Results extends Component { let onRulePage = R.contains('/regle/')(location.pathname) return ( -
this.el = el} id="results" className={classNames({show: showResults})}> +
this.el = el} id="results"> {onRulePage && conversationStarted ?
diff --git a/source/components/Simulateur.js b/source/components/Simulateur.js index 4cf4b6188..a39ee9f00 100644 --- a/source/components/Simulateur.js +++ b/source/components/Simulateur.js @@ -10,12 +10,13 @@ import { START_CONVERSATION } from '../actions' import { rules, findRuleByName, decodeRuleName } from 'Engine/rules' import './conversation/conversation.css' import './Simulateur.css' -import { capitalise0 } from '../utils' import Conversation from './conversation/Conversation' import { makeQuestion } from 'Engine/generateQuestions' import ReactPiwik from './Tracker' +import Results from 'Components/Results' + @withRouter @connect( state => ({ @@ -26,8 +27,8 @@ import ReactPiwik from './Tracker' situationGate: state.situationGate }), dispatch => ({ - startConversation: (targetNames, firstInput) => - dispatch({ type: START_CONVERSATION, targetNames, firstInput}), + startConversation: targetNames => + dispatch({ type: START_CONVERSATION, targetNames}), resetForm: () => dispatch(reset('conversation')) }) ) @@ -36,18 +37,16 @@ export default class extends Component { started: false } componentWillMount() { - let { match: { params: { targets: encodedTargets, firstInput: encodedFirstInput } } } = this.props, - targetNames = encodedTargets.split('+').map(decodeRuleName), - existingConversation = this.props.foldedSteps.length > 0 + let { match: { params: { targets: encodedTargets} } } = this.props, + targetNames = encodedTargets.split('+').map(decodeRuleName) this.targetNames = targetNames this.targetRules = targetNames.map(name => findRuleByName(rules, name)) - this.firstInput = findRuleByName(rules, decodeRuleName(encodedFirstInput)).dottedName // C'est ici que la génération du formulaire, et donc la traversée des variables commence // if (!existingConversation) //TODO - this.props.startConversation(targetNames, this.firstInput) + this.props.startConversation(targetNames) } render() { //TODO @@ -64,7 +63,7 @@ export default class extends Component { reinitalise = () => { ReactPiwik.push(['trackEvent', 'restart', '']) this.props.resetForm(this.name) - this.props.startConversation(this.targets, this.firstInput) + this.props.startConversation(this.targets) } return ( @@ -72,8 +71,8 @@ export default class extends Component { Titre à mettre -

Titre et sous titres à mettre TODO

- +

Titre et sous titres à mettre

+ -
{type}
{titre || capitalise0(name)} window.location.href.toString().indexOf(t) > -1 ) // track the initial pageview - ReactPiwik.push(["trackPageView"]) + ReactPiwik.push(['trackPageView']) return (
-
- - - - - - - - - - +