redirect dan fix jawaban lainnya

This commit is contained in:
Muhammad Thoriq 2025-12-08 08:08:28 +07:00
parent 8e3a178b4a
commit f81d245aa1
3 changed files with 18 additions and 26 deletions

View File

@ -448,7 +448,7 @@ class AdminController extends Controller
if(count($soal_json['options']) > 0){ if(count($soal_json['options']) > 0){
foreach ($soal_json['options'] as $v) { foreach ($soal_json['options'] as $v) {
if($v != 'Lainnya'){ if($v != 'TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan'){
$row = (clone $result)->where('d.jawaban', $v) $row = (clone $result)->where('d.jawaban', $v)
->first(); ->first();
@ -501,7 +501,7 @@ class AdminController extends Controller
// foreach ($get_data as $val) { // foreach ($get_data as $val) {
if($get_data){ if($get_data){
$data_per_jawaban = [ $data_per_jawaban = [
'name' => 'Lainnya', 'name' => 'TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan',
'percent' => (float) $get_data->percent, 'percent' => (float) $get_data->percent,
'value' => $get_data->total_jawaban, 'value' => $get_data->total_jawaban,
'total' => $get_data->total_semua, 'total' => $get_data->total_semua,
@ -509,7 +509,7 @@ class AdminController extends Controller
]; ];
} else { } else {
$data_per_jawaban = [ $data_per_jawaban = [
'name' => 'Lainnya', 'name' => 'TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan',
'percent' => 0, 'percent' => 0,
'value' => 0, 'value' => 0,
'jawaban' => '-' 'jawaban' => '-'
@ -628,7 +628,7 @@ class AdminController extends Controller
if(count($soal_json['options']) > 0){ if(count($soal_json['options']) > 0){
foreach ($soal_json['options'] as $v) { foreach ($soal_json['options'] as $v) {
if($v != 'Lainnya'){ if($v != 'TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan'){
$row = (clone $result)->where('d.jawaban', $v) $row = (clone $result)->where('d.jawaban', $v)
->first(); ->first();
@ -680,7 +680,7 @@ class AdminController extends Controller
// foreach ($get_data as $val) { // foreach ($get_data as $val) {
if($get_data){ if($get_data){
$data_per_jawaban = [ $data_per_jawaban = [
'name' => 'Lainnya', 'name' => 'TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan',
'percent' => (float) $get_data->percent, 'percent' => (float) $get_data->percent,
'value' => $get_data->total_jawaban, 'value' => $get_data->total_jawaban,
'total' => $get_data->total_semua, 'total' => $get_data->total_semua,
@ -688,7 +688,7 @@ class AdminController extends Controller
]; ];
} else { } else {
$data_per_jawaban = [ $data_per_jawaban = [
'name' => 'Lainnya', 'name' => 'TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan',
'percent' => 0, 'percent' => 0,
'value' => 0, 'value' => 0,
'jawaban' => '-' 'jawaban' => '-'
@ -743,17 +743,17 @@ class AdminController extends Controller
$data[$v['name']] = '-'; $data[$v['name']] = '-';
} }
if($v['name'] == 'Lainnya') { // if($v['name'] == 'TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan') {
$data['jawaban_lainnya'] = $v['jawaban']; // $data['jawaban_lainnya'] = $v['jawaban'];
} // }
} }
$data['total'] = $total; $data['total'] = $total;
array_push($data_setuju_report, $data); array_push($data_setuju_report, $data);
} }
array_push($data_setuju_header, 'Jawaban Lainnya'); // array_push($data_setuju_header, 'Jawaban Lainnya');
array_push($data_setuju_header, 'Total Responden'); array_push($data_setuju_header, 'Total Responden');
array_unshift($data_setuju_report, $data_setuju_header); array_unshift($data_setuju_report, $data_setuju_header);
$data_other_report = []; $data_other_report = [];
$data_other_header = ['No', 'Soal']; $data_other_header = ['No', 'Soal'];
foreach ($data_option_other as $key => $value) { foreach ($data_option_other as $key => $value) {
@ -790,14 +790,14 @@ class AdminController extends Controller
$data_selalu[$v['name']] = '-'; $data_selalu[$v['name']] = '-';
} }
if($v['name'] == 'Lainnya') { // if($v['name'] == 'TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan') {
$data_selalu['jawaban_lainnya'] = $v['jawaban']; // $data_selalu['jawaban_lainnya'] = $v['jawaban'];
} // }
} }
$data_selalu['total'] = $total; $data_selalu['total'] = $total;
array_push($data_selalu_report, $data_selalu); array_push($data_selalu_report, $data_selalu);
} }
array_push($data_selalu_header, 'Jawaban Lainnya'); // array_push($data_selalu_header, 'Jawaban Lainnya');
array_push($data_selalu_header, 'Total Responden'); array_push($data_selalu_header, 'Total Responden');
array_unshift($data_selalu_report, $data_selalu_header); array_unshift($data_selalu_report, $data_selalu_header);

View File

@ -248,7 +248,7 @@ class SoalController extends Controller
$array = json_decode($json, true); $array = json_decode($json, true);
session(['pegawai' => $array]); session(['pegawai' => $array]);
return redirect('/'); return redirect('/?start=1&soal_id=1');
} }
protected function generatePrefillJawaban($detailSoal, $pegawai): array protected function generatePrefillJawaban($detailSoal, $pegawai): array

View File

@ -95,8 +95,7 @@
<th class="text-white">Netral</th> <th class="text-white">Netral</th>
<th class="text-white">Setuju</th> <th class="text-white">Setuju</th>
<th class="text-white">Sangat Setuju</th> <th class="text-white">Sangat Setuju</th>
<th class="text-white">Lainnya</th> <th class="text-white">TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan</th>
<th class="text-white">Jawaban Lainnya</th>
<th class="text-white">Total Responden</th> <th class="text-white">Total Responden</th>
</tr> </tr>
</thead>`; </thead>`;
@ -116,9 +115,6 @@
} else { } else {
stringTable += `<td class="fw-bold">-</td>`; stringTable += `<td class="fw-bold">-</td>`;
} }
if(e.name == 'Lainnya') {
stringTable += `<td class="fw-bold">${e.jawaban}</td>`;
}
}); });
stringTable += `<td class="">${total}</td>`; stringTable += `<td class="">${total}</td>`;
stringTable += `</tr>`; stringTable += `</tr>`;
@ -176,8 +172,7 @@
<th class="text-white">Kadang-kadang</th> <th class="text-white">Kadang-kadang</th>
<th class="text-white">Sering</th> <th class="text-white">Sering</th>
<th class="text-white">Selalu</th> <th class="text-white">Selalu</th>
<th class="text-white">Lainnya</th> <th class="text-white">TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan</th>
<th class="text-white">Jawaban Lainnya</th>
<th class="text-white">Total Responden</th> <th class="text-white">Total Responden</th>
</tr> </tr>
</thead>`; </thead>`;
@ -193,9 +188,6 @@
} else { } else {
stringTable += `<td class="fw-bold">-</td>`; stringTable += `<td class="fw-bold">-</td>`;
} }
if(e.name == 'Lainnya') {
stringTable += `<td class="fw-bold">${e.jawaban}</td>`;
}
}); });
stringTable += `<td class="">${data.total}</td>`; stringTable += `<td class="">${data.total}</td>`;
stringTable += `</tr>`; stringTable += `</tr>`;