Merge pull request #651 from IFRCGo/feature/fix-dref-loan

Fix dref loan type
IFRCGo · Apr 2, 2024 · 5a2c3bb · 5a2c3bb
2 parents 770fe9c + b3e3873
commit 5a2c3bb
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/app/src/components/domain/ImageWithCaptionInput/index.tsx b/app/src/components/domain/ImageWithCaptionInput/index.tsx
@@ -111,7 +111,7 @@ function ImageWithCaptionInput<const N extends string | number>(props: Props<N>)
             >
                 {label}
             </GoSingleFileInput>
-            {value?.id && (
+            {value?.id && isDefined(fileUrl) && (
                 <TextInput
                     className={styles.captionInput}
                     name="caption"

diff --git a/app/src/views/AccountMyFormsDref/ActiveDrefTable/index.tsx b/app/src/views/AccountMyFormsDref/ActiveDrefTable/index.tsx
@@ -29,6 +29,7 @@ import {
 
 import useUserMe from '#hooks/domain/useUserMe';
 import useFilterState from '#hooks/useFilterState';
+import { DREF_TYPE_LOAN } from '#utils/constants';
 import { useRequest } from '#utils/restRequest';
 
 import DrefTableActions, { type Props as DrefTableActionsProps } from '../DrefTableActions';
@@ -236,6 +237,7 @@ function ActiveDrefTable(props: Props) {
                     const canCreateFinalReport = !has_final_report
                         && (applicationType === 'DREF' || applicationType === 'OPS_UPDATE')
                         && (is_published ?? false)
+                        && (item.type_of_dref !== DREF_TYPE_LOAN)
                         && (
                             !has_ops_update
                                 || (has_ops_update && unpublished_op_update_count === 0)

diff --git a/app/src/views/DrefApplicationForm/EventDetail/i18n.json b/app/src/views/DrefApplicationForm/EventDetail/i18n.json
@@ -10,9 +10,7 @@
         "drefFormPeopleAffectedDescriptionSlowSudden": "People Affected include all those whose lives and livelihoods have been impacted as a direct result of the shock or stress.",
         "drefFormClickEmergencyResponseFramework": "Click to view Emergency Response Framework",
         "drefFormEstimatedPeopleInNeed": "Estimated people in need (Optional)",
-        "drefFormPeopleTargetedDescription": "Include all those whose the National Society is aiming or planning to assist",
         "drefFormPeopleInNeed": "People in need (Optional)",
-        "drefFormPeopleTargeted": "Number of people targeted",
         "drefFormPeopleAffected": "Total affected population",
         "drefFormRiskPeopleLabel": "Total population at risk",
         "drefFormPeopleInNeedDescriptionImminent": "Include all those whose physical security, basic rights, dignity, living conditions or livelihoods are threatened or have been disrupted, and whose current level of access to basic services, goods and social protection will be inadequate to re-establish normal living conditions without additional assistance",

diff --git a/app/src/views/DrefFinalReportForm/EventDetail/i18n.json b/app/src/views/DrefFinalReportForm/EventDetail/i18n.json
@@ -21,8 +21,8 @@
         "drefFormEstimatedPeopleInNeed": "Estimated people in need (Optional)",
         "drefFormPeopleInNeed": "People in need (Optional)",
         "drefFormPeopleInNeedDescriptionImminent": "Include all those whose physical security, basic rights, dignity, living conditions or livelihoods are threatened or have been disrupted, and whose current level of access to basic services, goods and social protection will be inadequate to re-establish normal living conditions without additional assistance",
-        "finalReportPeopleTargeted": "Number of people targeted",
-        "drefFormPeopleTargetedDescription": "Include all those whose the National Society is aiming or planning to assist",
+        "drefFormPeopleAssisted": "Number of people assisted",
+        "drefFormPeopleAssistedDescription": "Include all those whose the National Society is aiming or planning to assist",
         "drefFormPeopleTargeted": "Number of people targeted",
         "drefFormPeopleInNeedDescriptionSlowSudden": "People in Need (PIN) are those members whose physical security, basic rights, dignity, living conditions or livelihoods are threatened or have been disrupted, and whose current level of access to basic services, goods and social protection is inadequate to re-establish normal living conditions without additional assistance.",
         "drefFormSourceInformationAddButton": "Add New Source Information",

diff --git a/app/src/views/DrefFinalReportForm/EventDetail/index.tsx b/app/src/views/DrefFinalReportForm/EventDetail/index.tsx
@@ -188,7 +188,7 @@ function EventDetail(props: Props) {
                     <NumberInput
                         label={(
                             <>
-                                {strings.finalReportPeopleTargeted}
+                                {strings.drefFormPeopleTargeted}
                                 <Link
                                     title={strings.drefFormClickEmergencyResponseFramework}
                                     href={peopleTargetedLink}
@@ -202,13 +202,12 @@ function EventDetail(props: Props) {
                         value={value.number_of_people_targeted}
                         onChange={setFieldValue}
                         error={error?.number_of_people_targeted}
-                        hint={strings.drefFormPeopleTargetedDescription}
                         disabled={disabled}
                     />
                     <NumberInput
                         label={(
                             <>
-                                {strings.drefFormPeopleTargeted}
+                                {strings.drefFormPeopleAssisted}
                                 <Link
                                     title={strings.drefFormClickEmergencyResponseFramework}
                                     href={peopleTargetedLink}
@@ -222,7 +221,7 @@ function EventDetail(props: Props) {
                         value={value?.num_assisted}
                         onChange={setFieldValue}
                         error={error?.num_assisted}
-                        hint={strings.drefFormPeopleTargetedDescription}
+                        hint={strings.drefFormPeopleAssistedDescription}
                         disabled={disabled}
                     />
                     {/* NOTE: Empty div to preserve the layout */}

diff --git a/app/src/views/DrefFinalReportForm/Overview/index.tsx b/app/src/views/DrefFinalReportForm/Overview/index.tsx
@@ -36,7 +36,10 @@ import useDisasterType from '#hooks/domain/useDisasterType';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import { type GoApiResponse } from '#utils/restRequest';
 
-import { TYPE_IMMINENT } from '../common';
+import {
+    TYPE_IMMINENT,
+    TYPE_LOAN,
+} from '../common';
 import { type PartialFinalReport } from '../schema';
 
 import i18n from './i18n.json';
@@ -130,6 +133,10 @@ function Overview(props: Props) {
         user,
     }), []);
 
+    const filteredTypeOfDrefOptions = (typeOfDrefOptions ?? []).filter(
+        (option) => option.key !== TYPE_LOAN,
+    );
+
     const error = getErrorObject(formError);
 
     return (
@@ -183,7 +190,7 @@ function Overview(props: Props) {
                     <SelectInput
                         name="type_of_dref"
                         label={strings.drefFormTypeOfDref}
-                        options={typeOfDrefOptions}
+                        options={filteredTypeOfDrefOptions}
                         keySelector={typeOfDrefKeySelector}
                         labelSelector={stringValueSelector}
                         onChange={setFieldValue}