diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 5291372..0000000 --- a/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,3 +0,0 @@ -wrapperVersion=3.3.4 -distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip diff --git a/src/main/java/com/gcc_manpower/gccservicedocuments/controller/GccServiceDocumentsController.java b/src/main/java/com/gcc_manpower/gccservicedocuments/controller/GccServiceDocumentsController.java index 0cf9d44..c051ec8 100644 --- a/src/main/java/com/gcc_manpower/gccservicedocuments/controller/GccServiceDocumentsController.java +++ b/src/main/java/com/gcc_manpower/gccservicedocuments/controller/GccServiceDocumentsController.java @@ -261,6 +261,7 @@ public class GccServiceDocumentsController { public Map updateFile( @RequestParam("id") Long id, @RequestParam("title") String title, + @RequestParam("mainCategory") String mainCategory, @RequestParam("subCategory") String subCategory, @RequestParam("fileType") String fileType, @RequestParam(value = "file", required = false) MultipartFile file, @@ -274,7 +275,8 @@ public class GccServiceDocumentsController { return response; } - if (title == null || title.trim().isEmpty() || subCategory == null || subCategory.trim().isEmpty() + if (title == null || title.trim().isEmpty() || mainCategory == null || mainCategory.trim().isEmpty() + || subCategory == null || subCategory.trim().isEmpty() || fileType == null || fileType.trim().isEmpty()) { response.put("success", false); response.put("error", "Required fields cannot be empty."); @@ -318,7 +320,7 @@ public class GccServiceDocumentsController { fileWebUrl = "/gccservicedocuments/files/" + cleanCategory + "/" + savedFilename; } - boolean updated = documentService.updateDocument(id, title.trim(), subCategory.trim(), fileType.trim(), + boolean updated = documentService.updateDocument(id, title.trim(), mainCategory.trim(), subCategory.trim(), fileType.trim(), fileWebUrl, originalFilename); if (updated) { diff --git a/src/main/java/com/gcc_manpower/gccservicedocuments/service/GccServiceDocumentsService.java b/src/main/java/com/gcc_manpower/gccservicedocuments/service/GccServiceDocumentsService.java index 2415556..b24237d 100644 --- a/src/main/java/com/gcc_manpower/gccservicedocuments/service/GccServiceDocumentsService.java +++ b/src/main/java/com/gcc_manpower/gccservicedocuments/service/GccServiceDocumentsService.java @@ -226,7 +226,7 @@ public class GccServiceDocumentsService { return null; } - public boolean updateDocument(Long id, String title, String subCategory, String fileType, String filePath, + public boolean updateDocument(Long id, String title, String mainCategory, String subCategory, String fileType, String filePath, String originalFilename) { // Insert old record into history before update try { @@ -252,17 +252,10 @@ public class GccServiceDocumentsService { // Resolve subCategoryId and fileTypeId int subCategoryId = 0; - String findSubSql = "SELECT id FROM sub_category_list WHERE category_name = ? AND is_delete = 0 LIMIT 1"; try { - List ids = jdbcTemplate.queryForList(findSubSql, Integer.class, subCategory.trim()); - if (!ids.isEmpty()) { - subCategoryId = ids.get(0); - } else { - // Find old document's main category ID - String oldMainCatSql = "SELECT s.mid FROM documents_uploads d JOIN sub_category_list s ON d.category = s.id WHERE d.id = ?"; - List mids = jdbcTemplate.queryForList(oldMainCatSql, Integer.class, id); - int mid = mids.isEmpty() ? 1 : mids.get(0); - subCategoryId = getOrCreateSubCategory(subCategory, mid); + int mainCategoryId = getOrCreateMainCategory(mainCategory); + if (mainCategoryId != 0) { + subCategoryId = getOrCreateSubCategory(subCategory, mainCategoryId); } } catch (Exception e) { System.err.println("Error resolving subcategory: " + e.getMessage()); diff --git a/src/main/java/com/gcc_manpower/service/AppUserService.java b/src/main/java/com/gcc_manpower/service/AppUserService.java index e3198af..78ee16b 100644 --- a/src/main/java/com/gcc_manpower/service/AppUserService.java +++ b/src/main/java/com/gcc_manpower/service/AppUserService.java @@ -520,6 +520,7 @@ public class AppUserService { " h.email, " + " h.mobile, " + " h.updated_date, " + + " COALESCE(u.usr_name, h.updated_by) AS updated_by_name, " + " COALESCE(v.vendor_name, h.vendor_id) AS vendor_name, " + " COALESCE(ut.usertype, h.user_type) AS user_type, " + " COALESCE(des.designation, h.designation) AS designation, " + @@ -527,10 +528,9 @@ public class AppUserService { "FROM employee_details_update_history h " + "LEFT JOIN vendor_details v ON (h.vendor_id = CAST(v.id AS CHAR) OR h.vendor_id = v.vendor_name) " + "LEFT JOIN user_type_details ut ON (h.user_type = CAST(ut.id AS CHAR) OR h.user_type = ut.usertype) " + - "LEFT JOIN employee_workorder_details des ON (h.designation = CAST(des.id AS CHAR) OR h.designation = des.designation) " - + - "LEFT JOIN employee_location_details loc ON (h.location = CAST(loc.id AS CHAR) OR h.location = loc.location_name) " - + + "LEFT JOIN employee_workorder_details des ON (h.designation = CAST(des.id AS CHAR) OR h.designation = des.designation) " + + "LEFT JOIN employee_location_details loc ON (h.location = CAST(loc.id AS CHAR) OR h.location = loc.location_name) " + + "LEFT JOIN app_user u ON (h.updated_by = CAST(u.usr_id AS CHAR) OR h.updated_by = u.usr_name) " + "WHERE h.emp_code = ? " + "ORDER BY h.updated_date DESC"; try { diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html index 011384c..4f7ff00 100644 --- a/src/main/resources/templates/fragments/navbar.html +++ b/src/main/resources/templates/fragments/navbar.html @@ -40,6 +40,12 @@ Delete Employee +
  • + + Deleted Employees + +
  • diff --git a/src/main/resources/templates/gccservicedocuments/view.html b/src/main/resources/templates/gccservicedocuments/view.html index 73954ba..85070f7 100644 --- a/src/main/resources/templates/gccservicedocuments/view.html +++ b/src/main/resources/templates/gccservicedocuments/view.html @@ -788,11 +788,13 @@ } let allFilterSubcategories = []; + let allMainCategories = []; function loadCategories() { fetch(contextPath + 'gccservicedocuments/api/main-categories') .then(response => response.json()) .then(mainCats => { + allMainCategories = mainCats; const select = document.getElementById('filter-main-category'); mainCats.forEach(cat => { const option = document.createElement('option'); @@ -1083,7 +1085,7 @@ if (isAdmin) { editButtonHtml = ` - @@ -1157,9 +1159,16 @@ }, 300); } - function editDocument(event, id, currentTitle, currentSubcategory, currentFileType) { + function editDocument(event, id, currentTitle, currentSubcategory, currentFileType, currentMainCategory) { event.stopPropagation(); + // Build options for main category dropdown + let mainCatOptions = ''; + allMainCategories.forEach(cat => { + const isSelected = cat.main_category_name.toLowerCase() === (currentMainCategory || '').toLowerCase() ? 'selected' : ''; + mainCatOptions += ``; + }); + // Build options for subcategory dropdown let subcatOptions = ''; allFilterSubcategories.forEach(sub => { @@ -1181,6 +1190,12 @@ +
    + + +
    +
    @@ -948,6 +948,7 @@ Designation Location Vendor Name + Last Updated By @@ -1193,6 +1194,115 @@ + + + + + + @@ -2312,11 +2422,23 @@ if (isAdmin) { actionTd = ` - +
    + + + +
    `; } @@ -2660,7 +2782,7 @@ tbody.innerHTML = ` - + @@ -2695,6 +2817,7 @@ ${escapeHtml(item.designation || '-')} ${escapeHtml(item.location || '-')} ${escapeHtml(item.vendor_name || '-')} + ${escapeHtml(item.updated_by_name || '-')} `; tbody.appendChild(tr); }); @@ -2703,7 +2826,7 @@ console.error("Error fetching employee history:", err); tbody.innerHTML = ` - + Failed to load history records. @@ -2744,7 +2867,7 @@ designation: designation, location: location, vendor_id: vendorId, - joined_date: joinedDate + joined_date: joinedDate ? joinedDate : null }) }) .then(res => res.json()) @@ -2968,6 +3091,11 @@ if (modalEl) { bootstrap.Modal.getOrCreateInstance(modalEl).show(); } + } else if (action === 'deletedEmployees') { + const modalEl = document.getElementById('deletedEmployeesModal'); + if (modalEl) { + bootstrap.Modal.getOrCreateInstance(modalEl).show(); + } } // Initialize Flatpickr datepickers for dd/mm/yyyy display format @@ -3060,6 +3188,12 @@ deleteModalEl.addEventListener("hidden.bs.modal", resetDeleteEmployeeModal); } + const deletedModalEl = document.getElementById("deletedEmployeesModal"); + if (deletedModalEl) { + deletedModalEl.addEventListener("show.bs.modal", fetchAndShowDeletedEmployees); + deletedModalEl.addEventListener("hidden.bs.modal", resetDeletedEmployeesModal); + } + // Initialize designation dropdown options on load updateDesignationDropdown(); }); @@ -3654,6 +3788,225 @@ showUpdateInitialMessage(); } + // Edit Employee from list + function editEmployee(empCode) { + // Hide details modal if open + const detailsModalEl = document.getElementById("employeeDetailsModal"); + if (detailsModalEl) { + const detailsModal = bootstrap.Modal.getInstance(detailsModalEl); + if (detailsModal) detailsModal.hide(); + } + + // Show update modal + const updateModalEl = document.getElementById("updateEmployeeModal"); + if (updateModalEl) { + const updateModal = bootstrap.Modal.getOrCreateInstance(updateModalEl); + updateModal.show(); + searchEmployee(empCode); + } + } + + // Show Employee history modal + function showEmployeeHistory(empCode, empName) { + document.getElementById("history-modal-emp-name").textContent = `${empName} (${empCode})`; + const tbody = document.getElementById("history-modal-tbody"); + const noHistoryEl = document.getElementById("history-modal-no-history"); + + tbody.innerHTML = ` + + + +

    Loading employee update history...

    + + + `; + noHistoryEl.style.display = "none"; + + const modalElement = document.getElementById("employeeHistoryModal"); + const modal = bootstrap.Modal.getOrCreateInstance(modalElement); + modal.show(); + + fetch(contextPath + 'api/employee/history?empCode=' + encodeURIComponent(empCode)) + .then(res => res.json()) + .then(historyList => { + tbody.innerHTML = ""; + if (!historyList || historyList.length === 0) { + noHistoryEl.style.display = "block"; + return; + } + noHistoryEl.style.display = "none"; + + historyList.forEach((item, index) => { + const tr = document.createElement("tr"); + const formattedDate = formatDateTime(item.updated_date); + + tr.innerHTML = ` + ${index + 1} + ${escapeHtml(formattedDate)} + ${escapeHtml(item.name || '-')} + ${escapeHtml(item.email || '-')} + ${escapeHtml(item.mobile || '-')} + ${escapeHtml(item.user_type || '-')} + ${escapeHtml(item.designation || '-')} + ${escapeHtml(item.location || '-')} + ${escapeHtml(item.vendor_name || '-')} + ${escapeHtml(item.updated_by_name || '-')} + `; + tbody.appendChild(tr); + }); + }) + .catch(err => { + console.error("Error fetching employee history:", err); + tbody.innerHTML = ` + + + +

    Failed to load history records.

    + + + `; + }); + } + + // Globals for Deleted Employees Modal + let deletedEmployeesList = []; + let filteredDeletedEmployeesList = []; + + function fetchAndShowDeletedEmployees() { + const tbody = document.getElementById("deleted-employee-tbody"); + tbody.innerHTML = ` + + + +

    Loading deleted employees...

    + + + `; + document.getElementById("no-deleted-employees-found").style.display = "none"; + document.getElementById("deleted-employee-search-input").value = ""; + + fetch(contextPath + 'api/all-employees-with-deleted') + .then(res => res.json()) + .then(data => { + // Filter to only include inactive/deleted employees + deletedEmployeesList = data.filter(emp => (emp.isdelete === true || emp.isactive === false || parseInt(emp.isdelete) === 1 || parseInt(emp.isactive) === 0)); + filterDeletedEmployees(); + }) + .catch(err => { + console.error("Error fetching deleted employees:", err); + tbody.innerHTML = ` + + + +

    Failed to connect to server and fetch database records. Please try again.

    + + + `; + }); + } + + function filterDeletedEmployees() { + const query = document.getElementById("deleted-employee-search-input").value.toLowerCase().trim(); + + if (query === "") { + filteredDeletedEmployeesList = deletedEmployeesList; + } else { + filteredDeletedEmployeesList = deletedEmployeesList.filter(emp => { + return (emp.name && emp.name.toLowerCase().includes(query)) || + (emp.emp_code && emp.emp_code.toLowerCase().includes(query)) || + (emp.designation && emp.designation.toLowerCase().includes(query)) || + (emp.location && emp.location.toLowerCase().includes(query)) || + (emp.email && emp.email.toLowerCase().includes(query)) || + (emp.mobile && emp.mobile.toLowerCase().includes(query)) || + (emp.vendor_name && emp.vendor_name.toLowerCase().includes(query)) || + (emp.user_type && emp.user_type.toLowerCase().includes(query)); + }); + } + + renderDeletedEmployeesTable(filteredDeletedEmployeesList); + } + + function renderDeletedEmployeesTable(list) { + const tbody = document.getElementById("deleted-employee-tbody"); + const noEmployeesEl = document.getElementById("no-deleted-employees-found"); + tbody.innerHTML = ""; + + if (list.length === 0) { + noEmployeesEl.style.display = "block"; + return; + } + + noEmployeesEl.style.display = "none"; + + list.forEach((emp, index) => { + const tr = document.createElement("tr"); + tr.style.backgroundColor = "#fdf2f2"; // light pink background for soft-deleted rows + tr.innerHTML = ` + ${index + 1} + ${escapeHtml(emp.emp_code || '-')} + ${escapeHtml(emp.name || '-')} + ${escapeHtml(emp.email || '-')} + ${escapeHtml(emp.mobile || '-')} + ${escapeHtml(emp.user_type || '-')} + ${escapeHtml(emp.designation || '-')} + ${escapeHtml(emp.location || '-')} + ${escapeHtml(emp.vendor_name || '-')} + ${escapeHtml(formatDateTime(emp.updated_at || emp.cdate))} + ${escapeHtml(emp.updated_by_name || '-')} + Inactive + `; + tbody.appendChild(tr); + }); + } + + function resetDeletedEmployeesModal() { + document.getElementById("deleted-employee-search-input").value = ""; + document.getElementById("deleted-employee-tbody").innerHTML = ""; + document.getElementById("no-deleted-employees-found").style.display = "none"; + deletedEmployeesList = []; + filteredDeletedEmployeesList = []; + } + + function exportDeletedEmployeesToCSV() { + if (filteredDeletedEmployeesList.length === 0) { + alert("No employee records to export!"); + return; + } + + let csvContent = "data:text/csv;charset=utf-8,"; + csvContent += "S.No,Employee Code,Name,Email,Mobile,User Type,Designation,Location,Vendor Name,Last Updated On,Last Updated By,Status\n"; + + filteredDeletedEmployeesList.forEach((emp, index) => { + const row = [ + index + 1, + `"${(emp.emp_code || '-').replace(/"/g, '""')}"`, + `"${(emp.name || '-').replace(/"/g, '""')}"`, + `"${(emp.email || '-').replace(/"/g, '""')}"`, + `"${(emp.mobile || '-').replace(/"/g, '""')}"`, + `"${(emp.user_type || '-').replace(/"/g, '""')}"`, + `"${(emp.designation || '-').replace(/"/g, '""')}"`, + `"${(emp.location || '-').replace(/"/g, '""')}"`, + `"${(emp.vendor_name || '-').replace(/"/g, '""')}"`, + `"${formatDateTime(emp.updated_at || emp.cdate)}"`, + `"${(emp.updated_by_name || '-').replace(/"/g, '""')}"`, + "Inactive" + ]; + csvContent += row.join(",") + "\n"; + }); + + const encodedUri = encodeURI(csvContent); + const link = document.createElement("a"); + link.setAttribute("href", encodedUri); + link.setAttribute("download", "deleted_employees.csv"); + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + } + function resetDeleteEmployeeModal() { document.getElementById("delete-modal-vendor-select").value = ""; document.getElementById("delete-modal-workorder-select").innerHTML = '';