Skip to content

Commit

Permalink
Fixes some spacing for contacts pages and fixes date issue
Browse files Browse the repository at this point in the history
  • Loading branch information
mightycox committed Oct 13, 2023
1 parent df72acb commit fbbe777
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 18 deletions.
7 changes: 0 additions & 7 deletions backend/src/components/edx/exchange.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,6 @@ async function getExchanges(req, res) {
element['contactIdentifierName'] = tempMinTeam.teamName;
}
}
if (element['createDate']) {
element['createDate'] = LocalDateTime.parse(element['createDate']).format(DateTimeFormatter.ofPattern('uuuu/MM/dd'));
}
});
}
return res.status(200).json(dataResponse);
Expand Down Expand Up @@ -190,10 +187,6 @@ async function getExchange(req, res) {
dataResponse['districtName'] = district.name;
}

if (dataResponse['createDate']) {
dataResponse['createDate'] = LocalDateTime.parse(dataResponse['createDate']).format(DateTimeFormatter.ofPattern('uuuu/MM/dd'));
}

//creating activities list for timeline display on the frontend
dataResponse['activities'] = [];
dataResponse['commentsList'].forEach((comment) => {
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/components/institute/AuthoritiesContacts.vue
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,10 @@
<div
v-for="authorityContactType in authorityContactTypes"
:key="authorityContactType.code"
class="pb-4"
>
<v-row>
<v-col>
<v-col class="pb-0">
<h2
id="authorityTypeLabel"
style="color:#1A5A96"
Expand All @@ -114,6 +115,7 @@
<v-col
v-for="contact in authorityContacts.get(authorityContactType.authorityContactTypeCode)"
:key="contact.independentAuthorityId"
class="pt-0"
cols="5"
lg="4"
>
Expand All @@ -129,7 +131,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
12 changes: 6 additions & 6 deletions frontend/src/components/institute/DistrictContacts.vue
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
</v-col>
</v-row>
<v-row
:class="['d-sm-flex', 'align-center', 'searchBox', 'elevation-2']"
:class="['d-sm-flex', 'align-center', 'searchBox', 'elevation-2', 'mb-3']"
@keydown.enter="searchButtonClicked"
>
<v-col>
Expand Down Expand Up @@ -139,14 +139,14 @@
<div
v-for="districtContactType in districtContactTypes"
:key="districtContactType.code"
class="mt-5"
class="pb-4"
>
<div v-if="hasContactsWhenFiltered(districtContactType)">
<v-row
class="mb-1"
no-gutters
>
<v-col>
<v-col class="pb-0">
<h2 style="color:#1A5A96">
{{
districtContactType.label
Expand All @@ -158,7 +158,7 @@
v-if="!districtContactType.publiclyAvailable"
cols="2"
>
<v-col cols="12">
<v-col class="pt-0" cols="12">
<v-alert
:id="`publiclyAvailableAlert${districtContactType.label}`"
color="#003366"
Expand All @@ -174,12 +174,12 @@
</v-row>
<v-row
v-if="hasContactsForThisType(districtContactType)"
class="mt-0 mb-0"
cols="2"
>
<v-col
v-for="contact in filteredDistrictContacts.get(districtContactType.districtContactTypeCode)"
:key="contact.schoolId"
class="pt-0"
cols="5"
lg="4"
>
Expand All @@ -196,7 +196,7 @@
no-gutters
cols="2"
>
<v-col class="mt-2">
<v-col class="pt-0">
<p>No contacts of this type have been listed.</p>
</v-col>
</v-row>
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

0 comments on commit fbbe777

Please sign in to comment.