From b8697e341fe21c531e2b8d2bb7e9d3c4577214a2 Mon Sep 17 00:00:00 2001 From: Johan Girod Date: Fri, 21 Feb 2020 17:01:02 +0100 Subject: [PATCH] :bug: :art: corrige l'affichage de la grille --- source/engine/mecanismViews/Barème.tsx | 4 +--- source/engine/mecanisms/grille.ts | 8 +++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/engine/mecanismViews/Barème.tsx b/source/engine/mecanismViews/Barème.tsx index 73b78630c..c97316422 100644 --- a/source/engine/mecanismViews/Barème.tsx +++ b/source/engine/mecanismViews/Barème.tsx @@ -90,9 +90,7 @@ export const TrancheTable = ({ tranches, multiplicateur }) => { } const Tranche = ({ tranche, multiplicateur }) => { - const isHighlighted = - tranche.isActive || (tranche.nodeValue != null && tranche.nodeValue) - + const isHighlighted = tranche.isActive return ( diff --git a/source/engine/mecanisms/grille.ts b/source/engine/mecanisms/grille.ts index e62f77546..1fd819fdd 100644 --- a/source/engine/mecanisms/grille.ts +++ b/source/engine/mecanisms/grille.ts @@ -73,9 +73,11 @@ const evaluate = ( return { ...node, - tranches, - assiette, - multiplicateur, + explanation: { + tranches, + assiette, + multiplicateur + }, missingVariables, nodeValue, unit: activeTranches[0]?.unit ?? node.unit