From ea631040349bcaf64e101cd8f894a20b525de617 Mon Sep 17 00:00:00 2001
From: Tobin <tobin@techware.in>
Date: Mon, 7 Jan 2019 09:51:09 +0530
Subject: [PATCH] daily commit
---
application/controllers/Issue.php | 101 +++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------
application/models/Issue_model.php | 71 +++++++++++++++++++++++++++++++++++++++--------------------------------
application/views/Issue/viewMappedIssues.php | 6 +++---
3 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/application/controllers/Issue.php b/application/controllers/Issue.php
index 9121d76..bbd5ab8 100644
--- a/application/controllers/Issue.php
+++ b/application/controllers/Issue.php
@@ -186,39 +186,37 @@ class Issue extends CI_Controller {
$err = 1;
$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['extSubTypes']) && !empty($_POST['extSubTypes'])){
+ 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 &&
@@ -229,7 +227,6 @@ class Issue extends CI_Controller {
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;
@@ -256,18 +253,20 @@ class Issue extends CI_Controller {
$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);
+ '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();
+ }
+
+ if(isset($_FILES['issue_image']) && !empty($_FILES['issue_image']['name']) &&
+ $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);
@@ -462,25 +461,19 @@ class Issue extends CI_Controller {
}
$custData = array();
- if($mapping_type == 1){
- foreach($mapping_data['issue_cat_ids'] AS $type_ids) {
- if(isset($mapping_data['default_service_fee_'.$type_ids]) &&
- !empty($mapping_data['default_service_fee_'.$type_ids]) &&
- isset($mapping_data['default_description_'.$type_ids]) &&
- !empty($mapping_data['default_description_'.$type_ids])){
-
- $custData[] = array('issue_id'=>$mapping_data['issue_id'],
- 'mechanic_id'=>$mapping_data['mechanic_id'],
- 'issue_cat_id'=>$type_ids,
- 'custom_description'=>$mapping_data['default_description_'.$type_ids],
- 'custom_service_fee'=>$mapping_data['default_service_fee_'.$type_ids]);
- }
+ foreach($mapping_data['issue_cat_ids'] AS $type_ids) {
+ $issArr = array('issue_id'=>$mapping_data['issue_id'],
+ 'mechanic_id'=>$mapping_data['mechanic_id'],
+ 'issue_cat_id'=>$type_ids);
+ if($mapping_type == 1 &&
+ isset($mapping_data['default_service_fee_'.$type_ids]) &&
+ isset($mapping_data['default_description_'.$type_ids])){
+
+ $issArr['custom_description'] = $mapping_data['default_description_'.$type_ids];
+ $issArr['custom_service_fee'] = $mapping_data['default_service_fee_'.$type_ids];
}
- } else {
- $custData[] = array('issue_id'=>$mapping_data['issue_id'],
- 'mechanic_id'=>$mapping_data['mechanic_id']);
+ $custData[] = $issArr;
}
-
return $custData;
}
}
diff --git a/application/models/Issue_model.php b/application/models/Issue_model.php
index b27e503..a9e10f0 100644
--- a/application/models/Issue_model.php
+++ b/application/models/Issue_model.php
@@ -90,17 +90,23 @@ class Issue_model extends CI_Model {
}
function updateIssue($issue_id='',$issue_data=array(),$updateSubTyp=array(),$insertSubTyp=array()){
- if(empty($issue_id) || empty($issue_data) || empty($updateSubTyp)){
+ if(empty($issue_id) || empty($issue_data)){
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');
+ $scat_ids = array();
+ if(!empty($updateSubTyp)){
+ foreach ($updateSubTyp AS $scat_id => $scat_data) {
+ $scat_ids[] = $scat_id;
+ $this->db->update('issues_category',$scat_data,array('issue_cat_id'=>$scat_id));
+ }
+ }
+ if(!empty($scat_ids)){
+ $this->db->where_not_in('issue_cat_id',$scat_ids);
+ }
+ $this->db->where('issue_id',$issue_id);
+ $this->db->delete('issues_category');
if(!empty($insertSubTyp)){
$this->db->insert_batch('issues_category',$insertSubTyp);
@@ -123,39 +129,40 @@ class Issue_model extends CI_Model {
$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
+ $sql = "SELECT MI.issue_id,MI.issue_cat_id,MI.mechanic_id,MI.custom_description,MI.custom_service_fee,
+ MI.status,ISS.issue,ISS.issue_image
FROM mechanic_issues AS MI
INNER JOIN issues AS ISS ON (ISS.issue_id=MI.issue_id)
- LEFT JOIN issues_category AS IC ON (IC.issue_id=MI.issue_id)
WHERE MI.mechanic_id='$mechanic_id' AND ISS.status='1' AND $cond
- GROUP BY IC.issue_id,IC.issue_cat_id";
+ GROUP BY MI.issue_id,MI.issue_cat_id";
$mechIssueData = $this->db->query($sql);
if(empty($mechIssueData) || empty($mechIssueData = $mechIssueData->result_array()))
return 0;
+ $cstFlag = 0;
$customIssues = array();
- $subIssueData = 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;
- }
- if(!empty($sub_issue_id)){
- $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(!isset($customIssues[$issue_id])){
+ $customIssues[$issue_id] = array('issue'=>$mechIsssue['issue'],
+ 'issue_id'=>$mechIsssue['issue_id'],
+ 'mechanic_id'=>$mechIsssue['mechanic_id'],
+ 'issue_image'=>$mechIsssue['issue_image'],
+ 'status'=>$mechIsssue['status']);
+ }
+
+ if(!empty($issCat_id = $mechIsssue['issue_cat_id'])){
+
+ $sIssData = $this->db->get_where('issues_category',array('issue_cat_id'=>$issCat_id));
+ if(empty($sIssData) || empty($sIssData = $sIssData->row_array())){
+ continue;
+ }
+ $subIssueDtls['description'] = $sIssData['default_description'];
+ $subIssueDtls['service_fee'] = $sIssData['default_service_fee'];
+ $subIssueDtls['issue_category'] = $sIssData['issue_category'];
+ $subIssueDtls['issue_cat_image'] = $sIssData['issue_cat_image'];
+
if(!empty($mechIsssue['custom_description'])){
$cstFlag = 1;
$subIssueDtls['description'] = $mechIsssue['custom_description'];
@@ -164,10 +171,10 @@ class Issue_model extends CI_Model {
$cstFlag = 1;
$subIssueDtls['service_fee'] = $mechIsssue['custom_service_fee'];
}
- $subIssueData[$sub_issue_id] = $subIssueDtls;
+
+ $customIssues[$issue_id]['sub_issue'][$issCat_id] = $subIssueDtls;
+ $customIssues[$issue_id]['custom_enable'] = $cstFlag;
}
- $customIssues[$issue_id]['sub_issue'] = $subIssueData;
- $customIssues[$issue_id]['custom_enable'] = $cstFlag;
}
return $customIssues;
}
diff --git a/application/views/Issue/viewMappedIssues.php b/application/views/Issue/viewMappedIssues.php
index 1cd6c4a..8b51b31 100644
--- a/application/views/Issue/viewMappedIssues.php
+++ b/application/views/Issue/viewMappedIssues.php
@@ -73,10 +73,10 @@
<tr>
<th class="hidden">ID</th>
<th width="10%;">Issue Icon</th>
- <th width="29%;">Issue Category</th>
- <th width="12%;">Mapping Type</th>
+ <th width="25%;">Issue Category</th>
+ <th width="13%;">Mapping Type</th>
<th width="10%;">Status</th>
- <th width="40%;">Action</th>
+ <th width="43%;">Action</th>
</tr>
</thead>
<tbody>
--
libgit2 0.27.1