diff --git a/app/Http/Controllers/HeadquartersDashboard/LoginToProvinceController.php b/app/Http/Controllers/HeadquartersDashboard/LoginToProvinceController.php index bb2a13d..799ba7f 100644 --- a/app/Http/Controllers/HeadquartersDashboard/LoginToProvinceController.php +++ b/app/Http/Controllers/HeadquartersDashboard/LoginToProvinceController.php @@ -17,7 +17,7 @@ class LoginToProvinceController extends Controller { $province_ip = Province::query() ->Where('id', '=', $request->province_id) - ->value('ip_address'); + ->value('ip'); $data = [ 'user_id' => auth()->user()->id, diff --git a/app/Services/Dashboard/Province/ReportService.php b/app/Services/Dashboard/Province/ReportService.php index f3952d6..bd804d6 100644 --- a/app/Services/Dashboard/Province/ReportService.php +++ b/app/Services/Dashboard/Province/ReportService.php @@ -31,13 +31,32 @@ class ReportService // ->orderByDesc(DB::raw('DATE(calldate)')) // ->get(); - return DataTableFacade::run( + $data = DataTableFacade::run( $query, $request, allowedFilters: ['*'], allowedSortings: ['*'], allowedGroupBy: ['d'] ); + $totals = [ + 'd' => 'TOTAL', + 'total' => $data->sum('total'), + 'teh4' => $data->sum('teh4'), + 'teh5' => $data->sum('teh5'), + 'os4' => $data->sum('os4'), + 'os5' => $data->sum('os5'), + 'ok' => $data->sum('ok'), + 'nok' => $data->sum('nok'), + 'b10' => $data->sum('b10'), + 'dnd' => $data->sum('dnd'), + 'trans' => $data->sum('trans'), + 'all' => $data->sum('all'), + 'avg' => round($data->avg('avg'), 2), + ]; + + $data->push($totals); + + return $data; } public function peopleMessages(Request $request) diff --git a/routes/web.php b/routes/web.php index dfc4ade..5279acc 100644 --- a/routes/web.php +++ b/routes/web.php @@ -216,8 +216,9 @@ Route::prefix('server')->group(function () { ->name('verifyAuthentication.') ->controller(VerifyAuthenticationController::class) ->group(function () { - Route::get('/', 'login')->name('login'); + Route::post('/', 'login')->name('login'); }); + Route::middleware('auth') ->prefix('report') ->name('report.')