Skip to content

Commit 0211d37

Browse files
D3V41D3V41
committed
fix: restore server-side drug filtering and heading display broken by DataTables upgrade
1 parent 5ca89f3 commit 0211d37

2 files changed

Lines changed: 116 additions & 23 deletions

File tree

‎src/main/webapp/oscarRx/ListDrugs.jsp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -252,29 +252,29 @@
252252
isPrevAnnotation = true;
253253
}
254254
255-
// if (request.getParameter("status") != null) { //TODO: Redo this in a better way
256-
// String stat = request.getParameter("status");
257-
// if (stat.equals("active") && !prescriptDrug.isLongTerm() && !prescriptDrug.isCurrent()) {
258-
// continue;
259-
// } else if (stat.equals("inactive") && prescriptDrug.isCurrent()) {
260-
// continue;
261-
// }
262-
// }
263-
// if (request.getParameter("longTermOnly") != null && request.getParameter("longTermOnly").equals("true")) {
264-
// if (!prescriptDrug.isLongTerm()) {
265-
// continue;
266-
// }
267-
// }
268-
//
269-
// if (request.getParameter("longTermOnly") != null && request.getParameter("longTermOnly").equals("acute")) {
270-
// if (prescriptDrug.isLongTerm()) {
271-
// continue;
272-
// }
273-
// }
274-
// if (request.getParameter("drugLocation") != null && request.getParameter("drugLocation").equals("external")) {
275-
// if (!prescriptDrug.isExternal())
276-
// continue;
277-
// }
255+
if (request.getParameter("status") != null) { //TODO: Redo this in a better way
256+
String stat = request.getParameter("status");
257+
if (stat.equals("active") && !prescriptDrug.isLongTerm() && !prescriptDrug.isCurrent()) {
258+
continue;
259+
} else if (stat.equals("inactive") && prescriptDrug.isCurrent()) {
260+
continue;
261+
}
262+
}
263+
if (request.getParameter("longTermOnly") != null && request.getParameter("longTermOnly").equals("true")) {
264+
if (!prescriptDrug.isLongTerm()) {
265+
continue;
266+
}
267+
}
268+
269+
if (request.getParameter("longTermOnly") != null && request.getParameter("longTermOnly").equals("acute")) {
270+
if (prescriptDrug.isLongTerm()) {
271+
continue;
272+
}
273+
}
274+
if (request.getParameter("drugLocation") != null && request.getParameter("drugLocation").equals("external")) {
275+
if (!prescriptDrug.isExternal())
276+
continue;
277+
}
278278
//add all long term med drugIds to an array.
279279
styleColor = getClassColour(prescriptDrug, now, month);
280280
String specialText = prescriptDrug.getSpecial();

‎src/main/webapp/oscarRx/SearchDrug3.jsp‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,6 +1217,99 @@
12171217
<table>
12181218
<tr>
12191219
<td>
1220+
<table class="legend">
1221+
<tr>
1222+
<td class="legend-change-view">
1223+
<a href="#"
1224+
title="<fmt:setBundle basename="oscarResources"/><fmt:message key="provider.rxChangeProfileViewMessage"/>"
1225+
onclick="popupPage(230,860,'../setProviderStaleDate.do?method=viewRxProfileView');"
1226+
class="link-red-no-decoration">
1227+
<fmt:message key="provider.rxChangeProfileView"/>
1228+
</a>
1229+
</td>
1230+
1231+
<td>
1232+
1233+
<table class="legend_items" align="left">
1234+
<tr>
1235+
<%if (show_current) {%>
1236+
<td>
1237+
<a href="javascript:void(0);"
1238+
onclick="callReplacementWebService('ListDrugs.jsp','drugProfile');CngClass(this);"
1239+
id="selected_default" class="link-default-selected"
1240+
TITLE="<fmt:setBundle basename="oscarResources"/><fmt:message key='SearchDrug.msgShowCurrentDesc'/>">
1241+
<fmt:setBundle basename="oscarResources"/><fmt:message key="SearchDrug.msgShowCurrent"/>
1242+
</a>
1243+
</td>
1244+
<%
1245+
}
1246+
if (show_all) {
1247+
%>
1248+
<td>
1249+
<a href="javascript:void(0);"
1250+
onclick="callReplacementWebService('ListDrugs.jsp?show=all','drugProfile');CngClass(this);"
1251+
Title="<fmt:setBundle basename="oscarResources"/><fmt:message key='SearchDrug.msgShowAllDesc'/>">
1252+
<fmt:setBundle basename="oscarResources"/><fmt:message key="SearchDrug.msgShowAll"/>
1253+
</a>
1254+
</td>
1255+
<%
1256+
}
1257+
if (active) {
1258+
%>
1259+
<td>
1260+
<a href="javascript:void(0);"
1261+
onclick="callReplacementWebService('ListDrugs.jsp?status=active','drugProfile');CngClass(this);"
1262+
TITLE="<fmt:setBundle basename="oscarResources"/><fmt:message key='SearchDrug.msgActiveDesc'/>">
1263+
<fmt:setBundle basename="oscarResources"/><fmt:message key="SearchDrug.msgActive"/>
1264+
</a>
1265+
</td>
1266+
<%
1267+
}
1268+
if (inactive) {
1269+
%>
1270+
<td>
1271+
<a href="javascript:void(0);"
1272+
onclick="callReplacementWebService('ListDrugs.jsp?status=inactive','drugProfile');CngClass(this);"
1273+
TITLE="<fmt:setBundle basename="oscarResources"/><fmt:message key='SearchDrug.msgInactiveDesc'/>">
1274+
<fmt:setBundle basename="oscarResources"/><fmt:message key="SearchDrug.msgInactive"/>
1275+
</a>
1276+
</td>
1277+
<%
1278+
}
1279+
if (!OscarProperties.getInstance().getProperty("rx.profile_legend.hide", "false").equals("true")) {
1280+
1281+
if (longterm_acute) {
1282+
%>
1283+
<td>
1284+
<a href="javascript:void(0);"
1285+
onclick="callReplacementWebService('ListDrugs.jsp?longTermOnly=true&heading=Long Term Meds','drugProfile'); callAdditionWebService('ListDrugs.jsp?longTermOnly=acute&heading=Acute','drugProfile');CngClass(this);"
1286+
TITLE="<fmt:setBundle basename='oscarResources'/><fmt:message key='SearchDrug.msgLongTermAcuteDesc'/>">
1287+
<fmt:setBundle basename="oscarResources"/><fmt:message key="SearchDrug.msgLongTermAcute"/>
1288+
</a>
1289+
</td>
1290+
<%
1291+
}
1292+
if (longterm_acute_inactive_external) {
1293+
%>
1294+
<td>
1295+
<a href="javascript:void(0);"
1296+
onclick="callReplacementWebService('ListDrugs.jsp?longTermOnly=true&heading=Long Term Meds','drugProfile'); callAdditionWebService('ListDrugs.jsp?longTermOnly=acute&heading=Acute&status=active','drugProfile');callAdditionWebService('ListDrugs.jsp?longTermOnly=acute&heading=Inactive&status=inactive','drugProfile');callAdditionWebService('ListDrugs.jsp?heading=External&drugLocation=external','drugProfile');CngClass(this);"
1297+
TITLE="<fmt:setBundle basename='oscarResources'/><fmt:message key='SearchDrug.msgLongTermAcuteInactiveExternalDesc'/>">
1298+
<fmt:setBundle basename="oscarResources"/><fmt:message
1299+
key="SearchDrug.msgLongTermAcuteInactiveExternal"/>
1300+
</a>
1301+
</td>
1302+
<%
1303+
}
1304+
}
1305+
%>
1306+
</tr>
1307+
</table>
1308+
1309+
</td>
1310+
1311+
</tr>
1312+
</table>
12201313
<div id="drugProfile"></div>
12211314

12221315
<div id="themeLegend">

0 commit comments

Comments
 (0)