diff --git a/app/Helpers/custom.php b/app/Helpers/custom.php index ce9577a..b14b646 100644 --- a/app/Helpers/custom.php +++ b/app/Helpers/custom.php @@ -259,15 +259,37 @@ if (!function_exists('kuesionerLogStatus')) { $progress = str_replace('_',' ',\Str::title($log->step)); }else{ if(@$log->status == 11){ - $progress = 'Terbit SK'; + $progress = 'Terbit SK'; }else{ - $progress = ''.str_replace('_',' ',\Str::title($log->step)).''; + $progress = ''.str_replace('_',' ',\Str::title($log->step)).''; } } return $progress; } } +if (!function_exists('StatusActivity')) { + /** + * @param $val + * + * @return string + */ + function StatusActivity($sekolah) + { + $kuesioner = Kuesioner::where('ms_sekolah_id',$sekolah)->first(); + if(!@$kuesioner){ + $text = 'Sekolah mendaftar Akun'; + }else{ + $profile = ProfileSekolah::where('ms_sekolah_id',$sekolah)->first(); + if(@$profile){ + $text = 'Sekolah mengisi profil sekolah.'; + } + } + + return $text; + } +} + if (!function_exists('status_kuesioner')) { /** * @param $val @@ -955,7 +977,7 @@ if (!function_exists('formKriteria')) { // $html .= ''; } - $html .= '
+ $html .= '
Drop PDF files here or click to upload
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 673ad7c..a2a6eef 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -306,7 +306,7 @@ class HomeController extends Controller 'status_sekolah' => $row->sekolah->status, 'tahun' => $row->tahun, 'alamat_sekolah' => $row->profile->alamat_sekolah, - 'status' => kuesionerLogStatus($row->KuesionerId).'
'.$labelDok, + 'status' => kuesionerLogStatus($row->KuesionerId), 'action' => $action, ]; diff --git a/app/Http/Controllers/KuesionerController.php b/app/Http/Controllers/KuesionerController.php index 243af58..cfa6070 100644 --- a/app/Http/Controllers/KuesionerController.php +++ b/app/Http/Controllers/KuesionerController.php @@ -133,7 +133,7 @@ class KuesionerController extends Controller 'tahun' => $row->tahun, 'alamat_sekolah' => $row->profile->alamat_sekolah, 'penghargaan' => $penghargaan, - 'status' => kuesionerLogStatus($row->KuesionerId).'
'.$labelDok, + 'status' => kuesionerLogStatus($row->KuesionerId), 'action' => $action, ]; @@ -541,7 +541,7 @@ class KuesionerController extends Controller $log->ms_sekolah_id = session('sekolah_id'); $log->npsn = session('npsn'); $log->ms_group_id = session('group_id'); - $log->step = 'create_usulan'; + $log->step = 'sekolah_mengisi_kuesioner_leveling'; $log->status = 0; $log->created_by = auth()->user()->id; $log->save(); @@ -551,7 +551,7 @@ class KuesionerController extends Controller $log->ms_sekolah_id = session('sekolah_id'); $log->npsn = session('npsn'); $log->ms_group_id = session('group_id'); - $log->step = 'proses_usulan'; + $log->step = 'menunggu_verifikasi_kuesioner_leveling'; $log->status = 1; $log->created_by = auth()->user()->id; $log->save(); diff --git a/app/Http/Controllers/Modules/Usulan/AdministrasiController.php b/app/Http/Controllers/Modules/Usulan/AdministrasiController.php index 4131e12..9e29b9b 100644 --- a/app/Http/Controllers/Modules/Usulan/AdministrasiController.php +++ b/app/Http/Controllers/Modules/Usulan/AdministrasiController.php @@ -9,6 +9,7 @@ use Carbon\Carbon; use Illuminate\Http\Request; use App\Models\Master\Provinsi; use App\Models\Kuesioner; +use App\Models\KuesionerLog; use App\Models\DokumenAdministrasi; use App\Models\Usulan; use App\Models\Master\Kecamatan; @@ -367,6 +368,18 @@ class AdministrasiController extends Controller $dok->status = 1; $dok->save(); + $kuesioner = Kuesioner::where('KuesionerId',$dok->kuesioner_id)->first(); + + $log = new KuesionerLog; + $log->kuesioner_id = $kuesioner->KuesionerId; + $log->ms_sekolah_id = $kuesioner->ms_sekolah_id; + $log->npsn = $kuesioner->npsn; + $log->ms_group_id = session('group_id'); + $log->step = 'sekolah_mengisi_form_pemenuhan_kriteria'; + $log->status = 1; + $log->created_by = auth()->user()->id; + $log->save(); + return response()->json(['status' => true,'message' => 'Data Berhasil Di Update','type' => 'success']); } public function tolak($id) @@ -376,6 +389,18 @@ class AdministrasiController extends Controller $dok->status = 2; $dok->save(); + $kuesioner = Kuesioner::where('KuesionerId',$dok->kuesioner_id)->first(); + + $log = new KuesionerLog; + $log->kuesioner_id = $kuesioner->KuesionerId; + $log->ms_sekolah_id = $kuesioner->ms_sekolah_id; + $log->npsn = $kuesioner->npsn; + $log->ms_group_id = session('group_id'); + $log->step = 'verifikasi_kuesioner_dikembalikan'; + $log->status = 1; + $log->created_by = auth()->user()->id; + $log->save(); + return response()->json(['status' => true,'message' => 'Data Berhasil Di Update','type' => 'success']); } diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 386a9ca..df1f715 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -245,30 +245,39 @@ class ProfileController extends Controller if(@$log){ $progress = ''.str_replace('_',' ',\Str::title($log->step)).''; }else{ - $progress = ''; + $progress = StatusActivity($row->MsSekolahId); } - if(@$kuesioner->level == 0){ - $penghargaan = ' Belum Pernah'; - }elseif(@$kuesioner->level == 1){ - $penghargaan = ' Adiwiyata Kab/Kota'; - }elseif(@$kuesioner->level == 2){ - $penghargaan = ' Adiwiyata Provinsi'; - }elseif(@$kuesioner->level == 3){ - $penghargaan = ' Adiwiyata Nasional'; - }elseif(@$kuesioner->level == 4){ - $penghargaan = ' Adiwiyata Mandiri'; + if($kuesioner){ + if(@$kuesioner->level == 0){ + $penghargaan = ' Belum Pernah'; + }elseif(@$kuesioner->level == 1){ + $penghargaan = ' Adiwiyata Kab/Kota'; + }elseif(@$kuesioner->level == 2){ + $penghargaan = ' Adiwiyata Provinsi'; + }elseif(@$kuesioner->level == 3){ + $penghargaan = ' Adiwiyata Nasional'; + }elseif(@$kuesioner->level == 4){ + $penghargaan = ' Adiwiyata Mandiri'; + } + }else{ + $penghargaan = '-'; } - if((@$kuesioner->level+1) == 1){ - $jenis_usulan = 'Adiwiyata Kab/Kota'; - }elseif((@$kuesioner->level+1) == 2){ - $jenis_usulan = 'Adiwiyata Provinsi'; - }elseif((@$kuesioner->level+1) == 3){ - $jenis_usulan = 'Adiwiyata Nasional'; - }elseif((@$kuesioner->level+1) == 4){ - $jenis_usulan = 'Adiwiyata Mandiri'; + if($kuesioner){ + if((@$kuesioner->level+1) == 1){ + $jenis_usulan = 'Adiwiyata Kab/Kota'; + }elseif((@$kuesioner->level+1) == 2){ + $jenis_usulan = 'Adiwiyata Provinsi'; + }elseif((@$kuesioner->level+1) == 3){ + $jenis_usulan = 'Adiwiyata Nasional'; + }elseif((@$kuesioner->level+1) == 4){ + $jenis_usulan = 'Adiwiyata Mandiri'; + } + }else{ + $jenis_usulan = '-'; } + $penilaian = ''; $penilaian .= ' Sekolah : '.getNilaiAll('sekolah',$row->MsSekolahId).'
'; @@ -280,10 +289,18 @@ class ProfileController extends Controller $penilaian .= ' Provinsi : '.getNilaiAll('provinsi',$row->MsSekolahId).'
'; } + $sekolah = ''; + $sekolah .= @$row->nama_sekolah.'
'; + $sekolah .= ''.@$row->profile->tingkat->name.' '; + $sekolah .= ''.@$row->profile->status_sekolah.' '; + $sekolah .= 'Level '.levelAdiwiyata($row->npsn).''; + $sekolah .= ''.@$row->profile->alamat_sekolah.' '; + $_data[] = [ 'no' => $key+1, 'id' => encode_id($row->id), 'npsn' => $row->npsn, + 'sekolah' => $sekolah, 'nama' => $row->nama_sekolah, 'status_level' => 'Level '.levelAdiwiyata($row->npsn).'', 'kecamatan' => $row->kecamatan->name, diff --git a/public/assets/school.jpg b/public/assets/school.jpg new file mode 100644 index 0000000..31bca22 Binary files /dev/null and b/public/assets/school.jpg differ diff --git a/resources/views/modules/dashboard/sekolah.blade.php b/resources/views/modules/dashboard/sekolah.blade.php index 07f4ccc..5c1610d 100644 --- a/resources/views/modules/dashboard/sekolah.blade.php +++ b/resources/views/modules/dashboard/sekolah.blade.php @@ -11,112 +11,147 @@ data_jumlah); ?> +
-
-
+
+
-
-
- Jumlah Siswa

-

{{@$jumlah ? @$jumlah->jumlah_peserta_didik : 0}} Siswa

-
-
-
- -
-
-
+
-
-
-
-
-
- Jumlah Guru

-

{{@$jumlah ? @$jumlah->jumlah_tenaga_pendidik : 0}} Guru

-
-
-
- -
-
-
-
-
-
-
-
-
-
-
- Penghargaan Terakhir

-

{{@getPenghargaanTerakhir(session('sekolah_id'))}}

-
-
-
- -
-
-
-
-
-
-
-
-
-
-
- Proses Usulan

-

{!!@kuesionerLogStatus(@$kuesioner->KuesionerId,'plain')!!}

-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- + +
+
+
+
+
+
+
+ Total Sampah Organik

+

{{number_format(@$summary->organik)}} Kg

+
+
+
+ +
-
-
- {{@$profile->sekolah->nama_sekolah}} - {{session('tingkat_sekolah')}} - {{session('status_sekolah')}} +
+
+
+
+
+
+
+
+ Total Sampah Anorganik

+

{{number_format(@$summary->anorganik)}} Kg

+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+ Total Sampah B3

+

{{number_format(@$summary->b3)}} Kg

+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Total Sampah Minyak Jelantah

+

{{number_format(@$summary->minyak)}} Kg

+
+
+
+ +
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+

{{@$profile->sekolah->nama_sekolah}}

+
+ {{session('tingkat_sekolah')}} + {{session('status_sekolah')}} +
Level {{@levelAdiwiyata(session('npsn'))}}
NPSN : {{@$profile->sekolah->npsn}}
-
-
-
Level {{@levelAdiwiyata(session('npsn'))}}
+
+
+
DATA SEKOLAH
+
+
+ Jumlah Siswa + {{@$jumlah ? @$jumlah->jumlah_peserta_didik : 0}} +
+
+ Jumlah Guru + {{@$jumlah ? @$jumlah->jumlah_tenaga_pendidik : 0}} +
+
+ Penghargaan Terakhir + {{@getPenghargaanTerakhir(session('sekolah_id'))}} +
+
+ Proses Usulan + + @if(@$kuesioner->KuesionerId) + + {!!@kuesionerLogStatus(@$kuesioner->KuesionerId,'plain')!!} + + @else + {!! StatusActivity(session('sekolah_id')) !!} + @endif +
-
-
-
-
+ +
+
+
+
ALAMAT
+

{{session('alamat_sekolah')}}

+
+
+
KONTAK
@@ -130,18 +165,16 @@
-
-
ALAMAT
-

{{session('alamat_sekolah')}}

-
+
+
-
+
-
Riwayat Usulan
+
 Riwayat Usulan
diff --git a/resources/views/modules/kuesioner/form.blade.php b/resources/views/modules/kuesioner/form.blade.php index 62299d8..92cd744 100644 --- a/resources/views/modules/kuesioner/form.blade.php +++ b/resources/views/modules/kuesioner/form.blade.php @@ -95,6 +95,13 @@ Perbaikan Data  
+ @else +
+
+

 Verifikasi Kuesioner Leveling

+

Kuesioner anda sedang dilakukan verifikasi oleh sudin/dinas terkait. Mohon Menunggu...

+
+
@endif @endif
diff --git a/resources/views/modules/profile/admin.blade.php b/resources/views/modules/profile/admin.blade.php index f8a87b4..7c1e8fe 100644 --- a/resources/views/modules/profile/admin.blade.php +++ b/resources/views/modules/profile/admin.blade.php @@ -123,15 +123,15 @@ No - NPSN - Nama Sekolah + {{-- NPSN --}} + Sekolah Wilayah Kecamatan - Status Level + {{-- Status Level --}} - + Penghargaan Terakhir - Pemenuhan Kriteria + {{-- Pemenuhan Kriteria --}} Jenis Usulan Status diff --git a/resources/views/modules/usulan/kriteria/form.blade.php b/resources/views/modules/usulan/kriteria/form.blade.php index 9850f88..369bf67 100644 --- a/resources/views/modules/usulan/kriteria/form.blade.php +++ b/resources/views/modules/usulan/kriteria/form.blade.php @@ -168,7 +168,7 @@