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

⚙️ Calcule les mv pour les 4 objectifs pour cohérence lors du changement d'objectif

pull/209/head
Laurent Bossavit 2018-04-26 12:28:48 +02:00
parent f58f951205
commit d959fa099b
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/components/ProgressCircle/selector.js
View File

@ -1,8 +1,14 @@
import { isEmpty, values } from 'ramda'
let computeRatio = (mvt, name) =>
!isEmpty(mvt) &&
values(mvt.current[name]).length / values(mvt.initial[name]).length
let computeRatio = (mvt, name) => {
let initialNextSteps = values(mvt.initial[name] || []).length,
currentNextSteps = values(mvt.current[name] || []).length
return !isEmpty(mvt) &&
initialNextSteps > 0
? currentNextSteps / initialNextSteps
: 1
}
export let targetCompletionRatioSelector = (state, props) => {
return props.isActiveInput

25
source/reducers/reduceSteps.js
View File

@ -8,6 +8,7 @@ import {
import { analyseMany, parseAll } from 'Engine/traverse'
export default (tracker, flatRules, answerSource) => (state, action) => {
console.log(action)
state.flatRules = flatRules
// Optimization - don't parse on each analysis
if (!state.parsedRules) {
@ -36,21 +37,14 @@ export default (tracker, flatRules, answerSource) => (state, action) => {
)
return state
if (
path(['form', 'conversation', 'syncErrors'], state) ||
(state.activeTargetInput && !answerSource(state)(state.activeTargetInput))
)
if (path(['form', 'conversation', 'syncErrors'], state))
return state
let targetNames = reject(
name => state.activeTargetInput && state.activeTargetInput.includes(name)
)(state.targetNames)
// Most rules have default values
let rulesDefaults = collectDefaults(flatRules),
situationWithDefaults = assume(answerSource, rulesDefaults)
let analysis = analyseMany(state.parsedRules, targetNames)(
let analysis = analyseMany(state.parsedRules, state.targetNames)(
situationWithDefaults(state)
)
@ -58,7 +52,7 @@ export default (tracker, flatRules, answerSource) => (state, action) => {
return { ...state, analysis, situationGate: situationWithDefaults(state) }
}
let nextStepsAnalysis = analyseMany(state.parsedRules, targetNames)(
let nextStepsAnalysis = analyseMany(state.parsedRules, state.targetNames)(
answerSource(state)
),
missingVariablesByTarget = collectMissingVariablesByTarget(
@ -80,14 +74,19 @@ export default (tracker, flatRules, answerSource) => (state, action) => {
: state.foldedSteps
}
if (['START_CONVERSATION', 'SET_ACTIVE_TARGET_INPUT'].includes(action.type))
// Les nextSteps initiaux ne dépendent que des règles et pourraient être précalculés
// TODO: sortir ce calcul du state pour éviter cette "astuce" avec stillBlank
if (['START_CONVERSATION', 'SET_ACTIVE_TARGET_INPUT'].includes(action.type)) {
// Le premier clic pour sélectionner un input actif permet d'initialiser missingVariablesByTarget
let stillBlank = state.activeTargetInput && !answerSource(state)(state.activeTargetInput)
return {
...newState,
...(stillBlank ? state : newState),
missingVariablesByTarget: {
initial: missingVariablesByTarget,
initial: state.missingVariablesByTarget.initial ? state.missingVariablesByTarget.initial : missingVariablesByTarget,
current: missingVariablesByTarget
}
}
}
if (action.type == 'STEP_ACTION' && action.name == 'fold') {
tracker.push([