diff --git a/application/controllers/Doctor.php b/application/controllers/Doctor.php
index 82989bc..9610319 100644
--- a/application/controllers/Doctor.php
+++ b/application/controllers/Doctor.php
@@ -1533,18 +1533,74 @@ public function check_current_user_confirmationcode()
  	
  }
 
+ /*FUNCTION FOR EDITING COLABORATOR - DOCTOR DASHBOARD*/
+ public function editColaborator()
+ {
+ 	if($this->session->userdata('UserData')&&($this->session->userdata('UserData')['type']=="DOCTOR")&&(!empty($this->uri->segment(3))))
+ 	{
+ 		$userdata = $this->session->userdata('UserData');
+ 		$id = $this->uri->segment(3);
+ 		$collaborator_data = $this->Doctor_model->get_collaboator_byid_doc_id($id,$userdata['id']);
+ 		//print_r($collaborator_data);die();
+ 		if(!empty($collaborator_data))
+ 		{
+ 			$template['collaborator_data'] = $collaborator_data;
+ 			$template['page'] = 'doctor_dash_edit_colaborator';
+			$template['page_title'] = "Edit Colaborator";
+			$this->load->view('template/template', $template);
+ 		}
+ 		else
+ 		{
+ 			redirect(base_url());
+ 		}
+ 		
+	}
+ 	else
+ 	{
+ 		redirect(base_url());
+ 	}
+ 	
+ }
+
+/*FUNCTION FOR SAVING COLABORATOR - ADD COLLABORATOR*/
  public function saveColaborator()
  {
- 	//print_r($_POST);
  	
-    if(!empty($_POST))
+ 	
+ 	//print_r($_FILES);
+ 	//die();
+ 	$userdata = $this->session->userdata('UserData');
+    if(!empty($_POST['data']))
     {
-    	$insertarray = array('name' => $_POST['name'],'email' => $_POST['email'],'password' => md5($_POST['password']),'telephone' => $_POST['telephone'],'cpf' => $_POST['cpf'] );
+    	parse_str($_POST['data'], $req_data);	
+    	$insertarray = array('name' => $req_data['name'],'email' => $req_data['email'],'password' => md5($req_data['password']),'telephone' => $req_data['telephone'],'cpf' => $req_data['cpf'],'doctor_id' => $userdata['id'] );
     }
     $colaborator = $this->Doctor_model->add_colaborator($insertarray);
     if($colaborator>0)
     {
-    	$res = array('status' =>'success','colaborator' => $colaborator);
+		$fileName = $colaborator.'_'.$_FILES['image']['name'];
+		$config = set_upload_options('./assets/uploads/profilepic/doctor_collaborator/'); 
+		$config['file_name'] = $fileName;
+		$this->load->library('upload', $config);
+		if ( ! $this->upload->do_upload('image')) 
+		{
+			$error = array('error' => $this->upload->display_errors('', '')); 
+			$res = array(
+			"status"=> "error",
+			"error"=> "Upload Error",
+			"message"=> "Sorry! Profile Photo not uploaded. ".$error['error']
+			);	
+			$this->Doctor_model->delete_registration_collaborator($colaborator);	
+		}	
+		else 
+		{ 
+			$imagedata = $this->upload->data(); 
+			$fullfilepath='assets/uploads/profilepic/doctor_collaborator/'.$imagedata['file_name'];
+			$picdata = array('image'=>$fullfilepath);
+			$this->Doctor_model->update_colaborator($colaborator,$picdata);
+			$res = array('status' =>'success','colaborator' => $colaborator);
+		}
+    	
     }
     else
     {
@@ -1553,6 +1609,38 @@ public function check_current_user_confirmationcode()
     print json_encode($res);
  }
 
+/*FUNCTION FOR UPDATING COLABORATOR DATA- SETTING AUTHORIZATION, EDIT COLLABORATOR*/
+ public function updateColaborator()
+ {
+ 	//print_r($_POST);die();
+ 	$update_array = array();
+
+ 	if($_POST['section']=='authorizeaccess')
+ 	{
+ 		$update_array['capabilities'] = '';
+ 		if(!empty($_POST['access']) and isset($_POST['access']))
+	 	{
+	 		$update_array['capabilities'] = implode(",",$_POST['access']);
+	 	}
+ 	}
+ 	elseif($_POST['section']=='profile')
+ 	{
+
+ 	}
+
+
+ 	if(!empty($update_array))
+ 	{
+ 		$update = $this->Doctor_model->update_colaborator($_POST['colabor_id'],$update_array);
+ 		if($update)
+ 			{$res = array('status' => 'success' );}
+ 		else
+ 			{$res = array('status'=>'error');}
+ 	}
+ 	print json_encode($res);
+
+ }
+
 
 	
 	
diff --git a/application/controllers/Home.php b/application/controllers/Home.php
index 659a65f..36702e5 100644
--- a/application/controllers/Home.php
+++ b/application/controllers/Home.php
@@ -311,6 +311,9 @@ class Home extends CI_Controller {
 									)
 								
 							);
+					$collaborator_data = $this->Doctor_model->get_all_collaborator_for_doctor($result['userdata']['id']);
+					//print_r($collaborator_data);die();
+					if(!empty($collaborator_data)){$this->session->set_userdata('CollaboratorData',$collaborator_data);}
 				}
 				else
 				{
diff --git a/application/models/Doctor_model.php b/application/models/Doctor_model.php
index 4f0d0a6..f2c472a 100644
--- a/application/models/Doctor_model.php
+++ b/application/models/Doctor_model.php
@@ -733,6 +733,48 @@ public function add_colaborator($array)
 
 }
 
+public function update_colaborator($id,$updatearray)
+{
+	$this->db->where('tbl_doctor_colaborators.id',$id);
+	if($this->db->update('tbl_doctor_colaborators',$updatearray))
+		return true;
+	else
+		return false;
+}
+
+public function delete_registration_collaborator($id)
+{
+	if($this->db->where_in('id', $id)->delete('tbl_doctor_colaborators')){}
+}
+
+public function get_all_collaborator_for_doctor($docid)
+{
+	$this->db->select('id,
+					   name,
+					   image');
+	$this->db->from('tbl_doctor_colaborators');
+	$this->db->where('doctor_id',$docid);
+	$query = $this->db->get();
+	return $query->result_array();
+
+}
+
+public function get_collaboator_byid_doc_id($id,$docid)
+{
+	$this->db->select('id,
+					   name,
+					   image,
+					   email,
+					   telephone,
+					   cpf,
+					   capabilities');
+	$this->db->from('tbl_doctor_colaborators');
+	$this->db->where('id',$id);
+	$this->db->where('doctor_id',$docid);
+	$query = $this->db->get();
+	return $query->row_array();
+
+}
   
    } 
 ?> 
\ No newline at end of file
diff --git a/application/views/chat.php b/application/views/chat.php
index 3d81ed1..84e4193 100644
--- a/application/views/chat.php
+++ b/application/views/chat.php
@@ -108,7 +108,7 @@
                     <div class="ip_message_text_header" ng-if="opponent">
                       {{opponent.name}}
                     </div>
-                    <div class="ip_message_text_header textCenter" ng-if="!opponent">
+                    <div class="ip_message_text_header textCenter ip_select_message_chat" ng-if="!opponent">
                       Please Select a Conversation
                     </div>
                     <div class="ip_message_more_btn"></div>
diff --git a/application/views/doctor_dash_add_colaborator.php b/application/views/doctor_dash_add_colaborator.php
index 3f2da1f..2d46877 100644
--- a/application/views/doctor_dash_add_colaborator.php
+++ b/application/views/doctor_dash_add_colaborator.php
@@ -45,6 +45,24 @@
                     </div>
                   </div>
                 </div>
+
+                <div class="ip_edit_row">
+                   <div class="col-md-6">
+                      <p class="ip_row_p">Add photo:</p>
+                      <div class="ip_reg_modal_addphoto floatLeft">
+                      <img  id="doc-add-colabor-pic">
+                      </div>
+
+                      <div class="ip_add_photo floatRight">
+                      <input name="image"  data-parsley-required="true" type="file" accept="image/*"   class="ip_reg_form_input"
+                      data-parsley-error-message="Choose Profile Photo" onchange="pat_add_depend_loadthumbnail(this,'doc-add-colabor-pic')" id="colabor-pic">
+
+                      </div>
+                   </div>
+                   <div class="col-md-6"></div>
+                 
+                <div class="clear"></div>
+              </div>
               </form>
               </div>
               <hr>
@@ -52,18 +70,23 @@
                 <a href="javascript:void(0)">
                   <button class="ip_colaborator_btn" type="button" id="add-colaborator-btn">Add collaborator</button>
                 </a>
-                <a href="javascript:void(0)">
+               <!--  <a href="javascript:void(0)">
                   <button class="ip_colaborator_delete_btn">Delete collaborator</button>
-                </a>
+                </a> -->
               </div>
+              <div class="alert alert-success alert-dismiss textCenter hidden" id="colabor-add-success">Collaborator Added, Authorize Access</div>
+              <div class="alert alert-danger alert-dismiss textCenter hidden" id="colabor-add-error">Error! Kindly try Again</div>
           </div>
         </div>
+
         <div class="col-md-4">
-          <div class="ip_edit_record_cover">
+          <div class="ip_edit_record_cover hidden" id="authorize-access-div">
+
             <div class="ip_edit_record_head backgroundnone">
               Authorize access
             </div>
               <div class="ip_edit_record_detail">
+                <form data-parsley-validate="" role="form" id="colabor-auth-access-form">
                 <div class="ip_edit_row">
                   <br>
                   <br>
@@ -75,14 +98,15 @@
                 <div class="ip_notify_time">
                   <li>
                     <div class="ip_day_time_schedule_details_data p0">
-                         <input id="checkbox-41" class="ip_custom_checkbox1" name="checkbox-41" type="checkbox" checked="">
+                         <input type="hidden" name="section" value="authorizeaccess">
+                         <input id="checkbox-41" class="ip_custom_checkbox1" name="access[]" type="checkbox" value="Doctor/collaborator">
                          <label for="checkbox-41" class="ip_custom_checkbox_label1">Appointment</label>
                          <div class="clear"></div>
                      </div>
                   </li>
                   <li>
                     <div class="ip_day_time_schedule_details_data p0">
-                         <input id="checkbox-42" class="ip_custom_checkbox1" name="checkbox-42" type="checkbox" checked="">
+                         <input id="checkbox-42" class="ip_custom_checkbox1" name="access[]" type="checkbox" value="Doctor/chat" >
                          <label for="checkbox-42" class="ip_custom_checkbox_label1">Messages</label>
                          <div class="clear"></div>
                      </div>
@@ -91,13 +115,19 @@
                 </div>
                 <br>
               </div>
+            </form>
               <hr>
               <div class="ip_coloborator_btn_bay">
-                <button class="ip_colaborator_btn floatRight">Authorize access</button>
+                <button class="ip_colaborator_btn floatRight" type="button"  id="colabor-auth-access">Authorize access</button>
                 <div class="clear"></div>
+                <br>
+                <div class="alert alert-danger alert-dismiss textCenter hidden" id="colabor-auth-access-error">Please add Collaborator</div>
+                <div class="alert alert-success alert-dismiss textCenter hidden" id="colabor-auth-access-success">Settings Saved!</div>
               </div>
+
           </div>
         </div>
+
       </div>
     </div>
   </div>
diff --git a/application/views/doctor_dash_edit_colaborator.php b/application/views/doctor_dash_edit_colaborator.php
new file mode 100644
index 0000000..22ba37f
--- /dev/null
+++ b/application/views/doctor_dash_edit_colaborator.php
@@ -0,0 +1,134 @@
+
+<div class="ip_set_two_wrapper">
+  <div class="container ip_custom_container">
+    <div class="ip_edit_record_wrapper">
+      <div class="row">
+        <div class="col-md-8">
+          <div class="ip_edit_record_cover">
+            <div class="ip_edit_record_head backgroundnone">
+              Edit collaborator
+            </div>
+              <div class="ip_edit_record_detail">
+                <form id="edit-colaborator-form" role="form" data-parsley-validate="">
+
+                <div class="ip_edit_row">
+                  <div class="ip_bank_detail_frame">
+                    <input class="ip_bank_input" data-parsley-required="" name="name" onKeyPress="if(this.value.length > 40) return false;" data-parsley-minlength="5" data-parsley-pattern="^[a-zA-Z ]+$"  placeholder="Name" data-parsley-required="" value="<?php echo $collaborator_data['name'];?>">
+                  </div>
+                </div>
+
+                <div class="ip_edit_row">
+                    <div class="ip_bank_detail_frame">
+                      <input class="ip_bank_input" disabled placeholder="Email" data-parsley-required="" data-parsley-emailcolabor="" onKeyPress="if(this.value.length > 75) return false;" name="email" pattern="[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,3}$" value="<?php echo $collaborator_data['email'];?>">
+                  </div>
+                </div>
+
+               <!--  <div class="ip_edit_row">
+                      <div class="ip_bank_detail_frame">
+                      <input class="ip_bank_input" name="password" data-parsley-required="" placeholder="Password" data-parsley-required="" data-parsley-minlength="8" onKeyPress="if(this.value.length > 25) return false;" type="Password">
+                      </div>
+                </div> -->
+
+                <div class="ip_edit_row">
+                  <div class="row">
+                    <div class="col-md-6">
+                      <p class="ip_row_p">Telephone</p>
+                      <div class="ip_bank_detail_frame">
+                          <input class="ip_bank_input" data-parsley-required="" type="number" onKeyPress="if(this.value.length > 25) return false;" placeholder="" name="telephone" value="<?php echo $collaborator_data['telephone'];?>">
+                      </div>
+                    </div>
+                    <div class="col-md-6">
+                      <p class="ip_row_p">CPF</p>
+                      <div class="ip_bank_detail_frame">
+                          <input class="ip_bank_input" data-parsley-required="" name="cpf" placeholder="" data-parsley-required="" data-parsley-minlength="11" data-parsley-cpf="" onKeyPress="if(this.value.length > 10) return false;"  type="number" value="<?php echo $collaborator_data['cpf'];?>">
+                      </div>
+                    </div>
+                  </div>
+                </div>
+
+                <div class="ip_edit_row">
+                   <div class="col-md-6">
+                      <p class="ip_row_p">Add photo:</p>
+                      <div class="ip_reg_modal_addphoto floatLeft">
+                      <img  id="doc-add-colabor-pic">
+                      </div>
+
+                      <div class="ip_add_photo floatRight">
+                      <input name="image"  data-parsley-required="true" type="file" accept="image/*"   class="ip_reg_form_input"
+                      data-parsley-error-message="Choose Profile Photo" onchange="pat_add_depend_loadthumbnail(this,'doc-add-colabor-pic')" id="colabor-pic">
+
+                      </div>
+                   </div>
+                   <div class="col-md-6"></div>
+                 
+                <div class="clear"></div>
+              </div>
+              </form>
+              </div>
+              <hr>
+              <div class="ip_coloborator_btn_bay">
+                <a href="javascript:void(0)">
+                  <button class="ip_colaborator_btn" type="button" id="add-colaborator-btn">Update & Save</button>
+                </a>
+                <a href="javascript:void(0)">
+                  <button class="ip_colaborator_delete_btn">Delete Collaborator</button>
+                </a>
+              </div>
+              <div class="alert alert-success alert-dismiss textCenter hidden" id="colabor-add-success">Collaborator Added, Authorize Access</div>
+              <div class="alert alert-danger alert-dismiss textCenter hidden" id="colabor-add-error">Error! Kindly try Again</div>
+          </div>
+        </div>
+
+        <div class="col-md-4">
+          <div class="ip_edit_record_cover " id="authorize-access-div">
+
+            <div class="ip_edit_record_head backgroundnone">
+              Authorize access
+            </div>
+              <div class="ip_edit_record_detail">
+                <form data-parsley-validate="" role="form" id="colabor-auth-access-form">
+                <div class="ip_edit_row">
+                  <br>
+                  <br>
+                    <p class="ip_row_p">
+                      Choose the areas that your collaborator can access,view, edit, and configure. These changes can be altered in the future
+                    </p>
+                </div>
+                <br>
+                <div class="ip_notify_time">
+                  <li>
+                    <div class="ip_day_time_schedule_details_data p0">
+                         <input type="hidden" name="section" value="authorizeaccess">
+                         <input id="checkbox-41" class="ip_custom_checkbox1" name="access[]" type="checkbox" value="Doctor/collaborator">
+                         <label for="checkbox-41" class="ip_custom_checkbox_label1">Appointment</label>
+                         <div class="clear"></div>
+                     </div>
+                  </li>
+                  <li>
+                    <div class="ip_day_time_schedule_details_data p0">
+                         <input id="checkbox-42" class="ip_custom_checkbox1" name="access[]" type="checkbox" value="Doctor/chat" >
+                         <label for="checkbox-42" class="ip_custom_checkbox_label1">Messages</label>
+                         <div class="clear"></div>
+                     </div>
+                  </li>                  
+                  <div class="clearfix"></div>
+                </div>
+                <br>
+              </div>
+            </form>
+              <hr>
+              <div class="ip_coloborator_btn_bay">
+                <button class="ip_colaborator_btn floatRight" type="button"  id="colabor-auth-access">Authorize access</button>
+                <div class="clear"></div>
+                <br>
+                <div class="alert alert-danger alert-dismiss textCenter hidden" id="colabor-auth-access-error">Please add Collaborator</div>
+                <div class="alert alert-success alert-dismiss textCenter hidden" id="colabor-auth-access-success">Settings Saved!</div>
+              </div>
+
+          </div>
+        </div>
+
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/application/views/doctor_medical_records.php b/application/views/doctor_medical_records.php
index 86933b3..f6509d3 100644
--- a/application/views/doctor_medical_records.php
+++ b/application/views/doctor_medical_records.php
@@ -175,6 +175,6 @@
 <script>
     setTimeout(function() {
       CKEDITOR.replace('broadcasttext');
-    },1500)
+    },1800)
 </script>
 
diff --git a/application/views/doctor_medical_records_scheduled.php b/application/views/doctor_medical_records_scheduled.php
index 6552809..37000d3 100644
--- a/application/views/doctor_medical_records_scheduled.php
+++ b/application/views/doctor_medical_records_scheduled.php
@@ -134,7 +134,7 @@
                   </div>
 
                   <div class="col-md-2 p0">
-                    <div class="ip_record_name sent-broadcast-btn">
+                    <div class="ip_record_name sent-broadcast-btn-sch">
                       <span>Message</span><span><img src="<?php echo base_url();?>assets/images/ip_menu4.png"></span>
                     </div>
                    </div>
diff --git a/application/views/doctor_notifications_aniversaries.php b/application/views/doctor_notifications_aniversaries.php
index 62c5384..67db09f 100644
--- a/application/views/doctor_notifications_aniversaries.php
+++ b/application/views/doctor_notifications_aniversaries.php
@@ -85,7 +85,7 @@
                     {
                   ?>  
                       <li>
-                        <a href="<?php echo base_url();?>Doctor/Chat/<?php echo $value['id'];?>">
+                        
                           <div class="ip_bio_message_pic">
                             <img src="<?php echo base_url(); echo $value['profile_photo'];?>">
                           </div>
@@ -95,12 +95,14 @@
                             <p><?php echo date('d F',$value['dob']);?></p>
                             <!-- <p>22th September</p> -->
                           </div>
-                          <div class="ip_message_not">
-                            <img src="<?php echo base_url();?>assets/images/ip_menu4.png"><br>
-                            Messages
-                          </div>
+                          <a href="<?php echo base_url();?>Doctor/Chat/<?php echo $value['id'];?>">
+                            <div class="ip_message_not">
+                              <img src="<?php echo base_url();?>assets/images/ip_menu4.png"><br>
+                              Messages
+                            </div>
+                          </a>
                           <div class="clear"></div>
-                        </a>
+                        
                       </li>
 
                   <?php
diff --git a/application/views/template/header.php b/application/views/template/header.php
index ccd20ad..c5e843d 100644
--- a/application/views/template/header.php
+++ b/application/views/template/header.php
@@ -3,6 +3,8 @@
     {$userdata = $this->session->userdata('UserData');}
     if($this->session->userdata('DependentData'))
       {$dependentdata = $this->session->userdata('DependentData');}
+    if($this->session->userdata('CollaboratorData'))
+      {$collaboratordata = $this->session->userdata('CollaboratorData');}
 ?>
   <div class="ip_main_wrapper">
     <nav class="navbar  navbar-fixed-top">
@@ -275,12 +277,31 @@
               <ul class="dropdown-menu ip_nav_profile_listing">
                 <div class="ip_arrow_up"></div>
 
+                <!-- CODE FOR SHOWING COLLABORATOR -->
+                <?php if(!empty($collaboratordata)){
+                foreach ($collaboratordata as $key => $value) 
+                  {
+                ?>
+                  <a href="<?php echo base_url();?>Doctor/editColaborator/<?php echo $value['id']?>">
+                    <li>
+                      <div class="ip_drop_pic">
+                        <img src="<?php echo base_url(); echo $value['image']?>">
+                      </div>
+                      <div class="ip_drop_detail"><?php echo $value['name']?></div>
+                      <div class="clear"></div>
+                    </li>
+                  </a>
+                <?php
+                  }
+                }
+                ?>
+
                 <li>
                   <a href="<?php echo base_url();?>Doctor/addColaborator">Add Collaborator</a>
                 </li>
-                <li>
-                  <a href="<?php echo base_url();?>Doctor/editColaborator">Edit Collaborator</a>
-                </li>
+                <!-- <li>
+                  <a href="">Edit Collaborator</a>
+                </li> -->
                 <li  class="bordernone">
                   <a href="<?php echo base_url()?>Home/logout">Sign Out</a>
                 </li>
diff --git a/assets/css/custom.css b/assets/css/custom.css
index b816c59..fd90c41 100644
--- a/assets/css/custom.css
+++ b/assets/css/custom.css
@@ -1974,6 +1974,8 @@ button[disabled], html input[disabled]{background: #d6d6d6 !important;border:non
 .ip_main_tab_content .success_content{padding: 45px;}
 .sent-broadcast-btn span {position: relative;bottom: 10px;}    
 .sent-broadcast-btn span img{width:40px;}
+.sent-broadcast-btn-sch span {position: relative;bottom: 10px;}    
+.sent-broadcast-btn-sch span img{width:40px;}
     
-  
+.ip_select_message_chat {font-size: 17px;background: #d6d6d6;color: white;}
   
diff --git a/assets/js/custom.js b/assets/js/custom.js
index 189427e..c5c5be3 100644
--- a/assets/js/custom.js
+++ b/assets/js/custom.js
@@ -112,7 +112,7 @@ Global_getLocation = function()
   {
     if (navigator.geolocation) 
     {
-     var item =  navigator.geolocation.getCurrentPosition(Global_showPosition);     
+     var item =  navigator.geolocation.getCurrentPosition(Global_showPosition,errorCallbackLocation,{timeout:15000});     
     } 
   }
 
@@ -143,6 +143,13 @@ Global_getLocation = function()
 
   }
 
+//Callback function for Location delay
+errorCallbackLocation = function(error)
+      {
+        //console.log(error)
+        if(error.code==3)
+          alert(error.message+'. Cant Find Your Location,Try Again Later');
+      }
 
  function cancel_consult(thiss)
 {
@@ -248,7 +255,33 @@ function certificate_images_loadthumbnail(file)
 
 $(function(){
 
-  /*DOCTOR REGISTRATION-WIZARD STARTS*/
+  $('#colabor-auth-access').click(function(){
+    $('#colabor-auth-access-success,#colabor-auth-access-error').addClass('hidden');
+    var elem = this;
+    var colabor = elem.getAttribute('colabor');
+    if(colabor!=null&&colabor.length!=0)
+    {
+      var access_obj = $('#colabor-auth-access-form').serializeArray();
+      access_obj[access_obj.length] = {'name':'colabor_id','value':colabor};
+      console.log(access_obj);
+      var result = post_ajax(base_url+'Doctor/updateColaborator',access_obj);
+      var items = JSON.parse(result);
+      if(items.status=='success')
+      {
+        $('#colabor-auth-access-success').removeClass('hidden');
+      }
+      else
+      {
+        $('#colabor-auth-access-error').removeClass('hidden');
+      }
+    }
+    else
+    {
+      $('#colabor-auth-access-error').removeClass('hidden');
+    }
+  })
+
+  /*COLABORATOR ADDING EMAIL VALIDATION STARTS*/
 /*----------------------------------*/
  window.Parsley.addValidator('emailcolabor', {
     requirementType: 'string',
@@ -273,14 +306,28 @@ $(function(){
 
   $('#add-colaborator-btn').click(function()
   {
+    $('#authorize-access-div,#colabor-add-success,#colabor-auth-access-success,#colabor-auth-access-error,#colabor-add-error').addClass('hidden');
     if($('#add-colaborator-form').parsley().validate())
     {
-     
-      var result = post_ajax(base_url+'Doctor/saveColaborator',$('#add-colaborator-form').serialize());
+      var formData = new FormData();
+      formData.append('data',$('#add-colaborator-form').serialize());
+      formData.append('image', $('#colabor-pic')[0].files[0]);      // Attach file
+      
+      var result = post_ajax_serialize(base_url+'Doctor/saveColaborator',formData);
       var items = JSON.parse(result);
+      console.log(items);
       if(items.status=="success")
       {
-        
+        $('#colabor-auth-access').attr('colabor',items.colaborator);
+        $('#authorize-access-div,#colabor-add-success').removeClass('hidden');
+      }
+      else if(items.status=="error" && items.error=="Upload Error")
+      {
+        $('#colabor-add-error').removeClass('hidden').html(items.message);
+      }
+      else 
+      {
+        $('#colabor-add-error').removeClass('hidden');
       }
     }
   })
@@ -1640,7 +1687,7 @@ $('#book_payment_btn').click(function(){
     {
       if (navigator.geolocation) 
       {
-        navigator.geolocation.getCurrentPosition(showPosition_home);
+        navigator.geolocation.getCurrentPosition(showPosition_home,errorCallbackLocation,{timeout:15000});
       }
       function showPosition_home(position) 
       {
@@ -1662,6 +1709,7 @@ $('#book_payment_btn').click(function(){
 
 $('.filter-change').on('change',function()
 {
+
 $('#search_filter_loader').removeClass('hidden');
   setTimeout(function(){
 
@@ -1670,7 +1718,11 @@ $('#search_filter_loader').removeClass('hidden');
       
       if (navigator.geolocation) 
       {
-        navigator.geolocation.getCurrentPosition(showPosition);
+        navigator.geolocation.getCurrentPosition(showPosition,errorCallbackLocation,{timeout:15000});
+      }
+      else
+      {
+        alert("Cant Find Location.Try Again");
       }
       function showPosition(position) 
       {
@@ -1729,11 +1781,11 @@ $("#login_submit").click(function()
       {
         if (navigator.geolocation) 
         {
-         var item =  navigator.geolocation.getCurrentPosition(showPosition);
+         var item =  navigator.geolocation.getCurrentPosition(showPosition,errorCallbackLocation,{timeout:15000});
         } 
         
       }
-
+      
       showPosition = function(position) {
         /*code for reverse geo location*/
           var geocoder = new google.maps.Geocoder;
diff --git a/assets/uploads/profilepic/doctor_collaborator/1_51b91bba5a3fd9b6c8b9c53bc0ab6c65.jpg b/assets/uploads/profilepic/doctor_collaborator/1_51b91bba5a3fd9b6c8b9c53bc0ab6c65.jpg
new file mode 100644
index 0000000..e2b9fef
Binary files /dev/null and b/assets/uploads/profilepic/doctor_collaborator/1_51b91bba5a3fd9b6c8b9c53bc0ab6c65.jpg differ
diff --git a/assets/uploads/profilepic/doctor_collaborator/3_51b91bba5a3fd9b6c8b9c53bc0ab6c65.jpg b/assets/uploads/profilepic/doctor_collaborator/3_51b91bba5a3fd9b6c8b9c53bc0ab6c65.jpg
new file mode 100644
index 0000000..e2b9fef
Binary files /dev/null and b/assets/uploads/profilepic/doctor_collaborator/3_51b91bba5a3fd9b6c8b9c53bc0ab6c65.jpg differ
diff --git a/assets/uploads/profilepic/doctor_collaborator/7_51b91bba5a3fd9b6c8b9c53bc0ab6c65.jpg b/assets/uploads/profilepic/doctor_collaborator/7_51b91bba5a3fd9b6c8b9c53bc0ab6c65.jpg
new file mode 100644
index 0000000..e2b9fef
Binary files /dev/null and b/assets/uploads/profilepic/doctor_collaborator/7_51b91bba5a3fd9b6c8b9c53bc0ab6c65.jpg differ