From ba721c6ab7db9f56515096447a4bcfab8a70b1da Mon Sep 17 00:00:00 2001 From: Kate Yang <150059882+kateyang1998@users.noreply.github.com> Date: Fri, 13 Dec 2024 13:40:03 -0500 Subject: [PATCH 1/4] fix: fixed the 500 error, and css / js issues on Demographic Master Record page --- dependencies-lock.json | 152 +++++++++++++++++- src/main/webapp/demographic/contactSearch.jsp | 4 +- .../demographiceditdemographic.jsp | 20 +-- .../demographic/displayHealthCareTeam.jsp | 2 +- .../demographic/manageHealthCareTeam.jsp | 2 +- .../webapp/demographic/procontactSearch.jsp | 4 +- .../professionalSpecialistSearch.jsp | 2 +- 7 files changed, 161 insertions(+), 25 deletions(-) diff --git a/dependencies-lock.json b/dependencies-lock.json index 1d0a65c33f0..68d478dd085 100644 --- a/dependencies-lock.json +++ b/dependencies-lock.json @@ -578,11 +578,11 @@ }, { "groupId" : "com.sun.istack", "artifactId" : "istack-commons-runtime", - "version" : "3.0.7", + "version" : "3.0.8", "scope" : "compile", "type" : "jar", "optional" : false, - "integrity" : "sha512:H7tNiDclMZAo/TtVgIain/0P0ABrVuymJ93aI7EVXih68phgA42S1MR1l19NH0rIJJrFW4iFKGliNIUXGTSzGg==" + "integrity" : "sha512:5xIWb5YcyoGaYb1u/JO5N1l4jSg69z3MbtCcD5wEXX3C9/q8DiNrKZb83r4m4bLsXqRetDU5Q9rYLs/vBIgwXg==" }, { "groupId" : "com.sun.mail", "artifactId" : "jakarta.mail", @@ -992,6 +992,62 @@ "type" : "jar", "optional" : false, "integrity" : "sha512:oio3IAodBcf4uXftxExiWEUSTu+IEfNpnrChGsUWUSjmA6mfbP1SPv24UrrLmLcorhsyoHgzwOs0JIOh/+fptQ==" + }, { + "groupId" : "jakarta.activation", + "artifactId" : "jakarta.activation-api", + "version" : "1.2.2", + "scope" : "compile", + "type" : "jar", + "optional" : false, + "integrity" : "sha512:49hG/19irZ/vUU8HJoRsY9SqdLK7j2DHYljbo3cB+DrnWHJAEHG/QNpAaX1DqKbjbQj6TvOf5weX+28rFxJZnw==" + }, { + "groupId" : "jakarta.annotation", + "artifactId" : "jakarta.annotation-api", + "version" : "1.3.5", + "scope" : "compile", + "type" : "jar", + "optional" : false, + "integrity" : "sha512:0az/FGwPnqkjqTJa1MIrogUuxHQ0Grg5Krq36KvTygENskAP+bWEn8Tx+lwKGIMOsQTaB6E70mtPCkPRZ5NYeA==" + }, { + "groupId" : "jakarta.jws", + "artifactId" : "jakarta.jws-api", + "version" : "2.1.0", + "scope" : "compile", + "type" : "jar", + "optional" : false, + "integrity" : "sha512:J7SIb3Ph2mR3JIj5S+jCIuC76jEmqnuq9qfSPNT/0ukRQKofqMVSpIwwE5RWaPv+n2X8SON5IKl69dzsDLAeAg==" + }, { + "groupId" : "jakarta.persistence", + "artifactId" : "jakarta.persistence-api", + "version" : "2.2.3", + "scope" : "compile", + "type" : "jar", + "optional" : false, + "integrity" : "sha512:Hgcle2Ma4zMacdfNkTYVLN3rvnhrpQxom+xhip62Wb6OlS/gQF2zYzLLbBLGyHxtZI6BfAJ+qMbgxmDOgvb0JA==" + }, { + "groupId" : "jakarta.xml.bind", + "artifactId" : "jakarta.xml.bind-api", + "version" : "2.3.2", + "scope" : "compile", + "type" : "jar", + "optional" : false, + "integrity" : "sha512:WpqU/DI67MnFso6axoiqyNCXJdTK5mClf1aYkU25HjUSg9/kkJosxt6AOJCsKzufBq+dBx1GUDHlUyahCFoR2w==" + }, { + "groupId" : "jakarta.xml.soap", + "artifactId" : "jakarta.xml.soap-api", + "version" : "1.4.2", + "scope" : "compile", + "type" : "jar", + "optional" : false, + "integrity" : "sha512:ZAsa2VW/koPVxVfeelZrxNEAyPZYDpftS88kq+EEIl22JG//GPoTkys8Rch3xtVg93eOsRXmvTOXaHZvCJkBzg==" + }, { + "groupId" : "jakarta.xml.ws", + "artifactId" : "jakarta.xml.ws-api", + "version" : "2.3.3", + "scope" : "compile", + "type" : "jar", + "optional" : false, + "integrity" : "sha512:wWBhbLeWy5RB63A+LluAl2pmaccocRtTkQDuvuhcri9026Vc/wRPxwMglvGdC+I6Mq7+zssMY9WOH+Wt0vRomA==" }, { "groupId" : "janino", "artifactId" : "janino", @@ -2601,6 +2657,46 @@ "type" : "jar", "optional" : false, "integrity" : "sha512:Gwz4XCjYoHLNuA3e5Z7/3Gllkm3WAHIPrMcuEtrfbUVAKumujLkv4DydoUkIaeeHAGjIHbmr4/8uago0D1FiJw==" + }, { + "groupId" : "org.eclipse.persistence", + "artifactId" : "commonj.sdo", + "version" : "2.1.1", + "scope" : "compile", + "type" : "jar", + "optional" : false, + "integrity" : "sha512:EBURx33QqpYr0bHlPrHPTzDnZ5kbMv+RO6VMVLerQlbPTkYgpb4Zub7ig67vsLg8g1x/RmCTlGY3dA+97HiSJw==" + }, { + "groupId" : "org.eclipse.persistence", + "artifactId" : "org.eclipse.persistence.asm", + "version" : "2.7.6", + "scope" : "compile", + "type" : "jar", + "optional" : false, + "integrity" : "sha512:hRjKmI/pg0iEIg6TShnuXNYuTqvOnjrDsIHtG4NzIpyIrIZemYd3tGeff+k4AgflX/eoQ0dAGBEdpY96a8ylPQ==" + }, { + "groupId" : "org.eclipse.persistence", + "artifactId" : "org.eclipse.persistence.core", + "version" : "2.7.6", + "scope" : "compile", + "type" : "jar", + "optional" : false, + "integrity" : "sha512:PoaA+dyjCB7mCrwLVwbHjrFQe5thBxc4D3LBbt2XgY9Eha2UY+3Fwg8+bX/xvGLOnGUi82TUm3kNnqPL+1n5xw==" + }, { + "groupId" : "org.eclipse.persistence", + "artifactId" : "org.eclipse.persistence.moxy", + "version" : "2.7.6", + "scope" : "compile", + "type" : "jar", + "optional" : false, + "integrity" : "sha512:8xPoxYUdZdswzRymdNLR/Q2ttN1HagpaqLU0ifnPiyd0Zk10Zk6py7RdeWhRNcfFzXMVSrl7GzZoYn78PN4zsQ==" + }, { + "groupId" : "org.eclipse.persistence", + "artifactId" : "org.eclipse.persistence.sdo", + "version" : "2.7.6", + "scope" : "compile", + "type" : "jar", + "optional" : false, + "integrity" : "sha512:rFwR/bcFZLIHiUDpuDdfqHoN/MT4uZgI0vtmHnNr2u9o2tE3Mxt7V9tO/Ac7QGnsdi3VzX0Hk69kFSXg0CjJvQ==" }, { "groupId" : "org.freemarker", "artifactId" : "freemarker", @@ -2617,22 +2713,62 @@ "type" : "jar", "optional" : false, "integrity" : "sha512:OWlmrfPoy6Cf91KXkV1Bump8YMMnV13/8VP2YXobyv/0oawLqhnZO03cq1EcXiOm/ZWq30XlXiBXcA2juJka8A==" + }, { + "groupId" : "org.glassfish.external", + "artifactId" : "management-api", + "version" : "3.2.2", + "scope" : "compile", + "type" : "jar", + "optional" : false, + "integrity" : "sha512:kATUhHSIg7aea5udotExSRfAG4fZT6KyBKqjpHq+vjNGWzOye2oY96Lc5IYGT4by3GwOyX15wlc1H4yhUw5Vag==" + }, { + "groupId" : "org.glassfish.gmbal", + "artifactId" : "gmbal", + "version" : "4.0.1", + "scope" : "compile", + "type" : "jar", + "optional" : false, + "integrity" : "sha512:S3t9zjI3s03b9A4+cXIpKShKR/9o58YD/HB4DgwKvHuDM61dCfmZuqcRQOnMeTek/Tqvk4sg6ngkFCiVds4l5w==" + }, { + "groupId" : "org.glassfish.ha", + "artifactId" : "ha-api", + "version" : "3.1.12", + "scope" : "compile", + "type" : "jar", + "optional" : false, + "integrity" : "sha512:xWD/Xo8z0SVeHBpcsQyw8tqYQxYGPnG7FhSMuyLKvRj6ZNnWLdO9TumZmKL1NmVAOhM60ynMmie/He4X6bwvLg==" }, { "groupId" : "org.glassfish.jaxb", "artifactId" : "jaxb-runtime", - "version" : "2.3.1", + "version" : "2.3.2", "scope" : "compile", "type" : "jar", "optional" : false, - "integrity" : "sha512:Qud432jevLbPG0KYXnxgBn58C1v1du62MOlyiNj7zNws8f+iOr5lG0SvHvTNNsUisGoZq1hqtnd+8Dl53hrJUQ==" + "integrity" : "sha512:imzz3Z+sT7bdtfCGGiysCT4E0Yb8eH7njDCGLSJetne5YF4Rd89X2g1PRcYT8QcYfDML4GhLQ7DKuakizZbbZg==" }, { "groupId" : "org.glassfish.jaxb", "artifactId" : "txw2", - "version" : "2.3.1", + "version" : "2.3.2", + "scope" : "compile", + "type" : "jar", + "optional" : false, + "integrity" : "sha512:ZsF0CTxHt1uQAVnFRJvZnrFTCNFbOVdxNnrcWGJhLtuYXDZ4QoxPYOfCe0bRI6+sOSd/gNt2ZRGmtvB1bVJVWQ==" + }, { + "groupId" : "org.glassfish.pfl", + "artifactId" : "pfl-basic", + "version" : "4.1.0", + "scope" : "compile", + "type" : "jar", + "optional" : false, + "integrity" : "sha512:qrUNjhpQXciKx14o7aEJjqvymfmOMUvY0sA/hhMj44LLgKBYQvkQEKzUwqc7hNJI+9YYJHNoPOphVHlaHkU0/g==" + }, { + "groupId" : "org.glassfish.pfl", + "artifactId" : "pfl-tf", + "version" : "4.1.0", "scope" : "compile", "type" : "jar", "optional" : false, - "integrity" : "sha512:7VViFUQ+mxkNmhgghzW1dvlLWWXeYx87KRr3rWCUVBS64boOpBMNawoEUwUhYvedG7z4IjcPWNYarO/ra3GFIw==" + "integrity" : "sha512:rw518KfDgB/jAwU8Qqlf/fLGrMavSoI7Iv9lzCRAAJH2NP+HaGcYHMKVqBi6xbkZYLIqJBPdS6LKIK/YnxRbOg==" }, { "groupId" : "org.hamcrest", "artifactId" : "hamcrest-core", @@ -2812,11 +2948,11 @@ }, { "groupId" : "org.jvnet.staxex", "artifactId" : "stax-ex", - "version" : "1.8", + "version" : "1.8.1", "scope" : "compile", "type" : "jar", "optional" : false, - "integrity" : "sha512:66vTMKLXwQkQX6VcQjb8Ly1SZo5wsXuPw2uKyfUkqixnBA51NxJn2OlSPZTe4M4GTnZYTJ8gZofom587Kjh/Aw==" + "integrity" : "sha512:0GDqXcyBUIoQeL0O2UdVOlZSpaeNp2zQDcLjhNygFBZt/pJ3f86314aGmYlNfkDs75n6x3cTcgJb/X8fo+L+Mg==" }, { "groupId" : "org.marc.everest", "artifactId" : "everest-core", diff --git a/src/main/webapp/demographic/contactSearch.jsp b/src/main/webapp/demographic/contactSearch.jsp index 3f4a9ae26e8..4cf632fb0f4 100644 --- a/src/main/webapp/demographic/contactSearch.jsp +++ b/src/main/webapp/demographic/contactSearch.jsp @@ -56,9 +56,9 @@ List contacts; if ("all".equalsIgnoreCase(list)) { - contacts = ContactAction.searchAllContacts(search_mode, orderBy, keyword); + contacts = Contact2Action.searchAllContacts(search_mode, orderBy, keyword); } else { - contacts = ContactAction.searchContacts(search_mode, orderBy, keyword); + contacts = Contact2Action.searchContacts(search_mode, orderBy, keyword); } nItems = contacts.size(); diff --git a/src/main/webapp/demographic/demographiceditdemographic.jsp b/src/main/webapp/demographic/demographiceditdemographic.jsp index 55a04e79dcb..1e810911382 100644 --- a/src/main/webapp/demographic/demographiceditdemographic.jsp +++ b/src/main/webapp/demographic/demographiceditdemographic.jsp @@ -90,7 +90,7 @@ <%@ page import="oscar.OscarProperties" %> <%@ page import="org.oscarehr.common.dao.*,org.oscarehr.common.model.*" %> <%@ page import="org.oscarehr.common.OtherIdManager" %> -<%@ page import="org.oscarehr.common.web.ContactAction" %> +<%@ page import="org.oscarehr.common.web.Contact2Action" %> <%@ page import="org.oscarehr.casemgmt.model.CaseManagementNoteLink" %> <%@ page import="org.oscarehr.casemgmt.service.CaseManagementManager" %> <%@ page import="org.oscarehr.util.SpringUtils" %> @@ -262,7 +262,7 @@ + href="<%=request.getContextPath()%>/share/calendar/calendar.css" title="win2k-cold-1"/> + + @@ -293,25 +293,25 @@ + href="<%=request.getContextPath()%>/share/calendar/calendar.css" title="win2k-cold-1"/> <% if (isMobileOptimized) { %> <% } else { %> - - + + <% } %> + src="<%=request.getContextPath()%>/share/javascript/Oscar.js"> - + @@ -1695,7 +1695,7 @@ ContactDao contactDao = (ContactDao) SpringUtils.getBean(ContactDao.class); DemographicContactDao dContactDao = (DemographicContactDao) SpringUtils.getBean(DemographicContactDao.class); List dContacts = dContactDao.findByDemographicNo(demographic.getDemographicNo()); - dContacts = ContactAction.fillContactNames(dContacts); + dContacts = Contact2Action.fillContactNames(dContacts); for (DemographicContact dContact : dContacts) { String sdm = (dContact.getSdm() != null && dContact.getSdm().equals("true")) ? "/SDM" : ""; String ec = (dContact.getEc() != null && dContact.getEc().equals("true")) ? "/EC" : ""; diff --git a/src/main/webapp/demographic/displayHealthCareTeam.jsp b/src/main/webapp/demographic/displayHealthCareTeam.jsp index 3d962e65c32..0f42a7a1413 100644 --- a/src/main/webapp/demographic/displayHealthCareTeam.jsp +++ b/src/main/webapp/demographic/displayHealthCareTeam.jsp @@ -49,7 +49,7 @@ if (!StringUtils.isBlank(demographicNoString)) { demographicDao = SpringUtils.getBean(DemographicDao.class); demographic = demographicDao.getClientByDemographicNo(Integer.parseInt(demographicNoString)); - demographicContacts = ContactAction.getDemographicContacts(demographic); + demographicContacts = Contact2Action.getDemographicContacts(demographic); specialtyDao = SpringUtils.getBean(ContactSpecialtyDao.class); specialty = specialtyDao.findAll(); } diff --git a/src/main/webapp/demographic/manageHealthCareTeam.jsp b/src/main/webapp/demographic/manageHealthCareTeam.jsp index be2f074c2c0..3a7fdd4549e 100644 --- a/src/main/webapp/demographic/manageHealthCareTeam.jsp +++ b/src/main/webapp/demographic/manageHealthCareTeam.jsp @@ -53,7 +53,7 @@ providerList = providerDao.getActiveProviders(); demographicDao = SpringUtils.getBean(DemographicDao.class); demographic = demographicDao.getClientByDemographicNo(Integer.parseInt(demographicNoString)); - demographicContacts = ContactAction.getDemographicContacts(demographic); + demographicContacts = Contact2Action.getDemographicContacts(demographic); contactSpecialtyDao = SpringUtils.getBean(ContactSpecialtyDao.class); specialty = contactSpecialtyDao.findAll(); } diff --git a/src/main/webapp/demographic/procontactSearch.jsp b/src/main/webapp/demographic/procontactSearch.jsp index f968ae865e1..b3ac0a08b1c 100644 --- a/src/main/webapp/demographic/procontactSearch.jsp +++ b/src/main/webapp/demographic/procontactSearch.jsp @@ -79,10 +79,10 @@ List contacts; if ("all".equalsIgnoreCase(list)) { - contacts = ContactAction.searchAllContacts(search_mode, orderBy, keyword); + contacts = Contact2Action.searchAllContacts(search_mode, orderBy, keyword); pageContext.setAttribute("toggleSearchTool", list); } else { - contacts = ContactAction.searchProContacts(search_mode, orderBy, keyword); + contacts = Contact2Action.searchProContacts(search_mode, orderBy, keyword); } nItems = contacts.size(); diff --git a/src/main/webapp/demographic/professionalSpecialistSearch.jsp b/src/main/webapp/demographic/professionalSpecialistSearch.jsp index d92efd20bb8..c9196f93df5 100644 --- a/src/main/webapp/demographic/professionalSpecialistSearch.jsp +++ b/src/main/webapp/demographic/professionalSpecialistSearch.jsp @@ -75,7 +75,7 @@ String search_mode = request.getParameter("search_mode") == null ? "search_name" : request.getParameter("search_mode"); String orderBy = request.getParameter("orderby") == null ? "c.lastName,c.firstName" : request.getParameter("orderby"); - List contacts = ContactAction.searchProfessionalSpecialists(keyword); + List contacts = Contact2Action.searchProfessionalSpecialists(keyword); nItems = contacts.size(); pageContext.setAttribute("contacts", contacts); } From 7b58bd6f514241987f885c8a7780ab96f58bd439 Mon Sep 17 00:00:00 2001 From: Kate Yang <150059882+kateyang1998@users.noreply.github.com> Date: Thu, 12 Dec 2024 15:19:00 -0500 Subject: [PATCH 2/4] fix: fixed the 500 error on Rx page --- src/main/webapp/oscarRx/SearchDrug3.jsp | 5 ++- src/main/webapp/oscarRx/TopLinks2.jspf | 56 ++++++++++++------------- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/src/main/webapp/oscarRx/SearchDrug3.jsp b/src/main/webapp/oscarRx/SearchDrug3.jsp index 3416d8bc3fc..27d30256a27 100644 --- a/src/main/webapp/oscarRx/SearchDrug3.jsp +++ b/src/main/webapp/oscarRx/SearchDrug3.jsp @@ -59,8 +59,9 @@ <%@page import="org.oscarehr.casemgmt.model.Issue" %> <% + oscar.oscarRx.pageUtil.RxSessionBean bean = null; String rx_enhance = OscarProperties.getInstance().getProperty("rx_enhance"); - oscar.oscarRx.data.RxPatientData.Patient patient = (oscar.oscarRx.data.RxPatientData.Patient) request.getAttribute("Patient"); + oscar.oscarRx.data.RxPatientData.Patient patient = (oscar.oscarRx.data.RxPatientData.Patient) request.getSession().getAttribute("Patient"); %> <% @@ -98,7 +99,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/TopLinks2.jspf b/src/main/webapp/oscarRx/TopLinks2.jspf index 26bbc8587c2..6a2bc193e1d 100644 --- a/src/main/webapp/oscarRx/TopLinks2.jspf +++ b/src/main/webapp/oscarRx/TopLinks2.jspf @@ -29,49 +29,45 @@ */%> - - oscarRx + oscarRx
- - -
+<% + oscar.oscarRx.data.RxPatientData.Patient patient2 = (oscar.oscarRx.data.RxPatientData.Patient) request.getSession().getAttribute("Patient"); +%> + <%=patient2.getFirstName() %> <%=patient2.getSurname() %> + <%=patient2.getAge() %>
Selected Pharmacy: - (Edit List) + (Edit List) 		- Drugref Info | - + Drugref Info |