Skip to content

Commit

Permalink
Merge pull request #1580 from bcgov/feature/EDX-1875
Browse files Browse the repository at this point in the history
MIN - Add tabbed view on District Details
  • Loading branch information
mightycox authored Oct 13, 2023
2 parents df72acb + 23a4bd5 commit 8722bec
Show file tree
Hide file tree
Showing 9 changed files with 1,151 additions and 893 deletions.
992 changes: 182 additions & 810 deletions frontend/src/components/institute/DistrictDetails.vue

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions frontend/src/components/institute/common/Details.vue
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@
>
mdi-email-outline
</v-icon>
<span>Mailing Address</span>
<span style="color: grey">Mailing Address</span>
</v-col>
</v-row>
<v-row
Expand All @@ -771,7 +771,7 @@
>
<v-col>
<v-row
class="ml-9"
class="ml-6"
no-gutters
>
<v-col>
Expand All @@ -781,21 +781,21 @@
</v-col>
</v-row>
<v-row no-gutters>
<v-col class="ml-9">
<v-col class="ml-6">
<span style="word-break: break-all;">{{
getMailingAddressItem('addressLine2')
}}</span>
</v-col>
</v-row>
<v-row no-gutters>
<v-col class="ml-9">
<v-col class="ml-6">
<span style="word-break: break-all;">{{
getMailingAddressItem('city') + ', ' + getMailingAddressItem('provinceCode') + ', ' + getMailingAddressItem('countryCode')
}}</span>
</v-col>
</v-row>
<v-row no-gutters>
<v-col class="ml-9">
<v-col class="ml-6">
<span style="word-break: break-all;">{{
getMailingAddressItem('postal')
}}</span>
Expand All @@ -816,7 +816,7 @@
>
mdi-home-outline
</v-icon>
<span>Physical Address</span>
<span style="color: grey">Physical Address</span>
</v-col>
</v-row>
<v-row
Expand All @@ -825,28 +825,28 @@
>
<v-col>
<v-row no-gutters>
<v-col class="ml-9">
<v-col class="ml-6">
<span style="word-break: break-all;">{{
getPhysicalAddressItem('addressLine1')
}}</span>
</v-col>
</v-row>
<v-row no-gutters>
<v-col class="ml-9">
<v-col class="ml-6">
<span style="word-break: break-all;">{{
getPhysicalAddressItem('addressLine2')
}}</span>
</v-col>
</v-row>
<v-row no-gutters>
<v-col class="ml-9">
<v-col class="ml-6">
<span style="word-break: break-all;">{{
getPhysicalAddressItem('city') + ', ' + getPhysicalAddressItem('provinceCode') + ', ' + getPhysicalAddressItem('countryCode')
}}</span>
</v-col>
</v-row>
<v-row no-gutters>
<v-col class="ml-9">
<v-col class="ml-6">
<span style="word-break: break-all;">{{
getPhysicalAddressItem('postal')
}}</span>
Expand Down
8 changes: 5 additions & 3 deletions frontend/src/components/institute/common/SchoolContacts.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@
<div
v-for="schoolContactType in schoolContactTypes"
:key="schoolContactType.code"
class="pb-4"
>
<v-row>
<v-col>
<v-col class="pb-0">
<h2 style="color:#1A5A96">
{{
schoolContactType.label
Expand All @@ -60,7 +61,7 @@
v-if="!schoolContactType.publiclyAvailable"
cols="2"
>
<v-col cols="12">
<v-col class="pt-0" cols="12">
<v-alert
:id="`publiclyAvailableAlert${schoolContactType.label}`"
color="#003366"
Expand All @@ -81,6 +82,7 @@
<v-col
v-for="contact in schoolContacts.get(schoolContactType.schoolContactTypeCode)"
:key="contact.schoolId"
class="pt-0"
cols="5"
lg="4"
>
Expand All @@ -96,7 +98,7 @@
v-else
cols="2"
>
<v-col>
<v-col class="pt-0">
<p>No contacts of this type have been listed.</p>
</v-col>
</v-row>
Expand Down
Loading

0 comments on commit 8722bec

Please sign in to comment.