diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index ea1c261..2b5a894 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -222,7 +222,7 @@ class PenilaianController extends Controller }); })->unique('id'); - $existingTeamIds = $teamPenilai->pluck('id')->toArray(); + $existingTeamIds = $userTeam->pluck('id')->toArray(); $updateTeamPenilai = Teams::with(['regions', 'teamsUsers', 'teamsUsers.user']) ->whereNotIn('id', $existingTeamIds) @@ -232,23 +232,14 @@ class PenilaianController extends Controller foreach ($userTeam as $item) { $regionName = $item->regions; } - // $regionName = $userTeam->first()?->regions->name; - - $penilaian = Penilaian::where('nomor_registrasi', $permohonan->nomor_registrasi)->first(); - $penilaianTeam = collect(); if ($penilaian && $penilaian->id) { $penilaianTeam = PenilaianTeam::where('penilaian_id', $penilaian->id)->get(); } - // return response()->json([ - // 'penilaianTeam' => $penilaianTeam - // ]); - - return view('lpj::penilaian.form', compact('permohonan', 'teamPenilai', 'jenisPenilaian', 'penilaian', 'regionName', 'updateTeamPenilai', 'penilaianTeam')); } /** diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index f19d4c9..0c936a0 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -25,6 +25,7 @@ use Modules\Lpj\Models\SpekKategoritBangunan; use Modules\Lpj\Models\SaranaPelengkap; use Modules\Lpj\Models\ArahMataAngin; use Modules\Lpj\Models\Analisa; +use Modules\Lpj\Models\PerkerasanJalan; use Modules\Lpj\Models\AnalisaFakta; use Modules\Lpj\Models\AnalisaLingkungan; use Modules\Lpj\Models\AnalisaTanahBagunan; @@ -591,6 +592,7 @@ class SurveyorController extends Controller $golMasySekitar = GolonganMasySekitar::all(); $tingkatKeramaian = TingkatKeramaian::all(); $laluLintasLokasi = LaluLintasLokasi::all(); + $perkerasanJalan = PerkerasanJalan::all(); $analisa = Analisa::with('analisaTanahBangunan', 'analisaLingkungan', 'analisaFakta', 'jenisJaminan') @@ -598,6 +600,7 @@ class SurveyorController extends Controller ->where('jenis_jaminan_id', $jaminanId) ->first(); + // return response()->json($permohonan); return view('lpj::surveyor.components.inspeksi', compact( @@ -622,7 +625,8 @@ class SurveyorController extends Controller 'viewUnit', 'golMasySekitar', 'tingkatKeramaian', - 'laluLintasLokasi' + 'laluLintasLokasi', + 'perkerasanJalan' )); } @@ -714,27 +718,27 @@ class SurveyorController extends Controller try { $type = $request->route('type'); - $modelClass = $this->getModelClass($type); + $modelClass = $this->getModelClass($type); + + if (!$modelClass) { + return redirect() + ->route('basicdata.'. $type .'.index') + ->with('error', 'Invalid type specified.'); + } + + if ($type == 'spek-bangunan') { + $validate['spek_kategori_bagunan_id'] = $request->spek_kategori_bagunan_id; + + } + + + $data = array_merge($validate, ['status' => true]); + $modelClass::create($data); - if (!$modelClass) { return redirect() - ->route('basicdata.'. $type .'.index') - ->with('error', 'Invalid type specified.'); - } + ->route('basicdata.' . $type .'.index') + ->with('success', 'created successfully'); - if ($type == 'spek-bangunan') { - $validate['spek_kategori_bagunan_id'] = $request->spek_kategori_bagunan_id; - - } - - - $data = array_merge($validate, ['status' => true]); - $modelClass::create($data); - - return redirect() - ->route('basicdata.' . $type .'.index') - ->with('success', 'created successfully'); - } catch (Exeception $e) { return response()->json(array('error' => $e->getMessage()), 400); @@ -842,6 +846,7 @@ class SurveyorController extends Controller 'Golongan Masyarakat Sekitar' => GolonganMasySekitar::class, 'Lantai Unit' => Lantai::class, 'View Unit' => ViewUnit::class, + 'Perkerasan jalan' => PerkerasanJalan::class ]; @@ -961,7 +966,8 @@ class SurveyorController extends Controller } - public function validateSubmit(){ + public function validateSubmit() + { } @@ -1039,6 +1045,7 @@ class SurveyorController extends Controller 'spek-bangunan' => ['Spek Bangunan', 'spek-bangunan'], 'lantai-unit' => ['Lantai Unit', 'lantai-unit'], 'view-unit' => ['View Unit', 'view-unit'], + 'perkerasan-jalan' => ['Perkerasan jalan', 'perkerasan-jalan'] ]; } diff --git a/app/Models/PerkerasanJalan.php b/app/Models/PerkerasanJalan.php index 2f59e92..2c7b0b1 100644 --- a/app/Models/PerkerasanJalan.php +++ b/app/Models/PerkerasanJalan.php @@ -10,6 +10,7 @@ class PerkerasanJalan extends Model { use HasFactory; + protected $table = 'perkerasan_jalan'; /** * The attributes that are mass assignable. */ diff --git a/resources/views/activity/progres_activity/index.blade.php b/resources/views/activity/progres_activity/index.blade.php index 6bf9a2b..b778da4 100644 --- a/resources/views/activity/progres_activity/index.blade.php +++ b/resources/views/activity/progres_activity/index.blade.php @@ -33,6 +33,11 @@ .dropdowns-content a:hover { background-color: #f1f1f1; } + + .break-words { + word-break: break-word; + white-space: normal; + } @endpush @@ -46,7 +51,6 @@ @php $sortedTeamsActivity = $teamsActivity->sortBy(function ($item) { - return $item->team->penilaianTeam ->filter(function ($penilaianTeam) use ($item) { return $penilaianTeam->user_id == $item->user->id; @@ -64,8 +68,9 @@ style="margin-start: 10px">
| - {{ $item->user->name }} + | + {{ $item->user->name }} Lorem, ipsum dolor sit amet consectetur | @@ -86,13 +91,14 @@ class="ki-outline ki-minus text-gray-600 text-2sm accordion-active:block hidden"> |
|---|