From 887415fb311d7303f238ff7b481d6a125b5c02b7 Mon Sep 17 00:00:00 2001 From: mama Date: Thu, 19 Oct 2017 09:41:39 +0200 Subject: [PATCH 1/3] Correction du validateur d'ints --- source/components/conversation/validators.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/components/conversation/validators.js b/source/components/conversation/validators.js index ba3a10e80..4e9a47cef 100644 --- a/source/components/conversation/validators.js +++ b/source/components/conversation/validators.js @@ -9,6 +9,6 @@ export let number = { } export let int = { - test: v => /^[0-9]+/.test(v), + test: v => /^[0-9]+$/.test(v), error: 'Vous devez entrer un entier, par ex. 16' } From af783a6da4a9122e4403c8f457d615ac2ed73c7a Mon Sep 17 00:00:00 2001 From: mama Date: Thu, 19 Oct 2017 12:36:09 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Plus=20de=20bulle=20d'aide=20qui=20traine?= =?UTF-8?q?=20apr=C3=A8s=20une=20r=C3=A9ponse=20=C3=A0=20une=20question?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/reducers.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/reducers.js b/source/reducers.js index abb6fd44f..484424d83 100644 --- a/source/reducers.js +++ b/source/reducers.js @@ -48,7 +48,8 @@ export let reduceSteps = (state, action) => { ...state, analysedSituation, situationGate: situationGate, - extraSteps: [] + extraSteps: [], + explainedVariable: null } if (action.type == START_CONVERSATION) { From 5763a794ab5ae6dc9bc9eaef238e38f7a62cf0ba Mon Sep 17 00:00:00 2001 From: mama Date: Thu, 19 Oct 2017 12:38:15 +0200 Subject: [PATCH 3/3] Plus de 'undefined' dans les titres des bulles d'aide --- source/components/Aide.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/components/Aide.js b/source/components/Aide.js index 77f1bf868..c7cd3df97 100644 --- a/source/components/Aide.js +++ b/source/components/Aide.js @@ -7,6 +7,7 @@ import {EXPLAIN_VARIABLE} from '../actions' import References from './rule/References' import './Aide.css' +import {capitalise0} from '../utils' @connect( state => @@ -39,7 +40,7 @@ export default class Aide extends Component { className="fa fa-times-circle" onClick={stopExplaining} >

+ dangerouslySetInnerHTML={{__html: this.renderExplanationMarkdown(text, rule.titre || capitalise0(rule.name))}}>

{/* { possibilities &&