From 892553bf823595085eb164e9dc6f07b7b3b0d1b5 Mon Sep 17 00:00:00 2001
From: Matthew Williams <mattwilliams1515@gmail.com>
Date: Sun, 6 Dec 2020 19:21:59 -0600
Subject: [PATCH] Finalize space to tab conversion
---
.../WebRoot/auth/hcp-uap/activatePatient.jsp | 114 ++++-----
.../auth/hcp-uap/deactivatePrePatient.jsp | 4 +-
.../hcp-uap/viewPreRegisteredPatientInfo.jsp | 168 ++++++-------
.../hcp-uap/viewPreRegisteredPatientList.jsp | 114 ++++-----
iTrust/WebRoot/auth/hcp/menu.jsp | 238 +++++++++---------
iTrust/sql/createTables.sql | 2 +-
.../csc/itrust/action/EditPatientAction.java | 8 +-
.../action/EditPrescriptionsAction.java | 10 +-
.../ncsu/csc/itrust/dao/mysql/PatientDAO.java | 6 +-
.../csc/itrust/enums/TransactionType.java | 196 +++++++--------
...iewPreRegisteredPatientListActionTest.java | 6 +-
.../datagenerators/TestDataGenerator.java | 10 +-
12 files changed, 438 insertions(+), 438 deletions(-)
diff --git a/iTrust/WebRoot/auth/hcp-uap/activatePatient.jsp b/iTrust/WebRoot/auth/hcp-uap/activatePatient.jsp
index 87a19f5..901932f 100644
--- a/iTrust/WebRoot/auth/hcp-uap/activatePatient.jsp
+++ b/iTrust/WebRoot/auth/hcp-uap/activatePatient.jsp
@@ -20,21 +20,21 @@
<%@include file="/header.jsp"%>
<itrust:patientNav thisTitle="Deactivate" />
<%
- /* Require a Patient ID first */
+ /* Require a Patient ID first */
String pidString = (String) session.getAttribute("pid");
if (pidString == null || pidString.equals("") || 1 > pidString.length()) {
out.println("pidstring is null");
response.sendRedirect("/iTrust/auth/getPatientID.jsp?forward=hcp-uap/deactivatePatient.jsp");
return;
- }
-
- /* If the patient id doesn't check out, then kick 'em out to the exception handler */
+ }
+
+ /* If the patient id doesn't check out, then kick 'em out to the exception handler */
EditPatientAction action = new EditPatientAction(prodDAO, loggedInMID.longValue(), pidString);
- /* Now take care of updating information */
+ /* Now take care of updating information */
PatientBean p;
-
+
if (request.getParameter("formIsFilled") != null && request.getParameter("formIsFilled").equals("true") &&
request.getParameter("understand") != null && request.getParameter("understand").equals("I UNDERSTAND")) {
try {
@@ -45,75 +45,75 @@
%>
- <a href="/iTrust/auth/hcp-uap/viewPreRegisteredPatientList.jsp" style="text-decoration: none;">
- <input type=button value="Go Back to Pre-Registered Patient List" onClick="location='/iTrust/auth/hcp-uap/viewPreRegisteredPatientList.jsp';">
- </a>
- <br /><br /><br /><br /><br />
-
- <div align=center>
- <span class="iTrustMessage">Patient Successfully Activated! You can </span>
- <a href="editPHR.jsp" style="text-decoration: none;">
- <input type=button value="Edit Patient" onClick="location='editPHR.jsp';">
- </a>
- </div>
- <br /><br /><br /><br /><br />
+ <a href="/iTrust/auth/hcp-uap/viewPreRegisteredPatientList.jsp" style="text-decoration: none;">
+ <input type=button value="Go Back to Pre-Registered Patient List" onClick="location='/iTrust/auth/hcp-uap/viewPreRegisteredPatientList.jsp';">
+ </a>
+ <br /><br /><br /><br /><br />
+
+ <div align=center>
+ <span class="iTrustMessage">Patient Successfully Activated! You can </span>
+ <a href="editPHR.jsp" style="text-decoration: none;">
+ <input type=button value="Edit Patient" onClick="location='editPHR.jsp';">
+ </a>
+ </div>
+ <br /><br /><br /><br /><br />
<%
- } catch (Exception e) {
+ } catch (Exception e) {
%>
- <br />
- <div align=center>
- <span class="iTrustError"><%=StringEscapeUtils.escapeHtml(e.getMessage()) %></span>
- </div>
- <br />
+ <br />
+ <div align=center>
+ <span class="iTrustError"><%=StringEscapeUtils.escapeHtml(e.getMessage()) %></span>
+ </div>
+ <br />
<%
- }
- } else {
+ }
+ } else {
p = action.getPatient();
if (request.getParameter("formIsFilled") != null && request.getParameter("formIsFilled").equals("true") &&
- (request.getParameter("understand") == null || !request.getParameter("understand").equals("I UNDERSTAND"))) {
+ (request.getParameter("understand") == null || !request.getParameter("understand").equals("I UNDERSTAND"))) {
%>
- <br />
- <div align=center>
- <span class="iTrustError">You must type "I UNDERSTAND" in the textbox.</span>
- </div>
- <br />
+ <br />
+ <div align=center>
+ <span class="iTrustError">You must type "I UNDERSTAND" in the textbox.</span>
+ </div>
+ <br />
<%
- }
-
+ }
+
%>
<form id="activateForm" action="activatePatient.jsp" method="post">
<input type="hidden" name="formIsFilled" value="true"><br />
<table cellspacing=0 align=center cellpadding=0>
- <tr>
- <td valign=top>
- <table class="fTable" align=center style="width: 350px;">
- <tr>
- <th colspan="4">Activate Patient</th>
- </tr>
- <tr>
-
- <td class="subHeaderVertical">First Name:</td>
- <td><%= StringEscapeUtils.escapeHtml("" + (p.getFirstName())) %></td>
- <td class="subHeaderVertical">Last Name:</td>
- <td><%= StringEscapeUtils.escapeHtml("" + (p.getLastName())) %></td>
- </tr>
- <tr>
- <td colspan="4">Are you absolutely sure you want to ACTIVATE this
+ <tr>
+ <td valign=top>
+ <table class="fTable" align=center style="width: 350px;">
+ <tr>
+ <th colspan="4">Activate Patient</th>
+ </tr>
+ <tr>
+
+ <td class="subHeaderVertical">First Name:</td>
+ <td><%= StringEscapeUtils.escapeHtml("" + (p.getFirstName())) %></td>
+ <td class="subHeaderVertical">Last Name:</td>
+ <td><%= StringEscapeUtils.escapeHtml("" + (p.getLastName())) %></td>
+ </tr>
+ <tr>
+ <td colspan="4">Are you absolutely sure you want to ACTIVATE this
patient? If you are sure, type "I UNDERSTAND" into the box below
and click the button</td>
- </tr>
- <tr>
- <td colspan="4"><div align="center"><input name="understand" type="text"></div></td>
- </tr>
- </table>
- </td>
- </tr>
+ </tr>
+ <tr>
+ <td colspan="4"><div align="center"><input name="understand" type="text"></div></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
</table>
<br />
<div align=center>
- <input type="submit" name="action"
+ <input type="submit" name="action"
style="font-size: 16pt; font-weight: bold;" value="Activate Patient"><br /><br />
</div>
</form>
diff --git a/iTrust/WebRoot/auth/hcp-uap/deactivatePrePatient.jsp b/iTrust/WebRoot/auth/hcp-uap/deactivatePrePatient.jsp
index 0ee2f1d..c52a144 100644
--- a/iTrust/WebRoot/auth/hcp-uap/deactivatePrePatient.jsp
+++ b/iTrust/WebRoot/auth/hcp-uap/deactivatePrePatient.jsp
@@ -49,10 +49,10 @@ else {
if (session.getAttribute("pid") == null) {
pid = 0;
pidString = "";
- } else {
+ } else {
pid = (long) Long.parseLong((String) session.getAttribute("pid"));
pidString = ""+pid;
- }
+ }
}
/* Require a Patient ID first */
diff --git a/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientInfo.jsp b/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientInfo.jsp
index bbb260c..2114087 100644
--- a/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientInfo.jsp
+++ b/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientInfo.jsp
@@ -76,15 +76,15 @@ else {
if (session.getAttribute("pid") == null) {
pid = 0;
pidString = "";
- } else {
+ } else {
pid = (long) Long.parseLong((String) session.getAttribute("pid"));
pidString = ""+pid;
- }
+ }
}
if (pidString == null || 1 > pidString.length()) {
response.sendRedirect("../getPatientID.jsp?forward=hcp-uap/editPHR.jsp");
-
+
return;
}
loggingAction.logEvent(TransactionType.PATIENT_HEALTH_INFORMATION_VIEW, loggedInMID.longValue(), pid, "");
@@ -98,10 +98,10 @@ if(request.getParameter("addA") != null)
try{
confirm = action.updateAllergies(pid,request.getParameter("description"));
loggingAction.logEvent(TransactionType.PATIENT_HEALTH_INFORMATION_EDIT, loggedInMID.longValue(), pid, "");
- } catch(Exception e)
- {
+ } catch(Exception e)
+ {
confirm = e.getMessage();
- }
+ }
}
PatientBean patient = action.getPatient();
@@ -118,7 +118,7 @@ List<FamilyMemberBean> family = action.getFamily();
function showRisks(){
document.getElementById("risks").style.display="inline";
document.getElementById("riskButton").style.display="none";
- }
+ }
</script>
<% if (!"".equals(confirm)) {%>
@@ -128,90 +128,90 @@ List<FamilyMemberBean> family = action.getFamily();
<br />
<a href="/iTrust/auth/hcp-uap/viewPreRegisteredPatientList.jsp" style="text-decoration: none;">
- <input type=button value="Go Back to Pre-Registered Patient List" onClick="location='/iTrust/auth/hcp-uap/viewPreRegisteredPatientList.jsp';">
+ <input type=button value="Go Back to Pre-Registered Patient List" onClick="location='/iTrust/auth/hcp-uap/viewPreRegisteredPatientList.jsp';">
</a>
<br /><br />
<td>
- <a href="activatePatient.jsp" style="text-decoration: none;">
- <input type=button value="Activate" >
- </a>
+ <a href="activatePatient.jsp" style="text-decoration: none;">
+ <input type=button value="Activate" >
+ </a>
</td>
<div align=center>
- <div style="margin-right: 10px;">
- <table class="fTable" align="center">
- <tr>
- <th colspan="2">Patient Information</th>
- </tr>
- <tr>
- <td class="subHeaderVertical">Name:</td>
- <td ><%= StringEscapeUtils.escapeHtml("" + (patient.getFullName())) %></td>
- </tr>
- <tr>
- <td class="subHeaderVertical">Address:</td>
- <td > <%= StringEscapeUtils.escapeHtml("" + (patient.getStreetAddress1())) %><br />
- <%="".equals(patient.getStreetAddress2()) ? "" : patient.getStreetAddress2() + "<br />"%>
- <%= StringEscapeUtils.escapeHtml("" + (patient.getStreetAddress3())) %><br />
- </td>
- </tr>
- <tr>
- <td class="subHeaderVertical">Phone:</td>
- <td ><%= StringEscapeUtils.escapeHtml("" + (patient.getPhone())) %></td>
- </tr>
- <tr>
- <td class="subHeaderVertical" >Email:</td>
- <td ><%= StringEscapeUtils.escapeHtml("" + (patient.getEmail())) %></td>
- </tr>
-
- <tr>
- <th colspan="2">Insurance Information</th>
- </tr>
- <tr>
- <td class="subHeaderVertical" >Provider Name:</td>
- <td ><%= StringEscapeUtils.escapeHtml("" + (patient.getIcName())) %></td>
- </tr>
- <tr>
- <td class="subHeaderVertical">Address:</td>
- <td > <%= StringEscapeUtils.escapeHtml("" + (patient.getIcAddress1())) %><br />
- <%="".equals(patient.getIcAddress2()) ? "" : patient.getIcAddress2() + "<br />"%>
- <%= StringEscapeUtils.escapeHtml("" + (patient.getIcAddress3())) %><br />
- </td>
- </tr>
- <tr>
- <td class="subHeaderVertical">Phone:</td>
- <td ><%= StringEscapeUtils.escapeHtml("" + (patient.getIcPhone())) %></td>
- </tr>
- </table>
- <br />
-
- </div>
-
- <div style="margin-right: 10px;">
- <table class="fTable" align="center">
- <tr>
- <th colspan="2">Basic Health Records</th>
- </tr>
- <% if (null == mostRecent) { %>
- <tr><td colspan=2>No basic health records are on file for this patient</td></tr>
- <% } else {%>
- <tr>
- <td class="subHeaderVertical">Height:</td>
- <td ><%= StringEscapeUtils.escapeHtml("" + (mostRecent.getHeight())) %>in.</td>
- </tr>
- <tr>
- <td class="subHeaderVertical">Weight:</td>
- <td ><%= StringEscapeUtils.escapeHtml("" + (mostRecent.getWeight())) %>lbs.</td>
- </tr>
- <tr>
- <td class="subHeaderVertical">Smoker?:</td>
- <td ><%= StringEscapeUtils.escapeHtml("" + (mostRecent.getSmokingStatus()) + " - " + (mostRecent.getSmokingStatusDesc())) %></td>
- </tr>
-
- <% } //closing for "there is a most recent record for this patient" %>
- </table>
- <br />
- </div>
+ <div style="margin-right: 10px;">
+ <table class="fTable" align="center">
+ <tr>
+ <th colspan="2">Patient Information</th>
+ </tr>
+ <tr>
+ <td class="subHeaderVertical">Name:</td>
+ <td ><%= StringEscapeUtils.escapeHtml("" + (patient.getFullName())) %></td>
+ </tr>
+ <tr>
+ <td class="subHeaderVertical">Address:</td>
+ <td > <%= StringEscapeUtils.escapeHtml("" + (patient.getStreetAddress1())) %><br />
+ <%="".equals(patient.getStreetAddress2()) ? "" : patient.getStreetAddress2() + "<br />"%>
+ <%= StringEscapeUtils.escapeHtml("" + (patient.getStreetAddress3())) %><br />
+ </td>
+ </tr>
+ <tr>
+ <td class="subHeaderVertical">Phone:</td>
+ <td ><%= StringEscapeUtils.escapeHtml("" + (patient.getPhone())) %></td>
+ </tr>
+ <tr>
+ <td class="subHeaderVertical" >Email:</td>
+ <td ><%= StringEscapeUtils.escapeHtml("" + (patient.getEmail())) %></td>
+ </tr>
+
+ <tr>
+ <th colspan="2">Insurance Information</th>
+ </tr>
+ <tr>
+ <td class="subHeaderVertical" >Provider Name:</td>
+ <td ><%= StringEscapeUtils.escapeHtml("" + (patient.getIcName())) %></td>
+ </tr>
+ <tr>
+ <td class="subHeaderVertical">Address:</td>
+ <td > <%= StringEscapeUtils.escapeHtml("" + (patient.getIcAddress1())) %><br />
+ <%="".equals(patient.getIcAddress2()) ? "" : patient.getIcAddress2() + "<br />"%>
+ <%= StringEscapeUtils.escapeHtml("" + (patient.getIcAddress3())) %><br />
+ </td>
+ </tr>
+ <tr>
+ <td class="subHeaderVertical">Phone:</td>
+ <td ><%= StringEscapeUtils.escapeHtml("" + (patient.getIcPhone())) %></td>
+ </tr>
+ </table>
+ <br />
+
+ </div>
+
+ <div style="margin-right: 10px;">
+ <table class="fTable" align="center">
+ <tr>
+ <th colspan="2">Basic Health Records</th>
+ </tr>
+ <% if (null == mostRecent) { %>
+ <tr><td colspan=2>No basic health records are on file for this patient</td></tr>
+ <% } else {%>
+ <tr>
+ <td class="subHeaderVertical">Height:</td>
+ <td ><%= StringEscapeUtils.escapeHtml("" + (mostRecent.getHeight())) %>in.</td>
+ </tr>
+ <tr>
+ <td class="subHeaderVertical">Weight:</td>
+ <td ><%= StringEscapeUtils.escapeHtml("" + (mostRecent.getWeight())) %>lbs.</td>
+ </tr>
+ <tr>
+ <td class="subHeaderVertical">Smoker?:</td>
+ <td ><%= StringEscapeUtils.escapeHtml("" + (mostRecent.getSmokingStatus()) + " - " + (mostRecent.getSmokingStatusDesc())) %></td>
+ </tr>
+
+ <% } //closing for "there is a most recent record for this patient" %>
+ </table>
+ <br />
+ </div>
</div>
<br />
<br />
diff --git a/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientList.jsp b/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientList.jsp
index 0f2481f..7d12170 100644
--- a/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientList.jsp
+++ b/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientList.jsp
@@ -20,35 +20,35 @@ pageTitle = "iTrust - View All Pre-Registered Patients";
ViewPreRegisteredPatientListAction action = new ViewPreRegisteredPatientListAction(prodDAO, loggedInMID.longValue());
List<PatientBean> PreRegisteredPatientList = action.getPreRegisteredPatients();
-
+
loggingAction.logEvent(TransactionType.PATIENT_LIST_VIEW, loggedInMID, 0, "");
%>
<script src="/iTrust/DataTables/media/js/jquery.dataTables.min.js" type="text/javascript"></script>
- <script type="text/javascript">
+ <script type="text/javascript">
jQuery.fn.dataTableExt.oSort['lname-asc'] = function(x,y) {
var a = x.split(" ");
var b = y.split(" ");
return ((a[1] < b[1]) ? -1 : ((a[1] > b[1]) ? 1 : 0));
- };
-
+ };
+
jQuery.fn.dataTableExt.oSort['lname-desc'] = function(x,y) {
var a = x.split(" ");
var b = y.split(" ");
return ((a[1] < b[1]) ? 1 : ((a[1] > b[1]) ? -1 : 0));
- };
+ };
</script>
-
+
<script type="text/javascript">
- $(document).ready(function() {
- $("#patientList").dataTable( {
- "aaColumns": [ [2,'dsc'] ],
- "aoColumns": [ { "sType": "lname" }, null, null],
- "bStateSave": true,
- "sPaginationType": "full_numbers"
- });
- });
+ $(document).ready(function() {
+ $("#patientList").dataTable( {
+ "aaColumns": [ [2,'dsc'] ],
+ "aoColumns": [ { "sType": "lname" }, null, null],
+ "bStateSave": true,
+ "sPaginationType": "full_numbers"
+ });
+ });
</script>
@@ -57,63 +57,63 @@ loggingAction.logEvent(TransactionType.PATIENT_LIST_VIEW, loggedInMID, 0, "");
</style>
<br />
- <h2>Pre-Registered Patients</h2>
-
+ <h2>Pre-Registered Patients</h2>
+
<form action="viewReport.jsp" method="post" name="myform">
<table class="display fTable" id="patientList" align="center">
- <thead>
- <tr class="">
- <th>Deactivate</th>
- <th>Name</th>
- <th>Address</th>
- <th>Email</th>
-
- </tr>
- </thead>
- <tbody>
- <%
+ <thead>
+ <tr class="">
+ <th>Deactivate</th>
+ <th>Name</th>
+ <th>Address</th>
+ <th>Email</th>
+
+ </tr>
+ </thead>
+ <tbody>
+ <%
List<PatientBean> patientsList = new ArrayList<PatientBean>();
int index = 0;
-
+
for (PatientBean bean : PreRegisteredPatientList) {
patientsList.add(bean);
String idName = "row" + index;
String editButtonName = "button" + index;
- %>
-
- <tr>
- <td>
- <a href="deactivatePrePatient.jsp?patient=<%= StringEscapeUtils.escapeHtml("" + (index)) %>" style="text-decoration: none;">
- <input type=button value="Deactivate" class="deactivate">
- </a>
- </td>
-
- <td >
- <a href="viewPreRegisteredPatientInfo.jsp?patient=<%= StringEscapeUtils.escapeHtml("" + (index)) %>" id=<%=editButtonName%>>
-
- <%= StringEscapeUtils.escapeHtml("" + (bean.getFullName())) %>
-
- </a>
- </td>
- <td ><%= StringEscapeUtils.escapeHtml("" + (bean.getStreetAddress1() +" " +bean.getStreetAddress2() +" " +bean.getCity() +" " +bean.getState()) +" " +bean.getZip()) %></td>
- <td >
- <%= StringEscapeUtils.escapeHtml("" + (bean.getEmail())) %>
- </td>
- </tr>
- <%
+ %>
+
+ <tr>
+ <td>
+ <a href="deactivatePrePatient.jsp?patient=<%= StringEscapeUtils.escapeHtml("" + (index)) %>" style="text-decoration: none;">
+ <input type=button value="Deactivate" class="deactivate">
+ </a>
+ </td>
+
+ <td >
+ <a href="viewPreRegisteredPatientInfo.jsp?patient=<%= StringEscapeUtils.escapeHtml("" + (index)) %>" id=<%=editButtonName%>>
+
+ <%= StringEscapeUtils.escapeHtml("" + (bean.getFullName())) %>
+
+ </a>
+ </td>
+ <td ><%= StringEscapeUtils.escapeHtml("" + (bean.getStreetAddress1() +" " +bean.getStreetAddress2() +" " +bean.getCity() +" " +bean.getState()) +" " +bean.getZip()) %></td>
+ <td >
+ <%= StringEscapeUtils.escapeHtml("" + (bean.getEmail())) %>
+ </td>
+ </tr>
+ <%
index ++;
- }
-
+ }
+
session.setAttribute("patients", patientsList);
- %>
- </tbody>
+ %>
+ </tbody>
</table>
</form>
<script type="text/javascript">
- $('.deactivate').on('click', function() {
- $(this).closest('tr').hide();
- });
+ $('.deactivate').on('click', function() {
+ $(this).closest('tr').hide();
+ });
</script>
<br />
diff --git a/iTrust/WebRoot/auth/hcp/menu.jsp b/iTrust/WebRoot/auth/hcp/menu.jsp
index 5b2fc4a..785d3ba 100644
--- a/iTrust/WebRoot/auth/hcp/menu.jsp
+++ b/iTrust/WebRoot/auth/hcp/menu.jsp
@@ -1,61 +1,61 @@
<div class="panel panel-default">
- <div class="panel-heading" anim-type="collapse" anim-target="#info-menu">
- <h2 class="panel-title">Patient Info</h2>
- </div>
-
- <div class="panel-body" id="info-menu">
- <ul class="nav nav-sidebar">
- <li><a href="/iTrust/auth/hcp-uap/viewPreRegisteredPatientList.jsp">View Pre-Registered Patients</a>
- <li><a href="/iTrust/auth/hcp-uap/viewPatientOfficeVisitHistory.jsp">All Patients</a>
- <li><a href="/iTrust/auth/hcp-uap/viewBasicHealth.jsp">Basic Health Information</a>
- <li><a href="/iTrust/auth/hcp-uap/editPatient.jsp">Patient Information</a>
- <li><a href="/iTrust/auth/hcp-uap/editPHR.jsp">PHR Information</a>
- <li><a href="/iTrust/auth/hcp/editRepresentatives.jsp">Representatives</a>
- <li><a href="/iTrust/auth/hcp-uap/viewImmunizations.jsp">Immunization Report</a>
- <li><a href="/iTrust/auth/hcp-er/emergencyReport.jsp">Emergency Patient Report</a>
- <li><a href="/iTrust/auth/hcp-uap/viewMyReportRequests.jsp">My Report Requests</a>
- <li><a href="/iTrust/auth/hcp-uap/viewRecordsReleases.jsp">Records Release Requests</a>
- <li><a href="/iTrust/auth/hcp-uap/chronicDiseaseRisks.jsp">Chronic Disease Risks</a>
- <li><a href="/iTrust/auth/hcp-pha/viewDiagnosisStatistics.jsp">Diagnosis Trends</a>
- <li><a href="/iTrust/auth/hcp/groupReport.jsp">Group Report</a>
- <li><a href="/iTrust/auth/hcp/changeDependency.jsp">Patient Dependency</a>
- <li><a href="/iTrust/auth/hcp-uap/deactivatePatient.jsp">Deactivate Patient</a>
- <li><a href="/iTrust/auth/hcp/auditPage.jsp">Audit Patients</a>
- <li><a href="/iTrust/auth/hcp-nutritionist/viewFoodDiaries.jsp">Patient Food Diaries</a>
- <li><a href="/iTrust/auth/hcp-nutritionist/macronutrients.jsp">Patient Macronutrient Intake</a>
- <li><a href="/iTrust/auth/hcp-fitness/viewExerciseDiaries.jsp">Patient Exercise Diaries</a>
- <li><a href="/iTrust/auth/hcp/viewSleepDiaries.jsp">Patient Sleep Diaries</a>
- </ul>
- </div>
+ <div class="panel-heading" anim-type="collapse" anim-target="#info-menu">
+ <h2 class="panel-title">Patient Info</h2>
+ </div>
+
+ <div class="panel-body" id="info-menu">
+ <ul class="nav nav-sidebar">
+ <li><a href="/iTrust/auth/hcp-uap/viewPreRegisteredPatientList.jsp">View Pre-Registered Patients</a>
+ <li><a href="/iTrust/auth/hcp-uap/viewPatientOfficeVisitHistory.jsp">All Patients</a>
+ <li><a href="/iTrust/auth/hcp-uap/viewBasicHealth.jsp">Basic Health Information</a>
+ <li><a href="/iTrust/auth/hcp-uap/editPatient.jsp">Patient Information</a>
+ <li><a href="/iTrust/auth/hcp-uap/editPHR.jsp">PHR Information</a>
+ <li><a href="/iTrust/auth/hcp/editRepresentatives.jsp">Representatives</a>
+ <li><a href="/iTrust/auth/hcp-uap/viewImmunizations.jsp">Immunization Report</a>
+ <li><a href="/iTrust/auth/hcp-er/emergencyReport.jsp">Emergency Patient Report</a>
+ <li><a href="/iTrust/auth/hcp-uap/viewMyReportRequests.jsp">My Report Requests</a>
+ <li><a href="/iTrust/auth/hcp-uap/viewRecordsReleases.jsp">Records Release Requests</a>
+ <li><a href="/iTrust/auth/hcp-uap/chronicDiseaseRisks.jsp">Chronic Disease Risks</a>
+ <li><a href="/iTrust/auth/hcp-pha/viewDiagnosisStatistics.jsp">Diagnosis Trends</a>
+ <li><a href="/iTrust/auth/hcp/groupReport.jsp">Group Report</a>
+ <li><a href="/iTrust/auth/hcp/changeDependency.jsp">Patient Dependency</a>
+ <li><a href="/iTrust/auth/hcp-uap/deactivatePatient.jsp">Deactivate Patient</a>
+ <li><a href="/iTrust/auth/hcp/auditPage.jsp">Audit Patients</a>
+ <li><a href="/iTrust/auth/hcp-nutritionist/viewFoodDiaries.jsp">Patient Food Diaries</a>
+ <li><a href="/iTrust/auth/hcp-nutritionist/macronutrients.jsp">Patient Macronutrient Intake</a>
+ <li><a href="/iTrust/auth/hcp-fitness/viewExerciseDiaries.jsp">Patient Exercise Diaries</a>
+ <li><a href="/iTrust/auth/hcp/viewSleepDiaries.jsp">Patient Sleep Diaries</a>
+ </ul>
+ </div>
</div>
<div class="panel panel-default">
- <div class="panel-heading" anim-type="collapse" anim-target="#appt-menu">
- <h2 class="panel-title">Appointments</h2>
- </div>
- <div class="panel-body" id="appt-menu">
- <ul class="nav nav-sidebar">
- <li><a href="/iTrust/auth/hcp/scheduleAppt.jsp">Schedule Appointment</a>
- <li><a href="/iTrust/auth/hcp/viewMyAppts.jsp">View My Appointments</a>
- <li><a href="/iTrust/auth/hcp/viewMyApptRequests.jsp">Appointment Requests</a>
- <li><a href="/iTrust/auth/hcp/calendar.jsp">Appointment Calendar</a>
- </ul>
- </div>
+ <div class="panel-heading" anim-type="collapse" anim-target="#appt-menu">
+ <h2 class="panel-title">Appointments</h2>
+ </div>
+ <div class="panel-body" id="appt-menu">
+ <ul class="nav nav-sidebar">
+ <li><a href="/iTrust/auth/hcp/scheduleAppt.jsp">Schedule Appointment</a>
+ <li><a href="/iTrust/auth/hcp/viewMyAppts.jsp">View My Appointments</a>
+ <li><a href="/iTrust/auth/hcp/viewMyApptRequests.jsp">Appointment Requests</a>
+ <li><a href="/iTrust/auth/hcp/calendar.jsp">Appointment Calendar</a>
+ </ul>
+ </div>
</div>
<div class="panel panel-default">
- <div class="panel-heading" anim-type="collapse" anim-target="#ov-menu">
- <h2 class="panel-title">Office Visits</h2>
- </div>
- <div class="panel-body" id="ov-menu">
- <ul class="nav nav-sidebar">
- <li><a href="/iTrust/auth/hcp-uap/documentOfficeVisit.jsp">Document Office Visit</a>
- <li><a href="/iTrust/auth/hcp/visitReminders.jsp">Office Visit Reminders</a>
- <li><a href="/iTrust/auth/hcp/LabProcHCP.jsp">Laboratory Procedures</a>
- <li><a href="/iTrust/auth/hcp-uap/viewSentReferrals.jsp">Sent Referrals</a>
- <li><a href="/iTrust/auth/hcp-uap/viewReceivedReferrals.jsp">Received Referrals</a>
- </ul>
- </div>
+ <div class="panel-heading" anim-type="collapse" anim-target="#ov-menu">
+ <h2 class="panel-title">Office Visits</h2>
+ </div>
+ <div class="panel-body" id="ov-menu">
+ <ul class="nav nav-sidebar">
+ <li><a href="/iTrust/auth/hcp-uap/documentOfficeVisit.jsp">Document Office Visit</a>
+ <li><a href="/iTrust/auth/hcp/visitReminders.jsp">Office Visit Reminders</a>
+ <li><a href="/iTrust/auth/hcp/LabProcHCP.jsp">Laboratory Procedures</a>
+ <li><a href="/iTrust/auth/hcp-uap/viewSentReferrals.jsp">Sent Referrals</a>
+ <li><a href="/iTrust/auth/hcp-uap/viewReceivedReferrals.jsp">Received Referrals</a>
+ </ul>
+ </div>
</div>
<div class="panel panel-default">
@@ -74,87 +74,87 @@
</div>
<div class="panel panel-default">
- <div class="panel-heading" anim-type="collapse" anim-target="#tele-menu">
- <h2 class="panel-title">Telemedicine</h2>
- </div>
- <div class="panel-body" id="tele-menu">
- <ul class="nav nav-sidebar">
- <li><a href="/iTrust/auth/hcp/editPatientList.jsp">Edit Patient List</a>
- <li><a href="/iTrust/auth/hcp/monitorPatients.jsp">Monitor Patients</a>
- </ul>
- </div>
+ <div class="panel-heading" anim-type="collapse" anim-target="#tele-menu">
+ <h2 class="panel-title">Telemedicine</h2>
+ </div>
+ <div class="panel-body" id="tele-menu">
+ <ul class="nav nav-sidebar">
+ <li><a href="/iTrust/auth/hcp/editPatientList.jsp">Edit Patient List</a>
+ <li><a href="/iTrust/auth/hcp/monitorPatients.jsp">Monitor Patients</a>
+ </ul>
+ </div>
</div>
<div class="panel panel-default">
- <div class="panel-heading" anim-type="collapse" anim-target="#add-menu">
- <h2 class="panel-title">Add</h2>
- </div>
- <div class="panel-body" id="add-menu">
- <ul class="nav nav-sidebar">
- <li><a href="/iTrust/auth/hcp-uap/addPatient.jsp">Patient</a></li>
- <li><a href="/iTrust/auth/hcp-uap/uploadPatientFile.jsp">Upload Patient File</a></li>
- <li><a href="/iTrust/auth/hcp/addUAP.jsp">UAP</a></li>
- </ul>
- </div>
+ <div class="panel-heading" anim-type="collapse" anim-target="#add-menu">
+ <h2 class="panel-title">Add</h2>
+ </div>
+ <div class="panel-body" id="add-menu">
+ <ul class="nav nav-sidebar">
+ <li><a href="/iTrust/auth/hcp-uap/addPatient.jsp">Patient</a></li>
+ <li><a href="/iTrust/auth/hcp-uap/uploadPatientFile.jsp">Upload Patient File</a></li>
+ <li><a href="/iTrust/auth/hcp/addUAP.jsp">UAP</a></li>
+ </ul>
+ </div>
</div>
<div class="panel panel-default">
- <div class="panel-heading" anim-type="collapse" anim-target="#pi-menu">
- <h2 class="panel-title">Personal Info</h2>
- </div>
- <div class="panel-body" id="pi-menu">
- <ul class="nav nav-sidebar">
- <li><a href="/iTrust/auth/staff/editMyDemographics.jsp">My Demographics</a>
- </ul>
- </div>
+ <div class="panel-heading" anim-type="collapse" anim-target="#pi-menu">
+ <h2 class="panel-title">Personal Info</h2>
+ </div>
+ <div class="panel-body" id="pi-menu">
+ <ul class="nav nav-sidebar">
+ <li><a href="/iTrust/auth/staff/editMyDemographics.jsp">My Demographics</a>
+ </ul>
+ </div>
</div>
<div class="panel panel-default">
- <div class="panel-heading" anim-type="collapse" anim-target="#ob-menu">
- <h2 class="panel-title">Obstetrics</h2>
- </div>
- <div class="panel-body" id="ob-menu">
- <ul class="nav nav-sidebar">
- <li><a href="/iTrust/auth/hcp/obstetricsHome.jsp">Obstetrics Home</a></li>
- <li><a href="/iTrust/auth/hcp/addObstetricsInitialRecord.jsp">Initialize Obstetrics Patient</a></li>
- <li><a href="/iTrust/auth/hcp/obstetricsHome.jsp?view">View Obstetrics Records</a></li>
- <li><a href="/iTrust/auth/hcp/addObstetricsOfficeVisit.jsp">Add Obstetrics Office Visit</a></li>
- <li><a href="/iTrust/auth/hcp/obstetricsPreExistingConditions.jsp">Patient Pre-existing Conditions</a></li>
- <li><a href="/iTrust/auth/hcp/obstetricsAlergies.jsp">Patient Allergies</a></li>
- <li><a href="/iTrust/auth/hcp/laborDeliveryReport.jsp">Labor and Delivery Report</a></li>
- </ul>
- </div>
+ <div class="panel-heading" anim-type="collapse" anim-target="#ob-menu">
+ <h2 class="panel-title">Obstetrics</h2>
+ </div>
+ <div class="panel-body" id="ob-menu">
+ <ul class="nav nav-sidebar">
+ <li><a href="/iTrust/auth/hcp/obstetricsHome.jsp">Obstetrics Home</a></li>
+ <li><a href="/iTrust/auth/hcp/addObstetricsInitialRecord.jsp">Initialize Obstetrics Patient</a></li>
+ <li><a href="/iTrust/auth/hcp/obstetricsHome.jsp?view">View Obstetrics Records</a></li>
+ <li><a href="/iTrust/auth/hcp/addObstetricsOfficeVisit.jsp">Add Obstetrics Office Visit</a></li>
+ <li><a href="/iTrust/auth/hcp/obstetricsPreExistingConditions.jsp">Patient Pre-existing Conditions</a></li>
+ <li><a href="/iTrust/auth/hcp/obstetricsAlergies.jsp">Patient Allergies</a></li>
+ <li><a href="/iTrust/auth/hcp/laborDeliveryReport.jsp">Labor and Delivery Report</a></li>
+ </ul>
+ </div>
</div>
<div class="panel panel-default">
- <div class="panel-heading" anim-type="collapse" anim-target="#oph-menu">
- <h2 class="panel-title">Ophthalmology</h2>
- </div>
- <div class="panel-body" id="oph-menu">
- <ul class="nav nav-sidebar">
- <li><a href="/iTrust/auth/hcp/ophthalmologyHome.jsp">Ophthalmology Home</a></li>
- <li><a href="/iTrust/auth/hcp/viewOphthalmologyScheduleRequests.jsp">View Ophthalmology Office Visit Requests</a></li>
- <li><a href="/iTrust/auth/hcp/viewOphthalmologyScheduleOV.jsp">View Scheduled Ophthalmology Office Visits</a></li>
- <li><a href="/iTrust/auth/hcp/ophthalmologyHome.jsp?view">View Ophthalmology Records</a></li>
- <li><a href="/iTrust/auth/hcp/addOphthalmologyOV.jsp">Add Ophthalmology Office Visit</a></li>
- <li><a href="/iTrust/auth/hcp/ophthalmologySurgeryHome.jsp">Surgical Ophthalmology Home</a></li>
- <li><a href="/iTrust/auth/hcp/ophthalmologySurgeryHome.jsp?view">View Surgical Ophthalmology Records</a></li>
- <li><a href="/iTrust/auth/hcp/addOphthalmologySurgery.jsp">Add Surgical Ophthalmology Office Visit</a></li>
- </ul>
- </div>
+ <div class="panel-heading" anim-type="collapse" anim-target="#oph-menu">
+ <h2 class="panel-title">Ophthalmology</h2>
+ </div>
+ <div class="panel-body" id="oph-menu">
+ <ul class="nav nav-sidebar">
+ <li><a href="/iTrust/auth/hcp/ophthalmologyHome.jsp">Ophthalmology Home</a></li>
+ <li><a href="/iTrust/auth/hcp/viewOphthalmologyScheduleRequests.jsp">View Ophthalmology Office Visit Requests</a></li>
+ <li><a href="/iTrust/auth/hcp/viewOphthalmologyScheduleOV.jsp">View Scheduled Ophthalmology Office Visits</a></li>
+ <li><a href="/iTrust/auth/hcp/ophthalmologyHome.jsp?view">View Ophthalmology Records</a></li>
+ <li><a href="/iTrust/auth/hcp/addOphthalmologyOV.jsp">Add Ophthalmology Office Visit</a></li>
+ <li><a href="/iTrust/auth/hcp/ophthalmologySurgeryHome.jsp">Surgical Ophthalmology Home</a></li>
+ <li><a href="/iTrust/auth/hcp/ophthalmologySurgeryHome.jsp?view">View Surgical Ophthalmology Records</a></li>
+ <li><a href="/iTrust/auth/hcp/addOphthalmologySurgery.jsp">Add Surgical Ophthalmology Office Visit</a></li>
+ </ul>
+ </div>
</div>
<div class="panel panel-default">
- <div class="panel-heading" anim-type="collapse" anim-target="#other-menu">
- <h2 class="panel-title">Other</h2>
- </div>
- <div class="panel-body" id="other-menu">
- <ul class="nav nav-sidebar">
- <li><a href="/iTrust/auth/staff/linkToResources.jsp">Edit Diagnoses URLs</a>
- <li><a href="/iTrust/auth/hcp/manageWards.jsp">Manage Wards</a>
- <li><a href="/iTrust/auth/staff/editPersonnel.jsp">UAPs</a>
- <li><a href="/iTrust/auth/surveyResults.jsp">Satisfaction Survey Results</a>
- <li><a href="/iTrust/auth/hcp/viewPrescriptionRenewalNeeds.jsp">Potential Prescription-Renewals</a>
- </ul>
- </div>
+ <div class="panel-heading" anim-type="collapse" anim-target="#other-menu">
+ <h2 class="panel-title">Other</h2>
+ </div>
+ <div class="panel-body" id="other-menu">
+ <ul class="nav nav-sidebar">
+ <li><a href="/iTrust/auth/staff/linkToResources.jsp">Edit Diagnoses URLs</a>
+ <li><a href="/iTrust/auth/hcp/manageWards.jsp">Manage Wards</a>
+ <li><a href="/iTrust/auth/staff/editPersonnel.jsp">UAPs</a>
+ <li><a href="/iTrust/auth/surveyResults.jsp">Satisfaction Survey Results</a>
+ <li><a href="/iTrust/auth/hcp/viewPrescriptionRenewalNeeds.jsp">Potential Prescription-Renewals</a>
+ </ul>
+ </div>
</div>
diff --git a/iTrust/sql/createTables.sql b/iTrust/sql/createTables.sql
index 0e7ec79..05d0171 100644
--- a/iTrust/sql/createTables.sql
+++ b/iTrust/sql/createTables.sql
@@ -707,7 +707,7 @@ CREATE TABLE requiredprocedures(
attribute VARCHAR(30) NOT NULL,
ageMax BIGINT unsigned default NULL
)ENGINE=innoDB;
-
+
CREATE TABLE reviews(
mid BIGINT UNSIGNED NOT NULL,
pid BIGINT UNSIGNED NOT NULL,
diff --git a/iTrust/src/edu/ncsu/csc/itrust/action/EditPatientAction.java b/iTrust/src/edu/ncsu/csc/itrust/action/EditPatientAction.java
index 0a3ea13..187f1a5 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/action/EditPatientAction.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/action/EditPatientAction.java
@@ -93,10 +93,10 @@ public class EditPatientAction extends PatientBaseAction {
}
email.setFrom("no-reply@itrust.com");
- email.setToList(toAddrs); // patient and personal representative
- email.setSubject(String.format("Patient Information Updated"));
- email.setBody("Dear " + pb.getFullName() + ",\n\tYour patient record information has been updated. " +
- "Please login to iTrust to see who has viewed your records.");
+ email.setToList(toAddrs); // patient and personal representative
+ email.setSubject(String.format("Patient Information Updated"));
+ email.setBody("Dear " + pb.getFullName() + ",\n\tYour patient record information has been updated. " +
+ "Please login to iTrust to see who has viewed your records.");
return email;
}
diff --git a/iTrust/src/edu/ncsu/csc/itrust/action/EditPrescriptionsAction.java b/iTrust/src/edu/ncsu/csc/itrust/action/EditPrescriptionsAction.java
index aa1fa15..0061e45 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/action/EditPrescriptionsAction.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/action/EditPrescriptionsAction.java
@@ -141,7 +141,7 @@ public class EditPrescriptionsAction extends EditOfficeVisitBaseAction {
return "Allergy: " + bean.getDescription() + ". First Found: " +
new SimpleDateFormat("MM/dd/yyyy").format(bean.getFirstFound());
}
-
+
/**
* Checks to see if the given prescription has an interaction with any
* other previously prescribed prescriptions.
@@ -328,13 +328,13 @@ public class EditPrescriptionsAction extends EditOfficeVisitBaseAction {
buf.append("\n");
}
String message = "Health care professional " + hcp.getFullName() + " has prescribed " +
- pres.getMedication().getDescription() + ". However, the following warning(s) were found:" +
+ pres.getMedication().getDescription() + ". However, the following warning(s) were found:" +
buf.toString();
email.setFrom("no-reply@itrust.com");
- email.setToList(toAddrs); // patient and personal representative
- email.setSubject(String.format("Prescription warning"));
- email.setBody(message);
+ email.setToList(toAddrs); // patient and personal representative
+ email.setSubject(String.format("Prescription warning"));
+ email.setBody(message);
return email;
}
}
diff --git a/iTrust/src/edu/ncsu/csc/itrust/dao/mysql/PatientDAO.java b/iTrust/src/edu/ncsu/csc/itrust/dao/mysql/PatientDAO.java
index cba1e6d..dc21085 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/dao/mysql/PatientDAO.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/dao/mysql/PatientDAO.java
@@ -245,7 +245,7 @@ public class PatientDAO {
DBUtil.closeConnection(conn, ps);
}
return emailInUse;
- }
+ }
public void addHistory(long pid, long hcpid) throws DBException {
Connection conn = null;
@@ -709,7 +709,7 @@ public class PatientDAO {
/**
* Removes all dependencies participated by the patient passed in the parameter
*
- * @param representerMID the mid for the patient to remove all representees for
+ * @param representeeMID the mid for the patient to remove all representees for
* @throws DBException
*/
public void removeAllRepresentee(long representeeMID) throws DBException {
@@ -762,7 +762,7 @@ public class PatientDAO {
DBUtil.closeConnection(conn, ps);
}
}
-
+
/**
* Return a list of all procedures for a given patient
*
diff --git a/iTrust/src/edu/ncsu/csc/itrust/enums/TransactionType.java b/iTrust/src/edu/ncsu/csc/itrust/enums/TransactionType.java
index acc45c4..6584c27 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/enums/TransactionType.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/enums/TransactionType.java
@@ -148,195 +148,195 @@ public enum TransactionType {
OFFICE_VISIT_BILLED(1160, "Office Visit Billed", "Billed an office visit", false),
/**OPERATIONAL_PROFILE_VIEW*/
OPERATIONAL_PROFILE_VIEW(1200, "View Operational Profile", "viewed the operational profile", false),
- /**HEALTH_REPRESENTATIVE_DECLARE*/
+ /**HEALTH_REPRESENTATIVE_DECLARE*/
HEALTH_REPRESENTATIVE_DECLARE(1300, "Declare personal health representative", "declared a personal health representative", true),
- /**HEALTH_REPRESENTATIVE_UNDECLARE*/
+ /**HEALTH_REPRESENTATIVE_UNDECLARE*/
HEALTH_REPRESENTATIVE_UNDECLARE(1301, "Undeclare personal health representative", "undeclared a personal health representative", true),
- /**MEDICAL_PROCEDURE_CODE_ADD*/
+ /**MEDICAL_PROCEDURE_CODE_ADD*/
MEDICAL_PROCEDURE_CODE_ADD(1500, "Add Medical procedure code", "added a medical procedure code", false),
- /**MEDICAL_PROCEDURE_CODE_VIEW*/
+ /**MEDICAL_PROCEDURE_CODE_VIEW*/
MEDICAL_PROCEDURE_CODE_VIEW(1501, "View Medical procedure code", "viewed a medical procedure code", false),
- /**MEDICAL_PROCEDURE_CODE_EDIT*/
+ /**MEDICAL_PROCEDURE_CODE_EDIT*/
MEDICAL_PROCEDURE_CODE_EDIT(1502, "Edit Medical procedure code", "edited a medical procedure code", false),
- /**IMMUNIZATION_CODE_ADD*/
+ /**IMMUNIZATION_CODE_ADD*/
IMMUNIZATION_CODE_ADD(1510, "Add Immunization code", "added an immunization code", false),
- /**IMMUNIZATION_CODE_VIEW*/
+ /**IMMUNIZATION_CODE_VIEW*/
IMMUNIZATION_CODE_VIEW(1511, "View Immunization code", "viewed an immunization code", false),
- /**IMMUNIZATION_CODE_EDIT*/
+ /**IMMUNIZATION_CODE_EDIT*/
IMMUNIZATION_CODE_EDIT(1512, "Edit Immunization code", "edited an immunization code", false),
- /**DIAGNOSIS_CODE_ADD*/
+ /**DIAGNOSIS_CODE_ADD*/
DIAGNOSIS_CODE_ADD(1520, "Add Diagnosis code", "added a diagnosis code", false),
- /**DIAGNOSIS_CODE_VIEW*/
+ /**DIAGNOSIS_CODE_VIEW*/
DIAGNOSIS_CODE_VIEW(1521, "View Diagnosis code", "viewed a diagnosis code", false),
- /**DIAGNOSIS_CODE_EDIT*/
+ /**DIAGNOSIS_CODE_EDIT*/
DIAGNOSIS_CODE_EDIT(1522, "Edit Diagnosis code", "edited a diagnosis code", false),
- /**DRUG_CODE_ADD*/
+ /**DRUG_CODE_ADD*/
DRUG_CODE_ADD(1530, "Add Drug code", "added a drug code", false),
- /**DRUG_CODE_VIEW*/
+ /**DRUG_CODE_VIEW*/
DRUG_CODE_VIEW(1531, "View Drug code", "viewed a drug code", false),
- /**DRUG_CODE_EDIT*/
+ /**DRUG_CODE_EDIT*/
DRUG_CODE_EDIT(1532, "Edit Drug code", "edited a drug code", false),
- /**DRUG_CODE_REMOVE*/
+ /**DRUG_CODE_REMOVE*/
DRUG_CODE_REMOVE(1533, "Remove Drug code", "removed a drug code", false),
- /**LOINC_CODE_ADD*/
+ /**LOINC_CODE_ADD*/
LOINC_CODE_ADD(1540, "Add Physical Services code", "added a physical service code", false),
- /**LOINC_CODE_VIEW*/
+ /**LOINC_CODE_VIEW*/
LOINC_CODE_VIEW(1541, "View Physical Services code", "viewed a physical service code", false),
- /**LOINC_CODE_EDIT*/
+ /**LOINC_CODE_EDIT*/
LOINC_CODE_EDIT(1542, "Edit Physical Services code", "edited a physical service code", false),
- /**LOINC_CODE_FILE_ADD*/
+ /**LOINC_CODE_FILE_ADD*/
LOINC_CODE_FILE_ADD(1549, "Upload Physical Services file", "uploaded a LOINC file", false),
- /**RISK_FACTOR_VIEW*/
+ /**RISK_FACTOR_VIEW*/
RISK_FACTOR_VIEW(1600, "View risk factors", "viewed your risk factors", true),
- /**PATIENT_REMINDERS_VIEW*/
+ /**PATIENT_REMINDERS_VIEW*/
PATIENT_REMINDERS_VIEW(1700, "Proactively determine necessary patient care", "proactively determined your necessary patient care", true),
- /**HOSPITAL_LISTING_ADD*/
+ /**HOSPITAL_LISTING_ADD*/
HOSPITAL_LISTING_ADD(1800, "Add a hospital listing", "added a hospital listing", false),
- /**HOSPITAL_LISTING_VIEW*/
+ /**HOSPITAL_LISTING_VIEW*/
HOSPITAL_LISTING_VIEW(1801, "View a hospital listing", "viewed a hospital listing", false),
- /**HOSPITAL_LISTING_EDIT*/
+ /**HOSPITAL_LISTING_EDIT*/
HOSPITAL_LISTING_EDIT(1802, "Edit a hospital listing", "edited a hospital listing", false),
- /**PRESCRIPTION_REPORT_VIEW*/
+ /**PRESCRIPTION_REPORT_VIEW*/
PRESCRIPTION_REPORT_VIEW(1900, "View prescription report", "viewed your prescription report", true),
- /**DEATH_TRENDS_VIEW*/
+ /**DEATH_TRENDS_VIEW*/
DEATH_TRENDS_VIEW(2000, "View Cause of Death Trends", "viewed cause of death trends", false),
- /**EMERGENCY_REPORT_CREATE*/
+ /**EMERGENCY_REPORT_CREATE*/
EMERGENCY_REPORT_CREATE(2100, "Create emergency report", "created an emergency report for you", true),
- /**EMERGENCY_REPORT_VIEW*/
+ /**EMERGENCY_REPORT_VIEW*/
EMERGENCY_REPORT_VIEW(2101, "View emergency report", "viewed your emergency report", true),
- /**APPOINTMENT_TYPE_ADD*/
+ /**APPOINTMENT_TYPE_ADD*/
APPOINTMENT_TYPE_ADD(2200, "Add appointment type listing", "added an appointment type", false),
- /**APPOINTMENT_TYPE_VIEW*/
+ /**APPOINTMENT_TYPE_VIEW*/
APPOINTMENT_TYPE_VIEW(2201, "View appointment type listing", "viewed an appointment type", false),
- /**APPOINTMENT_TYPE_EDIT*/
+ /**APPOINTMENT_TYPE_EDIT*/
APPOINTMENT_TYPE_EDIT(2202, "Edit appointment type listing", "edited an appointment type", false),
- /**APPOINTMENT_ADD*/
+ /**APPOINTMENT_ADD*/
APPOINTMENT_ADD(2210, "Schedule Appointments", "scheduled an appointment with you", true),
- /**APPOINTMENT_VIEW*/
+ /**APPOINTMENT_VIEW*/
APPOINTMENT_VIEW(2211, "View Scheduled Appointment", "viewed your scheduled appointment", true),
- /**APPOINTMENT_EDIT*/
+ /**APPOINTMENT_EDIT*/
APPOINTMENT_EDIT(2212, "Edit Scheduled Appointment", "edited your scheduled appointment", true),
- /**APPOINTMENT_REMOVE*/
+ /**APPOINTMENT_REMOVE*/
APPOINTMENT_REMOVE(2213, "Delete Scheduled Appointment", "canceled your scheduled appointment", true),
- /**APPOINTMENT_ALL_VIEW*/
+ /**APPOINTMENT_ALL_VIEW*/
APPOINTMENT_ALL_VIEW(2220, "View All Scheduled Appointments", "viewed all scheduled appointments", true),
- /**APPOINTMENT_CONFLICT_OVERRIDE*/
+ /**APPOINTMENT_CONFLICT_OVERRIDE*/
APPOINTMENT_CONFLICT_OVERRIDE(2230, "Schedule conflict override", "overrided a schedule conflict", true),
- /**APPOINTMENT_REQUEST_SUBMITTED*/
+ /**APPOINTMENT_REQUEST_SUBMITTED*/
APPOINTMENT_REQUEST_SUBMITTED(2240, "Appointment request submitted", "requested an appointment", true),
- /**APPOINTMENT_REQUEST_APPROVED*/
+ /**APPOINTMENT_REQUEST_APPROVED*/
APPOINTMENT_REQUEST_APPROVED(2250, "Appointment request approved", "approved an appointment request", true),
- /**APPOINTMENT_REQUEST_REJECTED*/
+ /**APPOINTMENT_REQUEST_REJECTED*/
APPOINTMENT_REQUEST_REJECTED(2251, "Appointment request rejected", "rejected an appointment request", true),
- /**APPOINTMENT_REQUEST_VIEW*/
+ /**APPOINTMENT_REQUEST_VIEW*/
APPOINTMENT_REQUEST_VIEW(2260, "View All Appointment Requests", "viewed all appointment requests", true),
- /**COMPREHENSIVE_REPORT_VIEW*/
+ /**COMPREHENSIVE_REPORT_VIEW*/
COMPREHENSIVE_REPORT_VIEW(2300, "Comprehensive Report", "viewed your comprehensive report", true),
- /**COMPREHENSIVE_REPORT_ADD*/
+ /**COMPREHENSIVE_REPORT_ADD*/
COMPREHENSIVE_REPORT_ADD(2301, "Request Comprehensive Report", "requested a comprehensive report for you", true),
- /**SATISFACTION_SURVEY_TAKE*/
+ /**SATISFACTION_SURVEY_TAKE*/
SATISFACTION_SURVEY_TAKE(2400, "Take Satisfaction Survey", "completed a satisfaction survey", true),
- /**SATISFACTION_SURVEY_VIEW*/
+ /**SATISFACTION_SURVEY_VIEW*/
SATISFACTION_SURVEY_VIEW(2500, "View physician satisfaction results", "viewed physician satisfaction survey results", false),
- /**LAB_RESULTS_UNASSIGNED*/
+ /**LAB_RESULTS_UNASSIGNED*/
LAB_RESULTS_UNASSIGNED(2600, "Unassigned lab results log value", "", false),
- /**LAB_RESULTS_CREATE*/
+ /**LAB_RESULTS_CREATE*/
LAB_RESULTS_CREATE(2601, "Create laboratory procedure", "created your lab procedure", true),
- /**LAB_RESULTS_VIEW*/
+ /**LAB_RESULTS_VIEW*/
LAB_RESULTS_VIEW(2602, "View laboratory procedure results", "viewed your lab procedure results", true),
- /**LAB_RESULTS_REASSIGN*/
+ /**LAB_RESULTS_REASSIGN*/
LAB_RESULTS_REASSIGN(2603, "Reassign laboratory test to a new lab technician", "assigned your laboratory test to a new lab tech", false),
- /**LAB_RESULTS_REMOVE*/
+ /**LAB_RESULTS_REMOVE*/
LAB_RESULTS_REMOVE(2604, "Remove a laboratory procedure", "removed your lab procedure", true),
- /**LAB_RESULTS_ADD_COMMENTARY*/
+ /**LAB_RESULTS_ADD_COMMENTARY*/
LAB_RESULTS_ADD_COMMENTARY(2605, "Add commentary to a laboratory procedure", "marked a lab procedure as completed", true),
- /**LAB_RESULTS_VIEW_QUEUE*/
+ /**LAB_RESULTS_VIEW_QUEUE*/
LAB_RESULTS_VIEW_QUEUE(2606, "View laboratory procedure queue", "viewed your lab procedure queue", false),
- /**LAB_RESULTS_RECORD*/
+ /**LAB_RESULTS_RECORD*/
LAB_RESULTS_RECORD(2607, "Record laboratory test results", "recorded your lab procedure results", false),
- /**LAB_RESULTS_RECEIVED*/
+ /**LAB_RESULTS_RECEIVED*/
LAB_RESULTS_RECEIVED(2608, "Laboratory procedure received by lab technician", "the lab tech received your lab procedure", false),
- /**EMAIL_SEND*/
+ /**EMAIL_SEND*/
EMAIL_SEND(2700, "Send an email", "sent an email", false),
- /**EMAIL_HISTORY_VIEW*/
+ /**EMAIL_HISTORY_VIEW*/
EMAIL_HISTORY_VIEW(2710, "View email history", "viewed email history", false),
- /**PATIENT_LIST_VIEW*/
+ /**PATIENT_LIST_VIEW*/
PATIENT_LIST_VIEW(2800, "View patient list", "viewed his/her patient list", false),
- /**EXPERIENCED_LHCP_FIND*/
+ /**EXPERIENCED_LHCP_FIND*/
EXPERIENCED_LHCP_FIND(2900, "Find LHCPs with experience with a diagnosis", "found LHCPs with experience with a diagnosis", false),
- /**MESSAGE_SEND*/
+ /**MESSAGE_SEND*/
MESSAGE_SEND(3000, "Send messages", "sent a message", false),
- /**MESSAGE_VIEW*/
+ /**MESSAGE_VIEW*/
MESSAGE_VIEW(3001, "View messages", "viewed a message", false),
- /**INBOX_VIEW*/
+ /**INBOX_VIEW*/
INBOX_VIEW(3010, "View inbox", "viewed message inbox", false),
- /**OUTBOX_VIEW*/
+ /**OUTBOX_VIEW*/
OUTBOX_VIEW(3011, "View outbox", "viewed message outbox", false),
- /**PATIENT_FIND_LHCP_FOR_RENEWAL*/
+ /**PATIENT_FIND_LHCP_FOR_RENEWAL*/
PATIENT_FIND_LHCP_FOR_RENEWAL(3100, "Find LHCPs for prescription renewal", "found LHCPs for prescription renewal", true),
- /**EXPIRED_PRESCRIPTION_VIEW*/
+ /**EXPIRED_PRESCRIPTION_VIEW*/
EXPIRED_PRESCRIPTION_VIEW(3110, "View expired prescriptions", "viewed your expired prescriptions", true),
- /**PRECONFIRM_PRESCRIPTION_RENEWAL*/
+ /**PRECONFIRM_PRESCRIPTION_RENEWAL*/
PRECONFIRM_PRESCRIPTION_RENEWAL(3200, "Proactively confirm prescription-renewal needs", "proactively confirmed your prescription renewal needs", true),
- /**DIAGNOSES_LIST_VIEW*/
+ /**DIAGNOSES_LIST_VIEW*/
DIAGNOSES_LIST_VIEW(3210, "View list of diagnoses", "viewed a list of diagnosis", false),
- /**CONSULTATION_REFERRAL_CREATE*/
+ /**CONSULTATION_REFERRAL_CREATE*/
CONSULTATION_REFERRAL_CREATE(3300, "Refer a patient for consultations", "referred you to another HCP", true),
- /**CONSULTATION_REFERRAL_VIEW*/
+ /**CONSULTATION_REFERRAL_VIEW*/
CONSULTATION_REFERRAL_VIEW(3310, "View referral for consultation", "viewed your consultation referral", true),
- /**CONSULTATION_REFERRAL_EDIT*/
+ /**CONSULTATION_REFERRAL_EDIT*/
CONSULTATION_REFERRAL_EDIT(3311, "Modify referral for consultation", "modified your consultation referral", true),
- /**CONSULTATION_REFERRAL_CANCEL*/
+ /**CONSULTATION_REFERRAL_CANCEL*/
CONSULTATION_REFERRAL_CANCEL(3312, "Cancel referral for consultation", "canceled your consultation referral", true),
- /**PATIENT_LIST_ADD*/
+ /**PATIENT_LIST_ADD*/
PATIENT_LIST_ADD(3400, "Patient added to monitoring list", "added you to the telemedicine monitoring list", true),
- /**PATIENT_LIST_EDIT*/
+ /**PATIENT_LIST_EDIT*/
PATIENT_LIST_EDIT(3401, "Patient telemedicine permissions changed", "changed the data you report for telemedicine monitoring", true),
- /**PATIENT_LIST_REMOVE*/
+ /**PATIENT_LIST_REMOVE*/
PATIENT_LIST_REMOVE(3402, "Patient removed from monitoring list", "removed you from the telemedicine monitoring list", true),
- /**TELEMEDICINE_DATA_REPORT*/
+ /**TELEMEDICINE_DATA_REPORT*/
TELEMEDICINE_DATA_REPORT(3410, "Remote monitoring levels are reported", "reported your telemedicine data", true),
- /**TELEMEDICINE_DATA_VIEW*/
+ /**TELEMEDICINE_DATA_VIEW*/
TELEMEDICINE_DATA_VIEW(3420, "Remote monitoring levels are viewed", "viewed your telemedicine data reports", true),
- /**ADVERSE_EVENT_REPORT*/
+ /**ADVERSE_EVENT_REPORT*/
ADVERSE_EVENT_REPORT(3500, "Adverse event reporting", "reported an adverse event", true),
- /**ADVERSE_EVENT_VIEW*/
+ /**ADVERSE_EVENT_VIEW*/
ADVERSE_EVENT_VIEW(3600, "Adverse event monitoring", "reviewed an adverse event report", false),
- /**ADVERSE_EVENT_REMOVE*/
+ /**ADVERSE_EVENT_REMOVE*/
ADVERSE_EVENT_REMOVE(3601, "Remove adverse event", "removed an adverse event report", false),
- /**ADVERSE_EVENT_REQUEST_MORE*/
+ /**ADVERSE_EVENT_REQUEST_MORE*/
ADVERSE_EVENT_REQUEST_MORE(3602, "Request More Adverse Event Details", "requested more adverse event details", false),
- /**ADVERSE_EVENT_CHART_VIEW*/
+ /**ADVERSE_EVENT_CHART_VIEW*/
ADVERSE_EVENT_CHART_VIEW(3603, "View Adverse Event Chart", "viewed adverse event chart", false),
- /**OVERRIDE_INTERACTION_WARNING*/
+ /**OVERRIDE_INTERACTION_WARNING*/
OVERRIDE_INTERACTION_WARNING(3700, "Override interaction warning", "Overrode an interaction warning", true),
- /**OVERRIDE_CODE_ADD*/
+ /**OVERRIDE_CODE_ADD*/
OVERRIDE_CODE_ADD(3710, "Add overriding reason listing", "added a medication override reason", false),
- /**OVERRIDE_CODE_EDIT*/
+ /**OVERRIDE_CODE_EDIT*/
OVERRIDE_CODE_EDIT(3711, "Edit overriding reason listing", "edited a medication override reason", false),
- /**DRUG_INTERACTION_ADD*/
+ /**DRUG_INTERACTION_ADD*/
DRUG_INTERACTION_ADD(3800, "Add Drug Interactions Code", "added a drug interaction code", false),
- /**DRUG_INTERACTION_EDIT*/
+ /**DRUG_INTERACTION_EDIT*/
DRUG_INTERACTION_EDIT(3801, "Edit Drug Interactions Code", "edited a drug interaction code", false),
- /**DRUG_INTERACTION_DELETE*/
+ /**DRUG_INTERACTION_DELETE*/
DRUG_INTERACTION_DELETE(3802, "Delete Drug Interactions Code", "deleted a drug interaction code", false),
- /**CALENDAR_VIEW*/
+ /**CALENDAR_VIEW*/
CALENDAR_VIEW(4000, "View calendar", "viewed your calendar", false),
- /**UPCOMING_APPOINTMENTS_VIEW*/
+ /**UPCOMING_APPOINTMENTS_VIEW*/
UPCOMING_APPOINTMENTS_VIEW(4010, "View Upcoming Appointments", "viewed upcoming appointments", false),
- /**NOTIFICATIONS_VIEW*/
+ /**NOTIFICATIONS_VIEW*/
NOTIFICATIONS_VIEW(4200, "View Notifications", "viewed your notification center", false),
- /**ACTIVITY_FEED_VIEW*/
+ /**ACTIVITY_FEED_VIEW*/
ACTIVITY_FEED_VIEW(4300, "View activity feed", "viewed your activity feed", false),
- /**PATIENT_INSTRUCTIONS_ADD*/
+ /**PATIENT_INSTRUCTIONS_ADD*/
PATIENT_INSTRUCTIONS_ADD(4400, "Add Patient Specific Instructions for Office Visit", "added a patient-specific instruction", true),
- /**PATIENT_INSTRUCTIONS_EDIT*/
+ /**PATIENT_INSTRUCTIONS_EDIT*/
PATIENT_INSTRUCTIONS_EDIT(4401, "Edit Patient Specific Instructions for Office Visit", "edited a patient-specific instruction", true),
- /**PATIENT_INSTRUCTIONS_DELETE*/
+ /**PATIENT_INSTRUCTIONS_DELETE*/
PATIENT_INSTRUCTIONS_DELETE(4402, " Delete Patient Specific Instructions for Office Visit", "deleted a patient-specific instruction", true),
- /**PATIENT_INSTRUCTIONS_VIEW*/
+ /**PATIENT_INSTRUCTIONS_VIEW*/
PATIENT_INSTRUCTIONS_VIEW(4403, " View Patient Specific Instructions", "viewed your patient-specific instructions", true),
- /**DIAGNOSIS_TRENDS_VIEW*/
+ /**DIAGNOSIS_TRENDS_VIEW*/
DIAGNOSIS_TRENDS_VIEW(4500, "View diagnosis statistics", "viewed your diagnosis count", false),
/**DIAGNOSIS_EPIDEMICS_VIEW*/
DIAGNOSIS_EPIDEMICS_VIEW(4600, "View Epidemic Detection", "viewed epidemic detection", false),
@@ -366,11 +366,11 @@ public enum TransactionType {
HCP_VIEW_BASIC_HEALTH_METRICS(5201, "HCP View of Basic Health Metrics", "viewed your health records history", true),
/**HCP_VIEW_PERCENTILES_CHART*/
HCP_VIEW_PERCENTILES_CHART(5301, "HCP View of Basic Health Metric Percentiles", "viewed your percentile data.", true),
- /**PATIENT_VIEW_PERCENTILES_CHART*/
+ /**PATIENT_VIEW_PERCENTILES_CHART*/
PATIENT_VIEW_PERCENTILES_CHART(5300, "Pateint View of Basic Health Metric Percentiles", "viewed your percentile data.", true),
- /**ADMIN_UPLOAD_CDCMETRICS*/
+ /**ADMIN_UPLOAD_CDCMETRICS*/
ADMIN_UPLOAD_CDCMETRICS(5302, "Admin upload of CDC Metrics", "Uploaded CDC Metrics Successfully", false),
- /**PASSWORD_CHANGE*/
+ /**PASSWORD_CHANGE*/
PASSWORD_CHANGE(5700, "User Successful Password Change", " changed password", false),
/**PASSWORD_CHANGE_FAILED*/
PASSWORD_CHANGE_FAILED(5701, "User Failed Password Change", " failed to change password", false),
diff --git a/iTrust/test/edu/ncsu/csc/itrust/unit/action/ViewPreRegisteredPatientListActionTest.java b/iTrust/test/edu/ncsu/csc/itrust/unit/action/ViewPreRegisteredPatientListActionTest.java
index 3c96e2f..d070b04 100644
--- a/iTrust/test/edu/ncsu/csc/itrust/unit/action/ViewPreRegisteredPatientListActionTest.java
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/action/ViewPreRegisteredPatientListActionTest.java
@@ -29,7 +29,7 @@ public class ViewPreRegisteredPatientListActionTest extends TestCase {
pb = action.getPreRegisteredPatients();
assertEquals(0, pb.size());
- }
+ }
public void testNoPersonnel() throws Exception {
@@ -40,8 +40,8 @@ public class ViewPreRegisteredPatientListActionTest extends TestCase {
for (PatientBean p : pb) {
if (p.getMID() == 90000000) {
fail("This id should not exist in the list");
- }
- }
+ }
+ }
return;
}
diff --git a/iTrust/test/edu/ncsu/csc/itrust/unit/datagenerators/TestDataGenerator.java b/iTrust/test/edu/ncsu/csc/itrust/unit/datagenerators/TestDataGenerator.java
index 87079f4..f8e2e19 100644
--- a/iTrust/test/edu/ncsu/csc/itrust/unit/datagenerators/TestDataGenerator.java
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/datagenerators/TestDataGenerator.java
@@ -785,12 +785,12 @@ public class TestDataGenerator {
public void hcp_diagnosis_data() throws FileNotFoundException, IOException,
SQLException {
new DBBuilder(factory).executeSQLFile(DIR + "/hcp_diagnosis_data.sql");
- }
+ }
public void hcp_additional_diagnosis_data() throws FileNotFoundException,
IOException, SQLException {
new DBBuilder(factory).executeSQLFile(DIR + "/hcp_additional_diagnosis_data.sql");
- }
+ }
public void immunization_data() throws FileNotFoundException, IOException,
SQLException {
@@ -957,13 +957,13 @@ public class TestDataGenerator {
public void malaria_epidemic1() throws SQLException, FileNotFoundException,
IOException {
new DBBuilder(factory).executeSQLFile(DIR + "/malariaEpidemic1.sql");
- }
+ }
public void malaria_epidemic2() throws SQLException, FileNotFoundException,
IOException {
new DBBuilder(factory).executeSQLFile(DIR + "/malariaEpidemic2.sql");
- }
-
+ }
+
public void malaria_epidemic3() throws SQLException, FileNotFoundException,
IOException {
new DBBuilder(factory).executeSQLFile(DIR + "/malariaEpidemic3.sql");
--
GitLab