Merge branch 'main' of https://github.com/raditya09/KlasifikasiStudentModelling
This commit is contained in:
commit
f392ce9cee
|
@ -6,6 +6,7 @@
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use App\Models\Hasil;
|
use App\Models\Hasil;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
|
use App\Models\PilihPeriode;
|
||||||
|
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
@ -21,6 +22,12 @@ public function index()
|
||||||
->groupBy('rm_class')
|
->groupBy('rm_class')
|
||||||
->orderByRaw("FIELD(rm_class, 'High', 'Medium', 'Low')")
|
->orderByRaw("FIELD(rm_class, 'High', 'Medium', 'Low')")
|
||||||
->get();
|
->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'));
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,6 +23,7 @@ public function index()
|
||||||
return view('backend.users_questionnaire', compact('kuesioners'));
|
return view('backend.users_questionnaire', compact('kuesioners'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function store(Request $request)
|
public function store(Request $request)
|
||||||
{
|
{
|
||||||
$idUser = auth()->user()->id;
|
$idUser = auth()->user()->id;
|
||||||
|
@ -96,4 +97,12 @@ public function store(Request $request)
|
||||||
|
|
||||||
return redirect()->route('user.questionnaire.check');
|
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'));
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,11 +86,10 @@
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h5 class="card-title">Histori Pengisian Kuesioner</h5>
|
<h5 class="card-title">Histori Pengisian Kuesioner</h5>
|
||||||
<!-- Tambahkan tabel atau daftar histori pengisian kuesioner di sini -->
|
|
||||||
<ul>
|
<ul>
|
||||||
{{-- @foreach ($historiPengisian as $item)
|
@foreach ($historiPengisian as $item)
|
||||||
<li>{{ $item->tanggal }} - {{ $item->keterangan }}</li>
|
<li>{{ $item->created_at }} - {{ $item->km_class }} / {{ $item->rm_class }}</li>
|
||||||
@endforeach --}}
|
@endforeach
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue