Commit 7326621c by Jansa Jose

Merge branch 'jaise' into jansa

parents ab1ab149 24d2130e
...@@ -76,16 +76,55 @@ class Webservice_model extends CI_Model { ...@@ -76,16 +76,55 @@ class Webservice_model extends CI_Model {
$return_array = array('status'=>'fail'); $return_array = array('status'=>'fail');
} }
}else{ }else{
$data['name'] = encrypt_data($data['name']);
$data['about'] = encrypt_data($data['about']);
$data['price'] = encrypt_data($data['price']);
$data['gender'] = encrypt_data($data['gender']);
$data['domiciliary_status'] = encrypt_data($data['domiciliary_status']);
$data['rg'] = encrypt_data($data['rg']);
$data['crm'] = encrypt_data($data['crm']);
$data['cep'] = encrypt_data($data['cep']);
$data['street_address'] = encrypt_data($data['street_address']);
$data['locality'] = encrypt_data($data['locality']);
$data['number'] = encrypt_data($data['number']);
$data['complement'] = encrypt_data($data['complement']);
if($this->db->insert('tbl_doctors', $data)){ if($this->db->insert('tbl_doctors', $data)){
$insertid = $this->db->insert_id(); $insertid = $this->db->insert_id();
<<<<<<< HEAD
$this->db->query("update tbl_doctors set dob = AES_ENCRYPT(".$data['dob'].",'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA')where id = ".$insertid);
=======
$this->db->insert('tbl_clinic_doctors',array('doctor_id'=>$insertid,'clinic_id'=> 0)); $this->db->insert('tbl_clinic_doctors',array('doctor_id'=>$insertid,'clinic_id'=> 0));
$this->db->insert('tbl_consultation',array('doctor_id'=>$insertid,'clinic_id'=> 0,'date'=>'""','date_secondary'=>'""','active_schedule'=> 0)); $this->db->insert('tbl_consultation',array('doctor_id'=>$insertid,'clinic_id'=> 0,'date'=>'""','date_secondary'=>'""','active_schedule'=> 0));
>>>>>>> jansa
$this->db->select('tbl_specialization.id as specialization_id,tbl_specialization.specialization_name,tbl_doctors.*'); $this->db->select('tbl_specialization.id as specialization_id,tbl_specialization.specialization_name,tbl_doctors.*');
$this->db->join('tbl_specialization','tbl_specialization.id = tbl_doctors. specialization'); $this->db->join('tbl_specialization','tbl_specialization.id = tbl_doctors. specialization');
$query = $this->db->get_where("tbl_doctors",array("tbl_doctors.id"=>$insertid)); $query = $this->db->get_where("tbl_doctors",array("tbl_doctors.id"=>$insertid));
$return_array = array('status'=>'success','userdata'=>$query->row_array());
$this->db->select("CAST(AES_DECRYPT(`dob`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob");
$this->db->where('id',$insertid);
$query_date = $this->db->get('tbl_doctors')->row();
$query = $query->row_array();
unset($query['dob']);
$query['dob'] = $query_date->dob;
$query['name'] = decrypt_data($query['name']);
$query['about'] = decrypt_data($query['about']);
$query['price'] = decrypt_data($query['price']);
$query['gender'] = decrypt_data($query['gender']);
$query['domiciliary_status'] = decrypt_data($query['domiciliary_status']);
$query['rg'] = decrypt_data($query['rg']);
$query['crm'] = decrypt_data($query['crm']);
$query['cep'] = decrypt_data($query['cep']);
$query['street_address'] = decrypt_data($query['street_address']);
$query['locality'] = decrypt_data($query['locality']);
$query['number'] = decrypt_data($query['number']);
$query['complement'] = decrypt_data($query['complement']);
$return_array = array('status'=>'success','userdata'=>$query);
} }
else{ else{
$return_array = array('status'=>'fail'); $return_array = array('status'=>'fail');
...@@ -246,15 +285,23 @@ class Webservice_model extends CI_Model { ...@@ -246,15 +285,23 @@ class Webservice_model extends CI_Model {
function update_doctor_registration_data($data,$query){ function update_doctor_registration_data($data,$query){
//$data['password'] = md5($data['password']); //$data['password'] = md5($data['password']);
$data['dob'] = $data['dob']; //$data['dob'] = $data['dob'];
$data['cep'] = $data['zip_code']; $data['cep'] = encrypt_data($data['zip_code']);
$data['complement'] = $data['landmark']; $data['complement'] = encrypt_data($data['landmark']);
$data['about'] = $data['biodata']; $data['about'] = encrypt_data($data['biodata']);
$data['specialization'] = $data['specialization_id']; $data['specialization'] = $data['specialization_id'];
$data['gender'] = strtoupper($data['gender']); $data['gender'] = encrypt_data(strtoupper($data['gender']));
$data['username'] = $data['uid']; $data['username'] = $data['uid'];
$data['is_registration_completed'] = 1; $data['is_registration_completed'] = 1;
$data['name'] = encrypt_data($data['name']);
$data['price'] = encrypt_data($data['price']);
$data['domiciliary_status'] = encrypt_data($data['domiciliary_status']);
$data['rg'] = encrypt_data($data['rg']);
$data['crm'] = encrypt_data($data['crm']);
$data['street_address'] = encrypt_data($data['street_address']);
$data['locality'] = encrypt_data($data['locality']);
$data['number'] = encrypt_data($data['number']);
unset($data['zip_code']); unset($data['zip_code']);
unset($data['landmark']); unset($data['landmark']);
...@@ -262,12 +309,34 @@ class Webservice_model extends CI_Model { ...@@ -262,12 +309,34 @@ class Webservice_model extends CI_Model {
unset($data['specialization_id']); unset($data['specialization_id']);
if($this->db->update('tbl_doctors',$data,array('uid'=>$data['uid']))){ if($this->db->update('tbl_doctors',$data,array('uid'=>$data['uid']))){
$this->db->query("update tbl_doctors set dob = AES_ENCRYPT(".$data['dob'].",'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA')where uid = ".$data['uid']);
$this->db->select('tbl_doctors.*,tbl_specialization.id as specialization_id,tbl_specialization.specialization_name,tbl_authtoken_doctors.doctor_id ,tbl_authtoken_doctors.authtoken'); $this->db->select('tbl_doctors.*,tbl_specialization.id as specialization_id,tbl_specialization.specialization_name,tbl_authtoken_doctors.doctor_id ,tbl_authtoken_doctors.authtoken');
$this->db->join('tbl_authtoken_doctors', 'tbl_authtoken_doctors.doctor_id = tbl_doctors.id'); $this->db->join('tbl_authtoken_doctors', 'tbl_authtoken_doctors.doctor_id = tbl_doctors.id');
$this->db->join('tbl_specialization','tbl_specialization.id = tbl_doctors. specialization'); $this->db->join('tbl_specialization','tbl_specialization.id = tbl_doctors. specialization');
$query = $this->db->get_where("tbl_doctors",array('tbl_doctors.id'=>$query->id))->row_array(); $query = $this->db->get_where("tbl_doctors",array('tbl_doctors.id'=>$query->id))->row_array();
unset($query['dob']);
$this->db->select("CAST(AES_DECRYPT(`dob`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob");
$this->db->where('uid',$data['uid']);
$query_date = $this->db->get('tbl_doctors')->row();
$query['dob'] = $query_date->dob;
$query['cep'] = decrypt_data($query['zip_code']);
$query['complement'] = decrypt_data($query['landmark']);
$query['about'] = decrypt_data($query['biodata']);
$query['gender'] = decrypt_data($query['gender']);
$query['name'] = decrypt_data($query['name']);
$query['price'] = decrypt_data($query['price']);
$query['domiciliary_status'] = decrypt_data($query['domiciliary_status']);
$query['rg'] = decrypt_data($query['rg']);
$query['crm'] = decrypt_data($query['crm']);
$query['street_address'] = decrypt_data($query['street_address']);
$query['locality'] = decrypt_data($query['locality']);
$query['number'] = decrypt_data($query['number']);
$return_array = array('status'=>'success','userdata'=>$query); $return_array = array('status'=>'success','userdata'=>$query);
}else{ }else{
$return_array = array('status'=>'failed'); $return_array = array('status'=>'failed');
...@@ -438,10 +507,45 @@ class Webservice_model extends CI_Model { ...@@ -438,10 +507,45 @@ class Webservice_model extends CI_Model {
if(count($query_email) < 0 || $query_email == ''){ if(count($query_email) < 0 || $query_email == ''){
$return_array = array('status'=>'fail'); $return_array = array('status'=>'fail');
}else{ }else{
$this->db->select("CAST(AES_DECRYPT(`tbl_doctors`.`dob`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob_new");
$this->db->where('id',$query_email['id']);
$querydate = $this->db->get('tbl_doctors')->row();
$query_email['dob'] = $query_date->dob_new;
$query_email['cep'] = decrypt_data($query_email['zip_code']);
$query_email['complement'] = decrypt_data($query_email['landmark']);
$query_email['about'] = decrypt_data($query_email['biodata']);
$query_email['gender'] = decrypt_data($query_email['gender']);
$query_email['name'] = decrypt_data($query_email['name']);
$query_email['price'] = decrypt_data($query_email['price']);
$query_email['domiciliary_status'] = decrypt_data($query_email['domiciliary_status']);
$query_email['rg'] = decrypt_data($query_email['rg']);
$query_email['crm'] = decrypt_data($query_email['crm']);
$query_email['street_address'] = decrypt_data($query_email['street_address']);
$query_email['locality'] = decrypt_data($query_email['locality']);
$query_email['number'] = decrypt_data($query_email['number']);
$return_array = array('status'=>'success','userdata'=>$query_email); $return_array = array('status'=>'success','userdata'=>$query_email);
} }
}else{ }else{
$return_array = array('status'=>'success','userdata'=>$query); $this->db->select("CAST(AES_DECRYPT(`tbl_doctors`.`dob`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob_new");
$this->db->where('id',$query['id']);
$querydate = $this->db->get('tbl_doctors')->row();
$query_email = $query;
$query_email['dob'] = $query_date->dob;
$query_email['cep'] = decrypt_data($query_email['zip_code']);
$query_email['complement'] = decrypt_data($query_email['landmark']);
$query_email['about'] = decrypt_data($query_email['biodata']);
$query_email['gender'] = decrypt_data($query_email['gender']);
$query_email['name'] = decrypt_data($query_email['name']);
$query_email['price'] = decrypt_data($query_email['price']);
$query_email['domiciliary_status'] = decrypt_data($query_email['domiciliary_status']);
$query_email['rg'] = decrypt_data($query_email['rg']);
$query_email['crm'] = decrypt_data($query_email['crm']);
$query_email['street_address'] = decrypt_data($query_email['street_address']);
$query_email['locality'] = decrypt_data($query_email['locality']);
$query_email['number'] = decrypt_data($query_email['number']);
$return_array = array('status'=>'success','userdata'=>$query_email);
} }
return $return_array; return $return_array;
...@@ -605,8 +709,26 @@ class Webservice_model extends CI_Model { ...@@ -605,8 +709,26 @@ class Webservice_model extends CI_Model {
$this->db->join('tbl_specialization','tbl_specialization.id = tbl_doctors. specialization','left'); $this->db->join('tbl_specialization','tbl_specialization.id = tbl_doctors. specialization','left');
$query_userdata = $this->db->get_where("tbl_doctors",array("uid"=>$data)); $query_userdata = $this->db->get_where("tbl_doctors",array("uid"=>$data));
if($query_userdata->num_rows() > 0){ if($query_userdata->num_rows() > 0){
$query = $query_userdata->row_array();
$this->db->select("CAST(AES_DECRYPT(`tbl_doctors`.`dob`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob_new");
$this->db->where('id',$query['id']);
$querydate = $this->db->get('tbl_doctors')->row();
$query['dob'] = $query_date->dob_new;
$query['cep'] = decrypt_data($query['zip_code']);
$query['complement'] = decrypt_data($query['landmark']);
$query['about'] = decrypt_data($query['biodata']);
$query['gender'] = decrypt_data($query['gender']);
$query['name'] = decrypt_data($query['name']);
$query['price'] = decrypt_data($query['price']);
$query['domiciliary_status'] = decrypt_data($query['domiciliary_status']);
$query['rg'] = decrypt_data($query['rg']);
$query['crm'] = decrypt_data($query['crm']);
$query['street_address'] = decrypt_data($query['street_address']);
$query['locality'] = decrypt_data($query['locality']);
$query['number'] = decrypt_data($query['number']);
$return_array = array('status'=>'success','userdata'=>$query_userdata->row_array()); $return_array = array('status'=>'success','userdata'=>$query);
} }
else{ else{
$return_array = array('status'=>'fail'); $return_array = array('status'=>'fail');
...@@ -647,13 +769,52 @@ class Webservice_model extends CI_Model { ...@@ -647,13 +769,52 @@ class Webservice_model extends CI_Model {
//.............. Insert uid for doctor //.............. Insert uid for doctor
public function insert_uid_doctor($data){ public function insert_uid_doctor($data){
$data['is_registration_completed'] = 0; $data['is_registration_completed'] = 0;
$data['name'] = encrypt_data($data['name']);
$data['about'] = encrypt_data($data['about']);
$data['price'] = encrypt_data($data['price']);
$data['gender'] = encrypt_data($data['gender']);
$data['domiciliary_status'] = encrypt_data($data['domiciliary_status']);
$data['rg'] = encrypt_data($data['rg']);
$data['crm'] = encrypt_data($data['crm']);
$data['cep'] = encrypt_data($data['cep']);
$data['street_address'] = encrypt_data($data['street_address']);
$data['locality'] = encrypt_data($data['locality']);
$data['number'] = encrypt_data($data['number']);
$data['complement'] = encrypt_data($data['complement']);
$this->db->insert('tbl_doctors',$data); $this->db->insert('tbl_doctors',$data);
$insertid = $this->db->insert_id(); $insertid = $this->db->insert_id();
$this->db->query("update tbl_doctors set dob = AES_ENCRYPT(".$data['dob'].",'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA')where id = ".$insertid);
$this->db->select('tbl_doctors.*'); $this->db->select('tbl_doctors.*');
$query_userdata = $this->db->get_where("tbl_doctors",array("id"=>$insertid)); $query_userdata = $this->db->get_where("tbl_doctors",array("id"=>$insertid));
if($query_userdata->num_rows() > 0){ if($query_userdata->num_rows() > 0){
$return_array = array('status'=>'success','userdata'=>$query_userdata->row_array()); $query = $query_userdata->row_array();
$this->db->select("CAST(AES_DECRYPT(`dob`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob");
$this->db->where('id',$insertid);
$query_date = $this->db->get('tbl_doctors')->row();
unset($query['dob']);
$query['dob'] = $query_date->dob;
$query['name'] = decrypt_data($query['name']);
$query['about'] = decrypt_data($query['about']);
$query['price'] = decrypt_data($query['price']);
$query['gender'] = decrypt_data($query['gender']);
$query['domiciliary_status'] = decrypt_data($query['domiciliary_status']);
$query['rg'] = decrypt_data($query['rg']);
$query['crm'] = decrypt_data($query['crm']);
$query['cep'] = decrypt_data($query['cep']);
$query['street_address'] = decrypt_data($query['street_address']);
$query['locality'] = decrypt_data($query['locality']);
$query['number'] = decrypt_data($query['number']);
$query['complement'] = decrypt_data($query['complement']);
$return_array = array('status'=>'success','userdata'=>$query);
} }
else{ else{
$return_array = array('status'=>'fail'); $return_array = array('status'=>'fail');
...@@ -909,7 +1070,26 @@ class Webservice_model extends CI_Model { ...@@ -909,7 +1070,26 @@ class Webservice_model extends CI_Model {
$query = $this->db->get_where("tbl_doctors",array("tbl_doctors.id"=>$doctorid)); $query = $this->db->get_where("tbl_doctors",array("tbl_doctors.id"=>$doctorid));
if($query->num_rows() > 0 && !is_null($query->row_array()['id'])){ if($query->num_rows() > 0 && !is_null($query->row_array()['id'])){
$return_array = array('status'=>'success','data'=>$query->row_array());
$query = $query->row_array();
$this->db->select("CAST(AES_DECRYPT(`tbl_doctors`.`dob`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob_new");
$this->db->where('id',$query['id']);
$querydate = $this->db->get('tbl_doctors')->row();
$query['dob'] = $query_date->dob_new;
$query['cep'] = decrypt_data($query['zip_code']);
$query['complement'] = decrypt_data($query['landmark']);
$query['about'] = decrypt_data($query['biodata']);
$query['gender'] = decrypt_data($query['gender']);
$query['name'] = decrypt_data($query['name']);
$query['price'] = decrypt_data($query['price']);
$query['domiciliary_status'] = decrypt_data($query['domiciliary_status']);
$query['rg'] = decrypt_data($query['rg']);
$query['crm'] = decrypt_data($query['crm']);
$query['street_address'] = decrypt_data($query['street_address']);
$query['locality'] = decrypt_data($query['locality']);
$query['number'] = decrypt_data($query['number']);
$return_array = array('status'=>'success','data'=>$query);
} }
else{ else{
$return_array = array('status'=>'fail'); $return_array = array('status'=>'fail');
...@@ -1544,10 +1724,43 @@ class Webservice_model extends CI_Model { ...@@ -1544,10 +1724,43 @@ class Webservice_model extends CI_Model {
//........................ Register Doctor //........................ Register Doctor
function register_doctor($data){ function register_doctor($data){
$data['name'] = encrypt_data($data['name']);
$data['about'] = encrypt_data($data['about']);
$data['price'] = encrypt_data($data['price']);
$data['gender'] = encrypt_data($data['gender']);
$data['domiciliary_status'] = encrypt_data($data['domiciliary_status']);
$data['rg'] = encrypt_data($data['rg']);
$data['crm'] = encrypt_data($data['crm']);
$data['cep'] = encrypt_data($data['cep']);
$data['street_address'] = encrypt_data($data['street_address']);
$data['locality'] = encrypt_data($data['locality']);
$data['number'] = encrypt_data($data['number']);
$data['complement'] = encrypt_data($data['complement']);
if($this->db->insert('tbl_doctors', $data)){ if($this->db->insert('tbl_doctors', $data)){
$insertid = $this->db->insert_id(); $insertid = $this->db->insert_id();
$this->db->query("update tbl_doctors set dob = AES_ENCRYPT(".$data['dob'].",'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA')where id = ".$insertid);
$this->db->select("CAST(AES_DECRYPT(`dob`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob");
$this->db->where('id',$insertid);
$query_date = $this->db->get('tbl_doctors')->row();
$query = $query->row_array();
unset($query['dob']);
$query['dob'] = $query_date->dob;
$query['name'] = decrypt_data($query['name']);
$query['about'] = decrypt_data($query['about']);
$query['price'] = decrypt_data($query['price']);
$query['gender'] = decrypt_data($query['gender']);
$query['domiciliary_status'] = decrypt_data($query['domiciliary_status']);
$query['rg'] = decrypt_data($query['rg']);
$query['crm'] = decrypt_data($query['crm']);
$query['cep'] = decrypt_data($query['cep']);
$query['street_address'] = decrypt_data($query['street_address']);
$query['locality'] = decrypt_data($query['locality']);
$query['number'] = decrypt_data($query['number']);
$query['complement'] = decrypt_data($query['complement']);
$query = $this->db->get_where("tbl_doctors",array("id"=>$insertid)); $query = $this->db->get_where("tbl_doctors",array("id"=>$insertid));
$return_array = array('status'=>'success','userdata'=>$query->row_array());
$return_array = array('status'=>'success','userdata'=>$query);
} }
else{ else{
$return_array = array('status'=>'fail'); $return_array = array('status'=>'fail');
......
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