diff --git a/app/Controllers/Certificates.php b/app/Controllers/Certificates.php index 77ff1d0..4176edc 100644 --- a/app/Controllers/Certificates.php +++ b/app/Controllers/Certificates.php @@ -160,8 +160,8 @@ class Certificates extends BaseController { WHEN certificates.cert_type = "MC" THEN "Maintenance" WHEN certificates.cert_type = "IC" THEN "Installation" WHEN certificates.cert_type = "UTC" THEN "User Training" - WHEN certificates.cert_type = "BAI" THEN "Before After Inspection" - WHEN certificates.cert_type = "BAP" THEN "Berita Acara Pengerjaan" + WHEN certificates.cert_type = "BAI" THEN "Berita Acara Instalasi" + WHEN certificates.cert_type = "BAP" THEN "Berita Acara Penarikan" ELSE certificates.cert_type END AS certtype, CONCAT(us.firstname, " ", us.lastname) AS username, @@ -212,8 +212,8 @@ class Certificates extends BaseController { WHEN certificates.cert_type = "MC" THEN "Maintenance" WHEN certificates.cert_type = "IC" THEN "Installation" WHEN certificates.cert_type = "UTC" THEN "User Training" - WHEN certificates.cert_type = "BAI" THEN "Before After Inspection" - WHEN certificates.cert_type = "BAP" THEN "Berita Acara Pengerjaan" + WHEN certificates.cert_type = "BAI" THEN "Berita Acara Instalasi" + WHEN certificates.cert_type = "BAP" THEN "Berita Acara Penarikan" ELSE certificates.cert_type END AS cert_type, CONCAT(users.firstname, " ", users.lastname) AS fullname, @@ -539,8 +539,8 @@ class Certificates extends BaseController { WHEN certificates.cert_type = "MC" THEN "Maintenance" WHEN certificates.cert_type = "IC" THEN "Installation" WHEN certificates.cert_type = "UTC" THEN "Training" - WHEN certificates.cert_type = "BAI" THEN "Before After Inspection" - WHEN certificates.cert_type = "BAP" THEN "Berita Acara Pengerjaan" + WHEN certificates.cert_type = "BAI" THEN "Berita Acara Instalasi" + WHEN certificates.cert_type = "BAP" THEN "Berita Acara Penarikan" ELSE certificates.cert_type END AS cert_type, CONCAT(users.firstname, " ", users.lastname) AS fullname, diff --git a/app/Views/certificate_maintenance_index.php b/app/Views/certificate_maintenance_index.php index c1c7465..c065b96 100644 --- a/app/Views/certificate_maintenance_index.php +++ b/app/Views/certificate_maintenance_index.php @@ -395,7 +395,7 @@ $(function () { '', { certid }, function (data) { - // console.log(data); + console.log(data); // Populate modal with data $('#modalCertName').text(data.cert_name || '-'); $('#modalCertNumber').text(data.cert_number || '-'); @@ -458,7 +458,7 @@ $(function () { $('#modalExpiredStatus').html(badge); $('#modalActivity').text(data.actid ? `#${data.actid} - ${data.subject || '-'}` : '-'); - $('#modalActivityLink').attr('data-actid', data.actid || ''); + $('#modalActivityLink').data('actid', data.actid || ''); $('#modalValOwner').html(data.user_validation_at ? `${data.username} - ${data.user_validation_at}` : '-'); $('#modalValSpv').html(data.spv_validation_at ? `${data.spvname} - ${data.spv_validation_at}` : '-'); $('#modalValManager').html(data.manager_validation_at ? `${data.managername} - ${data.manager_validation_at}` : '-');