fix the bugs
This commit is contained in:
@@ -12,7 +12,7 @@ class DataTableService
|
||||
public function index(Request $request)
|
||||
{
|
||||
$query = DB::table('asteriskcdrdb.cdr')
|
||||
->leftJoin('crm_db.operator_dialogues', 'asteriskcdrdb.cdr.uniqueid', '=', 'crm_db.operator_dialogues.cdr_unique_id')
|
||||
->leftJoin('roaddb.operator_dialogues', 'asteriskcdrdb.cdr.uniqueid', '=', 'roaddb.operator_dialogues.cdr_unique_id')
|
||||
->where('dst', '<>', '')
|
||||
->where('lastapp', '=', 'Dial')
|
||||
->where('duration', '>', 0)
|
||||
|
||||
@@ -4,11 +4,12 @@ namespace App\Services\Dashboard\Province;
|
||||
|
||||
use App\Facades\DataTable\DataTableFacade;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class ReportService
|
||||
{
|
||||
public function cumulative(Request $request)
|
||||
public function cumulative(Request $request): Collection
|
||||
{
|
||||
$query = DB::table('asteriskcdrdb.cdr')
|
||||
->selectRaw("
|
||||
@@ -23,13 +24,9 @@ class ReportService
|
||||
COUNT(CASE WHEN dcontext = 'from-internal' AND disposition = 'ANSWERED' AND dst BETWEEN 101 AND 104 AND billsec > 9 THEN 1 END) AS b10,
|
||||
COUNT(CASE WHEN lastapp = 'Busy' THEN 1 END) AS dnd,
|
||||
COUNT(CASE WHEN dst BETWEEN 502 AND 599 THEN 1 END) AS trans,
|
||||
COUNT(CASE WHEN disposition <> 'BUSY' AND dst BETWEEN 101 AND 105 THEN 1 END) AS all,
|
||||
COUNT(CASE WHEN disposition <> 'BUSY' AND dst BETWEEN 101 AND 105 THEN 1 END) AS all_calls,
|
||||
AVG(CASE WHEN dcontext = 'from-internal' AND disposition = 'ANSWERED' THEN billsec END) AS avg
|
||||
");
|
||||
// ->whereBetween('calldate', [$from, $to]) // use Carbon or date strings
|
||||
// ->groupBy(DB::raw('DATE(calldate)'))
|
||||
// ->orderByDesc(DB::raw('DATE(calldate)'))
|
||||
// ->get();
|
||||
")->groupByRaw('DATE(calldate)');
|
||||
|
||||
$data = DataTableFacade::run(
|
||||
$query,
|
||||
@@ -38,6 +35,9 @@ class ReportService
|
||||
allowedSortings: ['*'],
|
||||
allowedGroupBy: ['d']
|
||||
);
|
||||
|
||||
$data = collect($data);
|
||||
|
||||
$totals = [
|
||||
'd' => 'TOTAL',
|
||||
'total' => $data->sum('total'),
|
||||
@@ -66,8 +66,6 @@ class ReportService
|
||||
COUNT(CASE WHEN is_listen = 1 THEN 1 END) AS l,
|
||||
COUNT(CASE WHEN is_listen = 0 THEN 1 END) AS nl
|
||||
');
|
||||
// ->whereBetween('date', [$date_from, $date_to])
|
||||
// ->first();
|
||||
|
||||
return DataTableFacade::run(
|
||||
$query,
|
||||
@@ -81,57 +79,33 @@ class ReportService
|
||||
{
|
||||
$query = DB::table('asteriskcdrdb.cdr')
|
||||
->where('recordingfile', '<>', '');
|
||||
// ->whereBetween('calldate', ["$date_from $time_from", "$date_to $time_to"])
|
||||
// ->when($cid, function ($query, $cid) {
|
||||
// return $query->where('src', 'like', "%{$cid}%");
|
||||
// })
|
||||
// ->when($c_op, function ($query, $c_op) {
|
||||
// return $query->where('dst', $c_op);
|
||||
// }, function ($query) {
|
||||
// return $query->whereBetween('dst', [100, 110]);
|
||||
// })
|
||||
// ->orderByDesc('calldate');
|
||||
|
||||
return DataTableFacade::run(
|
||||
$query,
|
||||
$request,
|
||||
allowedFilters: ['*'],
|
||||
allowedSortings: ['*'],
|
||||
allowedSelects: ['calldate', 'src', 'dst', 'disposition', 'duration']
|
||||
);
|
||||
}
|
||||
|
||||
public function operatorPerformanceDaily(Request $request)
|
||||
{
|
||||
$query = DB::table('asteriskcdrdb.cdr')
|
||||
$query = DB::table(DB::raw("(SELECT *, CAST(dst AS UNSIGNED) AS dst_num FROM asteriskcdrdb.cdr) AS cdr"))
|
||||
->selectRaw("
|
||||
*
|
||||
(all - (ok + nok)) AS fail
|
||||
FROM (
|
||||
SELECT
|
||||
DATE(calldate) AS d,
|
||||
dst,
|
||||
COUNT(CASE WHEN dcontext = 'from-internal' AND disposition = 'ANSWERED' AND dst BETWEEN 101 AND 104 THEN 1 END) AS ok,
|
||||
COUNT(CASE WHEN dcontext = 'from-internal' AND disposition = 'NO ANSWER' AND dst BETWEEN 101 AND 104 AND duration > 14 THEN 1 END) AS nok,
|
||||
COUNT(CASE WHEN dcontext = 'from-internal' AND disposition = 'ANSWERED' AND dst BETWEEN 101 AND 104 AND billsec > 9 THEN 1 END) AS b10,
|
||||
COUNT(CASE WHEN lastapp = 'Busy' THEN 1 END) AS dnd,
|
||||
COUNT(CASE WHEN dst BETWEEN 502 AND 599 THEN 1 END) AS trans,
|
||||
COUNT(CASE WHEN disposition <> 'BUSY' AND dst BETWEEN 101 AND 105 THEN 1 END) AS all
|
||||
FROM asteriskcdrdb.cdr
|
||||
WHERE dst BETWEEN 101 AND 105
|
||||
GROUP BY d, dst
|
||||
ORDER BY d, dst
|
||||
);
|
||||
");
|
||||
// ->whereBetween('calldate', ["$date_from $time_from", "$date_to $time_to"])
|
||||
// ->when($cid, function ($query, $cid) {
|
||||
// return $query->where('src', 'like', "%{$cid}%");
|
||||
// })
|
||||
// ->when($c_op, function ($query, $c_op) {
|
||||
// return $query->where('dst', $c_op);
|
||||
// }, function ($query) {
|
||||
// return $query->whereBetween('dst', [100, 110]);
|
||||
// })
|
||||
// ->orderByDesc('calldate');
|
||||
DATE(calldate) AS d,
|
||||
dst,
|
||||
COUNT(CASE WHEN dcontext = 'from-internal' AND disposition = 'ANSWERED' AND dst_num BETWEEN 1 AND 104 THEN 1 END) AS ok,
|
||||
COUNT(CASE WHEN dcontext = 'from-internal' AND disposition = 'NO ANSWER' AND dst_num BETWEEN 1 AND 104 AND duration > 14 THEN 1 END) AS nok,
|
||||
COUNT(CASE WHEN dcontext = 'from-internal' AND disposition = 'ANSWERED' AND dst_num BETWEEN 1 AND 104 AND billsec > 9 THEN 1 END) AS b10,
|
||||
COUNT(CASE WHEN lastapp = 'Busy' THEN 1 END) AS dnd,
|
||||
COUNT(CASE WHEN dst_num BETWEEN 502 AND 599 THEN 1 END) AS trans,
|
||||
COUNT(CASE WHEN disposition <> 'BUSY' AND dst_num BETWEEN 1 AND 105 THEN 1 END) AS total_calls
|
||||
")
|
||||
->whereBetween('dst_num', [1, 105])
|
||||
->groupBy(DB::raw('DATE(calldate)'), 'dst')
|
||||
->orderBy(DB::raw('DATE(calldate)'))
|
||||
->orderBy('dst');
|
||||
|
||||
return DataTableFacade::run(
|
||||
$query,
|
||||
@@ -143,25 +117,21 @@ class ReportService
|
||||
|
||||
public function operatorPerformanceTotal(Request $request)
|
||||
{
|
||||
$query = DB::table('asteriskcdrdb.cdr')
|
||||
$query = DB::table(DB::raw("(SELECT *, CAST(dst AS UNSIGNED) AS dst_num FROM asteriskcdrdb.cdr) AS cdr"))
|
||||
->selectRaw("
|
||||
*
|
||||
(all - (ok + nok)) AS fail
|
||||
FROM (
|
||||
SELECT
|
||||
DATE(calldate) AS d,
|
||||
dst,
|
||||
COUNT(CASE WHEN dcontext = 'from-internal' AND disposition = 'ANSWERED' AND dst BETWEEN 101 AND 104 THEN 1 END) AS ok,
|
||||
COUNT(CASE WHEN dcontext = 'from-internal' AND disposition = 'NO ANSWER' AND dst BETWEEN 101 AND 104 AND duration > 14 THEN 1 END) AS nok,
|
||||
COUNT(CASE WHEN dcontext = 'from-internal' AND disposition = 'ANSWERED' AND dst BETWEEN 101 AND 104 AND billsec > 9 THEN 1 END) AS b10,
|
||||
COUNT(CASE WHEN lastapp = 'Busy' THEN 1 END) AS dnd,
|
||||
COUNT(CASE WHEN dst BETWEEN 502 AND 599 THEN 1 END) AS trans,
|
||||
COUNT(CASE WHEN disposition <> 'BUSY' AND dst BETWEEN 101 AND 105 THEN 1 END) AS all
|
||||
FROM asteriskcdrdb.cdr
|
||||
WHERE dst BETWEEN 101 AND 105
|
||||
GROUP BY dst
|
||||
ORDER BY dst);
|
||||
");
|
||||
DATE(calldate) AS d,
|
||||
dst,
|
||||
COUNT(CASE WHEN dcontext = 'from-internal' AND disposition = 'ANSWERED' AND dst_num BETWEEN 1 AND 104 THEN 1 END) AS ok,
|
||||
COUNT(CASE WHEN dcontext = 'from-internal' AND disposition = 'NO ANSWER' AND dst_num BETWEEN 1 AND 104 AND duration > 14 THEN 1 END) AS nok,
|
||||
COUNT(CASE WHEN dcontext = 'from-internal' AND disposition = 'ANSWERED' AND dst_num BETWEEN 1 AND 104 AND billsec > 9 THEN 1 END) AS b10,
|
||||
COUNT(CASE WHEN lastapp = 'Busy' THEN 1 END) AS dnd,
|
||||
COUNT(CASE WHEN dst_num BETWEEN 502 AND 599 THEN 1 END) AS trans,
|
||||
COUNT(CASE WHEN disposition <> 'BUSY' AND dst_num BETWEEN 1 AND 105 THEN 1 END) AS total_calls
|
||||
")
|
||||
->whereBetween('dst_num', [1, 105])
|
||||
->groupBy('dst')
|
||||
->orderBy(DB::raw('DATE(calldate)'))
|
||||
->orderBy('dst');
|
||||
|
||||
return DataTableFacade::run(
|
||||
$query,
|
||||
|
||||
Reference in New Issue
Block a user