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

Couleur graphe

parent 81dedada
Branches
Tags 0.0.443
1 merge request!220Ui cas types fonctionnaire
Pipeline #13710 passed
...@@ -251,11 +251,15 @@ ...@@ -251,11 +251,15 @@
} }
} }
const firstPrelevementIndex = prelevementsValues.findIndex(
(variable) => variable.name === "csg_deductible_salaire",
)
variableGroups = [ variableGroups = [
{ {
showOpen: true, showOpen: true,
variables: [ variables: [
...prelevementsValues.slice(0, 1), ...prelevementsValues.slice(0, firstPrelevementIndex),
...revenuDisponibleValues, ...revenuDisponibleValues,
], ],
}, },
...@@ -264,7 +268,7 @@ ...@@ -264,7 +268,7 @@
label: "Prélèvements", label: "Prélèvements",
name: "prelevements", name: "prelevements",
showOpen: false, showOpen: false,
variables: prelevementsValues.slice(1), variables: prelevementsValues.slice(firstPrelevementIndex),
}, },
{ {
css: "text-green-800", css: "text-green-800",
...@@ -1219,7 +1223,7 @@ ...@@ -1219,7 +1223,7 @@
<span class="uppercase" <span class="uppercase"
>{#if firstPersonActivity === "actif"} >{#if firstPersonActivity === "actif"}
{#if firstPersonCategorieSalarie !== "public_titulaire_etat" || firstPersonCategorieSalarie !== "public_titulaire_hospitaliere" || firstPersonCategorieSalarie !== "public_titulaire_territoriale" || firstPersonCategorieSalarie !== "public_titulaire_militaire" || firstPersonCategorieSalarie !== "public_titulaire_territoriale"} {#if firstPersonCategorieSalarie !== "public_titulaire_etat" || firstPersonCategorieSalarie !== "public_titulaire_hospitaliere" || firstPersonCategorieSalarie !== "public_titulaire_territoriale" || firstPersonCategorieSalarie !== "public_titulaire_militaire" || firstPersonCategorieSalarie !== "public_titulaire_territoriale"}
Salaire principal fonctionnaire Salaire principal
{:else} {:else}
Salaire de base Salaire de base
{/if} {/if}
......
...@@ -119,7 +119,7 @@ export const variableCustomizationsBase: { ...@@ -119,7 +119,7 @@ export const variableCustomizationsBase: {
borderstyle: "dashed", borderstyle: "dashed",
}, },
pattern: { pattern: {
background: "rgba(210, 223, 255, .6)", background: "rgba(210, 223, 255, 0.6)",
size: 40, size: 40,
}, },
selected: "always", selected: "always",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment