seperate and resorting the date by upcoming, today date and overdue

Author: lucas

packages/drafts-realm/SaleHub/bcbf2e7d-16ad-41e0-95a4-03dc988809e5.json

@@ -104,7 +104,44 @@
         "percentage": null,
         "forecastCategory": null
       },
-      "scheduledTask": [],
+      "scheduledTask": [
+        {
+          "taskForm": {
+            "taskId": "0",
+            "subject": "1",
+            "dueDate": "2024-06-29",
+            "comments": null,
+            "isCompleted": false
+          }
+        },
+        {
+          "taskForm": {
+            "taskId": "1",
+            "subject": "task b",
+            "dueDate": "2024-06-27",
+            "comments": null,
+            "isCompleted": false
+          }
+        },
+        {
+          "taskForm": {
+            "taskId": "2",
+            "subject": "task ccc",
+            "dueDate": "2024-06-30",
+            "comments": null,
+            "isCompleted": false
+          }
+        },
+        {
+          "taskForm": {
+            "taskId": "3",
+            "subject": "task xx",
+            "dueDate": "2024-07-03",
+            "comments": null,
+            "isCompleted": false
+          }
+        }
+      ],
       "title": null,
       "description": null,
       "thumbnailURL": null
@@ -129,6 +166,26 @@
         "links": {
           "self": null
         }
+      },
+      "scheduledTask.0.taskForm.relatedTo": {
+        "links": {
+          "self": "http://localhost:4201/drafts/CardDef/7298c9c6-2964-41a0-87f7-42127a16e12b"
+        }
+      },
+      "scheduledTask.1.taskForm.relatedTo": {
+        "links": {
+          "self": "http://localhost:4201/drafts/CrmAccount/4802eeed-bec6-4d7a-8f05-6370866edd40"
+        }
+      },
+      "scheduledTask.2.taskForm.relatedTo": {
+        "links": {
+          "self": null
+        }
+      },
+      "scheduledTask.3.taskForm.relatedTo": {
+        "links": {
+          "self": "http://localhost:4201/drafts/CardDef/992531db-9912-49eb-9b72-f710cbcdb085"
+        }
       }
     },
     "meta": {

packages/drafts-realm/sale-hub.gts

@@ -969,8 +969,8 @@ class IsolatedSecForSaleHub extends Component<typeof SaleHub> {
       }, {});
 
     const sortedMonths = Object.keys(groupedTasks).sort((a, b) => {
-      if (a === 'Upcoming & Overdue') return -1;
-      if (b === 'Upcoming & Overdue') return 1;
+      if (a === 'Upcoming') return -1;
+      if (b === 'Overdue') return 1;
       return new Date(a).getTime() - new Date(b).getTime();
     });
 
@@ -990,15 +990,18 @@ class IsolatedSecForSaleHub extends Component<typeof SaleHub> {
 
   @action formatDueDate(date: Date) {
     const todayDate = new Date();
-    if (date > todayDate || isToday(date))
-      return formatDate(new Date(date), 'MMMM yyyy');
-    return 'Upcoming & Overdue';
+
+    if (isToday(date)) return formatDate(new Date(date), 'MMMM yyyy');
+    if (date > todayDate) return 'Upcoming';
+    return 'Overdue';
   }
 
   @action formatDay(date: Date) {
     const todayDate = new Date();
     if (isToday(date)) return 'Today';
     if (isTomorrow(date)) return 'Tomorrow';
+    if (date > todayDate || isTomorrow(date))
+      return formatDate(new Date(date), 'dd/MM/yyyy');
     if (date < todayDate) return null;
     if (isThisMonth(date)) return 'This Month';
     return null;