add date checking in search

admin/application/models/Webservice_model.php

@@ -1122,34 +1122,63 @@ class Webservice_model extends CI_Model {
 		//print_r($this->db->last_query());die();
 		if ($query->num_rows() > 0) {
 			$querys = $query->result_array();
+			//echo "<pre>";print_r($querys);exit();
 			if(isset($data['date']) && strlen($data['date'])){
 				$day = date('D',$data['date']);
 				$day = strtolower($day);
 				$date = $data['date'];
-				$leave_query = $this->db->query("SELECT * FROM `tbl_doctor_leave` WHERE NOT($date > `tbl_doctor_leave`.`start_date` OR $date < `tbl_doctor_leave`.`end_date`)")->result();
-			}
-			if($leave_query){
-				foreach ($leave_query as $key => $value) {
-					foreach ($querys as $keys => $values) {
-						if(($values['doctor_id'] == $value->doctor_id ) && ($values['clinic_id'] == $value->clinic_id)){
-							unset($querys[$keys]);
-						}else{
-							$consult = $this->db->get_where('tbl_consultation',array('clinic_id'=>$values['clinic_id'],'doctor_id'=>$values['doctor_id']))->row();
-							if($consult){
-								if($consult->date != '' || $consult->date != '""'){
-									$consult_date = json_decode($consult->date);
-									if($consult_date['day'] != $day){
+				$leave_query = $this->db->query("SELECT * FROM `tbl_doctor_leave` WHERE ($date >= `tbl_doctor_leave`.`start_date` AND $date <= `tbl_doctor_leave`.`end_date`)")->result();
+				//echo $this->db->last_query();
+				if($leave_query){
+					//echo"s";
+					foreach ($leave_query as $key => $value) {
+						foreach ($querys as $keys => $values) {
+							if(($values['doctor_id'] == $value->doctor_id ) && ($values['clinic_id'] == $value->clinic_id)){
+								//echo"n".$values['clinic_id'].'-'.$values['doctor_id']."<br>";
+								unset($querys[$keys]);
+							}else{
+								//echo"s".$values['clinic_id'].'-'.$values['doctor_id'];
+								$consult = $this->db->get_where('tbl_consultation',array('clinic_id'=>$values['clinic_id'],'doctor_id'=>$values['doctor_id']))->row();
+								if($consult){
+									if($consult->date != '""'){
+										$consult_date = json_decode($consult->date);
+										foreach ($consult_date as $consult_key => $consult_value) {
+											$new_array_day = array();
+											$new_array_day[] = $consult_value->day;
+										}
+									//	print_r($new_array_day);
+										if(!in_array($day, $new_array_day)){
+											unset($querys[$keys]);
+										}
+									}else{
 										unset($querys[$keys]);
 									}
-								}else{
+								}
+							}
+						}
+					}
+				}else{
+					//echo"n";
+					foreach ($querys as $keys => $values) {
+						
+						$consult = $this->db->get_where('tbl_consultation',array('clinic_id'=>$values['clinic_id'],'doctor_id'=>$values['doctor_id']))->row();
+						if($consult){
+							if($consult->date != '""'){
+								$consult_date = json_decode($consult->date);
+								foreach ($consult_date as $consult_key => $consult_value) {
+									$new_array_day[] = $consult_value->day;
+								}
+								if(!in_array($day, $new_array_day)){
 									unset($querys[$keys]);
 								}
+							}else{
+								unset($querys[$keys]);
 							}
 						}
 					}
 				}
 			}
-			//print_r($querys);exit();
+			//echo"<pre>";print_r($querys);exit();
 			$return_array = array('status'=>'success','data'=>$querys);
 		}
 		else{