diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 449c7ae..d831718 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -266,7 +266,8 @@ class AdminController extends Controller '=', 'lms_mutu_jawaban.id' ) - ->where('lms_mutu_soal_detail_id', $value['id']); + ->where('lms_mutu_soal_detail_id', $value['id']) + ->where('jawaban', '!=', null); if($request->unit_kerja) { $sub->whereIn('lms_mutu_jawaban.unit', $request->unit_kerja); } @@ -290,6 +291,7 @@ class AdminController extends Controller ROUND((COUNT(*)::numeric / t.total_semua::numeric) * 100) AS percent' ) ->where('d.lms_mutu_soal_detail_id', $value['id']) + ->where('d.jawaban', '!=', null) ->groupBy('d.lms_mutu_soal_detail_id', 'd.jawaban', 't.total_semua'); if($request->unit_kerja) { $result->whereIn('lms_mutu_jawaban.unit', $request->unit_kerja); @@ -342,6 +344,7 @@ class AdminController extends Controller ROUND((COUNT(*)::numeric / t.total_semua::numeric) * 100) AS percent" ) ->where('d.lms_mutu_soal_detail_id', $value['id']) + ->where('jawaban', '!=', null) ->whereNotIn('d.jawaban', $soal_json['options']) ->groupBy('d.lms_mutu_soal_detail_id', 't.total_semua')->first(); diff --git a/resources/views/admin/dashboard_analisis.blade.php b/resources/views/admin/dashboard_analisis.blade.php index 20d32bd..cab1994 100644 --- a/resources/views/admin/dashboard_analisis.blade.php +++ b/resources/views/admin/dashboard_analisis.blade.php @@ -102,11 +102,15 @@ `; stringTable += ''; data.option_setuju.forEach((element, index) => { + let total = 0; stringTable += ` ${element.no_soal} ${element.soal}`; element.jawaban.forEach(e => { + if(e?.total > 0) { + total = e?.total; + } if(e.percent > 0){ stringTable += `${e.percent}%/${e.value} Orang`; } else { @@ -116,7 +120,7 @@ stringTable += `${e.jawaban}`; } }); - stringTable += `${data.total}`; + stringTable += `${total}`; stringTable += ``; }); stringTable += '';