Skip to content

flexydial / hdfc-beu-v2

Go to a project
Toggle navigation
Toggle navigation pinning
784eb5f5 by prami
Options

disposition plan : remove hrms master dependency from feedback

1 parent e74f54ec
Inline Side-by-side
Showing 5 changed files with 63 additions and 98 deletions
application/app/Http/Controllers/CampaignController.php
...@@ -239,59 +239,21 @@ class CampaignController extends Controller { ...@@ -239,59 +239,21 @@ class CampaignController extends Controller {
239 $gthis = new KHRMSLib(); 239 $gthis = new KHRMSLib();
240 $campaign = Input::get("campaign"); 240 $campaign = Input::get("campaign");
241 241
242 /*$mastersdata=$gthis->getCompanyMaster($campaign);
243 $disposition = array();
244 $dispoarr = array();
245 if(!empty($mastersdata['dialerDispoList'])){
246 //$mastersdata['dialerDispoList']=$gthis->HRCoreVars['dialerDispoList'];
247 $dispoarr=explode("~",$mastersdata['dialerDispoList']);
248 }
249
250 if(count($dispoarr) > 0){
251 foreach($dispoarr as $dispo){
252 if(!empty($dispo))
253 {
254 $dispoprts=explode("|",$dispo);
255 if(sizeof($dispoprts)>=3)
256 {
257 $disposition[$dispoprts[1]] = $dispoprts[2];
258 $dispositionCode[$dispoprts[1]] = $dispoprts[0];
259 }
260 }
261 }
262 }else{*/
263 $dispositionPlans=DispositionPlan::where("status","=","active")->get(); 242 $dispositionPlans=DispositionPlan::where("status","=","active")->get();
264 //}
265 243
266 $data['dispositionPlans'] = $dispositionPlans; 244 $data['dispositionPlans'] = $dispositionPlans;
267 //$data['dispositionCode'] = $dispositionCode;
268 245
269 $data['selectedDispositionPlan'] = DB::table('campaign_disposition_plan') 246 $data['selectedDispositionPlan'] = DB::table('campaign_disposition_plan')
270 ->join('disposition_plan', 'campaign_disposition_plan.dispo_plan_id', '=', 'disposition_plan.id') 247 ->join('disposition_plan', 'campaign_disposition_plan.dispo_plan_id', '=', 'disposition_plan.id')
271 ->select('disposition_plan.name as name ', 'disposition_plan.id as planid')->where("campaign","=",$campaign)->first(); 248 ->select('disposition_plan.name as name ', 'disposition_plan.id as planid')->where("campaign","=",$campaign)->first();
272 249
273 $dispositionList=DB::table('hrms_masters')->select('*')->where('status','=','Active')->where("mkey","=",$campaign)->where("mtype","=",'coreconfig')->first();
274 250
275 $dispolist=explode("~",$dispositionList->mvalue); 251 $data['dispositionList'] = DB::table('campaign_disposition_plan')
276 $dispositionList = array(); 252 ->join('disposition_plan_config', 'campaign_disposition_plan.dispo_plan_id', '=', 'disposition_plan_config.dispo_plan_id')
277 $plans = array(); 253 ->select('disposition_plan_config.disposition as disposition ', 'disposition_plan_config.sub_disposition as subDisposition')
278 foreach ($dispolist as $key => $dispo) { 254 ->where("campaign","=",$campaign)
279 if(!empty($dispo)) 255 ->get();
280 {
281 $dispoprts=explode("|",$dispo);
282 $dispositionPlan=Disposition::where("name","=",$dispoprts[1])->first();
283 256
284 //$dispositionList[$dispoprts[1]]= $dispoprts[2];
285 $dispositionList[] = array('disposition' => $dispoprts[1],
286 'subDisposition' => $dispoprts[2],
287 'plan' => $dispositionPlan->plan);
288
289 $plans[] = $dispositionPlan->plan;
290 }
291 }
292
293 $data['dispositionList'] = $dispositionList;
294 $data['plans'] = $plans;
295 //$campaign = Input::get("campaign"); 257 //$campaign = Input::get("campaign");
296 if($campaign != ""){ 258 if($campaign != ""){
297 //this condition for getting all campaign data 259 //this condition for getting all campaign data
...@@ -788,6 +750,7 @@ class CampaignController extends Controller { ...@@ -788,6 +750,7 @@ class CampaignController extends Controller {
788 $mvalue = "$code|$disposition|$subDisposition"; 750 $mvalue = "$code|$disposition|$subDisposition";
789 } 751 }
790 } 752 }
753
791 $hrmsdata = DB::table('hrms_masters')->where('mkey','=', $campaign)->where('mtype','=', 'coreconfig')->select('*'); 754 $hrmsdata = DB::table('hrms_masters')->where('mkey','=', $campaign)->where('mtype','=', 'coreconfig')->select('*');
792 if($hrmsdata->count() == 0){ 755 if($hrmsdata->count() == 0){
793 DB::table('hrms_masters')->insert(['mkey'=>$campaign, 'mtype'=>'coreconfig', 'mvalue'=>$mvalue,'status'=>'active']); 756 DB::table('hrms_masters')->insert(['mkey'=>$campaign, 'mtype'=>'coreconfig', 'mvalue'=>$mvalue,'status'=>'active']);
......
application/app/Http/Controllers/DispositionPlanController.php
...@@ -24,7 +24,7 @@ class DispositionPlanController extends Controller { ...@@ -24,7 +24,7 @@ class DispositionPlanController extends Controller {
24 24
25 public function index() 25 public function index()
26 { 26 {
27 $data['dispositionPlan']= DispositionPlan::join('disposition_plan_config', 'disposition_plan.id', '=', 'disposition_plan_config.dispo_plan_id') 27 $data['dispositionPlan']= DispositionPlan::leftjoin('disposition_plan_config', 'disposition_plan.id', '=', 'disposition_plan_config.dispo_plan_id')
28 ->select('disposition_plan.id as dispositionPlanId', 'disposition_plan.name as name','disposition_plan.status AS status', 28 ->select('disposition_plan.id as dispositionPlanId', 'disposition_plan.name as name','disposition_plan.status AS status',
29 DB::raw('count(*) as totalDisposition, disposition_plan_config.id'), 29 DB::raw('count(*) as totalDisposition, disposition_plan_config.id'),
30 DB::raw('GROUP_CONCAT(disposition_plan_config.disposition) as disposition, disposition_plan_config.disposition')) 30 DB::raw('GROUP_CONCAT(disposition_plan_config.disposition) as disposition, disposition_plan_config.disposition'))
......
application/app/Jobs/KFormLib.php
...@@ -819,10 +819,9 @@ $data.="</fieldset></div> ...@@ -819,10 +819,9 @@ $data.="</fieldset></div>
819 dialerdispoarray['']='';\n"; 819 dialerdispoarray['']='';\n";
820 820
821 // to get client corconfig 821 // to get client corconfig
822 $mastersdata= $gthis->getDispocampaignData($dataarr['client']); 822 /*$mastersdata= $gthis->getDispocampaignData($dataarr['client']);
823 $dispoarr = []; 823 $dispoarr = [];
824 //$dispoarr=explode("~",$mastersdata['mvalue']); 824
825
826 if(empty($mastersdata)) 825 if(empty($mastersdata))
827 { 826 {
828 // if client company is empty get data from campaign company 827 // if client company is empty get data from campaign company
...@@ -831,7 +830,7 @@ $data.="</fieldset></div> ...@@ -831,7 +830,7 @@ $data.="</fieldset></div>
831 /* commented above code : now get data from dispostion table 830 /* commented above code : now get data from dispostion table
832 if(empty($mastersdata['dialerDispoList'])){ 831 if(empty($mastersdata['dialerDispoList'])){
833 $mastersdata['dialerDispoList']=$gthis->HRCoreVars['dialerDispoList']; 832 $mastersdata['dialerDispoList']=$gthis->HRCoreVars['dialerDispoList'];
834 }*/ 833 }*
835 if(!empty($mastersdata['dialerDispoList'])){ 834 if(!empty($mastersdata['dialerDispoList'])){
836 $dispoarr=explode("~",$mastersdata['dialerDispoList']); 835 $dispoarr=explode("~",$mastersdata['dialerDispoList']);
837 } 836 }
...@@ -859,7 +858,48 @@ $data.="</fieldset></div> ...@@ -859,7 +858,48 @@ $data.="</fieldset></div>
859 $subDisposition = $value->sunDispoName; 858 $subDisposition = $value->sunDispoName;
860 $data.="dialerdispoarray['$disposition']='$subDisposition';"; 859 $data.="dialerdispoarray['$disposition']='$subDisposition';";
861 } 860 }
862 } 861 }*/
862
863 $mastersdata = DB::table('campaign_disposition_plan')
864 ->join('disposition_plan_config', 'campaign_disposition_plan.dispo_plan_id', '=', 'disposition_plan_config.dispo_plan_id')
865 ->select('disposition_plan_config.disposition as disposition ', 'disposition_plan_config.sub_disposition as subDisposition')
866 ->where("campaign","=",$dataarr['client'])
867 ->get();
868
869 if($mastersdata->count() > 0){
870
871 foreach ($mastersdata as $key => $value) {
872 $disposition = $value->disposition;
873 $subDisposition = $value->subDisposition;
874 $data.="dialerdispoarray['$disposition']='$subDisposition';";
875 }
876
877 }else{
878 // if client company is empty get data from campaign company
879 $mastersdata=$gthis->getCompanyMaster($client);
880 if(!empty($mastersdata['dialerDispoList'])){
881 $dispoarr=explode("~",$mastersdata['dialerDispoList']);
882 foreach($dispoarr as $dispo)
883 {
884 if(!empty($dispo))
885 {
886 $dispoprts=explode("|",$dispo);
887 if(sizeof($dispoprts)>=3)
888 {
889 $data.="dialerdispoarray['$dispoprts[1]']='$dispoprts[2]';dispoClassArray['$dispoprts[0]']='$dispoprts[1]';";
890 }
891 }
892 }
893 }else{
894 // get disposition from disposition table
895 $dispositionPlan = $gthis->getDispositionList();
896 foreach ($dispositionPlan as $key => $value) {
897 $disposition = $value->disposition;
898 $subDisposition = $value->sunDispoName;
899 $data.="dialerdispoarray['$disposition']='$subDisposition';";
900 }
901 }
902 }
863 903
864 $data.=" 904 $data.="
865 905
......
application/resources/views/layout/module/campaign/campaignAssignToDisposition.blade.php
...@@ -30,33 +30,6 @@ width:100% ...@@ -30,33 +30,6 @@ width:100%
30 30
31 </div> 31 </div>
32 </div> 32 </div>
33
34 <!-- <div class="row" style="margin: 5px">
35 <div class="col-md-2">
36 <label>Select Disposition:</label>
37 </div>
38 <div class="col-md-6">
39 <select id="disposition" class="form-control" onchange='subDisposition($(this).val());'>
40 <option value></option>
41 <?php if(isset($disposition))
42 foreach($disposition as $kay => $val)
43 {
44 $code = $dispositionCode[$kay];
45 echo "<option data-id='$code' data-text='$kay' value='$val'>$kay</option>";
46 } ?>
47 </select>
48
49 </div>
50 </div> -->
51 <!-- <div class="row" style="margin: 5px">
52 <div class="col-md-2">
53 <label>Select Sub Disposition:</label>
54 </div>
55 <div class="col-md-6">
56 <select id="subDisposition" class="select2multi" style='width:100%' multiple="">
57 </select>
58 </div>
59 </div>-->
60 <div class="row"> 33 <div class="row">
61 <div class="col-md-2"> 34 <div class="col-md-2">
62 <button id="assigndesposition" class="btn btn-xs btn-info">Assign Disposition 35 <button id="assigndesposition" class="btn btn-xs btn-info">Assign Disposition
...@@ -79,10 +52,10 @@ width:100% ...@@ -79,10 +52,10 @@ width:100%
79 foreach($dispositionList as $key => $val) { ?> 52 foreach($dispositionList as $key => $val) { ?>
80 <li class="list-group-item list-group"> 53 <li class="list-group-item list-group">
81 <div class="col-sm-12"> 54 <div class="col-sm-12">
82 <div class="col-sm-3"><label><?php echo $val['disposition']; ?></label></div> 55 <div class="col-sm-3"><label><?php echo $val->disposition; ?></label></div>
83 <div class="col-sm-4"> 56 <div class="col-sm-4">
84 <?php $count = 0; 57 <?php $count = 0;
85 $subDisposition = explode(",", $val['subDisposition']); 58 $subDisposition = explode(",", $val->subDisposition);
86 if(count($subDisposition) > 0){ 59 if(count($subDisposition) > 0){
87 foreach ($subDisposition as $key => $value) { 60 foreach ($subDisposition as $key => $value) {
88 if(!empty($value)){ 61 if(!empty($value)){
...@@ -93,9 +66,6 @@ width:100% ...@@ -93,9 +66,6 @@ width:100%
93 } 66 }
94 ?> 67 ?>
95 </div> 68 </div>
96 <!-- <div class="col-sm-2"><a class="innerAll" href="#" onclick="deleteDesposition('<?php echo $val['disposition']; ?>');">
97 <span class="btn btn-primary btn-xs"><i class="fa fa-trash-o"></i></span>
98 </a></div>-->
99 </div> 69 </div>
100 70
101 </li> 71 </li>
...@@ -110,13 +80,7 @@ width:100% ...@@ -110,13 +80,7 @@ width:100%
110 <script> 80 <script>
111 function subDisposition(dispo) 81 function subDisposition(dispo)
112 { 82 {
113 var dispolist = dispo.split(','); 83 var dispolist = dispo.split(',');
114 /*var dispolist = [];
115
116 $.each( dispo, function( index, value ){
117 dispolist = $.merge( dispolist, value.split(',') );
118 });*/
119
120 $("#subDisposition").select2("val", "Select"); 84 $("#subDisposition").select2("val", "Select");
121 updateJSSelect('subDisposition',dispolist); 85 updateJSSelect('subDisposition',dispolist);
122 } 86 }
......
application/resources/views/layout/module/dispositionplan/edit.blade.php
...@@ -36,9 +36,7 @@ ...@@ -36,9 +36,7 @@
36 36
37 <div class="control-group field_wrapper"> 37 <div class="control-group field_wrapper">
38 <?php foreach ($dispositionPlan as $key => $dispoList) { ?> 38 <?php foreach ($dispositionPlan as $key => $dispoList) { ?>
39 <?php //$dispositions = explode(",", $dispositionPlan[0]->dispositions); ?> 39 <?php
40
41 <?php //for ($i=0; $i < count($dispositions); $i++) {
42 if($key == 0){ ?> 40 if($key == 0){ ?>
43 41
44 <div class="row"> 42 <div class="row">
...@@ -64,7 +62,7 @@ ...@@ -64,7 +62,7 @@
64 } 62 }
65 ?> 63 ?>
66 <div class="col-md-8 controls tmar"> 64 <div class="col-md-8 controls tmar">
67 <select class="form-control disposition" name="disposition[]" data-subDospoId="subDisposition1" required> 65 <select class="form-control disposition" name="disposition[]" data-subDospoId="subDisposition0" required>
68 <option value></option> 66 <option value></option>
69 <?php echo $data; ?> 67 <?php echo $data; ?>
70 </select> 68 </select>
...@@ -76,7 +74,7 @@ ...@@ -76,7 +74,7 @@
76 <label>Select Sub Disposition:</label> 74 <label>Select Sub Disposition:</label>
77 </div> 75 </div>
78 <div class="col-md-8 controls tmar"> 76 <div class="col-md-8 controls tmar">
79 <select name="subDisposition[0][]" id="subDisposition1" class="select2multi" style='width:100%' multiple="" required> 77 <select name="subDisposition[0][]" id="subDisposition0" class="select2multi" style='width:100%' multiple="" required>
80 <?php 78 <?php
81 $selectedSubDisposition = explode(",", $dispoList->sub_disposition); 79 $selectedSubDisposition = explode(",", $dispoList->sub_disposition);
82 $subDisposition = explode(",", $subDispoList); 80 $subDisposition = explode(",", $subDispoList);
...@@ -125,7 +123,7 @@ ...@@ -125,7 +123,7 @@
125 } 123 }
126 ?> 124 ?>
127 <div class="col-md-8 controls tmar"> 125 <div class="col-md-8 controls tmar">
128 <select class="form-control disposition" name="disposition[$key]" data-subDospoId="subDisposition<?php echo $key; ?>" required> 126 <select class="form-control disposition" name="disposition[<?php echo $key; ?>]" data-subDospoId="subDisposition<?php echo $key; ?>" required>
129 <option value></option> 127 <option value></option>
130 <?php echo $data; ?> 128 <?php echo $data; ?>
131 </select> 129 </select>
...@@ -137,7 +135,7 @@ ...@@ -137,7 +135,7 @@
137 <label>Select Sub Disposition:</label> 135 <label>Select Sub Disposition:</label>
138 </div> 136 </div>
139 <div class="col-md-8 controls tmar"> 137 <div class="col-md-8 controls tmar">
140 <select name="subDisposition[$key][]" id="subDisposition<?php echo $key; ?>" class="select2multi" style='width:100%' multiple="" required> 138 <select name="subDisposition[<?php echo $key; ?>][]" id="subDisposition<?php echo $key; ?>" class="select2multi" style='width:100%' multiple="" required>
141 <?php 139 <?php
142 $selectedSubDisposition = explode(",", $dispoList->sub_disposition); 140 $selectedSubDisposition = explode(",", $dispoList->sub_disposition);
143 $subDisposition = explode(",", $subDispoList); 141 $subDisposition = explode(",", $subDispoList);
...@@ -182,8 +180,8 @@ ...@@ -182,8 +180,8 @@
182 <script> 180 <script>
183 $(document).ready(function(){ 181 $(document).ready(function(){
184 182
185 var i = 1; 183 var i = $('.disposition').length;
186 var wrapper = $('.field_wrapper'); //Input field wrapper 184 var wrapper = $('.field_wrapper'); //Input field wrapper
187 185
188 $('.add_button').click(function(){ 186 $('.add_button').click(function(){
189 i++; 187 i++;
...@@ -203,7 +201,7 @@ ...@@ -203,7 +201,7 @@
203 }); 201 });
204 202
205 //$(".disposition").change(function(){ 203 //$(".disposition").change(function(){
206 $('body').on('click', '.disposition', function() { 204 $('body').on('change', '.disposition', function() {
207 205
208 var subDispositionId = $(this).attr('data-subDospoId'); 206 var subDispositionId = $(this).attr('data-subDospoId');
209 var subDispo = $(this).find(':selected').attr('data-text') //this.find(':selected').attr('data-text'); 207 var subDispo = $(this).find(':selected').attr('data-text') //this.find(':selected').attr('data-text');
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!