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