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 {
$gthis = new KHRMSLib();
$campaign = Input::get("campaign");
/*$mastersdata=$gthis->getCompanyMaster($campaign);
$disposition = array();
$dispoarr = array();
if(!empty($mastersdata['dialerDispoList'])){
//$mastersdata['dialerDispoList']=$gthis->HRCoreVars['dialerDispoList'];
$dispoarr=explode("~",$mastersdata['dialerDispoList']);
}
if(count($dispoarr) > 0){
foreach($dispoarr as $dispo){
if(!empty($dispo))
{
$dispoprts=explode("|",$dispo);
if(sizeof($dispoprts)>=3)
{
$disposition[$dispoprts[1]] = $dispoprts[2];
$dispositionCode[$dispoprts[1]] = $dispoprts[0];
}
}
}
}else{*/
$dispositionPlans=DispositionPlan::where("status","=","active")->get();
//}
$data['dispositionPlans'] = $dispositionPlans;
//$data['dispositionCode'] = $dispositionCode;
$data['selectedDispositionPlan'] = DB::table('campaign_disposition_plan')
->join('disposition_plan', 'campaign_disposition_plan.dispo_plan_id', '=', 'disposition_plan.id')
->select('disposition_plan.name as name ', 'disposition_plan.id as planid')->where("campaign","=",$campaign)->first();
$dispositionList=DB::table('hrms_masters')->select('*')->where('status','=','Active')->where("mkey","=",$campaign)->where("mtype","=",'coreconfig')->first();
$dispolist=explode("~",$dispositionList->mvalue);
$dispositionList = array();
$plans = array();
foreach ($dispolist as $key => $dispo) {
if(!empty($dispo))
{
$dispoprts=explode("|",$dispo);
$dispositionPlan=Disposition::where("name","=",$dispoprts[1])->first();
$data['dispositionList'] = DB::table('campaign_disposition_plan')
->join('disposition_plan_config', 'campaign_disposition_plan.dispo_plan_id', '=', 'disposition_plan_config.dispo_plan_id')
->select('disposition_plan_config.disposition as disposition ', 'disposition_plan_config.sub_disposition as subDisposition')
->where("campaign","=",$campaign)
->get();
//$dispositionList[$dispoprts[1]]= $dispoprts[2];
$dispositionList[] = array('disposition' => $dispoprts[1],
'subDisposition' => $dispoprts[2],
'plan' => $dispositionPlan->plan);
$plans[] = $dispositionPlan->plan;
}
}
$data['dispositionList'] = $dispositionList;
$data['plans'] = $plans;
//$campaign = Input::get("campaign");
if($campaign != ""){
//this condition for getting all campaign data
......@@ -788,6 +750,7 @@ class CampaignController extends Controller {
$mvalue = "$code|$disposition|$subDisposition";
}
}
$hrmsdata = DB::table('hrms_masters')->where('mkey','=', $campaign)->where('mtype','=', 'coreconfig')->select('*');
if($hrmsdata->count() == 0){
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 {
public function index()
{
$data['dispositionPlan']= DispositionPlan::join('disposition_plan_config', 'disposition_plan.id', '=', 'disposition_plan_config.dispo_plan_id')
$data['dispositionPlan']= DispositionPlan::leftjoin('disposition_plan_config', 'disposition_plan.id', '=', 'disposition_plan_config.dispo_plan_id')
->select('disposition_plan.id as dispositionPlanId', 'disposition_plan.name as name','disposition_plan.status AS status',
DB::raw('count(*) as totalDisposition, disposition_plan_config.id'),
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>
dialerdispoarray['']='';\n";
// to get client corconfig
$mastersdata= $gthis->getDispocampaignData($dataarr['client']);
/*$mastersdata= $gthis->getDispocampaignData($dataarr['client']);
$dispoarr = [];
//$dispoarr=explode("~",$mastersdata['mvalue']);
if(empty($mastersdata))
{
// if client company is empty get data from campaign company
......@@ -831,7 +830,7 @@ $data.="</fieldset></div>
/* commented above code : now get data from dispostion table
if(empty($mastersdata['dialerDispoList'])){
$mastersdata['dialerDispoList']=$gthis->HRCoreVars['dialerDispoList'];
}*/
}*
if(!empty($mastersdata['dialerDispoList'])){
$dispoarr=explode("~",$mastersdata['dialerDispoList']);
}
......@@ -859,7 +858,48 @@ $data.="</fieldset></div>
$subDisposition = $value->sunDispoName;
$data.="dialerdispoarray['$disposition']='$subDisposition';";
}
}
}*/
$mastersdata = DB::table('campaign_disposition_plan')
->join('disposition_plan_config', 'campaign_disposition_plan.dispo_plan_id', '=', 'disposition_plan_config.dispo_plan_id')
->select('disposition_plan_config.disposition as disposition ', 'disposition_plan_config.sub_disposition as subDisposition')
->where("campaign","=",$dataarr['client'])
->get();
if($mastersdata->count() > 0){
foreach ($mastersdata as $key => $value) {
$disposition = $value->disposition;
$subDisposition = $value->subDisposition;
$data.="dialerdispoarray['$disposition']='$subDisposition';";
}
}else{
// if client company is empty get data from campaign company
$mastersdata=$gthis->getCompanyMaster($client);
if(!empty($mastersdata['dialerDispoList'])){
$dispoarr=explode("~",$mastersdata['dialerDispoList']);
foreach($dispoarr as $dispo)
{
if(!empty($dispo))
{
$dispoprts=explode("|",$dispo);
if(sizeof($dispoprts)>=3)
{
$data.="dialerdispoarray['$dispoprts[1]']='$dispoprts[2]';dispoClassArray['$dispoprts[0]']='$dispoprts[1]';";
}
}
}
}else{
// get disposition from disposition table
$dispositionPlan = $gthis->getDispositionList();
foreach ($dispositionPlan as $key => $value) {
$disposition = $value->disposition;
$subDisposition = $value->sunDispoName;
$data.="dialerdispoarray['$disposition']='$subDisposition';";
}
}
}
$data.="
......
application/resources/views/layout/module/campaign/campaignAssignToDisposition.blade.php
......@@ -30,33 +30,6 @@ width:100%
</div>
</div>
<!-- <div class="row" style="margin: 5px">
<div class="col-md-2">
<label>Select Disposition:</label>
</div>
<div class="col-md-6">
<select id="disposition" class="form-control" onchange='subDisposition($(this).val());'>
<option value></option>
<?php if(isset($disposition))
foreach($disposition as $kay => $val)
{
$code = $dispositionCode[$kay];
echo "<option data-id='$code' data-text='$kay' value='$val'>$kay</option>";
} ?>
</select>
</div>
</div> -->
<!-- <div class="row" style="margin: 5px">
<div class="col-md-2">
<label>Select Sub Disposition:</label>
</div>
<div class="col-md-6">
<select id="subDisposition" class="select2multi" style='width:100%' multiple="">
</select>
</div>
</div>-->
<div class="row">
<div class="col-md-2">
<button id="assigndesposition" class="btn btn-xs btn-info">Assign Disposition
......@@ -79,10 +52,10 @@ width:100%
foreach($dispositionList as $key => $val) { ?>
<li class="list-group-item list-group">
<div class="col-sm-12">
<div class="col-sm-3"><label><?php echo $val['disposition']; ?></label></div>
<div class="col-sm-3"><label><?php echo $val->disposition; ?></label></div>
<div class="col-sm-4">
<?php $count = 0;
$subDisposition = explode(",", $val['subDisposition']);
$subDisposition = explode(",", $val->subDisposition);
if(count($subDisposition) > 0){
foreach ($subDisposition as $key => $value) {
if(!empty($value)){
......@@ -93,9 +66,6 @@ width:100%
}
?>
</div>
<!-- <div class="col-sm-2"><a class="innerAll" href="#" onclick="deleteDesposition('<?php echo $val['disposition']; ?>');">
<span class="btn btn-primary btn-xs"><i class="fa fa-trash-o"></i></span>
</a></div>-->
</div>
</li>
......@@ -110,13 +80,7 @@ width:100%
<script>
function subDisposition(dispo)
{
var dispolist = dispo.split(',');
/*var dispolist = [];
$.each( dispo, function( index, value ){
dispolist = $.merge( dispolist, value.split(',') );
});*/
var dispolist = dispo.split(',');
$("#subDisposition").select2("val", "Select");
updateJSSelect('subDisposition',dispolist);
}
......
application/resources/views/layout/module/dispositionplan/edit.blade.php
......@@ -36,9 +36,7 @@
<div class="control-group field_wrapper">
<?php foreach ($dispositionPlan as $key => $dispoList) { ?>
<?php //$dispositions = explode(",", $dispositionPlan[0]->dispositions); ?>
<?php //for ($i=0; $i < count($dispositions); $i++) {
<?php
if($key == 0){ ?>
<div class="row">
......@@ -64,7 +62,7 @@
}
?>
<div class="col-md-8 controls tmar">
<select class="form-control disposition" name="disposition[]" data-subDospoId="subDisposition1" required>
<select class="form-control disposition" name="disposition[]" data-subDospoId="subDisposition0" required>
<option value></option>
<?php echo $data; ?>
</select>
......@@ -76,7 +74,7 @@
<label>Select Sub Disposition:</label>
</div>
<div class="col-md-8 controls tmar">
<select name="subDisposition[0][]" id="subDisposition1" class="select2multi" style='width:100%' multiple="" required>
<select name="subDisposition[0][]" id="subDisposition0" class="select2multi" style='width:100%' multiple="" required>
<?php
$selectedSubDisposition = explode(",", $dispoList->sub_disposition);
$subDisposition = explode(",", $subDispoList);
......@@ -125,7 +123,7 @@
}
?>
<div class="col-md-8 controls tmar">
<select class="form-control disposition" name="disposition[$key]" data-subDospoId="subDisposition<?php echo $key; ?>" required>
<select class="form-control disposition" name="disposition[<?php echo $key; ?>]" data-subDospoId="subDisposition<?php echo $key; ?>" required>
<option value></option>
<?php echo $data; ?>
</select>
......@@ -137,7 +135,7 @@
<label>Select Sub Disposition:</label>
</div>
<div class="col-md-8 controls tmar">
<select name="subDisposition[$key][]" id="subDisposition<?php echo $key; ?>" class="select2multi" style='width:100%' multiple="" required>
<select name="subDisposition[<?php echo $key; ?>][]" id="subDisposition<?php echo $key; ?>" class="select2multi" style='width:100%' multiple="" required>
<?php
$selectedSubDisposition = explode(",", $dispoList->sub_disposition);
$subDisposition = explode(",", $subDispoList);
......@@ -182,8 +180,8 @@
<script>
$(document).ready(function(){
var i = 1;
var wrapper = $('.field_wrapper'); //Input field wrapper
var i = $('.disposition').length;
var wrapper = $('.field_wrapper'); //Input field wrapper
$('.add_button').click(function(){
i++;
......@@ -203,7 +201,7 @@
});
//$(".disposition").change(function(){
$('body').on('click', '.disposition', function() {
$('body').on('change', '.disposition', function() {
var subDispositionId = $(this).attr('data-subDospoId');
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!