Commit a76cd177 by Jansa Jose

Merge branch 'jansa'

parents d0725c34 2c882a31
...@@ -1098,7 +1098,9 @@ class Webservice_model extends CI_Model { ...@@ -1098,7 +1098,9 @@ class Webservice_model extends CI_Model {
function review_list($id,$start,$per_page){ function review_list($id,$start,$per_page){
$this->db->join('tbl_registration','tbl_registration.id = tbl_review.reviewer_id'); $this->db->join('tbl_registration','tbl_registration.id = tbl_review.reviewer_id');
if($start != 0 || $per_page != 0){
$this->db->limit($per_page,$start); $this->db->limit($per_page,$start);
}
$query = $this->db->get_where("tbl_review",array("tbl_review.doctor_id"=>$id))->result_array(); $query = $this->db->get_where("tbl_review",array("tbl_review.doctor_id"=>$id))->result_array();
//echo $this->db->last_query();exit(); //echo $this->db->last_query();exit();
if(count($query)> 0){ if(count($query)> 0){
...@@ -1113,7 +1115,9 @@ class Webservice_model extends CI_Model { ...@@ -1113,7 +1115,9 @@ class Webservice_model extends CI_Model {
function review_list_clinic($id,$start,$per_page){ function review_list_clinic($id,$start,$per_page){
$this->db->join('tbl_registration','tbl_registration.id = tbl_review_clinic.reviewer_id'); $this->db->join('tbl_registration','tbl_registration.id = tbl_review_clinic.reviewer_id');
if($start != 0 || $per_page != 0){
$this->db->limit($per_page,$start); $this->db->limit($per_page,$start);
}
$query = $this->db->get_where("tbl_review_clinic",array("tbl_review_clinic.clinic_id"=>$id))->result_array(); $query = $this->db->get_where("tbl_review_clinic",array("tbl_review_clinic.clinic_id"=>$id))->result_array();
if(count($query)> 0){ if(count($query)> 0){
...@@ -1927,6 +1931,9 @@ class Webservice_model extends CI_Model { ...@@ -1927,6 +1931,9 @@ class Webservice_model extends CI_Model {
}else{ }else{
$this->db->where('tbl_recent_chats.doctor_id',$id); $this->db->where('tbl_recent_chats.doctor_id',$id);
} }
if($start != 0 || $per_page != 0){
$this->db->limit($per_page,$start);
}
$query = $this->db->get('tbl_recent_chats')->result(); $query = $this->db->get('tbl_recent_chats')->result();
//echo $this->db->last_query();exit(); //echo $this->db->last_query();exit();
if(count($query) > 0){ if(count($query) > 0){
...@@ -2336,7 +2343,9 @@ class Webservice_model extends CI_Model { ...@@ -2336,7 +2343,9 @@ class Webservice_model extends CI_Model {
public function get_faqs($start,$per_page){ public function get_faqs($start,$per_page){
$this->db->select('id,faq_title,faq_description'); $this->db->select('id,faq_title,faq_description');
$this->db->where('faq_for','0'); $this->db->where('faq_for','0');
if($start != 0 || $per_page != 0){
$this->db->limit($per_page,$start); $this->db->limit($per_page,$start);
}
$result = $this->db->get('tbl_faq')->result(); $result = $this->db->get('tbl_faq')->result();
if($result){ if($result){
return $result; return $result;
...@@ -2349,7 +2358,9 @@ class Webservice_model extends CI_Model { ...@@ -2349,7 +2358,9 @@ class Webservice_model extends CI_Model {
public function get_doctor_faq_list($start,$per_page){ public function get_doctor_faq_list($start,$per_page){
$this->db->select('id,faq_title,faq_description'); $this->db->select('id,faq_title,faq_description');
$this->db->where('faq_for','1'); $this->db->where('faq_for','1');
if($start != 0 || $per_page != 0){
$this->db->limit($per_page,$start); $this->db->limit($per_page,$start);
}
$result = $this->db->get('tbl_faq')->result(); $result = $this->db->get('tbl_faq')->result();
if($result){ if($result){
return $result; return $result;
...@@ -2969,7 +2980,9 @@ class Webservice_model extends CI_Model { ...@@ -2969,7 +2980,9 @@ class Webservice_model extends CI_Model {
$this->db->from('tbl_review'); $this->db->from('tbl_review');
$this->db->join('tbl_registration','tbl_registration.id = tbl_review.reviewer_id'); $this->db->join('tbl_registration','tbl_registration.id = tbl_review.reviewer_id');
$this->db->where('tbl_review.doctor_id',$id); $this->db->where('tbl_review.doctor_id',$id);
if($start != 0 || $per_page != 0){
$this->db->limit($per_page,$start); $this->db->limit($per_page,$start);
}
$result = $this->db->get()->result(); $result = $this->db->get()->result();
if(count($result) > 0){ if(count($result) > 0){
foreach ($result as $key => $value) { foreach ($result as $key => $value) {
...@@ -2988,7 +3001,9 @@ class Webservice_model extends CI_Model { ...@@ -2988,7 +3001,9 @@ class Webservice_model extends CI_Model {
$this->db->join('tbl_registration','tbl_registration.id = tbl_booking.patient_id'); $this->db->join('tbl_registration','tbl_registration.id = tbl_booking.patient_id');
$this->db->where('tbl_booking.doctor_id',$id); $this->db->where('tbl_booking.doctor_id',$id);
$this->db->where("(tbl_booking.booking_status != '0' or tbl_booking.booking_status != '4')"); $this->db->where("(tbl_booking.booking_status != '0' or tbl_booking.booking_status != '4')");
if($start != 0 || $per_page != 0){
$this->db->limit($per_page,$start); $this->db->limit($per_page,$start);
}
$this->db->order_by('tbl_registration.name','ASC'); $this->db->order_by('tbl_registration.name','ASC');
$result = $this->db->get()->result(); $result = $this->db->get()->result();
/*if(count($result) > 0){ /*if(count($result) > 0){
...@@ -3036,7 +3051,7 @@ class Webservice_model extends CI_Model { ...@@ -3036,7 +3051,7 @@ class Webservice_model extends CI_Model {
// $result = $this->db->get()->result(); // $result = $this->db->get()->result();
//echo $this->db->last_query();exit(); //echo $this->db->last_query();exit();
$result = $this->db->query("SELECT DISTINCT(reg_id) as id, reg_name as name, CAST(AES_DECRYPT(`reg_dob`, 'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob,reg_photo as profile_photo, TIMESTAMPDIFF(YEAR, FROM_UNIXTIME(CAST(AES_DECRYPT(`reg_dob`, 'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR), '%Y-%m-%d '), CURDATE()) as age FROM (select tbl_registration.id as reg_id, tbl_registration.name as reg_name, tbl_registration.dob as reg_dob, tbl_registration.profile_photo as reg_photo from `tbl_registration` JOIN `tbl_booking` ON `tbl_registration`.`id` = `tbl_booking`.`patient_id` WHERE `tbl_booking`.`booking_status` = '3' AND `tbl_booking`.`doctor_id` = '$id') temp WHERE (DATE_FORMAT(FROM_UNIXTIME(CAST(AES_DECRYPT(reg_dob,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR)), '%Y-%m-%e') like '%-$O_month-%' or DATE_FORMAT(FROM_UNIXTIME(CAST(AES_DECRYPT(reg_dob,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR)), '%Y-%m-%e') like '%-$T_month-%' or DATE_FORMAT(FROM_UNIXTIME(CAST(AES_DECRYPT(reg_dob,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR)), '%Y-%m-%e') like '%-$TH_month-%') ORDER BY DAYOFYEAR(DATE_FORMAT(FROM_UNIXTIME(CAST(AES_DECRYPT(reg_dob,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR)), '%Y-%m-%e')) < DAYOFYEAR(CURDATE()) , DAYOFYEAR(DATE_FORMAT(FROM_UNIXTIME(CAST(AES_DECRYPT(reg_dob,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR)), '%Y-%m-%e')) LIMIT 20")->result(); $result = $this->db->query("SELECT DISTINCT(reg_id) as id, reg_name as name, CAST(AES_DECRYPT(`reg_dob`, 'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob,reg_photo as profile_photo, TIMESTAMPDIFF(YEAR, FROM_UNIXTIME(CAST(AES_DECRYPT(`reg_dob`, 'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR), '%Y-%m-%d '), CURDATE()) as age FROM (select tbl_registration.id as reg_id, tbl_registration.name as reg_name, tbl_registration.dob as reg_dob, tbl_registration.profile_photo as reg_photo from `tbl_registration` JOIN `tbl_booking` ON `tbl_registration`.`id` = `tbl_booking`.`patient_id` WHERE `tbl_booking`.`booking_status` = '3' AND `tbl_booking`.`doctor_id` = '$id') temp WHERE (DATE_FORMAT(FROM_UNIXTIME(CAST(AES_DECRYPT(reg_dob,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR)), '%Y-%m-%e') like '%-$O_month-%' or DATE_FORMAT(FROM_UNIXTIME(CAST(AES_DECRYPT(reg_dob,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR)), '%Y-%m-%e') like '%-$T_month-%' or DATE_FORMAT(FROM_UNIXTIME(CAST(AES_DECRYPT(reg_dob,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR)), '%Y-%m-%e') like '%-$TH_month-%') ORDER BY DAYOFYEAR(DATE_FORMAT(FROM_UNIXTIME(CAST(AES_DECRYPT(reg_dob,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR)), '%Y-%m-%e')) < DAYOFYEAR(CURDATE()) , DAYOFYEAR(DATE_FORMAT(FROM_UNIXTIME(CAST(AES_DECRYPT(reg_dob,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR)), '%Y-%m-%e')) LIMIT $start,$per_page")->result();
if(count($result) > 0){ if(count($result) > 0){
return $result; return $result;
...@@ -3055,7 +3070,9 @@ class Webservice_model extends CI_Model { ...@@ -3055,7 +3070,9 @@ class Webservice_model extends CI_Model {
$this->db->where('doctor_id',$doctorid); $this->db->where('doctor_id',$doctorid);
$this->db->where('patient_id',$patientid); $this->db->where('patient_id',$patientid);
$this->db->where('booking_status','3'); $this->db->where('booking_status','3');
if($start != 0 || $per_page != 0){
$this->db->limit($per_page,$start); $this->db->limit($per_page,$start);
}
$query = $this->db->get('tbl_booking')->result(); $query = $this->db->get('tbl_booking')->result();
$new = array(); $new = array();
...@@ -3835,7 +3852,9 @@ class Webservice_model extends CI_Model { ...@@ -3835,7 +3852,9 @@ class Webservice_model extends CI_Model {
}else{ }else{
$this->db->where("(tbl_booking.booking_status = '1' or tbl_booking.booking_status = '2')"); $this->db->where("(tbl_booking.booking_status = '1' or tbl_booking.booking_status = '2')");
} }
if($start != 0 || $per_page != 0){
$this->db->limit($per_page,$start); $this->db->limit($per_page,$start);
}
$query = $this->db->get()->result(); $query = $this->db->get()->result();
if(count($query) > 0 ){ if(count($query) > 0 ){
foreach ($query as $key => $value) { foreach ($query as $key => $value) {
...@@ -3899,7 +3918,9 @@ class Webservice_model extends CI_Model { ...@@ -3899,7 +3918,9 @@ class Webservice_model extends CI_Model {
public function get_bank_list($id,$start,$per_page){ public function get_bank_list($id,$start,$per_page){
$this->db->select('id,bank_name,agency as agency_name,account_no as bank_account,account_holder as name'); $this->db->select('id,bank_name,agency as agency_name,account_no as bank_account,account_holder as name');
if($start != 0 || $per_page != 0){
$this->db->limit($per_page,$start); $this->db->limit($per_page,$start);
}
$query = $this->db->get_where('tbl_bank_accounts',array('type_id'=>$id))->result(); $query = $this->db->get_where('tbl_bank_accounts',array('type_id'=>$id))->result();
if(count($query) > 0){ if(count($query) > 0){
foreach ($query as $key => $value) { foreach ($query as $key => $value) {
...@@ -3945,7 +3966,9 @@ class Webservice_model extends CI_Model { ...@@ -3945,7 +3966,9 @@ class Webservice_model extends CI_Model {
public function get_withdrawal_history($doctorid,$start,$per_page){ public function get_withdrawal_history($doctorid,$start,$per_page){
$this->db->select('tbl_withdrawal_history.id,tbl_withdrawal_history.bank_id,tbl_withdrawal_history.amount,tbl_withdrawal_history.date,tbl_withdrawal_history.status,tbl_bank_accounts.bank_name,tbl_bank_accounts.account_no as bank_account'); $this->db->select('tbl_withdrawal_history.id,tbl_withdrawal_history.bank_id,tbl_withdrawal_history.amount,tbl_withdrawal_history.date,tbl_withdrawal_history.status,tbl_bank_accounts.bank_name,tbl_bank_accounts.account_no as bank_account');
$this->db->join('tbl_bank_accounts','tbl_bank_accounts.id = tbl_withdrawal_history.bank_id'); $this->db->join('tbl_bank_accounts','tbl_bank_accounts.id = tbl_withdrawal_history.bank_id');
if($start != 0 || $per_page != 0){
$this->db->limit($per_page,$start); $this->db->limit($per_page,$start);
}
$query = $this->db->get_where('tbl_withdrawal_history',array('tbl_withdrawal_history.doctor_id'=>$doctorid))->result(); $query = $this->db->get_where('tbl_withdrawal_history',array('tbl_withdrawal_history.doctor_id'=>$doctorid))->result();
if(count($query) > 0){ if(count($query) > 0){
foreach ($query as $key => $value) { foreach ($query as $key => $value) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment