Fix date display + rebuild

Sylrelo · Sep 7, 2024 · 2930ab2 · 2930ab2
1 parent 168fac2
commit 2930ab2
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 33 deletions.
diff --git a/...dist/assets/apexcharts.common-fUkLlU_0.js → ...dist/assets/apexcharts.common-flqU8va8.js b/...dist/assets/apexcharts.common-fUkLlU_0.js → ...dist/assets/apexcharts.common-flqU8va8.js
diff --git a/42Tools/front/dist/assets/index-DV81uDoe.js → 42Tools/front/dist/assets/index-kx_sTfF1.js b/42Tools/front/dist/assets/index-DV81uDoe.js → 42Tools/front/dist/assets/index-kx_sTfF1.js
diff --git a/42Tools/front/dist/index.html b/42Tools/front/dist/index.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="/app.css" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>42Tools</title>
-    <script type="module" crossorigin src="/assets/index-DV81uDoe.js"></script>
+    <script type="module" crossorigin src="/assets/index-kx_sTfF1.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-BMknnGRc.css">
   </head>
 

diff --git a/42Tools/front/src/lib/Pages/RNCP/RncpSearchAlternateView.svelte b/42Tools/front/src/lib/Pages/RNCP/RncpSearchAlternateView.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+  import type { CachedRncpProgress } from "@back/src/modules/rncp-progress/rncp-progress.entity";
+  import type { Users } from "@back/src/modules/users/users.entity";
   import {
     Avatar,
     Badge,
@@ -11,12 +13,10 @@
     TableHead,
     TableHeadCell,
   } from "flowbite-svelte";
-  import { formatDateDisplay, showTimeLeft } from "./utils";
-  import type { CachedRncpProgress } from "@back/src/modules/rncp-progress/rncp-progress.entity";
   import { onMount } from "svelte";
   import { httpGet, httpPatch } from "../../../services/http";
+  import { formatDateDisplay, showTimeLeft } from "./utils";
   import type { RncpDefinition } from "@back/src/modules/rncp-definition/rncp-definition.entity";
-  import type { Users } from "@back/src/modules/users/users.entity";
 
   //
 
@@ -33,6 +33,7 @@
   onMount(async () => {
     apprenticeshipRythm = await httpGet("/apprenticeship");
   });
+
   //
 
   function getColor(percent: number) {
@@ -50,6 +51,20 @@
     return "red";
   }
 
+  function displayCorrectRncpName(rncpKey?: string) {
+    if (rncpKey == null) {
+      return "--";
+    }
+
+    const rncp = rncpDefinition.find((r) => r.rncpKey === rncpKey);
+
+    if (rncp == null) {
+      return "--";
+    }
+
+    return `${rncp.level} - ${rncp.option}`;
+  }
+
   async function updateUserData(
     student: Users,
     event: Event,
@@ -158,7 +173,7 @@
               size="sm"
             />
           {:else}
-            {progress.user.apprenticeshipRncp ?? "--"}
+            {displayCorrectRncpName(progress.user.apprenticeshipRncp)}
           {/if}
         </TableBodyCell>