diff --git a/src/lib/components/parameters/ScaleAtInstantEdit.svelte b/src/lib/components/parameters/ScaleAtInstantEdit.svelte
index 2408b916240d555ef15a4b0ac1496f38b9aaf718..0897e6527344fbf36faa8e78a4a34ba561152209 100644
--- a/src/lib/components/parameters/ScaleAtInstantEdit.svelte
+++ b/src/lib/components/parameters/ScaleAtInstantEdit.svelte
@@ -116,171 +116,177 @@
}
</script>
-<table class="table-auto border-collapse ">
- <thead>
- <tr>
- <th />
- <th class="font-light text-center bg-gray-100">Seuil</th>
- {#if isAmountScale}
- <th class="font-light text-center bg-gray-100">Montant</th>
- {:else}
- {#if usesBase}
- <th class="font-light text-center bg-gray-100">Base</th>
- {/if}
- <th class="font-light text-center bg-gray-100">Taux</th>
- {/if}
- </tr>
- </thead>
- <tbody>
- {#each [...iterArrayWithErrors(scaleAtInstant, errors)] as [bracketAtInstant, errorsAtIndex], index}
- <tr>
- <td>
- <button
- class="pr-1 rounded"
- on:click={() => deleteBracket(index)}
- title="Supprimer"
- type="button"
- >
- <!-- Material ui icon : delete -->
- <svg
- class="fill-current h-5 w-5 text-gray-500 hover:text-le-gris-dispositif"
- xmlns="http://www.w3.org/2000/svg"
- height="24px"
- viewBox="0 0 24 24"
- width="24px"
- ><path d="M0 0h24v24H0z" fill="none" /><path
- d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
- /></svg
- >
- </button>
- </td>
- <td class="p-1">
- <div class="flex items-center">
- <input
- class="bg-white text-black hover:bg-le-gris-dispositif-light font-serif text-lg border-b border-l-0 border-r-0 border-t-0 py-0 w-24"
- step="any"
- type="number"
- on:change={(event) => changeValue(index, "threshold", event)}
- value={bracketAtInstant.threshold === "expected"
- ? null
- : bracketAtInstant.threshold?.value ?? null}
- />
- {#if showErrors && errorAsKeyValueDictionary(errorAsKeyValueDictionary(errorsAtIndex).threshold).value !== undefined}
- <p>
- {errorAsKeyValueDictionary(
- errorAsKeyValueDictionary(errorsAtIndex).threshold,
- ).value}
- </p>
+<div class="flex-col">
+ <div>
+ <table class="table-auto border-collapse ">
+ <thead>
+ <tr>
+ <th />
+ <th class="font-light text-center bg-gray-100">Seuil</th>
+ {#if isAmountScale}
+ <th class="font-light text-center bg-gray-100">Montant</th>
+ {:else}
+ {#if usesBase}
+ <th class="font-light text-center bg-gray-100">Base</th>
{/if}
- <!--UNITE A CHANGER
- <p class="font-serif text-base">€</p>
- -->
- </div>
- </td>
- {#if isAmountScale}
- <td class="border-l-2 p-1">
- <div class="flex items-center">
- <input
- class="bg-white text-black hover:bg-le-gris-dispositif-light font-serif text-lg border-b border-l-0 border-r-0 border-t-0 py-0 w-24"
- step="any"
- type="number"
- on:change={(event) => changeValue(index, "amount", event)}
- value={asAmountBracketAtInstant(bracketAtInstant).amount ===
- "expected"
- ? null
- : asNumberValue(
- asAmountBracketAtInstant(bracketAtInstant).amount,
- ).value ?? null}
- />
- {#if showErrors && errorAsKeyValueDictionary(errorAsKeyValueDictionary(errorsAtIndex).amount).value !== undefined}
- <p>
- {errorAsKeyValueDictionary(
- errorAsKeyValueDictionary(errorsAtIndex).amount,
- ).value}
- </p>
- {/if}
- <!--UNITE A CHANGER
- <p class="font-serif text-base">€</p>
- -->
- </div>
- </td>
- {:else}
- {#if usesBase}
- <td class="border-l-2 p-1">
+ <th class="font-light text-center bg-gray-100">Taux</th>
+ {/if}
+ </tr>
+ </thead>
+ <tbody>
+ {#each [...iterArrayWithErrors(scaleAtInstant, errors)] as [bracketAtInstant, errorsAtIndex], index}
+ <tr>
+ <td>
+ <button
+ class="pr-1 rounded"
+ on:click={() => deleteBracket(index)}
+ title="Supprimer"
+ type="button"
+ >
+ <!-- Material ui icon : delete -->
+ <svg
+ class="fill-current h-5 w-5 text-gray-500 hover:text-le-gris-dispositif"
+ xmlns="http://www.w3.org/2000/svg"
+ height="24px"
+ viewBox="0 0 24 24"
+ width="24px"
+ ><path d="M0 0h24v24H0z" fill="none" /><path
+ d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
+ /></svg
+ >
+ </button>
+ </td>
+ <td class="p-1">
<div class="flex items-center">
<input
- class="bg-white text-black font-serif text-lg border-b border-l-0 border-r-0 border-t-0 py-0 w-24"
+ class="bg-white text-black hover:bg-le-gris-dispositif-light font-serif text-lg border-b border-l-0 border-r-0 border-t-0 py-0 w-24"
step="any"
type="number"
- on:change={(event) => changeValue(index, "base", event)}
- value={asRateBracketAtInstant(bracketAtInstant).base ===
- "expected"
+ on:change={(event) => changeValue(index, "threshold", event)}
+ value={bracketAtInstant.threshold === "expected"
? null
- : asNumberValue(
- asRateBracketAtInstant(bracketAtInstant).base,
- )?.value ?? null}
+ : bracketAtInstant.threshold?.value ?? null}
/>
- {#if showErrors && errorAsKeyValueDictionary(errorAsKeyValueDictionary(errorsAtIndex).base).value !== undefined}
+ {#if showErrors && errorAsKeyValueDictionary(errorAsKeyValueDictionary(errorsAtIndex).threshold).value !== undefined}
<p>
{errorAsKeyValueDictionary(
- errorAsKeyValueDictionary(errorsAtIndex).base,
+ errorAsKeyValueDictionary(errorsAtIndex).threshold,
).value}
</p>
{/if}
<!--UNITE A CHANGER
- <p class="font-serif text-base">€</p>
- -->
+ <p class="font-serif text-base">€</p>
+ -->
</div>
</td>
- {/if}
- <td class="border-l-2 p-1">
- <div class="flex items-center">
- <input
- class="bg-white text-black font-serif text-lg border-b border-l-0 border-r-0 border-t-0 py-0 w-24 hover:bg-le-gris-dispositif-light"
- step="any"
- type="number"
- on:change={(event) => changeValue(index, "rate", event)}
- value={asRateBracketAtInstant(bracketAtInstant).rate ===
- "expected"
- ? null
- : asMaybeNumberValue(
- asRateBracketAtInstant(bracketAtInstant).rate,
- ).value ?? null}
- />
- {#if showErrors && errorAsKeyValueDictionary(errorAsKeyValueDictionary(errorsAtIndex).rate).value !== undefined}
- <p>
- {errorAsKeyValueDictionary(
- errorAsKeyValueDictionary(errorsAtIndex).rate,
- ).value}
- </p>
+ {#if isAmountScale}
+ <td class="border-l-2 p-1">
+ <div class="flex items-center">
+ <input
+ class="bg-white text-black hover:bg-le-gris-dispositif-light font-serif text-lg border-b border-l-0 border-r-0 border-t-0 py-0 w-24"
+ step="any"
+ type="number"
+ on:change={(event) => changeValue(index, "amount", event)}
+ value={asAmountBracketAtInstant(bracketAtInstant).amount ===
+ "expected"
+ ? null
+ : asNumberValue(
+ asAmountBracketAtInstant(bracketAtInstant).amount,
+ ).value ?? null}
+ />
+ {#if showErrors && errorAsKeyValueDictionary(errorAsKeyValueDictionary(errorsAtIndex).amount).value !== undefined}
+ <p>
+ {errorAsKeyValueDictionary(
+ errorAsKeyValueDictionary(errorsAtIndex).amount,
+ ).value}
+ </p>
+ {/if}
+ <!--UNITE A CHANGER
+ <p class="font-serif text-base">€</p>
+ -->
+ </div>
+ </td>
+ {:else}
+ {#if usesBase}
+ <td class="border-l-2 p-1">
+ <div class="flex items-center">
+ <input
+ class="bg-white text-black font-serif text-lg border-b border-l-0 border-r-0 border-t-0 py-0 w-24"
+ step="any"
+ type="number"
+ on:change={(event) => changeValue(index, "base", event)}
+ value={asRateBracketAtInstant(bracketAtInstant).base ===
+ "expected"
+ ? null
+ : asNumberValue(
+ asRateBracketAtInstant(bracketAtInstant).base,
+ )?.value ?? null}
+ />
+ {#if showErrors && errorAsKeyValueDictionary(errorAsKeyValueDictionary(errorsAtIndex).base).value !== undefined}
+ <p>
+ {errorAsKeyValueDictionary(
+ errorAsKeyValueDictionary(errorsAtIndex).base,
+ ).value}
+ </p>
+ {/if}
+ <!--UNITE A CHANGER
+ <p class="font-serif text-base">€</p>
+ -->
+ </div>
+ </td>
{/if}
- <!--UNITE A CHANGER
+ <td class="border-l-2 p-1">
+ <div class="flex items-center">
+ <input
+ class="bg-white text-black font-serif text-lg border-b border-l-0 border-r-0 border-t-0 py-0 w-24 hover:bg-le-gris-dispositif-light"
+ step="any"
+ type="number"
+ on:change={(event) => changeValue(index, "rate", event)}
+ value={asRateBracketAtInstant(bracketAtInstant).rate ===
+ "expected"
+ ? null
+ : asMaybeNumberValue(
+ asRateBracketAtInstant(bracketAtInstant).rate,
+ ).value ?? null}
+ />
+ {#if showErrors && errorAsKeyValueDictionary(errorAsKeyValueDictionary(errorsAtIndex).rate).value !== undefined}
+ <p>
+ {errorAsKeyValueDictionary(
+ errorAsKeyValueDictionary(errorsAtIndex).rate,
+ ).value}
+ </p>
+ {/if}
+ <!--UNITE A CHANGER
<p class="font-serif text-base">€</p>
-->
- </div>
- </td>
- {/if}
- </tr>
- {/each}
- </tbody>
-</table>
+ </div>
+ </td>
+ {/if}
+ </tr>
+ {/each}
+ </tbody>
+ </table>
+ </div>
-<button
- class="text-gray-500 hover:text-le-gris-dispositif w-64 "
- on:click={appendBracket}
- type="button"
->
- <div class="mt-4 text-sm pl-1 flex items-center">
- <svg
- class="fill-current inline mr-1"
- xmlns="http://www.w3.org/2000/svg"
- height="18px"
- viewBox="0 0 24 24"
- width="18px"
- fill="#000000"
- ><path d="M0 0h24v24H0z" fill="none" /><path
- d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm5 11h-4v4h-2v-4H7v-2h4V7h2v4h4v2z"
- /></svg
- >Ajouter un seuil
- </div></button
->
+ <div>
+ <button
+ class="text-gray-500 hover:text-le-gris-dispositif w-64 "
+ on:click={appendBracket}
+ type="button"
+ >
+ <div class="mt-4 text-sm pl-1 flex items-center">
+ <svg
+ class="fill-current inline mr-1"
+ xmlns="http://www.w3.org/2000/svg"
+ height="18px"
+ viewBox="0 0 24 24"
+ width="18px"
+ fill="#000000"
+ ><path d="M0 0h24v24H0z" fill="none" /><path
+ d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm5 11h-4v4h-2v-4H7v-2h4V7h2v4h4v2z"
+ /></svg
+ >Ajouter un seuil
+ </div></button
+ >
+ </div>
+</div>
diff --git a/src/lib/components/variables/VariableReferredParameterHeader.svelte b/src/lib/components/variables/VariableReferredParameterHeader.svelte
index 56ea4eda60a8df96d85f2446182f95ba5494fad4..4f1d82b769186daf06222cb89eb004166140de9f 100644
--- a/src/lib/components/variables/VariableReferredParameterHeader.svelte
+++ b/src/lib/components/variables/VariableReferredParameterHeader.svelte
@@ -15,14 +15,14 @@
<h1
class="font-serif text-gray-700 py-1 {parameter.class !== ParameterClass.Node
- ? 'text-base italic text-black'
+ ? 'text-base italic text-le-gris-dispositif-dark'
: depth === 0
? 'text-xl'
: depth === 1
- ? 'font-semibold text-lg'
+ ? 'font-semibold text-lg px-4'
: depth === 2
- ? 'text-base'
- : 'text-sm'}"
+ ? 'text-base px-8'
+ : 'text-sm px-12'}"
>
{#if depth === 0}
{#each [...iterParameterAncestors(parameter.parent)] as ancestor}
diff --git a/src/lib/components/variables/VariableReferredParameters.svelte b/src/lib/components/variables/VariableReferredParameters.svelte
index a90781f4e57717d8e7db756c43e57c5ee200ac32..d594fdb3366ff96b4bff4a2f48450d0ce43d19c8 100644
--- a/src/lib/components/variables/VariableReferredParameters.svelte
+++ b/src/lib/components/variables/VariableReferredParameters.svelte
@@ -35,7 +35,7 @@
$: rootParameterById = mergeParameters(parameters)
</script>
-<div class="bg-le-gris-dispositif-light px-5 py-2 shadow-inner">
+<div class="bg-le-gris-dispositif-light px-5 py-2 shadow-inner rounded-r">
<h1 class="text-2xl font-serif font-light">
{variable.label ?? variable.name}
</h1>
@@ -167,34 +167,35 @@
{/if}
{#if Object.keys(rootDirectParameterById).length > 0}
- <section class="px-5 pb-3 mb-3">
- <h2 class="text-black flex font-bold justify-between py-2 text-lg">
- <span>Principaux paramètres de la loi</span>
- <button on:click={() => (openDirectParameters = !openDirectParameters)}>
- {#if openDirectParameters}
- <!-- Material Icons name: Expand Less -->
- <svg
- aria-hidden="true"
- class="block h-6 stroke-current w-6"
- fill="black"
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- ><path d="M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z" /></svg
- >
- {:else}
- <!-- Material Icons name: Expand More -->
- <svg
- aria-hidden="true"
- class="block h-6 stroke-current w-6"
- fill="black"
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- ><path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z" /></svg
- >
- {/if}
- </button>
- </h2>
-
+ <h2
+ class="bg-le-gris-dispositif-light text-black flex justify-between py-2 text-lg px-5 rounded-r shadow-inner"
+ >
+ <span>Principaux paramètres de la loi</span>
+ <button on:click={() => (openDirectParameters = !openDirectParameters)}>
+ {#if openDirectParameters}
+ <!-- Material Icons name: Expand Less -->
+ <svg
+ aria-hidden="true"
+ class="block h-6 stroke-current w-6"
+ fill="black"
+ viewBox="0 0 24 24"
+ xmlns="http://www.w3.org/2000/svg"
+ ><path d="M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z" /></svg
+ >
+ {:else}
+ <!-- Material Icons name: Expand More -->
+ <svg
+ aria-hidden="true"
+ class="block h-6 stroke-current w-6"
+ fill="black"
+ viewBox="0 0 24 24"
+ xmlns="http://www.w3.org/2000/svg"
+ ><path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z" /></svg
+ >
+ {/if}
+ </button>
+ </h2>
+ <section class="pl-5 mb-3">
{#if openDirectParameters}
<ul>
{#each Object.values(rootDirectParameterById) as parameter}
@@ -214,32 +215,33 @@
{/if}
{#if Object.keys(rootParameterById).length > 0}
+ <h2
+ class="bg-le-gris-dispositif-light text-black flex justify-between py-2 text-lg px-5 rounded-r shadow-inner"
+ >
+ <span>Autres paramètres affectant le dispositif</span>
+ <button on:click={() => (openAllParameters = !openAllParameters)}>
+ {#if openAllParameters}
+ <!-- Material Icons name: Expand Less -->
+ <svg
+ aria-hidden="true"
+ class="block h-6 fill-current stroke-current text-gray-500 w-6"
+ viewBox="0 0 24 24"
+ xmlns="http://www.w3.org/2000/svg"
+ ><path d="M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z" /></svg
+ >
+ {:else}
+ <!-- Material Icons name: Expand More -->
+ <svg
+ aria-hidden="true"
+ class="block h-6 fill-current stroke-current text-gray-500 w-6"
+ viewBox="0 0 24 24"
+ xmlns="http://www.w3.org/2000/svg"
+ ><path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z" /></svg
+ >
+ {/if}
+ </button>
+ </h2>
<section class="pb-3 mb-3 px-5">
- <h2 class="text-black flex font-bold justify-between py-2 text-lg">
- <span>Tous les paramètres affectant le dispositif</span>
- <button on:click={() => (openAllParameters = !openAllParameters)}>
- {#if openAllParameters}
- <!-- Material Icons name: Expand Less -->
- <svg
- aria-hidden="true"
- class="block h-6 fill-current stroke-current text-gray-500 w-6"
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- ><path d="M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z" /></svg
- >
- {:else}
- <!-- Material Icons name: Expand More -->
- <svg
- aria-hidden="true"
- class="block h-6 fill-current stroke-current text-gray-500 w-6"
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- ><path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z" /></svg
- >
- {/if}
- </button>
- </h2>
-
{#if openAllParameters}
<ul>
{#each Object.values(rootParameterById) as parameter}
diff --git a/src/lib/components/variables/VariableReferredScaleParameter.svelte b/src/lib/components/variables/VariableReferredScaleParameter.svelte
index 1e0e952910f8ae38eba4624297f8c04e1a74b8ce..da58e562340b58419b1253c3d8442280d4cfb681 100644
--- a/src/lib/components/variables/VariableReferredScaleParameter.svelte
+++ b/src/lib/components/variables/VariableReferredScaleParameter.svelte
@@ -63,97 +63,96 @@
}
</script>
-<section class="mb-5 ml-10">
+<section class="ml-14 pl-4 pb-4 border-l-2 border-le-gris-dispositif-light">
<VariableReferredParameterHeader {depth} {parameter} />
- <div class="flex">
- <div class="bg-gray-100 rounded-sm pr-2 pl-1 py-2 ml-2 mb-1 mt-1 mr-6">
- <ScaleAtInstantEdit
- errors={{}}
- {parameter}
- on:change={changeScale}
- scaleAtInstant={latestScaleAtInstant}
- showErrors={true}
- />
- </div>
+ <div class="flex bg-gray-100 rounded-t pl-1 py-2 mt-1">
+ <ScaleAtInstantEdit
+ errors={{}}
+ {parameter}
+ on:change={changeScale}
+ scaleAtInstant={latestScaleAtInstant}
+ showErrors={true}
+ />
</div>
- <p class="ml-4 text-sm mb-3 text-gray-600">
- depuis {latestInstantSplit[1]}/{latestInstantSplit[0]}
- </p>
-
- <div class="flex items-baseline text-gray-600 text-xs px-2">
- <div class="flex items-center">
- <div class="flex text-gray-600 text-sm">
- <div class="bg-gray-400 rounded-sm flex px-1 text-white">
- <div class="flex pr-1">
- {#if latestInstant < "2020" || latestInstant === "0001-01-01"}
- <!-- Inspired from Material Icons name: Warning / with white symbol inside -->
- <div class="flex pr-1">
- <svg
- aria-hidden="true"
- class="block fill-current h-5 w-5 text-white "
- viewBox="0 0 24 22"
- xmlns="http://www.w3.org/2000/svg"
+ <div class="bg-gray-100 rounded-b p-2">
+ <p class=" text-sm mb-3">
+ Barème depuis {latestInstantSplit[1]}/{latestInstantSplit[0]}
+ </p>
+ <div class="flex items-baseline text-gray-600 text-xs">
+ <div class="flex items-center">
+ <div class="flex text-gray-600 text-sm">
+ <div class="bg-gray-400 rounded-sm flex px-1 text-white">
+ <div class="flex pr-1">
+ {#if latestInstant < "2020" || latestInstant === "0001-01-01"}
+ <!-- Inspired from Material Icons name: Warning / with white symbol inside -->
+ <div class="flex pr-1">
+ <svg
+ aria-hidden="true"
+ class="block fill-current h-5 w-5 text-white "
+ viewBox="0 0 24 22"
+ xmlns="http://www.w3.org/2000/svg"
+ >
+ <path
+ class="text-[#FFAC33]"
+ d="M0.124322 18.4377C-0.240619 19.1041 0.241623 19.918 1.00142 19.918H20.6259C21.3857 19.918 21.868 19.1041 21.503 18.4377L11.6908 0.519686C11.3113 -0.173228 10.316 -0.173229 9.93658 0.519685L0.124322 18.4377ZM11.8591 16.8375C11.8591 17.3898 11.4114 17.8375 10.8591 17.8375H10.7682C10.2159 17.8375 9.76822 17.3898 9.76822 16.8375V16.627C9.76822 16.0747 10.2159 15.627 10.7682 15.627H10.8591C11.4114 15.627 11.8591 16.0747 11.8591 16.627V16.8375ZM11.8591 12.7416C11.8591 13.2938 11.4114 13.7416 10.8591 13.7416H10.7682C10.2159 13.7416 9.76822 13.2938 9.76822 12.7416V7.3298C9.76822 6.77751 10.2159 6.3298 10.7682 6.3298H10.8591C11.4114 6.3298 11.8591 6.77751 11.8591 7.3298V12.7416Z"
+ />
+ <path
+ d="M10.7686 17.8378H10.8595C11.4117 17.8378 11.8595 17.3901 11.8595 16.8378V16.6273C11.8595 16.075 11.4117 15.6273 10.8595 15.6273H10.7686C10.2163 15.6273 9.76855 16.075 9.76855 16.6273V16.8378C9.76855 17.3901 10.2163 17.8378 10.7686 17.8378Z"
+ />
+ <path
+ d="M10.7686 13.7418H10.8595C11.4117 13.7418 11.8595 13.2941 11.8595 12.7418V7.33008C11.8595 6.77779 11.4117 6.33008 10.8595 6.33008H10.7686C10.2163 6.33008 9.76855 6.77779 9.76855 7.33008V12.7418C9.76855 13.2941 10.2163 13.7418 10.7686 13.7418Z"
+ />
+ </svg>
+ </div>
+ <span
+ title="La dernière relecture date de {latestInstantSplit[1]}/{latestInstantSplit[0]}"
+ >À vérifier</span
>
- <path
- class="text-[#FFAC33]"
- d="M0.124322 18.4377C-0.240619 19.1041 0.241623 19.918 1.00142 19.918H20.6259C21.3857 19.918 21.868 19.1041 21.503 18.4377L11.6908 0.519686C11.3113 -0.173228 10.316 -0.173229 9.93658 0.519685L0.124322 18.4377ZM11.8591 16.8375C11.8591 17.3898 11.4114 17.8375 10.8591 17.8375H10.7682C10.2159 17.8375 9.76822 17.3898 9.76822 16.8375V16.627C9.76822 16.0747 10.2159 15.627 10.7682 15.627H10.8591C11.4114 15.627 11.8591 16.0747 11.8591 16.627V16.8375ZM11.8591 12.7416C11.8591 13.2938 11.4114 13.7416 10.8591 13.7416H10.7682C10.2159 13.7416 9.76822 13.2938 9.76822 12.7416V7.3298C9.76822 6.77751 10.2159 6.3298 10.7682 6.3298H10.8591C11.4114 6.3298 11.8591 6.77751 11.8591 7.3298V12.7416Z"
- />
- <path
- d="M10.7686 17.8378H10.8595C11.4117 17.8378 11.8595 17.3901 11.8595 16.8378V16.6273C11.8595 16.075 11.4117 15.6273 10.8595 15.6273H10.7686C10.2163 15.6273 9.76855 16.075 9.76855 16.6273V16.8378C9.76855 17.3901 10.2163 17.8378 10.7686 17.8378Z"
- />
- <path
- d="M10.7686 13.7418H10.8595C11.4117 13.7418 11.8595 13.2941 11.8595 12.7418V7.33008C11.8595 6.77779 11.4117 6.33008 10.8595 6.33008H10.7686C10.2163 6.33008 9.76855 6.77779 9.76855 7.33008V12.7418C9.76855 13.2941 10.2163 13.7418 10.7686 13.7418Z"
- />
- </svg>
- </div>
- <span
- title="La dernière relecture date de {latestInstantSplit[1]}/{latestInstantSplit[0]}"
- >À vérifier</span
- >
- {:else}
- <!-- Inspired from Material Icons name: New Releases / with white symbol inside -->
- <div class="flex pr-1">
- <svg
- aria-hidden="true"
- class="block h-5 w-5 text-white "
- viewBox="0 0 24 23"
- xmlns="http://www.w3.org/2000/svg"
+ {:else}
+ <!-- Inspired from Material Icons name: New Releases / with white symbol inside -->
+ <div class="flex pr-1">
+ <svg
+ aria-hidden="true"
+ class="block h-5 w-5 text-white "
+ viewBox="0 0 24 23"
+ xmlns="http://www.w3.org/2000/svg"
+ >
+ <path
+ d="M22 10.5L19.56 7.71L19.9 4.02L16.29 3.2L14.4 0L11 1.46L7.6 0L5.71 3.19L2.1 4L2.44 7.7L0 10.5L2.44 13.29L2.1 16.99L5.71 17.81L7.6 21L11 19.53L14.4 20.99L16.29 17.8L19.9 16.98L19.56 13.29L22 10.5ZM9.09 15.22L5.29 11.41L6.77 9.93L9.09 12.26L14.94 6.39L16.42 7.87L9.09 15.22Z"
+ fill="#13CC03"
+ />
+ <path
+ d="M9.09004 15.2187L5.29004 11.4087L6.77004 9.92867L9.09004 12.2587L14.94 6.38867L16.42 7.86867L9.09004 15.2187Z"
+ fill="white"
+ />
+ </svg>
+ </div>
+ <span
+ title="La dernière relecture date de {latestInstantSplit[1]}/{latestInstantSplit[0]}"
+ >Vérifié</span
>
- <path
- d="M22 10.5L19.56 7.71L19.9 4.02L16.29 3.2L14.4 0L11 1.46L7.6 0L5.71 3.19L2.1 4L2.44 7.7L0 10.5L2.44 13.29L2.1 16.99L5.71 17.81L7.6 21L11 19.53L14.4 20.99L16.29 17.8L19.9 16.98L19.56 13.29L22 10.5ZM9.09 15.22L5.29 11.41L6.77 9.93L9.09 12.26L14.94 6.39L16.42 7.87L9.09 15.22Z"
- fill="#13CC03"
- />
- <path
- d="M9.09004 15.2187L5.29004 11.4087L6.77004 9.92867L9.09004 12.2587L14.94 6.38867L16.42 7.86867L9.09004 15.2187Z"
- fill="white"
- />
- </svg>
- </div>
- <span
- title="La dernière relecture date de {latestInstantSplit[1]}/{latestInstantSplit[0]}"
- >Vérifié</span
- >
- {/if}
+ {/if}
+ </div>
</div>
- </div>
- <div>
- <a
- class="text-sm ml-1 underline text-gray-600 hover:text-gray-700"
- href="/parameters/{parameter.name}"
- target="_blank"
- >
- <svg
- aria-hidden="true"
- class="inline h-4 fill-current stroke-transparent text-gray-600 w-4"
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- ><path
- d="M12.804 16.6663L13.7085 18.2402C12.8402 18.6382 11.8905 18.9005 10.9045 19V17.1729C11.5739 17.0915 12.207 16.9196 12.804 16.6663ZM2.82714 10.9045H1C1.0995 11.8995 1.36181 12.8402 1.7598 13.7085L3.33367 12.804C3.0804 12.207 2.90854 11.5739 2.82714 10.9045ZM12.804 3.33367L13.7085 1.7598C12.8402 1.36181 11.8995 1.0995 10.9045 1V2.82714C11.5739 2.90854 12.207 3.0804 12.804 3.33367ZM17.1729 9.09548H19C18.9005 8.1005 18.6382 7.1598 18.2402 6.29146L16.6663 7.19598C16.9196 7.79296 17.0915 8.42613 17.1729 9.09548ZM7.19598 16.6663L6.29146 18.2402C7.1598 18.6382 8.10955 18.9005 9.09548 19V17.1729C8.42613 17.0915 7.79296 16.9196 7.19598 16.6663ZM9.09548 2.82714V1C8.1005 1.0995 7.1598 1.36181 6.29146 1.7598L7.19598 3.33367C7.79296 3.0804 8.42613 2.90854 9.09548 2.82714ZM15.7528 5.63116L17.3266 4.71759C16.7568 3.93065 16.0603 3.23417 15.2734 2.66432L14.3598 4.23819C14.8935 4.64523 15.3548 5.10653 15.7528 5.63116ZM3.33367 7.19598L1.7598 6.29146C1.36181 7.1598 1.0995 8.1005 1 9.09548H2.82714C2.90854 8.42613 3.0804 7.79296 3.33367 7.19598ZM17.1729 10.9045C17.0915 11.5739 16.9196 12.207 16.6663 12.804L18.2402 13.7085C18.6382 12.8402 18.9005 11.8905 19 10.9045H17.1729ZM14.3688 15.7528L15.2824 17.3266C16.0693 16.7568 16.7658 16.0603 17.3357 15.2734L15.7618 14.3598C15.3548 14.8935 14.8935 15.3548 14.3688 15.7528ZM5.63116 4.24724L4.72663 2.66432C3.93065 3.24322 3.24322 3.93065 2.67337 4.72663L4.24724 5.6402C4.64523 5.10653 5.10653 4.64523 5.63116 4.24724ZM4.24724 14.3688L2.67337 15.2734C3.24322 16.0603 3.9397 16.7568 4.72663 17.3266L5.6402 15.7528C5.10653 15.3548 4.64523 14.8935 4.24724 14.3688ZM10.9045 5.47739H9.09548V10.3709L12.9759 14.2513L14.2513 12.9759L10.9045 9.62914V5.47739Z"
- /></svg
- >Historique</a
- >
+ <div>
+ <a
+ class="text-sm ml-1 underline text-gray-600 hover:text-gray-700"
+ href="/parameters/{parameter.name}"
+ target="_blank"
+ >
+ <svg
+ aria-hidden="true"
+ class="inline h-4 fill-current stroke-transparent text-gray-600 w-4"
+ viewBox="0 0 24 24"
+ xmlns="http://www.w3.org/2000/svg"
+ ><path
+ d="M12.804 16.6663L13.7085 18.2402C12.8402 18.6382 11.8905 18.9005 10.9045 19V17.1729C11.5739 17.0915 12.207 16.9196 12.804 16.6663ZM2.82714 10.9045H1C1.0995 11.8995 1.36181 12.8402 1.7598 13.7085L3.33367 12.804C3.0804 12.207 2.90854 11.5739 2.82714 10.9045ZM12.804 3.33367L13.7085 1.7598C12.8402 1.36181 11.8995 1.0995 10.9045 1V2.82714C11.5739 2.90854 12.207 3.0804 12.804 3.33367ZM17.1729 9.09548H19C18.9005 8.1005 18.6382 7.1598 18.2402 6.29146L16.6663 7.19598C16.9196 7.79296 17.0915 8.42613 17.1729 9.09548ZM7.19598 16.6663L6.29146 18.2402C7.1598 18.6382 8.10955 18.9005 9.09548 19V17.1729C8.42613 17.0915 7.79296 16.9196 7.19598 16.6663ZM9.09548 2.82714V1C8.1005 1.0995 7.1598 1.36181 6.29146 1.7598L7.19598 3.33367C7.79296 3.0804 8.42613 2.90854 9.09548 2.82714ZM15.7528 5.63116L17.3266 4.71759C16.7568 3.93065 16.0603 3.23417 15.2734 2.66432L14.3598 4.23819C14.8935 4.64523 15.3548 5.10653 15.7528 5.63116ZM3.33367 7.19598L1.7598 6.29146C1.36181 7.1598 1.0995 8.1005 1 9.09548H2.82714C2.90854 8.42613 3.0804 7.79296 3.33367 7.19598ZM17.1729 10.9045C17.0915 11.5739 16.9196 12.207 16.6663 12.804L18.2402 13.7085C18.6382 12.8402 18.9005 11.8905 19 10.9045H17.1729ZM14.3688 15.7528L15.2824 17.3266C16.0693 16.7568 16.7658 16.0603 17.3357 15.2734L15.7618 14.3598C15.3548 14.8935 14.8935 15.3548 14.3688 15.7528ZM5.63116 4.24724L4.72663 2.66432C3.93065 3.24322 3.24322 3.93065 2.67337 4.72663L4.24724 5.6402C4.64523 5.10653 5.10653 4.64523 5.63116 4.24724ZM4.24724 14.3688L2.67337 15.2734C3.24322 16.0603 3.9397 16.7568 4.72663 17.3266L5.6402 15.7528C5.10653 15.3548 4.64523 14.8935 4.24724 14.3688ZM10.9045 5.47739H9.09548V10.3709L12.9759 14.2513L14.2513 12.9759L10.9045 9.62914V5.47739Z"
+ /></svg
+ >Historique</a
+ >
+ </div>
</div>
</div>
</div>
diff --git a/src/lib/components/variables/VariableReferredValueParameter.svelte b/src/lib/components/variables/VariableReferredValueParameter.svelte
index d433d0fa1870015ab58959adbea1a05a3a313c57..8eafd4d31d7bbf692efb3c6c71f7ffd9f467dd6e 100644
--- a/src/lib/components/variables/VariableReferredValueParameter.svelte
+++ b/src/lib/components/variables/VariableReferredValueParameter.svelte
@@ -71,10 +71,10 @@
}
</script>
-<section class="mb-5 ml-10">
+<section class="ml-14 pl-4 pb-4 border-l-2 border-le-gris-dispositif-light">
<VariableReferredParameterHeader {depth} {parameter} />
- <div class="ml-2 mb-2 items-center flex justify-start mr-5">
+ <div class="bg-gray-100 p-2 pb-2 items-center flex justify-start rounded">
<div>
{#if typeof value === "number" || value === "expected" || value === null}
<input
@@ -111,7 +111,7 @@
</div>
</div>
- <div class=" flex items-baseline text-gray-600 text-xs px-2">
+ <div class="bg-gray-100 flex items-baseline text-gray-600 text-xs p-2">
<div class="flex items-center">
<div class="flex text-gray-600 text-sm">
<div class="bg-gray-400 rounded-sm flex px-1 text-white ">