Skip to content

D
dcarfixers
Commit d4a95246 by Tobin
Options

commit all local changes

parent 6737fc71
Showing with 52 additions and 26 deletions
application/controllers/Issue.php
......@@ -301,7 +301,7 @@ class Issue extends CI_Controller {
$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);
$this->session->set_flashdata('message',array('message'=>'Currently you have mapped all the existing issue categories, add new category or manage mapped issues..!','class'=>'error'));
redirect(base_url('Issue/viewMappedIssues/'.$mechanic_id));
}
$this->load->view('template',$template);
......@@ -409,10 +409,10 @@ class Issue extends CI_Controller {
$template['pTitle'] = "Edit Mechanic Issue Management";
$template['pDescription'] = "Update Custom Mechanic Issue Data";
$template['issue_id'] = $issue_id;
$template['mechanic_id'] = $mechanic_id;
$template['issue_id'] = encode_param($issue_id);
$template['mechanic_id'] = encode_param($mechanic_id);
$template['issue_data'] = $this->Issue_model->getIssues('',1);
$template['mechanicIssueData'] = $this->Issue_model->getMechanicIssues($mechanic_id,$issue_id);
$template['mechanicIssueData'] = $this->Issue_model->getMechanicIssues($mechanic_id,$issue_id,1);
if(empty($template['mechanicIssueData'])){
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Issue/viewMappedIssues/'.encode_param($mechanic_id)));
......
application/models/Issue_model.php
......@@ -43,7 +43,7 @@ class Issue_model extends CI_Model {
$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')");
WHERE mechanic_id='$mechanic_id' AND status<>'2')");
if(empty($result)){
return;
}
......@@ -117,7 +117,7 @@ class Issue_model extends CI_Model {
return 0;
}
$cond = ($view_all != 0)?' MI.status IN (0,1) ':' MI.status IN (1) ';
$cond = (!empty($issue_id))?" AND MI.issue_id = '$issue_id' ":"";
$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,
......@@ -125,7 +125,7 @@ class Issue_model extends CI_Model {
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
WHERE MI.mechanic_id='$mechanic_id' AND ISS.status='1' AND $cond
GROUP BY IC.issue_id,IC.issue_cat_id";
$mechIssueData = $this->db->query($sql);
......
application/views/Issue/issueForm.php
......@@ -125,8 +125,7 @@
</div>
<div class="col-md-2">
<input type="text" class="form-control required marginTop-8" required
data-parsley-trigger="change" data-parsley-minlength="2" name="default_service_fee[]"
data-parsley-pattern="^[0-9\ . \/]+$" placeholder="Default Service Fee"
data-parsley-trigger="change" data-parsley-minlength="2" name="default_service_fee[]"data-parsley-pattern="^[0-9\ . \/]+$" placeholder="Default Service Fee"
value="<?= (isset($sub_issue->default_service_fee))?$sub_issue->default_service_fee:'' ?>">
</div>
<div class="col-md-4" style="padding-bottom:10px;">
......
application/views/Issue/issueMapping.php
......@@ -14,7 +14,14 @@
<div class="row">
<div class="col-md-12">
<?php
$url = (!isset($mechanic_id)||empty($mechanic_id)||!isset($issue_id)||empty($issue_id))?'Issue/createMechIssue':'Issue/updateMechIssue/'.encode_param($mechanic_id).'/'.encode_param($issue_id);
$url = 'Issue/createMechIssue';
$edit = 0;
$issue_id = (isset($issue_id) && !empty($issue_id))?$issue_id:'';
$mechanic_id = (isset($mechanic_id) && !empty($mechanic_id))?$mechanic_id:'';
if(!empty($mechanic_id) && !empty($issue_id)){
$edit = 1;
$url = 'Issue/updateMechIssue/'.$mechanic_id.'/'.$issue_id;
}
if($this->session->flashdata('message')) {
$flashdata = $this->session->flashdata('message'); ?>
<div class="alert alert-<?= $flashdata['class'] ?>">
......@@ -32,17 +39,19 @@
<div class="col-md-6">
<div class="form-group">
<label>General Issue</label>
<select name="issue_id" class="form-control required" placeholder="Select General Issue" required="">
<select name="issue_id" class="form-control required" placeholder="Select General Issue" required="" <?= ($edit)?'disabled':'' ?>>
<option selected disabled>Choose an Issue Type</option>
<?php
if(!empty($issue_data)){
foreach ($issue_data as $issue) {
$select = (isset($issue_id) && $issue->issue_id == decode_param($issue_id))
?' selected ':' ';
echo '<option'.$select.'value="'.encode_param($issue->issue_id).'">'
.$issue->issue.
'</option>';
}
foreach ($issue_data as $issue) {
$select = '';
if(isset($issue_id) && $issue->issue_id == decode_param($issue_id)){
$select = 'selected';
}
echo '<option '.$select.' value="'.encode_param($issue->issue_id).'">'
.$issue->issue.
'</option>';
}
} ?>
</select>
</div>
......@@ -56,9 +65,13 @@
</div>
</div>
</div>
<div class="col-md-12 marginTop10 ">
<div class="col-md-12">
<div class="hide" id="subTypeDtlsCntr">
<div class="col-md-12"><label>Issue Sub Type Details</label></div>
<div class="col-md-12 padBottom10">
<label>Issue Sub Type Details</label>
</div>
<div id="subTypeDtlsCntrData"></div>
</div>
</div>
......@@ -69,6 +82,7 @@
</div>
</div>
<input type="hidden" name="mechanic_id" value="<?= $mechanic_id ?>" >
<input name="edit_flag" value="<?= $edit ?>" >
</form>
</div>
</div>
......
assets/js/custom-script.js
......@@ -606,9 +606,16 @@ 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'){
var issue_id = jQuery(this).val(),
edit_flag = jQuery('[name="edit_flag"]').val();
getIssueDetails(issue_id,edit_flag);
});
function getIssueDetails(issue_id,edit_flag){
if(issue_id == '' || issue_id == null || issue_id == 'null' || issue_id == undefined || issue_id == 'undefined' ||
edit_flag == '' || edit_flag == null || edit_flag == 'null' || edit_flag == undefined || edit_flag == 'undefined'){
return false;
}
showFullScreenLoader();
......@@ -643,7 +650,7 @@ jQuery('[name="issue_id"]').on('change',function() {
'<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;"'+
'<img class="small-icon" src="'+base_url+value['issue_cat_image']+'"'+
'onerror="this.src=\''+base_url+'assets/images/no_image_text.png\'";/>'+
'</div>'+
'<div class="col-md-4 marginBottom-10">'+
......@@ -657,7 +664,8 @@ jQuery('[name="issue_id"]').on('change',function() {
'<input type="hidden" name="issue_cat_ids[]" value="'+value['issue_cat_id']+'">';
});
jQuery('[id="mapTypeCntr"]').removeClass('hide');
jQuery('[id="subTypeDtlsCntr"]').removeClass('hide').html(html);
jQuery('[id="subTypeDtlsCntr"]').removeClass('hide');
jQuery('[id="subTypeDtlsCntrData"]').html(html);
remFullScreenLoader();
return false;
},
......@@ -672,10 +680,12 @@ jQuery('[name="issue_id"]').on('change',function() {
return false;
}
});
});
}
jQuery('[name="mapping_type"]').on('click',function() {
var mapping_type = jQuery(this).val();
var issue_id = '',
edit_flag = jQuery('[name="edit_flag"]').val(),
mapping_type = jQuery(this).val();
if(mapping_type == 1){
jQuery('[name^="default_description_"]').removeClass('custom-textarea');
......@@ -685,6 +695,9 @@ jQuery('[name="mapping_type"]').on('click',function() {
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);
issue_id = jQuery('[name="issue_id"]').val();
getIssueDetails(issue_id,edit_flag);
}
});
......
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