From e18e0a44da37e31ca83f774a12f2941929dd3139 Mon Sep 17 00:00:00 2001
From: Mael Thomas <mael.thomas@data.gouv.fr>
Date: Mon, 20 Mar 2017 10:53:43 +0100
Subject: [PATCH] =?UTF-8?q?:gear:=20:bug:=20R=C3=A9paration=20du=20pointeu?=
 =?UTF-8?q?r=20blanc=20question=20->=20objectif?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/components/Results.js | 6 +++---
 source/engine/rules.js       | 2 +-
 source/reducers.js           | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/source/components/Results.js b/source/components/Results.js
index b66b82964..fe00076b2 100644
--- a/source/components/Results.js
+++ b/source/components/Results.js
@@ -15,8 +15,8 @@ let humanFigure = decimalDigits => value => fmt(value.toFixed(decimalDigits))
 export default class Results extends Component {
 	render() {
 		let {analysedSituation, pointedOutObjectives} = this.props
-		// On travaille sur un objectif qui est une somme de plusieurs variables, et c'est ces variables que nous affichons comme résultats
 
+		// On travaille sur un objectif qui est une somme de plusieurs variables, et c'est ces variables que nous affichons comme résultats
 		let explanation = R.path(['formule', 'explanation', 'explanation'])(analysedSituation)
 		if (!explanation) return null
 
@@ -28,12 +28,12 @@ export default class Results extends Component {
 				</div>
 				<ul>
 					{explanation.map(
-						({explanation: {name, type, 'non applicable si': {nodeValue: nonApplicable}, formule: {nodeValue: computedValue}}}) =>
+						({variableName, explanation: {name, type, 'non applicable si': {nodeValue: nonApplicable}, formule: {nodeValue: computedValue}}}) =>
 						do {
 							let
 								unsatisfied = nonApplicable == null || computedValue == null,
 								irrelevant = nonApplicable === true,
-								pointedOut = pointedOutObjectives.find(objective => objective == name),
+								pointedOut = pointedOutObjectives.find(objective => objective == variableName),
 								number = nonApplicable == false && computedValue != null
 
 								;<li key={name} className={classNames({unsatisfied, irrelevant, number, pointedOut})}>
diff --git a/source/engine/rules.js b/source/engine/rules.js
index 22a0eff12..7f4277610 100644
--- a/source/engine/rules.js
+++ b/source/engine/rules.js
@@ -135,7 +135,7 @@ export let collectMissingVariables = (groupMethod='groupByMissingVariable', anal
 			R.pipe(
 				collectNodeMissingVariables('missingVariables'),
 				R.flatten,
-				R.map(mv => [v.name, mv])
+				R.map(mv => [v.variableName, mv])
 			)(v)
 		),
 		//groupBy missing variable but remove mv from value, it's now in the key
diff --git a/source/reducers.js b/source/reducers.js
index be2dac386..ba68fbe1c 100644
--- a/source/reducers.js
+++ b/source/reducers.js
@@ -99,7 +99,9 @@ export default reduceReducers(
 
 					missingVariables: {variable: [objectives]}
 				 */
-				missingVariables = collectMissingVariables('groupByMissingVariable', analysedSituation),
+
+				missingVariables = collectMissingVariables('groupByMissingVariable',  R.path(['formule', 'explanation', 'explanation'])(analysedSituation)),
+
 				missingVariablesList = R.keys(missingVariables),
 				/*
 					Certaines variables manquantes peuvent être factorisées dans des groupes.