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/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'); diff --git a/app/Http/Controllers/Backend/QuestionnaireController.php b/app/Http/Controllers/Backend/QuestionnaireController.php index 6f46a71..b046b76 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..73131f2 100644 --- a/resources/views/backend/dashboard.blade.php +++ b/resources/views/backend/dashboard.blade.php @@ -7,8 +7,8 @@

Dashboard

@@ -16,52 +16,33 @@
- -
-
-
-
Nilai KM
- 80 -
-
+ +
+
+
+
Knowledge of Metacognitif (KM)
+ @foreach ($historiPengisian as $item) +
+
+
+
Nilai anda {{ $item->km_total }}
+ @endforeach
-
-
-
+
+
-
Nilai RM
- 80 +
Regulation of Metacognitif (RM)
+ @foreach ($historiPengisian as $item)
-
+
- +
Nilai anda {{ $item->rm_total }}
+ @endforeach
@@ -73,9 +54,10 @@
Rangkuman
    - {{-- @foreach ($rangkuman as $item) -
  • {{ $item->keterangan }}
    • - @endforeach --}} + @foreach ($historiPengisian as $item) +

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

    +

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


    + @endforeach
@@ -86,11 +68,10 @@
Histori Pengisian Kuesioner
-
    - {{-- @foreach ($historiPengisian as $item) -
  • {{ $item->tanggal }} - {{ $item->keterangan }}
    • - @endforeach --}} + @foreach ($historiPengisian as $item) +
  • {{ $item->created_at }}
    • + @endforeach
@@ -102,7 +83,11 @@
Penjelasan KM
-

Knowledge of Metacognitif (KM) adalah ..........

+

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

@@ -113,7 +98,11 @@
Penjelasan RM
-

Regulation of Metacognitif (RM) adalah............

+

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/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)?> +
  • diff --git a/resources/views/backend/users-profile.blade.php b/resources/views/backend/users-profile.blade.php index 63efe7d..6e36e65 100644 --- a/resources/views/backend/users-profile.blade.php +++ b/resources/views/backend/users-profile.blade.php @@ -7,7 +7,7 @@

    Profile

    @@ -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 +