Fix mikro expertise auto-open and early warning target logic

This commit is contained in:
Dwi Swandhana
2026-05-09 05:47:10 +07:00
parent 4d942523d1
commit 49e94c3fb5
4 changed files with 62 additions and 22 deletions

No files matched your search

@@ -4,9 +4,11 @@
<script type="text/javascript">
$(function () {
var focusPeriksaId = @json((string) ($focusPeriksaId ?? ''));
var focusNoFoto = @json((string) ($focusNoFoto ?? ''));
var returnUrl = @json($expertiseReturnUrl ?? url('/'));
var shouldOpenOnLoad = @json((bool) ($openExpertiseOnLoad ?? false));
var initialListMode = @json($initialListMode ?? 'searchbydate');
var initialSearchValue = @json($initialSearchValue ?? '');
var initialStartDate = @json($initialStartDate ?? '');
var initialEndDate = @json($initialEndDate ?? '');
var autoOpenAttempts = 0;
@@ -28,7 +30,7 @@
$('#master_set01').val(initialListMode);
}
if ($('#valcari').length) {
$('#valcari').val('');
$('#valcari').val(initialSearchValue);
}
}
@@ -83,10 +85,12 @@
var rows = $('#gridpemeriksaan').jqxGrid('getrows') || [];
var matchedRow = null;
var matchedRowIndex = -1;
for (var i = 0; i < rows.length; i++) {
if (String(rows[i].id) === focusPeriksaId) {
if (String(rows[i].id) === focusPeriksaId || (focusNoFoto !== '' && String(rows[i].nofoto) === focusNoFoto)) {
matchedRow = rows[i];
matchedRowIndex = i;
break;
}
}
@@ -99,12 +103,12 @@
return;
}
var boundIndex = matchedRow.boundindex;
$('#gridpemeriksaan').jqxGrid('selectrow', boundIndex);
$('#gridpemeriksaan').jqxGrid('ensurerowvisible', boundIndex);
var triggerRowIndex = matchedRowIndex >= 0 ? matchedRowIndex : matchedRow.boundindex;
$('#gridpemeriksaan').jqxGrid('selectrow', triggerRowIndex);
$('#gridpemeriksaan').jqxGrid('ensurerowvisible', triggerRowIndex);
setTimeout(function () {
if (triggerExpertiseButton(boundIndex)) {
if (triggerExpertiseButton(triggerRowIndex)) {
hasOpenedTarget = true;
return;
}