daengdeni/location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix(districts): perbaiki pencarian dan pemetaan provinsi untuk distrik

Browse Source 
- Tambahkan penanganan khusus untuk kode kota Papua.
- Perbarui aturan validasi untuk kolom kode distrik.
- Perbaiki tampilan nama provinsi pada tabel distrik.
This commit is contained in:
Daeng Deni Mardaeni
2025-04-27 12:14:40 +07:00
parent bf288013f4
commit 094f9fa6d6
3 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Http/Controllers/DistrictsController.php
View File

@@ -80,9 +80,23 @@ class DistrictsController extends Controller
if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search');
$search = explode('|', $search);
if(isset($search[0]) &&!empty($search[0])){
$query->where('province_code',$search[0]);
if(isset($search[0]) && !empty($search[0])){
// Define special city codes once
$specialCityCodes = ['92.01', '92.04', '92.05', '92.09', '92.10', '92.71'];
// Handle Papua province special cases
if($search[0] == '92'){
$query->where('province_code', '92')
->whereNotIn('city_code', $specialCityCodes);
} else if($search[0] == '92.1'){
$query->where('province_code', '92')
->whereIn('city_code', $specialCityCodes);
} else {
// For all other provinces
$query->where('province_code', $search[0]);
}
}
if(isset($search[1]) &&!empty($search[1])){
$query->where('city_code',$search[1]);
}
@@ -123,6 +137,15 @@ class DistrictsController extends Controller
// Calculate the current page number
$currentPage = 0 + 1;
$data = $data->map(function ($item) {
if (in_array($item->city_code, ['92.01', '92.04', '92.05', '92.09', '92.10', '92.71'])) {
$item->province_name = Province::where('code', '92.1')->first()->name;
} else {
$item->province_name = $item->city->province->name;
}
return $item;
});
// Return the response data as a JSON object
return response()->json([
'draw' => $request->get('draw'),

4
app/Http/Requests/DistrictRequest.php
View File

@@ -18,10 +18,10 @@
];
if ($this->method() === 'PUT') {
$rules['code'] = 'required|string|max:6|unique:districts,code,' . $this->id;
$rules['code'] = 'required|string|max:9|unique:districts,code,' . $this->id;
$rules['name'] = 'required|string|max:2554|unique:districts,name,' . $this->id;
} else {
$rules['code'] = 'required|string|max:6|unique:districts,code';
$rules['code'] = 'required|string|max:9|unique:districts,code';
$rules['name'] = 'required|string|max:2554|unique:districts,name';
}