fix total

This commit is contained in:
Muhammad Thoriq 2025-12-04 15:00:56 +07:00
parent fe2b57ce37
commit 9c3cea2338
2 changed files with 9 additions and 2 deletions

View File

@ -266,7 +266,8 @@ class AdminController extends Controller
'=', '=',
'lms_mutu_jawaban.id' '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) { if($request->unit_kerja) {
$sub->whereIn('lms_mutu_jawaban.unit', $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' ROUND((COUNT(*)::numeric / t.total_semua::numeric) * 100) AS percent'
) )
->where('d.lms_mutu_soal_detail_id', $value['id']) ->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'); ->groupBy('d.lms_mutu_soal_detail_id', 'd.jawaban', 't.total_semua');
if($request->unit_kerja) { if($request->unit_kerja) {
$result->whereIn('lms_mutu_jawaban.unit', $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" ROUND((COUNT(*)::numeric / t.total_semua::numeric) * 100) AS percent"
) )
->where('d.lms_mutu_soal_detail_id', $value['id']) ->where('d.lms_mutu_soal_detail_id', $value['id'])
->where('jawaban', '!=', null)
->whereNotIn('d.jawaban', $soal_json['options']) ->whereNotIn('d.jawaban', $soal_json['options'])
->groupBy('d.lms_mutu_soal_detail_id', 't.total_semua')->first(); ->groupBy('d.lms_mutu_soal_detail_id', 't.total_semua')->first();

View File

@ -102,11 +102,15 @@
</thead>`; </thead>`;
stringTable += '<tbody>'; stringTable += '<tbody>';
data.option_setuju.forEach((element, index) => { data.option_setuju.forEach((element, index) => {
let total = 0;
stringTable += ` stringTable += `
<tr> <tr>
<td>${element.no_soal}</td> <td>${element.no_soal}</td>
<td>${element.soal}</td>`; <td>${element.soal}</td>`;
element.jawaban.forEach(e => { element.jawaban.forEach(e => {
if(e?.total > 0) {
total = e?.total;
}
if(e.percent > 0){ if(e.percent > 0){
stringTable += `<td class="fw-bold">${e.percent}%/${e.value} Orang</td>`; stringTable += `<td class="fw-bold">${e.percent}%/${e.value} Orang</td>`;
} else { } else {
@ -116,7 +120,7 @@
stringTable += `<td class="fw-bold">${e.jawaban}</td>`; stringTable += `<td class="fw-bold">${e.jawaban}</td>`;
} }
}); });
stringTable += `<td class="">${data.total}</td>`; stringTable += `<td class="">${total}</td>`;
stringTable += `</tr>`; stringTable += `</tr>`;
}); });
stringTable += '</tbody>'; stringTable += '</tbody>';