Develop (#102)

* fix closing cause in list SU * Update package.json
InseeFr · Feb 13, 2024 · 7b040de · 7b040de
1 parent a20b623
commit 7b040de
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sonor",
-  "version": "0.5.32",
+  "version": "0.5.33",
   "private": true,
   "dependencies": {
     "@testing-library/jest-dom": "^4.2.4",

diff --git a/src/components/ListSU/SurveyUnitLine.jsx b/src/components/ListSU/SurveyUnitLine.jsx
@@ -17,6 +17,7 @@ function SurveyUnitLine({
     state,
     remindersByOrder = [],
     contactOutcome,
+    closingCause,
   } = lineData;
 
   const getReminderDescription = (reminder) => {
@@ -115,7 +116,7 @@ function SurveyUnitLine({
           </td>
         </>
       )}
-      <td className="ColState">{state ? D[state] : ""}</td>
+      <td className="ColState">{closingCause ? D[closingCause] : ""}</td>
     </tr>
   );
 }

diff --git a/src/utils/Utils.js b/src/utils/Utils.js
@@ -186,8 +186,7 @@ class Utils {
       'survey',
       'site',
       'date',
-      'finalizationDate',
-      'state',
+      'finalizationDate',      
     ];
     if (labelsSimpleSort.includes(sortOn)) {
       return (a, b) => {
@@ -200,6 +199,21 @@ class Utils {
         return mainSort ? mainSortFunc(a, b) : 0;
       };
     }
+    if (sortOn === 'state') {
+      return (a, b) => {
+        const aState = a.closingCause ? D[a.closingCause] : undefined;
+        const bState = b.closingCause ? D[b.closingCause] : undefined;
+
+        if(!aState || !bState){
+          return aState ? -1 * mult : 1 * mult;
+        }
+        if (aState !== bState) {
+          return (aState < bState ? -1 : 1) * mult;
+        }
+        return mainSort ? mainSortFunc(a, b) : 0;
+      };
+    }
+
     if (sortOn === 'CPinterviewer') {
       return (a, b) => {
         const aString = a.interviewerLastName + a.interviewerFirstName;