diff --git a/src/main/java/oscar/oscarResearch/oscarDxResearch/pageUtil/dxResearch2Action.java b/src/main/java/oscar/oscarResearch/oscarDxResearch/pageUtil/dxResearch2Action.java index 4b8641dfedd..71c844db3cb 100644 --- a/src/main/java/oscar/oscarResearch/oscarDxResearch/pageUtil/dxResearch2Action.java +++ b/src/main/java/oscar/oscarResearch/oscarDxResearch/pageUtil/dxResearch2Action.java @@ -150,7 +150,7 @@ public String execute() } if (!valid) { - response.sendRedirect("/oscarResearch/oscarDxResearch/dxResearch.jsp"); + response.sendRedirect(request.getContextPath() + "/oscarResearch/oscarDxResearch/dxResearch.jsp"); return NONE; } @@ -161,11 +161,11 @@ public String execute() StringBuilder actionforward = new StringBuilder(); if ("success".equals(forwardTo)) { - actionforward = new StringBuilder("/oscarResearch/oscarDxResearch/setupDxResearch.do"); + actionforward = new StringBuilder(request.getContextPath() + "/oscarResearch/oscarDxResearch/setupDxResearch.do"); } else if ("codeSearch".equals(forwardTo)) { - actionforward = new StringBuilder("/oscarResearch/oscarDxResearch/dxcodeSearch.do"); + actionforward = new StringBuilder(request.getContextPath() + "/oscarResearch/oscarDxResearch/dxcodeSearch.do"); } else if ("codeList".equals(forwardTo)) { - actionforward = new StringBuilder("/oscarResearch/oscarDxResearch/quickCodeList.jsp"); + actionforward = new StringBuilder(request.getContextPath() + "/oscarResearch/oscarDxResearch/quickCodeList.jsp"); } actionforward.append("?demographicNo=").append(demographicNo); actionforward.append("&providerNo=").append(providerNo); diff --git a/src/main/java/oscar/oscarResearch/oscarDxResearch/pageUtil/dxResearchUpdate2Action.java b/src/main/java/oscar/oscarResearch/oscarDxResearch/pageUtil/dxResearchUpdate2Action.java index 1033f3d3d16..045d6359411 100644 --- a/src/main/java/oscar/oscarResearch/oscarDxResearch/pageUtil/dxResearchUpdate2Action.java +++ b/src/main/java/oscar/oscarResearch/oscarDxResearch/pageUtil/dxResearchUpdate2Action.java @@ -90,7 +90,7 @@ public String execute() throws ServletException, IOException { dao.merge(research); } - StringBuffer forward = new StringBuffer("/oscarResearch/oscarDxResearch/setupDxResearch.do"); + StringBuffer forward = new StringBuffer(request.getContextPath() + "/oscarResearch/oscarDxResearch/setupDxResearch.do"); forward.append("?demographicNo=").append(demographicNo); forward.append("&providerNo=").append(providerNo); forward.append("&quickList="); diff --git a/src/main/webapp/oscarReport/oscarReportDxReg.jsp b/src/main/webapp/oscarReport/oscarReportDxReg.jsp index 765d71e18ce..fb080539126 100644 --- a/src/main/webapp/oscarReport/oscarReportDxReg.jsp +++ b/src/main/webapp/oscarReport/oscarReportDxReg.jsp @@ -17,12 +17,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --%> +<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ page import="org.oscarehr.util.SessionConstants" %> <%@ page import="org.oscarehr.common.model.ProviderPreference" %> <%@ include file="/taglibs.jsp" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ taglib uri="/WEB-INF/security.tld" prefix="security" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + <% String roleName$ = (String) session.getAttribute("userrole") + "," + (String) session.getAttribute("user"); boolean authed = true; @@ -58,6 +60,8 @@ <fmt:setBundle basename="oscarResources"/><fmt:message key="admin.admin.DiseaseRegistry"/> + +
-
+
@@ -177,7 +184,7 @@ Search all patients with disease codes:
- +
@@ -188,28 +195,28 @@
@@ -255,7 +262,7 @@ - Search +

Results

@@ -281,7 +288,7 @@ onclick="javascript:this.form.action='${pageContext.servletContext.contextPath}/report/DxresearchReport.do?method=patientExcelReport';this.form.submit()"> - + diff --git a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp index 759941e462e..25b77d5e937 100644 --- a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp +++ b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp @@ -48,11 +48,16 @@ boolean disable; SecurityManager sm = new SecurityManager(); + // Check to see if the currently logged in role has write access, if so, disable input fields present in the page if (sm.hasWriteAccess("_dx.code", roleName$)) { disable = false; } else { disable = true; } + + // Set a String based on the "disable" boolean for easy access to use html functionality of "disabled" attribute + String disabled = disable ? "disabled" : ""; + boolean showQuicklist = false; if (sm.hasWriteAccess("_dx.quicklist", roleName$)) { @@ -65,6 +70,7 @@ pageContext.setAttribute("showQuicklist", showQuicklist); pageContext.setAttribute("disable", disable); + pageContext.setAttribute("disabled", disabled); %> @@ -234,7 +240,7 @@ + <%=disabled%> /> "> + <%=disabled%>/> + <%=disabled%>/> + <%=disabled%>/> + <%=disabled%>/> @@ -285,11 +291,11 @@ " onClick="javascript: ResearchScriptAttach();" ) - disabled="<%=disable%>"> + <%=disabled%>"> " - onClick="javascript: submitform('','');" disabled="<%=disable%>"> + onClick="javascript: submitform('','');" <%=disabled%>"> <% } %>