From 90c92c443fe4ea39ca0aa38eded7cd713088c7ef Mon Sep 17 00:00:00 2001
From: piumal1999 <piumalrathnayake@hotmail.com>
Date: Wed, 28 Jul 2021 21:54:27 +0530
Subject: [PATCH] DCM-55: Add user privileges to Automation UI and Run Reports
 UI

---
 omod/src/main/resources/config.xml            |  2 +-
 omod/src/main/webapp/automation.jsp           | 67 +++++++++++++------
 omod/src/main/webapp/failedData.jsp           |  2 +
 omod/src/main/webapp/runReports.jsp           |  2 +
 omod/src/main/webapp/template/localHeader.jsp | 41 ++++++------
 5 files changed, 72 insertions(+), 42 deletions(-)

diff --git a/omod/src/main/resources/config.xml b/omod/src/main/resources/config.xml
index fa22ee7..6e0a9ab 100644
--- a/omod/src/main/resources/config.xml
+++ b/omod/src/main/resources/config.xml
@@ -121,7 +121,7 @@
 		<description>Base privilege for running the reports</description>
 	</privilege>
 	<privilege>
-		<name>Run failed data</name>
+		<name>Run Failed Data</name>
 		<description>Base privilege for pushing the failed data</description>
 	</privilege>
 	<privilege>
diff --git a/omod/src/main/webapp/automation.jsp b/omod/src/main/webapp/automation.jsp
index 976a7fd..9da5a87 100644
--- a/omod/src/main/webapp/automation.jsp
+++ b/omod/src/main/webapp/automation.jsp
@@ -1,5 +1,7 @@
 <%@ include file="/WEB-INF/template/include.jsp" %>
 <%@ include file="/WEB-INF/template/header.jsp" %>
+<openmrs:require anyPrivilege="View Automation,Run Automation,Manage Automation" otherwise="/login.htm"
+                 redirect="/module/dhisconnector/automation.form"/>
 
 <%@ include file="template/localHeader.jsp" %>
 
@@ -12,45 +14,66 @@
 <spring:message code="dhisconnector.automation.description"/>
 <form method="post">
 	<br />
-		<input type="checkbox" name="toogleAutomation" <c:if test="${automationEnabled}">checked="checked"</c:if>><spring:message code="dhisconnector.automation.toggleAutomation"/></input>
-	<br />
+    <input type="checkbox" name="toogleAutomation" <c:if test="${automationEnabled}">checked="checked"</c:if>
+           <openmrs:hasPrivilege privilege="Manage Automation" inverse="true">disabled</openmrs:hasPrivilege>>
+        <spring:message code="dhisconnector.automation.toggleAutomation"/>
+    </input>
+    <br />
     <br />
     <spring:message code="dhisconnector.automation.periodTypeMessage"/>
     <br />
     <table>
         <thead>
             <tr>
-            	<th><spring:message code="dhisconnector.automation.delete"/></th>
-            	<th><spring:message code="dhisconnector.automation.run"/></th>
+                <openmrs:hasPrivilege privilege="Manage Automation">
+            	    <th><spring:message code="dhisconnector.automation.delete"/></th>
+                </openmrs:hasPrivilege>
+                <openmrs:hasPrivilege privilege="Run Automation">
+            	    <th><spring:message code="dhisconnector.automation.run"/></th>
+                </openmrs:hasPrivilege>
                 <th><spring:message code="dhisconnector.automation.mapping"/></th>
-                <th><spring:message code="dhisconnector.automation.reRun"/></th>
+                <openmrs:hasPrivilege privilege="Run Automation">
+                    <th><spring:message code="dhisconnector.automation.reRun"/></th>
+                </openmrs:hasPrivilege>
             </tr>
         </thead>
         <tbody>
-            <tr class="evenRow">
-                <td><spring:message code="dhisconnector.automation.add"/></td>
-                <td><spring:message code="dhisconnector.automation.new"/></td>
-                <td>
-                    <select name="mapping">
-                        <option></option>
-                        <c:forEach items="${mappings}" var="mapping">
-                            <option value="${mapping.name}.${mapping.created}">${mapping.name}</option>
-                        </c:forEach>
-                    </select>
-                </td>
-                <td></td>
-            </tr>
+            <openmrs:hasPrivilege privilege="Manage Automation">
+                <tr class="evenRow">
+                    <td><spring:message code="dhisconnector.automation.add"/></td>
+                    <openmrs:hasPrivilege privilege="Run Automation">
+                        <td><spring:message code="dhisconnector.automation.new"/></td>
+                    </openmrs:hasPrivilege>
+                    <td>
+                        <select name="mapping">
+                            <option></option>
+                            <c:forEach items="${mappings}" var="mapping">
+                                <option value="${mapping.name}.${mapping.created}">${mapping.name}</option>
+                            </c:forEach>
+                        </select>
+                    </td>
+                    <td></td>
+                </tr>
+            </openmrs:hasPrivilege>
             <c:forEach items="${reportToDataSetMappings}" var="mpg">
                 <tr class="evenRow">
-                    <td><input type="checkbox" name="mappingIds" value="${mpg.id}"/></td>
-                    <td><input type="checkbox" name="runs" value="${mpg.uuid}"/></td>
+                    <openmrs:hasPrivilege privilege="Manage Automation">
+                        <td><input type="checkbox" name="mappingIds" value="${mpg.id}"/></td>
+                    </openmrs:hasPrivilege>
+                    <openmrs:hasPrivilege privilege="Run Automation">
+                        <td><input type="checkbox" name="runs" value="${mpg.uuid}"/></td>
+                    </openmrs:hasPrivilege>
                     <td>${fn:substringBefore(mpg.mapping, '.')}</td>
-                    <td><c:if test="${not empty mpg.lastRun}"><input type="checkbox" name="reRuns" value="${mpg.uuid}"/></c:if> ${mpg.lastRun}</td>
+                    <openmrs:hasPrivilege privilege="Run Automation">
+                        <td><c:if test="${not empty mpg.lastRun}"><input type="checkbox" name="reRuns" value="${mpg.uuid}"/></c:if> ${mpg.lastRun}</td>
+                    </openmrs:hasPrivilege>
                 </tr>
            </c:forEach>
         </tbody>
     </table>
-    <input type="submit" value="<spring:message code='dhisconnector.automation.submit'/>">
+    <openmrs:hasPrivilege privilege="Run Automation,Manage Automation">
+        <input type="submit" value="<spring:message code='dhisconnector.automation.submit'/>">
+    </openmrs:hasPrivilege>
 </form>
 
 <c:forEach items="${postResponse}" var="resp">
diff --git a/omod/src/main/webapp/failedData.jsp b/omod/src/main/webapp/failedData.jsp
index e335a88..e1a46da 100644
--- a/omod/src/main/webapp/failedData.jsp
+++ b/omod/src/main/webapp/failedData.jsp
@@ -1,5 +1,7 @@
 <%@ include file="/WEB-INF/template/include.jsp" %>
 <%@ include file="/WEB-INF/template/header.jsp" %>
+<openmrs:require privilege="Run Failed Data" otherwise="/login.htm"
+				 redirect="/module/dhisconnector/failedData.form"/>
 <%@ include file="template/localHeader.jsp" %>
 
 <c:if test="${showLogin == 'true'}">
diff --git a/omod/src/main/webapp/runReports.jsp b/omod/src/main/webapp/runReports.jsp
index ae64900..deeff75 100644
--- a/omod/src/main/webapp/runReports.jsp
+++ b/omod/src/main/webapp/runReports.jsp
@@ -1,5 +1,7 @@
 <%@ include file="/WEB-INF/template/include.jsp" %>
 <%@ include file="/WEB-INF/template/header.jsp" %>
+<openmrs:require privilege="Run Reports" otherwise="/login.htm"
+                 redirect="/module/dhisconnector/runReports.form"/>
 
 <openmrs:htmlInclude file="/moduleResources/dhisconnector/dhisconnector.css"/>
 <openmrs:htmlInclude file="/moduleResources/dhisconnector/dhisconnector-runreports.js"/>
diff --git a/omod/src/main/webapp/template/localHeader.jsp b/omod/src/main/webapp/template/localHeader.jsp
index 3345f9c..5fa1924 100644
--- a/omod/src/main/webapp/template/localHeader.jsp
+++ b/omod/src/main/webapp/template/localHeader.jsp
@@ -19,12 +19,13 @@
 		</li>
 	</openmrs:hasPrivilege>
 
-	<li
-		<c:if test='<%= request.getRequestURI().contains("/automation") %>'>class="active"</c:if>>
-		<a
-		href="${pageContext.request.contextPath}/module/dhisconnector/automation.form"><spring:message
-				code="dhisconnector.automation" /></a>
-	</li>
+	<openmrs:hasPrivilege privilege="View Automation,Run Automation,Manage Automation">
+		<li <c:if test='<%= request.getRequestURI().contains("/automation") %>'>class="active"</c:if>>
+			<a href="${pageContext.request.contextPath}/module/dhisconnector/automation.form">
+				<spring:message code="dhisconnector.automation" />
+			</a>
+		</li>
+	</openmrs:hasPrivilege>
 	
 	<li
 			<c:if test='<%= request.getRequestURI().contains("/dhis2BackupImport") %>'>class="active"</c:if>>
@@ -53,20 +54,22 @@
 				href="${pageContext.request.contextPath}/module/dhisconnector/manageMappings.form"><spring:message
 				code="dhisconnector.manageMappings" /></a>
 	</li>
-	
-	<li
-			<c:if test='<%= request.getRequestURI().contains("/runReports") %>'>class="active"</c:if>>
-		<a
-				href="${pageContext.request.contextPath}/module/dhisconnector/runReports.form"><spring:message
-				code="dhisconnector.runReports" /></a>
-	</li>
 
-	<li
-			<c:if test='<%= request.getRequestURI().contains("/failedData") %>'>class="active"</c:if>>
-		<a
-				href="${pageContext.request.contextPath}/module/dhisconnector/failedData.form"><spring:message
-				code="dhisconnector.failedData" /></a>
-	</li>
+	<openmrs:hasPrivilege privilege="Run Reports">
+		<li <c:if test='<%= request.getRequestURI().contains("/runReports") %>'>class="active"</c:if>>
+			<a href="${pageContext.request.contextPath}/module/dhisconnector/runReports.form">
+				<spring:message code="dhisconnector.runReports" />
+			</a>
+		</li>
+	</openmrs:hasPrivilege>
+
+	<openmrs:hasPrivilege privilege="Run Failed Data">
+		<li <c:if test='<%= request.getRequestURI().contains("/failedData") %>'>class="active"</c:if>>
+			<a href="${pageContext.request.contextPath}/module/dhisconnector/failedData.form">
+				<spring:message code="dhisconnector.failedData" />
+			</a>
+		</li>
+	</openmrs:hasPrivilege>
 	
 	<!-- Add further links here -->
 </ul>