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

⚙️ Mise en valeur du plafond actif

pull/510/head
Mael 2019-03-25 19:14:27 +01:00 committed by Johan Girod
parent 7d815bfb94
commit 857b00dbea
2 changed files with 86 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/engine/mecanismViews/Product.js
View File

@ -29,7 +29,15 @@ export default function ProductView(nodeValue, explanation) {
alignItems: 'baseline',
flexWrap: 'wrap'
}}>
<Trans>Plafonnée à :</Trans>&nbsp;{makeJsx(explanation.plafond)}
<span
style={{
...(explanation.plafondActif
? { background: 'yellow' }
: {})
}}>
<Trans>Plafonnée à :</Trans>&nbsp;
{makeJsx(explanation.plafond)}
</span>
</div>
)}
</div>

105
source/engine/mecanisms.js
View File

@ -1,23 +1,68 @@
import { desugarScale } from 'Engine/mecanisms/barème';
import { decompose, devariateExplanation } from 'Engine/mecanisms/utils';
import { add, any, aperture, curry, equals, evolve, filter, find, head, is, isEmpty, isNil, keys, last, map, max, mergeWith, min, path, pipe, pluck, prop, propEq, reduce, reduced, reject, sort, subtract, toPairs } from 'ramda';
import React from 'react';
import { Trans } from 'react-i18next';
import 'react-virtualized/styles.css';
import { bonus, collectNodeMissing, defaultNode, evaluateArray, evaluateNode, evaluateObject, makeJsx, mergeAllMissing, mergeMissing, parseObject, rewriteNode } from './evaluation';
import Allègement from './mecanismViews/Allègement';
import Barème from './mecanismViews/Barème';
import BarèmeContinu from './mecanismViews/BarèmeContinu';
import { Node, SimpleRuleLink } from './mecanismViews/common';
import InversionNumérique from './mecanismViews/InversionNumérique';
import Product from './mecanismViews/Product';
import buildSelectionView from './mecanismViews/Selection';
import Somme from './mecanismViews/Somme';
import Variations from './mecanismViews/Variations';
import { disambiguateRuleReference, findRuleByDottedName, findRuleByName } from './rules';
import { anyNull, val } from './traverse-common-functions';
import uniroot from './uniroot';
import { desugarScale } from 'Engine/mecanisms/barème'
import { decompose, devariateExplanation } from 'Engine/mecanisms/utils'
import {
add,
any,
aperture,
curry,
equals,
evolve,
filter,
find,
head,
is,
isEmpty,
isNil,
keys,
last,
map,
max,
mergeWith,
min,
path,
pipe,
pluck,
prop,
propEq,
reduce,
reduced,
reject,
sort,
subtract,
toPairs
} from 'ramda'
import React from 'react'
import { Trans } from 'react-i18next'
import 'react-virtualized/styles.css'
import {
bonus,
collectNodeMissing,
defaultNode,
evaluateArray,
evaluateNode,
evaluateObject,
makeJsx,
mergeAllMissing,
mergeMissing,
parseObject,
rewriteNode
} from './evaluation'
import Allègement from './mecanismViews/Allègement'
import Barème from './mecanismViews/Barème'
import BarèmeContinu from './mecanismViews/BarèmeContinu'
import { Node, SimpleRuleLink } from './mecanismViews/common'
import InversionNumérique from './mecanismViews/InversionNumérique'
import Product from './mecanismViews/Product'
import buildSelectionView from './mecanismViews/Selection'
import Somme from './mecanismViews/Somme'
import Variations from './mecanismViews/Variations'
import {
disambiguateRuleReference,
findRuleByDottedName,
findRuleByName
} from './rules'
import { anyNull, val } from './traverse-common-functions'
import uniroot from './uniroot'
/* @devariate = true => This function will produce variations of a same mecanism (e.g. product) that share some common properties */
export let mecanismVariations = (recurse, k, v, devariate) => {
@ -557,14 +602,18 @@ export let mecanismProduct = (recurse, k, v) => {
let effect = ({ assiette, taux, facteur, plafond }) => {
let mult = (base, rate, facteur, plafond) =>
Math.min(base, plafond) * rate * facteur
return val(taux) === 0 ||
val(taux) === false ||
val(assiette) === 0 ||
val(facteur) === 0
? 0
: anyNull([taux, assiette, facteur, plafond])
? null
: mult(val(assiette), val(taux), val(facteur), val(plafond))
return {
nodeValue:
val(taux) === 0 ||
val(taux) === false ||
val(assiette) === 0 ||
val(facteur) === 0
? 0
: anyNull([taux, assiette, facteur, plafond])
? null
: mult(val(assiette), val(taux), val(facteur), val(plafond)),
additionalExplanation: { plafondActif: val(assiette) > val(plafond) }
}
}
let explanation = parseObject(recurse, objectShape, v),