Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes some spacing for contacts pages and fixes date issue #1579

Merged
merged 2 commits into from
Oct 13, 2023
Merged

Fixes some spacing for contacts pages and fixes date issue #1579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbbe777
Fixes some spacing for contacts pages and fixes date issue
mightycox Oct 13, 2023
adfa65e
Merge remote-tracking branch 'origin/master' into fix/contacts-spacing
mightycox Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions backend/src/components/edx/exchange.js
View file
Open in desktop
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
View file
Open in desktop
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
Loading