diff --git a/app/Http/Controllers/Api/BigDataResumeController.php b/app/Http/Controllers/Api/BigDataResumeController.php index 972f234..b1b3e86 100644 --- a/app/Http/Controllers/Api/BigDataResumeController.php +++ b/app/Http/Controllers/Api/BigDataResumeController.php @@ -39,13 +39,17 @@ class BigDataResumeController extends Controller return response()->json(['message' => 'No data setting found']); } + function cleanNumber($value) { + return floatval(str_replace('.', '', $value)); + } + $target_pad = floatval(optional($data_settings->where('key', 'TARGET_PAD')->first())->value); - $realisasi_terbit_pbg_sum = floatval(optional($data_settings->where('key', 'REALISASI_TERBIT_PBG_SUM')->first())->value); - $realisasi_terbit_pbg_count = floatval(optional($data_settings->where('key', 'REALISASI_TERBIT_PBG_COUNT')->first())->value); - $menuggu_klik_dpmptsp_sum = floatval(optional($data_settings->where('key', 'MENUNGGU_KLIK_DPMPTSP_SUM')->first())->value); - $menuggu_klik_dpmptsp_count = floatval(optional($data_settings->where('key', 'MENUNGGU_KLIK_DPMPTSP_COUNT')->first())->value); - $proses_dinas_teknis_sum = floatval(optional($data_settings->where('key', 'PROSES_DINAS_TEKNIS_SUM')->first())->value); - $proses_dinas_teknis_count = floatval(optional($data_settings->where('key', 'PROSES_DINAS_TEKNIS_COUNT')->first())->value); + $realisasi_terbit_pbg_sum = cleanNumber(optional($data_settings->where('key', 'REALISASI_TERBIT_PBG_SUM')->first())->value); + $realisasi_terbit_pbg_count = cleanNumber(optional($data_settings->where('key', 'REALISASI_TERBIT_PBG_COUNT')->first())->value); + $menunggu_klik_dpmptsp_sum = cleanNumber(optional($data_settings->where('key', 'MENUNGGU_KLIK_DPMPTSP_SUM')->first())->value); + $menunggu_klik_dpmptsp_count = cleanNumber(optional($data_settings->where('key', 'MENUNGGU_KLIK_DPMPTSP_COUNT')->first())->value); + $proses_dinas_teknis_sum = cleanNumber(optional($data_settings->where('key', 'PROSES_DINAS_TEKNIS_SUM')->first())->value); + $proses_dinas_teknis_count = cleanNumber(optional($data_settings->where('key', 'PROSES_DINAS_TEKNIS_COUNT')->first())->value); $tata_ruang = $big_data_resume->spatial_sum; $kekurangan_potensi = $target_pad - $big_data_resume->potention_sum; @@ -83,8 +87,8 @@ class BigDataResumeController extends Controller ? round(($realisasi_terbit_pbg_sum / $big_data_resume->verified_sum) * 100, 2) : 0; // percentage menunggu klik dpmptsp - $menunggu_klik_dpmptsp_percentage = $big_data_resume->verified_sum > 0 && $menuggu_klik_dpmptsp_sum > 0 - ? round(($menuggu_klik_dpmptsp_sum / $big_data_resume->verified_sum) * 100, 2) : 0; + $menunggu_klik_dpmptsp_percentage = $big_data_resume->verified_sum > 0 && $menunggu_klik_dpmptsp_sum > 0 + ? round(($menunggu_klik_dpmptsp_sum / $big_data_resume->verified_sum) * 100, 2) : 0; // percentage proses_dinas_teknis $proses_dinas_teknis_percentage = $big_data_resume->verified_sum > 0 && $proses_dinas_teknis_sum > 0 @@ -135,8 +139,8 @@ class BigDataResumeController extends Controller 'percentage' => $realisasi_terbit_percentage ], 'menunggu_klik_dpmptsp' => [ - 'sum' => $menuggu_klik_dpmptsp_sum, - 'count' => $menuggu_klik_dpmptsp_count, + 'sum' => $menunggu_klik_dpmptsp_sum, + 'count' => $menunggu_klik_dpmptsp_count, 'percentage' => $menunggu_klik_dpmptsp_percentage ], 'proses_dinas_teknis' => [ @@ -151,6 +155,8 @@ class BigDataResumeController extends Controller } } + + public function bigdata_report(Request $request){ try{ $query = BigdataResume::query()->orderBy('id', 'desc'); diff --git a/app/Http/Controllers/Api/RequestAssignmentController.php b/app/Http/Controllers/Api/RequestAssignmentController.php index 56605f5..3474fe5 100644 --- a/app/Http/Controllers/Api/RequestAssignmentController.php +++ b/app/Http/Controllers/Api/RequestAssignmentController.php @@ -17,7 +17,8 @@ class RequestAssignmentController extends Controller $query = PbgTask::query()->orderBy('id', 'desc'); if($request->has('search') && !empty($request->get("search"))){ $query->where('name', 'LIKE', '%'.$request->get('search').'%') - ->orWhere('registration_number', 'LIKE', '%'.$request->get('search').'%'); + ->orWhere('registration_number', 'LIKE', '%'.$request->get('search').'%') + ->orWhere('document_number', 'LIKE', '%'.$request->get('search').'%'); } return RequestAssignmentResouce::collection($query->paginate()); }