dwi_vendor/lis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mikro expertise auto-open and early warning target logic

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/resources/views/dokter/mikro-expertise.blade.php
+10 -6
View File
@@ -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;
}
htdocs/resources/views/livewire/gudang-pos.blade.php
+19 -5
View File
@@ -85,19 +85,33 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label>Penerima</label>
<label>Nama Ruang</label>
<input type="text" class="form-control" wire:model.live="namaRuangan" placeholder="contoh: ICU / Lab Mikrobiologi / OK">
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="form-group">
<label>Nama Penerima Barang</label>
<select class="form-control" wire:model.live="penerimaId">
@foreach($users as $u)
<option value="{{ $u->nama }}">{{ $u->nama }}</option>
@endforeach
@foreach($ruangans as $ruang)
<option value="{{ $ruang->ruangan }}">{{ $ruang->ruangan }}</option>
<option value="{{ $u->id }}">{{ $u->nama }}</option>
@endforeach
<option value="__manual__">Lainnya, ketik manual</option>
</select>
</div>
</div>
</div>
@if($penerimaId === '__manual__')
<div class="form-group">
<label>Nama Penerima Manual</label>
<input type="text" class="form-control" wire:model.live="penerimaManual" placeholder="ketik nama penerima barang">
</div>
@endif
<div class="table-responsive">
<table class="table table-bordered table-striped m-b-0">
<thead>