diff --git a/iTrust/.classpath b/iTrust/.classpath
index 2baf54a26f9305b98b933b077e839143c1bc8b2b..de701ebdf4ccdc802bccd60dec0f1fc4f4813257 100644
--- a/iTrust/.classpath
+++ b/iTrust/.classpath
@@ -1,27 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="test">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="test">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" path="target/generated-sources/annotations">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ <attribute name="ignore_optional_problems" value="true"/>
+ <attribute name="m2e-apt" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ <attribute name="ignore_optional_problems" value="true"/>
+ <attribute name="m2e-apt" value="true"/>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/iTrust/.project b/iTrust/.project
index 7b820d483d2063896df283a9489cef89b77dfe93..fc8bccfc0f87a2a249b31dafec52f01e217e4f90 100644
--- a/iTrust/.project
+++ b/iTrust/.project
@@ -45,4 +45,15 @@
<nature>net.sourceforge.metrics.nature</nature>
<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1605131018689</id>
+ <name></name>
+ <type>30</type>
+ <matcher>
+ <id>org.eclipse.core.resources.regexFilterMatcher</id>
+ <arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/iTrust/.settings/org.eclipse.jdt.apt.core.prefs b/iTrust/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..d4313d4b25e4b826b5efa4bed06fd69068761519
--- /dev/null
+++ b/iTrust/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/iTrust/.settings/org.eclipse.jdt.core.prefs b/iTrust/.settings/org.eclipse.jdt.core.prefs
index 13b3428acd87c3f94042e61eed221c15ce682bfa..c3e0df73b47f1231209e367585506af9c4b24f55 100644
--- a/iTrust/.settings/org.eclipse.jdt.core.prefs
+++ b/iTrust/.settings/org.eclipse.jdt.core.prefs
@@ -8,6 +8,10 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
diff --git a/iTrust/DBBuilder.launch b/iTrust/DBBuilder.launch
index 1fb151430e6028e1d3fefddc7939f8e1f3662bb7..27b8b6e3133ebc811fec023aed6a2877fdc0d7c2 100644
--- a/iTrust/DBBuilder.launch
+++ b/iTrust/DBBuilder.launch
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/iTrust/test/edu/ncsu/csc/itrust/unit/DBBuilder.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="edu.ncsu.csc.itrust.unit.DBBuilder"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="iTrust"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+ <listEntry value="/iTrust/test/edu/ncsu/csc/itrust/unit/DBBuilder.java"/>
+ </listAttribute>
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+ <listEntry value="1"/>
+ </listAttribute>
+ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+ <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="edu.ncsu.csc.itrust.unit.DBBuilder"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="iTrust"/>
+ <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>
diff --git a/iTrust/TestDataGenerator.launch b/iTrust/TestDataGenerator.launch
index dbccb1f459a0b769a072cc960c5e243cf6052777..2f535a3923afb8ca29cc30a55a3ad134a5cd24bf 100644
--- a/iTrust/TestDataGenerator.launch
+++ b/iTrust/TestDataGenerator.launch
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/iTrust/test/edu/ncsu/csc/itrust/unit/datagenerators/TestDataGenerator.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="edu.ncsu.csc.itrust.unit.datagenerators.TestDataGenerator"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="iTrust"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+ <listEntry value="/iTrust/test/edu/ncsu/csc/itrust/unit/datagenerators/TestDataGenerator.java"/>
+ </listAttribute>
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+ <listEntry value="1"/>
+ </listAttribute>
+ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+ <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="edu.ncsu.csc.itrust.unit.datagenerators.TestDataGenerator"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="iTrust"/>
+ <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>
diff --git a/iTrust/WebRoot/auth/patient/cancelApptPatient.jsp b/iTrust/WebRoot/auth/patient/cancelApptPatient.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..e515680dbb16bd005aa3eee00f5f7493803cddd5
--- /dev/null
+++ b/iTrust/WebRoot/auth/patient/cancelApptPatient.jsp
@@ -0,0 +1,147 @@
+<%@page import="java.text.ParseException"%>
+<%@page import="java.util.Date"%>
+<%@page import="java.text.DateFormat"%>
+<%@page import="java.text.SimpleDateFormat"%>
+<%@page import="edu.ncsu.csc.itrust.action.EditApptAction"%>
+<%@page import="edu.ncsu.csc.itrust.action.EditApptTypeAction"%>
+<%@page import="edu.ncsu.csc.itrust.beans.ApptBean"%>
+<%@page import="edu.ncsu.csc.itrust.beans.ApptTypeBean"%>
+<%@page import="edu.ncsu.csc.itrust.dao.mysql.ApptTypeDAO"%>
+<%@page errorPage="/auth/exceptionHandler.jsp"%>
+<%@page import="java.util.List"%>
+<%@page import="edu.ncsu.csc.itrust.action.ViewMyApptsAction"%>
+<%@page import="edu.ncsu.csc.itrust.exception.FormValidationException"%>
+<%@page import="edu.ncsu.csc.itrust.exception.ITrustException"%>
+
+<%@include file="/global.jsp"%>
+
+<%
+ pageTitle = "iTrust - Appointment Requests";
+%>
+<%@include file="/header.jsp"%>
+<%
+ EditApptAction editAction = new EditApptAction(prodDAO, loggedInMID.longValue());
+ ApptTypeDAO apptTypeDAO = prodDAO.getApptTypeDAO();
+ String msg = "";
+ long hcpid = 0L;
+ String comment = "";
+ String date = "";
+ String hourI = "";
+ String minuteI = "";
+ String tod = "";
+ String apptType = "";
+ String prompt = "";
+
+ ApptBean original = null;
+ String aptParameter = "";
+ if (request.getParameter("apt") != null) {
+ aptParameter = request.getParameter("apt");
+ try {
+ int apptID = Integer.parseInt(aptParameter);
+ original = editAction.getAppt(apptID);
+ if (original == null){
+ response.sendRedirect("viewMyAppts.jsp");
+ }
+ } catch (NullPointerException npe) {
+ response.sendRedirect("viewMyAppts.jsp");
+ } catch (NumberFormatException e) {
+ // Handle Exception
+ response.sendRedirect("viewMyAppts.jsp");
+ }
+ } else {
+ response.sendRedirect("viewMyAppts.jsp");
+ }
+
+ Long patientID = 0L;
+ if (session.getAttribute("pid") != null) {
+ String pidString = (String) session.getAttribute("pid");
+ patientID = Long.parseLong(pidString);
+ try {
+ editAction.getName(patientID);
+ } catch (ITrustException ite) {
+ patientID = 0L;
+ }
+ }
+
+ boolean hideForm = false;
+ boolean error = false;
+ String hidden = "";
+
+ Date oldDate = new Date(original.getDate().getTime());
+ DateFormat dFormat = new SimpleDateFormat("MM/dd/yyyy");
+ DateFormat tFormat = new SimpleDateFormat("hhmma");
+ String hPart = tFormat.format(oldDate).substring(0,2);
+ String mPart = tFormat.format(oldDate).substring(2,4);
+ String aPart = tFormat.format(oldDate).substring(4);
+
+ String lastSchedDate=dFormat.format(oldDate);
+ String lastApptType=original.getComment();
+ String lastTime1=hPart;
+ String lastTime2=mPart;
+ String lastTime3=aPart;
+ String lastComment=original.getComment();
+ if(lastComment == null) lastComment="";
+
+ if (request.getParameter("editAppt") != null && request.getParameter("apptID") != null) {
+ String headerMessage = "";
+ if (request.getParameter("editAppt").equals("Remove")) {
+ // Delete the appointment
+ ApptBean appt = new ApptBean();
+ appt.setApptID(Integer.parseInt(request.getParameter("apptID")));
+ headerMessage = editAction.removeAppt(appt);
+ if(headerMessage.startsWith("Success")) {
+ hideForm = true;
+ session.removeAttribute("pid");
+ loggingAction.logEvent(TransactionType.APPOINTMENT_REMOVE,
+ loggedInMID.longValue(), original.getPatient(), ""+original.getApptID());
+%>
+ <div align=center>
+ <span class="iTrustMessage"><%=StringEscapeUtils.escapeHtml(headerMessage)%></span>
+ </div>
+<%
+ } else {
+%>
+ <div align=center>
+ <span class="iTrustError"><%=StringEscapeUtils.escapeHtml(headerMessage)%></span>
+ </div>
+<%
+ }
+ }
+ }
+%>
+<h1>Cancel Existing Appointment</h1>
+<%
+ if (msg.contains("ERROR")) {
+%>
+ <span class="iTrustError"><%=msg%></span>
+<%
+ } else {
+%>
+ <span class="iTrustMessage"><%=msg%></span>
+<%
+ }
+%>
+<%=prompt%>
+<%
+ Date d = new Date(original.getDate().getTime());
+ DateFormat format = new SimpleDateFormat("MM/dd/yyyy hh:mm a");
+%>
+<div>
+ <h4>The following appointment will be canceled by pressing the "Cancel Appointment" button.</h4>
+ <p><b>Patient:</b> <%= StringEscapeUtils.escapeHtml("" + ( editAction.getName(original.getPatient()) )) %></p>
+ <p><b>HCP:</b> <%= StringEscapeUtils.escapeHtml("" + ( editAction.getName(original.getHcp()) )) %></p>
+ <p><b>Type:</b> <%= StringEscapeUtils.escapeHtml("" + ( original.getApptType() )) %></p>
+ <p><b>Date/Time:</b> <%= StringEscapeUtils.escapeHtml("" + ( format.format(d) )) %></p>
+ <p><b>Duration:</b> <%= StringEscapeUtils.escapeHtml("" + ( apptTypeDAO.getApptType(original.getApptType()).getDuration()+" minutes" )) %></p>
+</div>
+<%
+ if(!hideForm){
+%>
+ <form id="mainForm" type="hidden" method="post" action="cancelApptPatient.jsp?apt=<%=aptParameter %>&apptID=<%=original.getApptID() %>">
+ <input type="submit" value="Cancel Appointment" name="editApptButton" id="removeButton" onClick="document.getElementById('editAppt').value='Remove';"/>
+ <input type="hidden" id="editAppt" name="editAppt" value=""/>
+ </form>
+<%
+ }
+%>
+<%@include file="/footer.jsp"%>
diff --git a/iTrust/WebRoot/auth/patient/editApptPatient.jsp b/iTrust/WebRoot/auth/patient/editApptPatient.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..499b6bfea423935448fde19f0b13687f1bda1b66
--- /dev/null
+++ b/iTrust/WebRoot/auth/patient/editApptPatient.jsp
@@ -0,0 +1,280 @@
+<%@page import="java.text.ParseException"%>
+<%@page import="java.sql.Timestamp"%>
+<%@page import="java.util.Date"%>
+<%@page import="java.text.DateFormat"%>
+<%@page import="java.text.SimpleDateFormat"%>
+<%@page import="edu.ncsu.csc.itrust.action.EditApptAction"%>
+<%@page import="edu.ncsu.csc.itrust.beans.ApptBean"%>
+<%@page import="edu.ncsu.csc.itrust.beans.ApptTypeBean"%>
+<%@page import="edu.ncsu.csc.itrust.dao.mysql.ApptTypeDAO"%>
+<%@page import="edu.ncsu.csc.itrust.beans.HCPVisitBean"%>
+<%@page import="edu.ncsu.csc.itrust.action.ViewVisitedHCPsAction"%>
+<%@page errorPage="/auth/exceptionHandler.jsp"%>
+<%@page import="edu.ncsu.csc.itrust.action.AddApptRequestAction"%>
+<%@page import="edu.ncsu.csc.itrust.beans.ApptRequestBean"%>
+<%@page import="java.util.List"%>
+<%@page import="edu.ncsu.csc.itrust.action.ViewMyApptsAction"%>
+<%@page import="edu.ncsu.csc.itrust.exception.FormValidationException"%>
+<%@page import="edu.ncsu.csc.itrust.exception.ITrustException"%>
+
+<%@include file="/global.jsp"%>
+
+<%
+ pageTitle = "iTrust - Appointment Requests";
+%>
+<%@include file="/header.jsp"%>
+<%
+ EditApptAction editAction = new EditApptAction(prodDAO, loggedInMID.longValue());
+ AddApptRequestAction action = new AddApptRequestAction(prodDAO); //ViewAppt in HCP
+ ViewVisitedHCPsAction hcpAction = new ViewVisitedHCPsAction(
+ prodDAO, loggedInMID.longValue()); //ViewAppt in HCP
+ List<HCPVisitBean> visits = hcpAction.getVisitedHCPs();
+
+ ApptTypeDAO apptTypeDAO = prodDAO.getApptTypeDAO();
+ List<ApptTypeBean> apptTypes = apptTypeDAO.getApptTypes();
+ String msg = "";
+ long hcpid = 0L;
+ String comment = "";
+ String date = "";
+ String hourI = "";
+ String minuteI = "";
+ String tod = "";
+ String apptType = "";
+ String prompt = "";
+
+ ViewMyApptsAction viewAction = new ViewMyApptsAction(prodDAO, loggedInMID.longValue());
+ ApptBean original = null;
+ String aptParameter = "";
+ if (request.getParameter("apt") != null) {
+ aptParameter = request.getParameter("apt");
+ try {
+ int apptID = Integer.parseInt(aptParameter);
+ original = editAction.getAppt(apptID);
+ if (original == null){
+ response.sendRedirect("viewMyApptsPatient.jsp");
+ }
+ } catch (NullPointerException npe) {
+ response.sendRedirect("viewMyApptsPatient.jsp");
+ } catch (NumberFormatException e) {
+ // Handle Exception
+ response.sendRedirect("viewMyApptsPatient.jsp");
+ }
+ } else {
+ response.sendRedirect("viewMyApptsPatient.jsp");
+ }
+
+ Long patientID = 0L;
+ if (session.getAttribute("pid") != null) {
+ String pidString = (String) session.getAttribute("pid");
+ patientID = Long.parseLong(pidString);
+ try {
+ editAction.getName(patientID);
+ } catch (ITrustException ite) {
+ patientID = 0L;
+ }
+ }
+
+ boolean hideForm = false;
+ Date oldDate = new Date(original.getDate().getTime());
+ DateFormat dFormat = new SimpleDateFormat("MM/dd/yyyy");
+ DateFormat tFormat = new SimpleDateFormat("hhmma");
+ String hPart = tFormat.format(oldDate).substring(0,2);
+ String mPart = tFormat.format(oldDate).substring(2,4);
+ String aPart = tFormat.format(oldDate).substring(4);
+
+ String lastSchedDate=dFormat.format(oldDate);
+ String lastApptType=original.getComment();
+ String lastTime1=hPart;
+ String lastTime2=mPart;
+ String lastTime3=aPart;
+ String lastComment=original.getComment();
+ if(lastComment == null) lastComment="";
+
+ if (request.getParameter("editAppt") != null && request.getParameter("apptID") != null) {
+ String headerMessage = "";
+ if (request.getParameter("editAppt").equals("Request")) {
+ ApptBean appt = new ApptBean();
+ appt.setPatient(loggedInMID);
+ hcpid = Long.parseLong(request.getParameter("lhcp"));
+ appt.setHcp(hcpid);
+ comment = request.getParameter("comment");
+ appt.setComment(comment);
+ SimpleDateFormat frmt = new SimpleDateFormat("MM/dd/yyyy hh:mm a");
+ date = request.getParameter("startDate");
+ date = date.trim();
+ hourI = request.getParameter("time1");
+ minuteI = request.getParameter("time2");
+ tod = request.getParameter("time3");
+ apptType = request.getParameter("apptType");
+ appt.setApptType(apptType);
+ try {
+ if(date.length() == 10){
+ Date d = frmt.parse(date + " " + hourI + ":" + minuteI + " " + tod);
+ appt.setDate(new Timestamp(d.getTime()));
+ if(appt.getDate().before(new Timestamp(System.currentTimeMillis()))){
+ msg = "ERROR: The scheduled date of this appointment has already passed.";
+ }
+ else {
+ ApptRequestBean req = new ApptRequestBean();
+ req.setRequestedAppt(appt);
+ msg = action.addApptRequest(req);
+ if (msg.contains("conflicts")) {
+ msg = "ERROR: " + msg;
+ frmt = new SimpleDateFormat("MM/dd/yyyy hh:mm a");
+ List<ApptBean> open = action.getNextAvailableAppts(3, appt);
+ prompt="<br/>The following nearby time slots are available:<br/>";
+ int index = 0;
+ for(ApptBean possible : open) {
+ index++;
+ String newDate = frmt.format(possible.getDate());
+ prompt += "<div style='padding:5px;margin:5px;float:left;border:1px solid black;'><b>Option ";
+ prompt += index+ "</b><br/>"+ frmt.format(possible.getDate());
+ prompt +="<form action='appointmentRequests.jsp' method='post'>"
+ +"<input type='hidden' name='lhcp' value='"+hcpid+"'/>"
+ +"<input type='hidden' name='apptType' value='"+apptType+"'/> "
+ +"<input type='hidden' name='startDate' value='"+newDate.substring(0,10)+"'/>"
+ +"<input type='hidden' name='time1' value='"+newDate.substring(11,13)+"'/>"
+ +"<input type='hidden' name='time2' value='"+newDate.substring(14,16)+"'/>"
+ +"<input type='hidden' name='time3' value='"+newDate.substring(17)+"'/>"
+ +"<input type='hidden' name='comment' value='"+comment+"'/>"
+ +"<input type='submit' name='request' value='Select this time'/>"
+ +"</form></div>";
+ }
+ prompt+="<div style='clear:both;'><br/></div>";
+ } else {
+ loggingAction.logEvent(
+ TransactionType.APPOINTMENT_REQUEST_SUBMITTED,
+ loggedInMID, hcpid, "");
+ }
+ }
+ } else {
+ msg = "ERROR: Date must by in the format: MM/dd/yyyy";
+ }
+ } catch (ParseException e) {
+ msg = "ERROR: Date must by in the format: MM/dd/yyyy";
+ }
+ }
+ }
+%>
+<h1>Request a New Appointment</h1>
+<%
+ if (msg.contains("ERROR")) {
+%>
+ <span class="iTrustError"><%=msg%></span>
+<%
+ } else {
+%>
+ <span class="iTrustMessage"><%=msg%></span>
+<%
+ }
+%>
+<%=prompt%>
+<%
+ Date d = new Date(original.getDate().getTime());
+ DateFormat format = new SimpleDateFormat("MM/dd/yyyy hh:mm a");
+%>
+<form id="mainForm" type="hidden" method="post" action="editApptPatient.jsp?apt=<%=aptParameter %>&apptID=<%=original.getApptID() %>">
+ <p>HCP:</p>
+ <select name="lhcp">
+<%
+ for(HCPVisitBean visit : visits){
+ if (visit.getHCPMID() == original.getHcp()){
+%>
+ <option selected="selected" value="<%=visit.getHCPMID()%>"><%=visit.getHCPName()%></option>
+<%
+ } else {
+%>
+ <option value="<%=visit.getHCPMID()%>"><%=visit.getHCPName()%></option>
+<%
+ }
+ }
+%>
+ </select>
+ <p>Appointment Type:</p>
+ <select name="apptType">
+<%
+ for (ApptTypeBean appt : apptTypes) {
+ if (appt.getName().equals(original.getApptType())) {
+%>
+ <option selected="selected" value="<%=appt.getName()%>"><%=appt.getName()%></option>
+<%
+ } else {
+%>
+ <option value="<%=appt.getName()%>"><%=appt.getName()%></option>
+<%
+ }
+ }
+ String startDate = "";
+%>
+ </select>
+ <p>Date:</p>
+ <%DateFormat format_1 = new SimpleDateFormat("MM/dd/yyyy");%>
+ <input name="startDate" value="<%=StringEscapeUtils.escapeHtml("" + ( format_1.format(d) )) %>">
+ <input type=button value="Select Date" onclick="displayDatePicker('startDate');">
+
+ <p>Time:</p>
+ <%DateFormat format_hour = new SimpleDateFormat("hh");%>
+ <%DateFormat format_minute = new SimpleDateFormat("mm");%>
+ <%DateFormat format_ampm = new SimpleDateFormat("a");%>
+ <select name="time1">
+<%
+ String hour = "";
+ for (int i = 1; i <= 12; i++) {
+ if (i < 10)
+ hour = "0" + i;
+ else
+ hour = i + "";
+ if (hour.equals((format_hour.format(d) ))) {
+%>
+ <option selected="selected" value="<%=hour%>"><%=StringEscapeUtils.escapeHtml("" + (hour))%></option>
+<%
+ } else {
+%>
+ <option value="<%=hour%>"><%=StringEscapeUtils.escapeHtml("" + (hour))%></option>
+<%
+ }
+ }
+%>
+ </select>:<select name="time2">
+<%
+ String min = "";
+ for (int i = 0; i < 60; i += 5) {
+ if (i < 10)
+ min = "0" + i;
+ else
+ min = i + "";
+ if (min.equals((format_minute.format(d) ))) {
+%>
+ <option selected="selected" value="<%=min%>"><%=StringEscapeUtils.escapeHtml("" + (min))%></option>
+<%
+ } else {
+%>
+ <option value="<%=min%>"><%=StringEscapeUtils.escapeHtml("" + (min))%></option>
+<%
+ }
+ }
+%>
+ </select> <select name="time3">
+<%
+ if (format_ampm.format(d).equals("AM")){
+%>
+ <option value="PM">PM</option>
+ <option selected="selected" value="AM">AM</option>
+<%
+ } else {
+%>
+ <option value="AM">AM</option>
+ <option selected="selected" value="PM">PM</option>
+<%
+ }
+%>
+ </select>
+ <p>Comment:</p>
+ <textarea name="comment" cols="100" rows="5"><%=StringEscapeUtils.escapeHtml("" + (comment))%></textarea>
+ <br />
+ <br />
+ <input type="hidden" id="editAppt" name="editAppt" value=""/>
+ <input type="submit" name="request" value="Request" onClick="document.getElementById('editAppt').value='Request'"/>
+</form>
+
+<%@include file="/footer.jsp"%>
diff --git a/iTrust/WebRoot/auth/patient/menu.jsp b/iTrust/WebRoot/auth/patient/menu.jsp
index 53a832e35cd3fb298d6919ab420f3eb43f17bad6..cd613b69cc9327af60c185b4968e0295d9379d6e 100644
--- a/iTrust/WebRoot/auth/patient/menu.jsp
+++ b/iTrust/WebRoot/auth/patient/menu.jsp
@@ -66,7 +66,7 @@
<div class="panel-body" id="appt-menu">
<ul class="nav nav-sidebar">
<li><a href="/iTrust/auth/patient/appointmentRequests.jsp">Appointment Requests</a>
- <li><a href="/iTrust/auth/patient/viewMyAppts.jsp">View My Appointments</a>
+ <li><a href="/iTrust/auth/patient/viewMyApptsPatient.jsp">View/Edit My Appointments</a>
</ul>
</div>
</div>
diff --git a/iTrust/WebRoot/auth/patient/viewMyApptsPatient.jsp b/iTrust/WebRoot/auth/patient/viewMyApptsPatient.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..84417ce546b84386d5fe740d262135bdd2e40a69
--- /dev/null
+++ b/iTrust/WebRoot/auth/patient/viewMyApptsPatient.jsp
@@ -0,0 +1,82 @@
+
+<%@page errorPage="/auth/exceptionHandler.jsp"%>
+
+<%@page import="java.util.List"%>
+<%@page import="java.util.Date"%>
+<%@page import="java.text.DateFormat"%>
+<%@page import="java.text.SimpleDateFormat"%>
+<%@page import="java.sql.Timestamp"%>
+<%@page import="edu.ncsu.csc.itrust.action.EditApptTypeAction"%>
+<%@page import="edu.ncsu.csc.itrust.action.ViewMyApptsAction"%>
+<%@page import="edu.ncsu.csc.itrust.beans.ApptBean"%>
+<%@page import="edu.ncsu.csc.itrust.dao.mysql.ApptTypeDAO"%>
+<%@page import="edu.ncsu.csc.itrust.dao.DAOFactory"%>
+
+<%@include file="/global.jsp" %>
+
+<%
+pageTitle = "iTrust - View My Messages";
+%>
+
+<%@include file="/header.jsp" %>
+
+<div align=center>
+ <h2>My Appointments</h2>
+<%
+ loggingAction.logEvent(TransactionType.APPOINTMENT_ALL_VIEW, loggedInMID.longValue(), 0, "");
+ ViewMyApptsAction action = new ViewMyApptsAction(prodDAO, loggedInMID.longValue());
+ ApptTypeDAO apptTypeDAO = prodDAO.getApptTypeDAO();
+ List<ApptBean> appts = action.getMyAppointments();
+ session.setAttribute("appts", appts);
+ if (appts.size() > 0) { %>
+ <table class="fTable">
+ <tr style="width:100%">
+ <th>HCP</th>
+ <th>Appointment Type</th>
+ <th>Appointment Date/Time</th>
+ <th>Duration</th>
+ <th>Comments</th>
+ <th>Change</th>
+ <th></th>
+ <th></th>
+ </tr>
+<%
+ List<ApptBean>conflicts = action.getAllConflicts(loggedInMID.longValue());
+ int index = 0;
+ for(ApptBean a : appts) {
+ String comment = "No Comment";
+ if(a.getComment() != null)
+ comment = "<a href='viewAppt.jsp?apt="+a.getApptID()+"'>Read Comment</a>";
+
+ Date d = new Date(a.getDate().getTime());
+ Date now = new Date();
+ DateFormat format = new SimpleDateFormat("MM/dd/yyyy hh:mm a");
+
+ String row = "<tr";
+ if(conflicts.contains(a))
+ row += " style='font-weight: bold;'";
+%>
+ <%=row+" "+((index%2 == 1)?"class=\"alt\"":"")+">"%>
+ <td><%= StringEscapeUtils.escapeHtml("" + ( action.getName(a.getHcp()) )) %></td>
+ <td><%= StringEscapeUtils.escapeHtml("" + ( a.getApptType() )) %></td>
+ <td><%= StringEscapeUtils.escapeHtml("" + ( format.format(d) )) %></td>
+ <td><%= StringEscapeUtils.escapeHtml("" + ( apptTypeDAO.getApptType(a.getApptType()).getDuration()+" minutes" )) %></td>
+ <td><%= comment %></td>
+ <td style="text-align:center;"><% if(d.after(now)){ %><a href="editApptPatient.jsp?apt=<%=a.getApptID() %>">Edit</a> <% } %></td>
+ <td style="text-align:center;">|</td>
+ <td style="text-align:center;"><% if(d.after(now)){ %><a href="cancelApptPatient.jsp?apt=<%=a.getApptID() %>">Cancel Appointment</a><%}%></td>
+ </tr>
+ <%
+ index ++;
+ }
+ %>
+ </table>
+<% } else { %>
+ <div>
+ <i>You have no Appointments</i>
+ </div>
+<% } %>
+ <br />
+</div>
+
+<%@include file="/footer.jsp" %>
diff --git a/iTrust/test/edu/ncsu/csc/itrust/selenium/EditApptPatientTest.java b/iTrust/test/edu/ncsu/csc/itrust/selenium/EditApptPatientTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..5aa1c513efdd3647b854ef49c81be11f91925a39
--- /dev/null
+++ b/iTrust/test/edu/ncsu/csc/itrust/selenium/EditApptPatientTest.java
@@ -0,0 +1,112 @@
+package edu.ncsu.csc.itrust.selenium;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.*;
+import org.openqa.selenium.*;
+import org.openqa.selenium.htmlunit.HtmlUnitDriver;
+
+import edu.ncsu.csc.itrust.enums.TransactionType;
+
+public class EditApptPatientTest extends iTrustSeleniumTest {
+ private HtmlUnitDriver driver;
+ private StringBuffer verificationErrors = new StringBuffer();
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ gen.clearAllTables();
+ gen.standardData();
+ driver = new HtmlUnitDriver();
+ driver.manage().timeouts().implicitlyWait(5, TimeUnit.SECONDS);
+ }
+
+ @Test
+ public void testSetPassedDate() throws Exception {
+ gen.uc22();
+ driver = (HtmlUnitDriver) login("1", "pw");
+ driver.setJavascriptEnabled(true);
+ assertEquals("iTrust - Patient Home", driver.getTitle());
+ driver.findElement(By.linkText("View/Edit My Appointments")).click();
+ assertLogged(TransactionType.APPOINTMENT_ALL_VIEW, 1L, 0L, "");
+ driver.findElements(By.tagName("td")).get(5).findElement(By.tagName("a")).click();
+ driver.findElement(By.name("startDate")).clear();
+ driver.findElement(By.name("startDate")).sendKeys("10/10/2009");
+ driver.findElement(By.name("request")).click();
+ assertTrue(driver.getPageSource().contains("The scheduled date of this appointment"));
+ assertTrue(driver.getPageSource().contains("has already passed"));
+ assertNotLogged(TransactionType.APPOINTMENT_EDIT, 1L, 100L, "");
+ }
+
+ @Test
+ public void testRemoveAppt() throws Exception {
+ gen.uc22();
+ driver = (HtmlUnitDriver) login("1", "pw");
+ driver.setJavascriptEnabled(true);
+ assertEquals("iTrust - Patient Home", driver.getTitle());
+ driver.findElement(By.linkText("View/Edit My Appointments")).click();
+ assertLogged(TransactionType.APPOINTMENT_ALL_VIEW, 1L, 0L, "");
+ driver.findElements(By.tagName("td")).get(7).findElement(By.tagName("a")).click();
+ driver.findElement(By.id("removeButton")).click();
+ assertTrue(driver.getPageSource().contains("Success: Appointment removed"));
+ assertLoggedNoSecondary(TransactionType.APPOINTMENT_REMOVE, 1L, 0L, "");
+ }
+
+ @Test
+ public void testConflictingDate() throws Exception {
+ driver = (HtmlUnitDriver) login("1", "pw");
+ driver.setJavascriptEnabled(true);
+ assertEquals("iTrust - Patient Home", driver.getTitle());
+ driver.findElement(By.linkText("View/Edit My Appointments")).click();
+ assertLogged(TransactionType.APPOINTMENT_ALL_VIEW, 1L, 0L, "");
+ driver.findElements(By.tagName("td")).get(5).findElement(By.tagName("a")).click();
+ assertEquals("iTrust - Appointment Requests", driver.getTitle());
+ assertTrue(driver.getPageSource().contains("Kelly Doctor"));
+ assertTrue(driver.getPageSource().contains("Consultation"));
+ assertTrue(driver.getPageSource().contains("2020"));
+ assertTrue(driver.getPageSource().contains("09"));
+ assertTrue(driver.getPageSource().contains("10"));
+ assertTrue(driver.getPageSource().contains("AM"));
+ driver.findElement(By.name("comment")).clear();
+ driver.findElement(By.name("comment")).sendKeys("New comment!");
+ driver.findElement(By.name("request")).click();
+ assertTrue(driver.getPageSource()
+ .contains("ERROR: The appointment you requested conflicts with other existing appointments"));
+ driver.findElements(By.tagName("input")).get(7).click();
+ assertTrue(driver.getPageSource().contains("Your appointment request has been saved and is pending"));
+ assertLogged(TransactionType.APPOINTMENT_REQUEST_SUBMITTED, 1L, 9000000000L, "");
+ }
+
+ @Test
+ public void testEditAppt() throws Exception {
+ driver = (HtmlUnitDriver) login("1", "pw");
+ driver.setJavascriptEnabled(true);
+ assertEquals("iTrust - Patient Home", driver.getTitle());
+ driver.findElement(By.linkText("View/Edit My Appointments")).click();
+ assertLogged(TransactionType.APPOINTMENT_ALL_VIEW, 1L, 0L, "");
+ driver.findElements(By.tagName("td")).get(5).findElement(By.tagName("a")).click();
+ assertEquals("iTrust - Appointment Requests", driver.getTitle());
+ assertTrue(driver.getPageSource().contains("Kelly Doctor"));
+ assertTrue(driver.getPageSource().contains("Consultation"));
+ assertTrue(driver.getPageSource().contains("2020"));
+ assertTrue(driver.getPageSource().contains("09"));
+ assertTrue(driver.getPageSource().contains("10"));
+ assertTrue(driver.getPageSource().contains("AM"));
+ driver.findElement(By.name("comment")).clear();
+ driver.findElement(By.name("comment")).sendKeys("New comment!");
+ driver.findElement(By.name("startDate")).clear();
+ driver.findElement(By.name("startDate")).sendKeys("12/20/2021");
+ driver.findElement(By.name("request")).click();
+ assertTrue(driver.getPageSource().contains("Your appointment request has been saved and is pending"));
+ assertLogged(TransactionType.APPOINTMENT_REQUEST_SUBMITTED, 1L, 9000000000L, "");
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ driver.quit();
+ String verificationErrorString = verificationErrors.toString();
+ if (!"".equals(verificationErrorString)) {
+ fail(verificationErrorString);
+ }
+ }
+}
\ No newline at end of file
diff --git a/iTrust/test/edu/ncsu/csc/itrust/unit/action/CancelApptPatientActionTest.java b/iTrust/test/edu/ncsu/csc/itrust/unit/action/CancelApptPatientActionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d9ef05c115f35b6ede55c689767c61c51ad03432
--- /dev/null
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/action/CancelApptPatientActionTest.java
@@ -0,0 +1,199 @@
+package edu.ncsu.csc.itrust.unit.action;
+
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import edu.ncsu.csc.itrust.action.EditApptAction;
+import edu.ncsu.csc.itrust.action.ViewMyApptsAction;
+import edu.ncsu.csc.itrust.beans.ApptBean;
+import edu.ncsu.csc.itrust.dao.DAOFactory;
+import edu.ncsu.csc.itrust.exception.DBException;
+import edu.ncsu.csc.itrust.exception.FormValidationException;
+import edu.ncsu.csc.itrust.exception.ITrustException;
+import edu.ncsu.csc.itrust.unit.datagenerators.TestDataGenerator;
+import edu.ncsu.csc.itrust.unit.testutils.EvilDAOFactory;
+import edu.ncsu.csc.itrust.unit.testutils.TestDAOFactory;
+import junit.framework.TestCase;
+
+public class CancelApptPatientActionTest extends TestCase {
+ private EditApptAction editAction;
+ private EditApptAction evilAction;
+ private ViewMyApptsAction viewAction;
+ private DAOFactory factory;
+ private DAOFactory evilFactory;
+ private long hcpId = 9000000000L;
+
+ @Override
+ protected void setUp() throws Exception {
+ TestDataGenerator gen = new TestDataGenerator();
+ gen.clearAllTables();
+ gen.hcp0();
+ gen.patient42();
+ gen.appointment();
+ gen.appointmentType();
+ gen.uc22();
+
+ this.factory = TestDAOFactory.getTestInstance();
+ this.evilFactory = EvilDAOFactory.getEvilInstance();
+ this.evilAction = new EditApptAction(this.evilFactory, this.hcpId);
+ this.editAction = new EditApptAction(this.factory, this.hcpId);
+ this.viewAction = new ViewMyApptsAction(this.factory, this.hcpId);
+ }
+
+ public void testRemoveAppt() throws Exception {
+ List<ApptBean> appts = viewAction.getMyAppointments();
+ int size = appts.size();
+ assertEquals("Success: Appointment removed", editAction.removeAppt(appts.get(0)));
+ assertEquals(size - 1, viewAction.getMyAppointments().size());
+ editAction.removeAppt(appts.get(0));
+ }
+
+ public void testGetAppt() throws Exception, DBException {
+ List<ApptBean> appts = viewAction.getMyAppointments();
+ ApptBean b1 = appts.get(0);
+ ApptBean b2 = editAction.getAppt(b1.getApptID());
+ ApptBean b3 = new ApptBean();
+
+ b3 = editAction.getAppt(1234567891);
+
+ assertTrue(b3 == null);
+
+ assertEquals(b1.getApptID(), b2.getApptID());
+ assertEquals(b1.getApptType(), b2.getApptType());
+ assertEquals(b1.getComment(), b2.getComment());
+ assertEquals(b1.getHcp(), b2.getHcp());
+ assertEquals(b1.getPatient(), b2.getPatient());
+ assertEquals(b1.getClass(), b2.getClass());
+ assertEquals(b1.getDate(), b2.getDate());
+
+ try {
+
+ evilAction.getAppt(b1.getApptID());
+ } catch (DBException e) {
+ // success!
+ }
+
+ try {
+
+ evilAction.removeAppt(b1);
+ } catch (DBException e) {
+ // success!
+ }
+ }
+
+ /**
+ * testGetName
+ *
+ * @throws ITrustException
+ */
+ public void testGetName() throws ITrustException {
+ assertEquals("Kelly Doctor", editAction.getName(hcpId));
+ assertEquals("Bad Horse", editAction.getName(42));
+ }
+
+ /**
+ * testEditAppt
+ *
+ * @throws DBException
+ * @throws SQLException
+ * @throws FormValidationException
+ */
+ public void testEditAppt() throws DBException, SQLException, FormValidationException {
+ List<ApptBean> appts = viewAction.getAllMyAppointments();
+ ApptBean orig = appts.get(0);
+ ApptBean b = new ApptBean();
+ b.setApptID(orig.getApptID());
+ b.setDate(orig.getDate());
+ b.setApptType(orig.getApptType());
+ b.setHcp(orig.getHcp());
+ b.setPatient(orig.getPatient());
+ b.setComment("New comment!");
+
+ String s = editAction.editAppt(b, true);
+ assertTrue(s.contains("The scheduled date of this appointment"));
+ assertTrue(s.contains("has already passed"));
+
+ Date d = new Date();
+ boolean changed = false;
+ for (ApptBean aBean : appts) {
+ b = new ApptBean();
+ b.setApptID(aBean.getApptID());
+ b.setDate(aBean.getDate());
+ b.setApptType(aBean.getApptType());
+ b.setHcp(aBean.getHcp());
+ b.setPatient(aBean.getPatient());
+ b.setComment("New comment!");
+ d.setTime(aBean.getDate().getTime());
+ if (d.after(new Date())) {
+ s = editAction.editAppt(b, true);
+ assertEquals("Success: Appointment changed", s);
+ changed = true;
+ break;
+ }
+ }
+
+ if (!changed)
+ fail();
+ }
+
+ /**
+ * testEditApptConflict
+ *
+ * @throws Exception
+ */
+ public void testEditApptConflict() throws Exception {
+
+ Calendar c = Calendar.getInstance();
+ c.add(Calendar.DATE, 12);
+ c.set(Calendar.HOUR, 9);
+ c.set(Calendar.AM_PM, Calendar.AM);
+ c.set(Calendar.MINUTE, 45);
+
+ List<ApptBean> appts = viewAction.getMyAppointments();
+ ApptBean orig = appts.get(0);
+ ApptBean b = new ApptBean();
+ b.setApptID(orig.getApptID());
+ b.setDate(new Timestamp(c.getTimeInMillis()));
+ b.setApptType(orig.getApptType());
+ b.setHcp(orig.getHcp());
+ b.setPatient(orig.getPatient());
+
+ String s = editAction.editAppt(b, false);
+ assertTrue(s.contains("conflict"));
+
+ }
+
+ /**
+ * testEvilFactory
+ *
+ * @throws DBException
+ * @throws SQLException
+ * @throws FormValidationException
+ */
+ public void testEvilFactory() throws DBException, SQLException, FormValidationException {
+ this.editAction = new EditApptAction(EvilDAOFactory.getEvilInstance(), this.hcpId);
+ List<ApptBean> appts = viewAction.getMyAppointments();
+ ApptBean x = appts.get(0);
+ try {
+
+ editAction.editAppt(x, true);
+ } catch (DBException e) {
+ // this should pass if DBexception is thrown
+ }
+
+ try {
+
+ editAction.editAppt(x, true);
+ } catch (DBException e) {
+ // this should pass if DBexception is thrown
+ }
+ try {
+ assertEquals(null, editAction.getAppt(x.getApptID()));
+ } catch (DBException e) {
+ // this should pass if DBexception is thrown
+ }
+ }
+}
diff --git a/iTrust/test/edu/ncsu/csc/itrust/unit/action/EditApptPatientActionTest.java b/iTrust/test/edu/ncsu/csc/itrust/unit/action/EditApptPatientActionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..311a51eb7aeec903c41dae8118d632438f7ca9cd
--- /dev/null
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/action/EditApptPatientActionTest.java
@@ -0,0 +1,191 @@
+package edu.ncsu.csc.itrust.unit.action;
+
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import edu.ncsu.csc.itrust.action.EditApptAction;
+import edu.ncsu.csc.itrust.action.ViewMyApptsAction;
+import edu.ncsu.csc.itrust.beans.ApptBean;
+import edu.ncsu.csc.itrust.dao.DAOFactory;
+import edu.ncsu.csc.itrust.exception.DBException;
+import edu.ncsu.csc.itrust.exception.FormValidationException;
+import edu.ncsu.csc.itrust.exception.ITrustException;
+import edu.ncsu.csc.itrust.unit.datagenerators.TestDataGenerator;
+import edu.ncsu.csc.itrust.unit.testutils.EvilDAOFactory;
+import edu.ncsu.csc.itrust.unit.testutils.TestDAOFactory;
+import junit.framework.TestCase;
+
+public class EditApptPatientActionTest extends TestCase {
+ private EditApptAction editAction;
+ private EditApptAction evilAction;
+ private ViewMyApptsAction viewAction;
+ private DAOFactory factory;
+ private DAOFactory evilFactory;
+ private long hcpId = 9000000000L;
+
+ @Override
+ protected void setUp() throws Exception {
+ TestDataGenerator gen = new TestDataGenerator();
+ gen.clearAllTables();
+ gen.hcp0();
+ gen.patient42();
+ gen.appointment();
+ gen.appointmentType();
+ gen.uc22();
+
+ this.factory = TestDAOFactory.getTestInstance();
+ this.evilFactory = EvilDAOFactory.getEvilInstance();
+ this.evilAction = new EditApptAction(this.evilFactory, this.hcpId);
+ this.editAction = new EditApptAction(this.factory, this.hcpId);
+ this.viewAction = new ViewMyApptsAction(this.factory, this.hcpId);
+ }
+
+ public void testGetAppt() throws Exception, DBException {
+ List<ApptBean> appts = viewAction.getMyAppointments();
+ ApptBean b1 = appts.get(0);
+ ApptBean b2 = editAction.getAppt(b1.getApptID());
+ ApptBean b3 = new ApptBean();
+
+ b3 = editAction.getAppt(1234567891);
+
+ assertTrue(b3 == null);
+
+ assertEquals(b1.getApptID(), b2.getApptID());
+ assertEquals(b1.getApptType(), b2.getApptType());
+ assertEquals(b1.getComment(), b2.getComment());
+ assertEquals(b1.getHcp(), b2.getHcp());
+ assertEquals(b1.getPatient(), b2.getPatient());
+ assertEquals(b1.getClass(), b2.getClass());
+ assertEquals(b1.getDate(), b2.getDate());
+
+ try {
+
+ evilAction.getAppt(b1.getApptID());
+ } catch (DBException e) {
+ // success!
+ }
+
+ try {
+
+ evilAction.removeAppt(b1);
+ } catch (DBException e) {
+ // success!
+ }
+ }
+
+ /**
+ * testGetName
+ *
+ * @throws ITrustException
+ */
+ public void testGetName() throws ITrustException {
+ assertEquals("Kelly Doctor", editAction.getName(hcpId));
+ assertEquals("Bad Horse", editAction.getName(42));
+ }
+
+ /**
+ * testEditAppt
+ *
+ * @throws DBException
+ * @throws SQLException
+ * @throws FormValidationException
+ */
+ public void testEditAppt() throws DBException, SQLException, FormValidationException {
+ List<ApptBean> appts = viewAction.getAllMyAppointments();
+ ApptBean orig = appts.get(0);
+ ApptBean b = new ApptBean();
+ b.setApptID(orig.getApptID());
+ b.setDate(orig.getDate());
+ b.setApptType(orig.getApptType());
+ b.setHcp(orig.getHcp());
+ b.setPatient(orig.getPatient());
+ b.setComment("New comment!");
+
+ String s = editAction.editAppt(b, true);
+ assertTrue(s.contains("The scheduled date of this appointment"));
+ assertTrue(s.contains("has already passed"));
+
+ Date d = new Date();
+ boolean changed = false;
+ for (ApptBean aBean : appts) {
+ b = new ApptBean();
+ b.setApptID(aBean.getApptID());
+ b.setDate(aBean.getDate());
+ b.setApptType(aBean.getApptType());
+ b.setHcp(aBean.getHcp());
+ b.setPatient(aBean.getPatient());
+ b.setComment("New comment!");
+ d.setTime(aBean.getDate().getTime());
+ if (d.after(new Date())) {
+ s = editAction.editAppt(b, true);
+ assertEquals("Success: Appointment changed", s);
+ changed = true;
+ break;
+ }
+ }
+
+ if (!changed)
+ fail();
+ }
+
+ /**
+ * testEditApptConflict
+ *
+ * @throws Exception
+ */
+ public void testEditApptConflict() throws Exception {
+
+ Calendar c = Calendar.getInstance();
+ c.add(Calendar.DATE, 12);
+ c.set(Calendar.HOUR, 9);
+ c.set(Calendar.AM_PM, Calendar.AM);
+ c.set(Calendar.MINUTE, 45);
+
+ List<ApptBean> appts = viewAction.getMyAppointments();
+ ApptBean orig = appts.get(0);
+ ApptBean b = new ApptBean();
+ b.setApptID(orig.getApptID());
+ b.setDate(new Timestamp(c.getTimeInMillis()));
+ b.setApptType(orig.getApptType());
+ b.setHcp(orig.getHcp());
+ b.setPatient(orig.getPatient());
+
+ String s = editAction.editAppt(b, false);
+ assertTrue(s.contains("conflict"));
+
+ }
+
+ /**
+ * testEvilFactory
+ *
+ * @throws DBException
+ * @throws SQLException
+ * @throws FormValidationException
+ */
+ public void testEvilFactory() throws DBException, SQLException, FormValidationException {
+ this.editAction = new EditApptAction(EvilDAOFactory.getEvilInstance(), this.hcpId);
+ List<ApptBean> appts = viewAction.getMyAppointments();
+ ApptBean x = appts.get(0);
+ try {
+
+ editAction.editAppt(x, true);
+ } catch (DBException e) {
+ // this should pass if DBexception is thrown
+ }
+
+ try {
+
+ editAction.editAppt(x, true);
+ } catch (DBException e) {
+ // this should pass if DBexception is thrown
+ }
+ try {
+ assertEquals(null, editAction.getAppt(x.getApptID()));
+ } catch (DBException e) {
+ // this should pass if DBexception is thrown
+ }
+ }
+}
diff --git a/iTrust/tests.launch b/iTrust/tests.launch
index 97a6b657e4cb592d5f09f6f30e0e1d6e7c519c7c..1077c257316d0fdedb30255ed18f29ee7657f7b6 100644
--- a/iTrust/tests.launch
+++ b/iTrust/tests.launch
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/iTrust"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=iTrust/test"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="iTrust"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+ <listEntry value="/iTrust"/>
+ </listAttribute>
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+ <listEntry value="4"/>
+ </listAttribute>
+ <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=iTrust/test"/>
+ <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+ <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+ <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+ <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="iTrust"/>
+ <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>