From 707e2cb841ccfb71065a13d04aa43f1e34b1ec7a Mon Sep 17 00:00:00 2001 From: Dwi Swandhana Date: Mon, 20 Jul 2026 11:25:33 +0700 Subject: [PATCH] update --- .../app/Http/Controllers/DokterController.php | 18 +- htdocs/resources/views/dokter/ppds.blade.php | 155 +++++++++--------- 2 files changed, 89 insertions(+), 84 deletions(-) diff --git a/htdocs/app/Http/Controllers/DokterController.php b/htdocs/app/Http/Controllers/DokterController.php index fbe0811b..d4e13bfe 100644 --- a/htdocs/app/Http/Controllers/DokterController.php +++ b/htdocs/app/Http/Controllers/DokterController.php @@ -838,19 +838,19 @@ class DokterController extends Controller return null; } - if ($normalized === 'Penerimaan Sampel') { + if ($normalized === 'penerimaan sampel') { return 1; } - if (in_array($normalized, ['Pemeriksaan awal', 'Pemeriksaan Sampel', 'Proses Analisis Sampel'], true)) { + if (in_array($normalized, ['pemeriksaan awal', 'pemeriksaan sampel', 'proses analisis sampel'], true)) { return 2; } - if (str_starts_with($normalized, 'Data BD di Terima')) { + if (str_starts_with($normalized, 'data bd di terima')) { return 3; } - if ($normalized === 'Pewarnaan Langsung') { + if ($normalized === 'pewarnaan langsung') { return 4; } @@ -858,23 +858,23 @@ class DokterController extends Controller return 5; } - if (str_starts_with($normalized, 'Otor Maldi (Un Verified)')) { + if (str_starts_with($normalized, 'otor maldi (un verified)')) { return 6; } - if (str_starts_with($normalized, 'Preliminary Results')) { + if (str_starts_with($normalized, 'preliminary results')) { return 7; } - if (str_starts_with($normalized, 'Data Vitek di Terima')) { + if (str_starts_with($normalized, 'data vitek di terima')) { return 8; } - if (str_starts_with($normalized, 'Expertise Saved (Un Verified)')) { + if (str_starts_with($normalized, 'expertise saved (un verified)')) { return 9; } - if (in_array($normalized, ['Expertise', 'Selesai', 'Final Result'], true)) { + if (in_array($normalized, ['expertise', 'selesai', 'final result'], true)) { return 10; } diff --git a/htdocs/resources/views/dokter/ppds.blade.php b/htdocs/resources/views/dokter/ppds.blade.php index ed82ee0d..b4909a51 100644 --- a/htdocs/resources/views/dokter/ppds.blade.php +++ b/htdocs/resources/views/dokter/ppds.blade.php @@ -4972,7 +4972,6 @@ $('#vl_hasildiv2select').show(); $('#vl_hasildiv2teks').hide(); $('input[type="checkbox"]').prop('disabled', false); - console.log('Loading komponen jawaban for DLP: '+dlp+' | No.Foto: '+nofoto+' | ID Periksa: '+idne); var form_data = new FormData(); form_data.append('nofoto', nofoto); form_data.append('ruangan', dlp); @@ -4987,7 +4986,6 @@ success : function (response) { var komponens = response.komponens || JSON.parse(response); komponens.forEach(function(rows) { - console.log(rows.komponen+' | '+rows.isidata); if (rows.komponen === 'lsg_pewarnaanlain') { CKEDITOR.instances['lsg_pewarnaanlain'].setData(rows.isidata); } else if (rows.komponen === 'lsg_ditemukanmorfologi') { @@ -5100,7 +5098,6 @@ console.log(traceText); } }); - console.log('Displaying template for DLP: '+dlp); if (dlp == 'CCI'){ $('#templatecci').show(); } else if (dlp == 'Kultur'){ @@ -5126,7 +5123,6 @@ } else if (dlp == 'PCR COVID'){ $('#templatecovid').show(); } - console.log('Finished loading komponen jawaban for DLP: '+dlp+' | No.Foto: '+nofoto+' | ID Periksa: '+idne); } function openedpage( jQuery ){ var jenis = document.getElementById('master_set01').value; @@ -5757,15 +5753,14 @@ } timer = setInterval(showRemaining, 1000); } - $(function() { - CKEDITOR.env.isCompatible = true; - function ensureCkeditorInstance(id) { - if (document.getElementById(id) && !CKEDITOR.instances[id]) { - CKEDITOR.replace(id); - } - } - - ensureCkeditorInstance('keterangan'); + $(function() { + CKEDITOR.env.isCompatible = true; + function ensureCkeditorInstance(id) { + if (document.getElementById(id) && !CKEDITOR.instances[id]) { + CKEDITOR.replace(id); + } + } + ensureCkeditorInstance('keterangan'); ensureCkeditorInstance('lsg_ditemukanmorfologi'); ensureCkeditorInstance('lsg_pewarnaanlain'); ensureCkeditorInstance('viralload'); @@ -6655,6 +6650,23 @@ var acc_number = document.getElementById('nofoto').value; var nostatus = document.getElementById('nostatus').value; var addendumketerangan = CKEDITOR.instances['addendumketerangan'].getData(); + const checkboxMap = { + inlineCheckbox1: 'TBC SO', + inlineCheckbox2: 'TBC RO', + inlineCheckbox3: 'Anak', + inlineCheckbox4: 'HIV', + inlineCheckbox5: 'DM', + inlineCheckbox6: 'Nanah Lendir', + inlineCheckbox7: 'Bercak darah', + inlineCheckbox8: 'Air liur', + inlineCheckbox9: 'Nanah Lendir', + inlineCheckbox10: 'Bercak darah', + inlineCheckbox11: 'Air liur', + }; + const checkboxValues = {}; + $.each(checkboxMap, function (id, label) { + checkboxValues[id] = $(`#${id}`).is(':checked') ? label : ''; + }); if (id_dokter == 'Pilih' || id_dokter == '' || id_dokter == '0' || id_dokter == null){ swal({ title : 'Stop', @@ -6677,68 +6689,61 @@ }) return false; } else { - const checkboxMap = { - inlineCheckbox1: 'TBC SO', - inlineCheckbox2: 'TBC RO', - inlineCheckbox3: 'Anak', - inlineCheckbox4: 'HIV', - inlineCheckbox5: 'DM', - inlineCheckbox6: 'Nanah Lendir', - inlineCheckbox7: 'Bercak darah', - inlineCheckbox8: 'Air liur', - inlineCheckbox9: 'Nanah Lendir', - inlineCheckbox10: 'Bercak darah', - inlineCheckbox11: 'Air liur', - }; - const checkboxValues = {}; - $.each(checkboxMap, function (id, label) { - checkboxValues[id] = $(`#${id}`).is(':checked') ? label : ''; - }); - var formdata = new FormData($('#kt_form')[0]); - formdata.set('periksa_id', periksa_id); - formdata.set('acc_number', acc_number); - formdata.set('val01', 'verifikasi'); - formdata.set('val10', template_jenis); - formdata.set('keterangan', keterangan); - formdata.set('addendumketerangan', addendumketerangan); - formdata.set('lsg_pewarnaanlain', lsg_pewarnaanlain); - formdata.set('viralload', viralload); - formdata.set('nilai_kritis', $('#nilai_kritis').is(':checked') ? '1' : '0'); - formdata.set('master_mikro', $('#master_lokasi').val()); - formdata.set('_token', '{{ csrf_token() }}'); - $.each(checkboxValues, (key, val) => formdata.set(key, val)); - $.ajax({ - url : '{{ route("exexpertisepacs") }}', - data : formdata, - type : 'POST', - contentType : false, - processData : false, - success: function (data) { - $("#gridpemeriksaan").jqxGrid('updatebounddata','filter'); - $("#gridadendum").jqxGrid('updatebounddata','filter'); - var status = data.status; - var message = data.message; - var warna = data.warna; - var icon = data.icon; - $.toast({ - heading : status, - text : message, - position : 'top-right', - loaderBg : warna, - icon : icon, - hideAfter : 5000, - stack : 1 - }); - //window.location.href = "{{ url('/mikro') }}"; - return false; - }, - error: function (xhr, status, error) { - swal({ - title : 'Stop', - text : xhr.responseText, - type : 'warning', - }) - } + swal({ + title: 'Apakah anda yakin ?', + text: "Perhatian, data ini akan di finalisasi dengan Final Result", + type: 'warning', + showCancelButton: true, + confirmButtonClass: 'btn btn-confirm mt-2', + cancelButtonClass: 'btn btn-cancel ml-2 mt-2', + confirmButtonText: 'Yes' + }).then(function () { + var formdata = new FormData($('#kt_form')[0]); + formdata.set('periksa_id', periksa_id); + formdata.set('acc_number', acc_number); + formdata.set('val01', 'verifikasi'); + formdata.set('val10', template_jenis); + formdata.set('keterangan', keterangan); + formdata.set('addendumketerangan', addendumketerangan); + formdata.set('lsg_pewarnaanlain', lsg_pewarnaanlain); + formdata.set('viralload', viralload); + formdata.set('nilai_kritis', $('#nilai_kritis').is(':checked') ? '1' : '0'); + formdata.set('master_mikro', $('#master_lokasi').val()); + formdata.set('_token', '{{ csrf_token() }}'); + $.each(checkboxValues, (key, val) => formdata.set(key, val)); + $.ajax({ + url : '{{ route("exexpertisepacs") }}', + data : formdata, + type : 'POST', + contentType : false, + processData : false, + success: function (data) { + $("#gridpemeriksaan").jqxGrid('updatebounddata','filter'); + $("#gridadendum").jqxGrid('updatebounddata','filter'); + var status = data.status; + var message = data.message; + var warna = data.warna; + var icon = data.icon; + $.toast({ + heading : status, + text : message, + position : 'top-right', + loaderBg : warna, + icon : icon, + hideAfter : 5000, + stack : 1 + }); + //window.location.href = "{{ url('/mikro') }}"; + return false; + }, + error: function (xhr, status, error) { + swal({ + title : 'Stop', + text : xhr.responseText, + type : 'warning', + }) + } + }); }); } });