diff --git a/iTrust/WebRoot/auth/hcp-uap/activatePatient.jsp b/iTrust/WebRoot/auth/hcp-uap/activatePatient.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..901932f336590e1ee19beb48196626a638cd11bc
--- /dev/null
+++ b/iTrust/WebRoot/auth/hcp-uap/activatePatient.jsp
@@ -0,0 +1,125 @@
+<%@taglib prefix="itrust" uri="/WEB-INF/tags.tld"%>
+<%@page errorPage="/auth/exceptionHandler.jsp"%>
+
+<%@page import="edu.ncsu.csc.itrust.dao.DAOFactory"%>
+<%@page import="edu.ncsu.csc.itrust.beans.PatientBean"%>
+<%@page import="edu.ncsu.csc.itrust.action.EditPatientAction"%>
+<%@page import="edu.ncsu.csc.itrust.BeanBuilder"%>
+<%@page import="edu.ncsu.csc.itrust.enums.Ethnicity"%>
+<%@page import="edu.ncsu.csc.itrust.enums.BloodType"%>
+<%@page import="edu.ncsu.csc.itrust.exception.FormValidationException"%>
+<%@page import="edu.ncsu.csc.itrust.enums.Gender"%>
+<%@page import="edu.ncsu.csc.itrust.beans.DiagnosisBean"%>
+
+<%@include file="/global.jsp"%>
+
+<%
+ pageTitle = "iTrust - Activate a Pre-Registered Patient";
+%>
+
+<%@include file="/header.jsp"%>
+<itrust:patientNav thisTitle="Deactivate" />
+<%
+ /* 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 */
+ EditPatientAction action = new EditPatientAction(prodDAO, loggedInMID.longValue(), pidString);
+
+ /* 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 {
+ action.activate();
+ long patientMID = action.getPatient().getMID();
+ loggingAction.logEvent(TransactionType.REREGISTERED_PATIENT_ACTIVATE, loggedInMID.longValue(),
+ Long.valueOf((String)session.getAttribute("pid")).longValue(), "");
+%>
+
+
+ <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) {
+%>
+ <br />
+ <div align=center>
+ <span class="iTrustError"><%=StringEscapeUtils.escapeHtml(e.getMessage()) %></span>
+ </div>
+ <br />
+<%
+ }
+ } else {
+ p = action.getPatient();
+
+ if (request.getParameter("formIsFilled") != null && request.getParameter("formIsFilled").equals("true") &&
+ (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 />
+<%
+ }
+
+%>
+
+<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
+ 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>
+</table>
+<br />
+<div align=center>
+ <input type="submit" name="action"
+ style="font-size: 16pt; font-weight: bold;" value="Activate Patient"><br /><br />
+</div>
+</form>
+<% } %>
+<br />
+<br />
+<itrust:patientNav thisTitle="Activate" />
+
+<%@include file="/footer.jsp"%>
diff --git a/iTrust/WebRoot/auth/hcp-uap/deactivatePrePatient.jsp b/iTrust/WebRoot/auth/hcp-uap/deactivatePrePatient.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..c52a1444cfa7fdb37363c852dfb4228c26cb6c6b
--- /dev/null
+++ b/iTrust/WebRoot/auth/hcp-uap/deactivatePrePatient.jsp
@@ -0,0 +1,150 @@
+<%@taglib prefix="itrust" uri="/WEB-INF/tags.tld"%>
+<%@page errorPage="/auth/exceptionHandler.jsp"%>
+
+<%@page import="java.util.ArrayList"%>
+<%@page import="java.util.Date"%>
+<%@page import="java.util.List"%>
+<%@page import="java.text.DateFormat"%>
+
+<%@page import="edu.ncsu.csc.itrust.dao.DAOFactory"%>
+<%@page import="edu.ncsu.csc.itrust.beans.PatientBean"%>
+<%@page import="edu.ncsu.csc.itrust.action.EditPatientAction"%>
+<%@page import="edu.ncsu.csc.itrust.BeanBuilder"%>
+<%@page import="edu.ncsu.csc.itrust.enums.Ethnicity"%>
+<%@page import="edu.ncsu.csc.itrust.enums.BloodType"%>
+<%@page import="edu.ncsu.csc.itrust.exception.FormValidationException"%>
+<%@page import="edu.ncsu.csc.itrust.enums.Gender"%>
+<%@page import="edu.ncsu.csc.itrust.beans.DiagnosisBean"%>
+
+<%@include file="/global.jsp"%>
+
+<%
+ pageTitle = "iTrust - Deactivate Preregistered Patient";
+%>
+
+<%@include file="/header.jsp"%>
+<itrust:patientNav thisTitle="Deactivate" />
+<%
+
+
+String patientString = "";
+if (request.getParameter("patient") != null) {
+ patientString = request.getParameter("patient");
+}
+
+String pidString;
+long pid = 0;
+
+
+if (!patientString.equals("")) {
+
+ int patientIndex = Integer.parseInt(patientString);
+ List<PatientBean> patients = (List<PatientBean>) session.getAttribute("patients"); // pass through html
+ pid = patients.get(patientIndex).getMID();
+ pidString = "" + pid;
+ session.removeAttribute("patients");
+ session.setAttribute("pid", pidString);
+}
+else {
+ if (session.getAttribute("pid") == null) {
+ pid = 0;
+ pidString = "";
+ } else {
+ pid = (long) Long.parseLong((String) session.getAttribute("pid"));
+ pidString = ""+pid;
+ }
+}
+
+ /* Require a Patient ID first */
+ 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 */
+ EditPatientAction action = new EditPatientAction(prodDAO, loggedInMID.longValue(), pidString);
+
+ /* 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 {
+ action.deactivate();
+ loggingAction.logEvent(TransactionType.PREREGISTERED_PATIENT_DEACTIVATE, loggedInMID.longValue(), Long.valueOf((String)session.getAttribute("pid")).longValue(), "");
+ session.removeAttribute("pid");
+
+%>
+ <br />
+ <div align=center>
+ <span class="iTrustMessage">Patient Successfully Deactivated</span>
+ </div>
+ <br />
+<%
+ } catch (Exception e) {
+%>
+ <br />
+ <div align=center>
+ <span class="iTrustError"><%=StringEscapeUtils.escapeHtml(e.getMessage()) %></span>
+ </div>
+ <br />
+<%
+ }
+ } else {
+ p = action.getPatient();
+
+ if (request.getParameter("formIsFilled") != null && request.getParameter("formIsFilled").equals("true") &&
+ (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 />
+<%
+ }
+
+%>
+
+<form id="deactivateForm" action="deactivatePrePatient.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">Deactivate 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 deactivate this
+ patient? This operation can only be undone by an administrator. 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>
+</table>
+<br />
+<div align=center>
+ <input type="submit" name="action"
+ style="font-size: 16pt; font-weight: bold;" value="Deactivate Patient"><br /><br />
+</div>
+</form>
+<% } %>
+<br />
+<br />
+<itrust:patientNav thisTitle="Deactivate" />
+
+<%@include file="/footer.jsp"%>
diff --git a/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientInfo.jsp b/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientInfo.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..21140874983be3babbea13d27950eb856cc83dd6
--- /dev/null
+++ b/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientInfo.jsp
@@ -0,0 +1,219 @@
+<%@taglib uri="/WEB-INF/tags.tld" prefix="itrust" %>
+<%@page errorPage="/auth/exceptionHandler.jsp" %>
+
+<%@page import="java.util.ArrayList"%>
+<%@page import="java.util.Date"%>
+<%@page import="java.util.List"%>
+<%@page import="java.text.DateFormat"%>
+
+<%@page import="edu.ncsu.csc.itrust.action.EditPHRAction"%>
+<%@page import="edu.ncsu.csc.itrust.dao.DAOFactory"%>
+<%@page import="edu.ncsu.csc.itrust.beans.PatientBean"%>
+<%@page import="edu.ncsu.csc.itrust.beans.AllergyBean"%>
+<%@page import="edu.ncsu.csc.itrust.beans.FamilyMemberBean"%>
+<%@page import="edu.ncsu.csc.itrust.beans.HealthRecord"%>
+<%@page import="edu.ncsu.csc.itrust.beans.MedicationBean"%>
+<%@page import="edu.ncsu.csc.itrust.beans.OfficeVisitBean"%>
+<%@page import="edu.ncsu.csc.itrust.beans.ProcedureBean"%>
+<%@page import="edu.ncsu.csc.itrust.risk.RiskChecker"%>
+<%@page import="edu.ncsu.csc.itrust.beans.PersonnelBean"%>
+<%@page import="edu.ncsu.csc.itrust.dao.mysql.PersonnelDAO"%>
+<%@page import="edu.ncsu.csc.itrust.dao.mysql.PatientDAO"%>
+<%@page import="edu.ncsu.csc.itrust.enums.TransactionType"%>
+
+<%@include file="/global.jsp" %>
+
+<%
+pageTitle = "iTrust - View Pre-Registered Patients Info";
+%>
+
+<%@include file="/header.jsp" %>
+
+<%
+PatientDAO patientDAO = new PatientDAO(prodDAO);
+PersonnelDAO personnelDAO = new PersonnelDAO(prodDAO);
+PersonnelBean personnelb = personnelDAO.getPersonnel(loggedInMID.longValue());
+DateFormat df = DateFormat.getDateInstance();
+
+String switchString = "";
+if (request.getParameter("switch") != null) {
+ switchString = request.getParameter("switch");
+}
+
+String relativeString = "";
+if (request.getParameter("relative") != null) {
+ relativeString = request.getParameter("relative");
+}
+
+String patientString = "";
+if (request.getParameter("patient") != null) {
+ patientString = request.getParameter("patient");
+}
+
+String pidString;
+long pid = 0;
+
+if (switchString.equals("true")) pidString = "";
+else if (!relativeString.equals("")) {
+
+ int relativeIndex = Integer.parseInt(relativeString);
+ List<PatientBean> relatives = (List<PatientBean>) session.getAttribute("relatives");
+ pid = relatives.get(relativeIndex).getMID();
+ pidString = "" + pid;
+ session.removeAttribute("relatives");
+ session.setAttribute("pid", pidString);
+}
+else if (!patientString.equals("")) {
+
+ int patientIndex = Integer.parseInt(patientString);
+ List<PatientBean> patients = (List<PatientBean>) session.getAttribute("patients");
+ pid = patients.get(patientIndex).getMID();
+ pidString = "" + pid;
+ session.removeAttribute("patients");
+ session.setAttribute("pid", pidString);
+}
+else {
+ if (session.getAttribute("pid") == null) {
+ pid = 0;
+ pidString = "";
+ } 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, "");
+
+
+EditPHRAction action = new EditPHRAction(prodDAO,loggedInMID.longValue(), pidString);
+pid = action.getPid();
+String confirm = "";
+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)
+ {
+ confirm = e.getMessage();
+ }
+}
+
+PatientBean patient = action.getPatient();
+List<HealthRecord> records = action.getAllHealthRecords();
+HealthRecord mostRecent = records.size() > 0 ? records.get(0) : null;
+List<OfficeVisitBean> officeVisits = action.getAllOfficeVisits();
+List<FamilyMemberBean> family = action.getFamily();
+%>
+
+
+<%@page import="edu.ncsu.csc.itrust.exception.NoHealthRecordsException"%>
+
+<script type="text/javascript">
+ function showRisks(){
+ document.getElementById("risks").style.display="inline";
+ document.getElementById("riskButton").style.display="none";
+ }
+</script>
+
+<% if (!"".equals(confirm)) {%>
+<span class="iTrustError"><%= StringEscapeUtils.escapeHtml("" + (confirm)) %></span><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 />
+
+<td>
+ <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>
+<br />
+<br />
+
+<%@include file="/footer.jsp" %>
diff --git a/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientList.jsp b/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientList.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..7d12170e5fac3bbe8c7c1fe1f741a35c27d9ac4d
--- /dev/null
+++ b/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientList.jsp
@@ -0,0 +1,122 @@
+<%@taglib uri="/WEB-INF/tags.tld" prefix="itrust"%>
+<%@page errorPage="/auth/exceptionHandler.jsp"%>
+
+<%@page import="java.util.ArrayList"%>
+<%@page import="java.util.List"%>
+<%@page import="edu.ncsu.csc.itrust.beans.PatientBean"%>
+<%@page import="edu.ncsu.csc.itrust.beans.PatientVisitBean"%>
+
+<%@page import="edu.ncsu.csc.itrust.action.ViewPreRegisteredPatientListAction"%>
+
+<%@include file="/global.jsp" %>
+
+<%
+pageTitle = "iTrust - View All Pre-Registered Patients";
+%>
+
+<%@include file="/header.jsp" %>
+
+<%
+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">
+ 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"
+ });
+ });
+</script>
+
+
+<style type="text/css" title="currentStyle">
+@import "/iTrust/DataTables/media/css/demo_table.css";
+</style>
+
+<br />
+ <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>
+ <%
+ 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>
+ <%
+ index ++;
+ }
+
+ session.setAttribute("patients", patientsList);
+ %>
+ </tbody>
+</table>
+</form>
+<script type="text/javascript">
+ $('.deactivate').on('click', function() {
+ $(this).closest('tr').hide();
+ });
+</script>
+
+<br />
+<br />
+
+<%@include file="/footer.jsp" %>
diff --git a/iTrust/WebRoot/auth/hcp/menu.jsp b/iTrust/WebRoot/auth/hcp/menu.jsp
index ae1e0cc95f4072425cdfe32c4414306e363a020c..785d3ba2a05cf9baedeab00cfa0f68581b6fcb16 100644
--- a/iTrust/WebRoot/auth/hcp/menu.jsp
+++ b/iTrust/WebRoot/auth/hcp/menu.jsp
@@ -2,29 +2,29 @@
<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/viewPatientOfficeVisitHistory.jsp">All Patients</a>
+ <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-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-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>
- <li><a href="/iTrust/auth/hcp/causeOfDeathTrendsReport.jsp">Cause-Of-Death Trends Report</a>
-
</ul>
</div>
</div>
@@ -38,7 +38,7 @@
<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>
+ <li><a href="/iTrust/auth/hcp/calendar.jsp">Appointment Calendar</a>
</ul>
</div>
</div>
@@ -49,11 +49,11 @@
</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>
+ <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>
@@ -91,9 +91,9 @@
</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>
+ <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>
@@ -104,7 +104,7 @@
</div>
<div class="panel-body" id="pi-menu">
<ul class="nav nav-sidebar">
- <li><a href="/iTrust/auth/staff/editMyDemographics.jsp">My Demographics</a>
+ <li><a href="/iTrust/auth/staff/editMyDemographics.jsp">My Demographics</a>
</ul>
</div>
</div>
@@ -150,9 +150,9 @@
</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/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>
diff --git a/iTrust/sql/createTables.sql b/iTrust/sql/createTables.sql
index 8e8e7fce0b5eb3d273aabcffb84900987c0de199..05d01718955e79c8a067579104ec0affbae4a3a8 100644
--- a/iTrust/sql/createTables.sql
+++ b/iTrust/sql/createTables.sql
@@ -4,7 +4,7 @@ CREATE TABLE users(
Password VARCHAR(200),
Salt VARCHAR(200) DEFAULT '',
openID VARCHAR(200),
- Role enum('patient','admin','hcp','uap','er','tester','pha', 'lt', 'preRegisteredPatient') NOT NULL DEFAULT 'admin',
+ Role enum('patient','admin','hcp','uap','er','tester','pha', 'lt', 'preRegisteredPatient', 'deactivatedPatient') NOT NULL DEFAULT 'admin',
sQuestion VARCHAR(100) DEFAULT '',
sAnswer VARCHAR(30) DEFAULT '',
isDependent tinyint(1) unsigned NOT NULL default '0',
@@ -239,12 +239,12 @@ CREATE TABLE resetpasswordfailures(
) ENGINE=MyISAM;
CREATE TABLE icdcodes (
- Code decimal(5,2) NOT NULL,
- Description TEXT NOT NULL,
- Chronic enum('no','yes') NOT NULL default 'no',
- Ophthalmology enum('no','yes') NOT NULL default 'no',
- URL varchar(512) NOT NULL default '',
- PRIMARY KEY (Code)
+ Code decimal(5,2) NOT NULL,
+ Description TEXT NOT NULL,
+ Chronic enum('no','yes') NOT NULL default 'no',
+ Ophthalmology enum('no','yes') NOT NULL default 'no',
+ URL varchar(512) NOT NULL default '',
+ PRIMARY KEY (Code)
) ENGINE=MyISAM;
CREATE TABLE cptcodes(
@@ -401,7 +401,7 @@ CREATE TABLE ovprocedure(
) ENGINE=MyISAM;
CREATE TABLE ovmedication (
- ID INT(10) auto_increment primary key,
+ ID INT(10) auto_increment primary key,
VisitID INT( 10 ) unsigned NOT NULL COMMENT 'ID of the Office Visit',
NDCode VARCHAR( 9 ) NOT NULL COMMENT 'NDCode for the medication',
StartDate DATE,
@@ -419,10 +419,10 @@ CREATE TABLE ovreactionoverride (
) ENGINE=MyISAM;
CREATE TABLE ovdiagnosis (
- ID INT(10) auto_increment primary key,
+ ID INT(10) auto_increment primary key,
VisitID INT( 10 ) unsigned NOT NULL COMMENT 'ID of the Office Visit',
ICDCode DECIMAL( 5, 2 ) NOT NULL COMMENT 'Code for the Diagnosis',
- URL VARCHAR(512) COMMENT 'URL for information'
+ URL VARCHAR(512) COMMENT 'URL for information'
) ENGINE=MyISAM;
CREATE TABLE globalvariables (
@@ -443,13 +443,13 @@ CREATE TABLE fakeemail(
CREATE TABLE reportrequests (
ID INT(10) auto_increment primary key,
- RequesterMID BIGINT unsigned,
- PatientMID BIGINT unsigned,
- ApproverMID BIGINT unsigned,
- RequestedDate datetime,
- ApprovedDate datetime,
- ViewedDate datetime,
- Status varchar(30),
+ RequesterMID BIGINT unsigned,
+ PatientMID BIGINT unsigned,
+ ApproverMID BIGINT unsigned,
+ RequestedDate datetime,
+ ApprovedDate datetime,
+ ViewedDate datetime,
+ Status varchar(30),
Comment TEXT
) ENGINE=MyISAM;
@@ -458,7 +458,7 @@ CREATE TABLE ovsurvey (
SurveyDate datetime not null COMMENT 'Date the survey was completed',
WaitingRoomMinutes int(3) COMMENT 'How many minutes did you wait in the waiting room?',
ExamRoomMinutes int(3) COMMENT 'How many minutes did you wait in the examination room before seeing your physician?',
- VisitSatisfaction int(1) COMMENT 'How satisfied were you with your office visit?',
+ VisitSatisfaction int(1) COMMENT 'How satisfied were you with your office visit?',
TreatmentSatisfaction int(1) COMMENT 'How satisfied were you with the treatment or information you received?'
) ENGINE=MyISAM;
@@ -579,12 +579,12 @@ CREATE TABLE profilephotos (
) ENGINE=MyISAM;
CREATE TABLE patientspecificinstructions (
- id BIGINT unsigned AUTO_INCREMENT primary key,
- VisitID BIGINT unsigned,
- Modified TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
- Name VARCHAR(100),
- URL VARCHAR(250),
- Comment VARCHAR(500)
+ id BIGINT unsigned AUTO_INCREMENT primary key,
+ VisitID BIGINT unsigned,
+ Modified TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ Name VARCHAR(100),
+ URL VARCHAR(250),
+ Comment VARCHAR(500)
) ENGINE=MyISAM;
CREATE TABLE referralmessage(
@@ -707,32 +707,32 @@ 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,
- reviewdate DATETIME NOT NULL,
- descriptivereview VARCHAR(500),
- rating INT UNSIGNED NOT NULL,
- title VARCHAR(200)
+ mid BIGINT UNSIGNED NOT NULL,
+ pid BIGINT UNSIGNED NOT NULL,
+ reviewdate DATETIME NOT NULL,
+ descriptivereview VARCHAR(500),
+ rating INT UNSIGNED NOT NULL,
+ title VARCHAR(200)
)ENGINE=innoDB;
CREATE TABLE IF NOT EXISTS obstetricsconditions (
- `cid` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
- `mid` BIGINT NOT NULL,
- `condition` VARCHAR(64) NOT NULL,
- PRIMARY KEY (`cid`),
- UNIQUE INDEX `cid_UNIQUE` (`cid` ASC)
+ `cid` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+ `mid` BIGINT NOT NULL,
+ `condition` VARCHAR(64) NOT NULL,
+ PRIMARY KEY (`cid`),
+ UNIQUE INDEX `cid_UNIQUE` (`cid` ASC)
)ENGINE=innoDB;
CREATE TABLE IF NOT EXISTS zipcodes (
- `zip` varchar(5) NOT NULL default '',
- `state` char(2) NOT NULL default '',
- `latitude` varchar(10) NOT NULL default '',
- `longitude` varchar(10) NOT NULL default '',
- `city` varchar(50) default NULL,
- `full_state` varchar(50) default NULL,
- PRIMARY KEY `zip` (`zip`)
+ `zip` varchar(5) NOT NULL default '',
+ `state` char(2) NOT NULL default '',
+ `latitude` varchar(10) NOT NULL default '',
+ `longitude` varchar(10) NOT NULL default '',
+ `city` varchar(50) default NULL,
+ `full_state` varchar(50) default NULL,
+ PRIMARY KEY `zip` (`zip`)
) ENGINE=innoDB;
CREATE TABLE IF NOT EXISTS foodEntry (
@@ -795,8 +795,8 @@ CREATE TABLE IF NOT EXISTS designatedNutritionist(
) ENGINE=MyISAM;
CREATE TABLE IF NOT EXISTS opdiagnosis(
- ID INT(10) auto_increment primary key,
+ ID INT(10) auto_increment primary key,
VisitID INT( 10 ) unsigned NOT NULL COMMENT 'ID of the Ophthalmology Visit',
ICDCode DECIMAL( 5, 2 ) NOT NULL COMMENT 'Code for the Diagnosis',
- URL VARCHAR(512) COMMENT 'URL for information'
+ URL VARCHAR(512) COMMENT 'URL for information'
) ENGINE=MyISAM;
diff --git a/iTrust/sql/data/patient92.sql b/iTrust/sql/data/patient92.sql
new file mode 100644
index 0000000000000000000000000000000000000000..d990cd8fdd35c775543cef003bad7fda71b5cb1d
--- /dev/null
+++ b/iTrust/sql/data/patient92.sql
@@ -0,0 +1,30 @@
+/*Inserting dependent Brittany Franco*/
+INSERT INTO patients
+(MID,
+lastName,
+firstName,
+email,
+address1,
+address2,
+city,
+state,
+phone,
+dateofbirth,
+Gender)
+VALUES
+(92,
+'Franco',
+'Brittany',
+'brfranco@gmail.com',
+'1333 Who Cares Road',
+'Suite 102',
+'Raleigh',
+'NC',
+'919-971-0000',
+'2006-10-25',
+'Female')
+ ON DUPLICATE KEY UPDATE MID = MID;
+
+INSERT INTO users(MID, password, role, sQuestion, sAnswer, isDependent)
+ VALUES (92, '30c952fab122c3f9759f02a6d95c3758b246b4fee239957b2d4fee46e26170c4', 'preRegisteredPatient', 'what is your favorite color?', 'blue', 0)
+ ON DUPLICATE KEY UPDATE MID = MID;
diff --git a/iTrust/src/edu/ncsu/csc/itrust/action/EditPatientAction.java b/iTrust/src/edu/ncsu/csc/itrust/action/EditPatientAction.java
index fe355018b332817206ec088c95c5eda06c0f8632..187f1a51064d738fc04a9ef350c12952889cccdc 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;
}
@@ -111,6 +111,7 @@ public class EditPatientAction extends PatientBaseAction {
patientDAO.editPatient(p, loggedInMID);
patientDAO.removeAllRepresented(pid);
patientDAO.removeAllRepresentee(pid);
+ patientDAO.deactivatePatient(pid);
}
/**
@@ -122,6 +123,7 @@ public class EditPatientAction extends PatientBaseAction {
p.setMID(pid);
p.setDateOfDeactivationStr(null);
patientDAO.editPatient(p, loggedInMID);
+ patientDAO.ConvertPreRegisteredPatientsToPatient(this.getPid());
}
public boolean hasHistory() throws DBException {
diff --git a/iTrust/src/edu/ncsu/csc/itrust/action/EditPrescriptionsAction.java b/iTrust/src/edu/ncsu/csc/itrust/action/EditPrescriptionsAction.java
index 81673ada3d85d2dadc95e4fcd738185e0992d50e..0061e453fff947375c63b80c833260c7183cad74 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/action/EditPrescriptionsAction.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/action/EditPrescriptionsAction.java
@@ -1,7 +1,6 @@
package edu.ncsu.csc.itrust.action;
import java.text.SimpleDateFormat;
-//import java.util.Date;
import java.util.ArrayList;
import java.util.List;
import edu.ncsu.csc.itrust.EmailUtil;
@@ -142,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.
@@ -329,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/action/ResetPasswordAction.java b/iTrust/src/edu/ncsu/csc/itrust/action/ResetPasswordAction.java
index b544f816c4e59210d67414c14cfb9907f7333557..f8ba6f511e5c91e351bebc214cabe56199ab131e 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/action/ResetPasswordAction.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/action/ResetPasswordAction.java
@@ -80,12 +80,12 @@ public class ResetPasswordAction {
*/
public String checkRole(long mid, String role) throws ITrustException {
try {
- if (("patient".equals(role) && patientDAO.getRole(mid, role).equals("patient"))
- || ("hcp".equals(role) && patientDAO.getRole(mid, role).equals("hcp"))
- || ("uap".equals(role) && patientDAO.getRole(mid, role).equals("uap"))
- || ("pha".equals(role) && patientDAO.getRole(mid, role).equals("pha"))
- || ("er".equals(role) && patientDAO.getRole(mid, role).equals("er"))
- || ("lt".equals(role) && patientDAO.getRole(mid, role).equals("lt")))
+ if (("patient".equals(role) && patientDAO.getRole(mid).equals("patient"))
+ || ("hcp".equals(role) && patientDAO.getRole(mid).equals("hcp"))
+ || ("uap".equals(role) && patientDAO.getRole(mid).equals("uap"))
+ || ("pha".equals(role) && patientDAO.getRole(mid).equals("pha"))
+ || ("er".equals(role) && patientDAO.getRole(mid).equals("er"))
+ || ("lt".equals(role) && patientDAO.getRole(mid).equals("lt")))
return role;
else
return null;
diff --git a/iTrust/src/edu/ncsu/csc/itrust/action/ViewPreRegisteredPatientListAction.java b/iTrust/src/edu/ncsu/csc/itrust/action/ViewPreRegisteredPatientListAction.java
new file mode 100644
index 0000000000000000000000000000000000000000..53e64eb11dd3a1ff68ccdfe2bc91eb4c09ebc329
--- /dev/null
+++ b/iTrust/src/edu/ncsu/csc/itrust/action/ViewPreRegisteredPatientListAction.java
@@ -0,0 +1,66 @@
+package edu.ncsu.csc.itrust.action;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+
+import edu.ncsu.csc.itrust.beans.OfficeVisitBean;
+import edu.ncsu.csc.itrust.beans.PatientBean;
+import edu.ncsu.csc.itrust.beans.PatientVisitBean;
+import edu.ncsu.csc.itrust.beans.PersonnelBean;
+import edu.ncsu.csc.itrust.dao.DAOFactory;
+import edu.ncsu.csc.itrust.dao.mysql.OfficeVisitDAO;
+import edu.ncsu.csc.itrust.dao.mysql.PatientDAO;
+import edu.ncsu.csc.itrust.dao.mysql.PersonnelDAO;
+import edu.ncsu.csc.itrust.exception.DBException;
+import edu.ncsu.csc.itrust.exception.ITrustException;
+
+/**
+ *
+ * Action class for viewPreRegisteredPatientList.jsp
+ *
+ */
+public class ViewPreRegisteredPatientListAction {
+ private long loggedInMID;
+ private PatientDAO patientDAO;
+ private PersonnelDAO personnelDAO;
+
+ private ArrayList<PatientBean> PreRegisteredPatients;
+
+ /**
+ * Set up defaults
+ * @param factory The DAOFactory used to create the DAOs used in this action.
+ * @param loggedInMID The MID of the person viewing the office visits.
+ */
+ public ViewPreRegisteredPatientListAction(DAOFactory factory, long loggedInMID) {
+ this.loggedInMID = loggedInMID;
+
+ this.personnelDAO = factory.getPersonnelDAO();
+
+ this.patientDAO = factory.getPatientDAO();
+
+ PreRegisteredPatients = new ArrayList<PatientBean>();
+ }
+
+ /**
+ * Identify all the PreRegistered Patients from Patients Table using Users Table Role="PreRegistered", and add them to a list.
+ *
+ * @throws ITrustException
+ */
+ public List<PatientBean> getPreRegisteredPatients() throws ITrustException {
+ try {
+
+ List<PatientBean> plist = patientDAO.getAllPreRegisteredPatients();
+
+ for(PatientBean pb : plist) {
+
+ PreRegisteredPatients.add(pb);
+ }
+
+ return PreRegisteredPatients;
+ }
+ catch (DBException dbe) {
+ throw new ITrustException(dbe.getMessage());
+ }
+ }
+}
\ No newline at end of file
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 6d8d3afa4c4890e1cfc385639523d55d7cffa01b..dc210854503ba365c624773d2553d7bac2db38d3 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/dao/mysql/PatientDAO.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/dao/mysql/PatientDAO.java
@@ -99,19 +99,17 @@ public class PatientDAO {
* Returns the role of a particular patient - why is this in PatientDAO? It should be in AuthDAO
*
* @param mid The MID of the patient in question.
- * @param role A String representing the role of the patient.
* @return A String representing the patient's role.
* @throws ITrustException
* @throws DBException
*/
- public String getRole(long mid, String role) throws ITrustException, DBException {
+ public String getRole(long mid) throws ITrustException, DBException {
Connection conn = null;
PreparedStatement ps = null;
try {
conn = factory.getConnection();
- ps = conn.prepareStatement("SELECT role FROM users WHERE MID=? AND Role=?");
+ ps = conn.prepareStatement("SELECT role FROM users WHERE MID=?");
ps.setLong(1, mid);
- ps.setString(2, role);
ResultSet rs;
rs = ps.executeQuery();
if (rs.next()) {
@@ -145,9 +143,12 @@ public class PatientDAO {
conn = factory.getConnection();
ps = conn.prepareStatement("INSERT INTO patients(MID) VALUES(NULL)");
ps.executeUpdate();
+
long a = DBUtil.getLastInsert(conn);
ps.close();
+
return a;
+
} catch (SQLException e) {
throw new DBException(e);
@@ -222,10 +223,10 @@ public class PatientDAO {
} finally {
DBUtil.closeConnection(conn, ps);
}
- }
-
- public boolean isEmailInUse(String email) throws DBException {
- Connection conn = null;
+ }
+
+ public boolean isEmailInUse(String email) throws DBException {
+ Connection conn = null;
PreparedStatement ps = null;
boolean emailInUse = false;
try {
@@ -244,7 +245,7 @@ public class PatientDAO {
DBUtil.closeConnection(conn, ps);
}
return emailInUse;
- }
+ }
public void addHistory(long pid, long hcpid) throws DBException {
Connection conn = null;
@@ -708,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 {
@@ -761,7 +762,7 @@ public class PatientDAO {
DBUtil.closeConnection(conn, ps);
}
}
-
+
/**
* Return a list of all procedures for a given patient
*
@@ -921,7 +922,7 @@ public class PatientDAO {
}
/**
- * Lists every patient in the database.
+ * Lists every Approved patient in the database.
*
* @return A java.util.List of PatientBeans representing the patients.
* @throws DBException
@@ -931,7 +932,7 @@ public class PatientDAO {
PreparedStatement ps = null;
try {
conn = factory.getConnection();
- ps = conn.prepareStatement("SELECT * FROM patients ");
+ ps = conn.prepareStatement("SELECT * FROM patients, users where patients.MID = users.MID and users.Role='patient' ");
ResultSet rs = ps.executeQuery();
List<PatientBean> loadlist = patientLoader.loadList(rs);
rs.close();
@@ -945,6 +946,83 @@ public class PatientDAO {
}
}
+
+ /**
+ * Lists every Pre-Registered patient in the database.
+ *
+ * @return A java.util.List of PatientBeans representing the Pre-Registered patients.
+ * @throws DBException
+ */
+ public List<PatientBean> getAllPreRegisteredPatients() throws DBException {
+ Connection conn = null;
+ PreparedStatement ps = null;
+ try {
+ conn = factory.getConnection();
+ ps = conn.prepareStatement("SELECT * FROM patients, users where patients.MID = users.MID and users.Role='PreRegisteredPatient' and patients.DateOfDeactivation IS NULL");
+ ResultSet rs = ps.executeQuery();
+ List<PatientBean> loadlist = patientLoader.loadList(rs);
+ rs.close();
+ ps.close();
+ return loadlist;
+ } catch (SQLException e) {
+
+ throw new DBException(e);
+ } finally {
+ DBUtil.closeConnection(conn, ps);
+ }
+ }
+
+ /**
+ * Convert a Pre-Registered patient to a regular patient upon HCP approval.
+ * by change "role" column in "users" table.
+ *
+ * @param mid
+ * @throws DBException
+ */
+ public void ConvertPreRegisteredPatientsToPatient(long mid) throws DBException {
+ Connection conn = null;
+ PreparedStatement ps = null;
+ try {
+ conn = factory.getConnection();
+ ps = conn.prepareStatement("UPDATE users SET role=? WHERE MID=?");
+ ps.setString(1, "patient");
+ ps.setLong(2, mid);
+
+ ps.executeUpdate();
+ ps.close();
+
+ } catch (SQLException e) {
+ throw new DBException(e);
+ } finally {
+ DBUtil.closeConnection(conn, ps);
+ }
+ }
+
+ /**
+ * Convert a patient of any type to a deactivated patient, which should not
+ * be able to be seen anymore.
+ *
+ * @param mid
+ * @throws DBException
+ */
+ public void deactivatePatient(long mid) throws DBException {
+ Connection conn = null;
+ PreparedStatement ps = null;
+ try {
+ conn = factory.getConnection();
+ ps = conn.prepareStatement("UPDATE users SET role=? WHERE MID=?");
+ ps.setString(1, "deactivatedPatient");
+ ps.setLong(2, mid);
+
+ ps.executeUpdate();
+ ps.close();
+ } catch (SQLException e) {
+ throw new DBException(e);
+ } finally {
+ DBUtil.closeConnection(conn, ps);
+ }
+ }
+
/**
* Return a list of patients with a special-diagnosis-history who
* have the logged in HCP as a DHCP and whose medications are going to
@@ -1224,6 +1302,4 @@ public class PatientDAO {
DBUtil.closeConnection(conn, ps);
}
}
-
-
}
diff --git a/iTrust/src/edu/ncsu/csc/itrust/enums/TransactionType.java b/iTrust/src/edu/ncsu/csc/itrust/enums/TransactionType.java
index c7adcc6ff25e472951d61b1b41de031ed9281cf4..6584c27ffcd99dcafac833c00d6e52442f5b8e2f 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/enums/TransactionType.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/enums/TransactionType.java
@@ -31,6 +31,10 @@ public enum TransactionType {
PATIENT_DEACTIVATE(102, "Deactivate a patient", "deactivated your account", true),
/**PATIENT_ACTIVATE*/
PATIENT_ACTIVATE(103, "Activate a patient", "activated your account", true),
+ /**PREREGISTERED_PATIENT_ACTIVATE*/
+ REREGISTERED_PATIENT_ACTIVATE(105, "Activate a preregistered patient", "activated your account", true),
+ /**PREREGISTERED_PATIENT_DEACTIVATE*/
+ PREREGISTERED_PATIENT_DEACTIVATE(106, "Deactivate a preregistered patient", "deactivated your account", true),
/**LHCP_CREATE*/
LHCP_CREATE(200, "Create a LHCP", "created an LHCP", false),
/**LHCP_EDIT*/
@@ -143,196 +147,196 @@ public enum TransactionType {
/**OFFICE_VISIT_BILLED*/
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(1300, "Declare personal health representative", "declared a personal health representative", true),
- /**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(1500, "Add Medical procedure code", "added a medical procedure code", false),
- /**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(1502, "Edit Medical procedure code", "edited a medical procedure code", false),
- /**IMMUNIZATION_CODE_ADD*/
- IMMUNIZATION_CODE_ADD(1510, "Add Immunization code", "added an immunization code", false),
- /**IMMUNIZATION_CODE_VIEW*/
- IMMUNIZATION_CODE_VIEW(1511, "View Immunization code", "viewed an immunization code", false),
- /**IMMUNIZATION_CODE_EDIT*/
- IMMUNIZATION_CODE_EDIT(1512, "Edit Immunization code", "edited an immunization code", false),
- /**DIAGNOSIS_CODE_ADD*/
- DIAGNOSIS_CODE_ADD(1520, "Add Diagnosis code", "added a diagnosis code", false),
- /**DIAGNOSIS_CODE_VIEW*/
- DIAGNOSIS_CODE_VIEW(1521, "View Diagnosis code", "viewed a diagnosis code", false),
- /**DIAGNOSIS_CODE_EDIT*/
- DIAGNOSIS_CODE_EDIT(1522, "Edit Diagnosis code", "edited a diagnosis code", false),
- /**DRUG_CODE_ADD*/
- DRUG_CODE_ADD(1530, "Add Drug code", "added a drug code", false),
- /**DRUG_CODE_VIEW*/
- DRUG_CODE_VIEW(1531, "View Drug code", "viewed a drug code", false),
- /**DRUG_CODE_EDIT*/
- DRUG_CODE_EDIT(1532, "Edit Drug code", "edited a drug code", false),
- /**DRUG_CODE_REMOVE*/
- DRUG_CODE_REMOVE(1533, "Remove Drug code", "removed a drug code", false),
- /**LOINC_CODE_ADD*/
- LOINC_CODE_ADD(1540, "Add Physical Services code", "added a physical service code", false),
- /**LOINC_CODE_VIEW*/
- LOINC_CODE_VIEW(1541, "View Physical Services code", "viewed a physical service code", false),
- /**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(1549, "Upload Physical Services file", "uploaded a LOINC file", false),
- /**RISK_FACTOR_VIEW*/
- RISK_FACTOR_VIEW(1600, "View risk factors", "viewed your risk factors", true),
- /**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(1800, "Add a hospital listing", "added a hospital listing", false),
- /**HOSPITAL_LISTING_VIEW*/
- HOSPITAL_LISTING_VIEW(1801, "View a hospital listing", "viewed a hospital listing", false),
- /**HOSPITAL_LISTING_EDIT*/
- HOSPITAL_LISTING_EDIT(1802, "Edit a hospital listing", "edited a hospital listing", false),
- /**PRESCRIPTION_REPORT_VIEW*/
- PRESCRIPTION_REPORT_VIEW(1900, "View prescription report", "viewed your prescription report", true),
- /**DEATH_TRENDS_VIEW*/
- DEATH_TRENDS_VIEW(2000, "View Cause of Death Trends", "viewed cause of death trends", false),
- /**EMERGENCY_REPORT_CREATE*/
- EMERGENCY_REPORT_CREATE(2100, "Create emergency report", "created an emergency report for you", true),
- /**EMERGENCY_REPORT_VIEW*/
- EMERGENCY_REPORT_VIEW(2101, "View emergency report", "viewed your emergency report", true),
- /**APPOINTMENT_TYPE_ADD*/
- APPOINTMENT_TYPE_ADD(2200, "Add appointment type listing", "added an appointment type", false),
- /**APPOINTMENT_TYPE_VIEW*/
- APPOINTMENT_TYPE_VIEW(2201, "View appointment type listing", "viewed an appointment type", false),
- /**APPOINTMENT_TYPE_EDIT*/
- APPOINTMENT_TYPE_EDIT(2202, "Edit appointment type listing", "edited an appointment type", false),
- /**APPOINTMENT_ADD*/
- APPOINTMENT_ADD(2210, "Schedule Appointments", "scheduled an appointment with you", true),
- /**APPOINTMENT_VIEW*/
- APPOINTMENT_VIEW(2211, "View Scheduled Appointment", "viewed your scheduled appointment", true),
- /**APPOINTMENT_EDIT*/
- APPOINTMENT_EDIT(2212, "Edit Scheduled Appointment", "edited your scheduled appointment", true),
- /**APPOINTMENT_REMOVE*/
- APPOINTMENT_REMOVE(2213, "Delete Scheduled Appointment", "canceled your scheduled appointment", true),
- /**APPOINTMENT_ALL_VIEW*/
- APPOINTMENT_ALL_VIEW(2220, "View All Scheduled Appointments", "viewed all scheduled appointments", true),
- /**APPOINTMENT_CONFLICT_OVERRIDE*/
- APPOINTMENT_CONFLICT_OVERRIDE(2230, "Schedule conflict override", "overrided a schedule conflict", true),
- /**APPOINTMENT_REQUEST_SUBMITTED*/
- APPOINTMENT_REQUEST_SUBMITTED(2240, "Appointment request submitted", "requested an appointment", true),
- /**APPOINTMENT_REQUEST_APPROVED*/
- APPOINTMENT_REQUEST_APPROVED(2250, "Appointment request approved", "approved an appointment request", true),
- /**APPOINTMENT_REQUEST_REJECTED*/
- APPOINTMENT_REQUEST_REJECTED(2251, "Appointment request rejected", "rejected an appointment request", true),
- /**APPOINTMENT_REQUEST_VIEW*/
- APPOINTMENT_REQUEST_VIEW(2260, "View All Appointment Requests", "viewed all appointment requests", true),
- /**COMPREHENSIVE_REPORT_VIEW*/
- COMPREHENSIVE_REPORT_VIEW(2300, "Comprehensive Report", "viewed your comprehensive report", true),
- /**COMPREHENSIVE_REPORT_ADD*/
- COMPREHENSIVE_REPORT_ADD(2301, "Request Comprehensive Report", "requested a comprehensive report for you", true),
- /**SATISFACTION_SURVEY_TAKE*/
- SATISFACTION_SURVEY_TAKE(2400, "Take Satisfaction Survey", "completed a satisfaction survey", true),
- /**SATISFACTION_SURVEY_VIEW*/
- SATISFACTION_SURVEY_VIEW(2500, "View physician satisfaction results", "viewed physician satisfaction survey results", false),
- /**LAB_RESULTS_UNASSIGNED*/
- LAB_RESULTS_UNASSIGNED(2600, "Unassigned lab results log value", "", false),
- /**LAB_RESULTS_CREATE*/
- LAB_RESULTS_CREATE(2601, "Create laboratory procedure", "created your lab procedure", true),
- /**LAB_RESULTS_VIEW*/
- LAB_RESULTS_VIEW(2602, "View laboratory procedure results", "viewed your lab procedure results", true),
- /**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(2604, "Remove a laboratory procedure", "removed your lab procedure", true),
- /**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(2606, "View laboratory procedure queue", "viewed your lab procedure queue", false),
- /**LAB_RESULTS_RECORD*/
- LAB_RESULTS_RECORD(2607, "Record laboratory test results", "recorded your lab procedure results", false),
- /**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(2700, "Send an email", "sent an email", false),
- /**EMAIL_HISTORY_VIEW*/
- EMAIL_HISTORY_VIEW(2710, "View email history", "viewed email history", false),
- /**PATIENT_LIST_VIEW*/
- PATIENT_LIST_VIEW(2800, "View patient list", "viewed his/her patient list", false),
- /**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(3000, "Send messages", "sent a message", false),
- /**MESSAGE_VIEW*/
- MESSAGE_VIEW(3001, "View messages", "viewed a message", false),
- /**INBOX_VIEW*/
- INBOX_VIEW(3010, "View inbox", "viewed message inbox", false),
- /**OUTBOX_VIEW*/
- OUTBOX_VIEW(3011, "View outbox", "viewed message outbox", false),
- /**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(3110, "View expired prescriptions", "viewed your expired prescriptions", true),
- /**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(3210, "View list of diagnoses", "viewed a list of diagnosis", false),
- /**CONSULTATION_REFERRAL_CREATE*/
- CONSULTATION_REFERRAL_CREATE(3300, "Refer a patient for consultations", "referred you to another HCP", true),
- /**CONSULTATION_REFERRAL_VIEW*/
- CONSULTATION_REFERRAL_VIEW(3310, "View referral for consultation", "viewed your consultation referral", true),
- /**CONSULTATION_REFERRAL_EDIT*/
- CONSULTATION_REFERRAL_EDIT(3311, "Modify referral for consultation", "modified your consultation referral", true),
- /**CONSULTATION_REFERRAL_CANCEL*/
- CONSULTATION_REFERRAL_CANCEL(3312, "Cancel referral for consultation", "canceled your consultation referral", true),
- /**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(3401, "Patient telemedicine permissions changed", "changed the data you report for telemedicine monitoring", true),
- /**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(3410, "Remote monitoring levels are reported", "reported your telemedicine data", true),
- /**TELEMEDICINE_DATA_VIEW*/
- TELEMEDICINE_DATA_VIEW(3420, "Remote monitoring levels are viewed", "viewed your telemedicine data reports", true),
- /**ADVERSE_EVENT_REPORT*/
- ADVERSE_EVENT_REPORT(3500, "Adverse event reporting", "reported an adverse event", true),
- /**ADVERSE_EVENT_VIEW*/
- ADVERSE_EVENT_VIEW(3600, "Adverse event monitoring", "reviewed an adverse event report", false),
- /**ADVERSE_EVENT_REMOVE*/
- ADVERSE_EVENT_REMOVE(3601, "Remove adverse event", "removed an adverse event report", false),
- /**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(3603, "View Adverse Event Chart", "viewed adverse event chart", false),
- /**OVERRIDE_INTERACTION_WARNING*/
- OVERRIDE_INTERACTION_WARNING(3700, "Override interaction warning", "Overrode an interaction warning", true),
- /**OVERRIDE_CODE_ADD*/
- OVERRIDE_CODE_ADD(3710, "Add overriding reason listing", "added a medication override reason", false),
- /**OVERRIDE_CODE_EDIT*/
- OVERRIDE_CODE_EDIT(3711, "Edit overriding reason listing", "edited a medication override reason", false),
- /**DRUG_INTERACTION_ADD*/
- DRUG_INTERACTION_ADD(3800, "Add Drug Interactions Code", "added a drug interaction code", false),
- /**DRUG_INTERACTION_EDIT*/
- DRUG_INTERACTION_EDIT(3801, "Edit Drug Interactions Code", "edited a drug interaction code", false),
- /**DRUG_INTERACTION_DELETE*/
- DRUG_INTERACTION_DELETE(3802, "Delete Drug Interactions Code", "deleted a drug interaction code", false),
- /**CALENDAR_VIEW*/
- CALENDAR_VIEW(4000, "View calendar", "viewed your calendar", false),
- /**UPCOMING_APPOINTMENTS_VIEW*/
- UPCOMING_APPOINTMENTS_VIEW(4010, "View Upcoming Appointments", "viewed upcoming appointments", false),
- /**NOTIFICATIONS_VIEW*/
- NOTIFICATIONS_VIEW(4200, "View Notifications", "viewed your notification center", false),
- /**ACTIVITY_FEED_VIEW*/
- ACTIVITY_FEED_VIEW(4300, "View activity feed", "viewed your activity feed", false),
- /**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(4401, "Edit Patient Specific Instructions for Office Visit", "edited a patient-specific instruction", true),
- /**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(4403, " View Patient Specific Instructions", "viewed your patient-specific instructions", true),
- /**DIAGNOSIS_TRENDS_VIEW*/
+ OPERATIONAL_PROFILE_VIEW(1200, "View Operational Profile", "viewed the operational profile", false),
+ /**HEALTH_REPRESENTATIVE_DECLARE*/
+ HEALTH_REPRESENTATIVE_DECLARE(1300, "Declare personal health representative", "declared a personal health representative", true),
+ /**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(1500, "Add Medical procedure code", "added a medical procedure code", false),
+ /**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(1502, "Edit Medical procedure code", "edited a medical procedure code", false),
+ /**IMMUNIZATION_CODE_ADD*/
+ IMMUNIZATION_CODE_ADD(1510, "Add Immunization code", "added an immunization code", false),
+ /**IMMUNIZATION_CODE_VIEW*/
+ IMMUNIZATION_CODE_VIEW(1511, "View Immunization code", "viewed an immunization code", false),
+ /**IMMUNIZATION_CODE_EDIT*/
+ IMMUNIZATION_CODE_EDIT(1512, "Edit Immunization code", "edited an immunization code", false),
+ /**DIAGNOSIS_CODE_ADD*/
+ DIAGNOSIS_CODE_ADD(1520, "Add Diagnosis code", "added a diagnosis code", false),
+ /**DIAGNOSIS_CODE_VIEW*/
+ DIAGNOSIS_CODE_VIEW(1521, "View Diagnosis code", "viewed a diagnosis code", false),
+ /**DIAGNOSIS_CODE_EDIT*/
+ DIAGNOSIS_CODE_EDIT(1522, "Edit Diagnosis code", "edited a diagnosis code", false),
+ /**DRUG_CODE_ADD*/
+ DRUG_CODE_ADD(1530, "Add Drug code", "added a drug code", false),
+ /**DRUG_CODE_VIEW*/
+ DRUG_CODE_VIEW(1531, "View Drug code", "viewed a drug code", false),
+ /**DRUG_CODE_EDIT*/
+ DRUG_CODE_EDIT(1532, "Edit Drug code", "edited a drug code", false),
+ /**DRUG_CODE_REMOVE*/
+ DRUG_CODE_REMOVE(1533, "Remove Drug code", "removed a drug code", false),
+ /**LOINC_CODE_ADD*/
+ LOINC_CODE_ADD(1540, "Add Physical Services code", "added a physical service code", false),
+ /**LOINC_CODE_VIEW*/
+ LOINC_CODE_VIEW(1541, "View Physical Services code", "viewed a physical service code", false),
+ /**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(1549, "Upload Physical Services file", "uploaded a LOINC file", false),
+ /**RISK_FACTOR_VIEW*/
+ RISK_FACTOR_VIEW(1600, "View risk factors", "viewed your risk factors", true),
+ /**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(1800, "Add a hospital listing", "added a hospital listing", false),
+ /**HOSPITAL_LISTING_VIEW*/
+ HOSPITAL_LISTING_VIEW(1801, "View a hospital listing", "viewed a hospital listing", false),
+ /**HOSPITAL_LISTING_EDIT*/
+ HOSPITAL_LISTING_EDIT(1802, "Edit a hospital listing", "edited a hospital listing", false),
+ /**PRESCRIPTION_REPORT_VIEW*/
+ PRESCRIPTION_REPORT_VIEW(1900, "View prescription report", "viewed your prescription report", true),
+ /**DEATH_TRENDS_VIEW*/
+ DEATH_TRENDS_VIEW(2000, "View Cause of Death Trends", "viewed cause of death trends", false),
+ /**EMERGENCY_REPORT_CREATE*/
+ EMERGENCY_REPORT_CREATE(2100, "Create emergency report", "created an emergency report for you", true),
+ /**EMERGENCY_REPORT_VIEW*/
+ EMERGENCY_REPORT_VIEW(2101, "View emergency report", "viewed your emergency report", true),
+ /**APPOINTMENT_TYPE_ADD*/
+ APPOINTMENT_TYPE_ADD(2200, "Add appointment type listing", "added an appointment type", false),
+ /**APPOINTMENT_TYPE_VIEW*/
+ APPOINTMENT_TYPE_VIEW(2201, "View appointment type listing", "viewed an appointment type", false),
+ /**APPOINTMENT_TYPE_EDIT*/
+ APPOINTMENT_TYPE_EDIT(2202, "Edit appointment type listing", "edited an appointment type", false),
+ /**APPOINTMENT_ADD*/
+ APPOINTMENT_ADD(2210, "Schedule Appointments", "scheduled an appointment with you", true),
+ /**APPOINTMENT_VIEW*/
+ APPOINTMENT_VIEW(2211, "View Scheduled Appointment", "viewed your scheduled appointment", true),
+ /**APPOINTMENT_EDIT*/
+ APPOINTMENT_EDIT(2212, "Edit Scheduled Appointment", "edited your scheduled appointment", true),
+ /**APPOINTMENT_REMOVE*/
+ APPOINTMENT_REMOVE(2213, "Delete Scheduled Appointment", "canceled your scheduled appointment", true),
+ /**APPOINTMENT_ALL_VIEW*/
+ APPOINTMENT_ALL_VIEW(2220, "View All Scheduled Appointments", "viewed all scheduled appointments", true),
+ /**APPOINTMENT_CONFLICT_OVERRIDE*/
+ APPOINTMENT_CONFLICT_OVERRIDE(2230, "Schedule conflict override", "overrided a schedule conflict", true),
+ /**APPOINTMENT_REQUEST_SUBMITTED*/
+ APPOINTMENT_REQUEST_SUBMITTED(2240, "Appointment request submitted", "requested an appointment", true),
+ /**APPOINTMENT_REQUEST_APPROVED*/
+ APPOINTMENT_REQUEST_APPROVED(2250, "Appointment request approved", "approved an appointment request", true),
+ /**APPOINTMENT_REQUEST_REJECTED*/
+ APPOINTMENT_REQUEST_REJECTED(2251, "Appointment request rejected", "rejected an appointment request", true),
+ /**APPOINTMENT_REQUEST_VIEW*/
+ APPOINTMENT_REQUEST_VIEW(2260, "View All Appointment Requests", "viewed all appointment requests", true),
+ /**COMPREHENSIVE_REPORT_VIEW*/
+ COMPREHENSIVE_REPORT_VIEW(2300, "Comprehensive Report", "viewed your comprehensive report", true),
+ /**COMPREHENSIVE_REPORT_ADD*/
+ COMPREHENSIVE_REPORT_ADD(2301, "Request Comprehensive Report", "requested a comprehensive report for you", true),
+ /**SATISFACTION_SURVEY_TAKE*/
+ SATISFACTION_SURVEY_TAKE(2400, "Take Satisfaction Survey", "completed a satisfaction survey", true),
+ /**SATISFACTION_SURVEY_VIEW*/
+ SATISFACTION_SURVEY_VIEW(2500, "View physician satisfaction results", "viewed physician satisfaction survey results", false),
+ /**LAB_RESULTS_UNASSIGNED*/
+ LAB_RESULTS_UNASSIGNED(2600, "Unassigned lab results log value", "", false),
+ /**LAB_RESULTS_CREATE*/
+ LAB_RESULTS_CREATE(2601, "Create laboratory procedure", "created your lab procedure", true),
+ /**LAB_RESULTS_VIEW*/
+ LAB_RESULTS_VIEW(2602, "View laboratory procedure results", "viewed your lab procedure results", true),
+ /**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(2604, "Remove a laboratory procedure", "removed your lab procedure", true),
+ /**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(2606, "View laboratory procedure queue", "viewed your lab procedure queue", false),
+ /**LAB_RESULTS_RECORD*/
+ LAB_RESULTS_RECORD(2607, "Record laboratory test results", "recorded your lab procedure results", false),
+ /**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(2700, "Send an email", "sent an email", false),
+ /**EMAIL_HISTORY_VIEW*/
+ EMAIL_HISTORY_VIEW(2710, "View email history", "viewed email history", false),
+ /**PATIENT_LIST_VIEW*/
+ PATIENT_LIST_VIEW(2800, "View patient list", "viewed his/her patient list", false),
+ /**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(3000, "Send messages", "sent a message", false),
+ /**MESSAGE_VIEW*/
+ MESSAGE_VIEW(3001, "View messages", "viewed a message", false),
+ /**INBOX_VIEW*/
+ INBOX_VIEW(3010, "View inbox", "viewed message inbox", false),
+ /**OUTBOX_VIEW*/
+ OUTBOX_VIEW(3011, "View outbox", "viewed message outbox", false),
+ /**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(3110, "View expired prescriptions", "viewed your expired prescriptions", true),
+ /**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(3210, "View list of diagnoses", "viewed a list of diagnosis", false),
+ /**CONSULTATION_REFERRAL_CREATE*/
+ CONSULTATION_REFERRAL_CREATE(3300, "Refer a patient for consultations", "referred you to another HCP", true),
+ /**CONSULTATION_REFERRAL_VIEW*/
+ CONSULTATION_REFERRAL_VIEW(3310, "View referral for consultation", "viewed your consultation referral", true),
+ /**CONSULTATION_REFERRAL_EDIT*/
+ CONSULTATION_REFERRAL_EDIT(3311, "Modify referral for consultation", "modified your consultation referral", true),
+ /**CONSULTATION_REFERRAL_CANCEL*/
+ CONSULTATION_REFERRAL_CANCEL(3312, "Cancel referral for consultation", "canceled your consultation referral", true),
+ /**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(3401, "Patient telemedicine permissions changed", "changed the data you report for telemedicine monitoring", true),
+ /**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(3410, "Remote monitoring levels are reported", "reported your telemedicine data", true),
+ /**TELEMEDICINE_DATA_VIEW*/
+ TELEMEDICINE_DATA_VIEW(3420, "Remote monitoring levels are viewed", "viewed your telemedicine data reports", true),
+ /**ADVERSE_EVENT_REPORT*/
+ ADVERSE_EVENT_REPORT(3500, "Adverse event reporting", "reported an adverse event", true),
+ /**ADVERSE_EVENT_VIEW*/
+ ADVERSE_EVENT_VIEW(3600, "Adverse event monitoring", "reviewed an adverse event report", false),
+ /**ADVERSE_EVENT_REMOVE*/
+ ADVERSE_EVENT_REMOVE(3601, "Remove adverse event", "removed an adverse event report", false),
+ /**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(3603, "View Adverse Event Chart", "viewed adverse event chart", false),
+ /**OVERRIDE_INTERACTION_WARNING*/
+ OVERRIDE_INTERACTION_WARNING(3700, "Override interaction warning", "Overrode an interaction warning", true),
+ /**OVERRIDE_CODE_ADD*/
+ OVERRIDE_CODE_ADD(3710, "Add overriding reason listing", "added a medication override reason", false),
+ /**OVERRIDE_CODE_EDIT*/
+ OVERRIDE_CODE_EDIT(3711, "Edit overriding reason listing", "edited a medication override reason", false),
+ /**DRUG_INTERACTION_ADD*/
+ DRUG_INTERACTION_ADD(3800, "Add Drug Interactions Code", "added a drug interaction code", false),
+ /**DRUG_INTERACTION_EDIT*/
+ DRUG_INTERACTION_EDIT(3801, "Edit Drug Interactions Code", "edited a drug interaction code", false),
+ /**DRUG_INTERACTION_DELETE*/
+ DRUG_INTERACTION_DELETE(3802, "Delete Drug Interactions Code", "deleted a drug interaction code", false),
+ /**CALENDAR_VIEW*/
+ CALENDAR_VIEW(4000, "View calendar", "viewed your calendar", false),
+ /**UPCOMING_APPOINTMENTS_VIEW*/
+ UPCOMING_APPOINTMENTS_VIEW(4010, "View Upcoming Appointments", "viewed upcoming appointments", false),
+ /**NOTIFICATIONS_VIEW*/
+ NOTIFICATIONS_VIEW(4200, "View Notifications", "viewed your notification center", false),
+ /**ACTIVITY_FEED_VIEW*/
+ ACTIVITY_FEED_VIEW(4300, "View activity feed", "viewed your activity feed", false),
+ /**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(4401, "Edit Patient Specific Instructions for Office Visit", "edited a patient-specific instruction", true),
+ /**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(4403, " View Patient Specific Instructions", "viewed your patient-specific instructions", true),
+ /**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),
@@ -362,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(5300, "Pateint View of Basic Health Metric Percentiles", "viewed your percentile data.", true),
- /**ADMIN_UPLOAD_CDCMETRICS*/
- ADMIN_UPLOAD_CDCMETRICS(5302, "Admin upload of CDC Metrics", "Uploaded CDC Metrics Successfully", false),
- /**PASSWORD_CHANGE*/
+ /**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(5302, "Admin upload of CDC Metrics", "Uploaded CDC Metrics Successfully", false),
+ /**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/selenium/ActivatePatientTest.java b/iTrust/test/edu/ncsu/csc/itrust/selenium/ActivatePatientTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..9eb9dcdee4b02f885e74979370b3bd7c31d6cbb8
--- /dev/null
+++ b/iTrust/test/edu/ncsu/csc/itrust/selenium/ActivatePatientTest.java
@@ -0,0 +1,68 @@
+package edu.ncsu.csc.itrust.selenium;
+
+import java.util.concurrent.TimeUnit;
+
+import edu.ncsu.csc.itrust.enums.TransactionType;
+import org.junit.*;
+import org.openqa.selenium.*;
+import org.openqa.selenium.htmlunit.HtmlUnitDriver;
+
+public class ActivatePatientTest extends iTrustSeleniumTest {
+ private WebDriver driver;
+ private StringBuffer verificationErrors = new StringBuffer();
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ gen.standardData();
+ gen.patient92();
+ driver = new HtmlUnitDriver();
+ driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
+ }
+
+ @Test
+ public void testActivatePreregisteredPatient() throws Exception {
+ HtmlUnitDriver driver = (HtmlUnitDriver)login("9000000000", "pw");
+
+ // Make sure we were able to log in
+ assertEquals("iTrust - HCP Home", driver.getTitle());
+ driver.findElement(By.cssSelector("h2.panel-title")).click();
+ driver.findElement(By.linkText("View Pre-Registered Patients")).click();
+ String text = driver.findElement(By.cssSelector("table.fTable")).getText();
+
+ // Make sure the preregistered patients show up in the preregistered patients list
+ assertTrue("Text not found!", text.contains("Brittany Franco"));
+ assertTrue("Text not found!", text.contains("1333 Who Cares Road Suite 102"));
+ assertTrue("Text not found!", text.contains("Raleigh NC"));
+ assertTrue("Text not found!", text.contains("brfranco@gmail.com"));
+
+ // Ensure we can click on the patient and see more details
+ driver.findElement(By.linkText("Brittany Franco")).click();
+ text = driver.findElement(By.cssSelector("table.fTable")).getText();
+ assertTrue("Text not found!", text.contains("Phone:919-971-0000"));
+ assertTrue("Text not found!", text.contains("Email:brfranco@gmail.com"));
+ assertTrue("Text not found!", text.contains("Address: 1333 Who Cares Road"));
+
+ // Activate the preregistered patient
+ driver.findElement(By.linkText("Activate")).click();
+ text = driver.findElement(By.cssSelector("table.fTable")).getText();
+ assertTrue("Text not found!", text.contains("type \"I UNDERSTAND\" into the box below and click the button"));
+ driver.findElement(By.name("understand")).sendKeys("I UNDERSTAND");
+ driver.findElement(By.name("action")).click();
+ assertLogged(TransactionType.REREGISTERED_PATIENT_ACTIVATE, 9000000000L, 92L, "");
+
+ // Ensure the patient gets the fully activated screen
+ text = driver.findElement(By.cssSelector("span.iTrustMessage")).getText();
+ assertTrue("Text not found!", text.contains("Patient Successfully Activated!"));
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ driver.quit();
+ String verificationErrorString = verificationErrors.toString();
+ if (!"".equals(verificationErrorString)) {
+ fail(verificationErrorString);
+ }
+ }
+
+}
diff --git a/iTrust/test/edu/ncsu/csc/itrust/selenium/DeactivatePatientTest.java b/iTrust/test/edu/ncsu/csc/itrust/selenium/DeactivatePatientTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..7dd8a4f075a7bfd853a144d92b90fa01958c5375
--- /dev/null
+++ b/iTrust/test/edu/ncsu/csc/itrust/selenium/DeactivatePatientTest.java
@@ -0,0 +1,95 @@
+package edu.ncsu.csc.itrust.selenium;
+
+import java.util.concurrent.TimeUnit;
+
+import edu.ncsu.csc.itrust.enums.TransactionType;
+import org.junit.*;
+import org.openqa.selenium.*;
+import org.openqa.selenium.htmlunit.HtmlUnitDriver;
+import com.gargoylesoftware.htmlunit.WebClient;
+
+public class DeactivatePatientTest extends iTrustSeleniumTest {
+ private WebDriver driver;
+ private StringBuffer verificationErrors = new StringBuffer();
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ gen.standardData();
+ gen.patient92();
+ driver = new HtmlUnitDriver();
+ driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
+ }
+
+ @Test
+ public void testDeactivatePatients() throws Exception {
+ HtmlUnitDriver driver = (HtmlUnitDriver)login("9000000000", "pw");
+
+ // Make sure we were able to log in
+ assertEquals("iTrust - HCP Home", driver.getTitle());
+ driver.findElement(By.cssSelector("h2.panel-title")).click();
+ driver.findElement(By.linkText("View Pre-Registered Patients")).click();
+ driver.findElement(By.cssSelector("input.deactivate")).click();
+
+ // Deactivate the specified patient
+ driver.findElement(By.name("understand")).sendKeys("I UNDERSTAND");
+ driver.findElement(By.name("action")).click();
+ assertLogged(TransactionType.PREREGISTERED_PATIENT_DEACTIVATE, 9000000000L, 92L, "");
+
+ driver.findElement(By.cssSelector("h2.panel-title")).click();
+ driver.findElement(By.linkText("View Pre-Registered Patients")).click();
+ String text = driver.findElement(By.cssSelector("table.fTable")).getText();
+
+ // Ensure the deactivated patient is no longer in the preregistered patients list
+ assertFalse("Text found, but shouldn't be!", text.contains("Brittany Franco"));
+ assertFalse("Text found, but shouldn't be!", text.contains("1333 Who Cares Road Suite 102"));
+ assertFalse("Text found, but shouldn't be!", text.contains("Raleigh NC"));
+ assertFalse("Text found, but shouldn't be!", text.contains("brfranco@gmail.com"));
+ }
+
+ @Test
+ public void testLoginAfterPatientDeactivated() throws Exception {
+ HtmlUnitDriver driver = (HtmlUnitDriver)login("9000000000", "pw");
+
+ // Make sure we were able to log in
+ assertEquals("iTrust - HCP Home", driver.getTitle());
+ driver.findElement(By.cssSelector("h2.panel-title")).click();
+ driver.findElement(By.linkText("View Pre-Registered Patients")).click();
+ driver.findElement(By.cssSelector("input.deactivate")).click();
+
+ // Deactivate the specified patient
+ driver.findElement(By.name("understand")).sendKeys("I UNDERSTAND");
+ driver.findElement(By.name("action")).click();
+ assertLogged(TransactionType.PREREGISTERED_PATIENT_DEACTIVATE, 9000000000L, 92L, "");
+
+ driver.findElement(By.cssSelector("h2.panel-title")).click();
+ driver.findElement(By.linkText("View Pre-Registered Patients")).click();
+ String text = driver.findElement(By.cssSelector("table.fTable")).getText();
+
+ // Make sure deactivated patient doesn't show up in preregistered list
+ assertFalse("Text found, but shouldn't be!", text.contains("Brittany Franco"));
+ assertFalse("Text found, but shouldn't be!", text.contains("1333 Who Cares Road Suite 102"));
+ assertFalse("Text found, but shouldn't be!", text.contains("Raleigh NC"));
+ assertFalse("Text found, but shouldn't be!", text.contains("brfranco@gmail.com"));
+
+ // Test if the deactivated patient can log in
+ HtmlUnitDriver patientDriver = (HtmlUnitDriver)login("92", "pw");
+ assertEquals("Server Rebooted", patientDriver.getTitle());
+ text = patientDriver.findElement(By.xpath("//body")).getText();
+ assertTrue("Text not found!", text.contains("Authorization Error!"));
+ assertTrue("Text not found!", text.contains("You are not allowed to access this page"));
+ assertTrue("Text not found!", text.contains("Log back in."));
+
+
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ driver.quit();
+ String verificationErrorString = verificationErrors.toString();
+ if (!"".equals(verificationErrorString)) {
+ fail(verificationErrorString);
+ }
+ }
+
+}
diff --git a/iTrust/test/edu/ncsu/csc/itrust/selenium/ViewAllPreregisteredPatientsTest.java b/iTrust/test/edu/ncsu/csc/itrust/selenium/ViewAllPreregisteredPatientsTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..ca0eec65c42eca8e4568dedc3bc39186878b2428
--- /dev/null
+++ b/iTrust/test/edu/ncsu/csc/itrust/selenium/ViewAllPreregisteredPatientsTest.java
@@ -0,0 +1,51 @@
+package edu.ncsu.csc.itrust.selenium;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.*;
+import org.openqa.selenium.*;
+import org.openqa.selenium.htmlunit.HtmlUnitDriver;
+
+public class ViewAllPreregisteredPatientsTest extends iTrustSeleniumTest {
+ private WebDriver driver;
+ private StringBuffer verificationErrors = new StringBuffer();
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ gen.standardData();
+ gen.patient92();
+ driver = new HtmlUnitDriver();
+ driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
+ }
+
+ @Test
+ public void testViewAllPreregisteredPatients() throws Exception {
+
+ // This logs us into iTrust and returns the HtmlUnitDriver for use in
+ // this case
+ HtmlUnitDriver driver = (HtmlUnitDriver)login("9000000000", "pw");
+
+ // Make sure we were able to log in
+ assertEquals("iTrust - HCP Home", driver.getTitle());
+ driver.findElement(By.cssSelector("h2.panel-title")).click();
+ driver.findElement(By.linkText("View Pre-Registered Patients")).click();
+ String text = driver.findElement(By.cssSelector("table.fTable")).getText();
+
+ // Make sure the preregistered patients are shown in the list
+ assertTrue("Text not found!", text.contains("Brittany Franco"));
+ assertTrue("Text not found!", text.contains("1333 Who Cares Road Suite 102"));
+ assertTrue("Text not found!", text.contains("Raleigh NC"));
+ assertTrue("Text not found!", text.contains("brfranco@gmail.com"));
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ driver.quit();
+ String verificationErrorString = verificationErrors.toString();
+ if (!"".equals(verificationErrorString)) {
+ fail(verificationErrorString);
+ }
+ }
+
+}
diff --git a/iTrust/test/edu/ncsu/csc/itrust/unit/action/ActivatePatientActionTest.java b/iTrust/test/edu/ncsu/csc/itrust/unit/action/ActivatePatientActionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..2e0cc0cf94889365a63458c892839295aeed5e7d
--- /dev/null
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/action/ActivatePatientActionTest.java
@@ -0,0 +1,38 @@
+package edu.ncsu.csc.itrust.unit.action;
+
+import edu.ncsu.csc.itrust.action.EditPatientAction;
+import edu.ncsu.csc.itrust.dao.mysql.PatientDAO;
+import edu.ncsu.csc.itrust.unit.datagenerators.TestDataGenerator;
+import edu.ncsu.csc.itrust.unit.testutils.TestDAOFactory;
+import junit.framework.TestCase;
+
+public class ActivatePatientActionTest extends TestCase {
+
+ private TestDataGenerator gen = new TestDataGenerator();
+ private PatientDAO patientDAO = TestDAOFactory.getTestInstance().getPatientDAO();
+
+ @Override
+ protected void setUp() throws Exception {
+ gen.clearAllTables();
+ gen.patient92();
+ gen.patient4();
+ }
+
+ public void testActivateAlreadyActivated() throws Exception {
+ long pid = 4;
+ assertEquals("patient", patientDAO.getRole(pid));
+ EditPatientAction action = new EditPatientAction(TestDAOFactory.getTestInstance(), pid, Long.toString(pid));
+ action.activate();
+ assertEquals("patient", patientDAO.getRole(pid));
+ assertEquals("", patientDAO.getPatient(pid).getDateOfDeactivationStr());
+ }
+
+ public void testActivatePreregisteredPatient() throws Exception {
+ long pid = 92;
+ assertEquals("preRegisteredPatient", patientDAO.getRole(pid));
+ EditPatientAction action = new EditPatientAction(TestDAOFactory.getTestInstance(), pid, Long.toString(pid));
+ action.activate();
+ assertEquals("patient", patientDAO.getRole(pid));
+ assertEquals("", patientDAO.getPatient(pid).getDateOfDeactivationStr());
+ }
+}
diff --git a/iTrust/test/edu/ncsu/csc/itrust/unit/action/DeactivatePatientActionTest.java b/iTrust/test/edu/ncsu/csc/itrust/unit/action/DeactivatePatientActionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..3a2538af73cf368806b76168224be3ee8972dcc2
--- /dev/null
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/action/DeactivatePatientActionTest.java
@@ -0,0 +1,41 @@
+package edu.ncsu.csc.itrust.unit.action;
+
+import edu.ncsu.csc.itrust.action.EditPatientAction;
+import edu.ncsu.csc.itrust.dao.mysql.PatientDAO;
+import edu.ncsu.csc.itrust.unit.datagenerators.TestDataGenerator;
+import edu.ncsu.csc.itrust.unit.testutils.TestDAOFactory;
+import junit.framework.TestCase;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+public class DeactivatePatientActionTest extends TestCase {
+
+ private TestDataGenerator gen = new TestDataGenerator();
+ private PatientDAO patientDAO = TestDAOFactory.getTestInstance().getPatientDAO();
+
+ @Override
+ protected void setUp() throws Exception {
+ gen.clearAllTables();
+ gen.patient92();
+ gen.patient4();
+ }
+
+ public void testDeactivateActivatedPatient() throws Exception {
+ long pid = 4;
+ assertEquals("patient", patientDAO.getRole(pid));
+ EditPatientAction action = new EditPatientAction(TestDAOFactory.getTestInstance(), pid, Long.toString(pid));
+ action.deactivate();
+ assertEquals("deactivatedPatient", patientDAO.getRole(pid));
+ assertEquals(new SimpleDateFormat("MM/dd/yyyy").format(Calendar.getInstance().getTime()), patientDAO.getPatient(pid).getDateOfDeactivationStr());
+ }
+
+ public void testDeactivatePreregisteredPatient() throws Exception {
+ long pid = 92;
+ assertEquals("preRegisteredPatient", patientDAO.getRole(pid));
+ EditPatientAction action = new EditPatientAction(TestDAOFactory.getTestInstance(), pid, Long.toString(pid));
+ action.deactivate();
+ assertEquals("deactivatedPatient", patientDAO.getRole(pid));
+ assertEquals(new SimpleDateFormat("MM/dd/yyyy").format(Calendar.getInstance().getTime()), patientDAO.getPatient(pid).getDateOfDeactivationStr());
+ }
+}
diff --git a/iTrust/test/edu/ncsu/csc/itrust/unit/action/ViewPreRegisteredPatientListActionTest.java b/iTrust/test/edu/ncsu/csc/itrust/unit/action/ViewPreRegisteredPatientListActionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d070b040d3221d58d39e2354318f4ff0910345da
--- /dev/null
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/action/ViewPreRegisteredPatientListActionTest.java
@@ -0,0 +1,48 @@
+package edu.ncsu.csc.itrust.unit.action;
+
+import junit.framework.TestCase;
+import edu.ncsu.csc.itrust.action.ViewPreRegisteredPatientListAction;
+import edu.ncsu.csc.itrust.beans.PatientBean;
+import edu.ncsu.csc.itrust.dao.DAOFactory;
+import edu.ncsu.csc.itrust.unit.datagenerators.TestDataGenerator;
+import edu.ncsu.csc.itrust.unit.testutils.TestDAOFactory;
+
+import java.util.List;
+
+public class ViewPreRegisteredPatientListActionTest extends TestCase {
+
+ private DAOFactory factory = TestDAOFactory.getTestInstance();
+ private ViewPreRegisteredPatientListAction action;
+ private TestDataGenerator gen;
+
+ @Override
+ protected void setUp() throws Exception {
+ gen = new TestDataGenerator();
+ gen.clearAllTables();
+ }
+
+ public void testViewPatients() throws Exception {
+ long hcpMID = 900000000;
+ action = new ViewPreRegisteredPatientListAction(factory, hcpMID);
+ List<PatientBean> pb = action.getPreRegisteredPatients();
+ assertEquals(0, pb.size());
+
+ pb = action.getPreRegisteredPatients();
+ assertEquals(0, pb.size());
+ }
+
+ public void testNoPersonnel() throws Exception {
+
+ long hcpMID = 900000000;
+
+ action = new ViewPreRegisteredPatientListAction(factory, hcpMID);
+ List<PatientBean> pb = action.getPreRegisteredPatients();
+ 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/dao/patient/ActivatePatientTest.java b/iTrust/test/edu/ncsu/csc/itrust/unit/dao/patient/ActivatePatientTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..2b970a88451cf1bd711e36b755bd7d2bde72d246
--- /dev/null
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/dao/patient/ActivatePatientTest.java
@@ -0,0 +1,34 @@
+package edu.ncsu.csc.itrust.unit.dao.patient;
+
+import junit.framework.TestCase;
+import edu.ncsu.csc.itrust.dao.mysql.PatientDAO;
+import edu.ncsu.csc.itrust.unit.datagenerators.TestDataGenerator;
+import edu.ncsu.csc.itrust.unit.testutils.TestDAOFactory;
+import edu.ncsu.csc.itrust.action.EditPatientAction;
+
+public class ActivatePatientTest extends TestCase {
+ private TestDataGenerator gen = new TestDataGenerator();
+ private PatientDAO patientDAO = TestDAOFactory.getTestInstance().getPatientDAO();
+
+ @Override
+ protected void setUp() throws Exception {
+ gen.clearAllTables();
+ gen.patient92();
+ gen.patient4();
+ }
+
+ public void testActivateNewPatient() throws Exception {
+ long pid = 92;
+ assertEquals("preRegisteredPatient", patientDAO.getRole(pid));
+ patientDAO.ConvertPreRegisteredPatientsToPatient(pid);
+ assertEquals("patient", patientDAO.getRole(pid));
+ }
+
+ public void testActivateActionPatient() throws Exception {
+ long pid = 92;
+ assertEquals("preRegisteredPatient", patientDAO.getRole(pid));
+ EditPatientAction action = new EditPatientAction(TestDAOFactory.getTestInstance(), pid, Long.toString(pid));
+ action.activate();
+ assertEquals("patient", patientDAO.getRole(pid));
+ }
+}
diff --git a/iTrust/test/edu/ncsu/csc/itrust/unit/dao/patient/DeactivatePatientTest.java b/iTrust/test/edu/ncsu/csc/itrust/unit/dao/patient/DeactivatePatientTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..88968669428cf848811a360408b5de697b4102e4
--- /dev/null
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/dao/patient/DeactivatePatientTest.java
@@ -0,0 +1,42 @@
+package edu.ncsu.csc.itrust.unit.dao.patient;
+
+import junit.framework.TestCase;
+import edu.ncsu.csc.itrust.dao.mysql.PatientDAO;
+import edu.ncsu.csc.itrust.unit.datagenerators.TestDataGenerator;
+import edu.ncsu.csc.itrust.unit.testutils.TestDAOFactory;
+
+public class DeactivatePatientTest extends TestCase {
+
+ private TestDataGenerator gen = new TestDataGenerator();
+ private PatientDAO patientDAO = TestDAOFactory.getTestInstance().getPatientDAO();
+
+ @Override
+ protected void setUp() throws Exception {
+ gen.clearAllTables();
+ gen.patient92();
+ gen.patient4();
+ }
+
+ public void testDeactivateActivatedPatient() throws Exception {
+ long pid = 4;
+ assertEquals("patient", patientDAO.getRole(pid));
+ patientDAO.deactivatePatient(pid);
+ assertEquals("deactivatedPatient", patientDAO.getRole(pid));
+ }
+
+ public void testDeactivatePreregisteredPatient() throws Exception {
+ long pid = 92;
+ assertEquals("preRegisteredPatient", patientDAO.getRole(pid));
+ patientDAO.deactivatePatient(pid);
+ assertEquals("deactivatedPatient", patientDAO.getRole(pid));
+ }
+
+ public void testDeactivateThenActivatePatient() throws Exception {
+ long pid = 92;
+ assertEquals("preRegisteredPatient", patientDAO.getRole(pid));
+ patientDAO.ConvertPreRegisteredPatientsToPatient(pid);
+ assertEquals("patient", patientDAO.getRole(pid));
+ patientDAO.deactivatePatient(pid);
+ assertEquals("deactivatedPatient", patientDAO.getRole(pid));
+ }
+}
diff --git a/iTrust/test/edu/ncsu/csc/itrust/unit/dao/patient/GetRoleTest.java b/iTrust/test/edu/ncsu/csc/itrust/unit/dao/patient/GetRoleTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..c1d9869299d41db62ecf38122147b04bd95e7f4a
--- /dev/null
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/dao/patient/GetRoleTest.java
@@ -0,0 +1,45 @@
+package edu.ncsu.csc.itrust.unit.dao.patient;
+
+import junit.framework.TestCase;
+import edu.ncsu.csc.itrust.dao.mysql.PatientDAO;
+import edu.ncsu.csc.itrust.unit.datagenerators.TestDataGenerator;
+import edu.ncsu.csc.itrust.unit.testutils.TestDAOFactory;
+
+public class GetRoleTest extends TestCase {
+ private PatientDAO patientDAO = TestDAOFactory.getTestInstance().getPatientDAO();
+ private TestDataGenerator gen;
+
+ @Override
+ protected void setUp() throws Exception {
+ gen = new TestDataGenerator();
+ gen.clearAllTables();
+ gen.patient92();
+ gen.patient4();
+ gen.patient21();
+ }
+
+ public void testGetRole() throws Exception {
+ String role = patientDAO.getRole(92);
+ assertEquals("preRegisteredPatient", role);
+ }
+
+ public void testAnotherRole() throws Exception {
+ String role = patientDAO.getRole(4);
+ assertEquals("patient", role);
+ }
+
+ public void testNotRole() throws Exception {
+ String role = patientDAO.getRole(21);
+ assertEquals("patient", role);
+ }
+
+ public void testNonExistent() throws Exception {
+ try {
+ String role = patientDAO.getRole(9999999);
+ fail("This shouldn't ever be reached");
+ } catch (Exception e) {
+ assertEquals("User does not exist with the designated role", e.getMessage());
+ }
+ }
+
+}
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 61e7853a3894eed21bc53b6fe00a1d7be91c2f74..f8e2e19bd30d4355e1f308a9618badeca8236114 100644
--- a/iTrust/test/edu/ncsu/csc/itrust/unit/datagenerators/TestDataGenerator.java
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/datagenerators/TestDataGenerator.java
@@ -690,6 +690,10 @@ public class TestDataGenerator {
new DBBuilder(factory).executeSQLFile(DIR + "/patient42.sql");
}
+ public void patient92() throws FileNotFoundException, SQLException, IOException {
+ new DBBuilder(factory).executeSQLFile(DIR + "/patient92.sql");
+ }
+
/**
* Adds patient Anakin Skywalker for UC10 and UC37 testing purposes.
*
@@ -781,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 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 {
@@ -953,14 +957,14 @@ 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,
+ }
+
+ public void malaria_epidemic2() throws SQLException, FileNotFoundException,
IOException {
new DBBuilder(factory).executeSQLFile(DIR + "/malariaEpidemic2.sql");
- }
-
- public void malaria_epidemic3() throws SQLException, FileNotFoundException,
+ }
+
+ public void malaria_epidemic3() throws SQLException, FileNotFoundException,
IOException {
new DBBuilder(factory).executeSQLFile(DIR + "/malariaEpidemic3.sql");
}