Signed-off-by: Dr M H B Ariyaratne <[email protected]>

src/main/java/lk/gov/health/phsp/bean/LetterController.java

@@ -144,8 +144,6 @@ public void processDailyCounts() {
         });
     }
 
-
-
     public String removeUpload() {
         if (removingUpload == null) {
             JsfUtil.addErrorMessage("Nothing to remove");
@@ -852,6 +850,37 @@ public String forwardOrCopyTo() {
         return toLetterView();
     }
 
+    public String forwardOrCopyToForUnitLetter() {
+        if (webUserCopy == null) {
+            JsfUtil.addErrorMessage("Select a user to transfer ownership");
+            return "";
+        }
+        if (selected == null) {
+            JsfUtil.addErrorMessage("Select a file");
+            return "";
+        }
+        save(selected);
+        DocumentHistory docHx = new DocumentHistory();
+        docHx.setHistoryType(HistoryType.Letter_Copy_or_Forward);
+        docHx.setDocument(selected);
+        docHx.setFromUser(selected.getCurrentOwner());
+        docHx.setToInsOrUser(webUserCopy);
+        docHx.setComments(comments);
+        docHx.setItem(minute);
+        docHx.setInstitution(webUserController.getLoggedInstitution());
+        saveDocumentHx(docHx);
+
+        selected.setCompleted(false);
+        documentFacade.edit(selected);
+
+        minute = null;
+        webUserCopy = null;
+        comments = "";
+
+        JsfUtil.addSuccessMessage("Letter copied/forwarded successfully");
+        return "/document/unit_letter_view";
+    }
+
     public String forwardOrCopyToAndNew() {
         if (webUserCopy == null) {
             JsfUtil.addErrorMessage("Select a user to transfer ownership");
@@ -884,6 +913,38 @@ public String forwardOrCopyToAndNew() {
         return menuController.toLetterAddNewReceivedLetter();
     }
 
+    public String forwardOrCopyToAndNewUnitLetter() {
+        if (webUserCopy == null) {
+            JsfUtil.addErrorMessage("Select a user to transfer ownership");
+            return "";
+        }
+        if (selected == null) {
+            JsfUtil.addErrorMessage("Select a file");
+            return "";
+        }
+
+        DocumentHistory docHx = new DocumentHistory();
+        docHx.setHistoryType(HistoryType.Letter_Copy_or_Forward);
+        docHx.setDocument(selected);
+        docHx.setFromUser(selected.getCurrentOwner());
+        docHx.setToInsOrUser(webUserCopy);
+        docHx.setComments(comments);
+        docHx.setItem(minute);
+        docHx.setInstitution(webUserController.getLoggedInstitution());
+
+        saveDocumentHx(docHx);
+
+        selected.setCompleted(false);
+        documentFacade.edit(selected);
+
+        minute = null;
+        webUserCopy = null;
+        comments = "";
+
+        JsfUtil.addSuccessMessage("Letter copied/forwarded successfully");
+        return menuController.toUnitLetterAdd();
+    }
+
     public String recordActionTaken() {
         if (comments == null || comments.trim().equals("")) {
             JsfUtil.addErrorMessage("Enter details of the action.");
@@ -951,7 +1012,7 @@ public String unitLetterAddSaveAndView() {
 
         return "/document/unit_letter_view";
     }
-    
+
     public String unitLetterEditSaveAndView() {
         if (selected == null) {
             JsfUtil.addErrorMessage("Not selected");
@@ -1153,7 +1214,7 @@ public String unitLetterEditSaveAndNew() {
 
         return menuController.toUnitLetterAdd();
     }
-    
+
     public String unitLetterAddSaveAndNew() {
         if (selected == null) {
             JsfUtil.addErrorMessage("Nothing to save");
@@ -1693,6 +1754,41 @@ public String toInstitutionReceivedLetterView() {
         selectedUploads = uploadFacade.findByJpql(j, m);
         return "/document/letter_view";
     }
+
+
+    public String toInstitutionReceivedUnitLetterView() {
+        System.out.println("toInstitutionReceivedLetterView");
+        String j = "select h "
+                + " from DocumentHistory h "
+                + " where h.retired=false "
+                + " and h.document=:doc "
+                + " and (h.institution=:ins or h.fromInstitution=:ins or h.toInstitution=:ins) "
+                + " order by h.id desc";
+        Map m = new HashMap();
+        m.put("doc", selected);
+        m.put("ins", webUserController.getLoggedInstitution());
+        System.out.println("m = " + m);
+        System.out.println("j = " + j);
+        selectedDocumentHistories = documentHxFacade.findByJpql(j, m);
+        System.out.println("selectedDocumentHistories = " + selectedDocumentHistories.size());
+
+        j = "select h "
+                + " from Upload h "
+                + " where h.retired=false "
+                + " and h.document=:doc "
+                + " order by h.id";
+        m = new HashMap();
+        m.put("doc", selected);
+//        m.put("ins", webUserController.getLoggedInstitution());
+        //TODO: Need to allow only original upload
+//        if (selected.getFromInstitution() != null) {
+//            m.put("fins", selected.getFromInstitution());
+//        } else {
+//            m.put("fins", webUserController.getLoggedInstitution());
+//        }
+        selectedUploads = uploadFacade.findByJpql(j, m);
+        return "/document/unit_letter_view";
+    }
 
     public String toMailDepartmentReceivedLetterView() {
         System.out.println("toMailDepartmentReceivedLetterView");
@@ -1784,9 +1880,9 @@ public String toLetterView() {
                 return toMailDepartmentReceivedLetterView();
             case Other:
             case Received_by_institution:
-                return toInstitutionReceivedLetterView();
+                return toInstitutionReceivedUnitLetterView();
         }
-        return toInstitutionReceivedLetterView();
+        return toInstitutionReceivedUnitLetterView();
     }
 
     public String toLetterViewFromDocumentHistory() {

src/main/java/lk/gov/health/phsp/bean/MenuController.java

@@ -235,6 +235,7 @@ public String toSearch() {
     }
 
     public String toAdministrationIndex() {
+        System.out.println("toAdministrationIndex");
         boolean privileged = false;
         for (UserPrivilege up : webUserController.getLoggedUserPrivileges()) {
             if (up.getPrivilege() == Privilege.Institution_Administration) {
@@ -244,10 +245,12 @@ public String toAdministrationIndex() {
                 privileged = true;
             }
         }
+        System.out.println("privileged = " + privileged);
         if (!privileged) {
             JsfUtil.addErrorMessage("You are NOT autherized");
             return "";
         }
+        System.out.println("webUserController.getLoggedUser().getWebUserRoleLevel() = " + webUserController.getLoggedUser().getWebUserRoleLevel());
         switch (webUserController.getLoggedUser().getWebUserRoleLevel()) {
             case National:
                 return "/national/admin/index";

src/main/java/lk/gov/health/phsp/bean/WebUserController.java

@@ -1027,6 +1027,7 @@ List<Privilege> getInitialPrivileges(WebUserRole role) {
         }
         switch (role) {
             case Institutional_Administrator:
+                wups.add(Privilege.Institution_Administration);
                 wups.add(Privilege.Manage_Institution_Users);
                 wups.add(Privilege.Manage_Authorised_Institutions);
             case Institutional_Super_User:
@@ -1037,6 +1038,13 @@ List<Privilege> getInitialPrivileges(WebUserRole role) {
                 wups.add(Privilege.User);
                 wups.add(Privilege.Search_File);
                 wups.add(Privilege.Retire_File);
+                wups.add(Privilege.Add_Actions_To_Letter);
+                wups.add(Privilege.Add_Letter);
+                wups.add(Privilege.Assign_Letter);
+                wups.add(Privilege.Edit_Letter);
+                wups.add(Privilege.Institutional_Mail_Management);
+                wups.add(Privilege.Receive_File);
+                wups.add(Privilege.Retire_Letter);
                 break;
             case System_Administrator:
             case Super_User:

src/main/java/lk/gov/health/phsp/entity/WebUser.java

@@ -309,7 +309,7 @@ public WebUserRole getWebUserRole() {
     public void setWebUserRole(WebUserRole webUserRole) {
         this.webUserRole = webUserRole;
     }
-    
+
     @Override
     public Boolean getInstitute() {
         return false;
@@ -492,6 +492,11 @@ public WebUserRoleLevel getWebUserRoleLevel() {
                 case Institutional_User:
                     webUserRoleLevel = WebUserRoleLevel.Institutional;
                     break;
+                case Postal_Branch_Administrator:
+                case Postal_Branch_Super_User:
+                case Postal_Branch_User:
+                    webUserRoleLevel = WebUserRoleLevel.Institutional;
+                    break;
             }
         }
         return webUserRoleLevel;

src/main/webapp/document/unit_letter_view.xhtml

@@ -295,7 +295,7 @@
                                     value="#{letterController.comments}" ></h:inputTextarea>
 
                                 <h:commandButton class="form-control btn btn-warning" value="Send &amp; New" 
-                                                 action="#{letterController.forwardOrCopyToAndNew()}" ></h:commandButton>
+                                                 action="#{letterController.forwardOrCopyToAndNewUnitLetter()}" ></h:commandButton>
                                 <h:commandButton class="form-control btn btn-primary" value="Send" 
                                                  action="#{letterController.forwardOrCopyTo()}" ></h:commandButton>
                             </p:panelGrid>

src/main/webapp/institution/admin/index.xhtml

@@ -22,7 +22,7 @@
 
             <div class="card border border-light">
               <div class="card-header bg-white fw-bold text-secondary fs-5 my-2">
-                <h:outputLabel value="System Administration"></h:outputLabel>
+                <h:outputLabel value="Institution Administration"></h:outputLabel>
               </div>
               <div class="card-body container-fluid">
                 <div class="row">