Skip to content

D
dcarfixers
Commit 6737fc71 by Tobin
Options

daily commit

parent 0f8c5e10
Showing with 462 additions and 133 deletions
application/controllers/Issue.php
......@@ -20,7 +20,6 @@ class Issue extends CI_Controller {
$template['pTitle'] = "Add Issue";
$template['pDescription'] = "Create New Issue";
$template['issue_data'] = $this->Issue_model->getIssues();
$this->load->view('template',$template);
}
......@@ -50,7 +49,7 @@ class Issue extends CI_Controller {
public function createIssue(){
$err = 0;
$errMsg = '';
$errMsg = 'Something went wrong, please try again..!';
$this->load->library('upload',set_upload_service("assets/uploads/services"));
$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
if(!isset($_POST) || empty($_POST)){
......@@ -90,7 +89,7 @@ class Issue extends CI_Controller {
$files = $_FILES;
if($err == 0){
$typ = 0;
$issueTyp = array();
$insertSubTyp = array();
for ($typ = 0; $typ < count($_POST['issue_category']); $typ++) {
if(!isset($_POST['issue_category'][$typ]) ||
......@@ -114,7 +113,7 @@ class Issue extends CI_Controller {
$imgData = $this->upload->data();
$image_name = "assets/uploads/services/".$imgData['file_name'];
$issueTyp[] = array('issue_category' => $_POST['issue_category'][$typ],
$insertSubTyp[] = array('issue_category' => $_POST['issue_category'][$typ],
'issue_cat_image' => $image_name,'status'=>'1',
'default_service_fee' => $_POST['default_service_fee'][$typ],
'default_description' => $_POST['default_description'][$typ]);
......@@ -138,7 +137,7 @@ class Issue extends CI_Controller {
redirect(base_url('Issue/addIssue'));
}
$status = $this->Issue_model->addIssue($_POST,$issueTyp);
$status = $this->Issue_model->addIssue($_POST,$insertSubTyp);
if($status == 1){
$flashMsg =array('message'=>'Successfully Updated Issue Details..!','class'=>'success');
$this->session->set_flashdata('message', $flashMsg);
......@@ -150,7 +149,7 @@ class Issue extends CI_Controller {
}
public function editIssue($issue_id = ''){
$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
$flashMsg=array('message'=>'Something went wrong, please try again..!','class'=>'error');
if(empty($issue_id) || !is_numeric($issue_id = decode_param($issue_id))){
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Issue/viewIssues'));
......@@ -173,35 +172,117 @@ class Issue extends CI_Controller {
public function updateIssue($issue_id = ''){
$err = 0;
$errMsg = '';
$errMsg = 'Something went wrong, please try again..!';
$this->load->library('upload',set_upload_service("assets/uploads/services"));
$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
if(empty($issue_id) || !isset($_POST) || empty($_POST) || !is_numeric(decode_param($issue_id))){
if(empty($issue_id) || !is_numeric($issue_id = decode_param($issue_id))){
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Issue/viewIssues'));
}
if(!isset($_POST) || empty($_POST)){
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Issue/addIssue'));
$err = 1;
}
if($err == 0 && (!isset($_POST['issue']) || empty($_POST['issue']))){
$err = 1;
$errMsg = 'Provide a Issue Short Discription';
$errMsg = 'Provide Issue Short Discription';
}
else if($err == 0 && (!isset($_POST['extSubTypes']) || empty($_POST['extSubTypes']))){
$err = 1;
}
$insertSubTyp = array();
$updateSubTyp = array();
$issue_data = array('issue'=>$_POST['issue']);
if($err == 0){
foreach ($_POST['extSubTypes'] AS $typ_id) {
if(isset($_POST['issue_category_'.$typ_id]) &&
!empty($_POST['issue_category_'.$typ_id])){
$issue_category = $_POST['issue_category_'.$typ_id];
$updateSubTyp[$typ_id]['issue_category'] = $issue_category;
}
if(isset($_POST['default_description_'.$typ_id]) &&
!empty($_POST['default_description_'.$typ_id])){
$default_description = $_POST['default_description_'.$typ_id];
$updateSubTyp[$typ_id]['default_description'] = $default_description;
}
if(isset($_POST['default_service_fee_'.$typ_id]) &&
!empty($_POST['default_service_fee_'.$typ_id])){
$default_service_fee = $_POST['default_service_fee_'.$typ_id];
$updateSubTyp[$typ_id]['default_service_fee'] = $default_service_fee;
}
if(isset($_FILES['issue_cat_image_'.$typ_id]) &&
isset($_FILES['issue_cat_image_'.$typ_id]['name']) &&
!empty($_FILES['issue_cat_image_'.$typ_id]['name']) &&
$this->upload->do_upload('issue_cat_image_'.$typ_id)){
$imgData = $this->upload->data();
$issue_cat_image = "assets/uploads/services/".$imgData['file_name'];
$updateSubTyp[$typ_id]['issue_cat_image'] = $issue_cat_image;
}
}
if(isset($_POST['issue_category']) && count($_POST['issue_category']) > 0 &&
isset($_POST['default_description']) && count($_POST['default_description']) > 0 &&
isset($_POST['default_service_fee']) && count($_POST['default_service_fee']) > 0 &&
isset($_FILES['issue_cat_image']) && isset($_FILES['issue_cat_image']['name']) &&
count($_FILES['issue_cat_image']['name']) > 0 &&
count($_POST['issue_category']) == count($_POST['default_description']) &&
count($_POST['issue_category']) == count($_POST['default_service_fee']) &&
count($_POST['issue_category']) == count($_FILES['issue_cat_image']['name'])){
$typ = 0;
$files = $_FILES;
for ($typ = 0; $typ < count($_POST['issue_category']); $typ++) {
if(!isset($_POST['issue_category'][$typ]) ||
!isset($_POST['default_description'][$typ]) ||
!isset($_POST['default_service_fee'][$typ]) ||
!isset($_FILES['issue_cat_image']) ||
!isset($_FILES['issue_cat_image']['name']) ||
!isset($_FILES['issue_cat_image']['name'][$typ])){
break;
}
$_FILES['file']['name'] = $files['issue_cat_image']['name'][$typ];
$_FILES['file']['type'] = $files['issue_cat_image']['type'][$typ];
$_FILES['file']['size'] = $files['issue_cat_image']['size'][$typ];
$_FILES['file']['error'] = $files['issue_cat_image']['error'][$typ];
$_FILES['file']['tmp_name'] = $files['issue_cat_image']['tmp_name'][$typ];
if(!$this->upload->do_upload('file')){
continue;
}
$imgData = $this->upload->data();
$image_name = "assets/uploads/services/".$imgData['file_name'];
$insertSubTyp[] = array('issue_category' => $_POST['issue_category'][$typ],
'issue_cat_image' => $image_name,'status'=>'1',
'default_service_fee' => $_POST['default_service_fee'][$typ],
'default_description' => $_POST['default_description'][$typ],
'issue_id'=>$issue_id);
}
}
if($this->upload->do_upload('issue_image')){
$imgData = $this->upload->data();
$issue_data['issue_image'] = "assets/uploads/services/".$imgData['file_name'];
}
}
if($err == 1){
$flashMsg['message'] = $errMsg;
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Issue/addIssue'));
redirect(base_url('Issue/editIssue/'.encode_param($issue_id)));
}
$status = $this->Issue_model->updateIssue(decode_param($issue_id),$_POST);
$status = $this->Issue_model->updateIssue($issue_id,$issue_data,$updateSubTyp,$insertSubTyp);
if($status == 1){
$flashMsg =array('message'=>'Successfully Updated Issue Details..!','class'=>'success');
$this->session->set_flashdata('message', $flashMsg);
redirect(base_url('Issue/viewIssues'));
} else {
$this->session->set_flashdata('message', $flashMsg);
redirect(base_url('Issue/editIssue/'.$issue_id));
redirect(base_url('Issue/editIssue/'.encode_param($issue_id)));
}
}
......@@ -214,13 +295,14 @@ class Issue extends CI_Controller {
$template['menu'] = 'Issue Management';
$template['smenu'] = 'Issue Mapping';
$template['pTitle'] = "Issue Mapping";
$template['pDescription'] = "Creating Couston Issues";
$template['pDescription'] = "Creating Custom Issues";
$template['issue_data'] = $this->Issue_model->getIssues('',1);
$template['mechanic_id'] = encode_param($this->session->userdata('id'));
$mechanic_id = $this->session->userdata('id');
$template['issue_data'] = $this->Issue_model->getUnMappedIssues($mechanic_id,1);
$template['mechanic_id'] = encode_param($mechanic_id);
if(empty($template['issue_data'])){
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Issue/viewIssues'));
redirect(base_url('Issue/viewMappedIssues/'.$mechanic_id));
}
$this->load->view('template',$template);
}
......@@ -229,32 +311,37 @@ class Issue extends CI_Controller {
$err = 0;
$errMsg = '';
$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
if(!isset($_POST) || empty($_POST) || !isset($_POST['mechanic_id']) ||
empty(($_POST['mechanic_id'])) ||
!is_numeric($_POST['mechanic_id'] = decode_param($_POST['mechanic_id']))){
if(!isset($_POST) || empty($_POST) || !isset($_POST['mapping_type']) ||
!isset($_POST['issue_id']) || empty($_POST['issue_id']) ||
!isset($_POST['mechanic_id']) || empty($_POST['mechanic_id']) ||
!is_numeric($_POST['issue_id'] = decode_param($_POST['issue_id'])) ||
!is_numeric($_POST['mechanic_id'] = decode_param($_POST['mechanic_id'])) ||
($_POST['mapping_type'] == 1 &&
(!isset($_POST['issue_cat_ids']) || empty($_POST['issue_cat_ids'])))){
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Issue/issueMapping'));
}
if($err == 0 && (!isset($_POST['issue_id']) || empty($_POST['issue_id']))){
$err = 1;
$errMsg = 'Choose as Issue';
}
else if($err == 0 && (!isset($_POST['service_fee']) || empty($_POST['service_fee']))){
$err = 1;
$errMsg = 'Provide a Service Cost';
$custom_issue = array();
if($_POST['mapping_type'] == 1){
foreach($_POST['issue_cat_ids'] AS $type_ids) {
if(isset($_POST['default_service_fee_'.$type_ids]) &&
!empty($_POST['default_service_fee_'.$type_ids]) &&
isset($_POST['default_description_'.$type_ids]) &&
!empty($_POST['default_description_'.$type_ids])){
$custom_issue[]=array('issue_id'=>$_POST['issue_id'],
'mechanic_id'=>$_POST['mechanic_id'],
'issue_cat_id'=>$type_ids,
'custom_description'=>$_POST['default_description_'.$type_ids],
'custom_service_fee'=>$_POST['default_service_fee_'.$type_ids]);
}
else if($err == 0 && (!isset($_POST['issue_description']) || empty($_POST['issue_description']))){
$err = 1;
$errMsg = 'Provide a Brief Discription About Service';
}
if($err == 1){
$flashMsg['message'] = $errMsg;
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Issue/issueMapping'));
} else {
$custom_issue[] = array('issue_id'=>$_POST['issue_id'],
'mechanic_id'=>$_POST['mechanic_id']);
}
$status = $this->Issue_model->addMechIssue($_POST);
$status = $this->Issue_model->addMechIssue($custom_issue);
if($status == 1){
$flashMsg =array('message'=>'Successfully Created..!','class'=>'success');
$this->session->set_flashdata('message', $flashMsg);
......@@ -266,26 +353,30 @@ class Issue extends CI_Controller {
}
function viewMappedIssues($mechanic_id = ''){
if(!empty($mechanic_id)){
$mechanic_id = (!is_numeric($mechanic_id))?decode_param($mechanic_id):$mechanic_id;
}
$mechanic_data = '';
if($this->session->userdata('user_type') == 1){
$this->load->model('Mechanic_model');
$mechanic_data = $this->Mechanic_model->getMechanic('',1);
if(isset($_POST['mechanic_id']) && !empty($_POST['mechanic_id'])){
$mechanic_id = $_POST['mechanic_id'];
$mechanic_id = (!is_numeric($mechanic_id))?decode_param($mechanic_id):$mechanic_id;
}
} else {
$mechanic_id = $this->session->userdata('id');
}
$mechanic_id = (!is_numeric($mechanic_id = decode_param($mechanic_id)))?'':$mechanic_id;
$template['page'] = 'Issue/viewMappedIssues';
$template['menu'] = 'Issue Management';
$template['smenu'] = 'Manage Mapped Issues';
$template['pTitle'] = "Manage Mapped Issues";
$template['pDescription'] = "View and Manage Mapped Issues";
$template['mechanic_data'] = '';
if($this->session->userdata('user_type') == 1){
$this->load->model('Mechanic_model');
$template['mechanic_data'] = $this->Mechanic_model->getMechanic('',1);
} else {
$mechanic_id = $this->session->userdata('id');
}
$template['mechanicIssueData'] = $this->Issue_model->getMechanicIssues($mechanic_id);
$template['mechanic_id'] = $mechanic_id;
$template['mechanic_data'] = $mechanic_data;
$template['mechanicIssueData'] = $this->Issue_model->getMechanicIssues($mechanic_id);
$this->load->view('template',$template);
}
......@@ -338,7 +429,7 @@ class Issue extends CI_Controller {
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Issue/viewMappedIssues/'.encode_param($mechanic_id)));
}
$url = base_url('Issue/editMechanicIssues/'.encode_param($mechanic_id).'/'.encode_param($issue_id));
$url=base_url('Issue/editMechanicIssues/'.encode_param($mechanic_id).'/'.encode_param($issue_id));
if(!isset($_POST) || empty($_POST)){
$this->session->set_flashdata('message',$flashMsg);
redirect($url);
......
application/models/Issue_model.php
......@@ -33,6 +33,23 @@ class Issue_model extends CI_Model {
return (empty($issue_id))?$result->result():$result->row();
}
function getUnMappedIssues($mechanic_id = '',$view_all = 0){
if(empty($mechanic_id)){
return 0;
}
$cond = ($view_all != 0)?' status IN (0,1) ':' status IN (1) ';
$result = $this->db->query("SELECT * FROM issues
WHERE $cond AND issue_id NOT IN
(SELECT issue_id FROM mechanic_issues
WHERE mechanic_id='$mechanic_id')");
if(empty($result)){
return;
}
return (empty($issue_id))?$result->result():$result->row();
}
function getIssueDetails($issue_id = '',$view_all = 0){
$cond = ($view_all != 0)?' status IN (0,1) ':' status IN (1) ';
$cond .= (!empty($issue_id))?" AND issue_id = '$issue_id' ":"";
......@@ -68,12 +85,22 @@ class Issue_model extends CI_Model {
return $status;
}
function updateIssue($issue_id = '', $issue_data = array()){
if(empty($issue_id) || empty($issue_data)){
function updateIssue($issue_id='',$issue_data=array(),$updateSubTyp=array(),$insertSubTyp=array()){
if(empty($issue_id) || empty($issue_data) || empty($updateSubTyp)){
return 0;
}
$status = $this->db->update('issues',$issue_data,array('issue_id'=>$issue_id));
$scat_ids = array();
foreach ($updateSubTyp AS $scat_id => $scat_data) {
$scat_ids[] = $scat_id;
$this->db->update('issues_category',$scat_data,array('issue_cat_id'=>$scat_id));
}
$this->db->where_not_in('issue_cat_id',$scat_ids)->delete('issues_category');
if(!empty($insertSubTyp)){
$this->db->insert_batch('issues_category',$insertSubTyp);
}
return ($status)?1:0;
}
......@@ -81,29 +108,60 @@ class Issue_model extends CI_Model {
if(empty($issueMechData)){
return 0;
}
$status = $this->db->insert('mechanic_issues',$issueMechData);
$status = $this->db->insert_batch('mechanic_issues',$issueMechData);
return ($status)?1:0;
}
function getMechanicIssues($mechanic_id = '',$iisue_id = '',$view_all = 0){
function getMechanicIssues($mechanic_id = '',$issue_id = '',$view_all = '0'){
if(empty($mechanic_id)){
return 0;
}
$view = ($view_all == 0)?'0,1':'1';
$cond = (!empty($issue_id))?" AND ISSUE.issue_id = '$issue_id' ":"";
$sql = "SELECT ISSUE.*,MECH.*,M_ISSUE.*
FROM mechanic_issues AS M_ISSUE
INNER JOIN issues AS ISSUE ON (ISSUE.issue_id = M_ISSUE.issue_id)
INNER JOIN mechanic AS MECH ON (MECH.mechanic_id = M_ISSUE.mechanic_id)
INNER JOIN admin_users AS ADMIN ON (ADMIN.id = MECH.mechanic_id)
WHERE M_ISSUE.mechanic_id='$mechanic_id' $cond AND
ISSUE.status IN ($view) AND M_ISSUE.status IN ($view) AND ADMIN.status IN (0,1)";
$result = $this->db->query($sql);
if(empty($result))
return;
$cond = ($view_all != 0)?' MI.status IN (0,1) ':' MI.status IN (1) ';
$cond = (!empty($issue_id))?" AND MI.issue_id = '$issue_id' ":"";
$sql = "SELECT ISS.issue_id,MI.mechanic_id,ISS.issue,ISS.issue_image,IC.issue_cat_id,
IC.issue_category,IC.issue_cat_image,IC.default_description,IC.default_service_fee,
MI.custom_description,MI.custom_service_fee,MI.status
FROM mechanic_issues AS MI
INNER JOIN issues AS ISS ON (ISS.issue_id=MI.issue_id)
INNER JOIN issues_category AS IC ON (IC.issue_id=MI.issue_id)
WHERE MI.mechanic_id='$mechanic_id' AND ISS.status='1' $cond
GROUP BY IC.issue_id,IC.issue_cat_id";
$mechIssueData = $this->db->query($sql);
if(empty($mechIssueData) || empty($mechIssueData = $mechIssueData->result_array()))
return 0;
return (!empty($mechanic_id) && !empty($iisue_id))?$result->row():$result->result();
$customIssues = array();
foreach ($mechIssueData AS $mechIsssue) {
$cstFlag = 0;
$issue_id = $mechIsssue['issue_id'];
$sub_issue_id = $mechIsssue['issue_cat_id'];
if(!isset($customIssues[$issue_id])){
$issue_data = array('issue'=>$mechIsssue['issue'],
'issue_id'=>$issue_id,
'mechanic_id'=>$mechIsssue['mechanic_id'],
'issue_image'=>$mechIsssue['issue_image'],
'status'=>$mechIsssue['status']);
$customIssues[$issue_id] = $issue_data;
}
$subIssueDtls['description'] = $mechIsssue['default_description'];
$subIssueDtls['service_fee'] = $mechIsssue['default_service_fee'];
$subIssueDtls['issue_category'] = $mechIsssue['issue_category'];
$subIssueDtls['issue_cat_image'] = $mechIsssue['issue_cat_image'];
if(!empty($mechIsssue['custom_description'])){
$cstFlag = 1;
$subIssueDtls['description'] = $mechIsssue['custom_description'];
}
if(!empty($mechIsssue['custom_service_fee'])){
$cstFlag = 1;
$subIssueDtls['service_fee'] = $mechIsssue['custom_service_fee'];
}
$customIssues[$issue_id]['custom_enable'] = $cstFlag;
$customIssues[$issue_id]['sub_issue'][$sub_issue_id] = $subIssueDtls;
}
return $customIssues;
}
function changeMappedIssueStatus($mechanic_id = '', $issue_id = '', $status = '0'){
......
application/views/Issue/issueForm.php
......@@ -47,7 +47,7 @@
<label>Issue Icon</label>
<div class="col-md-12" style="padding-bottom:10px;">
<div class="col-md-5">
<img id="issue_image" src="<?= (isset($issue_data->issue_image))?base_url($issue_data->issue_image):'' ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" height="50" width="auto" />
<img class="small-icon" id="issue_image" src="<?= (isset($issue_data->issue_image))?base_url($issue_data->issue_image):'' ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" />
</div>
<div class="col-md-7" style="padding-top: 12px;">
<input name="issue_image" type="file" accept="image/*"
......@@ -131,7 +131,7 @@
</div>
<div class="col-md-4" style="padding-bottom:10px;">
<div class="col-md-4">
<img id="issue_cat_image" src="<?= (isset($sub_issue->issue_cat_image))?base_url($sub_issue->issue_cat_image):'' ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" height="50" width="auto" />
<img class="small-icon" id="issue_cat_image" src="<?= (isset($sub_issue->issue_cat_image))?base_url($sub_issue->issue_cat_image):'' ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" />
</div>
<div class="col-md-8" style="padding-top: 12px;">
<input name="issue_cat_image[]" type="file" accept="image/*"
......@@ -180,7 +180,7 @@
</div>
<div class="col-md-4" style="padding-bottom:10px;">
<div class="col-md-4">
<img id="issue_cat_image_{:count}" src="" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" height="50" width="auto" />
<img class="small-icon" id="issue_cat_image_{:count}" src="" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" />
</div>
<div class="col-md-8" style="padding-top: 12px;">
<input name="issue_cat_image[]" type="file" accept="image/*"
......
application/views/Issue/issueMapping.php
......@@ -37,36 +37,38 @@
<?php
if(!empty($issue_data)){
foreach ($issue_data as $issue) {
$select = (isset($issue->issue_id) && $issue->issue_id == $issue_id)
?' selected ':'';
echo'<option '.$select.' value="'.$issue->issue_id.'">'.$issue->issue.'</option>';
$select = (isset($issue_id) && $issue->issue_id == decode_param($issue_id))
?' selected ':' ';
echo '<option'.$select.'value="'.encode_param($issue->issue_id).'">'
.$issue->issue.
'</option>';
}
} ?>
</select>
</div>
<div class="form-group">
<label>Custom Service Fee</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[0-9\ , . \/]+$" required="" name="service_fee" placeholder="Custom Service Fee" value="<?= (isset($mechanicIssueData) && isset($mechanicIssueData->service_fee))?$mechanicIssueData->service_fee:'' ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="col-md-6 hide" id="mapTypeCntr">
<div class="form-group marginTop23">
<input type="radio" name="mapping_type" checked="" value="0">
<label class="padAll-10">Use Default</label>
<input type="radio" name="mapping_type" value="1">
<label class="padAll-10">Use Custom</label>
</div>
<div class="col-md-6">
<div class="form-group">
<label>Custom Repair Description</label>
<textarea class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="issue_description" style="height: 80px;" placeholder="Custom Repair Description"><?= (isset($mechanicIssueData) && isset($mechanicIssueData->issue_description))?trim($mechanicIssueData->issue_description):'' ?></textarea>
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="col-md-12 marginTop10 ">
<div class="hide" id="subTypeDtlsCntr">
<div class="col-md-12"><label>Issue Sub Type Details</label></div>
</div>
<input type="hidden" name="mechanic_id" value="<?= $mechanic_id ?>" >
<div class="col-md-12">
</div>
<div class="col-md-12 marginTop10">
<div class="box-footer textCenterAlign">
<button type="submit" class="btn btn-primary">Submit</button>
<a href="<?= base_url('Issue/viewMappedIssues/'.encode_param($mechanic_id)) ?>" class="btn btn-primary">Cancel</a>
</div>
</div>
<input type="hidden" name="mechanic_id" value="<?= $mechanic_id ?>" >
</form>
</div>
</div>
......
application/views/Issue/viewIssues.php
......@@ -37,8 +37,8 @@
<thead>
<tr>
<th class="hidden">ID</th>
<th width="15%;">Issue Icon </th>
<th width="35%;">Issue Category</th>
<th width="10%;">Issue Icon </th>
<th width="40%;">Issue Category</th>
<th width="10%;">Status</th>
<th width="40%;">Action</th>
</tr>
......@@ -50,7 +50,7 @@
<tr>
<th class="hidden"><?= $issue->issue_id ?></th>
<th class="center">
<img src="<?=base_url($issue->issue_image)?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" height="50" width="auto" />
<img class="small-icon" src="<?=base_url($issue->issue_image)?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" />
</th>
<th class="center"><?= $issue->issue ?></th>
<th class="center"><?= ($issue->status == 1)?'Active':'De-activate' ?></th>
......
application/views/Issue/viewMappedIssues.php
<?php
$mapIssueData = '';
?>
<div class="content-wrapper">
<section class="content-header">
<h1>
......@@ -60,9 +63,7 @@
</div>
</div>
</div>
<?php } ?>
<?php
<?php }
if($this->session->userdata['user_type'] != 1 || ($this->session->userdata['user_type'] == 1 && !empty($mechanic_id))){ ?>
<div class="col-xs-12">
<div class="box box-warning">
......@@ -71,41 +72,49 @@
<thead>
<tr>
<th class="hidden">ID</th>
<th width="80px;">Mechanic Name</th>
<th width="250px;">Issue Shot Discription</th>
<th width="250px;">Mechanic Custom Discription</th>
<th width="50px;">Fee</th>
<th width="50px;">Status</th>
<th width="250px;">Action</th>
<th width="10%;">Issue Icon</th>
<th width="29%;">Issue Category</th>
<th width="12%;">Mapping Type</th>
<th width="10%;">Status</th>
<th width="40%;">Action</th>
</tr>
</thead>
<tbody>
<?php
if(!empty($mechanicIssueData)){
foreach($mechanicIssueData as $customData) { ?>
<?php if(!empty($mechanicIssueData)){
$mapIssueData = $mechanicIssueData;
foreach($mechanicIssueData as $mechIssueData) { ?>
<tr>
<th class="hidden"><?= $customData->issue_id ?></th>
<th class="center"><?= $customData->first_name.' '.$customData->first_name ?></th>
<th class="center"><?= $customData->issue ?></th>
<th class="center"><?= $customData->issue_description ?></th>
<th class="center"><?= $customData->service_fee ?></th>
<th class="center"><?= ($customData->status == 1)?'Active':'De-activate' ?></th>
<th class="hidden"><?= $mechIssueData['issue_id'] ?></th>
<th class="center">
<img class="small-icon" src="<?=base_url($mechIssueData['issue_image'])?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" />
</th>
<th class="center"><?= $mechIssueData['issue'] ?></th>
<th class="center">
<?= ($mechIssueData['custom_enable'] == 1)?'Custom':'Default' ?>
</th>
<th class="center">
<?= ($mechIssueData['status'] == 1)?'Active':'De-activate' ?>
</th>
<td class="center">
<a class="btn btn-sm btn-info cpoint"
onclick="viewMapIssueDetails('<?= $mechIssueData['issue_id'] ?>');">
<i class="fa fa-fw fa-edit"></i>View Issue Sub Categories
</a>
<a class="btn btn-sm btn-primary"
href="<?= base_url('Issue/editMechanicIssues/'.encode_param($customData->mechanic_id).'/'.encode_param($customData->issue_id).'/2') ?>">
href="<?= base_url('Issue/editMechanicIssues/'.encode_param($mechIssueData['mechanic_id']).'/'.encode_param($mechIssueData['issue_id']).'/2') ?>">
<i class="fa fa-fw fa-edit"></i>Edit
</a>
<a class="btn btn-sm btn-danger"
href="<?= base_url("Issue/changeMappedIssueStatus/".encode_param($customData->mechanic_id)."/".encode_param($customData->issue_id)."/2")?>"
href="<?= base_url("Issue/changeMappedIssueStatus/".encode_param($mechIssueData['mechanic_id'])."/".encode_param($mechIssueData['issue_id'])."/2")?>"
onClick="return doconfirm()">
<i class="fa fa-fw fa-trash"></i>Delete
</a>
<?php if($customData->status == 1){ ?>
<a class="btn btn-sm btn-success" style="background-color:#ac2925" href="<?= base_url("Issue/changeMappedIssueStatus/".encode_param($customData->mechanic_id)."/".encode_param($customData->issue_id)."/0") ?>">
<?php if($mechIssueData['status'] == 1){ ?>
<a class="btn btn-sm btn-success" style="background-color:#ac2925" href="<?= base_url("Issue/changeMappedIssueStatus/".encode_param($mechIssueData['mechanic_id'])."/".encode_param($mechIssueData['issue_id'])."/0") ?>">
<i class="fa fa-cog"></i> De-activate
</a>
<?php } else { ?>
<a class="btn btn-sm btn-success" href="<?= base_url("Issue/changeMappedIssueStatus/".encode_param($customData->mechanic_id)."/".encode_param($customData->issue_id)."/1") ?>">
<a class="btn btn-sm btn-success" href="<?= base_url("Issue/changeMappedIssueStatus/".encode_param($mechIssueData['mechanic_id'])."/".encode_param($mechIssueData['issue_id'])."/1") ?>">
<i class="fa fa-cog"></i> Activate
</a>
<?php } ?>
......@@ -121,3 +130,7 @@
</div>
</section>
</div>
<script type="text/javascript">
var mapIssueData = '<?= json_encode($mapIssueData) ?>';
</script>
\ No newline at end of file
application/views/Templates/left-menu.php
......@@ -47,24 +47,30 @@
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<?php if($this->session->userdata['user_type'] != 1){ ?>
<li>
<a href="<?= base_url('Issue/issueMapping') ?>">
<a href="<?= base_url('Issue/addIssue') ?>">
<i class="fa fa-circle-o text-aqua"></i>
Issue Mapping
Add New Issue
</a>
</li>
<?php } ?>
<li>
<a href="<?= base_url('Issue/viewIssues') ?>">
<i class="fa fa-circle-o text-aqua"></i>
Manage General Issues
View All Issues
</a>
</li>
<?php if($this->session->userdata['user_type'] != 1){ ?>
<li>
<a href="<?= base_url('Issue/issueMapping') ?>">
<i class="fa fa-circle-o text-aqua"></i>
Issue Mapping
</a>
</li>
<?php } ?>
<li>
<a href="<?= base_url('Issue/viewMappedIssues') ?>">
<i class="fa fa-circle-o text-aqua"></i>
Manage Mechanic Issues
Manage Mapped Issues
</a>
</li>
</ul>
......
assets/css/custom-style.css
......@@ -415,6 +415,18 @@
margin-top: 8px;
}
.marginTop5 {
margin-top: 5px;
}
.marginTop30 {
margin-top: 30px;
}
.marginTop23 {
margin-top: 23px;
}
.fav-add-icon {
font-size: 2em;
color: #5a9f5a;
......@@ -443,4 +455,33 @@
margin-top: 10px !important;
}
.custom-textarea {
border: none;
background-color: #fff;
}
.custom-textarea-style {
margin: 0px;
width: 310px;
max-width: 310px;
height: 70px;
}
.custom-input {
border: none;
background-color: #fff;
}
.custom-input-style {
width: 60px;
font-size: large;
padding-left: 5px;
}
.small-icon {
width: auto;
height: 50px;
max-height: 50px;
max-width: 89px;
}
assets/js/custom-script.js
......@@ -579,14 +579,13 @@ function viewIssueDetls(issue_id){
jQuery.each(resp_data['data']['sub_issue'], function (index, value) {
console.log(value);
body += '<ul class="list_custom">'+
'<li class="issue-box" style="width:25%;"><label>'+value['issue_category']+'</label></li>'+
'<li class="issue-box" style="width:40%;">'+value['default_description']+'</li>'+
'<li class="issue-box padLeft40" style="width:15%;"><label>'+value['default_service_fee']+'</label></li>'+
'<li class="padBottom10 padLeft20 issue-box">'+
'<img src="'+base_url+value['issue_cat_image']+'" height="50" width="auto" '+
'onerror="this.src=;" />'+
'<img src="'+base_url+value['issue_cat_image']+'" height="75" width="auto" style="max-width: 125px;"'+
'onerror="this.src=\''+base_url+'assets/images/no_image_text.png\'";/>'+
'</li>'+
'</ul>';
});
......@@ -606,3 +605,119 @@ function viewIssueDetls(issue_id){
}
});
}
jQuery('[name="issue_id"]').on('change',function() {
var issue_id = jQuery(this).val();
if(issue_id == '' || issue_id == null || issue_id == 'null' || issue_id == undefined || issue_id == 'undefined'){
return false;
}
showFullScreenLoader();
var head = '', body = '',
msg = 'Something went wrong, please try again later...!';
jQuery.ajax({
url : base_url+"Issue/getIssueDetails",
type : 'POST',
data : {'issue_id':issue_id},
success: function(resp){
if(resp == '' || resp == undefined || resp == 'undefined' || resp == null || resp == 'null'){
remFullScreenLoader();
modalTrigger('Issue Mapping',msg);
return false;
}
var resp_data = jQuery.parseJSON(resp);
if(resp_data['status'] != '1' || (resp_data['status'] == 1 && resp_data['data'] == '' || resp_data['data'] == null || resp_data['data'] == undefined || resp_data['data'] == 'null' || resp_data['data'] == 'undefined')){
remFullScreenLoader();
modalTrigger('Issue Mapping',msg);
return false;
}
var html = '';
jQuery.each(resp_data['data']['sub_issue'], function (index, value) {
html += '<div class="col-md-12">'+
'<div class="col-md-1"></div>'+
'<div class="col-md-1 marginTop5">'+
'<i class="fa fa-arrow-circle-right fav-add-icon"></i>'+
'</div>'+
'<div class="col-md-2">'+
'<label>'+value['issue_category']+'</label>'+
'</div>'+
'<div class="col-md-2 marginBottom-10">'+
'<img src="'+base_url+value['issue_cat_image']+'" style="height:75;width:auto;max-width: 125px;"'+
'onerror="this.src=\''+base_url+'assets/images/no_image_text.png\'";/>'+
'</div>'+
'<div class="col-md-4 marginBottom-10">'+
'<textarea name="default_description_'+value['issue_cat_id']+'" disabled required class="custom-textarea custom-textarea-style">'+value['default_description']+'</textarea>'+
'</div>'+
'<div class="col-md-2">'+
'Service Fee : '+
'<input name="default_service_fee_'+value['issue_cat_id']+'" disabled required data-parsley-pattern="^[0-9\ . \/]+$" class="custom-input custom-input-style" maxlength="6" value="'+value['default_service_fee']+'">'+
'</div>'+
'</div>'+
'<input type="hidden" name="issue_cat_ids[]" value="'+value['issue_cat_id']+'">';
});
jQuery('[id="mapTypeCntr"]').removeClass('hide');
jQuery('[id="subTypeDtlsCntr"]').removeClass('hide').html(html);
remFullScreenLoader();
return false;
},
fail: function(xhr, textStatus, errorThrown){
remFullScreenLoader();
modalTrigger('Issue Mapping',msg);
return false;
},
error: function (ajaxContext) {
remFullScreenLoader();
modalTrigger('Issue Mapping',msg);
return false;
}
});
});
jQuery('[name="mapping_type"]').on('click',function() {
var mapping_type = jQuery(this).val();
if(mapping_type == 1){
jQuery('[name^="default_description_"]').removeClass('custom-textarea');
jQuery('[name^="default_service_fee_"]').removeClass('custom-input');
jQuery('[name^="default_description_"],[name^="default_service_fee_"]').prop("disabled",false);
} else if(mapping_type == 0){
jQuery('[name^="default_description_"]').addClass('custom-textarea');
jQuery('[name^="default_service_fee_"]').addClass('custom-input');
jQuery('[name^="default_description_"],[name^="default_service_fee_"]').prop("disabled",true);
}
});
function viewMapIssueDetails(issue_id) {
if(issue_id == '' || issue_id == null || issue_id == 'null' || issue_id == undefined || issue_id == 'undefined'){
return false;
}
var head = '', body = '', issueData = jQuery.parseJSON(mapIssueData);
jQuery('.modal-dialog').css('width', '60%');
modalTrigger('Issue Sub Types','');
addModalLoader();
head = '<ul class="list_custom">'+
'<li class="marginTop10" style="width:25%;"><label>Type</label></li>'+
'<li class="marginTop10" style="width:40%;"><label>Description</label></li>'+
'<li class="marginTop10" style="width:15%;"><label>Service Fee</label></li>'+
'<li class="padBottom10 padLeft50"><label>Image</label></li>'+
'</ul>';
jQuery.each(issueData[issue_id]['sub_issue'], function (index, value) {
console.log(value);
body += '<ul class="list_custom">'+
'<li class="issue-box" style="width:25%;"><label>'+value['issue_category']+'</label></li>'+
'<li class="issue-box" style="width:40%;">'+value['description']+'</li>'+
'<li class="issue-box padLeft40" style="width:15%;"><label>'+value['service_fee']+'</label></li>'+
'<li class="padBottom10 padLeft20 issue-box">'+
'<img src="'+base_url+value['issue_cat_image']+'" height="75" width="auto" style="max-width: 125px;"'+
'onerror="this.src=\''+base_url+'assets/images/no_image_text.png\'";/>'+
'</li>'+
'</ul>';
});
jQuery('[id="modal_content"]').html('<div class="border">'+head+body+'</div>');
remModalLoader();
return false;
}
\ No newline at end of file
sql/tobin_dcarfixers.sql
......@@ -3,7 +3,7 @@
-- https://www.phpmyadmin.net/
--
-- Host: db
-- Generation Time: Dec 19, 2018 at 01:05 PM
-- Generation Time: Dec 21, 2018 at 12:57 PM
-- Server version: 5.6.41
-- PHP Version: 7.2.8
......@@ -134,7 +134,8 @@ CREATE TABLE `issues` (
--
INSERT INTO `issues` (`issue_id`, `issue`, `issue_image`, `status`) VALUES
(9, 'dfrtge', 'assets/uploads/services/images8.jpg', 1);
(9, 'Wheel Maintenance', 'assets/uploads/services/images8.jpg', 1),
(10, 'AC Maintenance', 'assets/uploads/services/car_ac.jpg', 1);
-- --------------------------------------------------------
......@@ -157,8 +158,10 @@ CREATE TABLE `issues_category` (
--
INSERT INTO `issues_category` (`issue_cat_id`, `issue_id`, `issue_category`, `issue_cat_image`, `default_service_fee`, `default_description`, `status`) VALUES
(3, 9, 'awert', 'assets/uploads/services/images7.jpg', 43, 'sert', 1),
(4, 9, 'dfgse eswrftse sewrwe werwerf serdfewfr wearwe aweraw w3qrewq wqaew wqewq', 'assets/uploads/services/images7.jpg', 43, 'dfgse eswrftse sewrwe werwerf serdfewfr wearwe awedfgse eswrftse sewrwe werwerf serdfewfr wearwe aweraw w3qrewq wqaew wqewq dfgse eswrftse sewrwe werwerf serdfewfr wearwe aweraw w3qrewq wqaew wqewq dfgse eswrftse sewrwe werwerf serdfewfr wearwe aweraw w3qrewq wqaew wqewq dfgse eswrftse sewrwe werwerf serdfewfr wearwe aweraw w3qrewq wqaew wqewq dfgse eswrftse sewrwe werwerf serdfewfr wearwe aweraw w3qrewq wqaew wqewq raw w3qrewq wqaew wqewq ', 1);
(3, 9, 'Wheel Checking', 'assets/uploads/services/images7.jpg', 500, 'Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. Wheel Checking Edit Issue Update Issue Data. ', 1),
(4, 9, 'Wheel Alignment', 'assets/uploads/services/images7.jpg', 1000, 'Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. Wheel Alignment Wheel Checking Edit Issue Update Issue Data. ', 1),
(5, 10, 'AC Checking', 'assets/uploads/services/sniper.jpg', 1500, 'AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. ', 1),
(6, 10, 'AC Cleaning', 'assets/uploads/services/Himalayan.jpg', 2500, 'AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. ', 1);
-- --------------------------------------------------------
......@@ -204,7 +207,6 @@ CREATE TABLE `mechanic_issues` (
`issue_id` int(11) DEFAULT NULL,
`issue_cat_id` int(11) DEFAULT NULL,
`mechanic_id` int(11) DEFAULT NULL,
`custom_image` varchar(500) DEFAULT NULL,
`custom_description` longtext,
`custom_service_fee` double NOT NULL DEFAULT '0',
`status` tinyint(3) NOT NULL DEFAULT '1'
......@@ -214,11 +216,10 @@ CREATE TABLE `mechanic_issues` (
-- Dumping data for table `mechanic_issues`
--
INSERT INTO `mechanic_issues` (`id`, `issue_id`, `issue_cat_id`, `mechanic_id`, `custom_image`, `custom_description`, `custom_service_fee`, `status`) VALUES
(1, 1, NULL, 12, NULL, 'sert', 435345, 0),
(2, 2, NULL, 2, NULL, 'fghdrftyhudsrxfytuh we e4rtwe4t we5tywer5 we5twer tew4rte etewt aw4raew w3rw3e w3r4wer fghdrftyhudsrxfytuh we e4rtwe4t we5tywer5 we5twer tew4rte etewt aw4raew w3rw3e w3r4wer fghdrftyhudsrxfytuh we e4rtwe4t we5tywer5 we5twer tew4rte etewt aw4raew w3rw3e w3r4wer fghdrftyhudsrxfytuh we e4rtwe4t we5tywer5 we5twer tew4rte etewt aw4raew w3rw3e w3r4wer fghdrftyhudsrxfytuh we e4rtwe4t we5tywer5 we5twer tew4rte etewt aw4raew w3rw3e w3r4wer', 435345, 1),
(3, 1, NULL, 2, NULL, 'edrte ew4te ew5ter e354trs5 edrte ew4te ew5ter e354trs5 edrte ew4te ew5ter e354trs5 edrte ew4te ew5ter e354trs5 ', 435345, 0),
(4, 1, NULL, 2, NULL, 'edrte ew4te ew5ter e354trs5 edrte ew4te ew5ter e354trs5 edrte ew4te ew5ter e354trs5 edrte ew4te ew5ter e354trs5 ', 435345, 0);
INSERT INTO `mechanic_issues` (`id`, `issue_id`, `issue_cat_id`, `mechanic_id`, `custom_description`, `custom_service_fee`, `status`) VALUES
(11, 9, NULL, 2, NULL, 0, 1),
(17, 10, 5, 2, '555555 AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. AC Maintenance, AC Checking. ', 1500, 1),
(18, 10, 6, 2, '6666666 AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. AC Maintenance, AC Cleaning. ', 2500, 1);
-- --------------------------------------------------------
......@@ -356,13 +357,13 @@ ALTER TABLE `customer_vehicle`
-- AUTO_INCREMENT for table `issues`
--
ALTER TABLE `issues`
MODIFY `issue_id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=10;
MODIFY `issue_id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=11;
--
-- AUTO_INCREMENT for table `issues_category`
--
ALTER TABLE `issues_category`
MODIFY `issue_cat_id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5;
MODIFY `issue_cat_id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7;
--
-- AUTO_INCREMENT for table `mechanic`
......@@ -374,7 +375,7 @@ ALTER TABLE `mechanic`
-- AUTO_INCREMENT for table `mechanic_issues`
--
ALTER TABLE `mechanic_issues`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5;
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=19;
--
-- AUTO_INCREMENT for table `mechanic_shop`
......
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