Merge pull request #4563 from hmislk/Issue#4146

Issue#4146
hmislk · Apr 10, 2024 · 74f8dea · 74f8dea
2 parents a399faf + dfd0af5
commit 74f8dea
Show file tree

Hide file tree

Showing 4 changed files with 515 additions and 2 deletions.
diff --git a/src/main/java/com/divudi/bean/common/NavigationController.java b/src/main/java/com/divudi/bean/common/NavigationController.java
@@ -83,6 +83,10 @@ public String navigateToDoctorSpecilaity(){
         return "/admin/staff/admin_speciality?faces-redirect=true";
     }
 
+     public String navigateToManageStaff(){
+        return "/admin/staff/hr_staff_admin?faces-redirect=true";
+    }
+
     public String navigateToAdminUserStaff(){
         return "/admin/staff/admin_user_staff?faces-redirect=true";
     }

diff --git a/src/main/webapp/admin/staff/admin_doctor.xhtml b/src/main/webapp/admin/staff/admin_doctor.xhtml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <ui:composition xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                template="admin_manage_staff_index.xhtml"
+                template="/admin/staff/admin_manage_staff_index.xhtml"
                 xmlns:h="http://xmlns.jcp.org/jsf/html"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns="http://www.w3.org/1999/xhtml"

diff --git a/src/main/webapp/admin/staff/admin_manage_staff_index.xhtml b/src/main/webapp/admin/staff/admin_manage_staff_index.xhtml
@@ -27,7 +27,7 @@
                                         <div class="d-grid gap-2">
                                             <p:commandButton  class="w-100" ajax="false" value="Doctors" action="#{navigationController.navigateToAdminDoctor()}"/>
                                             <p:commandButton  class="w-100" ajax="false" value="Consultant" action="#{navigationController.navigateToAdminDoctorConsultant()}"/>
-                                            <p:commandButton  class="w-100" ajax="false" value="Staff" action="/hr/hr_staff_admin"/>
+                                            <p:commandButton  class="w-100" ajax="false" value="Staff" action="#{navigationController.navigateToManageStaff}"/>
                                             <p:commandButton  class="w-100" ajax="false" value="View Staff Signatures" action="#{staffController.navigateToAdminStaffViewSignature()}"/>
                                             <p:commandButton  class="w-100" ajax="false" value="Add Signature for staff" action="#{navigationController.navigateToAdminStaffSignature()}"/>
                                         </div>