Merge remote-tracking branch 'composer/feature/senior-officer' into staging
# Conflicts: # resources/views/penilai/show.blade.php
This commit is contained in:
@@ -1698,7 +1698,7 @@ class PenilaiController extends Controller
|
||||
|
||||
$permohonan->update([
|
||||
'status' => 'revisi-survey',
|
||||
'keterangan' => $request->message,
|
||||
'keterangan' => $request->keterangan,
|
||||
'submitted_at' => now()
|
||||
]);
|
||||
|
||||
|
||||
@@ -694,7 +694,7 @@
|
||||
url: `/penilai/revisi-surveyor/${dataId}`,
|
||||
type: 'PUT',
|
||||
data: {
|
||||
message: userMessage
|
||||
keterangan: userMessage
|
||||
},
|
||||
success: (response) => {
|
||||
Swal.fire('Berhasil!', response.message, 'success').then(
|
||||
|
||||
@@ -61,8 +61,8 @@
|
||||
value="{{ old('luas_unit_tidak_sesuai', $forminspeksi['luas_unit_tidak_sesuai'] ?? '') }}">
|
||||
<i>M<sup>2</sup></i>
|
||||
</div>
|
||||
<button type="button" class="btn btn-md btn-primary"
|
||||
onclick="updateAnalisa('analisa_unit')">Save</button>
|
||||
{{-- <button type="button" class="btn btn-md btn-primary"
|
||||
onclick="updateAnalisa('analisa_unit')">Save</button> --}}
|
||||
</div>
|
||||
</div>
|
||||
<em id="error-luas_unit" class="alert text-danger text-sm"></em>
|
||||
|
||||
@@ -68,10 +68,10 @@
|
||||
value="{{ old('luas_tanah_bagunan_tidak_sesuai', $forminspeksi['bangunan']['luas_tanah_bagunan']['tidak sesuai'] ?? '') }}">
|
||||
|
||||
</div>
|
||||
<button type="button" class="btn btn-md btn-primary"
|
||||
{{-- <button type="button" class="btn btn-md btn-primary"
|
||||
onclick="updateAnalisa('analisa_bangunan')">
|
||||
Save
|
||||
</button>
|
||||
</button> --}}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -57,9 +57,9 @@
|
||||
value="{{ old('luas_tanah_tidak_sesuai', $forminspeksi['tanah']['luas_tanah']['tidak sesuai'] ?? '') }}">
|
||||
|
||||
</div>
|
||||
<button type="button" class="btn btn-md btn-primary"
|
||||
{{-- <button type="button" class="btn btn-md btn-primary"
|
||||
onclick="updateAnalisa('analisa_tanah')">Save
|
||||
</button>
|
||||
</button> --}}
|
||||
</div>
|
||||
</div>
|
||||
<em id="error-luas_tanah" class="alert text-danger text-sm"></em>
|
||||
@@ -191,7 +191,7 @@
|
||||
@if (strcasecmp($item->name, 'Lebih Tinggi') == 0)
|
||||
<input id="input-lebih-tinggi" type="text"
|
||||
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'] ?? '') }}" />
|
||||
@elseif (strcasecmp($item->name, 'Lebih Rendah') == 0)
|
||||
<input id="input-lebih-rendah" type="text"
|
||||
|
||||
Reference in New Issue
Block a user