diff --git a/source/components/ResultsGrid.js b/source/components/ResultsGrid.js
index 037de03d3..6d4634fe6 100644
--- a/source/components/ResultsGrid.js
+++ b/source/components/ResultsGrid.js
@@ -82,7 +82,14 @@ export let byBranch = analysis => {
@translate()
export default class ResultsGrid extends Component {
render() {
- let { analysis, situationGate, targetNames, inversions, done, flatRules } = this.props,
+ let {
+ analysis,
+ situationGate,
+ targetNames,
+ inversions,
+ done,
+ flatRules
+ } = this.props,
rules = flatRules
if (!done) return null
@@ -114,10 +121,11 @@ export default class ResultsGrid extends Component {
+ id="sommeBase">
{humanFigure(2)(brut)}{' '}
- Salaire brut
+
+ Salaire brut
+
|
@@ -146,7 +154,9 @@ export default class ResultsGrid extends Component {
{humanFigure(2)(net)}{' '}
- Salaire net
+
+ Salaire net
+
|
>
)}
@@ -156,7 +166,9 @@ export default class ResultsGrid extends Component {
,
{humanFigure(2)(total)}{' '}
- Salaire total
+
+ Salaire total
+
|
]}
@@ -170,15 +182,18 @@ export default class ResultsGrid extends Component {
@translate()
class Row extends Component {
static contextTypes = {
- i18n: PropTypes.object.isRequired
- }
+ i18n: PropTypes.object.isRequired
+ }
state = {
folded: true
}
render() {
let { rules, branch, values, analysis, relevantSalaries } = this.props,
detail = byName(values),
- ruleData = mapObjIndexed((v,k,o) => findRuleByDottedName(rules,k), detail),
+ ruleData = mapObjIndexed(
+ (v, k, o) => findRuleByDottedName(rules, k),
+ detail
+ ),
{ i18n } = this.context
let title = name => {
@@ -189,11 +204,10 @@ class Row extends Component {
let aggregateRow = (
this.setState({ folded: !this.state.folded })}
- >
+ onClick={() => this.setState({ folded: !this.state.folded })}>
{capitalise0(i18n.t(branch))}
- {this.state.folded ? i18n.t('déplier')+' >' : i18n.t('replier')}
+ {this.state.folded ? i18n.t('déplier') + ' >' : i18n.t('replier')}
|
{this.state.folded ? (
@@ -255,7 +269,7 @@ class Row extends Component {
>
)}
- ))
+ ))
// returns an array of
return concat([aggregateRow], detailRows)
@@ -275,10 +289,9 @@ class ReductionRow extends Component {
let aggregateRow = (
this.setState({ folded: !this.state.folded })}
- >
+ onClick={() => this.setState({ folded: !this.state.folded })}>
- Réductions
+ Réductions
{this.state.folded ? 'déplier >' : 'replier'}
|
diff --git a/source/locales/en.yaml b/source/locales/en.yaml
index 706bbb812..5ca8d2c40 100644
--- a/source/locales/en.yaml
+++ b/source/locales/en.yaml
@@ -29,11 +29,13 @@ santé: healthcare
retraite: pensions
famille: family allowances
chômage: unemployment
+logement: housing
autre: other
Salaire brut: Gross salary
Salaire net: Net salary
Salaire total: Total salary
Salaire de base: Base salary
+Réductions: Reductions
disclaimer: This estimate takes into account national law but not union negotiated rules, and should not be used as a pay slip. If results differ from a pay slip, we refer you to an accountant or HR expert.
clickForMore: You can click the results below for detailed explanations.
Quel est le salaire mensuel ?: What is the monthly salary?