Merge pull request #99 from bcgov/extractfixes

Extractfixes
bcgov · Nov 16, 2023 · 1d21d2d · 1d21d2d
2 parents 454c277 + 0c39543
commit 1d21d2d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/backend/src/routes/district-router.js b/backend/src/routes/district-router.js
@@ -244,6 +244,13 @@ async function getDistrict(req, res) {
           valueType: "STRING",
           condition: "AND",
         },    
+        {
+          key: "facilityTypeCode",
+          operation: "neq",
+          value: "SUMMER",
+          valueType: "STRING",
+          condition: "AND",
+        },            
       ],
     },
   ];

diff --git a/backend/src/routes/institute-router.js b/backend/src/routes/institute-router.js
@@ -188,7 +188,9 @@ async function getDistrictList(req, res) {
       .get(url, { headers: { Authorization: `Bearer ${req.accessToken}` } })
       .then((response) => {
         //const districtList = response.data;
-        const districtList = createList(response.data, districtListOptions);
+        const filteredDistrictList = response.data.filter(district => !["YUKON", "OFFSHORE", "PSI"].includes(district.districtRegionCode));
+        const districtList = createList(filteredDistrictList, districtListOptions);
+
         listCache.set("districtlist", districtList);
         res.json(districtList);
         log.info(req.url);

diff --git a/frontend/src/views/DistrictView.vue b/frontend/src/views/DistrictView.vue
@@ -320,11 +320,16 @@ onMounted(async () => {
               </template>
 
               <template v-slot:item.phoneNumber="{ item }">
-                {{ formatPhoneNumber(item.phoneNumber) }}
+                <div style="min-width: 125px">
+                  <!-- Adjust the min-width value as needed -->
+                  {{ formatPhoneNumber(item.phoneNumber) }}
+                </div>
               </template>
 
               <template v-slot:item.faxNumber="{ item }">
-                {{ formatPhoneNumber(item.faxNumber) }}
+                <div style="min-width: 125px">
+                  {{ formatPhoneNumber(item.faxNumber) }}
+                </div>
               </template>
             </v-data-table>
           </v-window-item>