diff --git a/app/Views/certificate_installation_index.php b/app/Views/certificate_installation_index.php index 87da263..e0c8355 100644 --- a/app/Views/certificate_installation_index.php +++ b/app/Views/certificate_installation_index.php @@ -48,8 +48,8 @@ - - + + @@ -188,8 +188,13 @@ $(function () { let fullname = cert.fullname; let activity_subject = cert.activity_subject; + let user_check = cert.user_validation_at ? 'checked' : ''; + let spv_check = cert.spv_validation_at ? 'checked' : ''; + let manager_check = cert.manager_validation_at ? 'checked' : ''; + let issuedate = '-'; let validationBadge = ''; + let statusBadge = ''; if (issuedateRaw && issuedateRaw !== '0000-00-00') { let date = new Date(issuedateRaw); @@ -200,13 +205,44 @@ $(function () { } if (status == 'unvalidated') { - validationBadge = '
unvalidated
'; + // validationBadge = "
unvalidated
"; + validationBadge = '
' + + 'unvalidated
' + + '
' + + '' + + '' + + '
' + + '
' + + '' + + '' + + '
' + + '
' + + '' + + '' + + '
' + + '
'; + statusBadge = ''; } else { - validationBadge = '
validated
'; + // validationBadge = '
validated
'; + validationBadge = '
' + + 'validated
' + + '
' + + '' + + '' + + '
' + + '
' + + '' + + '' + + '
' + + '
' + + '' + + '' + + '
' + + '
'; } return [ - `${certname}
Cert# : ${certnumber}`, + `${statusBadge} ${certname}
Cert# : ${certnumber}`, `#${actid} - ${activity_subject}  
Owner : ${fullname}
`, issuedate, validationBadge, diff --git a/app/Views/certificate_maintenance_index.php b/app/Views/certificate_maintenance_index.php index facb6b4..871b8d9 100644 --- a/app/Views/certificate_maintenance_index.php +++ b/app/Views/certificate_maintenance_index.php @@ -216,10 +216,15 @@ $(function () { let fullname = cert.fullname; let activity_subject = cert.activity_subject; + let user_check = cert.user_validation_at ? 'checked' : ''; + let spv_check = cert.spv_validation_at ? 'checked' : ''; + let manager_check = cert.manager_validation_at ? 'checked' : ''; + let issuedate = '-'; let expirydate = '-'; // let statusBadge = 'need validation'; let validationBadge = ''; + let statusDot = ''; if (issuedateRaw && issuedateRaw !== '0000-00-00') { let date = new Date(issuedateRaw); @@ -250,15 +255,45 @@ $(function () { } if (status == 'unvalidated') { - - validationBadge = '
unvalidated
'; + // validationBadge = "
unvalidated
"; + validationBadge = '
' + + 'unvalidated
' + + '
' + + '' + + '' + + '
' + + '
' + + '' + + '' + + '
' + + '
' + + '' + + '' + + '
' + + '
'; + statusDot = ''; } else { - validationBadge = '
validated
'; + // validationBadge = '
validated
'; + validationBadge = '
' + + 'validated
' + + '
' + + '' + + '' + + '
' + + '
' + + '' + + '' + + '
' + + '
' + + '' + + '' + + '
' + + '
'; } return [ // index + 1, - `${certname}
Cert# : ${certnumber}`, + `${statusDot} ${certname}
Cert# : ${certnumber}`, `#${actid} - ${activity_subject}  
Owner : ${fullname}
`, issuedate, expirydate, diff --git a/app/Views/certificate_training_index.php b/app/Views/certificate_training_index.php index 0c1edc1..b444a1f 100644 --- a/app/Views/certificate_training_index.php +++ b/app/Views/certificate_training_index.php @@ -192,8 +192,13 @@ $(function () { let fullname = cert.fullname; let activity_subject = cert.activity_subject; + let user_check = cert.user_validation_at ? 'checked' : ''; + let spv_check = cert.spv_validation_at ? 'checked' : ''; + let manager_check = cert.manager_validation_at ? 'checked' : ''; + let issuedate = '-'; let validationBadge = ''; + let statusBadge = ''; if (issuedateRaw && issuedateRaw !== '0000-00-00') { let date = new Date(issuedateRaw); @@ -204,13 +209,44 @@ $(function () { } if (status == 'unvalidated') { - validationBadge = '
unvalidated
'; + // validationBadge = "
unvalidated
"; + validationBadge = '
' + + 'unvalidated
' + + '
' + + '' + + '' + + '
' + + '
' + + '' + + '' + + '
' + + '
' + + '' + + '' + + '
' + + '
'; + statusBadge = ''; } else { - validationBadge = '
validated
'; + // validationBadge = '
validated
'; + validationBadge = '
' + + 'validated
' + + '
' + + '' + + '' + + '
' + + '
' + + '' + + '' + + '
' + + '
' + + '' + + '' + + '
' + + '
'; } return [ - `${certname}
Cert# : ${certnumber}`, + `${statusBadge} ${certname}
Cert# : ${certnumber}`, `#${actid} - ${activity_subject}  
Owner : ${fullname}
`, issuedate, validationBadge,
CertificateAct ReportCertificateAct Report Issue Date Validation Action