Merge branch 'develop' into develop

I-TECH-UW · Jul 23, 2024 · 6870b26 · 6870b26
2 parents 0090653 + c6c5c59
commit 6870b26
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/frontend/src/components/admin/Admin.js b/frontend/src/components/admin/Admin.js
@@ -148,6 +148,12 @@ function Admin() {
             title={intl.formatMessage({ id: "admin.formEntryConfig" })}
             renderIcon={ListDropdown}
           >
+            <SideNavMenuItem href="#NonConformityConfigurationMenu">
+              <FormattedMessage id="sidenav.label.admin.formEntry.nonconformityconfig" />
+            </SideNavMenuItem>
+            <SideNavMenuItem href="#MenuStatementConfigMenu">
+              <FormattedMessage id="sidenav.label.admin.formEntry.menustatementconfig" />
+            </SideNavMenuItem>
             <SideNavMenuItem href="#WorkPlanConfigurationMenu">
               <FormattedMessage id="sidenav.label.admin.formEntry.Workplanconfig" />
             </SideNavMenuItem>
@@ -257,6 +263,18 @@ function Admin() {
         <CommonProperties />
       </PathRoute>
 
+      <PathRoute path="#NonConformityConfigurationMenu">
+        <ConfigMenuDisplay
+          menuType="NonConformityConfigurationMenu"
+          id="sidenav.label.admin.formEntry.nonconformityconfig"
+        />
+      </PathRoute>
+      <PathRoute path="#MenuStatementConfigMenu">
+        <ConfigMenuDisplay
+          menuType="MenuStatementConfigMenu"
+          id="sidenav.label.admin.formEntry.menustatementconfig"
+        />
+      </PathRoute>
       <PathRoute path="#ValidationConfigurationMenu">
         <ConfigMenuDisplay
           menuType="ValidationConfigurationMenu"

diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json
@@ -284,6 +284,8 @@
   "sidenav.label.admin.usermgt": "User Management",
   "sidenav.label.admin.labNumber": "Lab Number Management",
   "sidenav.label.admin.commonproperties": "Application Properties",
+  "sidenav.label.admin.formEntry.nonconformityconfig": "NonConformity Configuration",
+  "sidenav.label.admin.formEntry.menustatementconfig": "MenuStatement Configuration",
   "sidenav.label.admin.formEntry.validationconfig": "Validation Configuration",
   "sidenav.label.admin.formEntry.sampleEntryconfig": "Order Entry Configuration",
   "sidenav.label.admin.formEntry.Workplanconfig": "WorkPlan Configuration",

diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json
@@ -263,6 +263,8 @@
   "sidenav.label.admin.usermgt": "Gestion des Utilisateurs",
   "sidenav.label.admin.labNumber": "Gestion des Numéro de Laboratoire",
   "sidenav.label.admin.commonproperties": "Propriétés de l'application",
+  "sidenav.label.admin.formEntry.nonconformityconfig": "Configuration de Non-Conformité",
+  "sidenav.label.admin.formEntry.menustatementconfig": "Configuration de MenuStatement",
   "sidenav.label.admin.formEntry.validationconfig": "Configuration de validation",
   "sidenav.label.admin.formEntry.sampleEntryconfig": "Configuration de saisie de commande",
   "sidenav.label.admin.formEntry.Workplanconfig": "Configuration du plan de travail",