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 "Attachment :
";}
echo "$value
";
$i++;
}
+echo "
";
$i = 1;
-// foreach ($certificates as $value){
-// if($i == 1) {echo "Certificates :
";}
-// echo "".$value['cert_name']."
";
-// $i++;
-// }
+foreach ($certificates as $value){
+ // if($i == 1) {echo "Attachment :
";}
+ echo "Certificate : ".$value['cert_name']."
";
+ $i++;
+}
echo "