Added two more new columns into campaign wise report

@@ -20,7 +20,6 @@ use App\Models\UserLog;
 use DB;
 use DB;
 use Log;
 use Log;
 use Session;
 use Session;
-use App\lib\PHP_XLSXWriter_master\XLSXWriter;
 
 
 class ReportController extends Controller
 class ReportController extends Controller
 {
 {
@@ -70,7 +69,7 @@ class ReportController extends Controller
 
 
 		if($id=="liveusers")
 		if($id=="liveusers")
 		{
 		{
-			$campStr 	= "";
+			 /*$campStr 	= "";
 			 $ratio		= 0;
 			 $ratio		= 0;
 			 $totalCall	= 0;
 			 $totalCall	= 0;
 			 $dialedCall = 0;
 			 $dialedCall = 0;
@@ -122,7 +121,7 @@ class ReportController extends Controller
 			 	$statusStr	= "<span class='btn btn-xs btn-warning'><strong>Free</strong></span>";
 			 	$statusStr	= "<span class='btn btn-xs btn-warning'><strong>Free</strong></span>";
 
 
 			 	$sipIdArr = Sipid::where('server', '=', env('app_ip'))->where('user', "=", $usr->id)->where('status', '=', 1)->select('id', 'status', 'ready', 'patched','prepare_call')->first();
 			 	$sipIdArr = Sipid::where('server', '=', env('app_ip'))->where('user', "=", $usr->id)->where('status', '=', 1)->select('id', 'status', 'ready', 'patched','prepare_call')->first();
-				//if($sipIdArr->user!=$usr->id) continue;
+			 	if($sipIdArr->user!=$usr->id) continue;
 			 	if($sipIdArr->patched==0) $freeUsr++;
 			 	if($sipIdArr->patched==0) $freeUsr++;
 
 
 			 	if($sipIdArr->ready==1)$statusStr = "<span class='btn btn-xs btn-success'><strong>Available</strong></span>";
 			 	if($sipIdArr->ready==1)$statusStr = "<span class='btn btn-xs btn-success'><strong>Available</strong></span>";
@@ -150,9 +149,9 @@ class ReportController extends Controller
 
 
 			 }
 			 }
 
 
-			$data['campStr']	= $campStr;
+			 $data['campStr']	= $campStr;*/
 			
 			
-			return view("layout.module.reports.liveusers", $data);
+			return view("layout.module.dialer.liveusers", $data);
 		}
 		}
 
 
 		if($id=="calllog")
 		if($id=="calllog")
@@ -221,6 +220,9 @@ class ReportController extends Controller
 
 
 			if($crmcallObj->user_id != 0) $reportArr[$crmcallObj->client]['connects']++;
 			if($crmcallObj->user_id != 0) $reportArr[$crmcallObj->client]['connects']++;
 
 
+			if(strstr($crmcallObj->userstatus, "Contacted"))$reportArr[$crmcallObj->client]['contacts']++;
+			if(stristr($crmcallObj->usersubstatus, "follow"))$reportArr[$crmcallObj->client]['callbacks']++;
+
 			if(strstr($crmcallObj->status, "NOANSWER"))$reportArr[$crmcallObj->client]['no_answer']++;
 			if(strstr($crmcallObj->status, "NOANSWER"))$reportArr[$crmcallObj->client]['no_answer']++;
 			if(stristr($crmcallObj->status, "busy"))$reportArr[$crmcallObj->client]['busy']++;
 			if(stristr($crmcallObj->status, "busy"))$reportArr[$crmcallObj->client]['busy']++;
 			if($crmcallObj->status == "ANSWER" && $crmcallObj->user_id == 0)$reportArr[$crmcallObj->client]['abandoned']++;
 			if($crmcallObj->status == "ANSWER" && $crmcallObj->user_id == 0)$reportArr[$crmcallObj->client]['abandoned']++;