From a93d3a1b3444d803cbac44db52afacf830631de6 Mon Sep 17 00:00:00 2001
From: Mael <mael.thomas@data.gouv.fr>
Date: Fri, 7 Sep 2018 17:14:58 +0200
Subject: [PATCH] =?UTF-8?q?:sparkles:=20D=C3=A9placement=20de=20l'affichag?=
 =?UTF-8?q?e=20de=20la=20valeur=20de=20la=20r=C3=A8gle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/components/rule/Algorithm.css |  9 ---------
 source/components/rule/Algorithm.js  |  9 ---------
 source/components/rule/Rule.css      |  9 +++++++++
 source/components/rule/Rule.js       | 21 ++++++++++++++++-----
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/source/components/rule/Algorithm.css b/source/components/rule/Algorithm.css
index 3196fb09e..cfaab73d5 100644
--- a/source/components/rule/Algorithm.css
+++ b/source/components/rule/Algorithm.css
@@ -44,15 +44,6 @@
 	margin: 1em 0;
 }
 
-#rule-rules #ruleValue {
-	font-weight: 400;
-	text-align: center;
-	font-size: 200%;
-	color: inherit;
-	margin-bottom: 2em;
-	margin-top: 0.4em;
-}
-
 #declenchement > ul {
 	padding: 0;
 	list-style-type: none;
diff --git a/source/components/rule/Algorithm.js b/source/components/rule/Algorithm.js
index f49d4a624..6422f5dca 100644
--- a/source/components/rule/Algorithm.js
+++ b/source/components/rule/Algorithm.js
@@ -24,15 +24,6 @@ export default class Algorithm extends React.Component {
 		return (
 			<div id="algorithm">
 				<section id="rule-rules" className={classNames({ showValues })}>
-					{showValues && rule.nodeValue ? (
-						<div id="ruleValue">
-							<i className="fa fa-calculator" aria-hidden="true" />{' '}
-							{Intl.NumberFormat(language, {
-								style: 'currency',
-								currency: 'EUR'
-							}).format(rule.nodeValue)}
-						</div>
-					) : null}
 					<ShowValuesProvider value={showValues}>
 						{do {
 							// TODO ce let est incompréhensible !
diff --git a/source/components/rule/Rule.css b/source/components/rule/Rule.css
index 4fb46872f..5752722fc 100644
--- a/source/components/rule/Rule.css
+++ b/source/components/rule/Rule.css
@@ -25,3 +25,12 @@
 h2 small {
 	font-size: 75%;
 }
+
+#rule #ruleValue {
+	font-weight: 400;
+	text-align: center;
+	font-size: 200%;
+	color: inherit;
+	margin-bottom: 1em;
+	margin-top: 0.4em;
+}
diff --git a/source/components/rule/Rule.js b/source/components/rule/Rule.js
index 0a0234210..4d6e6288b 100644
--- a/source/components/rule/Rule.js
+++ b/source/components/rule/Rule.js
@@ -24,6 +24,7 @@ import RuleHeader from './Header'
 import References from './References'
 import './Rule.css'
 import { reduxForm } from 'redux-form'
+import withLanguage from 'Components/utils/withLanguage'
 
 @connect((state, props) => ({
 	currentExample: state.currentExample,
@@ -33,6 +34,7 @@ import { reduxForm } from 'redux-form'
 	analysedExample: exampleAnalysisSelector(state, props)
 }))
 @translate()
+@withLanguage
 export default class Rule extends Component {
 	render() {
 		let {
@@ -41,7 +43,8 @@ export default class Rule extends Component {
 				flatRules,
 				valuesToShow,
 				analysedExample,
-				analysedRule
+				analysedRule,
+				language
 			} = this.props,
 			flatRule = findRuleByDottedName(flatRules, dottedName)
 
@@ -49,6 +52,7 @@ export default class Rule extends Component {
 			namespaceRules = findRuleByNamespace(flatRules, dottedName)
 
 		let displayedRule = analysedExample || analysedRule
+		let showValues = valuesToShow || currentExample
 
 		return (
 			<div id="rule">
@@ -71,12 +75,19 @@ export default class Rule extends Component {
 				/>
 
 				<section id="rule-content">
+					{showValues && displayedRule.nodeValue ? (
+						<div id="ruleValue">
+							<i className="fa fa-calculator" aria-hidden="true" />{' '}
+							{Intl.NumberFormat(language, {
+								style: 'currency',
+								currency: 'EUR'
+							}).format(displayedRule.nodeValue)}
+						</div>
+					) : null}
+
 					{flatRule.question && <UserInput {...{ flatRules, dottedName }} />}
 					{flatRule.ns && (
-						<Algorithm
-							rule={displayedRule}
-							showValues={valuesToShow || currentExample}
-						/>
+						<Algorithm rule={displayedRule} showValues={showValues} />
 					)}
 					{flatRule.note && (
 						<section id="notes">