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

🐛 Corrige le changement de période 

Fixes #828
pull/833/head
Maxime Quandalle 2020-01-02 21:37:46 +01:00
parent 43581f0fb6
commit a8aae0e0c9
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/reducers/rootReducer.ts
View File

@ -112,6 +112,16 @@ function conversationSteps(
return state
}
function goalsFromAnalysis(analysis) {
return (
analysis &&
(Array.isArray(analysis) ? analysis[0] : analysis).targets
.map(target => target.explanation || target)
.filter(target => !!target.formule == !!target.question)
.map(({ dottedName }) => dottedName)
)
}
function updateSituation(
situation,
{
@ -124,12 +134,7 @@ function updateSituation(
analysis: Analysis | Array<Analysis> | null
}
) {
const goals =
analysis &&
(Array.isArray(analysis) ? analysis[0] : analysis).targets
.map(target => target.explanation || target)
.filter(target => !!target.formule == !!target.question)
.map(({ dottedName }) => dottedName)
const goals = goalsFromAnalysis(analysis)
const removePreviousTarget = goals?.includes(fieldName)
? omit(goals)
: identity
@ -138,6 +143,7 @@ function updateSituation(
function updateDefaultUnit(situation, { toUnit, analysis }) {
const unit = parseUnit(toUnit)
const goals = goalsFromAnalysis(analysis)
const convertedSituation = Object.keys(situation)
.map(
@ -147,6 +153,7 @@ function updateDefaultUnit(situation, { toUnit, analysis }) {
)
.filter(
rule =>
goals?.includes(rule.dottedName) &&
(rule.unit || rule.defaultUnit) &&
!rule.unité &&
areUnitConvertible(rule.unit || rule.defaultUnit, unit)