+let Variable = (yo) => do {
+ let {nodeValue, variableName} = yo
+;
{variableName}
@@ -186,38 +176,25 @@ let Percentage = ({percentage}) =>
-let NodeValue = ({data}) => do {
- let valeur = data == null ?
- '?'
- : ( R.is(Number)(data) ?
- Math.round(data)
- : ( data ? 'oui' : 'non')
- );
-
- ←
- {valeur}
-
-}
-
-let Formula = ({explanation, nodeValue}) => do {
-
-}
+// let Formula = ({explanation, nodeValue}) => do {
+//
+//
+// {expression}
+//
+//
+//
- ''}
- theme={theme}
- hideRoot={true}
- shouldExpandNode={() => true}
- data={rootKey ? {[rootKey]: o} : o}
- />
-
+
+ ''}
+ theme={theme}
+ hideRoot={true}
+ shouldExpandNode={() => true}
+ data={rootKey ? {[rootKey]: o} : o}
+ />
+
)
diff --git a/source/engine/mockSituation.yaml b/source/engine/mockSituation.yaml
new file mode 100644
index 000000000..a96788678
--- /dev/null
+++ b/source/engine/mockSituation.yaml
@@ -0,0 +1,10 @@
+"Salariat ":
+ " CDD ":
+ " événements": "_"
+ " motif": "saisonnier"
+ " engagement employeur complément formation": "non"
+ " durée contrat": "2"
+
+ " contrat aidé": "non"
+ " salaire de base": "1481"
+ " congés non pris": "3"
diff --git a/source/engine/traverse-common-jsx.js b/source/engine/traverse-common-jsx.js
new file mode 100644
index 000000000..77e9c0b82
--- /dev/null
+++ b/source/engine/traverse-common-jsx.js
@@ -0,0 +1,15 @@
+import React from 'react'
+import R from 'ramda'
+
+export let NodeValue = ({data}) => do {
+ let valeur = data == null ?
+ '?'
+ : ( R.is(Number)(data) ?
+ Math.round(data)
+ : ( data ? 'oui' : 'non')
+ )
+
+ ;←
+ {valeur}
+
+}
diff --git a/source/engine/traverse.js b/source/engine/traverse.js
index 4e2bc6a61..55f2678e2 100644
--- a/source/engine/traverse.js
+++ b/source/engine/traverse.js
@@ -1,10 +1,14 @@
-import {rules, findRuleByName, parentName} from './rules'
+import React from 'react'
+import {rules, findRuleByName} from './rules'
import {completeVariableName, evaluateVariable, knownVariable} from './expressions'
import R from 'ramda'
import knownMecanisms from './known-mecanisms.yaml'
import { Parser } from 'nearley'
import Grammar from './grammar.ne'
import variablesInDevelopment from './variablesInDevelopment.yaml'
+import {NodeValue} from './traverse-common-jsx'
+
+
let nearley = () => new Parser(Grammar.ParserRules, Grammar.ParserStart)
@@ -71,7 +75,12 @@ let fillVariableNode = (rule, situationGate) => (parseResult) => {
variableName,
type: 'boolean | numeric',
explanation: null,
- missingVariables: known ? [] : [variableName]
+ missingVariables: known ? [] : [variableName],
+ jsx:
+
+ {variableName}
+
+
}
}
@@ -99,7 +108,14 @@ let treat = (situationGate, rule) => rawNode => {
if (parseResult.category == 'calcExpression') {
let
filledExplanation = parseResult.explanation.map(
- R.when(R.propEq('category', 'variable'), fillVariableNode(rule, situationGate))
+ R.cond([
+ [R.propEq('category', 'variable'), fillVariableNode(rule, situationGate)],
+ [R.propEq('category', 'value'), node =>
+ R.assoc('jsx',
+ {node.nodeValue}
+ )(node)
+ ]
+ ])
),
[{nodeValue: value1}, {nodeValue: value2}] = filledExplanation,
operatorFunctionName = {
@@ -115,17 +131,34 @@ let treat = (situationGate, rule) => rawNode => {
return {
text: rawNode,
- nodeValue: nodeValue,
+ nodeValue,
category: 'calcExpression',
type: 'numeric',
- explanation: filledExplanation
+ explanation: filledExplanation,
+ jsx:
+
+
+ Éxpression de calcul
+
+
+ {filledExplanation[0].jsx}
+
{parseResult.operator}
+ {filledExplanation[1].jsx}
+
+ {filledExplanation[0].jsx}
+ {parseResult.operator}
+ {filledExplanation[1].jsx}
+
}
}
}
@@ -156,13 +194,17 @@ let treat = (situationGate, rule) => rawNode => {
return {
category: 'number',
nodeValue: rawNode,
- type: 'numeric'
+ type: 'numeric',
+ jsx:
+
+ {rawNode}
+
}
}
if (!R.is(Object)(rawNode)) {
- console.log('Cette donnée : ', rawNode)
+ console.log('Cette donnée : ', rawNode) // eslint-disable-line no-console
throw ' doit être un Number, String ou Object'
}
@@ -172,7 +214,7 @@ let treat = (situationGate, rule) => rawNode => {
v = rawNode[k]
if (k === "l'une de ces conditions") {
- return R.pipe(
+ let result = R.pipe(
R.unless(R.is(Array), () => {throw 'should be array'}),
R.reduce( (memo, next) => {
let {nodeValue, explanation} = memo,
@@ -193,6 +235,18 @@ let treat = (situationGate, rule) => rawNode => {
explanation: []
}) // Reduce but don't use R.reduced to set the nodeValue : we need to treat all the nodes
)(v)
+ return {...result,
+ jsx:
+
+
+ {result.name}
+
+
+
+ {result.explanation.map(item => - {item.jsx}
)}
+
+
+
+ logique numérique
+
+
+
+ {node.explanation.map(item => - {item.jsx}
)}
+
+
+ {base.jsx}
+ ×
+ {rate && rate.jsx}
+ {facteur && facteur.jsx}
+
}
}
@@ -330,14 +418,25 @@ let treat = (situationGate, rule) => rawNode => {
let contenders = v.map(treat(situationGate, rule)),
contenderValues = R.pluck('nodeValue')(contenders),
stopEverything = R.contains(null, contenderValues),
- maxValue = R.max(...contenderValues)
+ maxValue = R.max(...contenderValues),
+ nodeValue = stopEverything ? null : maxValue
return {
type: 'numeric',
category: 'mecanism',
name: 'le maximum de',
- nodeValue: stopEverything ? null : maxValue,
- explanation: contenders
+ nodeValue,
+ explanation: contenders,
+ jsx:
+
+
+ le maximum de
+
+
+
+ {contenders.map(item => - {item.jsx}
)}
+
+
+
+ non applicable si
+
+
+ { child.jsx }
+
+
+ formula
+
+
+ { child.jsx }
+