diff --git a/admin/displayappointments.php b/admin/displayappointments.php
index b3414027..8a8fefb7 100644
--- a/admin/displayappointments.php
+++ b/admin/displayappointments.php
@@ -56,18 +56,39 @@ include ("../functions/functions.input.php");
 
 if (isset($_GET['appointment_id']) && isset($_GET['case_id']))
 {
-	$appointment_id = bigintval($_GET['appointment_id']);
-	$case_id = bigintval($_GET['case_id']);
+	if (isset($_GET['delete']))
+	{
+		$appointment_id = bigintval($_GET['appointment_id']);
+		$case_id = bigintval($_GET['case_id']);
+	
+		$sql = "DELETE FROM appointment
+			WHERE appointment_id = '$appointment_id'";
+	
+		$db->Execute($sql);
+	
+		xhtml_head(T_("Now modify case outcome"));
+	
+		print "<p>" . T_("The appointment has been deleted. Now you must modify the case outcome") . "</p>";
+		print "<p><a href='supervisor.php?case_id=$case_id'>" . T_("Modify case outcome") . "</a></p>";
+	}
+	else if (isset($_GET['start']))
+	{
+		//Edit this appointment in the database
+			
 
-	$sql = "DELETE FROM appointment
-		WHERE appointment_id = '$appointment_id'";
+	}
+	else
+	{
+		//Display an edit form
+		xhtml_head(T_("Edit appointment"));
+		
 
-	$db->Execute($sql);
 
-	xhtml_head(T_("Now modify case outcome"));
+	}
+}
+else if (isset($_GET['new']))
+{
 
-	print "<p>" . T_("The appointment has been deleted. Now you must modify the case outcome") . "</p>";
-	print "<p><a href='supervisor.php?case_id=$case_id'>" . T_("Modify case outcome") . "</a></p>";
 
 }
 else
@@ -79,7 +100,7 @@ else
 	
 	print "<h1>" . T_("Appointments") . "</h1><h2>" . T_("All appointments (with times displayed in your time zone)") . "</h2>";
 	
-	$sql = "SELECT q.description, CONVERT_TZ(a.start,'UTC',o.Time_zone_name) as start, CONVERT_TZ(a.end,'UTC',o.Time_zone_name) as end, r.firstName, r.lastName, IFNULL(ou.description,'" . T_("Not yet called") . "') as outcome, oo.firstName as makerName, ooo.firstName as callerName, CONCAT('<a href=\'supervisor.php?case_id=', c.case_id, '\'>', c.case_id, '</a>') as case_id, CONCAT('<a href=\'?case_id=', c.case_id, '&amp;appointment_id=', a.appointment_id, '\'>". T_("Delete") . "</a>') as link
+	$sql = "SELECT q.description, CONVERT_TZ(a.start,'UTC',o.Time_zone_name) as start, CONVERT_TZ(a.end,'UTC',o.Time_zone_name) as end, r.firstName, r.lastName, IFNULL(ou.description,'" . T_("Not yet called") . "') as outcome, oo.firstName as makerName, ooo.firstName as callerName, CONCAT('<a href=\'supervisor.php?case_id=', c.case_id, '\'>', c.case_id, '</a>') as case_id, CONCAT('<a href=\'?case_id=', c.case_id, '&amp;appointment_id=', a.appointment_id, '&amp;delete=delete\'>". T_("Delete") . "</a>') as link
 		FROM appointment as a
 		JOIN (`case` as c, respondent as r, questionnaire as q, operator as o, operator as oo, call_attempt as cc) on (a.case_id = c.case_id and a.respondent_id = r.respondent_id and q.questionnaire_id = c.questionnaire_id and o.operator_id = '$operator_id' and a.call_attempt_id = cc.call_attempt_id and cc.operator_id =  oo.operator_id)
 		LEFT JOIN (`call` as ca, outcome as ou, operator as ooo) ON (ca.call_id = a.completed_call_id and ou.outcome_id = ca.outcome_id and ca.operator_id = ooo.operator_id)
diff --git a/admin/supervisor.php b/admin/supervisor.php
index d0d7e12a..e48f5ef9 100644
--- a/admin/supervisor.php
+++ b/admin/supervisor.php
@@ -168,7 +168,28 @@ if ($case_id != false)
 		print "<h2>". T_("Current outcome:") ." {$rs['description']}</h2>";
 
 		$current_outcome_id = $rs['outcome_id'];
-		
+
+
+		print "<h3>" . T_("Appointments")."</h3>";
+
+		//View appointments
+		$sql = "SELECT q.description, CONVERT_TZ(a.start,'UTC',o.Time_zone_name) as start, CONVERT_TZ(a.end,'UTC',o.Time_zone_name) as end, r.firstName, r.lastName, IFNULL(ou.description,'" . T_("Not yet called") . "') as outcome, oo.firstName as makerName, ooo.firstName as callerName, CONCAT('<a href=\'supervisor.php?case_id=', c.case_id, '\'>', c.case_id, '</a>') as case_id, CONCAT('<a href=\'displayappointments.php?case_id=', c.case_id, '&amp;appointment_id=', a.appointment_id, '&amp;delete=delete\'>". T_("Delete") . "</a>') as link
+		FROM appointment as a
+		JOIN (`case` as c, respondent as r, questionnaire as q, operator as o, operator as oo, call_attempt as cc) on (a.case_id = c.case_id and a.respondent_id = r.respondent_id and q.questionnaire_id = c.questionnaire_id and a.call_attempt_id = cc.call_attempt_id and cc.operator_id =  oo.operator_id)
+		LEFT JOIN (`call` as ca, outcome as ou, operator as ooo) ON (ca.call_id = a.completed_call_id and ou.outcome_id = ca.outcome_id and ca.operator_id = ooo.operator_id)
+		WHERE c.case_id = '$case_id'
+		GROUP BY a.appointment_id
+		ORDER BY a.start ASC";
+	
+		$rs = $db->GetAll($sql);
+	
+		if (!empty($rs))
+			xhtml_table($rs,array("description","start","end","makerName","firstName","lastName","outcome","callerName","link"),array(T_("Questionnaire"),T_("Start"),T_("End"),T_("Operator Name"),T_("Respondent Name"),T_("Surname"),T_("Current outcome"),T_("Operator who called"),T_("Delete")));
+		else
+			print "<p>" . T_("No appointments for this case") . "</p>";
+
+
+
 		//view calls and outcomes
 		$sql = "SELECT DATE_FORMAT(CONVERT_TZ(c.start,'UTC',r.Time_zone_name),'".DATE_TIME_FORMAT."') as start,CONVERT_TZ(c.end,'UTC',r.Time_zone_name) as end, op.firstName, op.lastName, o.description as des, CONCAT('<a href=\'?case_id=$case_id&amp;call_id=', c.call_id, '\'>". T_("Edit") . "</a>') as link, cp.phone as phone
 			FROM `call` as c