update preview foto dan alamat surveyor

This commit is contained in:
majid
2024-12-05 01:34:16 +07:00
parent 405dc82ac6
commit d797b0d2c0
8 changed files with 442 additions and 293 deletions

View File

@@ -48,7 +48,7 @@ class ActivityController extends Controller
$regionId = $userTeam?->team->regions_id;
$teamId = $userTeam?->teams_id;
}
}
$teamsActivity = TeamsUsers::with(['user', 'team', 'team.regions', 'user.roles'])
->whereHas('team', function ($q) use ($regionId, $teamId) {
@@ -74,7 +74,7 @@ class ActivityController extends Controller
function updateTeamAssingment(Request $request) {
try {
$id = $request->input('id');
$user = PenilaianTeam::where('penilaian_id', $id)->get();
@@ -86,7 +86,7 @@ class ActivityController extends Controller
}
return redirect()->route('activity.progres.index')->with('success', 'Surveyor berhasil diganti');
}
} catch (\Throwable $th) {
return redirect()->route('activity.progres.index')->with('success', $th->getMessage());
}

View File

@@ -12,12 +12,16 @@ use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Storage;
use Illuminate\Http\Response;
use Modules\Lpj\Models\Debiture;
use Modules\Lpj\Models\Permohonan;
use Modules\Lpj\Models\Branch;
use Modules\Lpj\Models\Surveyor;
use Modules\Lpj\Models\BentukTanah;
use Modules\Lpj\Models\KonturTanah;
use Modules\Location\Models\Province;
use Modules\Location\Models\City;
use Modules\Location\Models\District;
use Modules\Location\Models\Village;
use Modules\Lpj\Models\PosisiKavling;
use Modules\Lpj\Models\KondisiFisikTanah;
use Modules\Lpj\Models\KetinggianTanah;
@@ -709,10 +713,14 @@ class SurveyorController extends Controller
$branches = Branch::all();
$provinces = Province::all();
$debitur = Debiture::find($permohonan->debiture_id);
$cities = City::where('province_code', $debitur->province_code)->get();
$districts = District::where('city_code', $debitur->city_code)->get();
$villages = Village::where('district_code', $debitur->district_code)->get();
$surveyor = $id;
$branches = Branch::all();
$provinces = Province::all();
$bentukTanah = BentukTanah::all();
$konturTanah = KonturTanah::all();
$posisiKavling = PosisiKavling::all();
@@ -755,6 +763,10 @@ class SurveyorController extends Controller
'surveyor',
'branches',
'provinces',
'debitur',
'cities',
'districts',
'villages',
'bentukTanah',
'konturTanah',
'posisiKavling',
@@ -1460,11 +1472,11 @@ class SurveyorController extends Controller
private function getAssetData(array $data): array
{
$alamatData = [
'nama_jalan' => $data['nama_jalan'] ?? null,
'desa_kelurahan' => $data['desa_kelurahan'] ?? null,
'kecamatan' => $data['kecamatan'] ?? null,
'kota_kabupaten' => $data['kota_kabupaten'] ?? null,
'provinsi' => $data['provinsi'] ?? null,
'address' => $data['address'] ?? null,
'village_code' => $data['village_code'] ?? null,
'district_code' => $data['district_code'] ?? null,
'city_code' => $data['city_code'] ?? null,
'province_code' => $data['province_code'] ?? null,
];
return [

View File

@@ -528,11 +528,11 @@ class FormSurveyorRequest extends FormRequest
'hub_cadeb_penghuni_sesuai' => 'nullable',
'hub_cadeb_penghuni_tidak_sesuai' => 'nullable',
'nama_jalan' => 'nullable',
'desa_kelurahan' => 'nullable',
'kecamatan' => 'nullable',
'kota_kabupaten' => 'nullable',
'provinsi' => 'nullable',
'address' => 'nullable',
'village_code' => 'nullable',
'district_code' => 'nullable',
'city_code' => 'nullable',
'province_code' => 'nullable',
'kordinat_lng' => 'nullable',
'kordinat_lat' => 'nullable',
];