perbaiki tampilan dan proses pada admin, perbaiki laporan penelitian
This commit is contained in:
1 parent
792d97712c
commit
b58679927c
53 files changed
+98955
-128
No files matched your search
+113
-84
@@ -40,21 +40,25 @@ const db = mysql.createPool({
|
||||
host: process.env.DB_HOST || 'db',
|
||||
user: process.env.DB_USER || 'karan',
|
||||
password: process.env.DB_PASSWORD || 'karan456',
|
||||
database: process.env.DB_NAME || 'tugas1_rpl',
|
||||
database: process.env.DB_NAME || 'db_penelitian',
|
||||
port: process.env.DB_PORT || 3306
|
||||
});
|
||||
|
||||
// Initialize Database
|
||||
const initDB = () => {
|
||||
// 1. Create tb_dosen
|
||||
const queryDosen = `
|
||||
CREATE TABLE IF NOT EXISTS tb_dosen (
|
||||
dosen_id VARCHAR(50) PRIMARY KEY,
|
||||
dosen_name VARCHAR(255) NOT NULL,
|
||||
dosen_password VARCHAR(255) NOT NULL DEFAULT '1234567',
|
||||
dosen_image VARCHAR(255) DEFAULT NULL
|
||||
dosen_image VARCHAR(255) DEFAULT NULL,
|
||||
created_at TIMESTAMP DEFAULT CONVERT_TZ(NOW(), '+00:00', '+08:00'),
|
||||
updated_at TIMESTAMP DEFAULT CONVERT_TZ(NOW(), '+00:00', '+08:00') ON UPDATE CONVERT_TZ(NOW(), '+00:00', '+08:00')
|
||||
)
|
||||
`;
|
||||
|
||||
// 2. Create tb_penelitian
|
||||
const queryPenelitian = `
|
||||
CREATE TABLE IF NOT EXISTS tb_penelitian (
|
||||
id INT AUTO_INCREMENT PRIMARY KEY,
|
||||
@@ -62,18 +66,56 @@ const initDB = () => {
|
||||
judul_penelitian TEXT NOT NULL,
|
||||
tahun_penelitian YEAR NOT NULL,
|
||||
status_penelitian ENUM('Berjalan', 'Selesai') NOT NULL,
|
||||
keterangan TEXT DEFAULT NULL,
|
||||
hasil_publikasi JSON,
|
||||
created_at TIMESTAMP DEFAULT CONVERT_TZ(NOW(), '+00:00', '+08:00'),
|
||||
updated_at TIMESTAMP DEFAULT CONVERT_TZ(NOW(), '+00:00', '+08:00') ON UPDATE CONVERT_TZ(NOW(), '+00:00', '+08:00'),
|
||||
FOREIGN KEY (dosen_id) REFERENCES tb_dosen(dosen_id) ON DELETE CASCADE ON UPDATE CASCADE
|
||||
)
|
||||
`;
|
||||
|
||||
// 3. Create tb_laporan (History/Audit Trail)
|
||||
const queryLaporan = `
|
||||
CREATE TABLE IF NOT EXISTS tb_laporan (
|
||||
id INT AUTO_INCREMENT PRIMARY KEY,
|
||||
penelitian_id INT NOT NULL,
|
||||
dosen_id VARCHAR(50) NOT NULL,
|
||||
judul_penelitian TEXT NOT NULL,
|
||||
tahun_penelitian YEAR NOT NULL,
|
||||
status_penelitian ENUM('Berjalan', 'Selesai') NOT NULL,
|
||||
keterangan TEXT DEFAULT NULL,
|
||||
hasil_publikasi JSON,
|
||||
created_at TIMESTAMP DEFAULT CONVERT_TZ(NOW(), '+00:00', '+08:00'),
|
||||
FOREIGN KEY (penelitian_id) REFERENCES tb_penelitian(id) ON DELETE CASCADE
|
||||
)
|
||||
`;
|
||||
|
||||
db.query(queryDosen, (err) => {
|
||||
if (err) return console.error("Gagal buat tabel dosen:", err);
|
||||
console.log("Tabel tb_dosen siap.");
|
||||
|
||||
db.query(queryPenelitian, (err) => {
|
||||
if (err) console.error("Gagal buat tabel penelitian:", err);
|
||||
else console.log("Tabel tb_penelitian siap.");
|
||||
if (err) return console.error("Gagal buat tabel penelitian:", err);
|
||||
console.log("Tabel tb_penelitian siap.");
|
||||
|
||||
// Add new columns to existing tb_penelitian if they don't exist yet
|
||||
const alterPenelitian = [
|
||||
"ALTER TABLE tb_penelitian ADD COLUMN keterangan TEXT DEFAULT NULL",
|
||||
"ALTER TABLE tb_penelitian ADD COLUMN created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP",
|
||||
"ALTER TABLE tb_penelitian ADD COLUMN updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"
|
||||
];
|
||||
|
||||
alterPenelitian.forEach(q => {
|
||||
db.query(q, (err) => {
|
||||
// Ignore error if column already exists
|
||||
if (err && err.code !== 'ER_DUP_FIELDNAME') console.error("Alter error:", err.message);
|
||||
});
|
||||
});
|
||||
|
||||
db.query(queryLaporan, (err) => {
|
||||
if (err) console.error("Gagal buat tabel laporan:", err);
|
||||
else console.log("Tabel tb_laporan siap.");
|
||||
});
|
||||
});
|
||||
});
|
||||
};
|
||||
@@ -127,11 +169,8 @@ app.get('/dosen/verify', (req, res) => {
|
||||
db.query(query, [dosen_id, dosen_name], (err, results) => {
|
||||
if (err) return res.status(500).json({ valid: false, error: err.message });
|
||||
|
||||
if (results.length > 0) {
|
||||
return res.json({ valid: true, message: "Session valid" });
|
||||
} else {
|
||||
return res.status(401).json({ valid: false, message: "Invalid session" });
|
||||
}
|
||||
if (results.length > 0) return res.json({ valid: true, message: "Session valid" });
|
||||
return res.status(401).json({ valid: false, message: "Invalid session" });
|
||||
});
|
||||
});
|
||||
|
||||
@@ -166,6 +205,8 @@ app.get('/penelitian', (req, res) => {
|
||||
if (nama) { query += " AND d.dosen_name LIKE ?"; params.push(`%${nama}%`); }
|
||||
if (tahun) { query += " AND p.tahun_penelitian = ?"; params.push(tahun); }
|
||||
|
||||
query += " ORDER BY p.updated_at DESC";
|
||||
|
||||
db.query(query, params, (err, results) => {
|
||||
if (err) return res.status(500).json({ error: err.message });
|
||||
res.json(results);
|
||||
@@ -181,110 +222,98 @@ app.get('/penelitian/dosen/:dosen_id', (req, res) => {
|
||||
});
|
||||
});
|
||||
|
||||
// 3. Add Penelitian (Max 3 Files)
|
||||
// 3. Add Penelitian (Max 3 Files) AND Create Initial Laporan
|
||||
app.post('/penelitian', upload.array('files', 3), (req, res) => {
|
||||
const { dosen_id, judul_penelitian, tahun_penelitian, status_penelitian } = req.body;
|
||||
const { dosen_id, judul_penelitian, tahun_penelitian, status_penelitian, keterangan } = req.body;
|
||||
|
||||
let hasilPublikasiJson = null;
|
||||
if (req.files && req.files.length > 0) {
|
||||
hasilPublikasiJson = JSON.stringify(req.files.map(f => f.filename));
|
||||
}
|
||||
|
||||
const query = "INSERT INTO tb_penelitian (dosen_id, judul_penelitian, tahun_penelitian, status_penelitian, hasil_publikasi) VALUES (?, ?, ?, ?, ?)";
|
||||
const insertPenelitian = `
|
||||
INSERT INTO tb_penelitian (dosen_id, judul_penelitian, tahun_penelitian, status_penelitian, keterangan, hasil_publikasi)
|
||||
VALUES (?, ?, ?, ?, ?, ?)
|
||||
`;
|
||||
|
||||
db.query(query, [dosen_id, judul_penelitian, tahun_penelitian, status_penelitian, hasilPublikasiJson], (err, result) => {
|
||||
db.query(insertPenelitian, [dosen_id, judul_penelitian, tahun_penelitian, status_penelitian, keterangan, hasilPublikasiJson], (err, result) => {
|
||||
if (err) return res.status(500).json({ error: err.message });
|
||||
res.json({ message: "Data berhasil disimpan!", id: result.insertId });
|
||||
|
||||
const newId = result.insertId;
|
||||
|
||||
// Also insert into tb_laporan for the initial history
|
||||
const insertLaporan = `
|
||||
INSERT INTO tb_laporan (penelitian_id, dosen_id, judul_penelitian, tahun_penelitian, status_penelitian, keterangan, hasil_publikasi)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?)
|
||||
`;
|
||||
db.query(insertLaporan, [newId, dosen_id, judul_penelitian, tahun_penelitian, status_penelitian, keterangan, hasilPublikasiJson], (err) => {
|
||||
if (err) console.error("Gagal insert history laporan:", err);
|
||||
res.json({ message: "Data berhasil disimpan!", id: newId });
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
// 4. Edit Penelitian (Now with physical file deletion)
|
||||
|
||||
// 4. Edit Penelitian (Update tb_penelitian, then INSERT new snapshot into tb_laporan)
|
||||
app.put('/penelitian/:id', upload.array('files', 3), (req, res) => {
|
||||
const { id } = req.params;
|
||||
const { judul_penelitian, tahun_penelitian, status_penelitian, existing_files } = req.body;
|
||||
// ONLY extract what is allowed to change
|
||||
const { status_penelitian, keterangan, existing_files } = req.body;
|
||||
|
||||
// 1. Get the current data from DB to check what files used to exist
|
||||
const getQuery = "SELECT hasil_publikasi FROM tb_penelitian WHERE id = ?";
|
||||
db.query(getQuery, [id], (err, results) => {
|
||||
db.query("SELECT dosen_id, judul_penelitian, tahun_penelitian, hasil_publikasi FROM tb_penelitian WHERE id = ?", [id], (err, results) => {
|
||||
if (err) return res.status(500).json({ error: err.message });
|
||||
if (results.length === 0) return res.status(404).json({ error: "Data tidak ditemukan" });
|
||||
|
||||
// Safely parse old files
|
||||
let oldFiles = [];
|
||||
try {
|
||||
oldFiles = results[0].hasil_publikasi ? (typeof results[0].hasil_publikasi === 'string' ? JSON.parse(results[0].hasil_publikasi) : results[0].hasil_publikasi) : [];
|
||||
} catch (e) { oldFiles = []; }
|
||||
const dosen_id = results[0].dosen_id;
|
||||
const judul_penelitian = results[0].judul_penelitian; // Keep old title
|
||||
const tahun_penelitian = results[0].tahun_penelitian; // Keep old year
|
||||
|
||||
// Safely parse kept files sent from frontend
|
||||
let keptFiles = [];
|
||||
try {
|
||||
keptFiles = existing_files ? JSON.parse(existing_files) : [];
|
||||
} catch(e) { keptFiles = []; }
|
||||
// Handle files
|
||||
let keptFiles = existing_files ? JSON.parse(existing_files) : [];
|
||||
let newFiles = req.files ? req.files.map(f => f.filename) : [];
|
||||
let finalFiles = [...keptFiles, ...newFiles];
|
||||
|
||||
// 2. Find which files were removed by the user
|
||||
const removedFiles = oldFiles.filter(file => !keptFiles.includes(file));
|
||||
if (finalFiles.length > 3) return res.status(400).json({ error: "Maksimal 3 file publikasi!" });
|
||||
let hasilPublikasiJson = finalFiles.length > 0 ? JSON.stringify(finalFiles) : null;
|
||||
|
||||
// 3. Physically delete the removed files from the uploads folder
|
||||
removedFiles.forEach(file => {
|
||||
const filePath = path.join(uploadDir, file);
|
||||
fs.unlink(filePath, (err) => {
|
||||
if (err) console.error(`Gagal menghapus file fisik: ${file}`, err);
|
||||
else console.log(`File fisik dihapus: ${file}`);
|
||||
});
|
||||
});
|
||||
|
||||
// 4. Proceed with the database update
|
||||
let fileArray = keptFiles;
|
||||
|
||||
// Add newly uploaded files
|
||||
if (req.files && req.files.length > 0) {
|
||||
const newFiles = req.files.map(f => f.filename);
|
||||
fileArray = [...fileArray, ...newFiles];
|
||||
}
|
||||
|
||||
// Enforce max 3 files total
|
||||
if (fileArray.length > 3) {
|
||||
return res.status(400).json({ error: "Maksimal 3 file publikasi!" });
|
||||
}
|
||||
|
||||
const hasilPublikasiJson = fileArray.length > 0 ? JSON.stringify(fileArray) : null;
|
||||
const updateQuery = "UPDATE tb_penelitian SET judul_penelitian = ?, tahun_penelitian = ?, status_penelitian = ?, hasil_publikasi = ? WHERE id = ?";
|
||||
|
||||
db.query(updateQuery, [judul_penelitian, tahun_penelitian, status_penelitian, hasilPublikasiJson, id], (err, result) => {
|
||||
// 1. Update the main table (Only Status, Keterangan, and Files)
|
||||
const updateQuery = `
|
||||
UPDATE tb_penelitian
|
||||
SET status_penelitian = ?, keterangan = ?, hasil_publikasi = ?
|
||||
WHERE id = ?
|
||||
`;
|
||||
db.query(updateQuery, [status_penelitian, keterangan, hasilPublikasiJson, id], (err) => {
|
||||
if (err) return res.status(500).json({ error: err.message });
|
||||
res.json({ message: "Data berhasil diupdate!" });
|
||||
|
||||
// 2. Insert snapshot into tb_laporan (use old title and year)
|
||||
const logQuery = `
|
||||
INSERT INTO tb_laporan (penelitian_id, dosen_id, judul_penelitian, tahun_penelitian, status_penelitian, keterangan, hasil_publikasi)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?)
|
||||
`;
|
||||
db.query(logQuery, [id, dosen_id, judul_penelitian, tahun_penelitian, status_penelitian, keterangan, hasilPublikasiJson], (errLog) => {
|
||||
if (errLog) return res.status(500).json({ error: "Gagal membuat laporan update: " + errLog.message });
|
||||
res.json({ message: "Data berhasil diupdate dan laporan baru dibuat!" });
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
// 5. Delete Penelitian (Now also deletes physical files)
|
||||
// 5. Delete Penelitian (No physical file deletion, just delete DB record)
|
||||
// Since ON DELETE CASCADE is applied, deleting this will also delete all tb_laporan related to it
|
||||
app.delete('/penelitian/:id', (req, res) => {
|
||||
const getQuery = "SELECT hasil_publikasi FROM tb_penelitian WHERE id = ?";
|
||||
|
||||
db.query(getQuery, [req.params.id], (err, results) => {
|
||||
const deleteQuery = "DELETE FROM tb_penelitian WHERE id = ?";
|
||||
db.query(deleteQuery, [req.params.id], (err, result) => {
|
||||
if (err) return res.status(500).json({ error: err.message });
|
||||
|
||||
if (results.length > 0) {
|
||||
// Try to delete files from the folder before deleting the DB record
|
||||
let files = [];
|
||||
try {
|
||||
files = results[0].hasil_publikasi ? (typeof results[0].hasil_publikasi === 'string' ? JSON.parse(results[0].hasil_publikasi) : results[0].hasil_publikasi) : [];
|
||||
} catch(e) { files = []; }
|
||||
res.json({ message: "Data berhasil dihapus!" });
|
||||
});
|
||||
});
|
||||
|
||||
files.forEach(file => {
|
||||
const filePath = path.join(uploadDir, file);
|
||||
fs.unlink(filePath, (err) => {
|
||||
if (err) console.error(`Gagal menghapus file fisik: ${file}`, err);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// Delete from database
|
||||
const deleteQuery = "DELETE FROM tb_penelitian WHERE id = ?";
|
||||
db.query(deleteQuery, [req.params.id], (err, result) => {
|
||||
if (err) return res.status(500).json({ error: err.message });
|
||||
res.json({ message: "Data berhasil dihapus!" });
|
||||
});
|
||||
// 6. Get Laporan History by Penelitian ID
|
||||
app.get('/laporan/:penelitian_id', (req, res) => {
|
||||
const query = "SELECT * FROM tb_laporan WHERE penelitian_id = ? ORDER BY created_at DESC";
|
||||
db.query(query, [req.params.penelitian_id], (err, results) => {
|
||||
if (err) return res.status(500).json({ error: err.message });
|
||||
res.json(results);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
Reference in new issue
Block a user