diff --git a/app/Http/Controllers/AdminBackend/AdminDashboardController.php b/app/Http/Controllers/AdminBackend/AdminDashboardController.php index 8e0b9cf..2062bc9 100644 --- a/app/Http/Controllers/AdminBackend/AdminDashboardController.php +++ b/app/Http/Controllers/AdminBackend/AdminDashboardController.php @@ -3,21 +3,36 @@ namespace App\Http\Controllers\AdminBackend; use App\Http\Controllers\Controller; +use App\Models\Hasil; +use App\Models\User; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; class AdminDashboardController extends Controller { - // - public function index(){ - return view('admin_backend.admin_dashboard'); - } + // + public function index() + { + $angkatanCounts = User::select('angkatan', DB::raw('count(*) as total')) + ->groupBy('angkatan') + ->orderBy('angkatan', 'desc') + ->get(); + $kmCounts = Hasil::select('km_class', DB::raw('count(*) as total')) + ->groupBy('km_class') + ->orderByRaw("FIELD(km_class, 'High', 'Medium', 'Low')") + ->get(); + $rmCounts = Hasil::select('rm_class', DB::raw('count(*) as total')) + ->groupBy('rm_class') + ->orderByRaw("FIELD(rm_class, 'High', 'Medium', 'Low')") + ->get(); + return view('admin_backend.admin_dashboard', compact('angkatanCounts', 'kmCounts', 'rmCounts')); + } - public function hasRole($id) - { - foreach ($this->users as $user) - { - if ($user->kelas_user == $id) return true; - } - return false; - } + public function hasRole($id) + { + // foreach ($this->users as $user) { + // if ($user->kelas_user == $id) return true; + // } + return false; + } } diff --git a/app/Http/Controllers/AdminBackend/AdminPeriodController.php b/app/Http/Controllers/AdminBackend/AdminPeriodController.php index 4d49f9b..f409ea9 100644 --- a/app/Http/Controllers/AdminBackend/AdminPeriodController.php +++ b/app/Http/Controllers/AdminBackend/AdminPeriodController.php @@ -12,7 +12,7 @@ class AdminPeriodController extends Controller public function index() { - $periods = Periode::get(); + $periods = Periode::orderBy('id', 'desc')->get(); $selectPeriod = PilihPeriode::first(); if (!$selectPeriod->id_periode) { $selectPeriod->id_periode = 'Belum Ditambahkan'; @@ -23,7 +23,7 @@ public function index() } else { $checkPeriod->semester = 'Genap'; } - $selectPeriod->id_periode = $checkPeriod->semester . ' ' . $checkPeriod->tahun; + $selectPeriod->period = $checkPeriod->semester . ' ' . $checkPeriod->tahun; } return view('admin_backend.admin_period', compact('periods', 'selectPeriod')); diff --git a/app/Http/Controllers/AdminBackend/SelectPeriodController.php b/app/Http/Controllers/AdminBackend/SelectPeriodController.php index 8aeb04c..81bb7b6 100644 --- a/app/Http/Controllers/AdminBackend/SelectPeriodController.php +++ b/app/Http/Controllers/AdminBackend/SelectPeriodController.php @@ -13,6 +13,9 @@ public function update(Request $request) { $id = $request->id_periode; $pilihPeriode = PilihPeriode::first(); + if ($pilihPeriode->id_periode == $id) { + return redirect()->route('adminPeriod.index')->with('error', 'Periode kuesioner yang dipilih sama dengan sebelumnya'); + } $pilihPeriode->id_periode = $id; $pilihPeriode->aktif = '0'; $pilihPeriode->update(); diff --git a/public/admin_backend/assets/css/style.css b/public/admin_backend/assets/css/style.css index 6538926..28db898 100644 --- a/public/admin_backend/assets/css/style.css +++ b/public/admin_backend/assets/css/style.css @@ -51,14 +51,12 @@ @media (max-width: 1199px) { #main { padding: 20px; } - } - .right { float: right; width: max-content; - } +} /*-------------------------------------------------------------- # Page Title diff --git a/resources/views/admin_backend/admin_dashboard.blade.php b/resources/views/admin_backend/admin_dashboard.blade.php index c1d5d57..ff3aea3 100644 --- a/resources/views/admin_backend/admin_dashboard.blade.php +++ b/resources/views/admin_backend/admin_dashboard.blade.php @@ -7,645 +7,145 @@

Admin Dashboard

-
- -
-
+
+ +
+
+
+
Knowledge of Metacognitif (KM)
+
+
-
-
145
- 12% increase - -
-
-
- -
-
- - -
-
- -
- - -
- -
-
Revenue | This Month
- -
-
- -
-
-
$3,264
- 8% increase - -
-
-
- -
-
- - -
- -
- -
- - -
- -
-
Customers | This Year
- -
-
- -
-
-
1244
- 12% decrease - -
-
-
-
+ +
+
+
+
Regulation of Metacognitif (RM)
+
+ +
- -
-
Reports /Today
- - -
- - - - -
-
-
- - -
-
- -
- - -
- -
-
Recent Sales | Today
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#CustomerProductPriceStatus
#2457Brandon JacobAt praesentium minu$64Approved
#2147Bridie KesslerBlanditiis dolor omnis similique$47Pending
#2049Ashleigh LangoshAt recusandae consectetur$147Approved
#2644Angus GradyUt voluptatem id earum et$67Rejected
#2644Raheem LehnerSunt similique distinctio$165Approved
- -
- -
-
- - -
-
- -
- - -
- -
-
Top Selling | Today
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PreviewProductPriceSoldRevenue
Ut inventore ipsa voluptas nulla$64124$5,828
Exercitationem similique doloremque$4698$4,508
Doloribus nisi exercitationem$5974$4,366
Officiis quaerat sint rerum error$3263$2,016
Sit unde debitis delectus repellendus$7941$3,239
- -
- -
-
+
- - -
+
+
+
+
Jumlah Mahasiswa per Angkatan
+
+ + - -
-
- - -
-
- - -
- -
-
Website Traffic | Today
- -
- - - -
-
- - -
-
- - -
- -
-
News & Updates | Today
- -
-
- -

Nihil blanditiis at in nihil autem

-

Sit recusandae non aspernatur laboriosam. Quia enim eligendi sed ut harum...

+ }).render(); + }); + +
- -
- -

Quidem autem et impedit

-

Illo nemo neque maiores vitae officiis cum eum turos elan dries werona nande...

-
- -
- -

Id quia et et ut maxime similique occaecati ut

-

Fugiat voluptas vero eaque accusantium eos. Consequuntur sed ipsam et totam...

-
- -
- -

Laborum corporis quo dara net para

-

Qui enim quia optio. Eligendi aut asperiores enim repellendusvel rerum cuder...

-
- -
- -

Et dolores corrupti quae illo quod dolor

-

Odit ut eveniet modi reiciendis. Atque cupiditate libero beatae dignissimos eius...

-
- -
-
-
+
-
- -
- -@endsection \ No newline at end of file + + +@endsection +@section('script') + +@endsection diff --git a/resources/views/admin_backend/admin_listadmin.blade.php b/resources/views/admin_backend/admin_listadmin.blade.php index 16135b0..995051f 100644 --- a/resources/views/admin_backend/admin_listadmin.blade.php +++ b/resources/views/admin_backend/admin_listadmin.blade.php @@ -105,4 +105,13 @@ +@endsection +@section('script') + @endsection \ No newline at end of file diff --git a/resources/views/admin_backend/admin_listuser.blade.php b/resources/views/admin_backend/admin_listuser.blade.php index 09c3651..161c363 100644 --- a/resources/views/admin_backend/admin_listuser.blade.php +++ b/resources/views/admin_backend/admin_listuser.blade.php @@ -58,4 +58,14 @@ +@endsection + +@section('script') + @endsection \ No newline at end of file diff --git a/resources/views/admin_backend/admin_period.blade.php b/resources/views/admin_backend/admin_period.blade.php index ba37a27..e89a26f 100644 --- a/resources/views/admin_backend/admin_period.blade.php +++ b/resources/views/admin_backend/admin_period.blade.php @@ -19,7 +19,7 @@
Periode Terpilih
-
{{ $selectPeriod->id_periode }}
+
{{ $selectPeriod->period }}
@@ -62,7 +62,11 @@
@csrf - + @if ($period->id==$selectPeriod->id_periode) + + @else + + @endif
@@ -269,5 +273,8 @@ } }) }); + $(document).ready(function() { + $("#sidebar-period").removeClass("collapsed"); + }); @endsection \ No newline at end of file diff --git a/resources/views/admin_backend/admin_profile.blade.php b/resources/views/admin_backend/admin_profile.blade.php index 99b794d..5b25fb1 100644 --- a/resources/views/admin_backend/admin_profile.blade.php +++ b/resources/views/admin_backend/admin_profile.blade.php @@ -3,4 +3,12 @@
ini profile admin
+@endsection + +@section('script') + @endsection \ No newline at end of file diff --git a/resources/views/admin_backend/admin_questionnaire.blade.php b/resources/views/admin_backend/admin_questionnaire.blade.php index 6476543..c142e4a 100644 --- a/resources/views/admin_backend/admin_questionnaire.blade.php +++ b/resources/views/admin_backend/admin_questionnaire.blade.php @@ -165,5 +165,9 @@ }) }); }); + + $(document).ready(function() { + $("#sidebar-questionnaire").removeClass("collapsed"); + }); @endsection \ No newline at end of file diff --git a/resources/views/admin_backend/admin_result.blade.php b/resources/views/admin_backend/admin_result.blade.php index e174126..a856f72 100644 --- a/resources/views/admin_backend/admin_result.blade.php +++ b/resources/views/admin_backend/admin_result.blade.php @@ -33,5 +33,9 @@ @endsection @section('script') - + @endsection \ No newline at end of file diff --git a/resources/views/admin_backend/layouts/sidebar.blade.php b/resources/views/admin_backend/layouts/sidebar.blade.php index 2a154f0..2f8a41b 100644 --- a/resources/views/admin_backend/layouts/sidebar.blade.php +++ b/resources/views/admin_backend/layouts/sidebar.blade.php @@ -6,52 +6,52 @@ Dosen
  • - +
  • -
  • -
  • -
  • -
  • - -
      +
      • - + List User
      • - + List Admin
        • diff --git a/resources/views/backend/closed_questionnaire.blade.php b/resources/views/backend/closed_questionnaire.blade.php index 69365f9..20bf154 100644 --- a/resources/views/backend/closed_questionnaire.blade.php +++ b/resources/views/backend/closed_questionnaire.blade.php @@ -11,4 +11,11 @@

        Silakan kembali lagi nanti atau cek informasi terbaru untuk melihat kapan periode pengisian akan dibuka. Terima kasih atas pengertiannya.

    • + @endsection + @section('script') + @endsection \ No newline at end of file diff --git a/resources/views/backend/completed_questionnaire.blade.php b/resources/views/backend/completed_questionnaire.blade.php index 685d929..4bcbee5 100644 --- a/resources/views/backend/completed_questionnaire.blade.php +++ b/resources/views/backend/completed_questionnaire.blade.php @@ -11,4 +11,12 @@

    Anda telah berhasil menyelesaikan kuesioner yang telah kami sediakan. Terima kasih atas partisipasi Anda dalam memberikan masukan penting kepada kami.

    - @endsection \ No newline at end of file + @endsection + + @section('script') + +@endsection \ No newline at end of file diff --git a/resources/views/backend/dashboard.blade.php b/resources/views/backend/dashboard.blade.php index 1e0eb14..00856d6 100644 --- a/resources/views/backend/dashboard.blade.php +++ b/resources/views/backend/dashboard.blade.php @@ -648,4 +648,12 @@ +@endsection + +@section('script') + @endsection \ No newline at end of file diff --git a/resources/views/backend/layouts/sidebar.blade.php b/resources/views/backend/layouts/sidebar.blade.php index b2d0666..eb37871 100644 --- a/resources/views/backend/layouts/sidebar.blade.php +++ b/resources/views/backend/layouts/sidebar.blade.php @@ -10,21 +10,21 @@ Teknik Informatika
  • - +
  • -
  • - diff --git a/resources/views/backend/layouts/template.blade.php b/resources/views/backend/layouts/template.blade.php index 93d9b4e..59d089e 100644 --- a/resources/views/backend/layouts/template.blade.php +++ b/resources/views/backend/layouts/template.blade.php @@ -173,6 +173,9 @@ + @yield('script') + + @if (session('success')) +@endsection \ No newline at end of file diff --git a/resources/views/backend/questionnaire_instructions.blade.php b/resources/views/backend/questionnaire_instructions.blade.php index c32090b..3612ad0 100644 --- a/resources/views/backend/questionnaire_instructions.blade.php +++ b/resources/views/backend/questionnaire_instructions.blade.php @@ -52,4 +52,12 @@
    • - @endsection \ No newline at end of file + @endsection + + @section('script') + +@endsection \ No newline at end of file diff --git a/resources/views/backend/users-profile.blade.php b/resources/views/backend/users-profile.blade.php index f03daca..7b27caa 100644 --- a/resources/views/backend/users-profile.blade.php +++ b/resources/views/backend/users-profile.blade.php @@ -179,4 +179,12 @@ - @endsection \ No newline at end of file + @endsection + + @section('script') + + @endsection \ No newline at end of file diff --git a/resources/views/backend/users_questionnaire.blade.php b/resources/views/backend/users_questionnaire.blade.php index 53e52cd..2079b54 100644 --- a/resources/views/backend/users_questionnaire.blade.php +++ b/resources/views/backend/users_questionnaire.blade.php @@ -56,4 +56,12 @@ {{--! end fill --}} +@endsection + +@section('script') + @endsection \ No newline at end of file