Merge branch 'master' into client

admin/application/controllers/Webservice.php

@@ -1835,11 +1835,12 @@ class Webservice extends CI_Controller {
 							}else{
 								$db_day_array[] = [];
 							}
-						$time = strtotime($data['month']. $data['year']);
+						$getmonth = $this->Webservice_model->get_month($data['month']);
+						$time = strtotime($getmonth. $data['year']);
 
 						$search_form = date('Y-m-01',$time);
 				 		$search_to =  date('Y-m-t',$time);
-						$req_month_number = date('m',strtotime($data['month']));
+						$req_month_number = date('m',strtotime($getmonth));
 						$tod_month_number = date('m');
 						$month_today = date('F');
 				 		$year_today = date('Y');
@@ -1851,7 +1852,7 @@ class Webservice extends CI_Controller {
 								if(in_array($day, $db_day_array)){
 									if(count($result_booked['leave']) > 0){
 										foreach ($result_booked['leave'] as $key => $value) {
-											if((date('j',$value->start_date) <= date('j',strtotime($i))) && (date('j',$value->end_date) >= date('j',strtotime($i))) &&(date('F',$value->start_date) == $data['month']) && (date('F',$value->end_date) == $data['month']) && (date('Y',$value->start_date) == $data['year']) && (date('Y',$value->end_date) == $data['year'])) {
+											if((date('j',$value->start_date) <= date('j',strtotime($i))) && (date('j',$value->end_date) >= date('j',strtotime($i))) &&(date('F',$value->start_date) == $getmonth) && (date('F',$value->end_date) == $getmonth) && (date('Y',$value->start_date) == $data['year']) && (date('Y',$value->end_date) == $data['year'])) {
 												array_push($res['data']['not_available'], date('j',strtotime($i)));
 											}else{
 												if(strtotime($i) < strtotime($date_today)){
@@ -1909,6 +1910,11 @@ class Webservice extends CI_Controller {
 		}
 		print json_encode($res);
 	}
+
+	public function get_month($id){
+		if($id == '1'){ $res = 'January'; }else if($id == '2'){ $res = 'February'; }else if($id == '3'){ $res = 'March';  }else if($id == '4'){  $res = 'April'; }else if($id == '5'){  $res = 'May'; }else if($id == '6'){ $res = 'June';  }else if($id == '7'){ $res = 'July';  }else if($id == '8'){  $res = 'August'; }else if($id == '9'){ $res = 'September';  }else if($id == '10'){  $res = 'October'; }else if($id == '11'){  $res = 'November'; }else{ $res = 'December'; }
+		return $res;
+	}
 /*..........................................................................................*/
 /*....................................... booking list.......................................*/
 	
@@ -6747,12 +6753,7 @@ class Webservice extends CI_Controller {
 		}
 		print json_encode($res);
 	}
-											
-	function get_month($day){
-		if($day == '0'){$dayid = 'January';}elseif ($day == '1') {$dayid = 'February';}elseif ($day == '2') {$dayid = 'March';}elseif ($day == '3') {$dayid = 'April';}elseif ($day == '4') {$dayid = 'May';}elseif ($day == '5') {$dayid = 'June';}elseif ($day == '6') {$dayid = 'July';}elseif ($day == '7') {$dayid = 'August';}elseif ($day == '8') {$dayid = 'September';}elseif ($day == '9') {$dayid = 'October';}elseif ($day == '10') {$dayid = 'November';}elseif ($day == '11') {$dayid = 'December';}
-		return $dayid;
-	}
-	
+			
 	public function check_wait_listed(){
 		header('Content-type: application/json');
 

admin/application/models/Webservice_model.php

@@ -3468,6 +3468,11 @@ CASE when tbl_doctors.gender='0' then 'MALE' when tbl_doctors.gender='1' then 'F
 		return $result;
 	}
 
+	Public function get_month($day){
+		if($day == '1'){$dayid = 'January';}elseif ($day == '2') {$dayid = 'February';}elseif ($day == '3') {$dayid = 'March';}elseif ($day == '4') {$dayid = 'April';}elseif ($day == '5') {$dayid = 'May';}elseif ($day == '6') {$dayid = 'June';}elseif ($day == '7') {$dayid = 'July';}elseif ($day == '8') {$dayid = 'August';}elseif ($day == '9') {$dayid = 'September';}elseif ($day == '10') {$dayid = 'October';}elseif ($day == '11') {$dayid = 'November';}elseif ($day == '12') {$dayid = 'December';}
+		return $dayid;
+	}
+
 	
 	public function get_doctor_consultation_configuration($doctor_id){
 		$this->db->select('consultation_duration,price as consultation_price,domiciliary_status,accept_return,return_timeperiod as return_consultation_time_period');

application/controllers/Welcome.php

@@ -20,6 +20,7 @@ class Welcome extends CI_Controller {
 	 */
 	public function index()
 	{
-		$this->load->view('welcome_message');
+		phpinfo();
+		//$this->load->view('welcome_message');
 	}
 }

index.php

 <?php
+//phpinfo();exit();
 	ob_start();
     //date_default_timezone_set("Asia/Kolkata"); // Initial Time Zone
     date_default_timezone_set("UTC"); // UTC Time Zone