From ce887fd8da5aa70dcdc5426db845f1c1ce6d540e Mon Sep 17 00:00:00 2001 From: Simona Domnisoru Date: Fri, 29 Sep 2023 16:14:32 +0200 Subject: [PATCH] fix: custom form not being rendered --- i18n/en.pot | 19 ++----------------- .../useMergeFormFoundationsIfApplicable.js | 5 +++++ 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/i18n/en.pot b/i18n/en.pot index c0dd399bf9..06e8de8d33 100644 --- a/i18n/en.pot +++ b/i18n/en.pot @@ -5,8 +5,8 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -"POT-Creation-Date: 2023-09-28T11:41:14.981Z\n" -"PO-Revision-Date: 2023-09-28T11:41:14.981Z\n" +"POT-Creation-Date: 2023-09-29T14:14:34.330Z\n" +"PO-Revision-Date: 2023-09-29T14:14:34.330Z\n" msgid "Choose one or more dates..." msgstr "Choose one or more dates..." @@ -1004,11 +1004,6 @@ msgstr "You can also choose a program from the top bar and search in that progra msgid "Choose a type to start searching" msgstr "Choose a type to start searching" -msgid "Fill in at least {{count}} attribute to search" -msgid_plural "Fill in at least {{count}} attribute to search" -msgstr[0] "Fill in at least {{count}} attribute to search" -msgstr[1] "Fill in at least {{count}} attributes to search" - msgid "Search {{name}}" msgstr "Search {{name}}" @@ -1265,22 +1260,12 @@ msgstr "Scheduled automatically for {{suggestedScheduleDate}}" msgid "The scheduled date matches the suggested date, but can be changed if needed." msgstr "The scheduled date matches the suggested date, but can be changed if needed." -msgid "The scheduled date is {{count}} days {{position}} the suggested date." -msgid_plural "The scheduled date is {{count}} days {{position}} the suggested date." -msgstr[0] "The scheduled date is {{count}} day {{position}} the suggested date." -msgstr[1] "The scheduled date is {{count}} days {{position}} the suggested date." - msgid "after" msgstr "after" msgid "before" msgstr "before" -msgid "There are {{count}} scheduled event in {{orgUnitName}} on this day." -msgid_plural "There are {{count}} scheduled event in {{orgUnitName}} on this day." -msgstr[0] "There are {{count}} scheduled event in {{orgUnitName}} on this day." -msgstr[1] "There are {{count}} scheduled events in {{orgUnitName}} on this day." - msgid "Scheduling an event in {{stageName}} for {{programName}} in {{orgUnitName}}" msgstr "Scheduling an event in {{stageName}} for {{programName}} in {{orgUnitName}}" diff --git a/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/useMergeFormFoundationsIfApplicable.js b/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/useMergeFormFoundationsIfApplicable.js index b5f7bbf01f..77235be403 100644 --- a/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/useMergeFormFoundationsIfApplicable.js +++ b/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/useMergeFormFoundationsIfApplicable.js @@ -57,6 +57,11 @@ export const useMergeFormFoundationsIfApplicable = ( sectionName: section.name, }); o.group = Section.groups.EVENT; + o.customForm = section.customForm; + o.showContainer = section.showContainer; + o.open = section.open; + o.visible = section.visible; + o.displayDescription = section.displayDescription; }); addElements(section, newSection); renderFoundation.addSection(newSection);