Merge branch 'basic-task-sorting' into task-sorting

Author: sookwalinga

config/default/app_settings.json

@@ -304,6 +304,15 @@ module.exports = [
       const endTime = addDays(dueDate, event.end).getTime();
       return isFormArraySubmittedInWindow(contact.reports, ['pnc_danger_sign_follow_up_baby'], startTime, endTime);
     },
+    priority: function(contact, report, event, dueDate) {
+      console.warn(contact);
+      console.warn(event);
+      console.warn(dueDate);
+      return {
+        level: 10,
+        label: 'High',
+      };
+    },
     actions: [
       {
         type: 'report',
@@ -342,6 +351,15 @@ module.exports = [
       const endTime = addDays(dueDate, event.end + 1).getTime();
       return isFormArraySubmittedInWindow(contact.reports, ['pnc_danger_sign_follow_up_baby'], startTime, endTime);
     },
+    priority: function(contact, report, event, dueDate) {
+      console.warn(contact);
+      console.warn(event);
+      console.warn(dueDate);
+      return {
+        level: 10,
+        label: 'High',
+      };
+    },
     actions: [
       {
         type: 'report',

config/default/tasks.js

@@ -14,10 +14,22 @@ const initialState = {
   },
 };
 
-
 const orderByDueDateAndPriority1 = (t1, t2) => {
+
   const lhs = t1?.dueDate;
   const rhs = t2?.dueDate;
+
+  const lhsPriority = t1?.priority;
+  const rhsPriority = t2?.priority;
+
+  if ((lhsPriority && !rhsPriority) || lhsPriority > rhsPriority) {
+    return -1;
+  }
+
+  if ((!lhsPriority && rhsPriority) || lhsPriority < rhsPriority) {
+    return 1;
+  }
+
   if (!lhs && !rhs) {
     return 0;
   }