arifal/sibedas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:pariwisata and report pariwisata

Browse Source
This commit is contained in:
@jamaludinarifrohman6661
2025-02-19 01:07:20 +07:00
parent 6c936d4c14
commit 06a3bb8c8b
18 changed files with 356 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/Http/Controllers/Api/TourismController.php
View File

@@ -21,7 +21,6 @@ class TourismController extends Controller
*/
public function index(Request $request)
{
info($request);
$perPage = $request->input('per_page', 15);
$search = $request->input('search', '');
@@ -31,12 +30,9 @@ class TourismController extends Controller
$tourisms->getCollection()->transform(function ($tourisms) {
$village = DB::table('villages')->where('village_code', $tourisms->village_code)->first();
$tourisms->village_name = $village ? $village->village_name : null;
$district = DB::table('districts')->where('district_code', $tourisms->district_code)->first();
$tourisms->district_name = $district ? $district->district_name : null;
$business_type = DB::table('business_type')->where('id', $tourisms->business_type_id)->first();
$tourisms->business_type = $business_type ? $business_type->business_type : null;
$district = DB::table('districts')->where('district_code', $tourisms->district_code)->first();
$tourisms->district_name = $village ? $village->village_name : null;
return $tourisms;
});
@@ -46,7 +42,7 @@ class TourismController extends Controller
'total' => $tourisms->total(),
'per_page' => $tourisms->perPage(),
'current_page' => $tourisms->currentPage(),
'last_page' => $tourisms->lastPage(),
'last_page'=>$tourisms->lastPage(),
]
]);
}
@@ -62,11 +58,12 @@ class TourismController extends Controller
$data['district_code'] = $district_code;
$data['village_code'] = $village_code;
return Tourism::create($data);
}
/**
* Import advertisements from Excel or CSV
* Import advertisements from Excel
*/
public function importFromFile(Request $request)
{
@@ -77,21 +74,21 @@ class TourismController extends Controller
if ($validator->fails()) {
return response()->json([
'message' => 'File validation failed.',
'errors' => $validator->errors()
'message'=>'File validation failed.',
'errors'=>$validator->errors()
], 400);
}
try {
$file = $request->file('file');
Excel::import(new TourismImport, $file);
return response()->json([
'message' => 'File uploaded and imported successfully!'
'message'=>'File uploaded and imported successfully!'
], 200);
} catch (\Exception $e) {
return response()->json([
'message' => 'Error during file import.',
'error' => $e->getMessage()
'message'=>'Error during file import.',
'error'=>$e->getMessage()
], 500);
}
}
@@ -109,7 +106,17 @@ class TourismController extends Controller
*/
public function update(TourismRequest $request, Tourism $tourism): Tourism
{
$tourism->update($request->validated());
$data = $request->validated();
// Cari district_code berdasarkan district_name
$district_code = DB::table('districts')->where('district_name', $data['district_name'])->value('district_code');
// Cari village_code berdasarkan village_name
$village_code = DB::table('villages')->where('village_name', $data['village_name'])->where('district_code', $district_code)->value('village_code');
// Tambahkan village_code dan district_code ke data
$data['village_code'] = $village_code;
$data['district_code'] = $district_code;
$tourism->update($data);
return $tourism;
}

6
app/Http/Controllers/Api/UmkmController.php
View File

@@ -69,9 +69,9 @@ class UmkmController extends Controller
// Cari kode berdasarkan nama
$district_code = DB::table('districts')->where('district_name', $data['district_name'])->value('district_code');
$village_code = DB::table('villages')->where('village_name', $data['village_name'])->where('district_code', $district_code)->value('village_code');
$business_scale_id = DB::table('business_scale')->where('id', $data['business_scale'])->value('id');
$permit_status_id = DB::table('permit_status')->where('id', $data['permit_status'])->value('id');
$business_form_id = DB::table('business_form')->where('id', $data['business_form'])->value('id');
$business_scale_id = DB::table('business_scale')->where('id', $data['business_scale_id'])->value('id');
$permit_status_id = DB::table('permit_status')->where('id', $data['permit_status_id'])->value('id');
$business_form_id = DB::table('business_form')->where('id', $data['business_form_id'])->value('id');
info($business_scale_id);