Add sort by type

1 files changed, 16 insertions, 5 deletions

diff --git a/ufund-ui/src/app/components/cupboard/sorting.ts b/ufund-ui/src/app/components/cupboard/sorting.ts
index 73a5ba9..5c37019 100644
--- a/ufund-ui/src/app/components/cupboard/sorting.ts
+++ b/ufund-ui/src/app/components/cupboard/sorting.ts
@@ -49,10 +49,21 @@ const sortByLocation: sortAlgo = (a: Need, b: Need): number => {
     return 1;
 }
 
+const sortByType: sortAlgo = (a:Need, b:Need): number => {
+    if(a.type == b.type) {
+        return sortByName(a,b);
+    }
+    else if(a.type > b.type) {
+        return -1;
+    }
+    return 1;
+}
+
 export const SortingAlgoArrays: {[key: string]: { func: sortAlgo, display: [string, string]}} = {
-    sortByPriority:   { func: sortByPriority,   display: ["Highest Priority",     "Lowest Priority"       ] },
-    sortByName:       { func: sortByName,       display: ["Name (A to Z)",        "Name (Z to A)"         ] },
-    sortByLocation:   { func: sortByLocation,   display: ["Location (A to Z)",    "Location (Z to A)"     ] },
-    sortByCompletion: { func: sortByCompletion, display: ["Most Completed",       "Least Completed"       ] },
-    sortByGoal:       { func: sortByGoal,       display: ["Largest Maximum Goal", "Smallest Maximum Goal" ] },
+    sortByPriority:   { func: sortByPriority,   display: ["Highest Priority",      "Lowest Priority"       ] },
+    sortByName:       { func: sortByName,       display: ["Name (A to Z)",         "Name (Z to A)"         ] },
+    sortByLocation:   { func: sortByLocation,   display: ["Location (A to Z)",     "Location (Z to A)"     ] },
+    sortByCompletion: { func: sortByCompletion, display: ["Most Completed",        "Least Completed"       ] },
+    sortByGoal:       { func: sortByGoal,       display: ["Largest Maximum Goal",  "Smallest Maximum Goal" ] },
+    sortByType:       { func: sortByType,       display: ["Type (Physical first)", "Type (Monetary first)" ] },
 };