diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 1d8fdbf..d27cc40 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -448,7 +448,7 @@ class AdminController extends Controller if(count($soal_json['options']) > 0){ foreach ($soal_json['options'] as $v) { - if($v != 'Lainnya'){ + if($v != 'TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan'){ $row = (clone $result)->where('d.jawaban', $v) ->first(); @@ -501,7 +501,7 @@ class AdminController extends Controller // foreach ($get_data as $val) { if($get_data){ $data_per_jawaban = [ - 'name' => 'Lainnya', + 'name' => 'TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan', 'percent' => (float) $get_data->percent, 'value' => $get_data->total_jawaban, 'total' => $get_data->total_semua, @@ -509,7 +509,7 @@ class AdminController extends Controller ]; } else { $data_per_jawaban = [ - 'name' => 'Lainnya', + 'name' => 'TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan', 'percent' => 0, 'value' => 0, 'jawaban' => '-' @@ -628,7 +628,7 @@ class AdminController extends Controller if(count($soal_json['options']) > 0){ foreach ($soal_json['options'] as $v) { - if($v != 'Lainnya'){ + if($v != 'TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan'){ $row = (clone $result)->where('d.jawaban', $v) ->first(); @@ -680,7 +680,7 @@ class AdminController extends Controller // foreach ($get_data as $val) { if($get_data){ $data_per_jawaban = [ - 'name' => 'Lainnya', + 'name' => 'TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan', 'percent' => (float) $get_data->percent, 'value' => $get_data->total_jawaban, 'total' => $get_data->total_semua, @@ -688,7 +688,7 @@ class AdminController extends Controller ]; } else { $data_per_jawaban = [ - 'name' => 'Lainnya', + 'name' => 'TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan', 'percent' => 0, 'value' => 0, 'jawaban' => '-' @@ -743,17 +743,17 @@ class AdminController extends Controller $data[$v['name']] = '-'; } - if($v['name'] == 'Lainnya') { - $data['jawaban_lainnya'] = $v['jawaban']; - } + // if($v['name'] == 'TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan') { + // $data['jawaban_lainnya'] = $v['jawaban']; + // } } $data['total'] = $total; 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_unshift($data_setuju_report, $data_setuju_header); - + $data_other_report = []; $data_other_header = ['No', 'Soal']; foreach ($data_option_other as $key => $value) { @@ -790,14 +790,14 @@ class AdminController extends Controller $data_selalu[$v['name']] = '-'; } - if($v['name'] == 'Lainnya') { - $data_selalu['jawaban_lainnya'] = $v['jawaban']; - } + // if($v['name'] == 'TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan') { + // $data_selalu['jawaban_lainnya'] = $v['jawaban']; + // } } $data_selalu['total'] = $total; 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_unshift($data_selalu_report, $data_selalu_header); diff --git a/app/Http/Controllers/SoalController.php b/app/Http/Controllers/SoalController.php index 30fa65e..531a680 100644 --- a/app/Http/Controllers/SoalController.php +++ b/app/Http/Controllers/SoalController.php @@ -248,7 +248,7 @@ class SoalController extends Controller $array = json_decode($json, true); session(['pegawai' => $array]); - return redirect('/'); + return redirect('/?start=1&soal_id=1'); } protected function generatePrefillJawaban($detailSoal, $pegawai): array diff --git a/resources/views/admin/dashboard_analisis.blade.php b/resources/views/admin/dashboard_analisis.blade.php index cab1994..9ab4332 100644 --- a/resources/views/admin/dashboard_analisis.blade.php +++ b/resources/views/admin/dashboard_analisis.blade.php @@ -95,8 +95,7 @@