Merge pull request #1496 from bcgov/feature/vue3

Vue3 for GMP/UMP
bcgov · Jul 11, 2023 · f79bc0d · f79bc0d
2 parents 602b1c1 + 6f1c9a1
commit f79bc0d
Show file tree

Hide file tree

Showing 21 changed files with 597 additions and 388 deletions.
diff --git a/backend/src/components/requests.js b/backend/src/components/requests.js
@@ -23,18 +23,13 @@ function getAllRequests(requestType) {
     const statusFilters = req.query.statusFilters;
 
     if (req.query.headerFilters) {
-      let headerFilters = JSON.parse(req.query.headerFilters);
+      let headerFilters = req.query.headerFilters;
       Object.keys(headerFilters).forEach(element => {
         let operation = 'like_ignore_case';
         let valueType = 'STRING';
         if (element === 'initialSubmitDate') {
-          headerFilters[element].forEach((date, index) => {
-            headerFilters[element][index] = date + 'T00:00:01';
-          });
-          if (headerFilters[element].length === 1) {
-            headerFilters[element].push(LocalDateTime.now().toString());
-          }
-          headerFilters[element] = headerFilters[element].join(',');
+          const submissionDate = headerFilters['initialSubmitDate'] + 'T00:00:01';
+          headerFilters[element] = submissionDate + ',' + LocalDateTime.now().toString();
           operation = 'btn';
           valueType = 'DATE_TIME';
         }
@@ -132,7 +127,7 @@ function getRequestCommentById(requestType) {
           name: (element.staffMemberName ? element.staffMemberName : 'Student'),
           timestamp: readableTime,
           color: (element.staffMemberIDIRGUID ? 'adminGreen' : 'studentBlue'),
-          icon: (element.staffMemberIDIRGUID ? '$question' : '$info')
+          icon: (element.staffMemberIDIRGUID ? 'mdi-help-circle' : 'mdi-alert-circle')
         });
       });
       return res.status(200).json(response);

diff --git a/backend/tests/unit/components/penRequests.spec.js b/backend/tests/unit/components/penRequests.spec.js
@@ -128,15 +128,15 @@ describe('getPenRequestCommentById', () => {
         'participantId': '11',
         'name': 'IDIR',
         'color': 'adminGreen',
-        'icon': '$question',
+        'icon': 'mdi-help-circle',
         'timestamp': '2020-03-18 2:22pm'
       },
       {
         'content': 'Sending a student comment\n',
         'participantId': '1',
         'name': 'Student',
         'color': 'studentBlue',
-        'icon': '$info',
+        'icon': 'mdi-alert-circle',
         'timestamp': '2020-04-18 2:22pm'
       }
     ]

diff --git a/frontend/src/components/Chat.vue b/frontend/src/components/Chat.vue
@@ -162,6 +162,10 @@ export default {
     background-color: #555;
   }
 
+  .white--text{
+    color: white;
+  }
+
   .v-toolbar /deep/ .v-toolbar__content {
     padding-left: 20px !important;
   }