From 5258d96937eaa59d156436c42c1d8dc184dcd305 Mon Sep 17 00:00:00 2001 From: Ahmad Firdaus Tarmidzi Date: Mon, 6 Nov 2023 11:02:22 +0700 Subject: [PATCH 01/11] up --- app/Http/Controllers/Backend/DashboardController.php | 9 ++++++++- app/Http/Controllers/Backend/QuestionnaireController.php | 9 +++++++++ resources/views/backend/dashboard.blade.php | 7 +++---- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Backend/DashboardController.php b/app/Http/Controllers/Backend/DashboardController.php index e138e3f..9420258 100644 --- a/app/Http/Controllers/Backend/DashboardController.php +++ b/app/Http/Controllers/Backend/DashboardController.php @@ -6,6 +6,7 @@ use Illuminate\Http\Request; use App\Models\Hasil; use App\Models\User; +use App\Models\PilihPeriode; use Illuminate\Support\Facades\DB; @@ -21,6 +22,12 @@ public function index() ->groupBy('rm_class') ->orderByRaw("FIELD(rm_class, 'High', 'Medium', 'Low')") ->get(); - return view('backend.dashboard', compact('kmCounts', 'rmCounts')); + + $checkPeriod = PilihPeriode::first(); + $idUser = auth()->user()->id; + $historiPengisian = Hasil::where('id_user', $idUser)->where('id_periode', $checkPeriod->id_periode)->get(); + + return view('backend.dashboard', compact('kmCounts', 'rmCounts', 'historiPengisian')); + } } diff --git a/app/Http/Controllers/Backend/QuestionnaireController.php b/app/Http/Controllers/Backend/QuestionnaireController.php index cba053a..44ed2d6 100644 --- a/app/Http/Controllers/Backend/QuestionnaireController.php +++ b/app/Http/Controllers/Backend/QuestionnaireController.php @@ -23,6 +23,7 @@ public function index() return view('backend.users_questionnaire', compact('kuesioners')); } + public function store(Request $request) { $idUser = auth()->user()->id; @@ -96,4 +97,12 @@ public function store(Request $request) return redirect()->route('user.questionnaire.check'); } + + // public function check() + // { + // $idUser = auth()->user()->id; + // $historiPengisian = Hasil::where('id_user', $idUser)->get(); + + // return view('backend.dashboard', compact('historiPengisian')); + // } } diff --git a/resources/views/backend/dashboard.blade.php b/resources/views/backend/dashboard.blade.php index ebf8a54..c9670ba 100644 --- a/resources/views/backend/dashboard.blade.php +++ b/resources/views/backend/dashboard.blade.php @@ -86,11 +86,10 @@
Histori Pengisian Kuesioner
-
    - {{-- @foreach ($historiPengisian as $item) -
  • {{ $item->tanggal }} - {{ $item->keterangan }}
    • - @endforeach --}} + @foreach ($historiPengisian as $item) +
  • {{ $item->created_at }} - {{ $item->km_class }} / {{ $item->rm_class }}
    • + @endforeach
From 112f68a1c43c3c6b4d2943eb7b2046609a057bbb Mon Sep 17 00:00:00 2001 From: DimazzP Date: Mon, 6 Nov 2023 11:16:47 +0700 Subject: [PATCH 02/11] Null Safety Image Path --- app/Http/Controllers/Backend/ProfileController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Backend/ProfileController.php b/app/Http/Controllers/Backend/ProfileController.php index 0d44679..f46da1b 100644 --- a/app/Http/Controllers/Backend/ProfileController.php +++ b/app/Http/Controllers/Backend/ProfileController.php @@ -36,7 +36,7 @@ public function update(Request $request) $user->nim = $request->input('nim'); $user->semester = $request->input('semester'); $user->angkatan = $request->input('angkatan'); - $user->foto = $imagePath; + $user->foto = $imagePath ?? null; $user->update(); return redirect('/dashboard')->with('success', 'Profile updated successfully1'); From b2a50193b9f5ba1d224a1d00cd77cdc0b6d181fa Mon Sep 17 00:00:00 2001 From: Ahmad Firdaus Tarmidzi Date: Mon, 6 Nov 2023 13:49:56 +0700 Subject: [PATCH 03/11] up --- resources/views/frontend/layouts/navbar.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/frontend/layouts/navbar.blade.php b/resources/views/frontend/layouts/navbar.blade.php index 4d2df30..630f173 100644 --- a/resources/views/frontend/layouts/navbar.blade.php +++ b/resources/views/frontend/layouts/navbar.blade.php @@ -4,7 +4,7 @@
From ff92842e73882cf7d2caea78dab74250b0b6cd48 Mon Sep 17 00:00:00 2001 From: Ahmad Firdaus Tarmidzi Date: Mon, 6 Nov 2023 14:07:23 +0700 Subject: [PATCH 04/11] up --- resources/views/backend/users-profile.blade.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/resources/views/backend/users-profile.blade.php b/resources/views/backend/users-profile.blade.php index 63efe7d..5043971 100644 --- a/resources/views/backend/users-profile.blade.php +++ b/resources/views/backend/users-profile.blade.php @@ -21,8 +21,15 @@
Profile -

Raditya Arief Pratama

-

Teknik Informatika

+

+ @if(Auth::user()) + {{ Auth::user()->nama_lengkap }} + @endif

+

+ @if(Auth::user()) + {{ Auth::user()->nim }} + @endif +

From 24be87563f55ebf6f30604338e2a99d7358343cf Mon Sep 17 00:00:00 2001 From: Ahmad Firdaus Tarmidzi Date: Mon, 6 Nov 2023 14:19:50 +0700 Subject: [PATCH 05/11] update --- resources/views/backend/layouts/sidebar.blade.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/resources/views/backend/layouts/sidebar.blade.php b/resources/views/backend/layouts/sidebar.blade.php index 4d40bfc..9ad764c 100644 --- a/resources/views/backend/layouts/sidebar.blade.php +++ b/resources/views/backend/layouts/sidebar.blade.php @@ -7,13 +7,12 @@ - - -
class="d-flex flex-column align-items-center">nama_lengkap)?>
- Teknik Informatika + nim)?> +
  • From 5537e40b8b10525fe83261ee92896a8f85db944c Mon Sep 17 00:00:00 2001 From: Ahmad Firdaus Tarmidzi Date: Mon, 6 Nov 2023 14:36:21 +0700 Subject: [PATCH 06/11] up --- resources/views/backend/dashboard.blade.php | 10 +++++----- resources/views/frontend/layouts/navbar.blade.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/backend/dashboard.blade.php b/resources/views/backend/dashboard.blade.php index c9670ba..70f89d2 100644 --- a/resources/views/backend/dashboard.blade.php +++ b/resources/views/backend/dashboard.blade.php @@ -21,9 +21,9 @@
    Nilai KM
    - 80 + 50
    -
    +
    -
    - + +
    Nilai RM
    - 80 + @foreach ($historiPengisian as $item)
    -
    +
    - +
    Nilai anda {{ $item->rm_total }}
    + @endforeach
    @@ -74,8 +55,8 @@
      @foreach ($historiPengisian as $item) -

      KM = {{ $item->km_class }}

      -

      RM = {{ $item->rm_class }}


      +

      Nilai KM = {{ $item->km_class }}

      +

      Nilai RM = {{ $item->rm_class }}


      @endforeach
    @@ -89,7 +70,7 @@
    Histori Pengisian Kuesioner
      @foreach ($historiPengisian as $item) -
    • {{ $item->created_at }} - {{ $item->km_class }} / {{ $item->rm_class }}
      • +
    • {{ $item->created_at }}
      • @endforeach
    From a52f3a1241dc195feb30715f70f81107cd2fa522 Mon Sep 17 00:00:00 2001 From: Ahmad Firdaus Tarmidzi Date: Tue, 7 Nov 2023 06:37:36 +0700 Subject: [PATCH 10/11] UPDATE DASHBOARD --- resources/views/backend/dashboard.blade.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/backend/dashboard.blade.php b/resources/views/backend/dashboard.blade.php index 53dfce6..25d4d68 100644 --- a/resources/views/backend/dashboard.blade.php +++ b/resources/views/backend/dashboard.blade.php @@ -16,30 +16,30 @@
    - +
    -
    Nilai RM
    +
    Knowledge of Metacognitif (KM)
    @foreach ($historiPengisian as $item)
    -
    Nilai anda {{ $item->km_total }}
    +
    Nilai anda {{ $item->km_total }}
    @endforeach
    -
    +
    -
    Nilai RM
    +
    Regulation of Metacognitif (RM)
    @foreach ($historiPengisian as $item)
    -
    +
    Nilai anda {{ $item->rm_total }}
    @endforeach From ff48bab5f7aad00237c21fcf8b6d04db2899a559 Mon Sep 17 00:00:00 2001 From: Ahmad Firdaus Tarmidzi Date: Tue, 7 Nov 2023 08:29:20 +0700 Subject: [PATCH 11/11] up --- resources/views/backend/dashboard.blade.php | 16 ++++++++++++---- resources/views/backend/users-profile.blade.php | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/resources/views/backend/dashboard.blade.php b/resources/views/backend/dashboard.blade.php index 25d4d68..73131f2 100644 --- a/resources/views/backend/dashboard.blade.php +++ b/resources/views/backend/dashboard.blade.php @@ -7,8 +7,8 @@

    Dashboard

    @@ -39,7 +39,7 @@
    Regulation of Metacognitif (RM)
    @foreach ($historiPengisian as $item)
    -
    +
    Nilai anda {{ $item->rm_total }}
    @endforeach @@ -83,7 +83,11 @@
    Penjelasan KM
    -

    Knowledge of Metacognitif (KM) merupakan pengetahun individu terhadap kognitifnya. Knowledge of metacognitive terdiri dari pengetahuan prosedural yang merupakan pengetahuan bagaimana seseorang melakukan sesuatu, pengetahuan deklaratif mencakup pengetahuan tentang kegiatan yang akan dilakukan sebagai pembelajar dan apa yang mempengaruhi kegiatannya, pengdeklaratif, dan kondisional, serta pengetahuan kondisional yakni pengetahuan tentang kapan dan mengapa menggunakan pengetahuan prosedural dan deklaratif.

    +

    Knowledge of Metacognitif (KM) merupakan pengetahun individu terhadap kognitifnya. Knowledge of metacognitive terdiri dari pengetahuan prosedural yang merupakan pengetahuan bagaimana seseorang melakukan sesuatu, pengetahuan deklaratif mencakup pengetahuan tentang kegiatan yang akan dilakukan sebagai pembelajar dan apa yang mempengaruhi kegiatannya, pengdeklaratif, dan kondisional, serta pengetahuan kondisional yakni pengetahuan tentang kapan dan mengapa menggunakan pengetahuan prosedural dan deklaratif.

    +

    Keterangan Nilai KM:

     +

    KM High ≥ 63

     +

    KM Medium ≥ 42

     +

    KM Low <42

    @@ -95,6 +99,10 @@
    Penjelasan RM

    Regulation of Metacognitif (RM) merupakan kemampuan mengontrol pembelajaran, melakukan sesuatu atau melakukan perbaikan terhadap kesalahannya. Pembelajar mengatur kegiatan pembelajarannya dengan melibatkan perencanaan dan pengawasan terhadap aktivitas kognitif yang digunakan. Kemampuan metakognitif ini merupakan kunci bagi pengembangan berpikir kritis.

    +

    Keterangan Nilai RM :

     +

    RM High ≥ 132

     +

    RM Medium ≥ 88

     +

    RM Low <88

    diff --git a/resources/views/backend/users-profile.blade.php b/resources/views/backend/users-profile.blade.php index 5043971..6e36e65 100644 --- a/resources/views/backend/users-profile.blade.php +++ b/resources/views/backend/users-profile.blade.php @@ -7,7 +7,7 @@

    Profile