From 9417d78339bf172b47d3c5180b660355d2d16bc3 Mon Sep 17 00:00:00 2001 From: LiamStanziani Date: Tue, 17 Jun 2025 16:47:55 -0400 Subject: [PATCH 1/5] Fixed issue where disabled html attribute was disabling disease registry inputs when false --- .../oscarResearch/oscarDxResearch/dxResearch.jsp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp index 759941e462e..6d2e33f6ddb 100644 --- a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp +++ b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp @@ -234,7 +234,7 @@ + <%= disable ? "disabled" : "" %> /> "> + <%= disable ? "disabled" : "" %>/> + <%= disable ? "disabled" : "" %>/> + <%= disable ? "disabled" : "" %>/> + <%= disable ? "disabled" : "" %>/> @@ -285,11 +285,11 @@ " onClick="javascript: ResearchScriptAttach();" ) - disabled="<%=disable%>"> + <%= disable ? "disabled" : "" %>"> " - onClick="javascript: submitform('','');" disabled="<%=disable%>"> + onClick="javascript: submitform('','');" <%= disable ? "disabled" : "" %>"> <% } %> From 1873ee5e4e38c4da7aa1bf72a4980cfbbb580c63 Mon Sep 17 00:00:00 2001 From: LiamStanziani Date: Wed, 18 Jun 2025 09:34:26 -0400 Subject: [PATCH 2/5] Updated disabled logic for better readability, added comments for clarity of functionality --- .../oscarDxResearch/dxResearch.jsp | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp index 6d2e33f6ddb..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();" ) - <%= disable ? "disabled" : "" %>"> + <%=disabled%>"> " - onClick="javascript: submitform('','');" <%= disable ? "disabled" : "" %>"> + onClick="javascript: submitform('','');" <%=disabled%>"> <% } %> From 529d4009ac529af414b1d93960bede8cf06833cf Mon Sep 17 00:00:00 2001 From: LiamStanziani Date: Wed, 18 Jun 2025 12:06:42 -0400 Subject: [PATCH 3/5] Fixed 404 errors on patient echart disease registry with "Add", "Resolve", "Delete", and"Update". Fixed styling issues on administration disease registry in relation to main, fixed broken button and search due to a depricated nested:form and submit tags --- .../oscarDxResearch/pageUtil/dxResearch2Action.java | 8 ++++---- .../pageUtil/dxResearchUpdate2Action.java | 2 +- src/main/webapp/oscarReport/oscarReportDxReg.jsp | 9 +++++---- 3 files changed, 10 insertions(+), 9 deletions(-) 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..20f3d5b5947 100644 --- a/src/main/webapp/oscarReport/oscarReportDxReg.jsp +++ b/src/main/webapp/oscarReport/oscarReportDxReg.jsp @@ -23,6 +23,7 @@ <%@ 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; @@ -166,7 +167,7 @@ class="span4 jsonDxSearch"/>
- Add +
@@ -177,7 +178,7 @@ Search all patients with disease codes: - +
@@ -255,7 +256,7 @@ - Search +

Results

@@ -281,7 +282,7 @@ onclick="javascript:this.form.action='${pageContext.servletContext.contextPath}/report/DxresearchReport.do?method=patientExcelReport';this.form.submit()"> - +
From ff66c17320adb7f391661bdda4f1e49096e44afa Mon Sep 17 00:00:00 2001 From: LiamStanziani Date: Wed, 18 Jun 2025 15:28:04 -0400 Subject: [PATCH 4/5] Fixed 404 errors on "Add" and "Search" options in administration disease registry --- src/main/webapp/oscarReport/oscarReportDxReg.jsp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/oscarReport/oscarReportDxReg.jsp b/src/main/webapp/oscarReport/oscarReportDxReg.jsp index 20f3d5b5947..8ec04086e61 100644 --- a/src/main/webapp/oscarReport/oscarReportDxReg.jsp +++ b/src/main/webapp/oscarReport/oscarReportDxReg.jsp @@ -17,6 +17,7 @@ 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" %> @@ -59,6 +60,8 @@ <fmt:setBundle basename="oscarResources"/><fmt:message key="admin.admin.DiseaseRegistry"/> + +
-
+
checked + checked onclick="javascript:this.form.action='<%= request.getContextPath()%>/report/DxresearchReport.do?method=patientRegistedDistincted'"> ALL(distincted)