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

:doc: Amélioration de la vue barème

pull/291/head
Mael 2018-07-27 18:50:11 +02:00
parent d04d0ebe69
commit 06b98b6a8d
2 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/engine/mecanismViews/Barème.js
View File

@ -17,14 +17,16 @@ export default function Barème(nodeValue, explanation) {
</span>
<span className="value">{makeJsx(explanation.assiette)}</span>
</li>
<li key="multiplicateur">
<span className="key">
<Trans>multiplicateur des tranches</Trans>:{' '}
</span>
<span className="value">
{makeJsx(explanation['multiplicateur des tranches'])}
</span>
</li>
{explanation['multiplicateur des tranches'].nodeValue !== 1 && (
<li key="multiplicateur">
<span className="key">
<Trans>multiplicateur des tranches</Trans>:{' '}
</span>
<span className="value">
{makeJsx(explanation['multiplicateur des tranches'])}
</span>
</li>
)}
<table className="tranches">
<thead>
<tr>

47
source/engine/treat.js
View File

@ -90,14 +90,7 @@ export let treatString = (rules, rule) => rawNode => {
// We don't need to handle category == 'value' because YAML then returns it as
// numerical value, not a String: it goes to treatNumber
if (parseResult.category == 'percentage') {
return {
nodeValue: parseResult.nodeValue,
category: 'percentage',
// eslint-disable-next-line
jsx: () => <span className="percentage">{rawNode}</span>
}
}
if (parseResult.category == 'percentage') return treatPercentage(parseResult)
if (
parseResult.category == 'calcExpression' ||
@ -154,17 +147,7 @@ export let treatString = (rules, rule) => rawNode => {
jsx: nodeValue => <span className="value">{nodeValue}</span>
})
],
[
propEq('category', 'percentage'),
node => ({
nodeValue: node.nodeValue,
category: 'percentage',
// eslint-disable-next-line
jsx: nodeValue => (
<span className="value">{nodeValue * 100}%</span>
)
})
]
[propEq('category', 'percentage'), treatPercentage]
])
),
operator = parseResult.operator
@ -206,15 +189,23 @@ export let treatString = (rules, rule) => rawNode => {
}
}
export let treatNumber = rawNode => {
return {
text: '' + rawNode,
category: 'number',
nodeValue: rawNode,
type: 'numeric',
jsx: <span className="number">{rawNode}</span>
}
}
export let treatPercentage = node => ({
nodeValue: node.nodeValue,
category: 'percentage',
// eslint-disable-next-line
jsx: nodeValue => (
<span className="value">{Math.round(nodeValue * 100)} %</span>
)
})
export let treatNumber = rawNode => ({
text: '' + rawNode,
category: 'number',
nodeValue: rawNode,
type: 'numeric',
jsx: <span className="number">{rawNode}</span>
})
export let treatOther = rawNode => {
throw new Error(
'Cette donnée : ' + rawNode + ' doit être un Number, String ou Object'