update

htdocs/resources/views/cetak/rekappenerimaansample.blade.php

@@ -187,6 +187,7 @@
         var selectedTanggal = @json($tanggal);
         var printHistories = @json($printHistories ?? []);
         var printHistoryMap = {};
+        var printHistoryMetaMap = {};
         var appName = @json(config('global.namaapps'));
         var appDomain = @json(config('global.domainapps'));
         var appSubDomain = @json(config('global.subdomainapps'));
@@ -195,6 +196,10 @@
         var petugasCetak = @json(Session('nama'));
         printHistories.forEach(function(item) {
             printHistoryMap[String(item.id)] = item.rows_payload || [];
+            printHistoryMetaMap[String(item.id)] = {
+                printed_by_name: item.printed_by_name || '',
+                printed_at_label: item.printed_at_label || ''
+            };
         });
 
         function renderHistoryNumbers() {
@@ -220,6 +225,10 @@
             }
 
             printHistoryMap[String(history.id)] = history.rows_payload || [];
+            printHistoryMetaMap[String(history.id)] = {
+                printed_by_name: history.printed_by_name || '',
+                printed_at_label: history.printed_at_label || ''
+            };
             var tr = document.createElement('tr');
             tr.setAttribute('data-history-id', history.id);
             tr.innerHTML = ''
@@ -236,7 +245,7 @@
             renderHistoryNumbers();
         }
 
-        function openPrintWindowFromRows(printedRows) {
+        function openPrintWindowFromRows(printedRows, printMeta) {
             if (!printedRows || printedRows.length === 0) {
                 alert('Data riwayat cetak tidak ditemukan.');
                 return;
@@ -244,7 +253,7 @@
 
             var now = new Date();
             var orientation = printOrientation ? printOrientation.value : 'landscape';
-            var tanggalCetak = now.toLocaleString('id-ID', {
+            var tanggalCetakDefault = now.toLocaleString('id-ID', {
                 year: 'numeric',
                 month: '2-digit',
                 day: '2-digit',
@@ -252,6 +261,8 @@
                 minute: '2-digit',
                 second: '2-digit'
             });
+            var tanggalCetak = (printMeta && printMeta.printed_at_label) ? printMeta.printed_at_label : tanggalCetakDefault;
+            var petugasCetakLabel = (printMeta && printMeta.printed_by_name) ? printMeta.printed_by_name : (petugasCetak || '-');
 
             var printWindow = window.open('', '_blank');
             if (!printWindow) {
@@ -300,7 +311,7 @@
                 + '<div class="title">Rekapitulasi Penerimaan Sample {{$tanggal}}</div>'
                 + '<div class="meta">'
                 + '<div>Tanggal Cetak: ' + tanggalCetak + '</div>'
-                + '<div>Petugas: ' + (petugasCetak || '-') + '</div>'
+                + '<div>Petugas: ' + petugasCetakLabel + '</div>'
                 + '</div>'
                 + '<table>'
                 + '<thead><tr>'
@@ -515,7 +526,10 @@
                 updateCheckAllState();
                 if (resp.history) {
                     addHistoryRow(resp.history);
-                    openPrintWindowFromRows(resp.history.rows_payload || []);
+                    openPrintWindowFromRows(resp.history.rows_payload || [], {
+                        printed_by_name: resp.history.printed_by_name || '',
+                        printed_at_label: resp.history.printed_at_label || ''
+                    });
                 } else {
                     openPrintWindowFromRows(printedRows.map(function(cols) {
                         return {
@@ -531,7 +545,10 @@
                             tgldraft: cols[9] || '',
                             petugas: cols[10] || ''
                         };
-                    }));
+                    }), {
+                        printed_by_name: petugasCetak || '',
+                        printed_at_label: ''
+                    });
                 }
             }).fail(function(xhr) {
                 var err = 'Gagal memperbarui status cetak.';
@@ -550,7 +567,8 @@
                 }
                 var historyId = btn.getAttribute('data-history-id');
                 var payload = printHistoryMap[String(historyId)] || [];
-                openPrintWindowFromRows(payload);
+                var meta = printHistoryMetaMap[String(historyId)] || {};
+                openPrintWindowFromRows(payload, meta);
             });
         }
     });