Skip to content

Commit

Permalink
Merge pull request #1064 from bcgov/fix/ui-and-contacts-bugs
Browse files Browse the repository at this point in the history
Tweaks dashboard, but still not quite centered properly
  • Loading branch information
trev-dev authored Sep 28, 2023
2 parents 35531ff + f73aecf commit bf70f3a
Showing 1 changed file with 25 additions and 66 deletions.
91 changes: 25 additions & 66 deletions frontend/src/components/DashboardTable.vue
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
<template>
<v-container :fluid="true">
<v-container>
<v-row
no-gutters
justify="center"
align="center"
>
<v-col
v-if="hasRequiredPermission('SECURE_EXCHANGE')"
class="px-2 mx-2 py-1 my-1 py-lg-2 my-lg-2"
cols="8"
lg="4"
xl="3"
cols="auto"
>
<v-card
id="secureMessageInboxCard"
class="mt-0"
min-width="22em"
class="mx-auto"
width="24em"
outlined
rounded
@click="redirectToInbox()"
Expand Down Expand Up @@ -68,15 +65,12 @@
</v-col>
<v-col
v-if="isLoggedInDistrictUser && isDistrictActive"
class="px-2 mx-2 py-1 my-1 py-lg-2 my-lg-2"
cols="8"
lg="4"
xl="3"
cols="auto"
>
<v-card
id="districtDetailsCard"
min-width="22em"
class="mt-0"
width="24em"
class="mx-auto"
outlined
rounded
@click="redirectToDistrictDetails()"
Expand Down Expand Up @@ -104,10 +98,6 @@
<v-row no-gutters>
<v-col>
<span>Last updated:</span>
</v-col>
</v-row>
<v-row no-gutters>
<v-col>
<span>{{ districtLastUpdateDate }}</span>
</v-col>
</v-row>
Expand All @@ -117,15 +107,12 @@
</v-col>
<v-col
v-if="isLoggedInSchoolUser && isSchoolActive"
class="px-2 mx-2 py-1 my-1 py-lg-2 my-lg-2"
cols="8"
lg="4"
xl="3"
cols="auto"
>
<v-card
id="schoolContactsCard"
class="mt-0"
min-width="22em"
class="mx-auto"
width="24em"
outlined
rounded
@click="redirectToSchoolContacts()"
Expand Down Expand Up @@ -153,10 +140,6 @@
<v-row no-gutters>
<v-col>
<span>Last updated:</span>
</v-col>
</v-row>
<v-row no-gutters>
<v-col>
<span>{{ schoolContactsLastUpdateDate }}</span>
</v-col>
</v-row>
Expand All @@ -166,15 +149,12 @@
</v-col>
<v-col
v-if="isLoggedInDistrictUser && isDistrictActive"
class="px-2 mx-2 py-1 my-1 py-lg-2 my-lg-2"
cols="8"
lg="4"
xl="3"
cols="auto"
>
<v-card
id="districtContactsCard"
min-width="22em"
class="mt-0"
width="24em"
class="mx-auto"
outlined
rounded
@click="redirectToDistrictContacts()"
Expand Down Expand Up @@ -202,10 +182,6 @@
<v-row no-gutters>
<v-col>
<span>Last updated:</span>
</v-col>
</v-row>
<v-row no-gutters>
<v-col>
<span>{{ districtContactsLastUpdateDate }}</span>
</v-col>
</v-row>
Expand All @@ -215,15 +191,12 @@
</v-col>
<v-col
v-if="isLoggedInDistrictUser && isDistrictActive"
class="px-2 mx-2 py-1 my-1 py-lg-2 my-lg-2"
cols="8"
lg="4"
xl="3"
cols="auto"
>
<v-card
id="districtUserSchoolContactsCard"
min-width="22em"
class="mt-0"
width="24em"
class="mx-auto"
outlined
rounded
@click="redirectToSchools()"
Expand Down Expand Up @@ -251,10 +224,6 @@
<v-row no-gutters>
<v-col>
<span>Last updated:</span>
</v-col>
</v-row>
<v-row no-gutters>
<v-col>
<span>{{ schoolsLastUpdateDate }}</span>
</v-col>
</v-row>
Expand All @@ -264,15 +233,12 @@
</v-col>
<v-col
v-if="isLoggedInSchoolUser && isSchoolActive"
class="px-2 mx-2 py-1 my-1 py-lg-2 my-lg-2"
cols="8"
lg="4"
xl="3"
cols="auto"
>
<v-card
id="schoolDetailsCard"
class="mt-0"
min-width="22em"
class="mx-auto"
width="24em"
outlined
rounded
@click="redirectToSchoolDetails()"
Expand All @@ -299,10 +265,6 @@
<v-row no-gutters>
<v-col>
<span>Last updated:</span>
</v-col>
</v-row>
<v-row no-gutters>
<v-col>
<span>{{ schoolLastUpdateDate }}</span>
</v-col>
</v-row>
Expand All @@ -312,15 +274,12 @@
</v-col>
<v-col
v-if="hasRequiredPermission('STUDENT_DATA_COLLECTION') && isLoggedInSchoolUser"
class="px-2 mx-2 py-1 my-1 py-lg-2 my-lg-2"
cols="8"
lg="4"
xl="3"
cols="auto"
>
<v-card
id="studentDataCollectionCard"
class="mt-0"
min-width="22em"
class="mx-auto"
width="24em"
outlined
rounded
@click="openSDCCollection()"
Expand Down Expand Up @@ -430,13 +389,13 @@ export default {
this.getExchangesCount();
}
if(this.isLoggedInSchoolUser) {
if(this.isLoggedInSchoolUser) {
if(this.hasRequiredPermission('STUDENT_DATA_COLLECTION')) {
this.getSDCCollectionBySchoolId();
}
this.getSchoolContactsLastUpdate();
this.getSchoolLastUpdateDate();
this.isSchoolActive();
this.isSchoolActive();
}
if(this.isLoggedInDistrictUser){
this.getDistrictsLastUpdateDate();
Expand Down

0 comments on commit bf70f3a

Please sign in to comment.