Merge pull request #735 from bcgov/feature/942-updated-date-not-shown

Feature/942 updated date not shown
bcgov · Sep 27, 2023 · 1eee790 · 1eee790
2 parents 1c65a39 + d0d0ff8
commit 1eee790
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cccm-frontend/src/components/RNAList.vue b/cccm-frontend/src/components/RNAList.vue
@@ -313,7 +313,7 @@ export default {
         { text: 'RNA Form', align: 'start', sortable: true, value: 'module' },
         { text: 'Assessment Status', sortable: true, value: 'assessmentStatusDisplay' },
         { text: 'Status', sortable: true, value: 'status' },
-        { text: 'Updated Date', sortable: true, value: 'updatedDateDisplay' },
+        { text: 'Updated Date', sortable: true, value: 'osuUpdateDate' },
         { text: 'Created Location', sortable: true, value: 'location' },
         { text: 'Created By', sortable: true, value: 'createdBy' },
         { text: 'Supervision Level', sortable: true, value: 'supervisionRating' },
@@ -616,7 +616,7 @@ export default {
             if (el.complete) {
               el.status = this.$FORM_STATUS_COMPLETE;
             }
-            el.updatedDateDisplay = (el.osuUpdateDate) ? el.osuUpdateDate : (el.completedDate) ? el.completedDate : el.createdDate;
+            //el.updatedDateDisplay = (el.osuUpdateDate) ? el.osuUpdateDate : (el.completedDate) ? el.completedDate : el.createdDate;
             el.assessmentStatusDisplay = this.getAssessmentStatus(el.reassessment, el.module);
             
             // CRNA or SARA form, there should be only CRNA or SARA rating returned

diff --git a/cccm-frontend/src/components/common/templateFormInfo.json b/cccm-frontend/src/components/common/templateFormInfo.json
@@ -72,7 +72,7 @@
                                                             "value": ""
                                                         }
                                                     ],
-                                                    "content": "<div class='mb-3 mt-3'><Strong>Updated Date: </Strong>{{data.updatedDate}}</div><div><Strong>Office Location: </Strong>{{data.location}}</div>",
+                                                    "content": "<div class='mb-3 mt-3'><Strong>Updated Date: </Strong>{{data.osuUpdateDate}}</div><div><Strong>Office Location: </Strong>{{data.location}}</div>",
                                                     "refreshOnChange": true,
                                                     "key": "html1",
                                                     "type": "htmlelement",