From d23fc9e634c99db90a26c944914ff6ca899d7ca2 Mon Sep 17 00:00:00 2001 From: Zakiaass <117088186+zakiaass@users.noreply.github.com> Date: Wed, 13 Mar 2024 14:08:50 +0700 Subject: [PATCH] Update Perhitungan Controller and Dashboard --- app/Http/Controllers/CriteriaController.php | 40 ++--- app/Http/Controllers/DashboardController.php | 6 +- app/Http/Controllers/PenilaianController.php | 8 +- .../Controllers/PerhitunganController.php | 148 ++++++++++++++++++ app/Http/Controllers/SiswaController.php | 13 -- .../Controllers/SubCriteriaController.php | 50 +++--- resources/views/dashboard/index.blade.php | 83 ++++++++++ resources/views/layout/sidebar.blade.php | 2 +- .../views/penilaian/input-nilai.blade.php | 43 ++++- .../views/subkriteria/subkriteria.blade.php | 2 +- routes/web.php | 14 +- 11 files changed, 337 insertions(+), 72 deletions(-) create mode 100644 app/Http/Controllers/PerhitunganController.php delete mode 100644 app/Http/Controllers/SiswaController.php diff --git a/app/Http/Controllers/CriteriaController.php b/app/Http/Controllers/CriteriaController.php index 397779f..6c7f3d1 100644 --- a/app/Http/Controllers/CriteriaController.php +++ b/app/Http/Controllers/CriteriaController.php @@ -12,32 +12,32 @@ class CriteriaController extends Controller * Display a listing of the resource. */ - public function calculateBobotKriteria() - { - $criterias = Criteria::all(); + // public function calculateBobotKriteria() + // { + // $criterias = Criteria::all(); - $totalKriteria = count($criterias); + // $totalKriteria = count($criterias); - $bobotKriteria = []; + // $bobotKriteria = []; - foreach ($criterias as $key => $criteria) { - $sum = 0; - // Iterasi untuk setiap nilai prioritas pada kriteria - for ($i = $key; $i < $totalKriteria; $i++) { - // Hitung nilai SMARTER - $sum += 1 / ($i + 1); - } - // Hitung bobot kriteria menggunakan rumus SMARTER ROC - $bobot = $sum / $totalKriteria; + // foreach ($criterias as $key => $criteria) { + // $sum = 0; + // // Iterasi untuk setiap nilai prioritas pada kriteria + // for ($i = $key; $i < $totalKriteria; $i++) { + // // Hitung nilai SMARTER + // $sum += 1 / ($i + 1); + // } + // // Hitung bobot kriteria menggunakan rumus SMARTER ROC + // $bobot = $sum / $totalKriteria; - $bobotKriteria[$criteria->nama] = $bobot; + // $bobotKriteria[$criteria->nama] = $bobot; - $criteria->update(['bobot' => $bobot]); - $criteria->save(); - } + // $criteria->update(['bobot' => $bobot]); + // $criteria->save(); + // } - return redirect()->route('kriteria.index')->with('success', 'Bobot kriteria berhasil dihitung dan disimpan.'); - } + // return redirect()->route('kriteria.index')->with('success', 'Bobot kriteria berhasil dihitung dan disimpan.'); + // } public function index() { diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 5e9d900..7c8b725 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -17,7 +17,11 @@ public function index() $jumlahEkstra = Extracuricullar::count(); $jumlahKriteria = Criteria::count(); $jumlahSubKriteria = SubCriteria::count(); - return view('dashboard.index', compact('jumlahEkstra','jumlahKriteria','jumlahSubKriteria')); + $criterias = Criteria::all(); + $extracuricullars = Extracuricullar ::all(); + $subcriterias = Subcriteria::all(); + + return view('dashboard.index', compact('jumlahEkstra','jumlahKriteria','jumlahSubKriteria', 'criterias', 'subcriterias', 'extracuricullars')); } /** diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index b707314..b7e6c9c 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -15,11 +15,11 @@ class PenilaianController extends Controller */ public function index() { - $criterias = Criteria::all(); - $extracuricullars = Extracuricullar ::all(); - $subcriterias = Subcriteria::all(); + // $criterias = Criteria::all(); + // $extracuricullars = Extracuricullar ::all(); + // $subcriterias = Subcriteria::all(); - return view('penilaian.input-nilai', compact('criterias','extracuricullars','subcriterias')); + // return view('penilaian.input-nilai', compact('criterias','extracuricullars','subcriterias')); } /** diff --git a/app/Http/Controllers/PerhitunganController.php b/app/Http/Controllers/PerhitunganController.php new file mode 100644 index 0000000..8352082 --- /dev/null +++ b/app/Http/Controllers/PerhitunganController.php @@ -0,0 +1,148 @@ + $criteria) { + $sum = 0; + // Iterasi untuk setiap nilai prioritas pada kriteria + for ($i = $key; $i < $totalKriteria; $i++) { + // Hitung nilai SMARTER + $sum += 1 / ($i + 1); + } + // Hitung bobot kriteria menggunakan rumus SMARTER ROC + $bobot = $sum / $totalKriteria; + + $bobotKriteria[$criteria->nama] = $bobot; + + $criteria->update(['bobot' => $bobot]); + $criteria->save(); + } + + return redirect()->route('kriteria.index')->with('success', 'Bobot kriteria berhasil dihitung dan disimpan.'); + } + + public function calculateBobotSubKriteria() + { + $criterias = Criteria::all(); + + foreach ($criterias as $criteria) { + // Ambil semua sub-kriteria untuk kriteria ini + $subcriterias = SubCriteria::where('criteria_id', $criteria->id)->get(); + + $totalSubKriteria = $subcriterias->count(); + + $bobotSubKriteria = []; + + // Hitung bobot untuk setiap sub-kriteria + foreach ($subcriterias as $key => $subcriteria) { + $sum = 0; + // Iterasi untuk setiap nilai prioritas pada kriteria + for ($i = $key; $i < $totalSubKriteria; $i++) { + // Hitung nilai SMARTER + $sum += 1 / ($i + 1); + } + // Hitung bobot kriteria menggunakan rumus SMARTER ROC + $bobot = $sum / $totalSubKriteria; + + $bobotSubKriteria[$subcriteria->nama] = $bobot; + + $subcriteria->update(['bobot' => $bobot]); + $subcriteria->save(); + } + } + + return redirect()->route('subkriteria.index')->with('success', 'Bobot sub kriteria berhasil dihitung dan disimpan.'); + } + + public function penilaian() + { + $criterias = Criteria::all(); + $extracuricullars = Extracuricullar ::all(); + $subcriterias = Subcriteria::all(); + + return view('penilaian.input-nilai', compact('criterias','extracuricullars','subcriterias')); + } + + public function transformasiNilai(Request $request) + { + $criterias = Criteria::all(); + $subcriterias = SubCriteria::all(); + $extracuricullars = Extracuricullar::all(); + + return view('perhitungan.transformasi-nilai'); + } + + public function index() + { + // + } + + /** + * Show the form for creating a new resource. + */ + public function create() + { + // + } + + /** + * Store a newly created resource in storage. + */ + public function store(Request $request) + { + // + } + + /** + * Display the specified resource. + */ + public function show(string $id) + { + // + } + + /** + * Show the form for editing the specified resource. + */ + public function edit(string $id) + { + // + } + + /** + * Update the specified resource in storage. + */ + public function update(Request $request, string $id) + { + // + } + + /** + * Remove the specified resource from storage. + */ + public function destroy(string $id) + { + // + } +} diff --git a/app/Http/Controllers/SiswaController.php b/app/Http/Controllers/SiswaController.php deleted file mode 100644 index 7eabb62..0000000 --- a/app/Http/Controllers/SiswaController.php +++ /dev/null @@ -1,13 +0,0 @@ -id)->get(); + // foreach ($criterias as $criteria) { + // // Ambil semua sub-kriteria untuk kriteria ini + // $subcriterias = SubCriteria::where('criteria_id', $criteria->id)->get(); - $totalSubKriteria = $subcriterias->count(); + // $totalSubKriteria = $subcriterias->count(); - $bobotSubKriteria = []; + // $bobotSubKriteria = []; - // Hitung bobot untuk setiap sub-kriteria - foreach ($subcriterias as $key => $subcriteria) { - $sum = 0; - // Iterasi untuk setiap nilai prioritas pada kriteria - for ($i = $key; $i < $totalSubKriteria; $i++) { - // Hitung nilai SMARTER - $sum += 1 / ($i + 1); - } - // Hitung bobot kriteria menggunakan rumus SMARTER ROC - $bobot = $sum / $totalSubKriteria; + // // Hitung bobot untuk setiap sub-kriteria + // foreach ($subcriterias as $key => $subcriteria) { + // $sum = 0; + // // Iterasi untuk setiap nilai prioritas pada kriteria + // for ($i = $key; $i < $totalSubKriteria; $i++) { + // // Hitung nilai SMARTER + // $sum += 1 / ($i + 1); + // } + // // Hitung bobot kriteria menggunakan rumus SMARTER ROC + // $bobot = $sum / $totalSubKriteria; - $bobotSubKriteria[$subcriteria->nama] = $bobot; + // $bobotSubKriteria[$subcriteria->nama] = $bobot; - $subcriteria->update(['bobot' => $bobot]); - $subcriteria->save(); - } - } + // $subcriteria->update(['bobot' => $bobot]); + // $subcriteria->save(); + // } + // } - return redirect()->route('subkriteria.index')->with('success', 'Bobot sub kriteria berhasil dihitung dan disimpan.'); - } + // return redirect()->route('subkriteria.index')->with('success', 'Bobot sub kriteria berhasil dihitung dan disimpan.'); + // } public function index() diff --git a/resources/views/dashboard/index.blade.php b/resources/views/dashboard/index.blade.php index efa640d..3d1b8b7 100644 --- a/resources/views/dashboard/index.blade.php +++ b/resources/views/dashboard/index.blade.php @@ -74,6 +74,89 @@ +
+
+
+
+ +
+ +
+
+
+ + + + + + + + + + @forelse ($extracuricullars as $extracuricullar) + + + + + + @empty + + + + @endforelse + +
NoNama EkstrakurikulerKategori
{{ $loop->iteration }}{{ $extracuricullar->nama }}{{ $extracuricullar->kategori }}
Tidak ada data.
+
+
+
+ + +
+
+
+ + + + + + + + + + + + @forelse ($subcriterias as $subcriteria) + + + + + + + + @empty + + + + @endforelse + +
NoKriteriaSub KriteriaDeskripsiPrioritas
{{ $loop->iteration }}{{ $subcriteria->criteria->nama }}{{ $subcriteria->nama }}{{ $subcriteria->deskripsi }}{{ $subcriteria->prioritas }}
Tidak ada data.
+
+
+
+
+
+
+
+
{{--
diff --git a/resources/views/layout/sidebar.blade.php b/resources/views/layout/sidebar.blade.php index 9e03980..0f8fc0f 100644 --- a/resources/views/layout/sidebar.blade.php +++ b/resources/views/layout/sidebar.blade.php @@ -37,7 +37,7 @@ Penilaian
  • diff --git a/resources/views/penilaian/input-nilai.blade.php b/resources/views/penilaian/input-nilai.blade.php index c8e1880..e5c30a1 100644 --- a/resources/views/penilaian/input-nilai.blade.php +++ b/resources/views/penilaian/input-nilai.blade.php @@ -57,7 +57,7 @@ @@ -71,7 +71,7 @@
    - +
    • @@ -83,4 +83,43 @@
    + {{-- + --}} @endsection diff --git a/resources/views/subkriteria/subkriteria.blade.php b/resources/views/subkriteria/subkriteria.blade.php index 17cbe36..d713755 100644 --- a/resources/views/subkriteria/subkriteria.blade.php +++ b/resources/views/subkriteria/subkriteria.blade.php @@ -307,7 +307,7 @@ class="badge btn-danger" data-toggle="modal"
    -

    Apakah Anda yakin ingin menghapus data sub kriteria {{ $subcriteria->nama }} ini?

    +

    Apakah Anda yakin ingin menghapus data sub kriteria {{ $subcriteria->nama }} dari kriteria {{ $criteria->nama }} ini?

    diff --git a/routes/web.php b/routes/web.php index 7efcfe0..5461a74 100644 --- a/routes/web.php +++ b/routes/web.php @@ -5,12 +5,11 @@ use Illuminate\Support\Facades\Route; use App\Http\Controllers\AuthController; use App\Http\Controllers\UserController; -use App\Http\Controllers\SiswaController; +use App\Http\Controllers\PerhitunganController; use App\Http\Controllers\CriteriaController; use App\Http\Controllers\DataUserController; use App\Http\Controllers\DashboardController; use App\Http\Controllers\SubCriteriaController; -use App\Http\Controllers\WakilKepalaController; use App\Http\Controllers\ExtracurricularController; use App\Http\Controllers\PenilaianController; use App\Http\Controllers\TransformasiNilaiController; @@ -106,14 +105,19 @@ Route::resource('ekstrakurikuler', ExtracurricularController::class); Route::resource('kriteria', CriteriaController::class); -Route::post('/kriteria/calculate', [CriteriaController::class, 'calculateBobotKriteria'])->name('kriteria.calculate'); +// Route::post('/kriteria/calculate', [CriteriaController::class, 'calculateBobotKriteria'])->name('kriteria.calculate'); Route::resource('subkriteria', SubCriteriaController::class); -Route::post('/subkriteria/calculate', [SubCriteriaController::class, 'calculateBobotSubKriteria'])->name('subkriteria.calculate'); +// Route::post('/subkriteria/calculate', [SubCriteriaController::class, 'calculateBobotSubKriteria'])->name('subkriteria.calculate'); Route::resource('user', DataUserController::class); -Route::resource('input-nilai', PenilaianController::class); +Route::post('/kriteria/calculate', [PerhitunganController::class, 'calculateBobotKriteria'])->name('kriteria.calculate'); +Route::post('/subkriteria/calculate', [PerhitunganController::class, 'calculateBobotSubKriteria'])->name('subkriteria.calculate'); +Route::get('input-nilai', [PerhitunganController::class, 'penilaian'])->name(('penilaian.input-nilai')); +Route::post('/perhitungan/transformasiNilai', [PerhitunganController::class, 'transformasiNilai'])->name(('perhitungan.transformasiNilai')); + +// Route::resource('input-nilai', PenilaianController::class); Route::resource('transformasi-nilai', TransformasiNilaiController::class);