-
Certificate Preview
+
Certificate Preview
@@ -156,14 +188,6 @@
endSection() ?>
section('style') ?>
-
endSection() ?>
section('script') ?>
@@ -171,7 +195,7 @@
$(function () {
let table = $('#certificatesTable').DataTable({
- order: [[5, 'asc']],
+ order: [[4, 'asc']],
pageLength: 25,
dom: '<"row"<"col-md-6"l>>rtip',
responsive: true,
@@ -182,53 +206,73 @@ $(function () {
.then(response => response.json())
.then(result => {
callback({
- data: result.map(cert => {
- let certid = cert.certid || '';
- let certname = cert.certname || '-';
- let productname = cert.productname || '-';
- let productnumber = cert.productnumber || '';
- let issuedateRaw = cert.issuedate || '';
- let expirydateRaw = cert.expirydate || '';
- let vendor = cert.vendor || '-';
- let isval = cert.isval || null;
+ data: result.map((cert, index) => {
+
+ // console.log(result);
+ let certid = cert.cert_id || '';
+ let certname = cert.cert_name || '-';
+ let certnumber = cert.cert_number || '';
+ let actid = cert.actid || '';
+ let issuedateRaw = cert.issued_date || '';
+ let expirydateRaw = cert.expired_date || '';
+ let managerValidation = cert.manager_validation_at || null;
+ let spvValidation = cert.spv_validation_at || null;
+ let userValidation = cert.user_validation_at || null;
+ let status = cert.status;
+ let fullname = cert.fullname;
+ let activity_subject = cert.activity_subject;
let issuedate = '-';
let expirydate = '-';
- let statusBadge = '
Need Validation ';
+ // let statusBadge = '
need validation ';
+ let validationBadge = '';
- if (isval != null) {
- if (issuedateRaw && issuedateRaw !== '0000-00-00') {
- issuedate = new Date(issuedateRaw).toLocaleDateString('en-US', { month: 'short', day: '2-digit', year: 'numeric' });
- }
+ if (issuedateRaw && issuedateRaw !== '0000-00-00') {
+ let date = new Date(issuedateRaw);
+ let day = String(date.getDate()).padStart(2, '0');
+ let month = date.toLocaleString('en-US', { month: 'short' });
+ let year = date.getFullYear();
+ issuedate = `${day} ${month} ${year}`;
+ }
- if (expirydateRaw && expirydateRaw !== '0000-00-00') {
- expirydate = new Date(expirydateRaw).toLocaleDateString('en-US', { month: 'short', day: '2-digit', year: 'numeric' });
- let today = new Date();
- let expiryDate = new Date(expirydateRaw);
- let days = Math.ceil((expiryDate - today) / (1000 * 60 * 60 * 24));
-
- if (days < 0) {
- statusBadge = '
Expired ';
- } else if (days <= 30) {
- statusBadge = '
Expiring Soon ';
- } else {
- statusBadge = '
Active ';
- }
+ if (expirydateRaw && expirydateRaw !== '0000-00-00') {
+ let date = new Date(expirydateRaw);
+ let day = String(date.getDate()).padStart(2, '0');
+ let month = date.toLocaleString('en-US', { month: 'short' });
+ let year = date.getFullYear();
+ expirydate = `${day} ${month} ${year}`;
+ let today = new Date();
+ let expiryDate = new Date(expirydateRaw);
+ let days = Math.ceil((expiryDate - today) / (1000 * 60 * 60 * 24));
+ if (days < 0) {
+ statusBadge = '
Expired
';
+ } else if (days <= 30) {
+ statusBadge = '
Expiring Soon
';
} else {
- statusBadge = '
N/A ';
+ statusBadge = '
Active
';
}
+ } else {
+ statusBadge = '
n/a
';
+ }
+
+ if (status == 'unvalidated') {
+
+ validationBadge = '
unvalidated
';
+ } else {
+ validationBadge = '
validated
';
}
return [
- `
${certname} ID: ${certid} `,
- `${productname}${productnumber ? '
SN: ' + productnumber + ' ' : ''}`,
- `
Act ID - Nama AR - Nama User `,
+ index + 1,
+ `
${certname} Cert# : ${certnumber} `,
+ `
#${actid} - ${activity_subject} Owner : ${fullname} `,
issuedate,
expirydate,
statusBadge,
- isval == null
- ? `
`
- : `
`
+ validationBadge,
+ status == 'unvalidated'
+ ? `
`
+ : `
`
];
})
});
@@ -238,19 +282,29 @@ $(function () {
callback({ data: [] });
});
},
- columnDefs: [{
- targets: 5,
- render: function (data, type) {
- if (type === 'sort') {
- if (data.includes('Need Validation')) return 1;
- if (data.includes('Expired')) return 2;
- if (data.includes('Expiring Soon')) return 3;
- if (data.includes('Active')) return 4;
- return 5;
+ columnDefs: [
+ {
+ targets: 4,
+ render: function (data, type) {
+ if (type === 'sort') {
+ if (data.includes('need validation')) return 1;
+ if (data.includes('expired')) return 2;
+ if (data.includes('expiring soon')) return 3;
+ if (data.includes('active')) return 4;
+ return 5;
+ }
+ return data;
}
- return data;
+ },
+ {
+ targets: [5, 6],
+ orderable: false
+ },
+ {
+ targets: 7,
+ orderable: false
}
- }]
+ ]
});
$('#certificatesTable_filter').hide();
@@ -274,57 +328,103 @@ $(function () {
}
});
- // Status filter
$('#statusFilter').on('change', function () {
- let map = {
- active: 'Active',
- expired: 'Expired',
- expiring: 'Expiring Soon',
- isval: 'Need Validation'
- };
- table.column(5).search(map[this.value] || '').draw();
+ let status = $(this).val();
+
+ if (status === '') {
+ table.column(5).search('').draw();
+ } else if (status === 'active') {
+ table.column(5).search('active').draw();
+ } else if (status === 'expired') {
+ table.column(5).search('expired').draw();
+ } else if (status === 'expiring') {
+ table.column(5).search('expiring soon').draw();
+ }
});
// Reset
window.resetFilters = function () {
- $('#searchInput, #statusFilter').val('');
- table.search('').columns().search('').order([5,'asc']).draw();
+ $('#searchInput, #statusFilter, #typeFilter').val('');
+ table.search('').columns().search('').order([4,'asc']).draw();
};
// View PDF
$(document).on('click', '.btn-view', function () {
- let certid = $(this).data('certid');
- window.open('' + certid, '_blank');
+ let certnumber = $(this).data('certnumber');
+ window.open('' + certnumber, '_blank');
});
// Activity report
$(document).on('click', '.activity-report-link', function () {
- let certid = $(this).data('certid');
+ let actid = $(this).data('actid');
window.open(
- '' + certid,
+ '' + actid,
'_blank',
'width=1200,height=800,scrollbars=yes,resizable=yes'
);
});
// Open modal
- $(document).on('click', '.btn-validate', function () {
+ $(document).on('click', '.btn-validate-modal', function () {
let btn = $(this);
+ let certid = btn.data('certid');
- $('#modalCertId').text(btn.data('certid'));
- $('#modalCertName').text(btn.data('certname'));
- $('#modalProductName').text(btn.data('productname'));
- $('#modalProductNumber').text(btn.data('productnumber'));
- $('#modalIssueDate').text(btn.data('issuedate'));
- $('#modalExpiryDate').text(btn.data('expirydate'));
- $('#modalVendor').text(btn.data('vendor'));
+ // POST API call to fetch certificate data
+ $.post(
+ '',
+ { certid },
+ function (data) {
+ // console.log(data);
+ // Populate modal with data
+ $('#modalCertName').text(data.cert_name || '-');
+ $('#modalCertNumber').text(data.cert_number || '-');
+ $('#modalProductName').text(data.productname || '-');
+ $('#modalProductNumber').text(data.productnumber || '-');
+ $('#modalIssueDate').text(data.issued_date || '-');
- $('#confirmValidateBtn').data('certid', btn.data('certid'));
- $('#certificatePreview').attr(
- 'src',
- '' + btn.data('certid')
- );
+ const formattedDate = data.expired_date
+ ? new Date(data.expired_date).toLocaleDateString('en-GB', { day: '2-digit', month: 'short', year: 'numeric' })
+ : '-';
+ $('#modalExpiryDate').text(formattedDate);
+
+ $('#modalSiteName').text(data.sitename || '-');
+ $('#modalValidation').html(`
${data.status || '-'}`);
+
+ const today = new Date();
+ today.setHours(0, 0, 0, 0);
+ const expiryDate = new Date(data.expired_date);
+ expiryDate.setHours(0, 0, 0, 0);
+ const diffTime = expiryDate - today;
+ const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
+ let badge = '';
+ if (diffDays < 0) {
+ // Sudah melewati tanggal expired
+ badge = '
Expired ';
+ } else if (diffDays <= 30) {
+ // Masih aktif tapi sisa 30 hari atau kurang
+ badge = '
Expiring Soon ';
+ } else {
+ // Lebih dari 30 hari
+ badge = '
Active ';
+ }
+ $('#modalExpiryStatus').html(badge);
+
+ $('#modalActivity').text(data.actid ? `#${data.actid} - ${data.subject || '-'}` : '-');
+ $('#modalActivityLink').attr('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}
` : '-');
+ },
+ 'json'
+ ).fail(function () {
+ console.error('Error fetching certificate data');
+ });
+
+ // INI JANGAN DIUBAH
+ $('#confirmValidateBtn').data('certid', certid);
+ $('#certificatePreview').attr('src','' + certid);
$('#validateModal').modal('show');
});
@@ -337,33 +437,14 @@ $(function () {
if (!confirm('Are you sure?')) return;
$.post(
- '',
+ '',
{ certid, certificateType},
function (response) {
if (response.success) {
$('#validateModal').modal('hide');
alert(response.message);
-
- // Generate and save PDF after successful validation
- $.post(
- '',
- { certid, certificateType },
- function (pdfResponse) {
- if (pdfResponse.success) {
- alert('PDF generated and saved successfully!');
- location.reload();
- } else {
- alert('Validation successful but PDF generation failed: ' + (pdfResponse.message || 'Unknown error'));
- location.reload();
- }
- },
- 'json'
- ).fail(function () {
- alert('Validation successful but failed to generate PDF');
- location.reload();
- });
-
+ location.reload();
} else {
alert(response.message || 'Validation failed');
}
diff --git a/app/Views/certificate_training_index.php b/app/Views/certificate_training_index.php
index 20cafe9..0e5a1b5 100644
--- a/app/Views/certificate_training_index.php
+++ b/app/Views/certificate_training_index.php
@@ -1,4 +1,3 @@
-
extend('layouts/main.php') ?>
section('content') ?>
@@ -6,16 +5,9 @@
-
+
Certificates Training Management
-
-
-
-
-
@@ -30,7 +22,16 @@
placeholder="Search certificates by name, product, type, vendor, or dates...">
-
+
+
+ All Status
+ Active
+ Expired
+ Expiring Soon
+ Need Validation
+
+
+
All Types
TMS
@@ -38,29 +39,30 @@
Tokyo Boeki
-
-
-
-
-
- No
- Certificate Name
- Product/Equipment
- Issue Date
- Vendor
- Action
-
-
-
-
-
-
+
+
+
+
+
+ Certificate Name
+ Product/Equipment
+ Activity Report
+ Issue Date
+ Expiry Date
+ Status
+ Action
+
+
+
+
+
@@ -69,366 +71,371 @@
-
-