Merged PR 2274: case deadline and watch stream on results
case deadline and wat Related work items: #22423, #22783
This commit is contained in:
@@ -222,7 +222,9 @@ const EventsDetails = (props) => {
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
>
|
||||
Watch live stream
|
||||
{t(
|
||||
"case:live-event-link"
|
||||
)}
|
||||
</a>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -379,12 +379,12 @@ const CaseSummary = (props) => {
|
||||
className="govuk-notification-banner__title"
|
||||
id="live-event-title"
|
||||
>
|
||||
Live event
|
||||
{t("case:live-event-subheading")}
|
||||
</h2>
|
||||
</div>
|
||||
<div className="govuk-notification-banner__content">
|
||||
<p className="govuk-notification-banner__heading">
|
||||
A live streamed event is happening now.
|
||||
{t("case:live-event-copy")}
|
||||
</p>
|
||||
|
||||
{livePublishedEvent.pinswg_eventname && (
|
||||
@@ -401,7 +401,7 @@ const CaseSummary = (props) => {
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
>
|
||||
Watch live stream
|
||||
{t("case:live-event-link")}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -29,6 +29,17 @@ const Pinswg_sipscase = (props) => {
|
||||
);
|
||||
}
|
||||
|
||||
const extensions =
|
||||
detailsObj.pinswg_CaseDeadlineExtension_pinswg_sips || [];
|
||||
|
||||
const latest = extensions.sort(
|
||||
(a, b) =>
|
||||
new Date(b.pinswg_datedeadlineextended) -
|
||||
new Date(a.pinswg_datedeadlineextended)
|
||||
)[0];
|
||||
|
||||
console.log(latest);
|
||||
|
||||
return (
|
||||
<>
|
||||
{detailsObj.pinswg_projectdescription != null ? (
|
||||
@@ -485,7 +496,48 @@ const Pinswg_sipscase = (props) => {
|
||||
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
|
||||
{t("case:summary-dates-label")}
|
||||
</h3>
|
||||
<h4 className="govuk-heading-s ">
|
||||
<dl className="govuk-summary-list govuk-!-font-size-16 govuk-!-margin-bottom-9">
|
||||
<SummaryRow
|
||||
label={"Case deadline"}
|
||||
value={(() => {
|
||||
const fallback = t(
|
||||
"case:summary-awaiting-information-label"
|
||||
);
|
||||
|
||||
const extensions =
|
||||
detailsObj.pinswg_CaseDeadlineExtension_pinswg_sips ||
|
||||
[];
|
||||
|
||||
const latestExtension =
|
||||
extensions
|
||||
.filter(
|
||||
(extension) =>
|
||||
!_.isEmpty(
|
||||
extension.pinswg_datedeadlineextended
|
||||
)
|
||||
)
|
||||
.sort(
|
||||
(a, b) =>
|
||||
new Date(
|
||||
b.pinswg_datedeadlineextended
|
||||
) -
|
||||
new Date(
|
||||
a.pinswg_datedeadlineextended
|
||||
)
|
||||
)[0];
|
||||
|
||||
const dateToDisplay =
|
||||
latestExtension
|
||||
? latestExtension.pinswg_datedeadlineextended
|
||||
: detailsObj.pinswg_casedeadline;
|
||||
|
||||
return !_.isEmpty(dateToDisplay)
|
||||
? formatDates(dateToDisplay)
|
||||
: fallback;
|
||||
})()}
|
||||
/>
|
||||
</dl>
|
||||
<h4 className="govuk-heading-s">
|
||||
{t(
|
||||
"case:summary-pre-submission-sub-title"
|
||||
)}
|
||||
|
||||
Reference in New Issue
Block a user