From 760144b929040e602f3f83312f3dc25945d9809d Mon Sep 17 00:00:00 2001
From: Adam Zammit <adam.zammit@acspri.org.au>
Date: Tue, 4 Aug 2015 11:15:03 +1000
Subject: [PATCH] make sure appointment picker works even when no shifts
 defined

---
 admin/displayappointments.php                 | 23 ++++++++++++-------
 .../timepicker/jquery-ui-timepicker-addon.js  |  4 ++--
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/admin/displayappointments.php b/admin/displayappointments.php
index bfef4bb7..4b5d1d96 100644
--- a/admin/displayappointments.php
+++ b/admin/displayappointments.php
@@ -126,10 +126,17 @@ if ( (isset($_GET['appointment_id']) && isset($_GET['case_id'])) ||(isset($_GET[
 		if ($_GET['new'] == 'new'){$title = T_("Create NEW appointment");} else{$title = T_("Edit appointment"); $subtitle = "ID&ensp;" . $appointment_id;} 
 		
 		xhtml_head($title,true,$css,$js_head,false,false,false,$subtitle);
-		$lang = DEFAULT_LOCALE;
-		$sql = "SELECT CONVERT_TZ(NOW(),'SYSTEM',r.Time_zone_name) as startdate, CONVERT_TZ(s.end,'UTC',r.Time_zone_name) as enddate FROM `shift` as s, `case` as c, `respondent` as r WHERE s.questionnaire_id = c.questionnaire_id AND c.case_id = $case_id AND r.case_id = c.case_id ORDER BY  s.end DESC LIMIT 1";
-			$rs = $db->GetRow($sql); $startdate = $rs['startdate'];$enddate = $rs['enddate'];
-			
+
+    $lang = DEFAULT_LOCALE;
+
+    $sql = "SELECT  CONVERT_TZ(NOW(),'SYSTEM',r.Time_zone_name) as startdate, CONVERT_TZ(DATE_ADD(NOW(), INTERVAL 10 YEAR),'SYSTEM',r.Time_zone_name) as enddate
+                    FROM `case` as c, `respondent` as r 
+                    WHERE c.case_id = '$case_id' AND r.case_id = c.case_id";
+
+    $rs = $db->GetRow($sql); 
+    $startdate = $rs['startdate'];
+    $enddate = $rs['enddate'];
+
 		print "<script type='text/javascript'> 
 		$(document).ready(function() { var startDateTextBox = $('#start'); var endDateTextBox = $('#end');
 			$.timepicker.datetimeRange( 
@@ -140,13 +147,13 @@ if ( (isset($_GET['appointment_id']) && isset($_GET['case_id'])) ||(isset($_GET[
 				timeFormat: 'HH:mm:ss',
 				showSecond: false,
 				regional: '$lang',
-				hourMin: 9,
-				hourMax: 21,
+				hourMin: 0,
+				hourMax: 23,
 				stepMinute: 5,
 				hourGrid: 2,
 				minuteGrid: 10,
-				minDate: '$startdate',
-				maxDate: '$enddate',
+        minDate: '$startdate',
+        maxDate: '$enddate'
 				});});</script>";
 
 		if ($_GET['new'] =='new'){
diff --git a/include/timepicker/jquery-ui-timepicker-addon.js b/include/timepicker/jquery-ui-timepicker-addon.js
index 2249930b..65e05a00 100644
--- a/include/timepicker/jquery-ui-timepicker-addon.js
+++ b/include/timepicker/jquery-ui-timepicker-addon.js
@@ -28,7 +28,7 @@
 	*/
 	var Timepicker = function () {
 		this.regional = []; // Available regional settings, indexed by language code
-		this.regional['en'] = { // Default regional settings
+		this.regional[''] = { // Default regional settings
 			currentText: 'Now',
 			closeText: 'Done',
 			amNames: ['AM', 'A'],
@@ -104,7 +104,7 @@
 			defaultValue: null,
 			parse: 'strict'
 		};
-		$.extend(this._defaults, this.regional['en']);
+		$.extend(this._defaults, this.regional['']);
 	};
 
 	$.extend(Timepicker.prototype, {