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

update form surveyor

Browse Source
This commit is contained in:
majid
2024-11-09 00:55:11 +07:00
parent a4d49c7078
commit edd005e132
25 changed files with 1998 additions and 869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
app/Http/Controllers/SurveyorController.php
View File

@@ -35,6 +35,7 @@ use Modules\Lpj\Models\FotoJaminan;
use Modules\Lpj\Models\Lingkungan;
use Modules\Lpj\Models\LantaiUnit;
use Modules\Lpj\Models\Lantai;
use Modules\Lpj\Models\Teams;
use Modules\Lpj\Models\ViewUnit;
use Modules\Lpj\Models\ObjekJaminan;
use Modules\Lpj\Models\RuteJaminan;
@@ -149,41 +150,45 @@ class SurveyorController extends Controller
/**
* Store form inspeksi.
*/
public function store(FormSurveyorRequest $request)
public function store(Request $request)
{
$validatedData = $request->validated();
DB::beginTransaction();
try {
$analisa = Analisa::create($validatedData);
if ($analisa) {
$validatedData['analisa_id'] = $analisa->id;
dd($request);
switch ($validatedData['action']) {
case 'tanah_bangunan':
$this->handleTanahBangunan($validatedData, $request);
break;
case 'unit':
$this->handleUnit($validatedData);
break;
default:
throw new \Exception('Invalid action type');
}
AnalisaLingkungan::create($validatedData);
$validatedData['foto_tempat'] = $this->uploadFile($request->file('foto_tempat'), 'foto_tempat');
AnalisaFakta::create($validatedData);
}
// $validatedData = $request->validated();
// DB::beginTransaction();
// try {
// $analisa = Analisa::create($validatedData);
DB::commit();
return redirect()->route('surveyor.show', [
'id' => $validatedData['permohonan_id'],
'form' => 'inspeksi'
])->with('success', 'Data form surveyor berhasil disimpan');
} catch (Exception $e) {
DB::rollback();
return response()->json(['error' => 'Failed to save data', 'details' => $e->getMessage()], 500);
}
// if ($analisa) {
// $validatedData['analisa_id'] = $analisa->id;
// switch ($validatedData['action']) {
// case 'tanah_bangunan':
// $this->handleTanahBangunan($validatedData, $request);
// break;
// case 'unit':
// $this->handleUnit($validatedData);
// break;
// default:
// throw new \Exception('Invalid action type');
// }
// AnalisaLingkungan::create($validatedData);
// $validatedData['foto_tempat'] = $this->uploadFile($request->file('foto_tempat'), 'foto_tempat');
// AnalisaFakta::create($validatedData);
// }
// DB::commit();
// return redirect()->route('surveyor.show', [
// 'id' => $validatedData['permohonan_id'],
// 'form' => 'inspeksi'
// ])->with('success', 'Data form surveyor berhasil disimpan');
// } catch (Exception $e) {
// DB::rollback();
// return response()->json(['error' => 'Failed to save data', 'details' => $e->getMessage()], 500);
// }
}
private function handleTanahBangunan(array $validatedData, FormSurveyorRequest $request)
@@ -567,8 +572,14 @@ class SurveyorController extends Controller
{
$permohonan = $this->getPermohonanJaminanId($id, $jaminanId);
// Auth::user()->id
$link_url_region = Teams::with('regions', 'teamsUsers')
->whereHas('teamsUsers', function ($query) {
$query->where('user_id', Auth::user()->id);
})->first();
$branches = Branch::all();
$provinces = Province::all();
@@ -600,9 +611,6 @@ class SurveyorController extends Controller
->where('jenis_jaminan_id', $jaminanId)
->first();
// return response()->json($permohonan);
return view('lpj::surveyor.components.inspeksi', compact(
'analisa',
'permohonan',
@@ -626,7 +634,8 @@ class SurveyorController extends Controller
'golMasySekitar',
'tingkatKeramaian',
'laluLintasLokasi',
'perkerasanJalan'
'perkerasanJalan',
'link_url_region'
));
}

3
app/Http/Controllers/TeamsController.php
View File

@@ -196,6 +196,9 @@ class TeamsController extends Controller
->leftJoin('teams_users', 'teams.id', '=', 'teams_users.teams_id')
->leftJoin('users', 'teams_users.user_id', '=', 'users.id')
->addSelect('users.id as user_id', 'users.name as user_name');
// Filter pencarian
if ($request->has('search') && !empty($request->get('search'))) {

50
app/Http/Requests/FormSurveyorRequest.php
View File

@@ -80,10 +80,22 @@ class FormSurveyorRequest extends FormRequest
$action = $this->input('action');
switch ($action) {
case 'tanah_bangunan':
case 'tanah':
return $this->getTanahBangunanRules();
case 'unit':
return $this->getUnitRules();
case 'kapal':
return $this->getUnitRules();
case 'kendaraan':
return $this->getUnitRules();
case 'mesin':
return $this->getUnitRules();
case 'bangunan':
return $this->getTanahBangunanRules();
case 'tanah_bangunan':
return $this->getTanahBangunanRules();
case 'alat-berat':
return $this->getUnitRules();
default:
return [];
}
@@ -130,4 +142,40 @@ class FormSurveyorRequest extends FormRequest
'bentuk_unit' => 'required',
];
}
private function getKapalRules():array{
return [
'action' => 'required',
'kondisi_kapal' => 'required',
'kondisi_kapal_lain' => 'required',
];
}
public function getKendaraanRules():array{
return [
'action' => 'required',
'kondisi_kendaraan' => 'required',
'kondisi_kendaraan_lain' => 'required',
];
}
public function getMesinRules():array{
return [
'action' => 'required',
'kondisi_mesin' => 'required',
'kondisi_mesin_lain' => 'required',
];
}
public function getAlatBeratRules():array{
return [
'action' => 'required',
'kondisi_alat_berat' => 'required',
'kondisi_alat_berat_lain' => 'required',
];
}
}

2
app/Http/Requests/PenilaianRequest.php
View File

@@ -25,8 +25,6 @@ class PenilaianRequest extends FormRequest
];
}
return [
'jenis_penilaian_id' => 'required|max:255',
'teams_id' => 'required|max:255',

2
app/Http/Requests/RegionRequest.php
View File

@@ -14,6 +14,8 @@ class RegionRequest extends FormRequest
$rules = [
'name' => 'required|string|max:255',
'status' => 'nullable|boolean',
'url' => 'nullable|string|max:255',
'name_url' => 'nullable|string|max:255',
'authorized_at' => 'nullable|datetime',
'authorized_status' => 'nullable|string|max:1',
'authorized_by' => 'nullable|exists:users,id',

2
app/Models/Regions.php
View File

@@ -17,7 +17,7 @@ class Regions extends Model
protected $table = 'regions';
protected $fillable = [
'code', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by'
'code', 'name', 'status', 'name_url','url','authorized_status', 'authorized_at', 'authorized_by'
];
public function teams(){