Added local number format FR

dataforgoodfr · Dec 10, 2024 · b4dfb2d · b4dfb2d
1 parent dd4d5cd
commit b4dfb2d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/frontend/app/details/amp/[id]/page.tsx b/frontend/app/details/amp/[id]/page.tsx
@@ -2,11 +2,10 @@
 
 import { useMemo, useState } from "react"
 import { getZoneDetails } from "@/services/backend-rest-client"
-import { swrOptions } from "@/services/swr"
 import { getCountryNameFromIso3 } from "@/utils/vessel.utils"
 import useSWR from "swr"
 
-import { convertDurationInHours, getDateRange } from "@/libs/dateUtils"
+import { convertDurationInHoursStr, getDateRange } from "@/libs/dateUtils"
 import DetailsContainer from "@/components/details/details-container"
 
 export default function AmpDetailsPage({ params }: { params: { id: string } }) {
@@ -42,7 +41,7 @@ export default function AmpDetailsPage({ params }: { params: { id: string } }) {
           id: vessel.id.toString(),
           title: `${vessel.ship_name} - ${getCountryNameFromIso3(vessel.country_iso3)}`,
           description: `IMO: ${vessel.imo} - MMSI: ${vessel.mmsi} - Type: ${vessel.type} - Length: ${vessel.length} m`,
-          value: `${convertDurationInHours(zone_visiting_time_by_vessel)}h`,
+          value: `${convertDurationInHoursStr(zone_visiting_time_by_vessel)}h`,
           type: "vessels",
         }
       }),

diff --git a/frontend/app/details/vessel/[id]/page.tsx b/frontend/app/details/vessel/[id]/page.tsx
@@ -1,14 +1,11 @@
 "use client"
 
 import { useMemo, useState } from "react"
-import {
-  getTimeByZone,
-  getTopZonesVisited,
-} from "@/services/backend-rest-client"
+import { getTimeByZone } from "@/services/backend-rest-client"
 import { getCountryNameFromIso3 } from "@/utils/vessel.utils"
 import useSWR from "swr"
 
-import { convertDurationInHours, getDateRange } from "@/libs/dateUtils"
+import { convertDurationInHoursStr, getDateRange } from "@/libs/dateUtils"
 import DetailsContainer from "@/components/details/details-container"
 
 export default function VesselDetailsPage({
@@ -51,7 +48,7 @@ export default function VesselDetailsPage({
           id: zone.id.toString(),
           title: zone.name,
           description: zone.sub_category,
-          value: `${convertDurationInHours(vessel_visiting_time_by_zone)}h`,
+          value: `${convertDurationInHoursStr(vessel_visiting_time_by_zone)}h`,
           type: "zones",
         }
       }),

diff --git a/frontend/libs/dateUtils.ts b/frontend/libs/dateUtils.ts
@@ -26,10 +26,14 @@ export function convertDurationInSeconds(durationPattern: string): number {
   return Math.floor(totalSeconds)
 }
 
-export function convertDurationInHours(durationPattern: string): number {
+function convertDurationInHours(durationPattern: string): number {
   return Math.round(convertDurationInSeconds(durationPattern) / 3600)
 }
 
+export function convertDurationInHoursStr(durationPattern: string): string {
+  return convertDurationInHours(durationPattern).toLocaleString("fr-FR")
+}
+
 export function getDateRange(days: number) {
   const today = new Date()
   const start = new Date(today)

diff --git a/frontend/libs/mapper.tsx b/frontend/libs/mapper.tsx
@@ -1,7 +1,7 @@
 import { Item } from "@/types/item"
 import { VesselMetrics } from "@/types/vessel"
 import { ZoneMetrics } from "@/types/zone"
-import { convertDurationInHours } from "@/libs/dateUtils"
+import { convertDurationInHoursStr } from "@/libs/dateUtils"
 
 export function convertVesselDtoToItem(metrics: VesselMetrics[]): Item[] {
   return metrics
@@ -11,7 +11,7 @@ export function convertVesselDtoToItem(metrics: VesselMetrics[]): Item[] {
         id: `${vessel.id}`,
         title: vessel.ship_name,
         description: `IMO ${vessel.imo} / MMSI ${vessel.mmsi} / ${vessel.length} m`,
-        value: `${convertDurationInHours(vesselMetrics.total_time_at_sea)}h`,
+        value: `${convertDurationInHoursStr(vesselMetrics.total_time_at_sea)}h`,
         type: "vessel",
         countryIso3: vessel.country_iso3,
       }
@@ -28,7 +28,7 @@ export function convertZoneDtoToItem(zoneMetrics: ZoneMetrics[]): Item[] {
       id: `${zone.id}`,
       title: zone.name,
       description: zone.sub_category,
-      value: `${convertDurationInHours(visiting_duration)}h`,
+      value: `${convertDurationInHoursStr(visiting_duration)}h`,
       type: "amp",
     }
   })