Merge pull request #128 from bcgov/scdicontact

extract fixes
bcgov · Nov 24, 2023 · 70e064a · 70e064a
2 parents 1cd9890 + c40b7f4
commit 70e064a
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 65 deletions.
diff --git a/frontend/src/views/AuthorityView.vue b/frontend/src/views/AuthorityView.vue
@@ -75,26 +75,28 @@ function downloadAuthoritySchools() {
 }
 const transformContactForDownload = (inputData: any): {} => {
   return inputData.map((item: any) => ({
-    authorityNumber: item.authorityNumber,
-    displayName: item.displayName,
-    authorityContactTypeCode: item.authorityContactTypeCode,
-    firstName: item.firstName,
-    lastName: item.lastName,
-    email: item.email,
-    phoneNumber: item.phoneNumber,
-    phoneExtension: item.phoneExtension,
-    alternatePhoneNumber: item.alternatePhoneNumber,
-    alternatePhoneExtension: item.alternatePhoneExtension,
-    mailingAddress: item.mailingAddress,
-    mailingAddressCity: item.mailingAddressCity,
-    mailingAddressLine2: item.mailingAddressLine2,
-    mailingAddressPostalCode: item.mailingAddressPostalCode,
-    mailingAddressProvince: item.mailingAddressProvince,
-    physicalAddress: item.physicalAddress,
-    physicalAddressCity: item.physicalAddressCity,
-    physicalAddressLine2: item.physicalAddressLine2,
-    physicalAddressPostalCode: item.physicalAddressPostalCode,
-    physicalAddressProvince: item.physicalAddressProvince
+    'Authority Number': item.authorityNumber,
+    'Display Name': item.displayName,
+    'Authority Contact Type': appStore.getAuthorityContactTypeCodeLabel(
+      item.authorityContactTypeCode
+    ),
+    'First Name': item.firstName,
+    'Last Name': item.lastName,
+    Email: item.email,
+    'Phone Number': item.phoneNumber,
+    'Phone Extension': item.phoneExtension,
+    'Alternate Phone Number': item.alternatePhoneNumber,
+    'Alternate Phone Extension': item.alternatePhoneExtension,
+    'Mailing Address': item.mailingAddress,
+    'Mailing Address City': item.mailingAddressCity,
+    'Mailing Address Line2': item.mailingAddressLine2,
+    'Mailing Address Postal Code': item.mailingAddressPostalCode,
+    'Mailing Address Province': item.mailingAddressProvince,
+    'Physical Address': item.physicalAddress,
+    'Physical Address City': item.physicalAddressCity,
+    'Physical Address Line2': item.physicalAddressLine2,
+    'Physical Address Postal Code': item.physicalAddressPostalCode,
+    'Physical Address Province': item.physicalAddressProvince
   }))
 }
 onMounted(async () => {
@@ -134,32 +136,30 @@ onMounted(async () => {
 
     filteredSchools.value = transformedSchoolData.map((item: any) => {
       return {
-        authorityNumber: authority.value?.authorityData?.authorityNumber,
-        displayName: item.displayName,
-        mincode: item.mincode,
-        facilityTypeCode: item.facilityTypeCode,
-        contactJobTitle: item.contacts?.jobTitle,
-        contactFirstName: item.contacts?.firstName,
-        contactLastName: item.contacts?.lastName,
-        contactPhoneExtension: item.contacts?.phoneExtension,
-        contactPhoneNumber: item.contacts?.phoneNumber,
-        schoolEmail: item.email,
-        mailingAddress: item.mailingAddress?.addressLine1,
-        mailingAddressLine2: item.mailingAddress?.addressLine2,
-        mailingAddressCity: item.mailingAddress?.city,
-        mailingAddressProvince: item.mailingAddress?.provinceCode,
-        mailingAddressPostalCode: item.mailingAddress?.postal,
-        physicalAddress: item.physicalAddress?.addressLine1,
-        physicalAddressLine2: item.physicalAddress?.addressLine2,
-        physicalAddressCity: item.physicalAddress?.city,
-        physicalAddressProvince: item.physicalAddress?.provinceCode,
-        physicalAddressPostalCode: item.physicalAddress?.postal,
-        districtPhoneNumber: item.phoneNumber,
-        districtFax: item.faxNumber,
-        districtWebsite: item.website,
-        schoolCategoryCode: item.schoolCategoryCode,
-        schoolOrganizationCode: item.schoolOrganizationCode,
-        schoolReportingRequirementCode: item.schoolReportingRequirementCode
+        'Authority Number': authority.value?.authorityData?.authorityNumber,
+        Mincode: item.mincode,
+        'Display Name': item.displayName,
+        'Contact Job Title': item.contacts?.jobTitle,
+        'Contact First Name': item.contacts?.firstName,
+        'Contact Last Name': item.contacts?.lastName,
+        'Contact Phone Number': item.contacts?.phoneNumber,
+        'Contact Phone Extension': item.contacts?.phoneExtension,
+        'School Email': item.email,
+        'Mailing Address': item.mailingAddress?.addressLine1,
+        'Mailing Address Line2': item.mailingAddress?.addressLine2,
+        'Mailing Address City': item.mailingAddress?.city,
+        'Mailing Address Province': item.mailingAddress?.provinceCode,
+        'Mailing Address PostalCode': item.mailingAddress?.postal,
+        'Physical Address': item.physicalAddress?.addressLine1,
+        'Physical Address Line2': item.physicalAddress?.addressLine2,
+        'Physical Address City': item.physicalAddress?.city,
+        'Physical Address Province': item.physicalAddress?.provinceCode,
+        'Physical Address PostalCode': item.physicalAddress?.postal,
+        'Facility Type Code': appStore.getFacilityCodeLabel(item.facilityTypeCode),
+        'School Category Code': appStore.getCategoryCodeLabel(item.schoolCategoryCode),
+        'Phone Number': item.phoneNumber,
+        Fax: item.faxNumber,
+        Website: item.website
       }
     })
 

diff --git a/frontend/src/views/DistrictView.vue b/frontend/src/views/DistrictView.vue
@@ -113,15 +113,8 @@ onMounted(async () => {
       filteredSchools.value = transformedSchoolData.map((item: any) => {
         return {
           'District Number': response.data.districtData.districtNumber,
-          'Display Name': item.displayName,
           Mincode: item.mincode,
-          'Facility Type Code': item.facilityTypeCode,
-          'Contact Job Title': item.contacts?.jobTitle,
-          'Contact First Name': item.contacts?.firstName,
-          'Contact Last Name': item.contacts?.lastName,
-          'Contact Phone Extension': item.contacts?.phoneExtension,
-          'Contact Phone Number': item.contacts?.phoneNumber,
-          'School Email': item.email,
+          'Display Name': item.displayName,
           'Mailing Address': item.mailingAddress?.addressLine1,
           'Mailing Address Line2': item.mailingAddress?.addressLine2,
           'Mailing Address City': item.mailingAddress?.city,
@@ -131,13 +124,18 @@ onMounted(async () => {
           'Physical Address Line2': item.physicalAddress?.addressLine2,
           'Physical Address City': item.physicalAddress?.city,
           'Physical Address Province': item.physicalAddress?.provinceCode,
-          'Physical Address PostalCode': item.physicalAddress?.postal,
-          'District Phone Number': item.phoneNumber,
-          'District Fax': item.faxNumber,
-          'District Website': item.website,
-          'School Category Code': item.schoolCategoryCode,
-          'School Organization Code': item.schoolOrganizationCode,
-          'School Reporting Requirement Code': item.schoolReportingRequirementCode
+          'Physical Address Postal Code': item.physicalAddress?.postal,
+          'Contact Job Title': item.contacts?.jobTitle,
+          'Contact First Name': item.contacts?.firstName,
+          'Contact Last Name': item.contacts?.lastName,
+          'Contact Phone Extension': item.contacts?.phoneExtension,
+          'Contact Phone Number': item.contacts?.phoneNumber,
+          'Facility Type Code': appStore.getFacilityCodeLabel(item.facilityTypeCode),
+          'School Category Code': appStore.getCategoryCodeLabel(item.schoolCategoryCode),
+          'Phone Number': item.phoneNumber,
+          Fax: item.faxNumber,
+          Email: item.email,
+          Website: item.website
         }
       })
       filteredContacts.value = contacts.value.map((item: any) => {

diff --git a/frontend/src/views/OffshoreView.vue b/frontend/src/views/OffshoreView.vue
@@ -43,8 +43,8 @@ const transformContactForDownload = (inputData: any): {} => {
     Role: item.jobTitle,
     'First Name': item.firstName,
     'Last Name': item.lastName,
-    'Facility Type': item.facilityTypeCode,
-    'School Category': item.schoolCategoryCode,
+    'Facility Type': appStore.getFacilityCodeLabel(item.facilityTypeCode),
+    'School Category': appStore.getCategoryCodeLabel(item.schoolCategoryCode),
     'Phone Number': item.phoneNumber,
     'Fax Number': item.faxNumber,
     Email: item.email,

diff --git a/frontend/src/views/SchoolView.vue b/frontend/src/views/SchoolView.vue
@@ -117,15 +117,20 @@ onBeforeMount(async () => {
         filteredAddresses.value = response.data.addresses[0]
       }
     }
+    // console.log(appStore.getFacilityCodeLabel(response.data?.facilityTypeCode))
     //setting school contacts
     if (response.data) {
       if (response.data.contacts.length > 0) {
         for (let i = 0; i < response.data.contacts.length; i++) {
           filteredContacts.value = response.data.contacts
           filteredContacts.value[i].districtNumber = distNumberFromMincode(response.data?.mincode)
           filteredContacts.value[i].displayName = response.data?.displayName
-          filteredContacts.value[i].schoolCategoryCode = response.data?.schoolCategoryCode
-          filteredContacts.value[i].facilityTypeCode = response.data?.facilityTypeCode
+          filteredContacts.value[i].schoolCategoryCode = appStore.getCategoryCodeLabel(
+            response.data?.schoolCategoryCode
+          )
+          filteredContacts.value[i].facilityTypeCode = appStore.getFacilityCodeLabel(
+            response.data?.facilityTypeCode
+          )
           filteredContacts.value[i].mincode = response.data?.mincode
           filteredContacts.value[i].schoolEmail = response.data?.email
           filteredContacts.value[i].schoolPhoneNumber = response.data?.phoneNumber