From d7bd75f5a58dd42ca8abd8853507c5381767868a Mon Sep 17 00:00:00 2001
From: mikael-zakaria <mzi3721s@gmail.com>
Date: Mon, 9 Mar 2026 12:43:38 +0700
Subject: [PATCH] Update Sertifikat UI : Font Arial, ACT Detail : Menampilkan
 Sertifikat Link

---
 app/Controllers/Certificates.php                   |  6 ++++--
 app/Views/activities_detail.php                    | 12 +++++++-----
 app/Views/certificates/certificate_maintenance.php | 11 ++++++-----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/Controllers/Certificates.php b/app/Controllers/Certificates.php
index 07a68c5..03abb9b 100644
--- a/app/Controllers/Certificates.php
+++ b/app/Controllers/Certificates.php
@@ -212,7 +212,7 @@ class Certificates extends BaseController {
 										certificates.issued_date,
 										certificates.expired_date,
 										certificates.file_url,
-										productcatalog.productname as productname,
+										productalias.productaliastext as productname,
 										sites.sitename as sitename,
 										products.productnumber,
 										CASE 
@@ -235,6 +235,7 @@ class Certificates extends BaseController {
 									->join('sites', 'sites.siteid = activities.siteid', 'left')
 									->join('products', 'products.productid = activities.productid', 'left')
 									->join('productcatalog', 'productcatalog.catalogid = products.catalogid', 'left')
+									->join('productalias', 'productalias.productaliasid = productcatalog.productaliasid', 'left')
 									->where('certificates.cert_id', $certid) 
 									->first();		
 		$certificate = [
@@ -538,7 +539,7 @@ class Certificates extends BaseController {
 													certificates.issued_date,
 													certificates.expired_date,
 													certificates.file_url,
-													productcatalog.productname as productname,
+													productalias.productaliastext as productname,
 													sites.sitename as sitename,
 													products.productnumber,
 													CASE 
@@ -561,6 +562,7 @@ class Certificates extends BaseController {
 												->join('sites', 'sites.siteid = activities.siteid', 'left')
 												->join('products', 'products.productid = activities.productid', 'left')
 												->join('productcatalog', 'productcatalog.catalogid = products.catalogid', 'left')
+												->join('productalias', 'productalias.productaliasid = productcatalog.productaliasid', 'left')
 												->where('certificates.cert_id', $certid) 
 												->first();
 				
diff --git a/app/Views/activities_detail.php b/app/Views/activities_detail.php
index 3dcc4f3..bb2ac0d 100644
--- a/app/Views/activities_detail.php
+++ b/app/Views/activities_detail.php
@@ -5,18 +5,20 @@
 $attachment = $attachment['attachment'];
 $filelist = $attachment;
 $file_array = explode (',', $filelist);
+
 $i = 1;
 foreach ($file_array as $value){ 
 	if($i == 1) {echo "<b>Attachment : </b><br/>";}
 	echo "<a href='".base_url()."upload/$value' target='_blank'>$value </a><br/>"; 
 	$i++;
 }
+echo "<br/>";
 $i = 1;
-// foreach ($certificates as $value){ 
-// 	if($i == 1) {echo "<b>Certificates : </b><br/>";}
-// 	echo "<a href='".$value['file_url']."' target='_blank'>".$value['cert_name']."</a><br/>"; 
-// 	$i++;
-// }
+foreach ($certificates as $value){ 
+	// if($i == 1) {echo "<b>Attachment : </b><br/>";}
+	echo "Certificate : <a href='".$value['file_url']."' target='_blank'>".$value['cert_name']."</a><br/>"; 
+	$i++;
+}
 echo "<hr/>";
 foreach ($actsend_log as $data) {
 	$logdate = $data['logdate'];
diff --git a/app/Views/certificates/certificate_maintenance.php b/app/Views/certificates/certificate_maintenance.php
index 1a84536..4f6f36e 100644
--- a/app/Views/certificates/certificate_maintenance.php
+++ b/app/Views/certificates/certificate_maintenance.php
@@ -9,7 +9,8 @@
             padding: 0;
         }
         body {
-            font-family: Arial;
+            /* font-family: Arial; */
+            font-family: Arial, Helvetica, sans-serif;
             margin: 0;
             padding: 0;
             /* font-size: 12px; */
@@ -51,8 +52,8 @@
             text-align: center;
             margin: 0;
             padding: 0;
-            margin-top: 230px;
-            margin-bottom: 25px;
+            margin-top: 235px;
+            margin-bottom: 20px;
         }
         .site-name {
             text-align: center;
@@ -61,7 +62,7 @@
         .detail-information {
             text-align: center;
             /* margin-bottom: 137px; */
-            margin-bottom: 29px;
+            margin-bottom: 26px;
         }
         h4 {
             margin :0;
@@ -74,7 +75,7 @@
         .signature-table {
             width: 100%;
             border-collapse: collapse;
-            margin-bottom: 26px;
+            margin-bottom: 23px;
         }
         .signature-table td {
             width: 50%; /* Membagi dua sisi sama rata */