Fix mikro expertise auto-open and early warning target logic
This commit is contained in:
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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user