Merge branch 'jansa'

admin/application/controllers/Webservice.php

@@ -1630,6 +1630,7 @@ class Webservice extends CI_Controller {
 											if($end <= $end_time && ($initial > strtotime($nowin_server_addoffset))){
 												$time = date('h:i a',$initial).' - '.date('h:i a',$end);
 												$result = $this->Webservice_model->is_waiting_list_used($data,$time);
+												print_r($result);exit();
 												if($result == false || count($result) <= 1){
 													array_push($res['data']['time_interval'], array('time'=>date('h:i a',$initial).' - '.date('h:i a',$end)));
 												}
@@ -1639,7 +1640,8 @@ class Webservice extends CI_Controller {
 									    if($end <= $end_time && ($initial > strtotime($nowin_server_addoffset))){
 									    	$time = date('h:i a',$initial).' - '.date('h:i a',$end);
 											$result = $this->Webservice_model->is_waiting_list_used($data,$time);
-											if($result != false || count($result) <= 1){
+											print_r($result);exit();
+											if($result == false || count($result) <= 1){
 													array_push($res['data']['time_interval'], array('time'=>date('h:i a',$initial).' - '.date('h:i a',$end)));
 											}
 										}

admin/application/models/Webservice_model.php

@@ -1879,6 +1879,7 @@ CASE when tbl_doctors.gender='0' then 'MALE' when tbl_doctors.gender='1' then 'F
 	
 	function is_waiting_list_used($data,$time){
 		$query = $this->db->get_where('tbl_booking',array('doctor_id'=>$data['doctor_id'],'clinic_id'=>$data['clinic_id'],'date'=>$data['date'],'time'=>$time))->result();
+		echo $this->db->last_query();
 		if(count($query) > 0){
 			return $query;
 		}else{