Merge branch 'scv-399'

bcgov · Jul 24, 2023 · 1a2dacf · 1a2dacf
2 parents 8672586 + 1cd7212
commit 1a2dacf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/web/src/components/civil/CivilCaseDetails.vue b/web/src/components/civil/CivilCaseDetails.vue
@@ -500,7 +500,11 @@ export default class CivilCaseDetails extends Vue {
         }
         docInfo.documentId = jDoc.civilDocumentId;
         docInfo.pdfAvail = jDoc.imageId ? true : false;
-        docInfo.dateFiled = jDoc.filedDt ? jDoc.filedDt.split(" ")[0] : "";
+        if (docInfo.documentType.toUpperCase() == "ORDER") {
+          docInfo.dateFiled = jDoc.DateGranted ? jDoc.DateGranted.split(" ")[0] : "";
+        } else {
+          docInfo.dateFiled = jDoc.filedDt ? jDoc.filedDt.split(" ")[0] : "";
+        }
         docInfo.issues = [];
         if (jDoc.issue && jDoc.issue.length > 0) {
           for (const issue of jDoc.issue) {

diff --git a/web/src/components/civil/CivilDocumentsView.vue b/web/src/components/civil/CivilDocumentsView.vue
@@ -305,7 +305,13 @@ export default class CivilDocumentsView extends Vue {
         tdClass: "border-top",
         thClass: "",
       },
-      { key: "seq", label: "Seq.", sortable: true, headerStyle: "text-primary", cellStyle: "font-size: 14px;" },
+      {
+        key: "seq",
+        label: "Seq.",
+        sortable: true,
+        headerStyle: "text-primary",
+        cellStyle: "font-size: 14px;"
+      },
       {
         key: "documentType",
         label: "Document Type",
@@ -726,9 +732,12 @@ export default class CivilDocumentsView extends Vue {
     if (this.activetab == "COURT SUMMARY") {
       this.sortDesc = true;
       return "appearanceDate";
-    } else {
+    } else if (this.activetab == "ORDERS") {
       this.sortDesc = false;
       return "seq";
+    } else {
+      this.sortDesc = true;
+      return "dateFiled"
     }
   }