From d1e9fe03d65991a47123f1ff9a70e80c420ac179 Mon Sep 17 00:00:00 2001 From: Dwi Swandhana Date: Sun, 19 Jul 2026 21:37:35 +0700 Subject: [PATCH] update --- .../views/dokter/mikro-expertise.blade.php | 1 + .../views/dokter/ppdsdeveloper.blade.php | 44 ++++++++++++------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/htdocs/resources/views/dokter/mikro-expertise.blade.php b/htdocs/resources/views/dokter/mikro-expertise.blade.php index 3afb217e..ce91d293 100644 --- a/htdocs/resources/views/dokter/mikro-expertise.blade.php +++ b/htdocs/resources/views/dokter/mikro-expertise.blade.php @@ -24,6 +24,7 @@ var maxAutoOpenAttempts = 12; var hasOpenedTarget = false; var hasRequestedFilteredLoad = false; + window.mikroExpertiseDirectOpen = shouldOpenOnLoad; console.log('[mikro-expertise] init', { focusPeriksaId: focusPeriksaId, diff --git a/htdocs/resources/views/dokter/ppdsdeveloper.blade.php b/htdocs/resources/views/dokter/ppdsdeveloper.blade.php index c3decdf7..e0c29c94 100644 --- a/htdocs/resources/views/dokter/ppdsdeveloper.blade.php +++ b/htdocs/resources/views/dokter/ppdsdeveloper.blade.php @@ -4992,22 +4992,32 @@ currentNofotoText: document.getElementById('nofoto') ? document.getElementById('nofoto').textContent : null, currentPeriksaId: document.getElementById('periksa_id') ? document.getElementById('periksa_id').value : null }); - dlp = dlp || document.getElementById('dlp').value; - nofoto = nofoto || document.getElementById('nofoto').value || document.getElementById('nofoto').textContent; - idne = idne || document.getElementById('periksa_id').value; - console.log('[openlamanekpertise] resolved values', { - dlp: dlp, - nofoto: nofoto, + dlp = dlp || document.getElementById('dlp').value; + nofoto = nofoto || document.getElementById('nofoto').value || document.getElementById('nofoto').textContent; + idne = idne || document.getElementById('periksa_id').value; + if ((dlp == '' || dlp == null) && window.mikroExpertiseDirectOpen) { + dlp = 'Kultur'; + console.warn('[openlamanekpertise] dlp empty, using direct-open fallback', { + fallbackDlp: dlp, + nofoto: nofoto, + idne: idne + }); + } + console.log('[openlamanekpertise] resolved values', { + dlp: dlp, + nofoto: nofoto, idne: idne }); $('#dlp').val(dlp); $('#nofoto').val(nofoto).html(nofoto); - $('#periksa_id').val(idne); - $('#template_jenis').val(dlp); - $('#divawal').hide(); - $('#divtemplate').hide(); - $('.templatejawaban').hide(); - $('#divpreview').hide(); + $('#periksa_id').val(idne); + $('#template_jenis').val(dlp); + $('#divreadonly').hide(); + $('#divawal').hide(); + $('#divperiksa').show(); + $('#divtemplate').hide(); + $('.templatejawaban').hide(); + $('#divpreview').hide(); $('#masterdiv').show(); $('.setelahdipilihtemplate').show(); $('#id_bakterihitungkolselect').show(); @@ -5776,16 +5786,18 @@ }) } else if (statuse == 'Selesai' || statuse == 'Arsip') { $('#divreadonly').hide(); - $('#divperiksa').show(); + $('#divpreview').hide(); $('#divawal').hide(); + $('#divperiksa').show(); $('#btnsavedraft').hide(); $('#divadendumketerangan').show(); - openlamanekpertise(dataRecord.dlp, dataRecord.nofoto, dataRecord.id); + openlamanekpertise(dataRecord.dlp, dataRecord.nofoto, dataRecord.id); } else { $('#divreadonly').hide(); - $('#divperiksa').show(); + $('#divpreview').hide(); $('#divawal').hide(); - if (dlp == '' || dlp == null){ + $('#divperiksa').show(); + if ((dlp == '' || dlp == null) && !window.mikroExpertiseDirectOpen){ $('#divtemplate').show(); $('.templatejawaban').hide(); $('.setelahdipilihtemplate').hide();