update

app/Http/Controllers/HomeController.php

@@ -11,6 +11,7 @@ use App\Models\DokumenAdministrasi;
 use App\Models\Penilaian;
 use App\Models\SK;
 use App\Models\Usulan;
+use App\Models\SampahTerkelola;
 
 class HomeController extends Controller
 {
@@ -59,6 +60,40 @@ class HomeController extends Controller
             $data['sk']         = SK::where('tahun',date('Y'))->where('sekolah','like','%'.session('sekolah_id').'%')->first();
             $data['log']  = KuesionerLog::where('kuesioner_id',@$data['kuesioner']->KuesionerId)->orderBy('created_at','DESC')->first();
 
+            $series = SampahTerkelola::where('ms_sekolah_id',session('sekolah_id'))->where('tahun',date('Y'))->orderBy('bulan','ASC')->get();
+            $organik = array_fill(1, 12, 0);
+            $anorganik = array_fill(1, 12, 0);
+            $b3 = array_fill(1, 12, 0);
+            $minyak = array_fill(1, 12, 0);
+
+            foreach ($series as $row) {
+                $bulan = (int) $row->bulan;
+
+                $organik[$bulan]   = (int) $row->organik;
+                $anorganik[$bulan] = (int) $row->sampah_anorganik;
+                $b3[$bulan]        = (int) $row->b3;
+                $minyak[$bulan]    = (int) $row->minyak_jelantah;
+            }
+
+            $data['series'] = [
+                [
+                    'name' => 'Organik',
+                    'data' => array_values($organik),
+                ],
+                [
+                    'name' => 'Anorganik',
+                    'data' => array_values($anorganik),
+                ],
+                [
+                    'name' => 'B3',
+                    'data' => array_values($b3),
+                ],
+                [
+                    'name' => 'Minyak Jelantah',
+                    'data' => array_values($minyak),
+                ],
+            ];
+
             return view($this->template.'.sekolah', $data);
         }else{
             if(session('kabupaten_id') != ''){
@@ -101,8 +136,14 @@ class HomeController extends Controller
                 $data['total_sekolah_prov']      = Kuesioner::where('tahun',date('Y'))->where('level',1)->where('status',11)->count();
                 $data['total_sekolah_nasional']  = Kuesioner::where('tahun',date('Y'))->where('level',2)->where('status',11)->count();
                 $data['total_sekolah_mandiri']   = Kuesioner::where('tahun',date('Y'))->where('level',3)->where('status',11)->count();
-            }
 
+                $data['summary'] = SampahTerkelola::where('tahun', date('Y'))
+                    ->selectRaw('SUM(organik::integer) as organik,
+                        SUM(sampah_anorganik::integer) as anorganik,
+                        SUM(b3::integer) as b3,
+                        SUM(minyak_jelantah::integer) as minyak
+                    ')->first();
+            }
             
             $data['route']                  = 'modules';
             return view($this->template.'.admin', $data);

app/Http/Controllers/SampahController.php

@@ -31,20 +31,50 @@ class SampahController extends Controller
 
     public function grid(Request $request)
     {
-
+        if(session('group_alias') == 'sekolah'){
             $data = SampahTerkelola::where('ms_sekolah_id',session('sekolah_id'))
                 ->orderBy('tahun','DESC')
-        ->orderBy('bulan','ASC')
+                ->orderBy('bulan','ASC');
-        ->get();
+        }else{
+            if(session('kabupaten_id') != ''){
+                $data = SampahTerkelola::whereHas('sekolah',function($query){
+                        $query->where('ms_kabupaten_id',session('kabupaten_id'));
+                    })->orderBy('tahun','DESC')
+                    ->orderBy('bulan','ASC');
+                    
+            }else{
+                $data = SampahTerkelola::with(['sekolah'])->orderBy('tahun','DESC')
+                    ->orderBy('bulan','ASC');
+            }
+        }
+
+        if(@request()->tahun){
+            $tahun = request()->tahun;
+        }else{
+            $tahun = date('Y');
+        }
+
+        $data->where('tahun',$tahun);
+
+        
         $_data = [];
 
         
-        foreach ($data as $key => $row) {
+
+        foreach ($data->get() as $key => $row) {
+
+            $sekolah = '';
+            $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
+            $sekolah .= '<span class="badge bg-success-light text-success">'.@$row->sekolah->profile->tingkat->name.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-primary-light text-primary mt-1">'.@$row->sekolah->profile->status_sekolah.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-info-light text-info">Level '.levelAdiwiyata($row->sekolah->npsn).'</span>';
+            $sekolah .= '<span class="badge bg-secondary text-secondary text-left mt-1">'.@$row->sekolah->profile->alamat_sekolah.'</span>&nbsp;';
             
            $_data[] = [
             'no'                => $key+1,
             'id'                => encode_id($row->SampahTekelolaId),
             'tahun'             => $row->tahun,
+            'sekolah'           => $sekolah,
             'bulan'             => monthtString($row->bulan),
             'organik'           => $row->organik,
             'sampah_anorganik'  => $row->sampah_anorganik,

app/Models/SampahTerkelola.php

@@ -12,4 +12,9 @@ class SampahTerkelola extends Model
     protected $table = 'sampah_terkelola';
     protected $guarded = [];
     protected $primaryKey = 'SampahTerkelolaId';
+
+    public function sekolah()
+    {
+        return $this->belongsTo(\App\Models\Master\Sekolah::class,'ms_sekolah_id','MsSekolahId');
+    }
 }

resources/views/auth/login.blade.php

@@ -43,7 +43,8 @@
                                     <div class="">
                                         <div class="d-flex flex-column gap-3 align-items-center justify-content-center mb-5">
                                             <div>
-                                                <img src="{{asset('assets/logo-dinas.ico')}}" width="50">
+                                                {{-- <img src="{{asset('assets/logo-dinas.ico')}}" width="50"> --}}
+                                                <img src="{{asset('assets/logo.png')}}" width="95">
                                             </div>
                                             <div>
                                                 <h5 class="fw-500">SIDIA Jakarta</h5>

resources/views/auth/register.blade.php

@@ -65,7 +65,8 @@
                                 <div class="col-md-5 p-4 d-flex flex-column justify-content-center align-items-center gap-3">
                                      <div class="d-flex flex-column gap-3 align-items-center justify-content-center mb-5">
                                         <div>
-                                            <img src="{{asset('assets/logo-dinas.ico')}}" width="50">
+                                            {{-- <img src="{{asset('assets/logo-dinas.ico')}}" width="50"> --}}
+                                            <img src="{{asset('assets/logo.png')}}" width="95">
                                         </div>
                                         <div>
                                             <h5 class="fw-500">SIDIA Jakarta</h5>

resources/views/include/sidebar.blade.php

@@ -3,7 +3,7 @@
         <div class="d-flex flex-row justify-content-center align-items-center">
             <div class="">
                 <!-- <a href="#" class="page-logo-link press-scale-down d-flex align-items-center position-relative" data-toggle="modal" data-target="#modal-shortcut"> -->
-                    <img src="https://banksampah.jakarta.go.id/images/logo-dinas.ico" alt="Logo" style="width:35px;" aria-roledescription="logo">
+                    <img src="{{ asset('assets/logo.png') }}" alt="Logo" style="width:45px;" aria-roledescription="logo">
                 <!-- </a>  -->
             </div>
             <div class="">

resources/views/layouts/app.blade.php

@@ -50,7 +50,7 @@
 			<div class="flex flex-between justify-between items-center gap-5 mx-auto p-5">
 				<div class="flex flex-row gap-10">
 					<a href="{{ url('/') }}" class="flex items-center space-x-3 rtl:space-x-reverse">
-						<img src="{{ asset('assets/logo-dinas.ico') }}" class="h-8" />
+						<img src="{{ asset('assets/logo.png') }}" class="h-20" />
 					</a>
 					<div class="items-center justify-between hidden w-full md:flex md:w-auto md:order-1" id="navbar-cta">
 						<ul class="flex flex-col font-medium p-4 md:p-0 mt-4 border md:space-x-8 rtl:space-x-reverse md:flex-row md:mt-0 md:border-0 bg-white">
@@ -107,7 +107,7 @@
 					<div class="flex gap-5 items-center">
 						<div>
 							<a href="{{ url('/') }}" class="flex items-center space-x-3 rtl:space-x-reverse p-1 bg-white rounded-full">
-								<img src="{{ asset('assets/logo-dinas.ico') }}" class="h-8" />
+								<img src="{{ asset('assets/logo.png') }}" class="h-10" />
 							</a>
 						</div>
 						<div>

resources/views/modules/dashboard/admin.blade.php

@@ -165,6 +165,60 @@
         </div>
     </div>
 </div>
+<hr>
+<div class="row mb-2">
+    <div class="col-12">
+        <h5 class="fw-500">Statistik Sampah Terkelola</h5>
+    </div>
+    <div class="col-sm-6 col-xl-3">
+        <div class="card">
+            <div class="card-body">
+                <div class="d-flex flex-row  justify-content-between align-items-center">
+                    <div>
+                        <span class="m-0 l-h-n fw-500">Total Sampah Organik</span> <br><br>
+                        <h3 class="f20 fw-700 ">{{number_format(@$summary->organik)}} <span class="f12 fw-300">Kg</span> </h3>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-sm-6 col-xl-3">
+        <div class="card">
+            <div class="card-body">
+                <div class="d-flex flex-row  justify-content-between align-items-center">
+                    <div>
+                        <span class="m-0 l-h-n fw-500">Total Sampah Anorganik</span> <br><br>
+                        <h3 class="f20 fw-700 ">{{number_format(@$summary->anorganik)}} <span class="f12 fw-300">Kg</span> </h3>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-sm-6 col-xl-3">
+        <div class="card">
+            <div class="card-body">
+                <div class="d-flex flex-row  justify-content-between align-items-center">
+                    <div>
+                        <span class="m-0 l-h-n fw-500">Total Sampah B3</span> <br><br>
+                        <h3 class="f20 fw-700 ">{{number_format(@$summary->b3)}} <span class="f12 fw-300">Kg</span> </h3>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-sm-6 col-xl-3">
+        <div class="card">
+            <div class="card-body">
+                <div class="d-flex flex-row  justify-content-between align-items-center">
+                    <div>
+                        <span class="m-0 l-h-n fw-500">Total Sampah Minyak Jelantah</span> <br><br>
+                        <h3 class="f20 fw-700 ">{{number_format(@$summary->minyak)}} <span class="f12 fw-300">Kg</span> </h3>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 <div class="row mt-4">
     <div class="col-lg-6">
         <div id="panel-4" class="card">

resources/views/modules/dashboard/sekolah.blade.php

@@ -81,6 +81,13 @@
         </div>
     </div>
 </div>
+<div class="row">
+    <div class="col-md-12">
+        <figure class="highcharts-figure">
+            <div id="container"></div>
+        </figure>
+    </div>
+</div>
 <div class="row mb-4">
     <div class="col-md-6">
         <div class="card">
@@ -231,5 +238,51 @@
 </div>
 @endsection
 @section('page-js')
+<script src="https://code.highcharts.com/highcharts.js"></script>
+<script>
+    let series = @json($series);
 
+    Highcharts.chart('container', {
+    chart: {
+        type: 'column'
+    },
+    title: {
+        text: 'Data Sampah Terkelola Tahun {{ date("Y") }}'
+    },
+    xAxis: {
+        categories: ["Jan",
+                    "Feb",
+                    "Mar",
+                    "Apr",
+                    "Mei",
+                    "Jun",
+                    "Jul",
+                    "Agust",
+                    "Sept",
+                    "Okt",
+                    "Nov",
+                    "Des"],
+        crosshair: true,
+        accessibility: {
+            description: 'Countries'
+        }
+    },
+    yAxis: {
+        min: 0,
+        title: {
+            text: '(Kg)'
+        }
+    },
+    tooltip: {
+        valueSuffix: ' (Kg)'
+    },
+    plotOptions: {
+        column: {
+            pointPadding: 0.2,
+            borderWidth: 0
+        }
+    },
+    series: series
+});
+</script>
 @endsection

resources/views/modules/sampah/index.blade.php

@@ -14,10 +14,22 @@
         <div id="panel-4" class="panel">
             <div class="panel-container show">
                 <div class="panel-content">
-                    <div id="toolbar">
+                    <div id="toolbar" class="d-flex gap-2 align-items-center">
-                        <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
+                        <div>
+                            <span>Filter :</span>
+                        </div>
+                        <div>
+                            <select name="tahun" class="form-control filterTahun">
+                                @for ($i = date('Y')-3;   date('Y') >= $i; $i++)
+                                    <option {{ $i == date('Y') ? 'selected' : '' }} value="{{$i}}">{{$i}}</option>
+                                @endfor
+                            </select>
+                        </div>
+                        {{-- <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a> --}}
+                        <div>
                             <a data-toggle="modal" data-target="#modal" class="btn btn-success btn-sm text-white"><i class="fal fa-plus text-white"></i>&nbsp;Tambah Data</a>
                         </div>
+                    </div>
                     <table class="table w-100 wrap" 
                     data-search="true"
                     data-toggle="table"
@@ -30,17 +42,20 @@
                     data-sort-order="desc"
                     data-page-size="10"
                     data-id-field="id"
+                    data-query-params="queryParams"
                     id="grid-data">
                       <thead class="bg-primary-light text-primary">
                         <tr>
                           {{-- <th data-field="action">#</th> --}}
                           <th data-field="no">No</th>
-                          {{-- <th data-field="sekolah">Sekolah</th> --}}
+                          @if(session('group_alias') != 'sekolah')
+                          <th data-field="sekolah">Sekolah</th>
+                          @endif
                           <th data-field="tahun">Tahun</th>
                           <th data-field="bulan">Bulan</th>
-                          <th data-field="organik">Organik</th>
+                          <th data-field="organik">Organik (Kg)</th>
-                          <th data-field="sampah_anorganik">An Organik</th>
+                          <th data-field="sampah_anorganik">An Organik (Kg)</th>
-                          <th data-field="b3">B3</th>
+                          <th data-field="b3">B3 (Kg)</th>
                           <th data-field="minyak_jelantah">Minyak Jelantah</th>
                         </tr>
                       </thead>
@@ -154,7 +169,7 @@
                                         <div class="input-group">
                                             <input type="text" name="minyak_jelantah" class="form-control @error('minyak_jelantah') is-invalid @enderror" placeholder="Masukan Jumlah Minyak Jelantah">
                                             <div class="input-group-append">
-                                                <button class="btn btn-default waves-effect waves-themed" type="button">Kg</button>
+                                                <button class="btn btn-default waves-effect waves-themed" type="button"></button>
                                             </div>
                                         </div>
                                         @error('minyak_jelantah')
@@ -180,9 +195,22 @@
 <script src="{{asset('assets/js/datagrid/datatables/datatables.bundle.js')}}"></script>
 <script src="{{asset('assets/js/bootstrap-table.min.js')}}"></script>
 <script type="text/javascript">
+var $table = $('#grid-data');
     $('.btn-filter').on('click',function(){
         $('#filter').toggleClass('d-none');
     });
+    function queryParams(params) {
+        $('#toolbar').find('input[name], select').each(function() {
+            params[$(this).attr('name')] = $(this).val()
+        })
+
+        return params
+    }
+    $(function() {
+        $('.filterTahun').on('change',function(){
+            $table.bootstrapTable('refresh');
+        });
+    });
     $("#grid-data").on("click", ".tolak", function() {
         var base_url = $(this).attr('data-href');
         var id = $(this).attr('data-id');

resources/views/modules/usulan/kriteria/progress.blade.php

@@ -57,7 +57,8 @@
             </div>
         </div>
     @endif
-    <div class="col-md-6">
+
+    <div class="col-md-6 d-none">
         <div class="card">
             <div class="card-body">
                 <h4 class="mb-3 fw-700">Status Usulan</h4>
@@ -79,17 +80,37 @@
             </div>
         </div>
     </div>
-    <div class="col-md-6">
+
+    <div class="col-md-12">
         <form method="POST" id="form">
             {{csrf_field()}}
             <div class="card">
                 <div class="card-body p-4">
                 <h4 class="mb-3 fw-700">Kirim Kelengkapan Data</h4>
-                <p>Kab/Kota akan melakukan validasi, jika data sekolah lengkap akan diproses. apabila data belum lengkap akan dikembalikan ke sekolah untuk melakukan perbaikan. </p>
+                {{-- <p>Kab/Kota akan melakukan validasi, jika data sekolah lengkap akan diproses. apabila data belum lengkap akan dikembalikan ke sekolah untuk melakukan perbaikan. </p> --}}
                 <div class="alert bg-primary-light mb-3">
-                    <p class="text-primary mb-0">Pastikan NPSN, Profile, Dok Adminstrasi dan Pemenuhan Kriteria sudah sesuai.</p>
+                    <p class="text-primary mb-0">Pastikan data Pemenuhan Kriteria telah sesuai sebelum melanjutkan proses selanjutnya.</p>
                 </div>
                 <div class="d-flex flex-column gap-3">
+                    <div class="d-flex flex-row justify-content-between">
+                        <div>
+                            <i class="fal fa-trophy"></i>&nbsp;Usulan Adiwiyata
+                        </div>
+                        <div>
+                            <?php
+                                if(($kuesioner->level+1) == 1){
+                                    $jenis_usulan = 'Kabupaten/Kota';
+                                }elseif(($kuesioner->level+1) == 2){
+                                    $jenis_usulan = 'Provinsi';
+                                }elseif(($kuesioner->level+1) == 3){
+                                    $jenis_usulan = 'Nasional';
+                                }elseif(($kuesioner->level+1) == 4){
+                                    $jenis_usulan = 'Mandiri';
+                                }
+                            ?>
+                            <span class="fw-500">Calon Sekolah Adiwiyata {{$jenis_usulan}}</span>
+                        </div>
+                    </div>
                     <div class="d-flex flex-row justify-content-between">
                         <div>
                             <i class="fal fa-envelope"></i>&nbsp;Dokumen Administrasi 
@@ -97,14 +118,14 @@
                         <div>
                             @if(@$dok)
                                 @if(@$dok->status == 1)
-                                    <span class="badge bg-success-light text-success">Dokumen Sudah Di Verifikasi</span>
+                                    <span class="badge bg-success text-white">Dokumen Sudah Di Verifikasi</span>
                                 @elseif(@$dok->status == 2)
-                                    <span class="badge bg-danger-light text-danger">Dokumen Ditolak</span>
+                                    <span class="badge bg-danger text-white">Dokumen Ditolak</span>
                                 @else
-                                    <span class="badge bg-warning-light text-warning">Menunggu Verifikasi Dokumen</span>
+                                    <span class="badge bg-warning text-white">Menunggu Verifikasi Dokumen</span>
                                 @endif
                             @else
-                                <span class="badge badge-danger">Belum Upload Dokumen</span>
+                                <span class="badge bg-danger text-white">Belum Upload Dokumen</span>
                             @endif
                         </div>
                     </div>
@@ -115,18 +136,41 @@
                         <div>
                             {{count(@$penilaian)}} / {{count(@$page)}} &nbsp;
                             @if(count(@$penilaian) == count(@$page))
-                                <span class="badge bg-success-light text-success">Sudah Lengkap</span>
+                                <span class="badge bg-success text-white">Sudah Lengkap</span>
                             @else
-                                <span class="badge bg-danger-light text-danger">Belum Lengkap</span>
+                                <span class="badge bg-danger text-white">Belum Lengkap</span>
                             @endif
                         </div>
                     </div>
+                    <div class="d-flex flex-row justify-content-between">
+                        <div>
+                            <i class="fal fa-pencil"></i>&nbsp;Nilai Pemenuhan Kriteria
+                        </div>
+                        <div>
+                            {{ getNilaiAll('sekolah',$kuesioner->ms_sekolah_id) }}
+                            @if(getNilaiAll('sekolah',$kuesioner->ms_sekolah_id) > 70)
+                                <span class="badge bg-success text-white">Nilai Lolos Verifikasi</span>
+                            @else
+                                <span class="badge bg-danger text-white">Nilai Belum Cukup</span>
+                            @endif
+                        </div>
+                    </div>
+
+                    
                 </div>
                 @if(session('group_alias') == 'sekolah')
+
+                    @if(getNilaiAll('sekolah',$kuesioner->ms_sekolah_id) > 70)
+                    @else
+                        <div class="alert alert-danger mt-5 pb-0">
+                            <p>Nilai Pemenuhan Kriteria dinyatakan belum memenuhi ketentuan verifikasi dan perlu dilakukan perbaikan.</p>
+                        </div>
+                    @endif
                     <div class="d-flex flex-row justify-content-between my-3">
                         @if(session('group_alias') == 'sekolah')
                             @if(count(@$penilaian) == count(@$page))
                                 @if(($kuesioner->status == 1) || ($kuesioner->status == 5))
+                                    @if(getNilaiAll('sekolah',$kuesioner->ms_sekolah_id) > 70)
                                         <div class="custom-control custom-checkbox">
                                             <input type="checkbox" class="custom-control-input is-required check" id="true" value="1" name="check">
                                             <label class="custom-control-label" for="true">Dengan ini menyatakan bahwa kelengkapan data sudah benar.</label>
@@ -134,6 +178,7 @@
                                     @endif
                                 @endif
                             @endif
+                        @endif
                     </div>
                     @if(session('group_alias') == 'sekolah')
                         @if(@$kuesioner->status == 5)
@@ -144,11 +189,13 @@
                         @endif
                         @if(count(@$penilaian) == count(@$page))
                             @if(($kuesioner->status == 1) || ($kuesioner->status == 5))
+                                @if(getNilaiAll('sekolah',$kuesioner->ms_sekolah_id) > 70)
                                     <button class="btn btn-success btnSend">Kirim Data</button>
                                 @endif
                             @endif
                         @endif
                     @endif
+                @endif
               </div>
             </div>
             <div id="loading-spinner" style="display: none; text-align: center;">
@@ -223,6 +270,19 @@
             return;
         }
 
+        swal({
+            title: "Kirim Data!",
+            text: "Apa anda yakin ingin mengirim data pemenuhan kriteria ini ?",
+            type: "warning",
+            showCancelButton: true,
+            confirmButtonColor: "#3F7D58",
+            confirmButtonText: "Ya Kirim Sekarang",
+            cancelButtonText: "Tidak",
+            closeOnConfirm: true,
+            closeOnCancel: true
+        },
+        function(isConfirm) {
+            if(isConfirm){
                 $.ajax({
                     url: "{{url('usulan/adiwiyata/kriteria/kirimData/'.@$secure_id.'/'.encode_id(@$kuesioner->KuesionerId))}}", // Ganti dengan URL API-mu
                     type: 'POST', // Bisa juga 'POST' kalau perlu
@@ -253,6 +313,10 @@
                         $('#loading-spinner').hide(); // Sembunyikan spinner setelah request selesai
                     }
                 });
+            }
+        }); 
+        return false;
+        
     });
 
     $('#btnSave').on('click',function(e){