update
parent
70bce620ee
commit
772ff5c018
|
|
@ -44,7 +44,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$catatan = App\Models\Penilaian::where('key','catatan')->where('page_number',$data->page_number)->where('ms_sekolah_id',$kuesioner->ms_sekolah_id)->where('status',1)->first();
|
|
||||||
if(@$type == 'kota'){
|
if(@$type == 'kota'){
|
||||||
$penilaian = App\Models\Penilaian::where('tahun',$kuesioner->tahun)->where('key',$data->key)->where('ms_sekolah_id',$kuesioner->ms_sekolah_id)->where('status',$status)->first();
|
$penilaian = App\Models\Penilaian::where('tahun',$kuesioner->tahun)->where('key',$data->key)->where('ms_sekolah_id',$kuesioner->ms_sekolah_id)->where('status',$status)->first();
|
||||||
$penilaianOld = App\Models\Penilaian::where('tahun',$kuesioner->tahun)->where('key',$data->key)->where('ms_sekolah_id',$kuesioner->ms_sekolah_id)->where('status',($status-1))->first();
|
$penilaianOld = App\Models\Penilaian::where('tahun',$kuesioner->tahun)->where('key',$data->key)->where('ms_sekolah_id',$kuesioner->ms_sekolah_id)->where('status',($status-1))->first();
|
||||||
|
|
@ -92,6 +91,9 @@
|
||||||
?>
|
?>
|
||||||
<br>
|
<br>
|
||||||
<div>
|
<div>
|
||||||
|
<?php
|
||||||
|
$catatan = \App\Models\Penilaian::where('key','catatan')->where('page_number',$data->page_number)->where('ms_sekolah_id',$kuesioner->ms_sekolah_id)->where('status',1)->first();
|
||||||
|
?>
|
||||||
<i><b>Catatan : </b>
|
<i><b>Catatan : </b>
|
||||||
<p style="font-size: 12px;">{{@json_decode($catatan->value) ? json_decode($catatan->value) : '-'}}</p>
|
<p style="font-size: 12px;">{{@json_decode($catatan->value) ? json_decode($catatan->value) : '-'}}</p>
|
||||||
</i>
|
</i>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue