From 596aa57f961664a6584591af7d51c8f42513d68b Mon Sep 17 00:00:00 2001 From: ilhamwara Date: Fri, 16 May 2025 13:57:58 +0700 Subject: [PATCH] update --- app/Http/Controllers/HomeController.php | 20 +- public/assets/css/custom.css | 51 +++++ .../views/modules/dashboard/admin.blade.php | 179 +++++++++++------- .../modules/usulan/kriteria/form.blade.php | 2 +- .../usulan/kriteria/progress.blade.php | 155 --------------- .../modules/usulan/kriteria/resume.blade.php | 169 ++++++----------- 6 files changed, 236 insertions(+), 340 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index c789f0d..c59dd27 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -77,13 +77,13 @@ class HomeController extends Controller $sekolah .= ''.@$row->profile->status_sekolah.' '; if(($row->level+1) == 1){ - $jenis_usulan = 'Adiwiyata Kab/Kota'; + $jenis_usulan = 'Adiwiyata Kab/Kota'; }elseif(($row->level+1) == 2){ - $jenis_usulan = 'Adiwiyata Provinsi'; + $jenis_usulan = 'Adiwiyata Provinsi'; }elseif(($row->level+1) == 3){ - $jenis_usulan = 'Adiwiyata Nasional'; + $jenis_usulan = 'Adiwiyata Nasional'; }elseif(($row->level+1) == 4){ - $jenis_usulan = 'Adiwiyata Mandiri'; + $jenis_usulan = 'Adiwiyata Mandiri'; } if($row->level == 0){ @@ -100,12 +100,12 @@ class HomeController extends Controller $_data[] = [ - 'no' => $key+1, - 'nama_sekolah' => @$sekolah, - 'npsn' => @$row->sekolah->npsn, - 'kab' => @$row->sekolah->kabupaten->name, - 'usulan_sebelumnya' => @$usulanAwal, - 'pengajuan_usulan' => @$jenis_usulan, + 'no' => $key+1, + 'nama_sekolah' => @$sekolah, + 'npsn' => @$row->sekolah->npsn, + 'kab' => @$row->sekolah->kabupaten->name, + 'usulan_sebelumnya' => @$usulanAwal, + 'pengajuan_usulan' => @$jenis_usulan, ]; } return response()->json($_data); diff --git a/public/assets/css/custom.css b/public/assets/css/custom.css index 96cdf02..01029d1 100644 --- a/public/assets/css/custom.css +++ b/public/assets/css/custom.css @@ -45,6 +45,18 @@ .f20{ font-size: 20px; } +.f12{ + font-size: 12px; +} +.f14{ + font-size: 14px; +} +.f16{ + font-size: 16px; +} +.f18{ + font-size: 18px; +} .subheader{margin-bottom: 20px;} .table-bordered th, .table-bordered td{border: none!important;} @@ -54,6 +66,12 @@ .border-success{ border: 1px solid #1f6c3c!important; } +.border-left-primary{ + border-left: 5px solid #4765c0!important; +} +.border-left-primary-light{ + border-left: 5px solid #dbeafe!important; +} .border-primary{ border: 1px solid #4765c0!important; } @@ -69,24 +87,57 @@ .bg-secondary{ background: #F3F4F6!important; } +.border-left-success{ + border-left: 5px solid #1f6c3c!important; +} +.border-left-success-light{ + border-left: 5px solid #dcfce7!important; +} .bg-success{ background: #1f6c3c!important; } .bg-success-light{ background: #dcfce7; } +.bg-primary{ + background: #4765c0!important; +} .bg-primary-light{ background: #dbeafe; } +.text-primary-light{ + color: #dbeafe; +} +.border-left-white{ + border-left: 5px solid #fff!important; +} +.border-left-info{ + border-left: 5px solid #9333ea!important; +} +.border-left-info-light{ + border-left: 5px solid #f3e8ff!important; +} .text-info{ color: #9333ea!important; } +.bg-info{ + background: #9333ea!important; +} .bg-info-light{ background: #f3e8ff; } +.border-left-warning{ + border-left: 5px solid #ca8a04!important; +} +.border-left-warning-light{ + border-left: 5px solid #fef9c3!important; +} .text-warning{ color: #ca8a04!important; } +.bg-warning{ + background: #ca8a04!important; +} .bg-warning-light{ background: #fef9c3; } diff --git a/resources/views/modules/dashboard/admin.blade.php b/resources/views/modules/dashboard/admin.blade.php index 44f75f6..1284f8c 100644 --- a/resources/views/modules/dashboard/admin.blade.php +++ b/resources/views/modules/dashboard/admin.blade.php @@ -9,95 +9,144 @@ Dashboard -
+
-
-
-

- {{$total_usulan_kab}} -

- Total Usulan Adiwiyata Kota +
+
+
+
+ Usulan Adiwiyata Kota

+

{{@$total_usulan_kab}} Sekolah

+
+
+
+ +
+
+
-
-
-
-

- {{$total_usulan_prov}} -

- Total Usulan Adiwiyata Provinsi +
+
+
+
+ Usulan Adiwiyata Provinsi

+

{{@$total_usulan_prov}} Sekolah

+
+
+
+ +
+
+
-
-
-
-

- {{$total_usulan_nasional}} -

- Total Usulan Adiwiyata Nasional +
+
+
+
+ Usulan Adiwiyata Nasional

+

{{@$total_usulan_nasional}} Sekolah

+
+
+
+ +
+
+
-
-
-
-

- {{$total_usulan_mandiri}} -

- Total Usulan Adiwiyata Mandiri +
+
+
+
+ Usulan Adiwiyata Mandiri

+

{{@$total_usulan_mandiri}} Sekolah

+
+
+
+ +
+
+
-
-
+
-
-
-

- {{@$total_sekolah_kab}} -

- Total Sekolah Adiwiyata Kota +
+
+
+
+ Sekolah Adiwiyata Kota

+

{{@$total_sekolah_kab}} Sekolah

+
+
+
+ +
+
+
-
-
-
-

- {{@$total_sekolah_prov}} -

- Total Sekolah Adiwiyata Provinsi +
+
+
+
+ Sekolah Adiwiyata Provinsi

+

{{@$total_sekolah_prov}} Sekolah

+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+ Sekolah Adiwiyata Nasional

+

{{@$total_sekolah_nasional}} Sekolah

+
+
+
+ +
+
+
-
-
-
-

- {{@$total_sekolah_nasional}} -

- Total Sekolah Adiwiyata Nasional +
+
+
+
+ Sekolah Adiwiyata Mandiri

+

{{@$total_sekolah_mandiri}} Sekolah

+
+
+
+ +
+
+
- -
-
-
-
-
-

- {{@$total_sekolah_mandiri}} -

- Total Sekolah Adiwiyata Mandiri -
-
@@ -105,12 +154,12 @@
-
-

Usulan Adiwiyata Tahun {{date('Y')}}

-
+
+
Usulan Adiwiyata Tahun {{date('Y')}}
+
-
+
Resume
diff --git a/resources/views/modules/usulan/kriteria/progress.blade.php b/resources/views/modules/usulan/kriteria/progress.blade.php index 0d9aa10..718ff42 100644 --- a/resources/views/modules/usulan/kriteria/progress.blade.php +++ b/resources/views/modules/usulan/kriteria/progress.blade.php @@ -1,161 +1,6 @@ @extends('layouts.master') @section('page-css') - - @endsection @section('content')
diff --git a/resources/views/modules/usulan/kriteria/resume.blade.php b/resources/views/modules/usulan/kriteria/resume.blade.php index 649b5df..b55145d 100644 --- a/resources/views/modules/usulan/kriteria/resume.blade.php +++ b/resources/views/modules/usulan/kriteria/resume.blade.php @@ -1,126 +1,77 @@ @extends('layouts.master') @section('page-css') - - @endsection @section('content') -
-

- {{$title}} -

-
-
-
- @if ($errors->any()) -
+
+
+
+
+
+

+ {{$title}} +

+
+
+
+
+
+
+
+ +
+
+
{{session('name')}}
+

NPSN: {{session('npsn')}}

+
+
+ {{session('tingkat_sekolah')}} + {{session('status_sekolah')}} + Level {{levelAdiwiyata(session('npsn'))}} +
+
+
+
+
+
+
+
+
+

 Anda Belum Melakukan Finalisasi Proses Data Kriteria

+

 Klik Progress Usulan untuk melakukan Finalisasi Proses Data Kriteria

+
+
+ @if ($errors->any()) +
+
    @foreach ($errors->all() as $error)
  • {{ $error }}
    • @endforeach
- @endif -
- {{csrf_field()}} -
-
-
-
-
- - - - - - - - - - - - - - - -
- -
NPSN: {{session('npsn')}}

{{session('name')}}

{{session('tingkat_sekolah')}} {{session('status_sekolah')}}

{{session('alamat_sekolah')}}

-
-
-
-

 Anda Belum Melakukan Finalisasi Proses Data Kriteria

-

 Klik Progress Usulan untuk melakukan Finalisasi Proses Data Kriteria

-
-
-
-
    -
    • -
  • Resume
    • -
  • Progress Usulan
    • -
-
-
- -
- @foreach($page as $dataNumber) -
-
- {{$dataNumber}} -
-
- {!! formKriteria($dataNumber) !!} -
-
- @endforeach -
-
- +
+ @endif + + + @foreach($page as $k => $dataNumber) +
+
+
+
+ +
+
+
+
+ {!! formKriteria($dataNumber) !!}
-
- -
+
+ @endforeach
@endsection @section('page-js')