Skip to content

Commit bdc8543

Browse files
AdityaKhatriAdityaKhatri
authored
Merge pull request #1817 from IFRCGo/project/dref-superticket-2-feedbacks
Address feedbacks in DREF superticket feedbacks
2 parents 03e2c99 + 9ed8181 commit bdc8543

File tree

11 files changed

+248
-230
lines changed

11 files changed

+248
-230
lines changed

‎.changeset/rich-geckos-end.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
"go-web-app": minor
3+
---
4+
5+
Address feedbacks in [DREF superticket feedbacks](https://github.com/IFRCGo/go-web-app/issues/1816)
6+
7+
- Make end date of operation readonly field in all DREF forms
8+
- Fix font and spacing issues in the DREF exports (caused by link text overflow)
9+
- Update styling of Risk and Security Considerations section to match that of Previous Operations
10+
- Update visibility condition of National Society Actions in Final Report export

‎app/src/components/printable/Link/styles.module.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.link {
2+
overflow-wrap: anywhere;
23
color: var(--go-ui-color-blue);
3-
font-size: var(--go-ui-font-size-md);
4+
font-size: inherit;
45
}

‎app/src/views/DrefApplicationExport/index.tsx‎

Lines changed: 63 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -285,13 +285,15 @@ export function Component() {
285285
const hasChildrenSafeguardingDefined = isDefined(
286286
drefResponse?.has_child_safeguarding_risk_analysis_assessment,
287287
);
288-
const showRiskAndSecuritySection = riskSecurityDefined
289-
|| riskSecurityConcernDefined
290-
|| hasAntiFraudPolicy
288+
const hasRiskAndSecurityPoliciesDefined = hasAntiFraudPolicy
291289
|| hasSexualAbusePolicy
292290
|| hasChildProtectionPolicy
293291
|| hasWhistleblowerProtectionPolicy
294-
|| hasAntiSexualHarassmentPolicy
292+
|| hasAntiSexualHarassmentPolicy;
293+
294+
const showRiskAndSecuritySection = riskSecurityDefined
295+
|| riskSecurityConcernDefined
296+
|| hasRiskAndSecurityPoliciesDefined
295297
|| hasChildrenSafeguardingDefined;
296298

297299
const plannedInterventionDefined = isDefined(drefResponse)
@@ -697,7 +699,8 @@ export function Component() {
697699
label={strings.childSafeguardingRiskLevelLabel}
698700
value={drefResponse?.child_safeguarding_risk_level}
699701
valueType="text"
700-
strongLabel
702+
strongValue
703+
variant="contents"
701704
/>
702705
)}
703706
</Container>
@@ -981,66 +984,56 @@ export function Component() {
981984
/>
982985
</Container>
983986
{showRiskAndSecuritySection && (
984-
<>
985-
<Heading level={2}>
986-
{strings.riskAndSecuritySectionHeading}
987-
</Heading>
987+
<Container
988+
childrenContainerClassName={styles.riskAndSecuritySection}
989+
heading={strings.riskAndSecuritySectionHeading}
990+
headingLevel={2}
991+
>
988992
{hasAntiFraudPolicy && (
989-
<Container>
990-
<BlockTextOutput
991-
label={strings.hasAntiFraudPolicy}
992-
value={drefResponse?.has_anti_fraud_corruption_policy}
993-
valueType="boolean"
994-
strongLabel
995-
/>
996-
</Container>
993+
<BlockTextOutput
994+
label={strings.hasAntiFraudPolicy}
995+
value={drefResponse?.has_anti_fraud_corruption_policy}
996+
valueType="boolean"
997+
strongValue
998+
/>
997999
)}
9981000
{hasSexualAbusePolicy && (
999-
<Container>
1000-
<BlockTextOutput
1001-
label={strings.hasSexualAbusePolicy}
1002-
value={drefResponse?.has_sexual_abuse_policy}
1003-
valueType="boolean"
1004-
strongLabel
1005-
/>
1006-
</Container>
1001+
<BlockTextOutput
1002+
label={strings.hasSexualAbusePolicy}
1003+
value={drefResponse?.has_sexual_abuse_policy}
1004+
valueType="boolean"
1005+
strongValue
1006+
/>
10071007
)}
10081008
{hasChildProtectionPolicy && (
1009-
<Container>
1010-
<BlockTextOutput
1011-
label={strings.hasChildProtectionPolicy}
1012-
value={drefResponse?.has_child_protection_policy}
1013-
valueType="boolean"
1014-
strongLabel
1015-
/>
1016-
</Container>
1009+
<BlockTextOutput
1010+
label={strings.hasChildProtectionPolicy}
1011+
value={drefResponse?.has_child_protection_policy}
1012+
valueType="boolean"
1013+
strongValue
1014+
/>
10171015
)}
10181016
{hasWhistleblowerProtectionPolicy && (
1019-
<Container>
1020-
<BlockTextOutput
1021-
label={strings.hasWhistleblowerProtectionPolicy}
1022-
value={drefResponse?.has_whistleblower_protection_policy}
1023-
valueType="boolean"
1024-
strongLabel
1025-
/>
1026-
</Container>
1017+
<BlockTextOutput
1018+
label={strings.hasWhistleblowerProtectionPolicy}
1019+
value={drefResponse?.has_whistleblower_protection_policy}
1020+
valueType="boolean"
1021+
strongValue
1022+
/>
10271023
)}
10281024
{hasAntiSexualHarassmentPolicy && (
1029-
<Container>
1030-
<BlockTextOutput
1031-
label={strings.hasAntiSexualHarassmentPolicy}
1032-
value={drefResponse?.has_anti_sexual_harassment_policy}
1033-
valueType="boolean"
1034-
strongLabel
1035-
/>
1036-
</Container>
1025+
<BlockTextOutput
1026+
label={strings.hasAntiSexualHarassmentPolicy}
1027+
value={drefResponse?.has_anti_sexual_harassment_policy}
1028+
valueType="boolean"
1029+
strongValue
1030+
/>
10371031
)}
10381032
{riskSecurityDefined && (
1039-
<Container
1040-
heading={strings.riskSecurityHeading}
1041-
childrenContainerClassName={styles.riskList}
1042-
headingLevel={6}
1043-
>
1033+
<>
1034+
<div className={styles.potentialRisksHeading}>
1035+
{strings.riskSecurityHeading}
1036+
</div>
10441037
<div className={styles.riskTitle}>
10451038
{strings.drefApplicationExportRisk}
10461039
</div>
@@ -1059,32 +1052,27 @@ export function Component() {
10591052
</Fragment>
10601053
),
10611054
)}
1062-
</Container>
1055+
</>
10631056
)}
10641057
{riskSecurityConcernDefined && (
1065-
<Container
1066-
heading={strings.safetyConcernHeading}
1067-
headingLevel={6}
1068-
>
1069-
<DescriptionText
1070-
className={styles.description}
1071-
>
1072-
{drefResponse?.risk_security_concern}
1073-
</DescriptionText>
1074-
</Container>
1058+
<TextOutput
1059+
className={styles.riskSecurityConcern}
1060+
label={strings.safetyConcernHeading}
1061+
value={drefResponse?.risk_security_concern}
1062+
valueType="text"
1063+
strongLabel
1064+
/>
10751065
)}
10761066
{hasChildrenSafeguardingDefined && (
1077-
<Container>
1078-
<BlockTextOutput
1079-
label={strings.hasChildRiskCompleted}
1080-
// eslint-disable-next-line max-len
1081-
value={drefResponse?.has_child_safeguarding_risk_analysis_assessment}
1082-
valueType="boolean"
1083-
strongLabel
1084-
/>
1085-
</Container>
1067+
<BlockTextOutput
1068+
label={strings.hasChildRiskCompleted}
1069+
// eslint-disable-next-line max-len
1070+
value={drefResponse?.has_child_safeguarding_risk_analysis_assessment}
1071+
valueType="boolean"
1072+
strongValue
1073+
/>
10861074
)}
1087-
</>
1075+
</Container>
10881076
)}
10891077
{plannedInterventionDefined && (
10901078
<>

‎app/src/views/DrefApplicationExport/styles.module.css‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,27 @@
154154
}
155155
}
156156

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

163+
.potential-risks-heading {
164+
grid-column: span 2;
165+
background-color: var(--pdf-element-bg);
166+
padding: var(--go-ui-spacing-sm) var(--go-ui-spacing-xs);
167+
color: var(--go-ui-color-black);
168+
font-weight: var(--go-ui-font-weight-semibold);
169+
}
170+
171+
.risk-security-concern {
172+
grid-column: span 2;
173+
background-color: var(--pdf-element-bg);
174+
padding: var(--go-ui-spacing-sm) var(--go-ui-spacing-xs);
175+
gap: var(--go-ui-spacing-sm);
176+
}
177+
163178
.risk,
164179
.name,
165180
.link,

0 commit comments

Comments
 (0)