Skip to content

DREF Imminent v2 Final Report#1942

Merged
AdityaKhatri merged 9 commits intodevelopfrom
project/dref-imminent-v2-final-report
Aug 1, 2025
Merged

DREF Imminent v2 Final Report#1942
AdityaKhatri merged 9 commits intodevelopfrom
project/dref-imminent-v2-final-report

Conversation

@frozenhelium
Copy link
Copy Markdown
Member

Summary

Update final report form for dref imminent type

Addresses

Depends On

Changes

  • Dref final report form
  • Dref final report export
  • Hide some fields for dref imminent type

This PR Ensures:

  • No typos or grammatical errors
  • No conflict markers left in the code
  • No unwanted comments, temporary files, or auto-generated files
  • No inclusion of secret keys or sensitive data
  • No console.log statements meant for debugging
  • All CI checks have passed

@changeset-bot
Copy link
Copy Markdown

changeset-bot Bot commented Jul 21, 2025

🦋 Changeset detected

Latest commit: 3ee9979

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
go-web-app Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

headingLevel={3}
childrenContainerClassName={styles.proposedActions}
>
<div className={styles.actionTitleLabel} />
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its empty. It is needed?

{strings.priorityActionsBudget}
</div>
<div className={styles.actionTitleLabel}>
Expenditure
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

get this from i18n.

</div>
{proposedAction.actions.map((action) => (
<Fragment key={action.id}>
{action.activities.map((activity, i) => (
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it would easier to read if we write index instead of i.

(value: Maybe<number>) => (
// FIXME: use translations
isDefined(value) && value !== SUB_TOTAL
? 'The sub-total of the budgets should be exactly CHF 75000'
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use translation. do not forget to remove FIXME.

const primarySectorOptions = usePrimarySector();

const {
// pending: fetchingDref,
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove commented line it not needed


const sortedPlannedInterventions = useMemo(
() => filteredPlannedIntervention?.sort(

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this space


const sortedIdentifiedNeedsAndGaps = useMemo(
() => filteredIdentifiedNeedsAndGaps?.sort(

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

<img
className={styles.icon}
src={identifiedNeed.image_url}
alt=""
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add alt

<img
className={styles.icon}
src={plannedIntervention.image_url}
alt=""
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add alt

Comment on lines +177 to +185
/*
if ((response.photos_file?.length ?? 0) > 0) {
response.photos_file?.forEach((img) => {
if (isDefined(img.file)) {
newMap[img.id] = img.file;
}
});
}
*/
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove commented or add Note

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@barshathakuri @AdityaKhatri For future references, this should have been done using fixup commit! It wouldn't be possible to revert back to the moved migration!

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

@AdityaKhatri AdityaKhatri force-pushed the project/dref-imminent-v2-final-report branch from 1d0bccd to 3ee9979 Compare August 1, 2025 11:15
@AdityaKhatri AdityaKhatri merged commit 51a9510 into develop Aug 1, 2025
21 checks passed
@AdityaKhatri AdityaKhatri deleted the project/dref-imminent-v2-final-report branch August 1, 2025 11:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants