betagouv
/
mon-entreprise
mirror of https://github.com/betagouv/mon-entreprise
1
0
Fork 0
Code Releases Activity

5

demo-contrôles
Mael 2019-02-12 17:05:42 +01:00
parent 060cb43de0
commit 17bee434ef
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/components/SalaryExplanation.js
View File

@ -1,14 +1,14 @@
import { startConversation } from 'Actions/actions';
import withTracker from 'Components/utils/withTracker';
import { compose } from 'ramda';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { formValueSelector } from 'redux-form';
import ficheDePaieSelectors from 'Selectors/ficheDePaieSelectors';
import * as Animate from 'Ui/animate';
import SalaryCompactExplanation from './SalaryCompactExplanation';
import './SalaryCompactExplanation.css';
import SalaryFirstExplanation from './SalaryFirstExplanation';
import { startConversation } from 'Actions/actions'
import withTracker from 'Components/utils/withTracker'
import { compose } from 'ramda'
import React, { Component } from 'react'
import { connect } from 'react-redux'
import { formValueSelector } from 'redux-form'
import ficheDePaieSelectors from 'Selectors/ficheDePaieSelectors'
import * as Animate from 'Ui/animate'
import SalaryCompactExplanation from './SalaryCompactExplanation'
import './SalaryCompactExplanation.css'
import SalaryFirstExplanation from './SalaryFirstExplanation'
export default compose(
withTracker,

4
source/components/Simulation.js
View File

@ -7,7 +7,6 @@ import { compose } from 'ramda'
import { connect } from 'react-redux'
import {
nextStepsSelector,
noUserInputSelector,
noUserInputSelector
} from 'Selectors/analyseSelectors'
import Animate from 'Ui/animate'
@ -20,8 +19,7 @@ export default compose(
previousAnswers: state.conversationSteps.foldedSteps,
noNextSteps:
state.conversationStarted && nextStepsSelector(state).length == 0,
noUserInput: noUserInputSelector(state),
userInput: !noUserInputSelector(state)
noUserInput: noUserInputSelector(state)
}),
{ resetSimulation }
)

3
source/selectors/regleSelectors.js
View File

@ -72,6 +72,8 @@ export const règleValeurSelector: InputSelector<
(analysis.cache[dottedName] ||
analysis.targets.find(target => target.dottedName === dottedName))
if (rule == undefined) return null
let valeur =
rule && !isNil(rule.nodeValue)
? rule.nodeValue
@ -103,6 +105,7 @@ export const règleValeurSelector: InputSelector<
(!Number.isNaN(valeur) && Number.isNaN(Number.parseFloat(valeur))
? 'string'
: 'number')
return {
type,
valeur: