From a8a3fcee39c63a086d5e2a3ee890f3857ac602de Mon Sep 17 00:00:00 2001
From: Dorine Lambinet <dorine.lambinet@gmail.com>
Date: Fri, 24 Jun 2022 15:15:41 +0200
Subject: [PATCH] =?UTF-8?q?Ajoute=20l'info=20Litres=20de=20carburant=20dan?=
 =?UTF-8?q?s=20le=20r=C3=A9sum=C3=A9=20du=20cas=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/components/pictos/PictoMaison.svelte  |  2 +-
 .../test_cases/TestCaseSummary.svelte         | 50 +++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/lib/components/pictos/PictoMaison.svelte b/src/lib/components/pictos/PictoMaison.svelte
index ff2e461c9..c53cbf91f 100644
--- a/src/lib/components/pictos/PictoMaison.svelte
+++ b/src/lib/components/pictos/PictoMaison.svelte
@@ -1,6 +1,6 @@
 <svg
   width="30"
-  height="28"
+  height="30"
   viewBox="0 0 218 220"
   fill="none"
   xmlns="http://www.w3.org/2000/svg"
diff --git a/src/lib/components/test_cases/TestCaseSummary.svelte b/src/lib/components/test_cases/TestCaseSummary.svelte
index 4f749ff0a..bce378454 100644
--- a/src/lib/components/test_cases/TestCaseSummary.svelte
+++ b/src/lib/components/test_cases/TestCaseSummary.svelte
@@ -10,7 +10,7 @@
   import PictoBigParent from "$lib/components/pictos/PictoBigParent.svelte"
   import PictoBigPersonneACharge from "$lib/components/pictos/PictoBigPersonneACharge.svelte"
   import PictoBigEntreprise from "$lib/components/pictos/PictoBigEntreprise.svelte"
-  // import PictoFraisGazoil from "../pictos/PictoFraisGazoil.svelte"
+  import PictoFraisGazoil from "../pictos/PictoFraisGazoil.svelte"
   import PictoGardeAlternee from "../pictos/PictoGardeAlternee.svelte"
   import PictoHandicap from "../pictos/PictoHandicap.svelte"
   import PictoMaison from "../pictos/PictoMaison.svelte"
@@ -569,7 +569,7 @@
     ? "grid gap-x-8 grid-cols-1"
     : mode === "compare"
     ? "flex flex-col"
-    : "grid gap-x-8 grid-cols-2 xl:grid-cols-3"}
+    : "grid gap-x-8 grid-cols-1 xl:grid-cols-2"}
 >
   <!-- Ménages -->
   {#each Object.keys(householdSituation).sort( (populationId1, populationId2) => populationId1.localeCompare(populationId2), ) as populationId}
@@ -583,38 +583,38 @@
     <!--Frais loyer-->
     {#if (loyer > 0 && statut_occupation_logement !== "proprietaire") || statut_occupation_logement === "loge_gratuitement" || statut_occupation_logement === "sans_domicile"}
       <div>
-        <div class="my-2 flex items-end gap-2">
+        <div class="my-2 flex items-end gap-6">
           <div class="flex items-center">
             <div>
               <PictoMaison />
             </div>
             <div class="pl-2">
-              <span>
-                <span class="text-lg"
-                  >{euroAmountFormatter.format(loyer)}
-                  <span
-                    class="text-xs"
-                    title="Frais de loyer ou d'emprunt pour un primo-accédant par an"
-                    >{#if statut_occupation_logement === "locataire_foyer" || statut_occupation_logement === "locataire_hlm" || statut_occupation_logement === "locataire_meuble" || statut_occupation_logement === "locataire_vide"}de
-                      loyer/an
-                    {:else if statut_occupation_logement === "primo_accedant"}d'emprunt
-                      primo-accédant/an{/if}</span
-                  ></span
-                ></span
+              <span
+                class="text-xs"
+                title="Frais de loyer ou d'emprunt pour un primo-accédant par an"
+              >
+                <span class="text-lg">{euroAmountFormatter.format(loyer)}</span>
+                {#if statut_occupation_logement === "locataire_foyer" || statut_occupation_logement === "locataire_hlm" || statut_occupation_logement === "locataire_meuble" || statut_occupation_logement === "locataire_vide"}de
+                  loyer/an
+                {:else if statut_occupation_logement === "primo_accedant"}d'emprunt
+                  primo-accédant/an{/if}</span
               >
             </div>
           </div>
 
-          <!--Frais carburants
-      <div class="flex items-center">
-        <PictoFraisGazoil />
-        <div class="pl-2">
-          <abbr class="text-sm" title="Frais en gazoil par an">
-            Frais carburant&nbsp;:</abbr
-          >
-          <span>XX/an</span>
-        </div>
-      </div>-->
+          <!--Frais carburants-->
+          <div class="flex items-center">
+            <div>
+              <PictoFraisGazoil />
+            </div>
+            <div class="pl-2">
+              <span class="text-xs" title="Volume en Litre de carburant par an">
+                <span class="text-lg">XXX L.</span>
+
+                de carburant&nbsp;/an</span
+              >
+            </div>
+          </div>
         </div>
       </div>
     {/if}
-- 
GitLab