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

🐛 Avancement par objectif correctement calcule

pull/209/head
Mael 2018-04-24 18:30:16 +02:00
parent 42f007fde9
commit 16f5e4aee6
4 changed files with 72 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
source/components/TargetSelection.js
View File

@ -51,16 +51,23 @@ export default class TargetSelection extends Component {
}}>
{this.renderOutputList()}
</section>
{!this.firstEstimationComplete &&
<h1><Trans i18nKey="enterSalary">Entrez un salaire mensuel</Trans></h1>
}
{!this.firstEstimationComplete && (
<h1>
<Trans i18nKey="enterSalary">Entrez un salaire mensuel</Trans>
</h1>
)}
{this.firstEstimationComplete &&
!conversationStarted && (
<div id="action">
<p>
<b><Trans>Estimation approximative</Trans></b> <br />
<Trans i18nKey="defaults">pour une situation par défaut (CDI non cadre).</Trans>
<b>
<Trans>Estimation approximative</Trans>
</b>{' '}
<br />
<Trans i18nKey="defaults">
pour une situation par défaut (CDI non cadre).
</Trans>
</p>
<BlueButton onClick={this.props.startConversation}>
<Trans>Affiner le calcul</Trans>
@ -115,8 +122,34 @@ export default class TargetSelection extends Component {
let computeRatio = (mvt, name) =>
!isEmpty(mvt) &&
values(mvt.current[name]).length /
values(mvt.initial[name]).length
values(mvt.current[name]).length / values(mvt.initial[name]).length
let ProgressCircle = ({ activeInput, s, missingVariablesByTarget }) => {
let isActiveInput = activeInput === s.dottedName,
ratio = isActiveInput
? null
: computeRatio(missingVariablesByTarget, s.dottedName)
return (
<span
className="progressCircle"
style={{
visibility: isActiveInput ? 'hidden' : 'visible'
}}>
{ratio === 0 ? (
<i className="fa fa-check" aria-hidden="true" />
) : (
<Circle
percent={100 - ratio * 100}
strokeWidth="15"
strokeColor="#5de662"
trailColor="#fff"
trailWidth="5"
/>
)}
</span>
)
}
let Header = ({
conversationStarted,
@ -126,30 +159,7 @@ let Header = ({
}) => (
<span className="header">
{conversationStarted && (
<span
className="progressCircle"
style={{
visibility: activeInput === s.dottedName ? 'hidden' : 'visible'
}}>
{do {
let ratio =
activeInput === s.dottedName
? 0
: computeRatio(missingVariablesByTarget, s.dottedName)
ratio === 0 ? (
<i className="fa fa-check" aria-hidden="true" />
) : (
<Circle
percent={100 - ratio * 100}
strokeWidth="15"
strokeColor="#5de662"
trailColor="#fff"
trailWidth="5"
/>
)
}}
</span>
<ProgressCircle {...{ s, missingVariablesByTarget, activeInput }} />
)}
<span className="texts">

1
source/containers/App.dev.js
View File

@ -7,6 +7,7 @@ export default ({ store }) => (
<Provider store={store}>
<div id="dev">
<Layout />
<DevTools />
</div>
</Provider>
)

7
source/i18n.js
View File

@ -5,8 +5,9 @@ import queryString from 'query-string'
import { getIframeOption } from './utils'
import enTranslations from './locales/en.yaml'
let lang = getIframeOption('lang') ||
queryString.parse(location.search)['lang'] ||
let lang =
getIframeOption('lang') ||
queryString.parse(location.search)['lang'] ||
sessionStorage['lang'] ||
'fr'
@ -14,7 +15,7 @@ sessionStorage['lang'] = lang
i18next.init(
{
debug: true,
debug: false,
lng: lang,
resources: {
en: {

43
source/reducers.js
View File

@ -84,7 +84,8 @@ export let reduceSteps = (tracker, flatRules, answerSource) => (
missingVariablesByTarget = collectMissingVariablesByTarget(
nextStepsAnalysis.targets
),
nextSteps = getNextSteps(missingVariablesByTarget)
nextSteps = getNextSteps(missingVariablesByTarget),
currentQuestion = head(nextSteps)
let newState = {
...state,
@ -92,23 +93,21 @@ export let reduceSteps = (tracker, flatRules, answerSource) => (
situationGate: situationWithDefaults(state),
explainedVariable: null,
nextSteps,
// store the missingVariables when no question has been answered yet,
// to be able to compute a progress by objective
missingVariablesByTarget: {
initial:
state.foldedSteps.length === 0
? missingVariablesByTarget
: state.missingVariablesByTarget.initial,
current: missingVariablesByTarget
},
currentQuestion: head(nextSteps),
currentQuestion,
foldedSteps:
action.type === 'SET_CONVERSATION_TARGETS' && action.reset
? []
: state.foldedSteps
}
if (action.type == 'START_CONVERSATION') return newState
if (action.type == 'START_CONVERSATION')
return {
...newState,
missingVariablesByTarget: {
initial: missingVariablesByTarget,
current: missingVariablesByTarget
}
}
if (action.type == STEP_ACTION && action.name == 'fold') {
tracker.push([
@ -124,10 +123,15 @@ export let reduceSteps = (tracker, flatRules, answerSource) => (
'after' + length(newState.foldedSteps) + 'questions'
])
}
let foldedSteps = [...state.foldedSteps, state.currentQuestion]
return {
...newState,
foldedSteps: [...state.foldedSteps, state.currentQuestion]
foldedSteps,
missingVariablesByTarget: {
...state.missingVariablesByTarget,
current: missingVariablesByTarget
}
}
}
if (action.type == STEP_ACTION && action.name == 'unfold') {
@ -137,14 +141,19 @@ export let reduceSteps = (tracker, flatRules, answerSource) => (
let previous = state.currentQuestion,
// we fold it back into foldedSteps if it had been answered
answered = previous && answerSource(state)(previous) != undefined,
foldedSteps = answered
rawFoldedSteps = answered
? concat(state.foldedSteps, [previous])
: state.foldedSteps
: state.foldedSteps,
foldedSteps = without([action.step], foldedSteps)
return {
...newState,
foldedSteps: without([action.step], foldedSteps),
currentQuestion: action.step
foldedSteps,
currentQuestion: action.step,
missingVariablesByTarget: {
...state.missingVariablesByTarget,
current: missingVariablesByTarget
}
}
}
}