Skip to content

Commit fdd3a5a

Browse files
yingbullyingbull
authored
Merge pull request #13 from cc-ar-emr/jsp-compilation-error-bullfrog
2 parents 2159dbf + cab92d5 commit fdd3a5a

File tree

99 files changed

+578
-348
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+578
-348
lines changed

‎pom.xml

+54-2
Original file line numberDiff line numberDiff line change
@@ -1589,6 +1589,20 @@
15891589
</execution>
15901590
</executions>
15911591
</plugin>
1592+
1593+
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-war-plugin -->
1594+
<plugin>
1595+
<groupId>org.apache.maven.plugins</groupId>
1596+
<artifactId>maven-war-plugin</artifactId>
1597+
<version>3.3.1</version>
1598+
<configuration>
1599+
<webResources>
1600+
<resource>
1601+
<directory>src/main/webapp</directory>
1602+
</resource>
1603+
</webResources>
1604+
</configuration>
1605+
</plugin>
15921606

15931607
<plugin>
15941608
<groupId>org.apache.maven.plugins</groupId>
@@ -1698,11 +1712,11 @@
16981712
</plugin>
16991713

17001714
<!-- https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-maven-plugin -->
1701-
<plugin>
1715+
<!-- <plugin>
17021716
<groupId>org.eclipse.jetty</groupId>
17031717
<artifactId>jetty-maven-plugin</artifactId>
17041718
<version>11.0.24</version>
1705-
</plugin>
1719+
</plugin> -->
17061720
<!--
17071721
Comming soon. After spring and java upgrades
17081722
<plugin>
@@ -2023,5 +2037,43 @@
20232037
</plugins>
20242038
</build>
20252039
</profile>
2040+
2041+
<profile>
2042+
<!-- Skip jsp compile, run 'mvn package -Pjspc' to compile jsps -->
2043+
<id>jspc</id>
2044+
<activation>
2045+
<activeByDefault>false</activeByDefault>
2046+
</activation>
2047+
<build>
2048+
<plugins>
2049+
<!-- https://mvnrepository.com/artifact/io.leonard.maven.plugins/jspc-maven-plugin -->
2050+
<plugin>
2051+
<groupId>io.leonard.maven.plugins</groupId>
2052+
<artifactId>jspc-maven-plugin</artifactId>
2053+
<version>3.0.0</version>
2054+
<executions>
2055+
<execution>
2056+
<id>jspc</id>
2057+
<goals>
2058+
<goal>compile</goal>
2059+
</goals>
2060+
<configuration>
2061+
<sourceDirectory>src/main/webapp</sourceDirectory>
2062+
<outputDirectory>src/main/jsp</outputDirectory>
2063+
<excludes>
2064+
<exclude>**/*.jspf</exclude>
2065+
<!-- Exclude the deprecated jsp file, the file is not using now -->
2066+
<exclude>oscarEncounter/oscarConsultationRequest/attachConsultation2.jsp</exclude>
2067+
<!-- Detect html taglib related errors, exclude for now -->
2068+
<exclude>PMmodule/Admin/Bed/Bed.jsp</exclude>
2069+
<exclude>PMmodule/Admin/AgencyEdit/bed.jsp</exclude>
2070+
</excludes>
2071+
</configuration>
2072+
</execution>
2073+
</executions>
2074+
</plugin>
2075+
</plugins>
2076+
</build>
2077+
</profile>
20262078
</profiles>
20272079
</project>

‎src/main/java/org/oscarehr/common/model/UserProperty.java

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public class UserProperty extends AbstractModel<Integer> implements Serializable
5050
public static final String DOC_DEFAULT_QUEUE = "doc_default_queue";
5151
public static final String HC_TYPE = "HC_Type";
5252
public static final String DEFAULT_SEX = "default_sex";
53+
public static final String DEFAULT_REF_PRACTITIONER= "default_ref_prac";
5354
public static final String EFORM_REFER_FAX = "eform_refer_fax";
5455
public static final String EFORM_FAVOURITE_GROUP = "favourite_eform_group";
5556
public static final String RX_SHOW_PATIENT_DOB = "rx_show_patient_dob";

‎src/main/webapp/PMmodule/Admin/Facility/ViewFacility.jsp

+24-19
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828

2929
<%@ include file="/common/messages.jsp" %>
3030
<%@ page import="org.oscarehr.common.model.Facility" %>
31+
<%@ page import="java.util.List" %>
32+
3133
<div class="tabs" id="tabs">
3234
<table cellpadding="3" cellspacing="0" border="0">
3335
<tr>
@@ -121,19 +123,20 @@
121123
if (request.getAttribute("program") != null) {
122124
%>
123125

124-
<% if (request.getAttribute("program") != null && ((org.oscarehr.common.model.Program) request.getAttribute("program")).getFacilityId().equals(((org.oscarehr.common.model.Facility) request.getAttribute("facility")).getId())) { %>
125-
<display:column sortable="true" sortProperty="name"
126-
title="Program Name">
127-
<a
128-
href="<html:rewrite action="/PMmodule/ProgramManagerView"/>?id=<c:out value="${program.id}"/>"><c:out
129-
value="${program.name}"/></a>
130-
</display:column>
131-
<% } else { %>
132-
<display:column sortable="true" sortProperty="name"
133-
title="Program Name">
134-
<c:out value="${program.name}"/>
135-
</display:column>
136-
<% } %>
126+
<c:choose>
127+
<c:when test="${program.facilityId == facility.id}">
128+
<display:column sortable="true" sortProperty="name" title="Program Name">
129+
<a href="${pageContext.request.contextPath}/PMmodule/ProgramManagerView?id=${program.id}">
130+
<c:out value="${program.name}" />
131+
</a>
132+
</display:column>
133+
</c:when>
134+
<c:otherwise>
135+
<display:column sortable="true" sortProperty="name" title="Program Name">
136+
<c:out value="${program.name}" />
137+
</display:column>
138+
</c:otherwise>
139+
</c:choose>
137140

138141
<display:column property="type" sortable="true" title="Program Type"/>
139142
<display:column property="queueSize" sortable="true"
@@ -161,18 +164,20 @@
161164
<th>Bed Program</th>
162165
<th>Discharge Date/Time</th>
163166
</tr>
164-
<% for (org.oscarehr.common.model.Client client : (List<org.oscarehr.common.model.Client>) request.getAttribute("associatedClients")) { %>
165-
<% String styleColor = ""; %>
166-
<% if (client.isInOneDay()) { %>
167-
<% styleColor = "style=\"color:red;\""; %>
168-
<% } %>
167+
<c:forEach var="client" items="${associatedClients}">
168+
169+
<%String styleColor = ""; %>
170+
<c:if test="${client.inOneDay}">
171+
<%styleColor = "style=\"color:red;\"";%>
172+
</c:if>
169173
<tr class="b" <%=styleColor%>>
170174
<td><c:out value="${client.name}"/></td>
171175
<td><c:out value="${client.dob}"/></td>
172176
<td><c:out value="${client.programName}"/></td>
173177
<td><c:out value="${client.dischargeDate}"/></td>
174178
</tr>
175-
<% } %>
179+
180+
</c:forEach>
176181
</table>
177182

178183

‎src/main/webapp/PMmodule/ClientSearchForm.jsp

+5-4
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@
8989
<th>Date of Birth</th>
9090
<td><html:text property="criteria.dob" size="15"/><br/><font size="1">yyyy/mm/dd</font></td>
9191
</tr>
92-
<c:if test="${!moduleLoaded['TORONTO_RFQ']}">
93-
<c:if test="${moduleLoaded['GET_OHIP_INFO']}">
92+
<caisi:isModuleLoad moduleName="TORONTO_RFQ" reverse="true">
93+
<caisi:isModuleLoad moduleName="GET_OHIP_INFO" reverse="false">
9494
<tr>
9595
<th>Health Card Number</th>
9696
<td><html:text property="criteria.healthCardNumber" size="15"/>
@@ -106,11 +106,12 @@
106106
<!-- <th>Search outside of domain <a href="javascript:void(0)" onclick="popupHelp('domain')">?</a></th>
107107
-->
108108
<tr>
109-
<c:if test="${moduleLoaded['pmm.client.search.outside.of.domain.enabled']}">
109+
<caisi:isModuleLoad
110+
moduleName="pmm.client.search.outside.of.domain.enabled">
110111
<th>Search all clients <a href="javascript:void(0)"
111112
onclick="popupHelp('domain')">?</a></th>
112113
<td><html:checkbox property="criteria.searchOutsideDomain"/></td>
113-
</c:if>
114+
</caisi:isModuleLoad>
114115
</tr>
115116

116117
<tr>

‎src/main/webapp/PMmodule/GenericIntake/Edit.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<%@page import="java.text.DateFormatSymbols" %>
6464
<%@page import="org.apache.commons.lang.time.DateFormatUtils" %>
6565
<%@page import="org.oscarehr.common.model.Demographic" %>
66-
<html xhtml="true" locale="true">
66+
<html>
6767
<head>
6868
<script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>
6969
<script type="text/javascript" src="<%= request.getContextPath() %>/js/check_hin.js"></script>

‎src/main/webapp/PMmodule/GenericIntake/Print.jsp

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
GenericIntakeEditFormBean intakeEditForm = (GenericIntakeEditFormBean) session.getAttribute("genericIntakeEditForm");
3131
Intake intake = intakeEditForm.getIntake();
3232
%>
33-
<html:html xhtml="true" locale="true">
33+
<html>
3434
<head>
3535
<script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>
3636
<title>Generic Intake Print</title>
@@ -112,4 +112,4 @@
112112
</div>
113113
<caisi:intake base="<%=3%>" intake="<%=intake%>"/></div>
114114
</body>
115-
</html:html>
115+
</html>

‎src/main/webapp/PMmodule/GenericIntake/PrintPreview.jsp

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
GenericIntakeEditFormBean intakeEditForm = (GenericIntakeEditFormBean) session.getAttribute("genericIntakeEditForm");
3131
Intake intake = intakeEditForm.getIntake();
3232
%>
33-
<html:html xhtml="true" locale="true">
33+
<html>
3434
<head>
3535
<script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>
3636
<title>Generic Intake Print</title>
@@ -116,4 +116,4 @@
116116
</tr>
117117
</table>
118118
</body>
119-
</html:html>
119+
</html>

‎src/main/webapp/PMmodule/IntakeCReport.jsp

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
Date[] dateList = (Date[]) request.getAttribute("dateList");
3939
%>
4040

41-
<html:html xhtml="true" locale="true">
41+
<html>
4242
<head>
4343
<script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>
4444
<title>Street Health Mental Health Report</title>
@@ -104,4 +104,4 @@
104104
%>
105105
</table>
106106
</body>
107-
</html:html>
107+
</html>

‎src/main/webapp/PMmodule/StreetHealthIntakeReport.jsp

100755100644
+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
%>
3232

3333

34-
<html:html xhtml="true" locale="true">
34+
<html>
3535
<head>
3636
<script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>
3737
<title>Street Health Mental Health Report</title>
@@ -137,4 +137,4 @@
137137
</table>
138138

139139
</body>
140-
</html:html>
140+
</html>

‎src/main/webapp/PMmodule/layout.jsp

+5-3
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,19 @@
8282
</head>
8383
<body style="margin-top:0;margin-bottom:0;margin-right:0;margin-left:0;">
8484

85-
<tiles:insert name="topnav.jsp"></tiles:insert>
85+
<jsp:include page="topnav.jsp" />
8686

8787
<div style="height:20px"></div>
8888

8989
<div class="composite">
9090
<table border="0" cellspacing="0" cellpadding="0" width="100%">
9191
<tr valign="top">
92-
<td id="leftcol" width="20%"><tiles:insert attribute="navigation"/>
92+
<td id="leftcol" width="20%">
93+
<jsp:include page="/PMmodule/navigation_blank.jsp"/>
9394
</td>
9495
<td width="80%">
95-
<div class="body"><tiles:insert attribute="body"/></div>
96+
<div class="body">
97+
<jsp:include page="/PMmodule/Home.jsp"/>
9698
</td>
9799
</tr>
98100
</table>

‎src/main/webapp/PMmodule/lookup/LookupCodeEdit.jsp

+4-4
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<td width="30%">${field.fieldDesc}</td>
8888
<td>
8989
<c:choose>
90-
<!-- String Field Type (S) -->
90+
<%-- String Field Type (S) --%>
9191
<c:when test="${field.fieldType == 'S'}">
9292
<c:choose>
9393
<c:when test="${not field.editable}">
@@ -114,7 +114,7 @@
114114
</c:choose>
115115
</c:when>
116116

117-
<!-- Date Field Type (D) -->
117+
<%-- Date Field Type (D) --%>
118118
<c:when test="${field.fieldType == 'D'}">
119119
<c:choose>
120120
<c:when test="${field.editable}">
@@ -128,7 +128,7 @@
128128
</c:choose>
129129
</c:when>
130130

131-
<!-- Number Field Type (N) -->
131+
<%-- Number Field Type (N) --%>
132132
<c:when test="${field.fieldType == 'N'}">
133133
<c:choose>
134134
<c:when test="${field.editable}">
@@ -141,7 +141,7 @@
141141
</c:choose>
142142
</c:when>
143143

144-
<!-- Boolean Field Type (B) -->
144+
<%-- Boolean Field Type (B) --%>
145145
<c:when test="${field.fieldType == 'B'}">
146146
<c:choose>
147147
<c:when test="${field.editable}">

‎src/main/webapp/PMmodule/reports/ClientListsReport.jsp

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
<th>Program</th>
4343
</tr>
4444
<%
45-
Map<String, DemographicDao.ClientListsReportResults> reportResults = (Map<String, DemographicDao.ClientListsReportResults>) request.getAttribute("reportResults");
46-
for (DemographicDao.ClientListsReportResults clientListsReportResults : reportResults.values()) {
45+
Map<String, DemographicDaoImpl.ClientListsReportResults> reportResults = (Map<String, DemographicDaoImpl.ClientListsReportResults>) request.getAttribute("reportResults");
46+
for (DemographicDaoImpl.ClientListsReportResults clientListsReportResults : reportResults.values()) {
4747
%>
4848
<tr>
4949
<td><%=clientListsReportResults.lastName + ", " + clientListsReportResults.firstName%>

‎src/main/webapp/admin/billingreferralAdmin.jsp

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
2121
"http://www.w3.org/TR/html4/loose.dtd">
2222
<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
23+
<%@page import="org.owasp.encoder.Encode" %>
2324
<%@ include file="/taglibs.jsp" %>
2425
<%@ taglib uri="/WEB-INF/security.tld" prefix="security" %>
2526
<%

‎src/main/webapp/administration/leftNav.jspf

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
--%>
2626

27+
<%@ page import="oscar.OscarProperties" %>
28+
2729
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
2830

2931
<%

‎src/main/webapp/billing/CA/BC/billingAddReferralDoc.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<%@page import="org.oscarehr.common.model.Billingreferral" %>
4949
<%@page import="org.oscarehr.common.dao.BillingreferralDao" %>
5050
<%
51-
BillingreferralDao billingReferralDao = (BillingreferralDao) SpringUtils.getBean(BillingreferralDAO.class);
51+
BillingreferralDao billingReferralDao = (BillingreferralDao) SpringUtils.getBean(BillingreferralDao.class);
5252
%>
5353

5454
<%@page import="org.oscarehr.util.MiscUtils" %>

‎src/main/webapp/billing/CA/BC/billingBC.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
String defaultServiceLocation = OscarProperties.getInstance().getProperty("visittype");
222222
223223
// 2. global billing settings
224-
List<Property> userSetDefaultServiceLocationList = propertyDao.findGlobalByName(Property.PROPERTY_KEY.bc_default_service_location);
224+
List<Property> userSetDefaultServiceLocationList = propertyDao.findGlobalByName(Property.PROPERTY_KEY.bc_default_service_location.toString());
225225
if (userSetDefaultServiceLocationList != null && !userSetDefaultServiceLocationList.isEmpty()) {
226226
Property uerSetDefaultServiceLocationProperty = userSetDefaultServiceLocationList.get(0);
227227
String userSetDefaultServiceLocation = null;

0 commit comments

Comments
 (0)