diff --git a/be/index.js b/be/index.js index e780e45..8eccfdf 100644 --- a/be/index.js +++ b/be/index.js @@ -71,7 +71,6 @@ const db = mysql.createPool({ password: process.env.DB_PASSWORD || 'karan456', database: process.env.DB_NAME || 'db_penelitian', port: process.env.DB_PORT || 3306, - timezone: '+08:00', }); // Initialize Database @@ -171,61 +170,56 @@ const initDB = () => { // Function to create the +8 hour triggers const createTimezoneTriggers = () => { - const triggers = [ + // Array of queries to run sequentially + const queries = [ // tb_dosen `DROP TRIGGER IF EXISTS trg_dosen_insert;`, - `CREATE TRIGGER trg_dosen_insert BEFORE INSERT ON tb_dosen FOR EACH ROW - BEGIN - SET NEW.created_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); - SET NEW.updated_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); - END;`, + `CREATE TRIGGER trg_dosen_insert BEFORE INSERT ON tb_dosen FOR EACH ROW BEGIN SET NEW.created_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); SET NEW.updated_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); END;`, `DROP TRIGGER IF EXISTS trg_dosen_update;`, - `CREATE TRIGGER trg_dosen_update BEFORE UPDATE ON tb_dosen FOR EACH ROW - BEGIN - SET NEW.updated_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); - END;`, + `CREATE TRIGGER trg_dosen_update BEFORE UPDATE ON tb_dosen FOR EACH ROW BEGIN SET NEW.updated_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); END;`, // tb_penelitian `DROP TRIGGER IF EXISTS trg_penelitian_insert;`, - `CREATE TRIGGER trg_penelitian_insert BEFORE INSERT ON tb_penelitian FOR EACH ROW - BEGIN - SET NEW.created_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); - SET NEW.updated_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); - END;`, + `CREATE TRIGGER trg_penelitian_insert BEFORE INSERT ON tb_penelitian FOR EACH ROW BEGIN SET NEW.created_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); SET NEW.updated_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); END;`, `DROP TRIGGER IF EXISTS trg_penelitian_update;`, - `CREATE TRIGGER trg_penelitian_update BEFORE UPDATE ON tb_penelitian FOR EACH ROW - BEGIN - SET NEW.updated_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); - END;`, + `CREATE TRIGGER trg_penelitian_update BEFORE UPDATE ON tb_penelitian FOR EACH ROW BEGIN SET NEW.updated_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); END;`, // tb_laporan `DROP TRIGGER IF EXISTS trg_laporan_insert;`, - `CREATE TRIGGER trg_laporan_insert BEFORE INSERT ON tb_laporan FOR EACH ROW - BEGIN - SET NEW.created_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); - END;`, + `CREATE TRIGGER trg_laporan_insert BEFORE INSERT ON tb_laporan FOR EACH ROW BEGIN SET NEW.created_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); END;`, // tb_mahasiswa `DROP TRIGGER IF EXISTS trg_mahasiswa_insert;`, - `CREATE TRIGGER trg_mahasiswa_insert BEFORE INSERT ON tb_mahasiswa FOR EACH ROW - BEGIN - SET NEW.created_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); - SET NEW.updated_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); - END;`, + `CREATE TRIGGER trg_mahasiswa_insert BEFORE INSERT ON tb_mahasiswa FOR EACH ROW BEGIN SET NEW.created_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); SET NEW.updated_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); END;`, `DROP TRIGGER IF EXISTS trg_mahasiswa_update;`, - `CREATE TRIGGER trg_mahasiswa_update BEFORE UPDATE ON tb_mahasiswa FOR EACH ROW - BEGIN - SET NEW.updated_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); - END;` + `CREATE TRIGGER trg_mahasiswa_update BEFORE UPDATE ON tb_mahasiswa FOR EACH ROW BEGIN SET NEW.updated_at = DATE_ADD(NOW(), INTERVAL 8 HOUR); END;` ]; - triggers.forEach(q => { - db.query(q, (err) => { - if (err) console.error("Trigger Error:", err.message); + // Execute queries sequentially to prevent race conditions + let i = 0; + const nextQuery = () => { + if (i >= queries.length) { + console.log("Timezone Triggers (+8 Hours) siap."); + return; + } + db.query(queries[i], (err) => { + if (err) { + console.error(`Trigger Error [${i}]:`, err.message); + // If a drop trigger fails, it means it doesn't exist. We can safely continue. + if (!err.message.includes("does not exist")) { + // If it's a create trigger error, log it loudly. + if(queries[i].toUpperCase().startsWith("CREATE")) { + console.error(`Fatal Trigger Error: ${queries[i]}`); + } + } + } + i++; + nextQuery(); }); - }); - console.log("Timezone Triggers (+8 Hours) siap."); + }; + nextQuery(); }; + setTimeout(initDB, 5000); app.get('/', (req, res) => { @@ -573,6 +567,21 @@ app.get('/laporan/latest/:dosen_id', (req, res) => { }); }); +// Get Laporan Statistics (Group by Date) +app.get('/laporan/stats/daily', (req, res) => { + // We group by DATE(created_at) and count how many entries there are per date + const query = ` + SELECT DATE(created_at) as date, COUNT(*) as total + FROM tb_laporan + GROUP BY DATE(created_at) + ORDER BY DATE(created_at) ASC + `; + db.query(query, (err, results) => { + if (err) return res.status(500).json({ error: err.message }); + res.json(results); + }); +}); + app.use('/uploads', express.static(uploadDir)); app.listen(3000, () => console.log('API berjalan di port 3000')); \ No newline at end of file diff --git a/web/admin_index.html b/web/admin_index.html index d273d0f..6987b59 100644 --- a/web/admin_index.html +++ b/web/admin_index.html @@ -127,6 +127,17 @@ +
+
+
+

Statistik Penelitian

+
+ +
+
+
+
+
@@ -175,6 +186,9 @@ + + + @@ -204,6 +218,61 @@ }); } + // --- CHART RENDERING FUNCTION --- + function renderChart() { + $.get('/api/laporan/stats/daily', function(data) { + const labels = []; + const counts = []; + + // Extract dates and counts + data.forEach(item => { + // Format date from YYYY-MM-DD to DD MMM + const dateObj = new Date(item.date); + const formattedDate = dateObj.toLocaleDateString('id-ID', { day: '2-digit', month: 'short' }); + labels.push(formattedDate); + counts.push(item.total); + }); + + const ctx = document.getElementById('penelitianChart').getContext('2d'); + + new Chart(ctx, { + type: 'line', + data: { + labels: labels, + datasets: [{ + label: 'Jumlah Submit/Update Penelitian', + data: counts, + backgroundColor: 'rgba(54, 162, 235, 0.2)', + borderColor: 'rgba(54, 162, 235, 1)', + borderWidth: 2, + pointBackgroundColor: 'rgba(54, 162, 235, 1)', + pointRadius: 4, + fill: true, + tension: 0.3 // Makes the line slightly curved + }] + }, + options: { + responsive: true, + maintainAspectRatio: false, + scales: { + y: { + beginAtZero: true, + ticks: { + stepSize: 1 // Ensure integers on Y axis + } + } + }, + plugins: { + legend: { + display: true, + position: 'top' + } + } + } + }); + }); + } + $(document).ready(function () { document.body.style.display = 'block'; @@ -280,6 +349,9 @@ $('#h_jumlah_dosen').text('0'); } }); + + // 4. Render the Chart + renderChart(); }); diff --git a/web/dosen.html b/web/dosen.html index 9ed3620..7842264 100644 --- a/web/dosen.html +++ b/web/dosen.html @@ -429,6 +429,31 @@ let isViewMode = false; let currentViewId = null; + // --- DATE FORMATTER (ISO String to "DD Mon YYYY, HH.mm") --- + function formatDateOnly(dateString) { + if (!dateString) return '-'; + + // If it's already in "YYYY-MM-DD HH:mm:ss" format, just format it + if (!dateString.includes('T')) { + // Replace T with space, then remove the seconds + let cleanStr = dateString.replace('T', ' '); + return cleanStr.substring(0, 16).replace(/-/g, ' ').replace(':', '.'); + } + + const date = new Date(dateString); + + // Use UTC getters because the DB stores WIB as "UTC" in the ISO string + const months = ['Jan', 'Feb', 'Mar', 'Apr', 'Mei', 'Jun', 'Jul', 'Agu', 'Sep', 'Okt', 'Nov', 'Des']; + + const day = String(date.getUTCDate()).padStart(2, '0'); + const month = months[date.getUTCMonth()]; + const year = date.getUTCFullYear(); + const hours = String(date.getUTCHours()).padStart(2, '0'); + const minutes = String(date.getUTCMinutes()).padStart(2, '0'); + + return `${day} ${month} ${year}, ${hours}.${minutes}`; + } + // Custom Search Logic $.fn.dataTable.ext.search.push( function (settings, data, dataIndex) { @@ -471,6 +496,16 @@ if (dosenName) document.getElementById('dosenName').textContent = dosenName; if (dosenId) document.getElementById('dosenId').value = dosenId; + // Fetch current profile image + $.get(`/api/dosen`, function (data) { + const dosen = data.find(d => d.dosen_id === dosenId); + if (dosen && dosen.dosen_image) { + const imgUrl = `/api/images/dosen/${dosen.dosen_image}`; + $('#profileImagePreview').attr('src', imgUrl); + $('#foto_dosen').attr('src', imgUrl); + } + }); + // 1. Populate Years for the Form (Tambah/Edit) const yearSelect = document.getElementById('tahun_penelitian'); for (let y = 2026; y >= 2010; y--) { @@ -499,16 +534,12 @@ // 3. Add Event Listener to "Tahun Dari" $('#searchTahunFrom').on('change', function () { const selectedFrom = $(this).val(); - - // Reset "Tahun Sampai" toSelect.innerHTML = ''; if (selectedFrom) { - // Enable "Tahun Sampai" if a start year is selected toSelect.disabled = false; toSelect.innerHTML = ''; - // Populate "Tahun Sampai" starting from the selected "Tahun Dari" up to 2026 for (let y = parseInt(selectedFrom); y <= 2026; y++) { let opt = document.createElement('option'); opt.value = y; @@ -516,28 +547,16 @@ toSelect.appendChild(opt); } } else { - // If "Tahun Dari" is cleared, disable "Tahun Sampai" again toSelect.disabled = true; toSelect.innerHTML = ''; } - // Redraw table to clear any previous filter applyCustomFilter(); }); initDataTable(dosenId); }); - - function formatDate(dateString) { - if (!dateString) return '-'; - const date = new Date(dateString); - return date.toLocaleString('id-ID', { - day: '2-digit', month: 'short', year: 'numeric', - hour: '2-digit', minute: '2-digit' - }); - } - function initDataTable(dosenId) { dataTable = $('#tablePenelitian').DataTable({ ajax: { @@ -557,7 +576,9 @@ }, { data: 'updated_at', - render: function (data) { return formatDate(data); } + render: function (data) { + return formatDateOnly(data); + } }, { data: null, @@ -571,18 +592,14 @@ } ], order: [[4, "desc"]], - // REPLACED initComplete WITH drawCallback drawCallback: function () { - // Get all data from the DataTable instance const data = this.api().rows().data().toArray(); updateStatistics(data); } }); } - - - // NEW FUNCTION: Calculate and update the dashboard cards + // Calculate and update the dashboard cards function updateStatistics(data) { let total = data.length; let selesai = 0; @@ -593,7 +610,6 @@ if (item.status_penelitian === 'Selesai') selesai++; if (item.status_penelitian === 'Berjalan') berjalan++; - // Find the most recent updated_at date if (item.updated_at) { const itemDate = new Date(item.updated_at); if (!latestUpdate || itemDate > latestUpdate) { @@ -602,13 +618,11 @@ } }); - // Update the DOM elements $('#h_jumlah_penelitian').text(total); $('#h_penelitian_selesai').text(selesai); $('#h_penelitian_berjalan').text(berjalan); if (latestUpdate) { - // Format to show just the day, month, and year const options = { day: '2-digit', month: 'short', year: 'numeric' }; $('#h_terakhir_update').text(latestUpdate.toLocaleDateString('id-ID', options)); } else { @@ -663,21 +677,19 @@ $('#keterangan').val(item.keterangan || ''); renderExistingFiles(item.hasil_publikasi); - $('#lblCreated').text(formatDate(item.created_at)); - $('#lblUpdated').text(formatDate(item.updated_at)); + $('#lblCreated').text(formatDateOnly(item.created_at)); + $('#lblUpdated').text(formatDateOnly(item.updated_at)); $('#timestampInfo').show(); } }); } - function editPenelitian(id) { resetModal(); $('#modalLabel').text('Update Penelitian'); $('#penelitianId').val(id); $('#modalPenelitian').modal('show'); - // Disable Judul and Tahun for Edit mode $('#judul_penelitian').prop('disabled', true); $('#tahun_penelitian').prop('disabled', true); @@ -693,8 +705,6 @@ }); } - - function renderExistingFiles(filesData) { if (Array.isArray(filesData)) { currentEditFiles = filesData; @@ -771,7 +781,7 @@
Update #${data.length - index} - ${formatDate(log.created_at)} + ${formatDateOnly(log.created_at)}
@@ -931,6 +941,7 @@ } + \ No newline at end of file