wip

Author: jamiebrynes7

plugin/src/data/dueDate.test.ts

@@ -1,4 +1,5 @@
 import type { DueDate as ApiDueDate } from "@/api/domain/dueDate";
+import type { Duration as ApiDuration } from "@/api/domain/task";
 import { DueDate } from "@/data/dueDate";
 import { CalendarDate, ZonedDateTime } from "@internationalized/date";
 import { describe, expect, it, vi } from "vitest";
@@ -336,6 +337,28 @@ describe("parse", () => {
   }
 });
 
+describe("parse with duration", () => {
+  type Testcase = {
+    description: string;
+    input: {
+      due: ApiDueDate;
+      duration: ApiDuration;
+    };
+    expected: DueDate;
+  };
+
+  // TODO: add test cases
+  const testcases: Testcase[] = [];
+
+  for (const tc of testcases) {
+    it(tc.description, () => {
+      const output = DueDate.parse(tc.input.due, tc.input.duration);
+      expect(output).toStrictEqual(tc.expected);
+    });
+  }
+});
+
+// TODO: add test cases for dates with end.
 describe("format", () => {
   type Testcase = {
     description: string;

plugin/src/data/dueDate.ts

@@ -130,19 +130,24 @@ const getFormatter: (style: string) => Intl.DateTimeFormat = (() => {
 const formatDueDate = (due: DueDate): string => {
   const date = formatDate(due.start);
 
-  if (due.start.hasTime) {
-    const i18n = t().dates;
-    const time = getFormatter("time").format(due.start.raw);
+  if (!due.start.hasTime) {
+    return date;
+  }
 
-    if (due.end !== undefined) {
-      const endTime = getFormatter("time").format(due.end.raw);
-      return i18n.dateTimeDuration(date, time, endTime);
-    }
+  const i18n = t().dates;
+  const time = getFormatter("time").format(due.start.raw);
 
+  if (due.end === undefined) {
     return i18n.dateTime(date, time);
   }
 
-  return date;
+  const endTime = getFormatter("time").format(due.end.raw);
+  if (isSameDay(due.start.raw, due.end.raw)) {
+    return i18n.dateTimeDuration(date, time, endTime);
+  }
+
+  const endDate = formatDate(due.end);
+  return i18n.dateTimeDurationDifferentDays(date, time, endDate, endTime);
 };
 
 const formatDate = (info: DateInfo): string => {
@@ -193,3 +198,11 @@ export const DueDate = {
   format: formatDueDate,
   formatHeader: formatDueDateHeader,
 };
+
+function isSameDay(a: Date, b: Date): boolean {
+  return (
+    a.getFullYear() === b.getFullYear() &&
+    a.getMonth() === b.getMonth() &&
+    a.getDate() === b.getDate()
+  );
+}

plugin/src/i18n/langs/en.ts

@@ -212,7 +212,15 @@ export const en: Translations = {
       return `${date} at ${time}`;
     },
     dateTimeDuration: (date: string, startTime: string, endTime: string) => {
-      return `${date} at ${startTime}-${endTime}`;
+      return `${date} at ${startTime} - ${endTime}`;
+    },
+    dateTimeDurationDifferentDays: (
+      startDate: string,
+      startTime: string,
+      endDate: string,
+      endTime: string,
+    ): string => {
+      return `${startDate} at ${startTime} - ${endDate} at ${endTime}`;
     },
   },
 };

plugin/src/i18n/translation.ts

@@ -193,5 +193,11 @@ export type Translations = {
     lastWeekday: (weekday: string) => string;
     dateTime: (date: string, time: string) => string;
     dateTimeDuration: (date: string, startTime: string, endTime: string) => string;
+    dateTimeDurationDifferentDays: (
+      startDate: string,
+      startTime: string,
+      endDate: string,
+      endTime: string,
+    ) => string;
   };
 };