From 680c2953cbe64ce20b5a19d7a55960428b132337 Mon Sep 17 00:00:00 2001 From: Kate Yang <150059882+kateyang1998@users.noreply.github.com> Date: Fri, 13 Dec 2024 16:00:56 -0500 Subject: [PATCH 1/4] fix: fixed receivePayment compilation error and CopyFavourites2 syntax error --- src/main/webapp/billing/CA/BC/receivePayment.jsp | 2 +- src/main/webapp/oscarRx/CopyFavorites2.jsp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/billing/CA/BC/receivePayment.jsp b/src/main/webapp/billing/CA/BC/receivePayment.jsp index fd30d8e8c7e..ed8534b467a 100644 --- a/src/main/webapp/billing/CA/BC/receivePayment.jsp +++ b/src/main/webapp/billing/CA/BC/receivePayment.jsp @@ -32,7 +32,7 @@
<% - oscar.oscarBilling.ca.bc.pageUtil.ReceivePaymentActionForm frm = (oscar.oscarBilling.ca.bc.pageUtil.ReceivePaymentActionForm) request.getAttribute("receivePaymentActionForm"); + oscar.oscarBilling.ca.bc.pageUtil.ReceivePayment2Action frm = (oscar.oscarBilling.ca.bc.pageUtil.ReceivePayment2Action) request.getAttribute("receivePaymentActionForm"); %> <%=java.text.NumberFormat.getCurrencyInstance().format(new Double(frm.getAmountReceived()))%>     diff --git a/src/main/webapp/oscarRx/CopyFavorites2.jsp b/src/main/webapp/oscarRx/CopyFavorites2.jsp index 3d5b6bbaa9a..b02481b8b63 100644 --- a/src/main/webapp/oscarRx/CopyFavorites2.jsp +++ b/src/main/webapp/oscarRx/CopyFavorites2.jsp @@ -62,10 +62,10 @@ <% - oscar.oscarRx.data.RxCodesData.FrequencyCode[] freq = new oscar.oscarRx.data.RxCodesData().getFrequencyCodes(); int i, j; + %> @@ -79,7 +79,6 @@ - %> diff --git a/src/main/webapp/admin/billingSettings.jsp b/src/main/webapp/admin/billingSettings.jsp index dff2fa5cac9..5dd6a15050e 100644 --- a/src/main/webapp/admin/billingSettings.jsp +++ b/src/main/webapp/admin/billingSettings.jsp @@ -43,7 +43,7 @@ <%@ taglib uri="/WEB-INF/oscar-tag.tld" prefix="oscar" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ page import="org.oscarehr.util.SpringUtils" %> <%@ page import="org.owasp.encoder.Encode" %> <%@ page import="org.oscarehr.common.dao.PropertyDao" %> diff --git a/src/main/webapp/casemgmt/IssueSearch.jsp b/src/main/webapp/casemgmt/IssueSearch.jsp index 786a9103808..655b5f3c074 100644 --- a/src/main/webapp/casemgmt/IssueSearch.jsp +++ b/src/main/webapp/casemgmt/IssueSearch.jsp @@ -108,39 +108,27 @@ <%-- table contents --%> - - " align="center"> - - - - Local - - - + + + + + + + + Local + + Community - - - - - - - + - - - - - - - - - - - - + ${newIssueCheckList.issue.code} + + ${newIssueCheckList.issue.description} + + ${newIssueCheckList.issue.role} + + -
diff --git a/src/main/webapp/casemgmt/navigation.jsp b/src/main/webapp/casemgmt/navigation.jsp index b4b0f6c1e4c..e6df8030f10 100644 --- a/src/main/webapp/casemgmt/navigation.jsp +++ b/src/main/webapp/casemgmt/navigation.jsp @@ -29,6 +29,7 @@ <%@page import="org.oscarehr.util.LoggedInInfo" %> <% long loadPage = System.currentTimeMillis(); %> <%@ include file="/casemgmt/taglibs.jsp" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib uri="/WEB-INF/caisi-tag.tld" prefix="caisi" %> <%@ page import="org.apache.commons.lang.StringEscapeUtils" %> <%@ page import="oscar.oscarEncounter.oscarMeasurements.MeasurementFlowSheet" %> @@ -335,24 +336,18 @@ @@ -364,17 +359,13 @@ @@ -431,7 +422,7 @@ onchange="javascript:popUpMsg(600,900,this.options[this.selectedIndex].value)"> - + diff --git a/src/main/webapp/casemgmt/noteIssueList.jsp b/src/main/webapp/casemgmt/noteIssueList.jsp index ece8f64437c..f14c5754fe1 100644 --- a/src/main/webapp/casemgmt/noteIssueList.jsp +++ b/src/main/webapp/casemgmt/noteIssueList.jsp @@ -23,16 +23,14 @@ Ontario, Canada --%> - <%@page import="org.oscarehr.util.LoggedInInfo" %> -<%@ page - import="org.oscarehr.casemgmt.web.formbeans.CaseManagementEntryFormBean, org.oscarehr.common.model.Facility" %> +<%@page import="org.oscarehr.casemgmt.web.formbeans.CaseManagementEntryFormBean, org.oscarehr.common.model.Facility" %> <%@page import="org.apache.commons.lang.StringEscapeUtils" %> <%@page import="org.oscarehr.PMmodule.model.Program" %> <%@page import="org.oscarehr.PMmodule.dao.ProgramDao" %> <%@page import="org.oscarehr.util.SpringUtils" %> <%@ include file="/casemgmt/taglibs.jsp" %> - +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <% String roleName$ = (String) session.getAttribute("userrole") + "," + (String) session.getAttribute("user"); boolean authed = true; @@ -46,10 +44,7 @@ return; } %> - - - + <% LoggedInInfo loggedInInfo73557 = LoggedInInfo.getLoggedInInfoFromSession(request); String noteIndex = ""; @@ -62,87 +57,85 @@ request.setAttribute("caseManagementEntryForm", frm); } %> - - - <% - noteIndex = request.getParameter("newNoteIdx"); - %> -
"> -
" - style="float: right; margin-right: 3px;"> - - - <% - noteIndex = "0"; - %> -
-
- - - - <% - noteIndex = String.valueOf(frm.getCaseNote().getId()); - %> -
"> -
" - style="float: right; margin-right: 3px;"> - + + + + + +
+
+
+ + + +
+
+
+ + + + + +
+
+
+
+ +
- - : "> -   - ', event);"> - - - : " - id="observationDate_cal" - alt="calendar"> "> - rev', event);"> - + + + +   + + +   + + + + ${caseManagementEntryForm.caseNote.revision} + + + + +   + calendar  + "> + rev + + ${caseManagementEntryForm.caseNote.revision} + + +
: - + +
    - - - -
  • ; + + +
  • ${editor.formattedName}; - - -
    • + + ${editor.formattedName} -     - + +
- + +
 
- + +
<% @@ -156,24 +149,28 @@ if (currentFacility.isEnableEncounterTime() || (currentProgram != null && currentProgram.getEnableEncounterTime())) { %>
- - :  - "> - - : - "> - - - - - :  - "> :  - "> - + + + + :  + + ${caseManagementEntryForm.caseNote.hourOfEncounterTime} + : + + ${caseManagementEntryForm.caseNote.minuteOfEncounterTime} + + + + + :  +  :  + + +
<%}%> @@ -181,25 +178,29 @@ if (currentFacility.isEnableEncounterTransportationTime() || (currentProgram != null && currentProgram.isEnableEncounterTransportationTime())) { %>
- - :  - "> - - : - "> - - - - - :  - "> :  - "> - + + + + :  + + ${caseManagementEntryForm.caseNote.hourOfEncTransportationTime} + : + + ${caseManagementEntryForm.caseNote.minuteOfEncTransportationTime} + + + + + :  +  :  + + + +
<%}%> @@ -211,56 +212,77 @@
:  - - - - "" - + + + + + + """" + +
- -<%-- -
 
- --%> - -
- + + + +
+ + + +
    - +
    • -     +

- - -

+ + + +
+
- + +
@@ -268,112 +290,77 @@ <% int countResolvedIssue = -1; %> - - - <% - String winame = "window" + issueCheckList.getIssueDisplay().getDescription(); - winame = winame.replaceAll("\\s|\\/|\\*", "_"); - winame = winame.replaceAll("'", ""); - winame = StringEscapeUtils.escapeJavaScript(winame); - countResolvedIssue++; - if (countResolvedIssue % 2 == 0) { - %> - - <% - } - %> - - - - - <% - if (countResolvedIssue % 2 != 0) { - %> - - <% - } - %> - - + + + + + + + + + + +
- <% - String submitString = "this.form.method.value='issueChange';"; - submitString = submitString + "this.form.lineId.value=" + "'" + ind.intValue() + "'; return ajaxUpdateIssues('issueChange', $('noteIssues').up().id);"; - String id = "noteIssue" + ind; - org.oscarehr.casemgmt.web.CheckBoxBean cbb = (org.oscarehr.casemgmt.web.CheckBoxBean) pageContext.getAttribute("issueCheckList"); - boolean writeAccess = cbb.getIssueDisplay().isWriteAccess(); - boolean disabled = !writeAccess; - %> - - - - - - - - - <% - String submitDelete = "removeIssue('" + winame + "');document.forms['caseManagementEntryForm'].deleteId.value=" + "'" + ind.intValue() + "';return ajaxUpdateIssues('issueDelete', $('noteIssues').up().id);"; - %> -   - Delete -   - - - - <% - String submitChange = "return changeDiagnosisResolved('" + ind.intValue() + "');"; - %> -   - Change - - - - -
+ + + + + + + + + + + + + + + + + + + +   + Delete  + + + + +   + Change + + +
@@ -384,101 +371,82 @@ - - - - - - <% - String winame = "window" + issueCheckList.getIssueDisplay().getDescription(); - winame = winame.replaceAll("\\s|\\/|\\*", "_"); - winame = winame.replaceAll("'", ""); - winame = StringEscapeUtils.escapeJavaScript(winame); - countUnresolvedIssue++; - if (countUnresolvedIssue % 2 == 0) { - %> - <% - } - %> - - <% if (countUnresolvedIssue % 2 != 0) { %> - - <% } %> - - + + + + + + + + + + + + + + + + + + + + + +
- <% - String submitString = "this.form.method.value='issueChange';"; - submitString = submitString + "this.form.lineId.value=" + "'" + ind.intValue() + "'; return ajaxUpdateIssues('issueChange', $('noteIssues').up().id);"; - String id = "noteIssue" + ind; - org.oscarehr.casemgmt.web.CheckBoxBean cbb = (org.oscarehr.casemgmt.web.CheckBoxBean) pageContext.getAttribute("issueCheckList"); - boolean writeAccess = cbb.getIssueDisplay().isWriteAccess(); - boolean disabled = !writeAccess; - %> - - - - - - - <% - String submitDelete = "removeIssue('" + winame + "');document.forms['caseManagementEntryForm'].deleteId.value=" + "'" + ind.intValue() + "';return ajaxUpdateIssues('issueDelete', $('noteIssues').up().id);"; - %> -   - Delete -   - - - <% - String submitChange = "return changeDiagnosisUnresolved('" + ind.intValue() + "');"; - %> -   - Change - -
+ + + + + + + + + + ${issueCheckList.issueDisplay.description} + + + + +   + Delete +   + + +   + Change + + +
@@ -489,34 +457,37 @@ //check to see if we need to update div containers to most recent note id //this happens only when we're called thru ajaxsave - - var origId = ""; - var newId = ""; - var oldDiv; - var newDiv; - var prequel = ["n", "sig", "signed", "full", "bgColour", "print", "editWarn"]; - - for (var idx = 0; idx < prequel.length; ++idx) { - oldDiv = prequel[idx] + origId; - newDiv = prequel[idx] + newId; - if ($(oldDiv) != null) - $(oldDiv).id = newDiv; - } - updatedNoteId = newId; - - <%//CaseManagementEntryFormBean form = (CaseManagementEntryFormBean)request.getAttribute("caseManagementEntryForm"); - String noteTxt = frm.getCaseNote().getNote(); - noteTxt = org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(noteTxt);%> - completeChangeToView("<%=noteTxt%>", newId); - if (origId.substr(0, 1) == "0") { - $("nc" + origId).id = "nc" + numNotes; - ++numNotes; - } + + + - - alert(""); - - var c = "bgColour" + "<%=noteIndex%>"; var txtStyles = $F(c).split(";"); @@ -542,7 +513,7 @@ } //do we have a custom encounter type? if so add an option to the encounter type select - var encounterType = ''; + var encounterType = '${caseManagementEntryForm.caseNote.encounter_type}'; var selectEnc = "<%=encSelect%>"; if ($(selectEnc) != null) { diff --git a/src/main/webapp/casemgmt/showHistory.jsp b/src/main/webapp/casemgmt/showHistory.jsp index 61b44134120..d49629eed6f 100644 --- a/src/main/webapp/casemgmt/showHistory.jsp +++ b/src/main/webapp/casemgmt/showHistory.jsp @@ -23,7 +23,7 @@ Ontario, Canada --%> - +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ include file="/casemgmt/taglibs.jsp" %> <%@page import="org.oscarehr.casemgmt.model.CaseManagementNote" %> <% @@ -58,7 +58,7 @@

- +

diff --git a/src/main/webapp/casemgmt/viewNotes.jsp b/src/main/webapp/casemgmt/viewNotes.jsp index 2170f8e4887..b3e25668244 100644 --- a/src/main/webapp/casemgmt/viewNotes.jsp +++ b/src/main/webapp/casemgmt/viewNotes.jsp @@ -23,7 +23,7 @@ Ontario, Canada --%> - +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@page import="org.apache.commons.lang.StringEscapeUtils" %> <%@page import="oscar.util.ConversionUtils" %> <%@page import="org.oscarehr.casemgmt.web.NoteDisplay" %> @@ -58,9 +58,8 @@ String titleMsg = bundle.getString(titleParam); %> - - + +
">

@@ -94,124 +93,48 @@ num" diff --git a/src/main/webapp/oscarMDS/Split.jsp b/src/main/webapp/oscarMDS/Split.jsp index a80fd3f9e5b..9733f91985e 100644 --- a/src/main/webapp/oscarMDS/Split.jsp +++ b/src/main/webapp/oscarMDS/Split.jsp @@ -10,7 +10,7 @@ --%> <%@ page import="java.util.*" %> <%@ page import="org.oscarehr.util.SpringUtils, org.oscarehr.common.model.Document" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ page import="org.oscarehr.common.dao.DocumentDao" %> <%@ taglib uri="/WEB-INF/security.tld" prefix="security" %> diff --git a/src/main/webapp/oscarRx/AddReaction.jsp b/src/main/webapp/oscarRx/AddReaction.jsp index 305d7dff98f..4dc087a7979 100644 --- a/src/main/webapp/oscarRx/AddReaction.jsp +++ b/src/main/webapp/oscarRx/AddReaction.jsp @@ -21,10 +21,10 @@ McMaster University Hamilton Ontario, Canada - + --%> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ page import="org.oscarehr.util.LoggedInInfo" %> <%@ taglib uri="/WEB-INF/security.tld" prefix="security" %> diff --git a/src/main/webapp/oscarRx/ChooseDrug.jsp b/src/main/webapp/oscarRx/ChooseDrug.jsp index a6307694835..0ac7ffee7f2 100644 --- a/src/main/webapp/oscarRx/ChooseDrug.jsp +++ b/src/main/webapp/oscarRx/ChooseDrug.jsp @@ -25,6 +25,7 @@ --%> <%@ taglib uri="/WEB-INF/security.tld" prefix="security" %> <% + oscar.oscarRx.pageUtil.RxSessionBean bean = null; String roleName2$ = (String) session.getAttribute("userrole") + "," + (String) session.getAttribute("user"); boolean authed = true; %> @@ -51,7 +52,7 @@ <% // Directly access the RxSessionBean from the session - oscar.oscarRx.pageUtil.RxSessionBean bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); + bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); if (bean != null && !bean.isValid()) { response.sendRedirect("error.html"); return; // Ensure no further JSP processing diff --git a/src/main/webapp/oscarRx/CopyFavorites2.jsp b/src/main/webapp/oscarRx/CopyFavorites2.jsp index b02481b8b63..ba168040db9 100644 --- a/src/main/webapp/oscarRx/CopyFavorites2.jsp +++ b/src/main/webapp/oscarRx/CopyFavorites2.jsp @@ -25,7 +25,6 @@ --%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> - <%@ page import="java.util.*" %> <%@ page import="org.oscarehr.util.SpringUtils" %> <%@ page import="org.oscarehr.common.dao.FavoritesDao" %> @@ -38,13 +37,30 @@ FavoritesDao favoritesDao = SpringUtils.getBean(FavoritesDao.class); FavoritesPrivilegeDao favoritesPrivilegeDao = SpringUtils.getBean(FavoritesPrivilegeDao.class); ProviderDao providerDao = SpringUtils.getBean(ProviderDao.class); + + // Setting default values + String providerNo = (String) request.getAttribute("providerNo"); + boolean share = false; + FavoritesPrivilege fp = favoritesPrivilegeDao.findByProviderNo(providerNo); + if (fp != null) { + share = fp.isOpenToPublic(); + } + + List allProviders = favoritesPrivilegeDao.getProviders(); + String copyProviderNo = (String) request.getAttribute("copyProviderNo"); + if (copyProviderNo == null) { + copyProviderNo = ""; + } + + oscar.oscarRx.data.RxCodesData.FrequencyCode[] freq = new oscar.oscarRx.data.RxCodesData().getFrequencyCodes(); %> + <fmt:setBundle basename="oscarResources"/><fmt:message key="SearchDrug.title.CopyFavorites"/> "> - + @@ -56,348 +72,120 @@ + - - <% - oscar.oscarRx.data.RxCodesData.FrequencyCode[] freq = new oscar.oscarRx.data.RxCodesData().getFrequencyCodes(); - - int i, j; - %> - - - - - - - - - - - - - - - - - -
- - /> - - - <%@ include file="TopLinks.jsp"%> - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
-
>
-
-
-
-
-
-
Choose provider who share the favorites
-
- -
-
- - - - - - - - - - - - - - name="record<%= i%>Line1"> - - - <% if (!isCustom) {%> - name="record<%= i%>Line2"> - - - - - <% } else {%> - name="record<%= i%>Line2"> - - - <% }%> - name="record<%= i%>Line3"> - - - - - - - - - - - > - - - - - - - - - - - - - <% } //for i %> - -
- - - - - -
- - Check off this - favorite to copy -
Favorite Name: -     -
Brand Name:<%= fav.getBn()%> - Generic Name:<%= fav.getGn()%> -  
Custom Drug Name: -
Take: - to For: Quantity: Repeats:No Subs: - checked - <%}%> class=tblRow size=1 value="on"/>PRN: checked <%}%> class=tblRow size=1 - value="on"/>
- - - - - -
Special Instructions:
- Custom Instructions:  - checked - <%}%>>
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
-
-
> - > Setting
-
-
-
Your Favorite Share Setting
-
-
- Share My Favorites /> - Won't Share/> - - -
-
-
-
-
 
-
+
+ + + + + + <%@ include file="TopLinks.jsp"%> + + + + +
+ + + + + + + + + + + + + + + +
+
+ + + + > + + + +
+
+
+ +
+
+
+
Choose provider who share the favorites
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ Favorite Name: + + +
Brand Name:${fav.bn}Generic Name:${fav.gn}
Take: + + to + +
+
+
+
+
diff --git a/src/main/webapp/oscarRx/ListDrugs.jsp b/src/main/webapp/oscarRx/ListDrugs.jsp index 7abc5d32199..5421a83ef2e 100644 --- a/src/main/webapp/oscarRx/ListDrugs.jsp +++ b/src/main/webapp/oscarRx/ListDrugs.jsp @@ -54,6 +54,7 @@ <%@page import="org.oscarehr.managers.CodingSystemManager" %> <% oscar.oscarRx.data.RxPatientData.Patient patient = null; + oscar.oscarRx.pageUtil.RxSessionBean bean = null; %> @@ -61,7 +62,7 @@ <% // Directly access the RxSessionBean from the session - oscar.oscarRx.pageUtil.RxSessionBean bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); + bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); if (bean != null && !bean.isValid()) { response.sendRedirect("error.html"); return; // Ensure no further JSP processing diff --git a/src/main/webapp/oscarRx/ManagePharmacy.jsp b/src/main/webapp/oscarRx/ManagePharmacy.jsp index cddb6f3978d..585df2ae90d 100644 --- a/src/main/webapp/oscarRx/ManagePharmacy.jsp +++ b/src/main/webapp/oscarRx/ManagePharmacy.jsp @@ -30,7 +30,7 @@ import="oscar.oscarRx.pageUtil.*,oscar.oscarRx.data.*,java.util.*" %> <%@ taglib uri="/WEB-INF/security.tld" prefix="security" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <% String roleName2$ = (String) session.getAttribute("userrole") + "," + (String) session.getAttribute("user"); boolean authed = true; diff --git a/src/main/webapp/oscarRx/ManagePharmacy2.jsp b/src/main/webapp/oscarRx/ManagePharmacy2.jsp index 97a5e6f2306..40698f938ec 100644 --- a/src/main/webapp/oscarRx/ManagePharmacy2.jsp +++ b/src/main/webapp/oscarRx/ManagePharmacy2.jsp @@ -29,6 +29,7 @@ <%@ taglib uri="/WEB-INF/security.tld" prefix="security" %> <% + oscar.oscarRx.pageUtil.RxSessionBean bean = null; String roleName2$ = (String) session.getAttribute("userrole") + "," + (String) session.getAttribute("user"); boolean authed = true; %> @@ -172,7 +173,7 @@ <% // Directly access the RxSessionBean from the session - oscar.oscarRx.pageUtil.RxSessionBean bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); + bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); if (bean != null && !bean.isValid()) { response.sendRedirect("error.html"); return; // Ensure no further JSP processing diff --git a/src/main/webapp/oscarRx/PrintDrugProfile2.jsp b/src/main/webapp/oscarRx/PrintDrugProfile2.jsp index 5c006351877..712e133bb4f 100644 --- a/src/main/webapp/oscarRx/PrintDrugProfile2.jsp +++ b/src/main/webapp/oscarRx/PrintDrugProfile2.jsp @@ -34,13 +34,16 @@ <%@page import="java.util.List" %> <%@page import="org.oscarehr.util.LoggedInInfo" %> <%@page import="java.util.ArrayList,oscar.util.*,java.util.*,org.oscarehr.common.model.Drug,org.oscarehr.common.dao.*" %> +<% + oscar.oscarRx.pageUtil.RxSessionBean bean = null; +%> <% // Directly access the RxSessionBean from the session - oscar.oscarRx.pageUtil.RxSessionBean bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); + bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); if (bean != null && !bean.isValid()) { response.sendRedirect("error.html"); return; // Ensure no further JSP processing diff --git a/src/main/webapp/oscarRx/SearchDrug.jsp b/src/main/webapp/oscarRx/SearchDrug.jsp index 47f372b644a..194f31143da 100644 --- a/src/main/webapp/oscarRx/SearchDrug.jsp +++ b/src/main/webapp/oscarRx/SearchDrug.jsp @@ -39,6 +39,7 @@ <% + oscar.oscarRx.pageUtil.RxSessionBean bean = null; String roleName2$ = (String) session.getAttribute("userrole") + "," + (String) session.getAttribute("user"); boolean authed = true; %> @@ -58,7 +59,7 @@ <% // Directly access the RxSessionBean from the session - oscar.oscarRx.pageUtil.RxSessionBean bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); + bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); if (bean != null && !bean.isValid()) { response.sendRedirect("error.html"); return; // Ensure no further JSP processing diff --git a/src/main/webapp/oscarRx/SelectPharmacy.jsp b/src/main/webapp/oscarRx/SelectPharmacy.jsp index 42dbbfcc53b..eaa1681a3f7 100644 --- a/src/main/webapp/oscarRx/SelectPharmacy.jsp +++ b/src/main/webapp/oscarRx/SelectPharmacy.jsp @@ -24,11 +24,13 @@ --%> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ page import="oscar.oscarRx.data.*,java.util.*" %> <%@ taglib uri="/WEB-INF/security.tld" prefix="security" %> <% + oscar.oscarRx.pageUtil.RxSessionBean bean = null; + oscar.oscarRx.data.RxPatientData.Patient patient = null; String roleName2$ = (String) session.getAttribute("userrole") + "," + (String) session.getAttribute("user"); boolean authed = true; %> @@ -54,12 +56,12 @@ <% // Directly access the RxSessionBean from the session - oscar.oscarRx.pageUtil.RxSessionBean bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); + bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); if (bean != null && !bean.isValid()) { response.sendRedirect("error.html"); return; // Ensure no further JSP processing } - oscar.oscarRx.data.RxPatientData.Patient patient = (oscar.oscarRx.data.RxPatientData.Patient) request.getAttribute("Patient"); + patient = (oscar.oscarRx.data.RxPatientData.Patient) request.getAttribute("Patient"); %> diff --git a/src/main/webapp/oscarRx/SelectPharmacy2.jsp b/src/main/webapp/oscarRx/SelectPharmacy2.jsp index 4804fd856be..5a091e4ebc3 100644 --- a/src/main/webapp/oscarRx/SelectPharmacy2.jsp +++ b/src/main/webapp/oscarRx/SelectPharmacy2.jsp @@ -25,14 +25,14 @@ --%> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> - -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="/WEB-INF/security.tld" prefix="security" %> <%@ page import="oscar.oscarRx.data.*,java.util.*" %> <%@ page import="oscar.OscarProperties" %> <%@ page import="org.owasp.encoder.Encode" %> <% + oscar.oscarRx.pageUtil.RxSessionBean bean = null; String roleName$ = session.getAttribute("userrole") + "," + session.getAttribute("user"); boolean authed = true; %> @@ -75,7 +75,7 @@ <% // Directly access the RxSessionBean from the session - oscar.oscarRx.pageUtil.RxSessionBean bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); + bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); if (bean != null && !bean.isValid()) { response.sendRedirect("error.html"); return; // Ensure no further JSP processing diff --git a/src/main/webapp/oscarRx/ShowAllergies.jsp b/src/main/webapp/oscarRx/ShowAllergies.jsp index 2e043a0d545..cc327841270 100644 --- a/src/main/webapp/oscarRx/ShowAllergies.jsp +++ b/src/main/webapp/oscarRx/ShowAllergies.jsp @@ -36,6 +36,8 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib uri="/WEB-INF/security.tld" prefix="security" %> <% + oscar.oscarRx.data.RxPatientData.Patient patient = null; + oscar.oscarRx.pageUtil.RxSessionBean bean = null; String roleName2$ = (String) session.getAttribute("userrole") + "," + (String) session.getAttribute("user"); boolean authed = true; %> @@ -60,12 +62,12 @@ <% // Directly access the RxSessionBean from the session - oscar.oscarRx.pageUtil.RxSessionBean bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); + bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); if (bean != null && !bean.isValid()) { response.sendRedirect("error.html"); return; // Ensure no further JSP processing } - oscar.oscarRx.data.RxPatientData.Patient patient = (oscar.oscarRx.data.RxPatientData.Patient) request.getAttribute("Patient"); + patient = (oscar.oscarRx.data.RxPatientData.Patient) request.getAttribute("Patient"); %> <% diff --git a/src/main/webapp/oscarRx/ShowAllergies2.jsp b/src/main/webapp/oscarRx/ShowAllergies2.jsp index 39e18138db8..28b1b303fb0 100644 --- a/src/main/webapp/oscarRx/ShowAllergies2.jsp +++ b/src/main/webapp/oscarRx/ShowAllergies2.jsp @@ -32,8 +32,7 @@ <%@page import="org.oscarehr.util.MiscUtils" %> <%@ page language="java" import="oscar.OscarProperties" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> - -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="/WEB-INF/security.tld" prefix="security" %> <%@page import="java.util.List" %> @@ -59,7 +58,7 @@ <% OscarProperties props = OscarProperties.getInstance(); - + oscar.oscarRx.pageUtil.RxSessionBean bean = null; PartialDateDao partialDateDao = (PartialDateDao) SpringUtils.getBean(PartialDateDao.class); %> @@ -69,7 +68,7 @@ <% // Directly access the RxSessionBean from the session - oscar.oscarRx.pageUtil.RxSessionBean bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); + bean = (oscar.oscarRx.pageUtil.RxSessionBean) session.getAttribute("RxSessionBean"); if (bean != null && !bean.isValid()) { response.sendRedirect("error.html"); return; // Ensure no further JSP processing diff --git a/src/main/webapp/oscarRx/WriteScript.jsp b/src/main/webapp/oscarRx/WriteScript.jsp index dc1038d7f04..e09f0b0ac8d 100644 --- a/src/main/webapp/oscarRx/WriteScript.jsp +++ b/src/main/webapp/oscarRx/WriteScript.jsp @@ -1437,14 +1437,14 @@ Outside ProOhip: <%= thisForm.getOutsideProviderOhip() %>
//RxPatientData.Patient.Allergy[] allerg = (RxPatientData.Patient.Allergy[]) request.getAttribute("ALLERGIES"); org.oscarehr.common.model.Allergy[] allerg = bean.getAllergyWarnings(loggedInInfo, atcCode); if (allerg != null && allerg.length > 0) { - for (int i = 0; i < allerg.length; i++) { + for (int allergIndex = 0; allergIndex < allerg.length; allergIndex++) { %>
- Allergy: <%= allerg[i].getDescription() %> Reaction: - <%= allerg[i].getReaction() %> - Severity: <%=severityOfReaction(allerg[i].getSeverityOfReaction())%> - Onset of Reaction: <%=onSetOfReaction(allerg[i].getOnsetOfReaction())%> + style="background-color:<%=severityOfReactionColor(allerg[allergIndex].getSeverityOfReaction())%>;margin-right:100px;margin-left:20px;margin-top:10px;padding-left:10px;padding-top:10px;padding-bottom:5px;border-bottom: 2px solid gray;border-right: 2px solid #999;border-top: 1px solid #CCC;border-left: 1px solid #CCC;"> + Allergy: <%= allerg[allergIndex].getDescription() %> Reaction: + <%= allerg[allergIndex].getReaction() %> + Severity: <%=severityOfReaction(allerg[allergIndex].getSeverityOfReaction())%> + Onset of Reaction: <%=onSetOfReaction(allerg[allergIndex].getOnsetOfReaction())%>
<% } }%> @@ -1505,7 +1505,7 @@ Outside ProOhip: <%= thisForm.getOutsideProviderOhip() %>
- <% int i = 0; %> + diff --git a/src/main/webapp/provider/infirmarydemographiclist.jspf b/src/main/webapp/provider/infirmarydemographiclist.jspf index db99489b850..82ce52667b0 100755 --- a/src/main/webapp/provider/infirmarydemographiclist.jspf +++ b/src/main/webapp/provider/infirmarydemographiclist.jspf @@ -1,16 +1,11 @@ -<%@ page import="org.oscarehr.managers.TicklerManager" %> -<%@ page import="org.oscarehr.common.model.Tickler" %> - - +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ taglib uri="/WEB-INF/security.tld" prefix="security" %> <%@ taglib uri="/WEB-INF/caisi-tag.tld" prefix="caisi" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - +<%@ page import="org.oscarehr.managers.TicklerManager" %> +<%@ page import="org.oscarehr.common.model.Tickler" %> <%@ page import="oscar.*, org.oscarehr.util.*,oscar.util.*,java.net.URLEncoder"%> - - <% LoggedInInfo loggedInInfo=LoggedInInfo.getLoggedInInfoFromSession(request); session.setAttribute("case_program_id", session.getAttribute(SessionConstants.CURRENT_PROGRAM_ID)); diff --git a/src/main/webapp/sharingcenter/documents/demographicExport.jsp b/src/main/webapp/sharingcenter/documents/demographicExport.jsp index e55c506355b..d2ee0cf1f9b 100644 --- a/src/main/webapp/sharingcenter/documents/demographicExport.jsp +++ b/src/main/webapp/sharingcenter/documents/demographicExport.jsp @@ -54,7 +54,6 @@ <%@page import="org.oscarehr.sharingcenter.dao.AffinityDomainDao" %> <%@page import="org.oscarehr.sharingcenter.model.AffinityDomainDataObject" %> <%@page import="org.oscarehr.common.model.Document" %> -<%@page import="oscar.oscarDemographic.pageUtil.DemographicExportAction4" %> <%@page import="org.marc.shic.core.configuration.IheConfiguration" %> <%@page import="org.marc.shic.core.configuration.IheAffinityDomainConfiguration" %> <%@page import="org.oscarehr.sharingcenter.DocumentType" %> diff --git a/src/main/webapp/web/dashboard/dashboard.jsp b/src/main/webapp/web/dashboard/dashboard.jsp index da5be0d00b3..f6731387d81 100644 --- a/src/main/webapp/web/dashboard/dashboard.jsp +++ b/src/main/webapp/web/dashboard/dashboard.jsp @@ -49,7 +49,7 @@
-

{{me.firstName}} {{me.firstName}} {{displayDate() | date:'MMMM d, y'}}

@@ -69,11 +69,11 @@
- - + + - - + + @@ -112,10 +112,10 @@ - - - - + + + + @@ -190,9 +190,9 @@ - - - + + + @@ -222,7 +222,7 @@ -

+

diff --git a/src/main/webapp/web/tickler/ticklerAdd.jsp b/src/main/webapp/web/tickler/ticklerAdd.jsp index cf3f02f55b6..b07c4c0b84a 100644 --- a/src/main/webapp/web/tickler/ticklerAdd.jsp +++ b/src/main/webapp/web/tickler/ticklerAdd.jsp @@ -28,7 +28,7 @@
-

+

@@ -44,7 +44,7 @@
" + placeholder="" uib-typeahead="pt.demographicNo as pt.name for pt in searchPatients($viewValue)" typeahead-on-select="updateDemographicNo($item, $model, $label)" class="form-control"> @@ -73,7 +73,7 @@
" + placeholder="" uib-typeahead="pt.providerNo as pt.name for pt in searchProviders($viewValue)" typeahead-on-select="updateProviderNo($item, $model, $label)" class="form-control"> @@ -84,7 +84,7 @@
- + @@ -95,7 +95,7 @@
- : + : {{tickler.serviceDateDate | date: 'yyyy-MM-dd'}} {{tickler.serviceDateTime | date: 'HH:mm'}}

@@ -103,7 +103,7 @@
- : + :
@@ -118,7 +118,7 @@
- + @@ -134,12 +134,7 @@
- - + +
- - - - - From 63d28e92b852a264ef338e4104642d2b0664667a Mon Sep 17 00:00:00 2001 From: Kate Yang <150059882+kateyang1998@users.noreply.github.com> Date: Mon, 6 Jan 2025 10:36:20 -0500 Subject: [PATCH 4/4] update: updated dependencies-lock.json --- dependencies-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies-lock.json b/dependencies-lock.json index 68d478dd085..511c09742d6 100644 --- a/dependencies-lock.json +++ b/dependencies-lock.json @@ -1227,11 +1227,11 @@ }, { "groupId" : "net.java.dev.jna", "artifactId" : "jna", - "version" : "5.15.0", + "version" : "5.16.0", "scope" : "compile", "type" : "jar", "optional" : false, - "integrity" : "sha512:Nfr+zgyK+pXglOfGJ4ANDOAky/1bZxEHV+sw1F3PwxB+q3Wvn+xJi2Kfm3kLKviSegk6coPTSPeyEPRTPPd8og==" + "integrity" : "sha512:2eGpxL6mstiqyWAdCXp3AT/TI7b1xh2D+sIZirapiLXPITkGGJM7FD3kzCVthL0qhnmPyzZ5R5zPxq7LIDQZhA==" }, { "groupId" : "net.oauth.core", "artifactId" : "oauth-provider",