From 4c2fefe9c3b1c961b83c64d0680f7e174a29f300 Mon Sep 17 00:00:00 2001
From: Sendi Pebriyan <sendibinary@gmail.com>
Date: Wed, 29 Jul 2026 08:01:24 +0700
Subject: [PATCH] tambah kolom server di pdf barang bawaan

---
 application/controllers/Asset.php          |  6 ++++--
 application/libraries/PDF_BarangBawaan.php | 15 +++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/application/controllers/Asset.php b/application/controllers/Asset.php
index e731e0f..f58107a 100644
--- a/application/controllers/Asset.php
+++ b/application/controllers/Asset.php
@@ -22,9 +22,10 @@ class Asset extends CI_Controller {
     // ================= GET DATA =================
     public function get_data(){
         $data = $this->db
-            ->select('assets.*, lokasi_asset.nama as nama_lokasi')
+            ->select('assets.*, lokasi_asset.nama as nama_lokasi, item_barcodes.barcode as barcode, item_barcodes.id as barcode_id')
             ->from('assets')
             ->join('lokasi_asset', 'lokasi_asset.id = assets.lokasi_asset_id', 'left')
+            ->join('item_barcodes', 'item_barcodes.id = assets.barcode_id', 'left')
             ->order_by('assets.tanggal_perolehan','DESC')
             ->get()
             ->result();
@@ -37,7 +38,7 @@ class Asset extends CI_Controller {
                 $no++,
                 $d->tanggal_perolehan,
                 $d->kode_asset ?? '-',
-                $d->nama_asset,
+                $d->nama_asset . ($d->barcode_id ? '<br><small class="text-muted"><i>'.$d->barcode.'</i></small>' : ''),
                 $d->nama_lokasi ?? '-',
                 $d->keterangan ?? '-',
                 number_format($d->nilai_perolehan),
@@ -204,6 +205,7 @@ class Asset extends CI_Controller {
         // INSERT ASSET
         $this->db->insert('assets',[
             'item_id' => $item_id,
+            'barcode_id' => $barcode_id,
             'kode_asset' => 'AST-'.time(),
             'nama_asset' => $nama_asset,
             'harga_per_unit' => $harga,
diff --git a/application/libraries/PDF_BarangBawaan.php b/application/libraries/PDF_BarangBawaan.php
index 1d072b9..1de21c6 100644
--- a/application/libraries/PDF_BarangBawaan.php
+++ b/application/libraries/PDF_BarangBawaan.php
@@ -8,7 +8,7 @@ class PDF_BarangBawaan extends FPDF
     private $tanggal;
     private $teknisi;
 
-    private $colWidths = [8, 18, 27, 44, 26, 10, 57];
+    private $colWidths = [8, 18, 27, 42, 24, 10, 46, 15];
 
     public function __construct($orientation = 'L', $unit = 'mm', $size = 'A5')
     {
@@ -57,7 +57,7 @@ class PDF_BarangBawaan extends FPDF
         $this->SetTextColor(255, 255, 255);
         $this->SetFont('Arial', 'B', 7);
 
-        $headers = ['No', 'Tanggal', 'Barcode', 'Nama Barang', 'Serial Number', 'Jumlah', 'Keterangan'];
+        $headers = ['No', 'Tanggal', 'Barcode', 'Nama Barang', 'Serial Number', 'Jumlah', 'Keterangan', 'Server'];
         foreach ($headers as $i => $h) {
             $this->Cell($this->colWidths[$i], 7, $h, 1, 0, 'C', true);
         }
@@ -73,8 +73,8 @@ class PDF_BarangBawaan extends FPDF
         $minRowH = 8;
         $no = 1;
 
-        $colsMultiCell = [false, false, true, true, true, false, true];
-        $cellAligns = ['C', 'C', 'L', 'L', 'L', 'C', 'L'];
+        $colsMultiCell = [false, false, true, true, true, false, true, false];
+        $cellAligns = ['C', 'C', 'L', 'L', 'L', 'C', 'L', 'L'];
 
         foreach ($items as $item) {
             $keterangan = isset($item->keterangan) ? $item->keterangan : '';
@@ -82,6 +82,7 @@ class PDF_BarangBawaan extends FPDF
             $serial = $item->serial_number ?? '-';
             $barcode = $item->barcode ?? '-';
             $jumlah = isset($item->qty_sisa) ? (int)$item->qty_sisa : 1;
+            $server = '';
 
             $cellValues = [
                 (string)$no,
@@ -90,7 +91,8 @@ class PDF_BarangBawaan extends FPDF
                 $namaBarang,
                 $serial,
                 (string)$jumlah,
-                $keterangan
+                $keterangan,
+                $server
             ];
 
             $maxLines = 1;
@@ -122,7 +124,8 @@ class PDF_BarangBawaan extends FPDF
             foreach ($cellValues as $i => $val) {
                 $this->SetXY($currentX, $startY);
                 if ($colsMultiCell[$i]) {
-                    $contentH = $maxLines * $lineH;
+                    $colLines = $this->NbLines($this->colWidths[$i], $val);
+                    $contentH = $colLines * $lineH;
                     $offsetY = ($rowH - $contentH) / 2;
                     $this->SetXY($currentX, $startY + $offsetY);
                     $this->MultiCell($this->colWidths[$i], $lineH, $val, 0, $cellAligns[$i]);