daily commit

application/controllers/Mechanic.php

@@ -109,7 +109,16 @@ class Mechanic extends CI_Controller {
         }else if($err == 0 && (!isset($_POST['address']) || empty($_POST['address']))){
             $err = 1;
 			$errMsg = 'Provide an address';
+        }else if($err == 0 && (!isset($_POST['location']) || empty($_POST['location']))){
+            $err = 1;
+			$errMsg = 'Provide a Functional Area';
+        }
+        $fnLocation = getLocationLatLng($_POST['location']);
+    	if(empty($fnLocation)){
+    		$err = 1;
+			$errMsg = 'Provide a Valid Functional Area';
     	}
+
         if($err == 0){
 	        $config = set_upload_service("assets/uploads/services");
 	        $this->load->library('upload');
@@ -139,6 +148,8 @@ class Mechanic extends CI_Controller {
             redirect(base_url('Mechanic/addMechanic'));
 		}
 		$_POST['password'] = md5($_POST['password']);
+		$_POST['location_lat'] = $fnLocation['lat'];
+		$_POST['location_lng'] = $fnLocation['lng'];
 
         $status = $this->Mechanic_model->addMechanic($_POST);
         if($status == 1){
@@ -214,7 +225,16 @@ class Mechanic extends CI_Controller {
         }else if($err == 0 && (!isset($_POST['address']) || empty($_POST['address']))){
             $err = 1;
 			$errMsg = 'Provide your address';
+        }else if($err == 0 && (!isset($_POST['location']) || empty($_POST['location']))){
+            $err = 1;
+			$errMsg = 'Provide a Functional Area';
+        }
+        $fnLocation = getLocationLatLng($_POST['location']);
+    	if(empty($fnLocation)){
+    		$err = 1;
+			$errMsg = 'Provide a Valid Functional Area';
     	}
+    	
         if($err == 0){
 	        $config = set_upload_service("assets/uploads/services");
 	        $this->load->library('upload');
@@ -240,6 +260,8 @@ class Mechanic extends CI_Controller {
             redirect(base_url('Mechanic/addMechanic'));
 		}
 		
+		$_POST['location_lat'] = $fnLocation['lat'];
+		$_POST['location_lng'] = $fnLocation['lng'];
         $status = $this->Mechanic_model->updateMechanic(decode_param($mechanic_id),$_POST);
         if($status == 1){
             $flashMsg =array('message'=>'Successfully Updated User Details..!','class'=>'success');

application/controllers/Webservices.php

@@ -182,7 +182,7 @@ class Webservices extends CI_Controller {
 	  echo json_encode($respArr); exit;
 	}
 
-   // customer_registration
+	// getGeneralIssues
 	public function getGeneralIssues(){
 	  header('Content-type: application/json');
 
@@ -198,5 +198,25 @@ class Webservices extends CI_Controller {
 	  
 	  echo json_encode($respArr); exit;
 	}
+
+	// getNearByMechanics
+	public function getNearByMechanics(){
+	  header('Content-type: application/json');
+	  $post = file_get_contents("php://input");
+	  $postData = json_decode($post, true);
+	  $this->load->model('Mechanic_model');
+
+	  $respArr = array('status'=>'0','message'=>'Something went wrong.');
+
+	  $mechanic_data = $this->Mechanic_model->getNearByMechanics($postData);
+
+	  if(!empty($issue_data)){
+	     $respArr['status'] = '1';
+	     $respArr['message'] = 'Success';
+	     $respArr['mechanic_data'] = $mechanic_data;
+	  }
+	  
+	  echo json_encode($respArr); exit;
+	}
 }
 ?>

application/models/Mechanic_model.php

@@ -44,9 +44,12 @@ class Mechanic_model extends CI_Model {
 											  'shop_id'=>$mechanic_data['shop_id'],
 											  'address'=>$mechanic_data['address'],
 											  'licence'=>$mechanic_data['licence'],
+											  'location'=>$mechanic_data['location'],
 											  'email_id'=>$mechanic_data['email_id'],
 											  'last_name'=>$mechanic_data['last_name'],
 											  'first_name'=>$mechanic_data['first_name'],
+											  'location_lat'=>$mechanic_data['location_lat'],
+											  'location_lng'=>$mechanic_data['location_lng'],
 											  'licence_number'=>$mechanic_data['licence_number'],
 											  'licence_exp_date'=>$mechanic_data['licence_exp_date']));
  		return $status;
@@ -105,6 +108,9 @@ class Mechanic_model extends CI_Model {
  						  'state'=>$mechanic_data['state'],'shop_id'=>$mechanic_data['shop_id'],
  						  'address'=>$mechanic_data['address'],'email_id'=>$mechanic_data['email_id'],
  						  'last_name'=>$mechanic_data['last_name'],'phone'=>$mechanic_data['phone'],
+ 						  'location'=>$mechanic_data['location'],
+ 						  'location_lat'=>$mechanic_data['location_lat'],
+ 						  'location_lng'=>$mechanic_data['location_lng'],
  						  'licence_number'=>$mechanic_data['licence_number'],
  						  'licence_exp_date'=>$mechanic_data['licence_exp_date']);
 
@@ -122,5 +128,27 @@ class Mechanic_model extends CI_Model {
  		$status = $this->db->update('admin_users',array('status'=>$status),array('id'=>$mechanic_id));
  		return $status;
  	}
+
+ 	function getNearByMechanics($pickLocData = array()){
+ 		if(empty($pickLocData)){
+ 			return 0;
+ 		}
+
+ 		$current_lat = $pickLocData['pickup_lat'];
+        $current_lng = $pickLocData['pickup_lng'];
+
+        $sql = "SELECT ME.*, MS.*,
+        			   3956 * 2 * ASIN(SQRT(POWER(SIN(($current_lat-ME.location_lat)*pi()/180/2),2)+
+        			   COS($current_lat*pi()/180 )*COS(ME.location_lat*pi()/180)*
+        			   POWER(SIN(($current_lng-ME.location_lng)*pi()/180/2),2) )) as distance
+    			FROM mechanic AS ME
+    			INNER JOIN admin_users AS AU ON (AU.id=ME.mechanic_id)
+    			LEFT JOIN mechanic_shop AS MS ON (MS.shop_id=ME.shop_id AND MS.status='1')
+                WHERE AU.status = '1'
+                HAVING distance<10";
+
+		pr($this->db->query($sql));
+
+ 	}
 }
 ?>
\ No newline at end of file

application/views/Mechanic/mechanicForm.php

@@ -112,6 +112,12 @@
                   required=""  name="state" placeholder="Enter email ID" value="<?= (isset($user_data->state))?$user_data->state:'' ?>">
                   <span class="glyphicon form-control-feedback"></span>
                 </div> 
+                <div class="form-group">
+                  <label>Functional Area</label>
+                  <input type="text" class="form-control" data-parsley-trigger="change" 
+                  id="loc_search_1" name="location" placeholder="Choose Functional Area" value="<?= (isset($user_data->location))?$user_data->location:'' ?>">
+                  <span class="glyphicon  form-control-feedback"></span>
+                </div>
                 <?php if(!empty($shop_data)){ ?>
                   <div class="form-group">
                     <label>Workshop</label>

assets/js/custom-script.js

@@ -201,6 +201,11 @@ jQuery('[id="viewMechanic"]').on('click',function() {
                               '<div class="col-md-1">:</div>'+
                               '<div class="col-md-6"><label>'+mechanic_data['state']+'</label></div> '+
                             '</div> '+
+                            '<div class="row"> '+
+                              '<div class="col-md-4">Location</div>'+
+                              '<div class="col-md-1">:</div>'+
+                              '<div class="col-md-6"><label>'+mechanic_data['location']+'</label></div> '+
+                            '</div> '+
                             shopHtml+
                           '</div> '+
                           '<div class="col-md-5"> '+