Skip to content

Address feedbacks in DREF superticket feedbacks #1817

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

Merged
AdityaKhatri merged 5 commits into from
May 12, 2025
Merged

Address feedbacks in DREF superticket feedbacks #1817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2dde747
feat(dref): make end date of Operation read only
frozenhelium May 12, 2025
3792319
fix(dref-export): add overflow wrap for link
frozenhelium May 12, 2025
cbf7e2e
feat(dref-export): update styling of Risk section
frozenhelium May 12, 2025
407287e
feat(dref-final-report-export): update condition for NS actions
frozenhelium May 12, 2025
9ed8181
chore(changeset): add changeset for DREF superticket feedbacks
frozenhelium May 12, 2025
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
10 changes: 10 additions & 0 deletions .changeset/rich-geckos-end.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"go-web-app": minor
---

Address feedbacks in [DREF superticket feedbacks](https://github.com/IFRCGo/go-web-app/issues/1816)

- Make end date of operation readonly field in all DREF forms
- Fix font and spacing issues in the DREF exports (caused by link text overflow)
- Update styling of Risk and Security Considerations section to match that of Previous Operations
- Update visibility condition of National Society Actions in Final Report export
3 changes: 2 additions & 1 deletion app/src/components/printable/Link/styles.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.link {
overflow-wrap: anywhere;
color: var(--go-ui-color-blue);
font-size: var(--go-ui-font-size-md);
font-size: inherit;
}
138 changes: 63 additions & 75 deletions app/src/views/DrefApplicationExport/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,13 +285,15 @@ export function Component() {
const hasChildrenSafeguardingDefined = isDefined(
drefResponse?.has_child_safeguarding_risk_analysis_assessment,
);
const showRiskAndSecuritySection = riskSecurityDefined
|| riskSecurityConcernDefined
|| hasAntiFraudPolicy
const hasRiskAndSecurityPoliciesDefined = hasAntiFraudPolicy
|| hasSexualAbusePolicy
|| hasChildProtectionPolicy
|| hasWhistleblowerProtectionPolicy
|| hasAntiSexualHarassmentPolicy
|| hasAntiSexualHarassmentPolicy;

const showRiskAndSecuritySection = riskSecurityDefined
|| riskSecurityConcernDefined
|| hasRiskAndSecurityPoliciesDefined
|| hasChildrenSafeguardingDefined;

const plannedInterventionDefined = isDefined(drefResponse)
Expand Down Expand Up @@ -697,7 +699,8 @@ export function Component() {
label={strings.childSafeguardingRiskLevelLabel}
value={drefResponse?.child_safeguarding_risk_level}
valueType="text"
strongLabel
strongValue
variant="contents"
/>
)}
</Container>
Expand Down Expand Up @@ -981,66 +984,56 @@ export function Component() {
/>
</Container>
{showRiskAndSecuritySection && (
<>
<Heading level={2}>
{strings.riskAndSecuritySectionHeading}
</Heading>
<Container
childrenContainerClassName={styles.riskAndSecuritySection}
heading={strings.riskAndSecuritySectionHeading}
headingLevel={2}
>
{hasAntiFraudPolicy && (
<Container>
<BlockTextOutput
label={strings.hasAntiFraudPolicy}
value={drefResponse?.has_anti_fraud_corruption_policy}
valueType="boolean"
strongLabel
/>
</Container>
<BlockTextOutput
label={strings.hasAntiFraudPolicy}
value={drefResponse?.has_anti_fraud_corruption_policy}
valueType="boolean"
strongValue
/>
)}
{hasSexualAbusePolicy && (
<Container>
<BlockTextOutput
label={strings.hasSexualAbusePolicy}
value={drefResponse?.has_sexual_abuse_policy}
valueType="boolean"
strongLabel
/>
</Container>
<BlockTextOutput
label={strings.hasSexualAbusePolicy}
value={drefResponse?.has_sexual_abuse_policy}
valueType="boolean"
strongValue
/>
)}
{hasChildProtectionPolicy && (
<Container>
<BlockTextOutput
label={strings.hasChildProtectionPolicy}
value={drefResponse?.has_child_protection_policy}
valueType="boolean"
strongLabel
/>
</Container>
<BlockTextOutput
label={strings.hasChildProtectionPolicy}
value={drefResponse?.has_child_protection_policy}
valueType="boolean"
strongValue
/>
)}
{hasWhistleblowerProtectionPolicy && (
<Container>
<BlockTextOutput
label={strings.hasWhistleblowerProtectionPolicy}
value={drefResponse?.has_whistleblower_protection_policy}
valueType="boolean"
strongLabel
/>
</Container>
<BlockTextOutput
label={strings.hasWhistleblowerProtectionPolicy}
value={drefResponse?.has_whistleblower_protection_policy}
valueType="boolean"
strongValue
/>
)}
{hasAntiSexualHarassmentPolicy && (
<Container>
<BlockTextOutput
label={strings.hasAntiSexualHarassmentPolicy}
value={drefResponse?.has_anti_sexual_harassment_policy}
valueType="boolean"
strongLabel
/>
</Container>
<BlockTextOutput
label={strings.hasAntiSexualHarassmentPolicy}
value={drefResponse?.has_anti_sexual_harassment_policy}
valueType="boolean"
strongValue
/>
)}
{riskSecurityDefined && (
<Container
heading={strings.riskSecurityHeading}
childrenContainerClassName={styles.riskList}
headingLevel={6}
>
<>
<div className={styles.potentialRisksHeading}>
{strings.riskSecurityHeading}
</div>
<div className={styles.riskTitle}>
{strings.drefApplicationExportRisk}
</div>
Expand All @@ -1059,32 +1052,27 @@ export function Component() {
</Fragment>
),
)}
</Container>
</>
)}
{riskSecurityConcernDefined && (
<Container
heading={strings.safetyConcernHeading}
headingLevel={6}
>
<DescriptionText
className={styles.description}
>
{drefResponse?.risk_security_concern}
</DescriptionText>
</Container>
<TextOutput
className={styles.riskSecurityConcern}
label={strings.safetyConcernHeading}
value={drefResponse?.risk_security_concern}
valueType="text"
strongLabel
/>
)}
{hasChildrenSafeguardingDefined && (
<Container>
<BlockTextOutput
label={strings.hasChildRiskCompleted}
// eslint-disable-next-line max-len
value={drefResponse?.has_child_safeguarding_risk_analysis_assessment}
valueType="boolean"
strongLabel
/>
</Container>
<BlockTextOutput
label={strings.hasChildRiskCompleted}
// eslint-disable-next-line max-len
value={drefResponse?.has_child_safeguarding_risk_analysis_assessment}
valueType="boolean"
strongValue
/>
)}
</>
</Container>
)}
{plannedInterventionDefined && (
<>
Expand Down
17 changes: 16 additions & 1 deletion app/src/views/DrefApplicationExport/styles.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,27 @@
}
}

.risk-list,
.risk-and-security-section,
.source-information-list {
display: grid;
grid-template-columns: 1fr 1fr;
grid-gap: var(--go-ui-width-separator-md);

.potential-risks-heading {
grid-column: span 2;
background-color: var(--pdf-element-bg);
padding: var(--go-ui-spacing-sm) var(--go-ui-spacing-xs);
color: var(--go-ui-color-black);
font-weight: var(--go-ui-font-weight-semibold);
}

.risk-security-concern {
grid-column: span 2;
background-color: var(--pdf-element-bg);
padding: var(--go-ui-spacing-sm) var(--go-ui-spacing-xs);
gap: var(--go-ui-spacing-sm);
}

.risk,
.name,
.link,
Expand Down
Loading
Loading