Skip to content
Snippets Groups Projects
Unverified Commit 621b69b4 authored by Dorine Lambinet's avatar Dorine Lambinet
Browse files

Utilise le composant universel valueChange plutôt qu'un autre composant... 

Utilise le composant universel valueChange plutôt qu'un autre composant valueChangeGraph + aligne les montants sur la droite et réduit la taille des typos
parent 2566032b
No related branches found
No related tags found
1 merge request!296Resolve "Panneau d'information du graphique"
Pipeline #19413 passed
Stage: build
Show whitespace changes
Inline Side-by-side
src/lib/components/test_cases/TestCaseGraph.svelte
+ 91
− 71
View file @ 621b69b4
......@@ -33,7 +33,7 @@
import type { GraphDomain } from "$lib/components/piece_of_cake/types"
import TestCaseGraphXlsxExport from "$lib/components/test_cases/TestCaseGraphXlsxExport.svelte"
import Tooltip from "$lib/components/Tooltip.svelte"
import ValueChangeGraph from "$lib/components/ValueChangeGraph.svelte"
import ValueChange from "$lib/components/ValueChange.svelte"
import {
buildVisibleDecompositionsForGraph,
type EvaluationByName,
......@@ -1235,7 +1235,7 @@
<div
class="w-[22rem] overflow-hidden rounded-xl border bg-white shadow-lg"
>
<div class="flex gap-3 bg-neutral-100 p-3">
<div class="flex gap-3 bg-neutral-100 p-2">
<div class="flex items-center">
{#each Object.keys(personSituation).sort( (populationId1, populationId2) => populationId1.localeCompare(populationId2), ) as populationId}
{@const activite = getVariableValue(
......@@ -1331,9 +1331,15 @@
<div class="flex flex-col gap-3 px-5 py-3">
{#each variableGroups.slice(1) as { css, label, variables }}
<div>
<span class={css ?? ""}>
<div
class="flex justify-between {css ?? ''}"
>
<span
class="overflow-x-hidden text-ellipsis"
>
{label} :
<span class="text-xl font-bold"
</span>
<span class="text-base font-bold"
>{formatCurrency(
variables
.filter(
......@@ -1351,22 +1357,25 @@
(sum, current) => sum + current,
0,
),
)}</span
> /an
</span>
<ul
class="list-disc px-6 text-sm font-bold"
)}
<span class="text-xs">/an</span></span
>
</div>
<ul class="list-disc pl-4 text-xs">
{#each variables as variable}
<li
style:margin-left="{variable.depth *
20}px"
>
<div class="inline-flex">
<div
class="flex justify-between text-nowrap"
>
<span
class="overflow-x-hidden text-ellipsis"
>{variable.label}&nbsp;:&nbsp;</span
>
<ValueChangeGraph
<span class="flex gap-1">
<ValueChange
unitName="currency-EUR"
valueByCalculationName={Object.fromEntries(
variable.rows.map(
......@@ -1380,6 +1389,7 @@
),
)}
/>
</span>
</div>
</li>
{/each}
......@@ -1396,12 +1406,14 @@
<div>
<div
class="inline-flex text-sm text-le-gris-dispositif-dark"
class="flex justify-between text-sm text-le-gris-dispositif-dark"
>
<span class="font-bold"
<span
class="overflow-x-hidden text-ellipsis font-bold"
>{variable?.label}&nbsp;:&nbsp;</span
>
<ValueChangeGraph
<span class="flex gap-1">
<ValueChange
unitName="currency-EUR"
valueByCalculationName={Object.fromEntries(
variable.rows.map(
......@@ -1411,21 +1423,28 @@
],
),
)}
/>
/></span
>
</div>
{#if niveauDeVieVariable !== undefined}
<div
class="inline-flex text-sm text-le-gris-dispositif-dark"
class="flex justify-between text-sm text-le-gris-dispositif-dark"
>
<span
class="overflow-x-hidden text-ellipsis font-bold"
>
<span class="font-bold">
Niveau de vie&nbsp;:&nbsp;
</span>
<ValueChangeGraph
<span class="flex gap-1">
<ValueChange
unitName="currency-EUR"
valueByCalculationName={Object.fromEntries(
niveauDeVieVariable.map(
({ calculationName, delta }) => [
({
calculationName,
delta,
}) => [
calculationName,
Math.abs(delta[index]),
],
......@@ -1452,7 +1471,8 @@
</span>
{/if}
{/snippet}
</ValueChangeGraph>
</ValueChange>
</span>
</div>
{/if}
</div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment