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

Merge remote-tracking branch 'composer/feature/senior-officer' into staging

Browse Source 
# Conflicts:
#	resources/views/penilai/show.blade.php
This commit is contained in:
Daeng Deni Mardaeni
2025-03-07 14:11:18 +07:00
parent 3c7302c857 50ce815ac1
commit ae59500b1e
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/PenilaiController.php
View File

@@ -1698,7 +1698,7 @@ class PenilaiController extends Controller
$permohonan->update([ $permohonan->update([
'status' => 'revisi-survey', 'status' => 'revisi-survey',
'keterangan' => $request->message, 'keterangan' => $request->keterangan,
'submitted_at' => now() 'submitted_at' => now()
]); ]);

2
resources/views/penilai/show.blade.php
View File

@@ -694,7 +694,7 @@
url: `/penilai/revisi-surveyor/${dataId}`, url: `/penilai/revisi-surveyor/${dataId}`,
type: 'PUT', type: 'PUT',
data: { data: {
message: userMessage keterangan: userMessage
}, },
success: (response) => { success: (response) => {
Swal.fire('Berhasil!', response.message, 'success').then( Swal.fire('Berhasil!', response.message, 'success').then(

4
resources/views/surveyor/components/apartemen-kantor.blade.php
View File

@@ -61,8 +61,8 @@
value="{{ old('luas_unit_tidak_sesuai', $forminspeksi['luas_unit_tidak_sesuai'] ?? '') }}"> value="{{ old('luas_unit_tidak_sesuai', $forminspeksi['luas_unit_tidak_sesuai'] ?? '') }}">
<i>M<sup>2</sup></i> <i>M<sup>2</sup></i>
</div> </div>
<button type="button" class="btn btn-md btn-primary" {{-- <button type="button" class="btn btn-md btn-primary"
onclick="updateAnalisa('analisa_unit')">Save</button> onclick="updateAnalisa('analisa_unit')">Save</button> --}}
</div> </div>
</div> </div>
<em id="error-luas_unit" class="alert text-danger text-sm"></em> <em id="error-luas_unit" class="alert text-danger text-sm"></em>

4
resources/views/surveyor/components/bangunan.blade.php
View File

@@ -68,10 +68,10 @@
value="{{ old('luas_tanah_bagunan_tidak_sesuai', $forminspeksi['bangunan']['luas_tanah_bagunan']['tidak sesuai'] ?? '') }}"> value="{{ old('luas_tanah_bagunan_tidak_sesuai', $forminspeksi['bangunan']['luas_tanah_bagunan']['tidak sesuai'] ?? '') }}">
</div> </div>
<button type="button" class="btn btn-md btn-primary" {{-- <button type="button" class="btn btn-md btn-primary"
onclick="updateAnalisa('analisa_bangunan')"> onclick="updateAnalisa('analisa_bangunan')">
Save Save
</button> </button> --}}
</div> </div>
</div> </div>

6
resources/views/surveyor/components/tanah.blade.php
View File

@@ -57,9 +57,9 @@
value="{{ old('luas_tanah_tidak_sesuai', $forminspeksi['tanah']['luas_tanah']['tidak sesuai'] ?? '') }}"> value="{{ old('luas_tanah_tidak_sesuai', $forminspeksi['tanah']['luas_tanah']['tidak sesuai'] ?? '') }}">
</div> </div>
<button type="button" class="btn btn-md btn-primary" {{-- <button type="button" class="btn btn-md btn-primary"
onclick="updateAnalisa('analisa_tanah')">Save onclick="updateAnalisa('analisa_tanah')">Save
</button> </button> --}}
</div> </div>
</div> </div>
<em id="error-luas_tanah" class="alert text-danger text-sm"></em> <em id="error-luas_tanah" class="alert text-danger text-sm"></em>
@@ -191,7 +191,7 @@
@if (strcasecmp($item->name, 'Lebih Tinggi') == 0) @if (strcasecmp($item->name, 'Lebih Tinggi') == 0)
<input id="input-lebih-tinggi" type="text" <input id="input-lebih-tinggi" type="text"
style="{{ isset($forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi']) && $forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi'] ? '' : 'display: none;' }}" style="{{ isset($forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi']) && $forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi'] ? '' : 'display: none;' }}"
name="ketinggian_lebih_tinggi" class="input w-full mt-2" placeholder="m2" name="ketinggian_lebih_tinggi" class="input w-full mt-2" placeholder="m"
value="{{ old('ketinggian_lebih_tinggi', $forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi'] ?? '') }}" /> value="{{ old('ketinggian_lebih_tinggi', $forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi'] ?? '') }}" />
@elseif (strcasecmp($item->name, 'Lebih Rendah') == 0) @elseif (strcasecmp($item->name, 'Lebih Rendah') == 0)
<input id="input-lebih-rendah" type="text" <input id="input-lebih-rendah" type="text"