Skip to content

D
dcarfixers
Commit d4ba340f by Tobin
Options

daily commit

parent ca1cdefa
Showing with 108 additions and 24 deletions
application/controllers/Mechanic.php
...@@ -112,7 +112,17 @@ class Mechanic extends CI_Controller { ...@@ -112,7 +112,17 @@ class Mechanic extends CI_Controller {
}else if($err == 0 && (!isset($_POST['location']) || empty($_POST['location']))){ }else if($err == 0 && (!isset($_POST['location']) || empty($_POST['location']))){
$err = 1; $err = 1;
$errMsg = 'Provide a Functional Area'; $errMsg = 'Provide a Functional Area';
}else if($err == 0 && (!isset($_POST['start_time']) || empty($_POST['start_time']))){
$err = 1;
$errMsg = 'Provide Work Start Time';
}else if($err == 0 && (!isset($_POST['end_time']) || empty($_POST['end_time']))){
$err = 1;
$errMsg = 'Provide Work End Time';
}else if($err == 0 && ($_POST['start_time'] >= $_POST['end_time'])){
$err = 1;
$errMsg = 'Provide proper Working Hours';
} }
$fnLocation = getLocationLatLng($_POST['location']); $fnLocation = getLocationLatLng($_POST['location']);
if(empty($fnLocation)){ if(empty($fnLocation)){
$err = 1; $err = 1;
...@@ -228,7 +238,17 @@ class Mechanic extends CI_Controller { ...@@ -228,7 +238,17 @@ class Mechanic extends CI_Controller {
}else if($err == 0 && (!isset($_POST['location']) || empty($_POST['location']))){ }else if($err == 0 && (!isset($_POST['location']) || empty($_POST['location']))){
$err = 1; $err = 1;
$errMsg = 'Provide a Functional Area'; $errMsg = 'Provide a Functional Area';
}else if($err == 0 && (!isset($_POST['start_time']) || empty($_POST['start_time']))){
$err = 1;
$errMsg = 'Provide Work Start Time';
}else if($err == 0 && (!isset($_POST['end_time']) || empty($_POST['end_time']))){
$err = 1;
$errMsg = 'Provide Work End Time';
}else if($err == 0 && ($_POST['start_time'] >= $_POST['end_time'])){
$err = 1;
$errMsg = 'Provide proper Working Hours';
} }
$fnLocation = getLocationLatLng($_POST['location']); $fnLocation = getLocationLatLng($_POST['location']);
if(empty($fnLocation)){ if(empty($fnLocation)){
$err = 1; $err = 1;
...@@ -257,7 +277,7 @@ class Mechanic extends CI_Controller { ...@@ -257,7 +277,7 @@ class Mechanic extends CI_Controller {
if($err == 1){ if($err == 1){
$flashMsg['message'] = $errMsg; $flashMsg['message'] = $errMsg;
$this->session->set_flashdata('message',$flashMsg); $this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Mechanic/addMechanic')); redirect(base_url('Mechanic/editMechanics/'.$mechanic_id));
} }
$_POST['location_lat'] = $fnLocation['lat']; $_POST['location_lat'] = $fnLocation['lat'];
......
application/models/Mechanic_model.php
...@@ -46,7 +46,9 @@ class Mechanic_model extends CI_Model { ...@@ -46,7 +46,9 @@ class Mechanic_model extends CI_Model {
'licence'=>$mechanic_data['licence'], 'licence'=>$mechanic_data['licence'],
'location'=>$mechanic_data['location'], 'location'=>$mechanic_data['location'],
'email_id'=>$mechanic_data['email_id'], 'email_id'=>$mechanic_data['email_id'],
'end_time'=>$mechanic_data['end_time'],
'last_name'=>$mechanic_data['last_name'], 'last_name'=>$mechanic_data['last_name'],
'start_time'=>$mechanic_data['start_time'],
'first_name'=>$mechanic_data['first_name'], 'first_name'=>$mechanic_data['first_name'],
'location_lat'=>$mechanic_data['location_lat'], 'location_lat'=>$mechanic_data['location_lat'],
'location_lng'=>$mechanic_data['location_lng'], 'location_lng'=>$mechanic_data['location_lng'],
...@@ -109,6 +111,8 @@ class Mechanic_model extends CI_Model { ...@@ -109,6 +111,8 @@ class Mechanic_model extends CI_Model {
'address'=>$mechanic_data['address'],'email_id'=>$mechanic_data['email_id'], 'address'=>$mechanic_data['address'],'email_id'=>$mechanic_data['email_id'],
'last_name'=>$mechanic_data['last_name'],'phone'=>$mechanic_data['phone'], 'last_name'=>$mechanic_data['last_name'],'phone'=>$mechanic_data['phone'],
'location'=>$mechanic_data['location'], 'location'=>$mechanic_data['location'],
'end_time'=>$mechanic_data['end_time'],
'start_time'=>$mechanic_data['start_time'],
'location_lat'=>$mechanic_data['location_lat'], 'location_lat'=>$mechanic_data['location_lat'],
'location_lng'=>$mechanic_data['location_lng'], 'location_lng'=>$mechanic_data['location_lng'],
'licence_number'=>$mechanic_data['licence_number'], 'licence_number'=>$mechanic_data['licence_number'],
...@@ -137,18 +141,38 @@ class Mechanic_model extends CI_Model { ...@@ -137,18 +141,38 @@ class Mechanic_model extends CI_Model {
$current_lat = $pickLocData['pickup_lat']; $current_lat = $pickLocData['pickup_lat'];
$current_lng = $pickLocData['pickup_lng']; $current_lng = $pickLocData['pickup_lng'];
$sql = "SELECT ME.*, MS.*, $sql = "SELECT ME.*,MS.shop_name,MS.address AS shop_address,
3956 * 2 * ASIN(SQRT(POWER(SIN(($current_lat-ME.location_lat)*pi()/180/2),2)+ MS.phone AS shop_phone,MS.email_id AS shop_email_id,
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)* COS($current_lat*pi()/180 )*COS(ME.location_lat*pi()/180)*
POWER(SIN(($current_lng-ME.location_lng)*pi()/180/2),2) )) as distance POWER(SIN(($current_lng-ME.location_lng)*pi()/180/2),2) )) AS distance
FROM mechanic AS ME FROM mechanic AS ME
INNER JOIN admin_users AS AU ON (AU.id=ME.mechanic_id) 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') LEFT JOIN mechanic_shop AS MS ON (MS.shop_id=ME.shop_id AND MS.status='1')
WHERE AU.status = '1' WHERE AU.status='1'
HAVING distance<10"; -- HAVING distance<30";
pr($this->db->query($sql)); $mechData = $this->db->query($sql);
if(empty($mechData) || empty($mechData = $mechData->result_array())){
return 0;
}
$mechDataArr = array();
$default_timer = array('09:00 AM','10:00 AM','11:00 AM','12:00 PM','01:00 PM','02:00 PM','03:00 PM','04:00 PM','05:00 PM','06:00 PM');
foreach($mechData AS $data){
if(empty($data['start_time']) || empty($data['end_time'])){
continue;
}
$endTime = strtotime($data['end_time']);
$schTime = strtotime($data['start_time']);
$custom_timer = array();
for( ; $schTime <= $endTime ; $schTime += 3600){
$custom_timer[] = $schTime;
}
pr($custom_timer);
}
return $mechData;
} }
} }
?> ?>
\ No newline at end of file
application/views/Mechanic/mechanicForm.php
...@@ -151,6 +151,27 @@ ...@@ -151,6 +151,27 @@
value="<?= (isset($user_data->phone))?$user_data->phone:'' ?>" name="phone" placeholder="Enter Phone Number" > value="<?= (isset($user_data->phone))?$user_data->phone:'' ?>" name="phone" placeholder="Enter Phone Number" >
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div> </div>
<div class="form-group" style="display:inline-flex;">
<div style="width:250px;" class="clockpicker" data-autoclose="true">
<label>Working Hours</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required name="start_time" placeholder="Work Start Time"
value="<?= (isset($user_data->start_time))?$user_data->start_time:'' ?>"
id="start_time" autocomplete="off" >
<span class="glyphicon form-control-feedback"></span>
</div>
<div style="width:250px;padding-left:10px;padding-top:25px;"
class="clockpicker" data-autoclose="true">
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" placeholder="Work End Time" autocomplete="off"
value="<?= (isset($user_data->end_time))?$user_data->end_time:'' ?>" id="end_time"
name="end_time">
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label>Licence Number</label> <label>Licence Number</label>
<input type="text" class="form-control" data-parsley-trigger="change" <input type="text" class="form-control" data-parsley-trigger="change"
......
assets/js/custom-script.js
...@@ -202,6 +202,15 @@ jQuery('[id="viewMechanic"]').on('click',function() { ...@@ -202,6 +202,15 @@ jQuery('[id="viewMechanic"]').on('click',function() {
'<div class="col-md-6"><label>'+mechanic_data['state']+'</label></div> '+ '<div class="col-md-6"><label>'+mechanic_data['state']+'</label></div> '+
'</div> '+ '</div> '+
'<div class="row"> '+ '<div class="row"> '+
'<div class="col-md-4">Working Hours</div>'+
'<div class="col-md-1">:</div>'+
'<div class="col-md-6">'+
'<label>'+
mechanic_data['start_time']+' - '+mechanic_data['end_time']+
'</label>'+
'</div> '+
'</div> '+
'<div class="row"> '+
'<div class="col-md-4">Location</div>'+ '<div class="col-md-4">Location</div>'+
'<div class="col-md-1">:</div>'+ '<div class="col-md-1">:</div>'+
'<div class="col-md-6"><label>'+mechanic_data['location']+'</label></div> '+ '<div class="col-md-6"><label>'+mechanic_data['location']+'</label></div> '+
......
sql/tobin_dcarfixers.sql
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
-- https://www.phpmyadmin.net/ -- https://www.phpmyadmin.net/
-- --
-- Host: db -- Host: db
-- Generation Time: Jan 04, 2019 at 12:37 PM -- Generation Time: Jan 08, 2019 at 01:31 PM
-- Server version: 5.6.41 -- Server version: 5.6.41
-- PHP Version: 7.2.8 -- PHP Version: 7.2.8
...@@ -44,9 +44,11 @@ CREATE TABLE `admin_users` ( ...@@ -44,9 +44,11 @@ CREATE TABLE `admin_users` (
INSERT INTO `admin_users` (`id`, `username`, `password`, `user_type`, `display_name`, `profile_image`, `status`) VALUES INSERT INTO `admin_users` (`id`, `username`, `password`, `user_type`, `display_name`, `profile_image`, `status`) VALUES
(1, 'admin', '202cb962ac59075b964b07152d234b70', 1, 'Super Admin User', 'assets/uploads/services/1543990056_1523012120_default.png', 1), (1, 'admin', '202cb962ac59075b964b07152d234b70', 1, 'Super Admin User', 'assets/uploads/services/1543990056_1523012120_default.png', 1),
(2, 'mechanic', '202cb962ac59075b964b07152d234b70', 2, 'Mechanic', 'assets/uploads/services/1544088354_car1.jpg', 1), (2, 'mechanic', '202cb962ac59075b964b07152d234b70', 2, 'Mechanic', 'assets/uploads/services/1546929651_audi-r8-1366x786.jpg', 1),
(11, 'cfghbfchdrfg', '97a4aa7bfb0e20d7b9813ffe99f91fd4', 2, 'lnoik', 'assets/uploads/services/1544013534_images.jpg', 0), (11, 'cfghbfchdrfg', '97a4aa7bfb0e20d7b9813ffe99f91fd4', 2, 'lnoik', 'assets/uploads/services/1544013534_images.jpg', 1),
(12, 'admin123', '202cb962ac59075b964b07152d234b70', 2, 'Super Admin', 'assets/uploads/services/1544091403_Himalayan.jpg', 1); (12, 'admin123', '202cb962ac59075b964b07152d234b70', 2, 'Super Admin', 'assets/uploads/services/1544091403_Himalayan.jpg', 1),
(13, 'jansa', '202cb962ac59075b964b07152d234b70', 2, 'Jensa Mechanic', 'assets/uploads/services/1546851554_234858854male.jpg', 1),
(14, 'mechanic_1', '202cb962ac59075b964b07152d234b70', 2, 'Super Mechanic 1', 'assets/uploads/services/1546929755_1523012036_hj.jpg', 1);
-- -------------------------------------------------------- -- --------------------------------------------------------
...@@ -165,7 +167,8 @@ INSERT INTO `issues` (`issue_id`, `issue`, `issue_image`, `status`) VALUES ...@@ -165,7 +167,8 @@ INSERT INTO `issues` (`issue_id`, `issue`, `issue_image`, `status`) VALUES
(9, 'Wheel Maintenance', 'assets/uploads/services/images8.jpg', 2), (9, 'Wheel Maintenance', 'assets/uploads/services/images8.jpg', 2),
(10, 'AC Maintenance', 'assets/uploads/services/car_ac.jpg', 2), (10, 'AC Maintenance', 'assets/uploads/services/car_ac.jpg', 2),
(11, 'Oil Change and General Service', 'assets/uploads/services/images9.jpg', 1), (11, 'Oil Change and General Service', 'assets/uploads/services/images9.jpg', 1),
(12, 'General Service', 'assets/uploads/services/Twitch_KingpinSkin_old2_HD1.jpg', 1); (12, 'General Service', 'assets/uploads/services/Twitch_KingpinSkin_old2_HD1.jpg', 1),
(13, 'Oil Change and General Service (Free Water Service and Polishing).', 'assets/uploads/services/Himalayan.jpg', 1);
-- -------------------------------------------------------- -- --------------------------------------------------------
...@@ -191,7 +194,8 @@ INSERT INTO `issues_category` (`issue_cat_id`, `issue_id`, `issue_category`, `is ...@@ -191,7 +194,8 @@ INSERT INTO `issues_category` (`issue_cat_id`, `issue_id`, `issue_category`, `is
(7, 11, 'Oil Change', 'assets/uploads/services/Twitch_KingpinSkin_old2_HD.jpg', 1500, 'Oil Change and general service with free water service. Oil Change and general service with free water service. Oil Change and general service with free water service. ', 1), (7, 11, 'Oil Change', 'assets/uploads/services/Twitch_KingpinSkin_old2_HD.jpg', 1500, 'Oil Change and general service with free water service. Oil Change and general service with free water service. Oil Change and general service with free water service. ', 1),
(8, 11, 'Oil Top Up ', 'assets/uploads/services/Himalayan1.jpg', 500, 'Oil Top Up and general service with free water service. ', 1), (8, 11, 'Oil Top Up ', 'assets/uploads/services/Himalayan1.jpg', 500, 'Oil Top Up and general service with free water service. ', 1),
(9, 12, 'General Service L:0', 'assets/uploads/services/park-512.png', 700, 'With out Water Service and Polishing. With out Water Service and Polishing. With out Water Service and Polishing. With out Water Service and Polishing. ', 1), (9, 12, 'General Service L:0', 'assets/uploads/services/park-512.png', 700, 'With out Water Service and Polishing. With out Water Service and Polishing. With out Water Service and Polishing. With out Water Service and Polishing. ', 1),
(10, 12, 'General Service L:1', 'assets/uploads/services/car.jpg', 700, 'Free Water Service and Polishing. Free Water Service and Polishing. Free Water Service and Polishing. Free Water Service and Polishing. ', 1); (10, 12, 'General Service L:1', 'assets/uploads/services/car.jpg', 700, 'Free Water Service and Polishing. Free Water Service and Polishing. Free Water Service and Polishing. Free Water Service and Polishing. ', 1),
(11, 13, 'Oil Change and General Service', 'assets/uploads/services/orig.jpg', 1500, 'Oil Change and General Service without free water service. Oil Change and General Service without free water service. Oil Change and General Service without free water service. ', 1);
-- -------------------------------------------------------- -- --------------------------------------------------------
...@@ -213,18 +217,23 @@ CREATE TABLE `mechanic` ( ...@@ -213,18 +217,23 @@ CREATE TABLE `mechanic` (
`licence` varchar(500) NOT NULL, `licence` varchar(500) NOT NULL,
`licence_number` varchar(250) DEFAULT NULL, `licence_number` varchar(250) DEFAULT NULL,
`licence_exp_date` varchar(250) DEFAULT NULL, `licence_exp_date` varchar(250) DEFAULT NULL,
`location` varchar(250) DEFAULT NULL,
`location_lat` varchar(30) DEFAULT NULL, `location_lat` varchar(30) DEFAULT NULL,
`location_lng` varchar(30) DEFAULT NULL `location_lng` varchar(30) DEFAULT NULL,
`start_time` varchar(250) DEFAULT NULL,
`end_time` varchar(250) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1; ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --
-- Dumping data for table `mechanic` -- Dumping data for table `mechanic`
-- --
INSERT INTO `mechanic` (`id`, `mechanic_id`, `shop_id`, `first_name`, `last_name`, `email_id`, `phone`, `address`, `city`, `state`, `licence`, `licence_number`, `licence_exp_date`, `location_lat`, `location_lng`) VALUES INSERT INTO `mechanic` (`id`, `mechanic_id`, `shop_id`, `first_name`, `last_name`, `email_id`, `phone`, `address`, `city`, `state`, `licence`, `licence_number`, `licence_exp_date`, `location`, `location_lat`, `location_lng`, `start_time`, `end_time`) VALUES
(1, 2, 0, 'Tobin', 'Thomas', '[email protected]', '9995559194', 'Techware Software Solution', 'Ernakulam', 'Kerala', 'assets/uploads/services/1544088274_1523012036_hj.jpg', '', '', NULL, NULL), (1, 2, 0, 'Tobin', 'Thomas', '[email protected]', '9995559194', 'Techware Software Solution', 'Ernakulam', 'Kerala', 'assets/uploads/services/1546929651_1523012036_hj.jpg', 'LI000515456', '01/29/2019', 'FL, USA', '27.6648274', '-81.5157535', '10:00', '17:00'),
(5, 11, 0, 'kjo', 'kjo', '[email protected]', '34653456344456', 'Techware', 'Aiea', 'Hawaii', 'assets/uploads/services/1544091718_sniper.jpg', 'dfrgdersgt', '12/13/2018', NULL, NULL), (5, 11, 0, 'kjo', 'kjo', '[email protected]', '34653456344456', 'Techware', 'Aiea', 'Hawaii', 'assets/uploads/services/1544091718_sniper.jpg', 'dfrgdersgt', '12/13/2018', 'FL, USA', '27.6648274', '-81.5157535', NULL, NULL),
(6, 12, 0, 'Driver', 'john', '[email protected]', '9995551234', 'Techware', 'Aiea', 'Hawaii', 'assets/uploads/services/1544091568_1523012036_hj.jpg', 'LI00051545', '12/25/2018', NULL, NULL); (6, 12, 0, 'Driver', 'john', '[email protected]', '9995551234', 'Techware', 'Aiea', 'Hawaii', 'assets/uploads/services/1544091568_1523012036_hj.jpg', 'LI00051545', '12/25/2018', NULL, NULL, NULL, NULL, NULL),
(7, 13, 1, 'Jensa', 'Jose', '[email protected]', '9995559856', 'Techware', 'Aiea', 'Hawaii', 'assets/uploads/services/1546851554_1523012036_hj.jpg', 'LI0005154', '01/30/2019', 'Grand Rapids, MI, USA', '42.9633599', '-85.6680863', NULL, NULL),
(8, 14, 0, 'Tobin', 'Thomas', '[email protected]', '9934534594', 'Techware', 'Aiea', 'Hawaii', 'assets/uploads/services/1546929755_1523012036_hj1.jpg', 'LI000515456', '01/29/2019', 'J K O\'Donnell\'s, West Wayne Street, Fort Wayne, IN, USA', '41.0780191', '-85.1402719', '10:00', '17:00');
-- -------------------------------------------------------- -- --------------------------------------------------------
...@@ -379,7 +388,7 @@ ALTER TABLE `setting` ...@@ -379,7 +388,7 @@ ALTER TABLE `setting`
-- AUTO_INCREMENT for table `admin_users` -- AUTO_INCREMENT for table `admin_users`
-- --
ALTER TABLE `admin_users` ALTER TABLE `admin_users`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=13; MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=15;
-- --
-- AUTO_INCREMENT for table `customers` -- AUTO_INCREMENT for table `customers`
...@@ -403,19 +412,19 @@ ALTER TABLE `forgot_password_link` ...@@ -403,19 +412,19 @@ ALTER TABLE `forgot_password_link`
-- AUTO_INCREMENT for table `issues` -- AUTO_INCREMENT for table `issues`
-- --
ALTER TABLE `issues` ALTER TABLE `issues`
MODIFY `issue_id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=13; MODIFY `issue_id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=14;
-- --
-- AUTO_INCREMENT for table `issues_category` -- AUTO_INCREMENT for table `issues_category`
-- --
ALTER TABLE `issues_category` ALTER TABLE `issues_category`
MODIFY `issue_cat_id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=11; MODIFY `issue_cat_id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=12;
-- --
-- AUTO_INCREMENT for table `mechanic` -- AUTO_INCREMENT for table `mechanic`
-- --
ALTER TABLE `mechanic` ALTER TABLE `mechanic`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7; MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=9;
-- --
-- AUTO_INCREMENT for table `mechanic_issues` -- AUTO_INCREMENT for table `mechanic_issues`
......
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