openo-beta · gongjian1981 · Dec 13, 2024 · Dec 13, 2024 · Dec 16, 2024 · Jan 6, 2025
diff --git 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",

diff --git a/src/main/java/org/oscarehr/casemgmt/web/CaseManagementEntry2Action.java b/src/main/java/org/oscarehr/casemgmt/web/CaseManagementEntry2Action.java
@@ -2613,6 +2613,9 @@ public String notehistory() {
         String noteid = request.getParameter("noteId");
 
         List<CaseManagementNote> history = caseManagementMgr.getHistory(noteid);
+        for (CaseManagementNote caseManagementNote : history) {
+            caseManagementNote.setNote(caseManagementNote.getNote().replace("\n", "<br/>"));
+        }
         request.setAttribute("history", history);
         ResourceBundle props = ResourceBundle.getBundle("oscarResources");
         request.setAttribute("title", props.getString("oscarEncounter.noteHistory.title"));

diff --git a/src/main/webapp/PMmodule/Admin/ProgramManagerForm.jsp b/src/main/webapp/PMmodule/Admin/ProgramManagerForm.jsp
@@ -88,8 +88,7 @@
                 <table cellpadding="0" cellspacing="0" border="0">
                     <tr>
                         <%
-                            DynaValidatorForm form = (DynaValidatorForm) session.getAttribute("programManagerForm");
-                            Program program = (Program) form.get("program");
+                            Program program = (Program) request.getAttribute("program");
 
                             for (int i = 0; i < ProgramManagerViewFormBean.tabs.length; i++) {
                                 if (ProgramManagerViewFormBean.tabs[i].equalsIgnoreCase("Bed Check") && program.isService()) {

diff --git a/src/main/webapp/PMmodule/Admin/ProgramView/queue.jsp b/src/main/webapp/PMmodule/Admin/ProgramView/queue.jsp
@@ -27,7 +27,7 @@
 <%@page import="oscar.eform.EFormUtil" %>
 <%@ page import="java.util.*" %>
 <%@ page import="org.oscarehr.PMmodule.model.ProgramQueue" %>
-<%@ page import="org.oscarehr.PMmodule.web.admin.ProgramManagerAction.RemoteQueueEntry" %>
+<%@ page import="org.oscarehr.PMmodule.web.admin.ProgramManager2Action.RemoteQueueEntry" %>
 <%@ page import="java.net.URLEncoder" %>
 <%@page import="org.apache.commons.lang.time.DateFormatUtils" %>
 <%@page import="org.oscarehr.util.SpringUtils" %>

diff --git a/src/main/webapp/PMmodule/Admin/StaffManagerList.jsp b/src/main/webapp/PMmodule/Admin/StaffManagerList.jsp
@@ -23,8 +23,6 @@
 
 --%>
 <%@ include file="/taglibs.jsp" %>
-<%@ taglib uri="/WEB-INF/quatro-tag.tld" prefix="quatro" %>
-
 <html>
     <head>
         <script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>

diff --git 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/billing/CA/BC/receivePayment.jsp b/src/main/webapp/billing/CA/BC/receivePayment.jsp
@@ -32,7 +32,7 @@
         <legend><fmt:setBundle basename="oscarResources"/><fmt:message key="oscar.billing.CA.BC.received"/></legend>
         <div class="msgDisplay">
             <%
-                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()))%>
             <fmt:setBundle basename="oscarResources"/><fmt:message key="oscar.billing.CA.BC.credit"/> &nbsp; <fmt:setBundle basename="oscarResources"/><fmt:message key="oscar.billing.CA.BC.invoice"/> 
             <c:out value="${receivePaymentActionForm.billNo}"/> &nbsp; <fmt:setBundle basename="oscarResources"/><fmt:message key="oscar.billing.CA.BC.lineNo"/> 

diff --git a/src/main/webapp/billing/CA/ON/billingON3rdPayments.jsp b/src/main/webapp/billing/CA/ON/billingON3rdPayments.jsp
@@ -338,14 +338,18 @@
                 <td align="left">
                     <table width="100%">
                         <c:forEach var="billingPaymentType" items="${paymentTypeList}" varStatus="ttr">
-                            <%= ttr.intValue() % 2 == 0 ? "<tr>" : "" %>
+                            <c:if test="${ttr.index % 2 == 0}">
+                                <tr>
+                            </c:if>
                             <td width="50%">
                                 <input type="radio" name="paymentType"
-                                       id="paymentType<c:out value='${billingPaymentType.id}'/>"
-                                       value="<c:out value='${billingPaymentType.id}'/>" <%=(ttr == 0 ? "checked=true" : "")%> />
+                                    id="paymentType${billingPaymentType.id}"
+                                    value="${billingPaymentType.id}" ${ttr.index == 0 ? "checked" : ""}/>
                                 <c:out value="${billingPaymentType.paymentType}"/>
                             </td>
-                            <%= ttr.intValue() % 2 == 0 ? "" : "</tr>" %>
+                            <c:if test="${ttr.index % 2 != 0}">
+                                </tr>
+                            </c:if>
                         </c:forEach>
                     </table>
                 </td>
@@ -433,24 +437,25 @@
         <c:if test="${not empty paymentsList}">
             <c:forEach var="displayPayment" items="${paymentsList}" varStatus="ctr">
                 <tr>
-                    <td><%= ctr + 1 %>
-                    </td>
+                    <td>${ctr.index + 1}</td>
                     <td><c:out value="${displayPayment.total_payment}"/></td>
-                    <td><%=types.get(ctr.intValue()) %>
-                    </td>
+                    <td>${types[ctr.index]}</td>
                     <td><c:out value="${displayPayment.paymentDateFormatted}"/></td>
                     <td><c:out value="${displayPayment.total_discount}"/></td>
                     <td><c:out value="${displayPayment.total_credit}"/></td>
                     <td><c:out value="${displayPayment.total_refund}"/></td>
-                    <%if (((BigDecimal) balances.get(index)).compareTo(BigDecimal.ZERO) == -1) {%>
-                    <td><%= "-" + currency.format(balances.get(index++)) %>
-                    </td>
-                    <%} else { %>
-                    <td><%= currency.format(balances.get(index++)) %>
+                    <td>
+                        <c:choose>
+                            <c:when test="${balances[ctr.index] < 0}">
+                                -${currency.format(balances[ctr.index])}
+                            </c:when>
+                            <c:otherwise>
+                                ${currency.format(balances[ctr.index])}
+                            </c:otherwise>
+                        </c:choose>
                     </td>
-                    <%} %>
                     <td>
-                        <a href="javascript:onViewPayment('<c:out value="${displayPayment.id}"/>')">view</a>
+                        <a href="javascript:onViewPayment('<c:out value="${displayPayment.id}"/>')" >view</a>
                     </td>
                 </tr>
             </c:forEach>

diff --git a/src/main/webapp/casemgmt/CaseManagementEntry.jsp b/src/main/webapp/casemgmt/CaseManagementEntry.jsp
@@ -223,7 +223,7 @@
         String pId = (String) session.getAttribute("case_program_id");
         if (pId == null) pId = "";
     %>
-    <nested:form action="/CaseManagementEntry">
+    <form action="<%=request.getContextPath() %>/CaseManagementEntry.do">
         <input type="hidden" name="chain" id="chain"/>
         <input type="hidden" name="demographicNo" id="demographicNo"/>
         <c:if test="${param.providerNo==null}">
@@ -287,98 +287,76 @@
                 <td></td>
             </tr>
 
-            <nested:iterate indexId="ind" id="issueCheckList" property="issueCheckList"
-                            type="org.oscarehr.casemgmt.web.CheckBoxBean">
-                <%
-                    String submitString = "this.form.method.value='issueChange';";
-                    submitString = submitString + "this.form.lineId.value=" + "'"
-                            + ind.intValue() + "';" + "this.form.submit();";
-
-                    org.oscarehr.casemgmt.web.CheckBoxBean cbb = (org.oscarehr.casemgmt.web.CheckBoxBean) pageContext.getAttribute("issueCheckList");
-                    boolean writeAccess = cbb.getIssueDisplay().isWriteAccess();
-                    boolean disabled = !"local".equals(cbb.getIssueDisplay().location) ? true : !writeAccess;
-                    boolean checkBoxDisabled = !"local".equals(cbb.getIssueDisplay().location) ? false : disabled;
-                    boolean resolved = "resolved".equals(cbb.getIssueDisplay().resolved);
-                    int counter = 0;
-
-                    if (!resolved || showResolved) {
-                        count_issues_display++;
-                        counter++;
-                %>
-
-                <tr bgcolor="<%= (counter%2==0)?"#EEEEFF":"white" %>"
-                    align="center">
-                    <td>
-                        <nested:checkbox indexed="true" name="issueCheckList" property="checked"
-                                         onchange="setChangeFlag(true);"
-                                         disabled="<%=checkBoxDisabled%>"></nested:checkbox>
-                    </td>
-                    <td <%="allergy".equals(cbb.getIssueDisplay().priority) ? "bgcolor=\"yellow\"" : ""%>>
-                        <nested:write name="issueCheckList" property="issueDisplay.description"/>
-                    </td>
-                    <td>
-                        <nested:select indexed="true" name="issueCheckList" property="issueDisplay.acute"
-                                       disabled="<%=disabled%>">
-                            <option value="acute">acute</option>
-                            <option value="chronic">chronic</option>
-                        </nested:select>
-                    </td>
-                    <td>
-                        <nested:select indexed="true" name="issueCheckList" property="issueDisplay.certain"
-                                       disabled="<%=disabled%>">
-                            <option value="certain">certain</option>
-                            <option value="uncertain">uncertain</option>
-                        </nested:select>
-                    </td>
-                    <td>
-                        <nested:select indexed="true" name="issueCheckList" property="issueDisplay.major"
-                                       disabled="<%=disabled%>">
-                            <option value="major">major</option>
-                            <option value="not major">not major</option>
-                        </nested:select>
-                    </td>
-                    <td>
-                        <!-- removed onchange="<%=submitString%>" before disabled="<%=disabled %>" FOR THE ABOVE LINEs in this table -->
-                        <nested:select indexed="true" name="issueCheckList" property="issueDisplay.resolved"
-                                       disabled="<%=disabled%>">
-                            <option value="resolved">resolved</option>
-                            <option value="unresolved">unresolved</option>
-                        </nested:select>
-                    </td>
-                    <td>
-                        <nested:text indexed="true" name="issueCheckList" property="issueDisplay.role"
-                                     disabled="<%=disabled%>"/>
-                    </td>
-                    <td>
-                        <% if (cbb.getIssueDisplay().location != null && cbb.getIssueDisplay().location.equals("local")) { %>
-                        <security:oscarSec roleName="<%=roleName$%>" objectName="_casemgmt.issues" rights="u">
-                            <nested:equal name="issueCheckList" property="used"
-                                          value="false">
-                                <%
-                                    submitString = "this.form.method.value='issueDelete';";
-                                    submitString = submitString + "this.form.deleteId.value=" + "'"
-                                            + ind.intValue() + "';";
-                                %>
-                                <input type="submit" value="delete" onclick="<%=submitString%>">
-                            </nested:equal>
-
-                            <!-- change diagnosis button -->
-                            <%
-                                submitString = "this.form.method.value='changeDiagnosis';";
-                                submitString = submitString + "this.form.deleteId.value=" + "'"
-                                        + ind.intValue() + "';";
-                            %>
-                            <input type="submit" value="Change Issue" onclick="<%=submitString%>">
-                        </security:oscarSec>
-                        <%} else {%>
-                        <fmt:setBundle basename="oscarResources"/><fmt:message key="casemanagementEntry.activecommunityissue"/>
-                        <%}%>
-                    </td>
-                </tr>
-                <%
-                    }
-                %>
-            </nested:iterate>
+            <c:forEach var="issueCheckList" items="${caseManagementEntryForm.issueCheckList}" varStatus="status">
+    <c:set var="cbb" value="${issueCheckList}" />
+    <c:set var="writeAccess" value="${cbb.issueDisplay.writeAccess}" />
+    <c:set var="disabled" value="${cbb.issueDisplay.location ne 'local' ? true : !writeAccess}" />
+    <c:set var="checkBoxDisabled" value="${cbb.issueDisplay.location ne 'local' ? false : disabled}" />
+    <c:set var="resolved" value="${cbb.issueDisplay.resolved eq 'resolved'}" />
+
+    <c:if test="${!resolved or showResolved}">
+        <c:set var="countIssuesDisplay" value="${countIssuesDisplay + 1}" />
+        <c:set var="counter" value="${status.count}" />
+
+        <tr style="background-color: ${counter % 2 == 0 ? '#EEEEFF' : 'white'}; text-align: center;">
+            <td>
+                <input type="checkbox" name="issueCheckList[${status.index}].checked"
+                       onchange="setChangeFlag(true);"
+                       ${checkBoxDisabled ? 'disabled' : ''} />
+            </td>
+            <td style="${cbb.issueDisplay.priority eq 'allergy' ? 'background-color: yellow;' : ''}">
+                ${cbb.issueDisplay.description}
+            </td>
+            <td>
+                <select name="issueCheckList[${status.index}].issueDisplay.acute" ${disabled ? 'disabled' : ''}>
+                    <option value="acute" ${cbb.issueDisplay.acute eq 'acute' ? 'selected' : ''}>acute</option>
+                    <option value="chronic" ${cbb.issueDisplay.acute eq 'chronic' ? 'selected' : ''}>chronic</option>
+                </select>
+            </td>
+            <td>
+                <select name="issueCheckList[${status.index}].issueDisplay.certain" ${disabled ? 'disabled' : ''}>
+                    <option value="certain" ${cbb.issueDisplay.certain eq 'certain' ? 'selected' : ''}>certain</option>
+                    <option value="uncertain" ${cbb.issueDisplay.certain eq 'uncertain' ? 'selected' : ''}>uncertain</option>
+                </select>
+            </td>
+            <td>
+                <select name="issueCheckList[${status.index}].issueDisplay.major" ${disabled ? 'disabled' : ''}>
+                    <option value="major" ${cbb.issueDisplay.major eq 'major' ? 'selected' : ''}>major</option>
+                    <option value="not major" ${cbb.issueDisplay.major eq 'not major' ? 'selected' : ''}>not major</option>
+                </select>
+            </td>
+            <td>
+                <select name="issueCheckList[${status.index}].issueDisplay.resolved" ${disabled ? 'disabled' : ''}>
+                    <option value="resolved" ${cbb.issueDisplay.resolved eq 'resolved' ? 'selected' : ''}>resolved</option>
+                    <option value="unresolved" ${cbb.issueDisplay.resolved eq 'unresolved' ? 'selected' : ''}>unresolved</option>
+                </select>
+            </td>
+            <td>
+                <input type="text" name="issueCheckList[${status.index}].issueDisplay.role" 
+                       value="${cbb.issueDisplay.role}" ${disabled ? 'disabled' : ''} />
+            </td>
+            <td>
+                <c:if test="${cbb.issueDisplay.location eq 'local'}">
+                    <c:if test="${!cbb.used}">
+                        <button type="submit" 
+                                onclick="this.form.method.value='issueDelete'; this.form.deleteId.value='${status.index}';">
+                            Delete
+                        </button>
+                    </c:if>
+                    <button type="submit" 
+                            onclick="this.form.method.value='changeDiagnosis'; this.form.deleteId.value='${status.index}';">
+                        Change Issue
+                    </button>
+                </c:if>
+                <c:if test="${cbb.issueDisplay.location ne 'local'}">
+                    <fmt:setBundle basename="oscarResources" />
+                    <fmt:message key="casemanagementEntry.activecommunityissue" />
+                </c:if>
+            </td>
+        </tr>
+    </c:if>
+</c:forEach>
+
 
         </table>
         <br>
@@ -398,7 +376,7 @@
         %>
         <br>
         <security:oscarSec roleName="<%=roleName$%>" objectName="_casemgmt.issues" rights="w">
-            <nested:submit value="add new issue" onclick="this.form.method.value='addNewIssue';"/>
+            <input type="submit" value="add new issue" onclick="this.form.method.value='addNewIssue';" />
         </security:oscarSec>
 
         <p><b><fmt:setBundle basename="oscarResources"/><fmt:message key="casemanagementEntry.progressnoteentryview"/> </b></p>
@@ -419,7 +397,8 @@
             <tr>
                 <td class="fieldValue" colspan="1">
                     <textarea name="caseNote_note" id="caseNote_note" cols="60" rows="20" wrap="hard"
-                              onchange="setChangeFlag(true);"><nested:write property="caseNote.note"/></textarea>
+                              onchange="setChangeFlag(true);">${caseNote.note}
+                            </textarea>
                 </td>
                 <td class="fieldTitle"></td>
 
@@ -461,7 +440,8 @@
                         <tr>
                             <td class="fieldTitle"><fmt:setBundle basename="oscarResources"/><fmt:message key="casemanagementEntry.billing"/></td>
 
-                            <td class="fieldValue"><nested:text property="caseNote.billing_code"/>
+                            <td class="fieldValue">
+                                ${caseNote.billing_code}
                                 <input type="button" value="add billing"
                                        onclick="self.open('<%=(String)session.getAttribute("billing_url")%>','','scrollbars=yes,menubars=no,toolbars=no,resizable=yes');return false;">
                             </td>
@@ -490,7 +470,7 @@
             </tr>
 
         </table>
-    </nested:form>
+    </form>
 
 </security:oscarSec>
 <security:oscarSec roleName="<%=roleName$%>" objectName="_casemgmt.notes" rights="u" reverse="true">
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,8 +23,6 @@ @@
     --%>
     <%@ include file="/taglibs.jsp" %>
-    <%@ taglib uri="/WEB-INF/quatro-tag.tld" prefix="quatro" %>
     <html>
         <head>
             <script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>
@@ Expand Down @@