From f81d245aa1e6cae1b8e8bd5769f14d66eb356329 Mon Sep 17 00:00:00 2001 From: Muhammad Thoriq Date: Mon, 8 Dec 2025 08:08:28 +0700 Subject: [PATCH 1/6] redirect dan fix jawaban lainnya --- app/Http/Controllers/AdminController.php | 30 +++++++++---------- app/Http/Controllers/SoalController.php | 2 +- .../views/admin/dashboard_analisis.blade.php | 12 ++------ 3 files changed, 18 insertions(+), 26 deletions(-) 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 @@ Netral Setuju Sangat Setuju - Lainnya - Jawaban Lainnya + TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan Total Responden `; @@ -116,9 +115,6 @@ } else { stringTable += `-`; } - if(e.name == 'Lainnya') { - stringTable += `${e.jawaban}`; - } }); stringTable += `${total}`; stringTable += ``; @@ -176,8 +172,7 @@ Kadang-kadang Sering Selalu - Lainnya - Jawaban Lainnya + TIDAK BERLAKU/TIDAK TAHU, Sebutkan alasan Total Responden `; @@ -193,9 +188,6 @@ } else { stringTable += `-`; } - if(e.name == 'Lainnya') { - stringTable += `${e.jawaban}`; - } }); stringTable += `${data.total}`; stringTable += ``; From 08253e1b22c072305baeab34b760a84d83e3815b Mon Sep 17 00:00:00 2001 From: Muhammad Thoriq Date: Mon, 8 Dec 2025 08:50:42 +0700 Subject: [PATCH 2/6] set env prod --- .env.prod | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 .env.prod diff --git a/.env.prod b/.env.prod new file mode 100644 index 0000000..86edcbb --- /dev/null +++ b/.env.prod @@ -0,0 +1,87 @@ +APP_NAME=Laravel +APP_ENV=local +APP_KEY=base64:ysLF8NLAMjYCH7ikOgmCRATlMb6YT+8oFpAz0aJampI= +APP_DEBUG=true +APP_TIMEZONE=UTC +APP_URL=http://localhost + +APP_LOCALE=en +APP_FALLBACK_LOCALE=en +APP_FAKER_LOCALE=en_US + +APP_MAINTENANCE_DRIVER=file +# APP_MAINTENANCE_STORE=database + +PHP_CLI_SERVER_WORKERS=4 + +BCRYPT_ROUNDS=12 + +LOG_CHANNEL=stack +LOG_STACK=single +LOG_DEPRECATIONS_CHANNEL=null +LOG_LEVEL=debug + +DB_CONNECTION=pgsql +DB_HOST=172.16.88.22 +DB_PORT=5432 +DB_DATABASE=lms_mutu +DB_USERNAME=simrs +DB_PASSWORD=@S1mrs.3205@ + +DB_CONNECTION_LMS_MUTU= pgsql +DB_HOST_LMS_MUTU = 172.16.88.22 +DB_PORT_LMS_MUTU = 5432 +DB_DATABASE_LMS_MUTU = lms_mutu +DB_USERNAME_LMS_MUTU = simrs +DB_PASSWORD_LMS_MUTU = @S1mrs.3205@ + +SESSION_DRIVER=file +SESSION_LIFETIME=120 +SESSION_ENCRYPT=false +SESSION_PATH=/ +SESSION_DOMAIN=null + +BROADCAST_CONNECTION=log +FILESYSTEM_DISK=local +QUEUE_CONNECTION=database + +CACHE_STORE=database +CACHE_PREFIX= + +MEMCACHED_HOST=127.0.0.1 + +REDIS_CLIENT=phpredis +REDIS_HOST=127.0.0.1 +REDIS_PASSWORD=null +REDIS_PORT=6379 + +MAIL_MAILER=log +MAIL_SCHEME=null +MAIL_HOST=127.0.0.1 +MAIL_PORT=2525 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_FROM_ADDRESS="hello@example.com" +MAIL_FROM_NAME="${APP_NAME}" + +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= +AWS_DEFAULT_REGION=us-east-1 +AWS_BUCKET= +AWS_USE_PATH_STYLE_ENDPOINT=false + +VITE_APP_NAME="${APP_NAME}" + +DB_CONNECTION_SMARTV1 = pgsql +DB_HOST_SMARTV1 = psql1.rsabhk.lan +DB_PORT_SMARTV1 = 5432 +DB_DATABASE_SMARTV1 = rsab_hk_production +DB_USERNAME_SMARTV1 = postgres +DB_PASSWORD_SMARTV1 = postgres + +# DB_CONNECTION_SMARTV1 = pgsql +# DB_HOST_SMARTV1 = 192.168.12.3 +# DB_PORT_SMARTV1 = 5432 +# DB_DATABASE_SMARTV1 = rsab_hk_25_01_14 +# DB_USERNAME_SMARTV1 = postgres +# DB_PASSWORD_SMARTV1 = postgres \ No newline at end of file From 68a483cb0df13a37351e77385e5c57ca10385772 Mon Sep 17 00:00:00 2001 From: Muhammad Thoriq Date: Mon, 8 Dec 2025 10:31:57 +0700 Subject: [PATCH 3/6] set cache file --- config/cache.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cache.php b/config/cache.php index 925f7d2..d13a631 100644 --- a/config/cache.php +++ b/config/cache.php @@ -15,7 +15,7 @@ return [ | */ - 'default' => env('CACHE_STORE', 'database'), + 'default' => env('CACHE_STORE', 'file'), /* |-------------------------------------------------------------------------- From a29e2964526d275c0b4bc1de44bf71a10d47c362 Mon Sep 17 00:00:00 2001 From: Muhammad Thoriq Date: Mon, 8 Dec 2025 11:29:23 +0700 Subject: [PATCH 4/6] fix load asset --- .env.prod | 2 + resources/views/layouts/template.blade.php | 48 ++++++++--------- .../views/layouts/template_admin.blade.php | 52 +++++++++---------- .../views/layouts/template_auth.blade.php | 38 +++++++------- 4 files changed, 71 insertions(+), 69 deletions(-) diff --git a/.env.prod b/.env.prod index 86edcbb..1b25fbd 100644 --- a/.env.prod +++ b/.env.prod @@ -79,6 +79,8 @@ DB_DATABASE_SMARTV1 = rsab_hk_production DB_USERNAME_SMARTV1 = postgres DB_PASSWORD_SMARTV1 = postgres +APP_ASSET_URL=https://survei-mutu.rsabhk.co.id/ + # DB_CONNECTION_SMARTV1 = pgsql # DB_HOST_SMARTV1 = 192.168.12.3 # DB_PORT_SMARTV1 = 5432 diff --git a/resources/views/layouts/template.blade.php b/resources/views/layouts/template.blade.php index deb9f1f..0f7116d 100644 --- a/resources/views/layouts/template.blade.php +++ b/resources/views/layouts/template.blade.php @@ -8,7 +8,7 @@ @yield('title', 'Survey Mutu RSAB Harapan Kita') - + @@ -18,29 +18,29 @@ rel="stylesheet"> - - + + - - + + - - - - - - + + + + + + - + - + @yield('custom_css') @@ -49,7 +49,7 @@ @@ -59,20 +59,20 @@ - - - - - - - - + + + + + + + + - + - + + - +