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

🐛 Le salaire saisi était à 0 dans le tableau

pull/138/head
mama 2017-12-12 11:11:43 +01:00
parent 2da3c4b5c6
commit 4ffce25e5f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/components/ResultsGrid.js
View File

@ -69,12 +69,11 @@ export default class ResultsGrid extends Component {
if (!analysis) return null
let extract = x => (x && x.nodeValue) || 0,
fromSituation = name => situationGate(name),
let extract = x => typeof x == 'string' ? +x : ((x && x.nodeValue) || 0),
fromEval = name => R.find(R.propEq("dottedName", name), analysis.targets),
fromDict = name => analysis.dict[name],
get = name =>
extract(fromSituation(name) || fromEval(name) || fromDict(name))
extract(situationGate(name) || fromEval(name) || fromDict(name))
let results = byBranch(analysis),
brut = get("contrat salarié . salaire brut"),
net = get("contrat salarié . salaire net"),
@ -238,7 +237,7 @@ class ReductionRow extends Component {
render() {
let {relevantSalaries, node} = this.props
if (!relevantSalaries.has('salaire total')) return null
let value = node.nodeValue
let value = node ? node.nodeValue : 0
let aggregateRow = (
<tr
key="aggregateRowReductions"