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

Update View

Browse Source
This commit is contained in:
servdal
2025-09-05 08:07:58 +07:00
parent 7794fc6fdf
commit ab65bfb585
3 changed files with 13 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/app/Http/Controllers/Controller.php
+3 -5
View File
@@ -178,16 +178,14 @@ class Controller extends BaseController
protected function getDefaultData($jenis, $master, $mulai, $akhir, $valcari) { protected function getDefaultData($jenis, $master, $mulai, $akhir, $valcari) {
$query = Periksa::whereNotNull('nofoto'); $query = Periksa::whereNotNull('nofoto');
if ($jenis == 'ThisDay') { if ($jenis == 'ThisDay') {
if (Session('previlage') == 'admin'){ return $query->where(function($q) {
return $query->whereDate('daftar', Carbon::today());
} else {
return $query->where(function($q) {
$q->where(function($sub) { $q->where(function($sub) {
$sub->where('status', '!=', 'Selesai') $sub->where('status', '!=', 'Selesai')
->where('status', 'not like', 'Dibatalkan%'); ->where('status', 'not like', 'Dibatalkan%');
})->orWhereNull('status'); })->orWhereNull('status');
}); });
} } else if ($jenis == 'ThisDayPendaftaran') {
return $query->whereDate('daftar', Carbon::today());
} else if ($jenis == 'mundur2') { } else if ($jenis == 'mundur2') {
return $query->whereDate('daftar', '>=', Carbon::today()->subDays(2)); return $query->whereDate('daftar', '>=', Carbon::today()->subDays(2));
} else if ($jenis == 'mundur3') { } else if ($jenis == 'mundur3') {
htdocs/resources/views/dokter/pemeriksaan.blade.php
+7 -35
View File
@@ -1821,7 +1821,7 @@
<div class="form-group setelahdipilihtemplate"> <div class="form-group setelahdipilihtemplate">
<input type="hidden" id="periksa_id" name="periksa_id"> <input type="hidden" id="periksa_id" name="periksa_id">
<button type="button" id="btnkembali" class="btn btn-primary">Back</button> <button type="button" id="btnkembali" class="btn btn-primary">Back</button>
<button type="button" id="btnsendexpertisetopacs" class="btn btn-warning pull-right">Save Expertise</button> <button type="button" id="btnsendexpertisetopacs" class="btn btn-warning pull-right">Final Expertise</button>
<button type="button" id="btnsavedraft" class="btn btn-success pull-right">Save as Draft</button> <button type="button" id="btnsavedraft" class="btn btn-success pull-right">Save as Draft</button>
</div> </div>
<div class="form-group setelahdipilihtemplate"> <div class="form-group setelahdipilihtemplate">
@@ -2204,7 +2204,7 @@
var akhir = ''; var akhir = '';
var valcari = ''; var valcari = '';
var master = document.getElementById('master_lokasi').value; var master = document.getElementById('master_lokasi').value;
var poli = ''; var poli = document.getElementById('master_userid').value;
var set06 = document.getElementById('master_judul').value; var set06 = document.getElementById('master_judul').value;
var token = document.getElementById('token').value; var token = document.getElementById('token').value;
if (jenis == 'ThisDay'){ if (jenis == 'ThisDay'){
@@ -2301,7 +2301,7 @@
{ name: 'alamat', type: 'text'}, { name: 'alamat', type: 'text'},
], ],
type : 'GET', type : 'GET',
data : {jenis:jenis, mulai:mulai, akhir:akhir, valcari:valcari, poli:poli, master:master, _token: token}, data : {jenis:'verificationppds', mulai:mulai, akhir:akhir, valcari:valcari, poli:poli, master:'verificationppds', _token: token},
url : '{{ route("getList") }}', url : '{{ route("getList") }}',
}; };
var dataAdapter = new $.jqx.dataAdapter(sourcepasiencari); var dataAdapter = new $.jqx.dataAdapter(sourcepasiencari);
@@ -2752,40 +2752,12 @@
$('#divperiksa').hide(); $('#divperiksa').hide();
$('#divreadonly').hide(); $('#divreadonly').hide();
$('#divharibytanggal').hide(); $('#divharibytanggal').hide();
$("#btnhariinidoank").click(function() { $("#btnpunyaku").click(function() {
$("#master_set01").val('ThisDay'); $("#master_userid").val("{{ Session('id') }}");
$("#master_set02").val('');
$("#master_set03").val('');
$("#master_set04").val('');
var set01=document.getElementById('master_judul').value;
var judul='Patient Queue This Day on '+set01;
$("#judul").html(judul);
$("#valcari").val('');
$("#mulai").val('');
$("#akhir").val('');
$("#valjenis").val('searchbydate');
openedpage(); openedpage();
}); });
$("#btnmundur2").click(function() { $("#btnallspv").click(function() {
$("#master_set01").val('mundur2'); $("#master_userid").val('allspv');
$("#master_set02").val('');
$("#master_set03").val('');
$("#master_set04").val('');
$("#valcari").val('');
$("#mulai").val('');
$("#akhir").val('');
$("#valjenis").val('searchbydate');
openedpage();
});
$("#btnmundur3").click(function() {
$("#master_set01").val('mundur3');
$("#master_set02").val('');
$("#master_set03").val('');
$("#master_set04").val('');
$("#valcari").val('');
$("#mulai").val('');
$("#akhir").val('');
$("#valjenis").val('searchbydate');
openedpage(); openedpage();
}); });
$("#btnkembali").click(function() { $("#btnkembali").click(function() {
htdocs/resources/views/pendaftaran.blade.php
+3 -3
View File
@@ -365,7 +365,7 @@
</div><!-- /.modal-dialog --> </div><!-- /.modal-dialog -->
</div> </div>
<input type="hidden" name="_token" id="token" value="{{ csrf_token() }}"> <input type="hidden" name="_token" id="token" value="{{ csrf_token() }}">
<input type="hidden" id="master_set01" name="master_set01" value="ThisDay"> <input type="hidden" id="master_set01" name="master_set01" value="ThisDayPendaftaran">
<input type="hidden" id="master_set02" name="master_set02" value="{{ Session('previlage') }}"> <input type="hidden" id="master_set02" name="master_set02" value="{{ Session('previlage') }}">
<input type="hidden" id="master_set03" name="master_set03" value=""> <input type="hidden" id="master_set03" name="master_set03" value="">
<input type="hidden" id="master_set04" name="master_set04" value=""> <input type="hidden" id="master_set04" name="master_set04" value="">
@@ -468,7 +468,7 @@
var akhir = document.getElementById('akhir').value; var akhir = document.getElementById('akhir').value;
var valcari = document.getElementById('valcari').value; var valcari = document.getElementById('valcari').value;
var master = 'mikro'; var master = 'mikro';
var poli = ''; var poli = 'pendaftaran';
var set06 = ''; var set06 = '';
var token = document.getElementById('token').value; var token = document.getElementById('token').value;
var sourcepasiencari = { var sourcepasiencari = {
@@ -940,7 +940,7 @@
openedpage(); openedpage();
}); });
$("#btnhariinidoank").click(function() { $("#btnhariinidoank").click(function() {
$("#master_set01").val('ThisDay'); $("#master_set01").val('ThisDayPendaftaran');
$("#master_set02").val(''); $("#master_set02").val('');
$("#master_set03").val(''); $("#master_set03").val('');
$("#master_set04").val(''); $("#master_set04").val('');