fix (admin): show minutes for reservation duration

Author: joonatank

apps/admin-ui/src/component/reservations/requested/util.test.ts

@@ -124,7 +124,9 @@ describe("createTag", () => {
 
     const mockT = ((x: string) => x) as TFunction;
     const tag = createTagString(res, mockT);
-    expect(tag).toContain("dayShort.0, dayShort.1, dayShort.3 12:00-14:00, 2t");
+    expect(tag).toContain(
+      "dayShort.0, dayShort.1, dayShort.3 12:00-14:00, common.hoursUnit"
+    );
     expect(tag).toContain("1.4.2023-1.7.2023");
     expect(tag).toContain("Foobar");
   });
@@ -145,7 +147,7 @@ describe("createTag", () => {
     const tag = createTagString(res, mockT);
     expect(tag).not.toContain("dayShort.0, dayShort.1, dayShort.3");
     expect(tag).toContain("1.4.2023");
-    expect(tag).toContain("12:00-14:00, 2t");
+    expect(tag).toContain("12:00-14:00, common.hoursUnit");
     expect(tag).toContain("dayShort.5");
     expect(tag).toContain("Foobar");
   });

apps/admin-ui/src/component/reservations/requested/util.ts

@@ -63,11 +63,19 @@ export const reservationDuration = (start: Date, end: Date): string => {
   return `${differenceInHours(end, start)}`;
 };
 
-const reservationDurationString = (start: string, end: string): string => {
+const reservationDurationString = (
+  start: string,
+  end: string,
+  t: TFunction
+): string => {
   const startDate = new Date(start);
   const endDate = new Date(end);
 
-  return `${differenceInHours(endDate, startDate)}`;
+  const h = differenceInHours(endDate, startDate);
+  const m = differenceInMinutes(endDate, startDate) - h * 60;
+  return `${t("common.hoursUnit", { count: h })} ${
+    m !== 0 ? t("common.minutesUnit", { count: m }) : ""
+  }`;
 };
 
 export const reservationUnitName = (
@@ -255,12 +263,13 @@ export const createTagString = (reservation: ReservationType, t: TFunction) => {
 
   const durationTag = `${reservationDurationString(
     reservation.begin,
-    reservation.end
+    reservation.end,
+    t
   )}`;
 
   const reservationTagline = `${
     reservation.recurringReservation ? recurringDateTag : singleDateTimeTag
-  }, ${durationTag}t ${
+  }, ${durationTag} ${
     recurringTag.length > 0 ? " | " : ""
   } ${recurringTag} | ${unitTag}`;
 

apps/admin-ui/src/i18n/messages.ts

@@ -128,7 +128,7 @@ const translations: ITranslations = {
     volumeUnit: [" kpl", " ", " "],
     personUnit_one: ["{{count}} henkilö"],
     personUnit_other: ["{{count}} henkeä"],
-    hoursUnit: ["{{count}} h"],
+    hoursUnit: ["{{count}} t"],
     hoursUnitLong_one: ["{{count}} tunti"],
     hoursUnitLong_other: ["{{count}} tuntia"],
     minutesUnit: ["{{count}} min"],