diff --git a/app/Http/Controllers/Api/BigDataResumeController.php b/app/Http/Controllers/Api/BigDataResumeController.php index 98734c6..972f234 100644 --- a/app/Http/Controllers/Api/BigDataResumeController.php +++ b/app/Http/Controllers/Api/BigDataResumeController.php @@ -159,7 +159,7 @@ class BigDataResumeController extends Controller $query->where('name', 'LIKE', '%'.$request->input('search').'%'); } - $query = $query->paginate(15); + $query = $query->paginate(config('app.paginate_per_page', 50)); return BigdataResumeResource::collection($query)->response()->getData(true); }catch(\Exception $e){ Log::error($e->getMessage()); @@ -167,38 +167,6 @@ class BigDataResumeController extends Controller } } - /** - * Store a newly created resource in storage. - */ - public function store(Request $request) - { - // - } - - /** - * Display the specified resource. - */ - public function show(string $id) - { - // - } - - /** - * Update the specified resource in storage. - */ - public function update(Request $request, string $id) - { - // - } - - /** - * Remove the specified resource from storage. - */ - public function destroy(string $id) - { - // - } - private function response_empty_resume(){ $result = [ 'target_pad' => [ diff --git a/app/Http/Controllers/Api/BusinessOrIndustriesController.php b/app/Http/Controllers/Api/BusinessOrIndustriesController.php index d426b0b..0002eee 100644 --- a/app/Http/Controllers/Api/BusinessOrIndustriesController.php +++ b/app/Http/Controllers/Api/BusinessOrIndustriesController.php @@ -31,7 +31,7 @@ class BusinessOrIndustriesController extends Controller }); } - return response()->json($query->paginate()); + return response()->json($query->paginate(config('app.paginate_per_page', 50))); } /** diff --git a/app/Http/Controllers/Api/CustomersController.php b/app/Http/Controllers/Api/CustomersController.php index 33b5d44..248ad42 100644 --- a/app/Http/Controllers/Api/CustomersController.php +++ b/app/Http/Controllers/Api/CustomersController.php @@ -24,7 +24,7 @@ class CustomersController extends Controller ->orWhere('nama', 'LIKE', '%'.$request->get('search').'%') ->orWhere('kota_pelayanan', 'LIKE', '%'.$request->get('search').'%'); } - return CustomersResource::collection($query->paginate()); + return CustomersResource::collection($query->paginate(config('app.paginate_per_page', 50))); } /** diff --git a/app/Http/Controllers/Api/ImportDatasourceController.php b/app/Http/Controllers/Api/ImportDatasourceController.php index f77c4a0..ed48ef2 100644 --- a/app/Http/Controllers/Api/ImportDatasourceController.php +++ b/app/Http/Controllers/Api/ImportDatasourceController.php @@ -24,7 +24,7 @@ class ImportDatasourceController extends Controller $search = $request->get("search"); $query->where('status', 'like', "%".$search."%"); } - return ImportDatasourceResource::collection($query->paginate()); + return ImportDatasourceResource::collection($query->paginate(config('app.paginate_per_page', 50))); } public function checkImportDatasource(){ diff --git a/app/Http/Controllers/Api/MenusController.php b/app/Http/Controllers/Api/MenusController.php index eede7aa..50fd187 100644 --- a/app/Http/Controllers/Api/MenusController.php +++ b/app/Http/Controllers/Api/MenusController.php @@ -22,7 +22,7 @@ class MenusController extends Controller $query = $query->where("name", "like", "%".$request->get("search")."%"); } - return response()->json($query->paginate()); + return response()->json($query->paginate(config('app.paginate_per_page', 50))); } /** diff --git a/app/Http/Controllers/Api/RolesController.php b/app/Http/Controllers/Api/RolesController.php index d005214..0e755f2 100644 --- a/app/Http/Controllers/Api/RolesController.php +++ b/app/Http/Controllers/Api/RolesController.php @@ -20,7 +20,7 @@ class RolesController extends Controller $query = $query->where('name', 'like', '%'. $request->get('search') . '%'); } - return response()->json($query->paginate()); + return response()->json($query->paginate(config('app.paginate_per_page', 50))); } /** diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index c4c97f1..da5c6f4 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -31,7 +31,7 @@ class UsersController extends Controller if($request->has('search') && !empty($request->get("search"))){ $query->where('name', 'LIKE', '%'.$request->get('search').'%'); } - return UserResource::collection($query->paginate()); + return UserResource::collection($query->paginate(config('app.paginate_per_page', 50))); } public function logout(Request $request){ $request->user()->tokens()->delete(); diff --git a/app/Http/Resources/BigdataResumeResource.php b/app/Http/Resources/BigdataResumeResource.php index 611f77e..400ca30 100644 --- a/app/Http/Resources/BigdataResumeResource.php +++ b/app/Http/Resources/BigdataResumeResource.php @@ -34,7 +34,16 @@ class BigdataResumeResource extends JsonResource 'spatial_count' => (int) $this->spatial_count, 'spatial_sum' => number_format((float) $this->spatial_sum, 2, ',', '.'), - + + 'issuance_realization_pbg_count' => (int) $this->issuance_realization_pbg_count, + 'issuance_realization_pbg_sum' => number_format((float) $this->issuance_realization_pbg_sum, 2, ',', '.'), + + 'waiting_click_dpmptsp_count' => (int) $this->waiting_click_dpmptsp_count, + 'waiting_click_dpmptsp_sum' => number_format((float) $this->waiting_click_dpmptsp_sum, 2, ',', '.'), + + 'process_in_technical_office_count' => (int) $this->process_in_technical_office_count, + 'process_in_technical_office_sum' => number_format((float) $this->process_in_technical_office_sum, 2, ',', '.'), + 'year' => $this->year, 'created_at' => $this->created_at->toDateTimeString(), ]; diff --git a/config/app.php b/config/app.php index ea06b04..1b40396 100755 --- a/config/app.php +++ b/config/app.php @@ -123,5 +123,6 @@ return [ 'store' => env('APP_MAINTENANCE_STORE', 'database'), ], - 'api_url' => env('API_URL', 'http://localhost:8000') + 'api_url' => env('API_URL', 'http://localhost:8000'), + 'paginate_per_page' => 50 ]; diff --git a/resources/js/bigdata-resumes/index.js b/resources/js/bigdata-resumes/index.js index 359add3..b2cb7a4 100644 --- a/resources/js/bigdata-resumes/index.js +++ b/resources/js/bigdata-resumes/index.js @@ -30,7 +30,6 @@ class BigdataResume { initTableDataSettings() { let tableContainer = document.getElementById("table-bigdata-resumes"); - // Create a new Grid.js instance only if it doesn't exist this.table = new Grid({ columns: [ { name: "ID" }, @@ -46,13 +45,19 @@ class BigdataResume { { name: "Total Non Usaha" }, { name: "Jumlah Tata Ruang" }, { name: "Total Tata Ruang" }, + { name: "Jumlah Menunggu Klik DPMPTSP" }, + { name: "Total Menunggu Klik DPMPTSP" }, + { name: "Jumlah Realisasi Terbit PBG" }, + { name: "Total Realisasi Terbit PBG" }, + { name: "Jumlah Proses Dinas Teknis" }, + { name: "Total Proses Dinas Teknis" }, { name: "Created", attributes: { style: "width: 200px; white-space: nowrap;" }, // Set width dynamically }, ], pagination: { - limit: 15, + limit: 50, server: { url: (prev, page) => `${prev}${prev.includes("?") ? "&" : "?"}page=${ @@ -74,8 +79,8 @@ class BigdataResume { .getAttribute("content")}`, "Content-Type": "application/json", }, - then: (data) => - data.data.map((item) => [ + then: (data) => { + return data.data.map((item) => [ item.id, item.potention_count, addThousandSeparators(item.potention_sum), @@ -89,8 +94,19 @@ class BigdataResume { addThousandSeparators(item.non_business_sum), item.spatial_count, addThousandSeparators(item.spatial_sum), + item.waiting_click_dpmptsp_count, + addThousandSeparators(item.waiting_click_dpmptsp_sum), + item.issuance_realization_pbg_count, + addThousandSeparators( + item.issuance_realization_pbg_sum + ), + item.process_in_technical_office_count, + addThousandSeparators( + item.process_in_technical_office_sum + ), moment(item.created_at).format("YYYY-MM-DD H:mm:ss"), - ]), + ]); + }, total: (data) => data.total, }, }).render(tableContainer); diff --git a/resources/js/business-industries/index.js b/resources/js/business-industries/index.js index a85eb04..bcba970 100644 --- a/resources/js/business-industries/index.js +++ b/resources/js/business-industries/index.js @@ -64,7 +64,7 @@ class BusinessIndustries { }, ], pagination: { - limit: 15, + limit: 50, server: { url: (prev, page) => `${prev}${prev.includes("?") ? "&" : "?"}page=${ diff --git a/resources/js/customers/index.js b/resources/js/customers/index.js index e2f5835..70b0b65 100644 --- a/resources/js/customers/index.js +++ b/resources/js/customers/index.js @@ -53,7 +53,7 @@ class Customers { }, ], pagination: { - limit: 15, + limit: 50, server: { url: (prev, page) => `${prev}${prev.includes("?") ? "&" : "?"}page=${ diff --git a/resources/js/master/users/users.js b/resources/js/master/users/users.js index 15dab30..5506e06 100644 --- a/resources/js/master/users/users.js +++ b/resources/js/master/users/users.js @@ -31,7 +31,7 @@ class UsersTable { }, ], pagination: { - limit: 15, + limit: 50, server: { url: (prev, page) => `${prev}${prev.includes("?") ? "&" : "?"}page=${ diff --git a/resources/js/menus/index.js b/resources/js/menus/index.js index a2797c6..92109c5 100644 --- a/resources/js/menus/index.js +++ b/resources/js/menus/index.js @@ -83,7 +83,7 @@ class Menus { }, ], pagination: { - limit: 15, + limit: 50, server: { url: (prev, page) => `${prev}${prev.includes("?") ? "&" : "?"}page=${ diff --git a/resources/js/roles/index.js b/resources/js/roles/index.js index a6bfc2a..c4ab98d 100644 --- a/resources/js/roles/index.js +++ b/resources/js/roles/index.js @@ -52,7 +52,7 @@ class Roles { }, ], pagination: { - limit: 15, + limit: 50, server: { url: (prev, page) => `${prev}${prev.includes("?") ? "&" : "?"}page=${ diff --git a/resources/js/settings/syncronize/syncronize.js b/resources/js/settings/syncronize/syncronize.js index 61dec35..7d62b55 100644 --- a/resources/js/settings/syncronize/syncronize.js +++ b/resources/js/settings/syncronize/syncronize.js @@ -26,7 +26,7 @@ class SyncronizeTask { }, }, pagination: { - limit: 15, + limit: 50, server: { url: (prev, page) => `${prev}${prev.includes("?") ? "&" : "?"}page=${