From 463b1df05fa4773303abec21281ec0744a85048b Mon Sep 17 00:00:00 2001
From: mama <mael.thomas@data.gouv.fr>
Date: Fri, 13 Oct 2017 17:45:45 +0200
Subject: [PATCH] =?UTF-8?q?:art:=20D=C3=A9placement=20du=20r=C3=A9sultat?=
 =?UTF-8?q?=20de=20calcul=20sur=20/regle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/components/rule/Algorithm.css | 11 +++++++++--
 source/components/rule/Algorithm.js  | 10 ++++++++++
 source/components/rule/Rule.css      |  8 --------
 source/components/rule/Rule.js       | 17 +----------------
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/source/components/rule/Algorithm.css b/source/components/rule/Algorithm.css
index 3684feb51..5c526f45c 100644
--- a/source/components/rule/Algorithm.css
+++ b/source/components/rule/Algorithm.css
@@ -26,6 +26,15 @@
 #rule-rules section > div {
 	font-size: 90%;
 }
+
+
+#rule-rules  #ruleValue {
+	font-weight: 400;
+	font-size: 160%;
+	margin: 2em 0 1em;
+}
+
+
 .node {
 	padding-left: 1em;
 	color: #4B4B66
@@ -201,8 +210,6 @@
 	color: #3498db;
 }
 
-
-
 #rule-content {
 	margin-left: 2em;
 }
diff --git a/source/components/rule/Algorithm.js b/source/components/rule/Algorithm.js
index e86581336..7979e528a 100644
--- a/source/components/rule/Algorithm.js
+++ b/source/components/rule/Algorithm.js
@@ -5,6 +5,7 @@ import {AttachDictionary} from '../AttachDictionary'
 import knownMecanisms from 'Engine/known-mecanisms.yaml'
 import {makeJsx} from 'Engine/evaluation'
 import './Algorithm.css'
+import { humanFigure } from "./RuleValueVignette"
 
 let RuleWithoutFormula = () => [
 	<p>
@@ -46,6 +47,15 @@ export default class Algorithm extends React.Component {
 							: makeJsx(rule['formule'])
 						}
 					</section>
+					<section
+						id="ruleValue"
+						style={{ display: showValues ? "block" : "none" }} >
+						<i className="fa fa-calculator" aria-hidden="true"></i>{' '}{rule.nodeValue == 0
+							? "Règle non applicable"
+							: rule.nodeValue == null
+								? "Situation incomplète"
+								: humanFigure(2)(rule.nodeValue) + " €"}
+					</section>
 				</section>
 			</div>
 		)
diff --git a/source/components/rule/Rule.css b/source/components/rule/Rule.css
index 00fa955ad..c016bb3eb 100644
--- a/source/components/rule/Rule.css
+++ b/source/components/rule/Rule.css
@@ -114,14 +114,6 @@
 	text-align: center;
 }
 
-#ruleValue {
-	margin-left: 3em;
-	font-weight: 600;
-}
-
-
-
-
 #reportError {
 	background: #c0392b;
 	color: white;
diff --git a/source/components/rule/Rule.js b/source/components/rule/Rule.js
index 86dab8013..af3ae2b34 100644
--- a/source/components/rule/Rule.js
+++ b/source/components/rule/Rule.js
@@ -11,7 +11,6 @@ import References from "./References"
 import Algorithm from "./Algorithm"
 import Examples from "./Examples"
 import Helmet from "react-helmet"
-import { humanFigure } from "./RuleValueVignette"
 import {createMarkdownDiv} from 'Engine/marked'
 
 @connect(
@@ -57,8 +56,7 @@ export default class Rule extends Component {
 
 		let { type, name, titre, description, question } = this.rule,
 			situationOrExampleRule =
-				R.path(["example", "rule"])(this.state) || this.rule,
-			ruleValue = situationOrExampleRule.nodeValue
+				R.path(["example", "rule"])(this.state) || this.rule
 
 		return (
 			<div id="rule">
@@ -77,19 +75,6 @@ export default class Rule extends Component {
 						{this.renderDestinataire(R.path([type, "destinataire"])(this.rule))}
 					</div>
 				</section>
-				<div
-					id="ruleValue"
-					style={{ display: situationExists ? "block" : "none" }}
-				>
-					<h2>Résultat</h2>
-					<p>
-						{ruleValue == 0
-							? "Règle non applicable"
-							: ruleValue == null
-								? "Situation incomplète"
-								: humanFigure(2)(ruleValue) + " €"}
-					</p>
-				</div>
 
 				<section id="rule-content">
 					<Algorithm