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

🐛 répare le changement de période pour les charges 

fix #872
pull/873/head
Johan Girod 2020-02-06 13:45:01 +01:00
parent e718537a36
commit 8c81b42a62
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/reducers/rootReducer.ts
View File

@ -102,7 +102,6 @@ function updateSituation(
function updateDefaultUnit(situation, { toUnit, analysis }) {
const unit = parseUnit(toUnit)
const goals = goalsFromAnalysis(analysis)
console.log(goals)
const convertedSituation = Object.keys(situation)
.map(
dottedName =>
@ -111,10 +110,11 @@ function updateDefaultUnit(situation, { toUnit, analysis }) {
)
.filter(
rule =>
goals?.includes(rule.dottedName) &&
(rule.unit || rule.defaultUnit) &&
!rule.unité &&
areUnitConvertible(rule.unit || rule.defaultUnit, unit)
rule.dottedName === 'entreprise . charges' || // HACK en attendant de revoir le fonctionnement des unités
(goals?.includes(rule.dottedName) &&
(rule.unit || rule.defaultUnit) &&
!rule.unité &&
areUnitConvertible(rule.unit || rule.defaultUnit, unit))
)
.reduce(
(convertedSituation, rule) => ({