partial update add env for setting api url from env, partial update detail pbg, add tata ruang for dashboard pimpinan, fix service sync simbg add unique for prasarana table

This commit is contained in:
arifal
2025-02-07 09:45:29 +07:00
parent 6fb59e58e9
commit 97ffd322a1
20 changed files with 438 additions and 127 deletions

View File

@@ -12,30 +12,34 @@ class DashboardController extends Controller
use GlobalApiResponse;
public function businnessDocument(Request $request){
$query = DB::table('pbg_task AS pt')
->leftJoin('pbg_task_google_sheet AS ptgs', 'pt.registration_number', '=', 'ptgs.no_registrasi')
->leftJoin('pbg_task_retributions AS ptr', 'pt.uuid', '=', 'ptr.pbg_task_uid') // Join ke pbg_task_retributions
->where(function ($query) {
$query->whereRaw('LOWER(TRIM(ptgs.status_verifikasi)) != ?', [strtolower(trim('Selesai Verifikasi'))])
->orWhereNull('ptgs.status_verifikasi');
})
->where(function ($query) {
$query->whereRaw('LOWER(TRIM(pt.function_type)) = ?', [strtolower(trim('Sebagai Tempat Usaha'))]);
})
->selectRaw('COUNT(pt.id) AS total_data,
SUM(ptr.nilai_retribusi_bangunan) AS total_retribution') // Menambahkan SUM dari pbg_task_retributions
->first();
$query = once(function () {
return DB::table('pbg_task AS pt')
->leftJoin('pbg_task_google_sheet AS ptgs', 'pt.registration_number', '=', 'ptgs.no_registrasi')
->leftJoin('pbg_task_retributions AS ptr', 'pt.uuid', '=', 'ptr.pbg_task_uid')
->where(function ($query) {
$query->whereRaw('LOWER(TRIM(ptgs.status_verifikasi)) != ?', [strtolower(trim('Selesai Verifikasi'))])
->orWhereNull('ptgs.status_verifikasi');
})
->where(function ($query) {
$query->whereRaw('LOWER(TRIM(pt.function_type)) = ?', [strtolower(trim('Sebagai Tempat Usaha'))]);
})
->selectRaw('COUNT(pt.id) AS total_data,
SUM(ptr.nilai_retribusi_bangunan) AS total_retribution')
->first();
});
$taskCount = $query->total_data;
$taskTotal = $query->total_retribution ?? 0;
$result = [
return $this->resSuccess([
"count" => $taskCount,
"total" => $taskTotal
];
return $this->resSuccess($result);
]);
}
public function nonBusinnessDocument(Request $request){
$query = DB::table('pbg_task AS pt')
$query = once( function () {
return DB::table('pbg_task AS pt')
->leftJoin('pbg_task_google_sheet AS ptgs', 'pt.registration_number', '=', 'ptgs.no_registrasi')
->leftJoin('pbg_task_retributions AS ptr', 'pt.uuid', '=', 'ptr.pbg_task_uid') // Join ke pbg_task_retributions
->where(function ($query) {
@@ -49,53 +53,55 @@ class DashboardController extends Controller
->selectRaw('COUNT(pt.id) AS total_data,
SUM(ptr.nilai_retribusi_bangunan) AS total_retribution') // Menambahkan SUM dari pbg_task_retributions
->first();
});
$taskCount = $query->total_data;
$taskTotal = $query->total_retribution ?? 0;
$result = [
return $this->resSuccess([
"count" => $taskCount,
"total" => $taskTotal
];
return $this->resSuccess($result);
]);
}
public function allTaskDocuments(){
$query = DB::table('pbg_task')
$query = once( function () {
return DB::table('pbg_task')
->leftJoin('pbg_task_retributions', 'pbg_task.uuid', '=', 'pbg_task_retributions.pbg_task_uid')
->select(
DB::raw('COUNT(DISTINCT pbg_task.id) as task_count'),
DB::raw('SUM(pbg_task_retributions.nilai_retribusi_bangunan) as total_retribution')
)
->first();
});
$taskCount = $query->task_count;
$taskTotal = $query->total_retribution;
$result = [
return $this->resSuccess([
"count" => $taskCount,
"total" => $taskTotal
];
return $this->resSuccess($result);
]);
}
public function verificationDocuments(){
$query = DB::table('pbg_task AS pt')
->leftJoin('pbg_task_google_sheet AS ptgs', 'pt.registration_number', '=', 'ptgs.no_registrasi')
->leftJoin('pbg_task_retributions AS ptr', 'pt.uuid', '=', 'ptr.pbg_task_uid') // Menambahkan join ke pbg_task_retributions
->whereRaw('LOWER(TRIM(ptgs.status_verifikasi)) = ?', [strtolower(trim('Selesai Verifikasi'))])
->selectRaw('COUNT(pt.id) AS total_data,
SUM(ptr.nilai_retribusi_bangunan) AS total_retribution')
->first();
$query = once( function (){
return DB::table('pbg_task AS pt')
->leftJoin('pbg_task_google_sheet AS ptgs', 'pt.registration_number', '=', 'ptgs.no_registrasi')
->leftJoin('pbg_task_retributions AS ptr', 'pt.uuid', '=', 'ptr.pbg_task_uid') // Menambahkan join ke pbg_task_retributions
->whereRaw('LOWER(TRIM(ptgs.status_verifikasi)) = ?', [strtolower(trim('Selesai Verifikasi'))])
->selectRaw('COUNT(pt.id) AS total_data,
SUM(ptr.nilai_retribusi_bangunan) AS total_retribution')
->first();
});
$taskCount = $query->total_data;
$taskTotal = $query->total_retribution;
$result = [
return $this->resSuccess([
"count"=> $taskCount,
"total"=> $taskTotal
];
return $this->resSuccess($result);
]);
}
public function nonVerificationDocuments(){
$query = DB::table('pbg_task AS pt')
$query = once(function () {
return DB::table('pbg_task AS pt')
->leftJoin('pbg_task_google_sheet AS ptgs', 'pt.registration_number', '=', 'ptgs.no_registrasi')
->leftJoin('pbg_task_retributions AS ptr', 'pt.uuid', '=', 'ptr.pbg_task_uid') // Join tabel pbg_task_retributions
->where(function ($query) {
@@ -105,16 +111,15 @@ class DashboardController extends Controller
->selectRaw('COUNT(pt.id) AS total_data,
SUM(ptr.nilai_retribusi_bangunan) AS total_retribution') // Menambahkan SUM dari pbg_task_retributions
->first();
});
$taskCount = $query->total_data;
$taskTotal = $query->total_retribution ?? 0;
$result = [
return $this->resSuccess([
"count"=> $taskCount,
"total"=> $taskTotal
];
return $this->resSuccess($result);
]);
}
public function pbgTaskDocuments(Request $request){

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
use App\Http\Controllers\Controller;
use App\Http\Requests\PbgTaskMultiStepRequest;
use App\Http\Resources\PbgTaskResource;
use App\Models\PbgTask;
use App\Models\PbgTaskGoogleSheet;
use App\Services\GoogleSheetService;
@@ -68,7 +69,19 @@ class PbgTaskController extends Controller
*/
public function show(string $id)
{
//
try{
$pbg_task = PbgTask::with(['pbg_task_retributions','pbg_task_index_integrations'])->findOrFail($id);
return response()->json([
"success"=> true,
"message"=> "Data ditemukan",
"data"=> $pbg_task
]);
}catch(\Exception $e){
return response()->json([
"success"=> false,
"message"=> $e->getMessage(),
]);
}
}
/**

View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\RequestAssignment;
use App\Http\Controllers\Controller;
use App\Models\PbgTask;
use Illuminate\Http\Request;
class PbgTaskController extends Controller
@@ -36,7 +37,8 @@ class PbgTaskController extends Controller
*/
public function show(string $id)
{
return view("pbg_task.show");
$data = PbgTask::with(['pbg_task_retributions','pbg_task_index_integrations'])->findOrFail($id);
return view("pbg_task.show", compact("data"));
}
/**

View File

@@ -8,32 +8,38 @@ use Illuminate\Http\Request;
use Exception;
class SyncronizeController extends Controller
{
protected $service_simbg;
public function __construct(ServiceSIMBG $service_simbg){
$this->service_simbg = $service_simbg;
}
public function index(Request $request){
return view('settings.syncronize.index');
}
public function syncPbgTask(){
$res = (new ServiceSIMBG())->syncTaskList();
$res = $this->service_simbg->syncTaskList();
return $res;
}
public function syncronizeTask(Request $request){
$res = (new ServiceSIMBG())->syncTaskList();
$res = $this->service_simbg->syncTaskList();
return redirect()->back()->with('success', 'Processing completed successfully');
}
public function getUserToken(){
$res = (new ServiceSIMBG())->getToken();
$res = $this->service_simbg->getToken();
return $res;
}
public function syncIndexIntegration($uuid){
$res = (new ServiceSIMBG())->syncIndexIntegration($uuid);
public function syncIndexIntegration(Request $request, $uuid){
$token = $request->get('token');
$res = $this->service_simbg->syncIndexIntegration($uuid, $token);
return $res;
}
public function syncTaskDetailSubmit($uuid){
$res = (new ServiceSIMBG())->syncTaskDetailSubmit($uuid);
public function syncTaskDetailSubmit(Request $request, $uuid){
$token = $request->get('token');
$res = $this->service_simbg->syncTaskDetailSubmit($uuid, $token);
return $res;
}
}