diff --git a/htdocs/app/Http/Controllers/DokterController.php b/htdocs/app/Http/Controllers/DokterController.php index 4a51a07b..3a106607 100644 --- a/htdocs/app/Http/Controllers/DokterController.php +++ b/htdocs/app/Http/Controllers/DokterController.php @@ -2596,9 +2596,12 @@ class DokterController extends Controller public function ctkFormhasil($id){ $periksa = Periksa::where('nofoto', $id)->first(); if (isset($periksa->id)){ + $urlbaru = url('/'); $cekriwayat = Riwayat::where('nofoto', $periksa->nofoto)->where('keterangan', 'Expertise')->where('verifikasi', 'Accepted')->orderBy('created_at', 'DESC')->first(); if (isset($cekriwayat->jawaban)){ $surat = $cekriwayat->jawaban; + $surat = str_replace('http://10.10.123.218', $urlbaru, $surat); + $surat = str_replace('https://10.10.123.218', $urlbaru, $surat); } else { $surat = self::genSurat($periksa->id, 'dengan kop'); } diff --git a/htdocs/app/Http/Controllers/JsonTransferController.php b/htdocs/app/Http/Controllers/JsonTransferController.php index 2ba16394..edde736a 100644 --- a/htdocs/app/Http/Controllers/JsonTransferController.php +++ b/htdocs/app/Http/Controllers/JsonTransferController.php @@ -7,6 +7,8 @@ use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\Response; use ZipArchive; use JsonMachine\Items; +use Illuminate\Http\Request; + class JsonTransferController extends Controller { protected $exportPath = 'database/seeders/data/'; diff --git a/htdocs/resources/views/dokter/pemeriksaan.blade.php b/htdocs/resources/views/dokter/pemeriksaan.blade.php index 06f4170c..35e2b92d 100644 --- a/htdocs/resources/views/dokter/pemeriksaan.blade.php +++ b/htdocs/resources/views/dokter/pemeriksaan.blade.php @@ -3434,34 +3434,7 @@ $('#micvalue_id').val(id); $('#modaleditormic').modal('show'); } - function reloadAntibioticTablesKeepScroll() { - var scrollLeft = window.pageXOffset || document.documentElement.scrollLeft || 0; - var scrollTop = window.pageYOffset || document.documentElement.scrollTop || 0; - var tableIds = ['#tblvitek', '#tblkumanmanual1', '#tblkumanmanual2']; - var tableCount = 0; - - function restoreScroll() { - window.requestAnimationFrame(function () { - window.scrollTo(scrollLeft, scrollTop); - }); - } - - tableIds.forEach(function (tableId) { - if ( $.fn.DataTable.isDataTable(tableId) ) { - tableCount++; - $(tableId).DataTable().ajax.reload(function () { - tableCount--; - if (tableCount === 0) { - restoreScroll(); - } - }, false); - } - }); - - if (tableCount === 0) { - restoreScroll(); - } - } + function updateValueManOne(id, value) { $.ajax({ url: '{{ route("getResult") }}', @@ -3474,7 +3447,15 @@ _token: '{{ csrf_token() }}' }, success: function(res) { - reloadAntibioticTablesKeepScroll(); + if ( $.fn.DataTable.isDataTable('#tblvitek') ) { + $("#tblvitek").DataTable().ajax.reload(); + } + if ( $.fn.DataTable.isDataTable('#tblkumanmanual1') ) { + $("#tblkumanmanual1").DataTable().ajax.reload(); + } + if ( $.fn.DataTable.isDataTable('#tblkumanmanual2') ) { + $("#tblkumanmanual2").DataTable().ajax.reload(); + } } }); } diff --git a/htdocs/resources/views/dokter/ppds.blade.php b/htdocs/resources/views/dokter/ppds.blade.php index b88976d3..ab2ea0a0 100644 --- a/htdocs/resources/views/dokter/ppds.blade.php +++ b/htdocs/resources/views/dokter/ppds.blade.php @@ -3512,34 +3512,6 @@ $('#micvalue_id').val(id); $('#modaleditormic').modal('show'); } - function reloadAntibioticTablesKeepScroll() { - var scrollLeft = window.pageXOffset || document.documentElement.scrollLeft || 0; - var scrollTop = window.pageYOffset || document.documentElement.scrollTop || 0; - var tableIds = ['#tblvitek', '#tblkumanmanual1', '#tblkumanmanual2']; - var tableCount = 0; - - function restoreScroll() { - window.requestAnimationFrame(function () { - window.scrollTo(scrollLeft, scrollTop); - }); - } - - tableIds.forEach(function (tableId) { - if ( $.fn.DataTable.isDataTable(tableId) ) { - tableCount++; - $(tableId).DataTable().ajax.reload(function () { - tableCount--; - if (tableCount === 0) { - restoreScroll(); - } - }, false); - } - }); - - if (tableCount === 0) { - restoreScroll(); - } - } function updateValueManOne(id, value) { $.ajax({ url: '{{ route("getResult") }}', @@ -3552,7 +3524,15 @@ _token: '{{ csrf_token() }}' }, success: function(res) { - reloadAntibioticTablesKeepScroll(); + if ( $.fn.DataTable.isDataTable('#tblvitek') ) { + $("#tblvitek").DataTable().ajax.reload(); + } + if ( $.fn.DataTable.isDataTable('#tblkumanmanual1') ) { + $("#tblkumanmanual1").DataTable().ajax.reload(); + } + if ( $.fn.DataTable.isDataTable('#tblkumanmanual2') ) { + $("#tblkumanmanual2").DataTable().ajax.reload(); + } console.log("Value updated", res); } }); @@ -3594,6 +3574,15 @@ _token: '{{ csrf_token() }}' }, success: function(res) { + if ( $.fn.DataTable.isDataTable('#tblvitek') ) { + $("#tblvitek").DataTable().ajax.reload(); + } + if ( $.fn.DataTable.isDataTable('#tblkumanmanual1') ) { + $("#tblkumanmanual1").DataTable().ajax.reload(); + } + if ( $.fn.DataTable.isDataTable('#tblkumanmanual2') ) { + $("#tblkumanmanual2").DataTable().ajax.reload(); + } console.log("Value updated", res); } }); diff --git a/htdocs/resources/views/dokter/ppdsdeveloper.blade.php b/htdocs/resources/views/dokter/ppdsdeveloper.blade.php index ca304f8b..a177a066 100644 --- a/htdocs/resources/views/dokter/ppdsdeveloper.blade.php +++ b/htdocs/resources/views/dokter/ppdsdeveloper.blade.php @@ -3549,34 +3549,6 @@ $('#micvalue_id').val(id); $('#modaleditormic').modal('show'); } - function reloadAntibioticTablesKeepScroll() { - var scrollLeft = window.pageXOffset || document.documentElement.scrollLeft || 0; - var scrollTop = window.pageYOffset || document.documentElement.scrollTop || 0; - var tableIds = ['#tblvitek', '#tblkumanmanual1', '#tblkumanmanual2']; - var tableCount = 0; - - function restoreScroll() { - window.requestAnimationFrame(function () { - window.scrollTo(scrollLeft, scrollTop); - }); - } - - tableIds.forEach(function (tableId) { - if ( $.fn.DataTable.isDataTable(tableId) ) { - tableCount++; - $(tableId).DataTable().ajax.reload(function () { - tableCount--; - if (tableCount === 0) { - restoreScroll(); - } - }, false); - } - }); - - if (tableCount === 0) { - restoreScroll(); - } - } function updateValueManOne(id, value) { $.ajax({ url: '{{ route("getResult") }}', @@ -3589,7 +3561,15 @@ _token: '{{ csrf_token() }}' }, success: function(res) { - reloadAntibioticTablesKeepScroll(); + if ( $.fn.DataTable.isDataTable('#tblvitek') ) { + $("#tblvitek").DataTable().ajax.reload(); + } + if ( $.fn.DataTable.isDataTable('#tblkumanmanual1') ) { + $("#tblkumanmanual1").DataTable().ajax.reload(); + } + if ( $.fn.DataTable.isDataTable('#tblkumanmanual2') ) { + $("#tblkumanmanual2").DataTable().ajax.reload(); + } } }); } @@ -3629,6 +3609,7 @@ _token: '{{ csrf_token() }}' }, success: function(res) { + reloadAntibioticTablesKeepScroll(); // console.log("Value updated", res); } });