Merge branch 'master' into fix/EDX-1892

bcgov · Oct 18, 2023 · dc066ef · dc066ef
2 parents 6602fdf + 7e72993
commit dc066ef
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 30 deletions.
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -193,4 +193,7 @@ export default {
     background-color: rgba(0,0,0,.12)!important;
   }
 
+  .viewer-open {
+    padding-right: 0 !important;
+  }
 </style>
diff --git a/frontend/src/components/secure-message/AccessDistrictUsersPage.vue b/frontend/src/components/secure-message/AccessDistrictUsersPage.vue
@@ -76,7 +76,6 @@
             id="generateNewPrimaryEdxActivationCodeDialog"
             :class="['d-sm-flex', 'align-center', 'searchBox']"
             class="px-2 mb-4"
-            style="margin-right: 14em;margin-left: 14em;"
           >
             <v-col>
               <v-row no-gutters>
@@ -184,8 +183,9 @@
           <v-col
             v-for="user in filteredUsers"
             :key="user.digitalID"
-            xl="4"
-            cols="6"
+            lg="4"
+            sm="6"
+            cols="12"
             class="pb-0"
           >
             <AccessUserCard
@@ -199,8 +199,9 @@
             />
           </v-col>
           <v-col
-            xl="4"
-            cols="6"
+            lg="4"
+            sm="6"
+            cols="12"
             class="pb-0"
           >
             <v-row style="height: 100%;">
@@ -536,9 +537,4 @@ export default {
     min-height: 150px;
 }
 
-.containerSetup {
-    padding-right: 10em !important;
-    padding-left: 10em !important;
-}
-
 </style>
diff --git a/frontend/src/components/secure-message/AccessSchoolUsersPage.vue b/frontend/src/components/secure-message/AccessSchoolUsersPage.vue
@@ -58,7 +58,6 @@
         id="generateNewPrimaryEdxActivationCodeDialog"
         :class="['d-sm-flex', 'align-center', 'searchBox']"
         class="px-2 mb-4"
-        style="margin-right: 14em;margin-left: 14em;"
       >
         <v-col>
           <v-row no-gutters>
@@ -166,8 +165,9 @@
       <v-col
         v-for="user in filteredUsers"
         :key="user.digitalID"
-        xl="4"
-        cols="6"
+        lg="4"
+        sm="6"
+        cols="12"
         class="pb-0"
       >
         <AccessUserCard
@@ -181,8 +181,9 @@
         />
       </v-col>
       <v-col
-        xl="4"
-        cols="6"
+        lg="4"
+        sm="6"
+        cols="12"
         class="pb-0"
       >
         <v-row style="height: 100%;">
@@ -501,9 +502,5 @@ export default {
   }
 }
 
-.containerSetup{
-  padding-right: 10em !important;
-  padding-left: 10em !important;
-}
 
 </style>
diff --git a/frontend/src/components/secure-message/ExchangePage.vue b/frontend/src/components/secure-message/ExchangePage.vue
@@ -211,11 +211,15 @@
                     item-title="label"
                     variant="underlined"
                     item-value="secureExchangeStatusCode"
-                    prepend-inner-icon="mdi-circle-medium"
                     class="pt-0 mt-0"
                     :menu-props="{closeOnContentClick:true}"
                     label="Status"
                   >
+                    <template #prepend-inner>
+                      <v-icon :color="getStatusColor(statusSelectFilter ? statusSelectFilter : '')">
+                        mdi-circle-medium
+                      </v-icon>
+                    </template>
                     <template #selection="{ item, index }">
                       {{
                         item.raw.label
@@ -760,9 +764,9 @@ export default {
 
     },
     getStatusColor(status) {
-      if (status === 'Open') {
+      if (status?.toLowerCase() === 'open') {
         return 'green';
-      } else if (status === 'Closed') {
+      } else if (status?.toLowerCase() === 'closed') {
         return 'red';
       }
     },

diff --git a/frontend/src/components/secure-message/InstituteAccessPage.vue b/frontend/src/components/secure-message/InstituteAccessPage.vue
@@ -119,11 +119,3 @@ export default {
   }
 };
 </script>
-
-<style scoped>
-.containerSetup{
-  padding-right: 20em !important;
-  padding-left: 20em !important;
-}
-
-</style>