Update perbaikan Bug Link Act pada certificate modal dan penamaan status sertifikat pada controller
This commit is contained in:
parent
d7bd75f5a5
commit
a32a768a51
@ -167,8 +167,8 @@ class Certificates extends BaseController {
|
|||||||
WHEN certificates.cert_type = "MC" THEN "Maintenance"
|
WHEN certificates.cert_type = "MC" THEN "Maintenance"
|
||||||
WHEN certificates.cert_type = "IC" THEN "Installation"
|
WHEN certificates.cert_type = "IC" THEN "Installation"
|
||||||
WHEN certificates.cert_type = "UTC" THEN "User Training"
|
WHEN certificates.cert_type = "UTC" THEN "User Training"
|
||||||
WHEN certificates.cert_type = "BAI" THEN "Before After Inspection"
|
WHEN certificates.cert_type = "BAI" THEN "Berita Acara Instalasi"
|
||||||
WHEN certificates.cert_type = "BAP" THEN "Berita Acara Pengerjaan"
|
WHEN certificates.cert_type = "BAP" THEN "Berita Acara Penarikan"
|
||||||
ELSE certificates.cert_type
|
ELSE certificates.cert_type
|
||||||
END AS certtype,
|
END AS certtype,
|
||||||
CONCAT(us.firstname, " ", us.lastname) AS username,
|
CONCAT(us.firstname, " ", us.lastname) AS username,
|
||||||
@ -219,8 +219,8 @@ class Certificates extends BaseController {
|
|||||||
WHEN certificates.cert_type = "MC" THEN "Maintenance"
|
WHEN certificates.cert_type = "MC" THEN "Maintenance"
|
||||||
WHEN certificates.cert_type = "IC" THEN "Installation"
|
WHEN certificates.cert_type = "IC" THEN "Installation"
|
||||||
WHEN certificates.cert_type = "UTC" THEN "User Training"
|
WHEN certificates.cert_type = "UTC" THEN "User Training"
|
||||||
WHEN certificates.cert_type = "BAI" THEN "Before After Inspection"
|
WHEN certificates.cert_type = "BAI" THEN "Berita Acara Instalasi"
|
||||||
WHEN certificates.cert_type = "BAP" THEN "Berita Acara Pengerjaan"
|
WHEN certificates.cert_type = "BAP" THEN "Berita Acara Penarikan"
|
||||||
ELSE certificates.cert_type
|
ELSE certificates.cert_type
|
||||||
END AS cert_type,
|
END AS cert_type,
|
||||||
CONCAT(users.firstname, " ", users.lastname) AS fullname,
|
CONCAT(users.firstname, " ", users.lastname) AS fullname,
|
||||||
@ -546,8 +546,8 @@ class Certificates extends BaseController {
|
|||||||
WHEN certificates.cert_type = "MC" THEN "Maintenance"
|
WHEN certificates.cert_type = "MC" THEN "Maintenance"
|
||||||
WHEN certificates.cert_type = "IC" THEN "Installation"
|
WHEN certificates.cert_type = "IC" THEN "Installation"
|
||||||
WHEN certificates.cert_type = "UTC" THEN "Training"
|
WHEN certificates.cert_type = "UTC" THEN "Training"
|
||||||
WHEN certificates.cert_type = "BAI" THEN "Before After Inspection"
|
WHEN certificates.cert_type = "BAI" THEN "Berita Acara Instalasi"
|
||||||
WHEN certificates.cert_type = "BAP" THEN "Berita Acara Pengerjaan"
|
WHEN certificates.cert_type = "BAP" THEN "Berita Acara Penarikan"
|
||||||
ELSE certificates.cert_type
|
ELSE certificates.cert_type
|
||||||
END AS cert_type,
|
END AS cert_type,
|
||||||
CONCAT(users.firstname, " ", users.lastname) AS fullname,
|
CONCAT(users.firstname, " ", users.lastname) AS fullname,
|
||||||
|
|||||||
@ -395,7 +395,7 @@ $(function () {
|
|||||||
'<?= base_url('certificates/api/showmaintenance') ?>',
|
'<?= base_url('certificates/api/showmaintenance') ?>',
|
||||||
{ certid },
|
{ certid },
|
||||||
function (data) {
|
function (data) {
|
||||||
// console.log(data);
|
console.log(data);
|
||||||
// Populate modal with data
|
// Populate modal with data
|
||||||
$('#modalCertName').text(data.cert_name || '-');
|
$('#modalCertName').text(data.cert_name || '-');
|
||||||
$('#modalCertNumber').text(data.cert_number || '-');
|
$('#modalCertNumber').text(data.cert_number || '-');
|
||||||
@ -458,7 +458,7 @@ $(function () {
|
|||||||
|
|
||||||
$('#modalExpiredStatus').html(badge);
|
$('#modalExpiredStatus').html(badge);
|
||||||
$('#modalActivity').text(data.actid ? `#${data.actid} - ${data.subject || '-'}` : '-');
|
$('#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}<i class="fa-solid fa-circle-check text-success ms-2"></i>` : '-');
|
$('#modalValOwner').html(data.user_validation_at ? `${data.username} - ${data.user_validation_at}<i class="fa-solid fa-circle-check text-success ms-2"></i>` : '-');
|
||||||
$('#modalValSpv').html(data.spv_validation_at ? `${data.spvname} - ${data.spv_validation_at}<i class="fa-solid fa-circle-check text-success ms-2"></i>` : '-');
|
$('#modalValSpv').html(data.spv_validation_at ? `${data.spvname} - ${data.spv_validation_at}<i class="fa-solid fa-circle-check text-success ms-2"></i>` : '-');
|
||||||
$('#modalValManager').html(data.manager_validation_at ? `${data.managername} - ${data.manager_validation_at}<i class="fa-solid fa-circle-check text-success ms-2"></i>` : '-');
|
$('#modalValManager').html(data.manager_validation_at ? `${data.managername} - ${data.manager_validation_at}<i class="fa-solid fa-circle-check text-success ms-2"></i>` : '-');
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user