From c401f17f7dc1a5fe407a33e253a9756faf68dfb5 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 10 Apr 2022 10:02:36 +0800 Subject: [PATCH] fix kelulusan --- app/Http/Controllers/AdminPageController.php | 21 ++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index b46c718..3653096 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -1684,19 +1684,28 @@ class AdminPageController extends Controller $cawangan_all = Cawangan::on('mysql7')->get(); $arraykelulusan = []; - foreach($cawangan_all as $index=>$cawangan){ - $kelulusan=Mohon::on($cawangan['mysql']) + foreach($cawangan_all as $index=>$cawangan){ + $kelulusan=Mohon::on($cawangan['mysql']) ->where('tarikh','=',$harini->toDateString()) ->where('masalulus','=','') ->where('pelulus','=','operasi') - ->get(); + ->get()->toArray(); if(sizeof($kelulusan) != 0){ - array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]); + foreach($kelulusan as $index=>$kel) + { + $kelulusan[$index]['cawangan'] = $cawangan['details_caw']; + $kelulusan[$index]['cawangankod'] = $cawangan['kodcaw']; + array_push($arraykelulusan,$kelulusan[$index]); + } + // $arraykelulusan += $kelulusan; + // array_push($arraykelulusan,$kelulusan); + // $arraykelulusan += $kelulusan; + // array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]); } } - - $data = $this->paginate($arraykelulusan); + + $data = $this->paginate($arraykelulusan,3); return response()->json($data,200); }