Merge pull request #55 from EyeSeeTea/fix/hosp-redirect

do not redirect for PPS HOSPITAL survey type
EyeSeeTea · May 23, 2024 · d634b0f · d634b0f
2 parents ecb550e + d5ccaba
commit d634b0f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -153,6 +153,9 @@ msgstr ""
 msgid "Org Unit"
 msgstr ""
 
+msgid "Facility Code"
+msgstr ""
+
 msgid "Start Date"
 msgstr ""
 

diff --git a/i18n/es.po b/i18n/es.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-05-20T17:45:48.260Z\n"
+"POT-Creation-Date: 2024-05-22T13:24:01.336Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -153,6 +153,9 @@ msgstr ""
 msgid "Org Unit"
 msgstr ""
 
+msgid "Facility Code"
+msgstr ""
+
 msgid "Start Date"
 msgstr ""
 

diff --git a/src/webapp/pages/survey-list/useRedirectHome.ts b/src/webapp/pages/survey-list/useRedirectHome.ts
@@ -9,7 +9,6 @@ export function useRedirectHome() {
     const {
         currentPPSSurveyForm,
         currentPrevalenceSurveyForm,
-        currentCountryQuestionnaire,
         currentHospitalForm,
         currentWardRegister,
         currentFacilityLevelForm,
@@ -30,9 +29,6 @@ export function useRedirectHome() {
 
             if (
                 (formType === "PPSCountryQuestionnaire" && !currentPPSSurveyForm) ||
-                (hasAdminAccess &&
-                    formType === "PPSHospitalForm" &&
-                    !currentCountryQuestionnaire) ||
                 (formType === "PPSWardRegister" && !currentHospitalForm) ||
                 (formType === "PPSPatientRegister" && !currentWardRegister) ||
                 (hasAdminAccess &&
@@ -52,7 +48,6 @@ export function useRedirectHome() {
             currentModule,
             userGroups,
             currentPPSSurveyForm,
-            currentCountryQuestionnaire,
             currentHospitalForm,
             currentWardRegister,
             currentPrevalenceSurveyForm,