Skip to content

Commit

Permalink
Merge branch 'master' into feature/EDX-1875
Browse files Browse the repository at this point in the history
  • Loading branch information
SodhiA1 committed Oct 16, 2023
2 parents aac60f4 + 7f3c41a commit fabac45
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 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
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,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 @@ -67,6 +68,7 @@
<v-col
v-for="contact in authorityContacts.get(authorityContactType.authorityContactTypeCode)"
:key="contact.independentAuthorityId"
class="pt-0"
cols="5"
lg="4"
>
Expand All @@ -82,7 +84,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 fabac45

Please sign in to comment.