From c7c982f7841b5fd6ed42387db8f7d5a8880ec665 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Mon, 1 Sep 2025 09:40:22 +0530 Subject: [PATCH 01/61] CHANGE_UI_FIX - VADIVEL J 2025-09-01 --- app/Views/DashBoard.php | 25 +------ app/Views/employee_list.php | 6 ++ app/Views/employee_upload.php | 38 ++++++++++- app/Views/import_export.php | 18 ++--- app/Views/layout/footer.php | 14 ++++ app/Views/layout/header.php | 67 ++++++++++++++++++- .../policy_transaction_inception_list.php | 12 +++- 7 files changed, 145 insertions(+), 35 deletions(-) diff --git a/app/Views/DashBoard.php b/app/Views/DashBoard.php index 4aa74f18..aa1ffa89 100755 --- a/app/Views/DashBoard.php +++ b/app/Views/DashBoard.php @@ -167,28 +167,11 @@ } } - .navtab-bg .nav-link { - margin: 0 5px 10px!important; - } - - .nav-link{ - color:black !important; - background-color: #D4F5F6 !important; - font-size: small; - padding:8px; - border-radius: 10px !important; - } - .nav-link.active-tab { - color: white !important; - background-color: #00999E !important; - font-size: small; - padding:8px; - border-radius: 10px !important; - - } .tab-content-styles{ background-color:#F4F4F4; margin-right:20px; + margin-left:20px; + margin-top:0px !important; border-radius:25px!important; min-height: 70vh !important; } @@ -208,8 +191,6 @@
- -
    @@ -275,7 +256,7 @@
-
+
diff --git a/app/Views/employee_list.php b/app/Views/employee_list.php index 317875fd..79a04ff9 100755 --- a/app/Views/employee_list.php +++ b/app/Views/employee_list.php @@ -45,6 +45,12 @@ table.dataTable tbody td { color: #16181b !important; cursor: pointer !important; } + + .row{ + margin-right:20px !important; + margin-left:30px !important; + } +
diff --git a/app/Views/employee_upload.php b/app/Views/employee_upload.php index ab566571..9fa5c433 100755 --- a/app/Views/employee_upload.php +++ b/app/Views/employee_upload.php @@ -72,7 +72,6 @@ option:disabled {
-
@@ -98,7 +97,9 @@ option:disabled {
OR
+ style="margin-top: 26px;position: relative;left: 65px;"> +

OR

+
+
+ +
+ +
+  [ Sample Excel ] +
+ + +       + + + +    + + OR + +    + + Fetch + Enrolled Data + +
+ + +
diff --git a/app/Views/import_export.php b/app/Views/import_export.php index e6194c79..e3a4b649 100755 --- a/app/Views/import_export.php +++ b/app/Views/import_export.php @@ -58,22 +58,22 @@
diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php index a809ab18..182bcbb5 100755 --- a/app/Views/layout/footer.php +++ b/app/Views/layout/footer.php @@ -992,6 +992,20 @@ function confirmActionSweertAlert(message = "Are you sure?", confirmText = "Yes, }); + + diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 35ad766e..1eeb9f07 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -98,6 +98,37 @@
From 8c4eba72a1b5812706cce78f06d69d7fa10e6d20 Mon Sep 17 00:00:00 2001 From: venba-Inspriron-3558 Date: Mon, 1 Sep 2025 11:23:29 +0530 Subject: [PATCH 02/61] FIX_Lead History --- app/Views/leads_list.php | 293 ++++++++++++++++++++------------------- 1 file changed, 152 insertions(+), 141 deletions(-) diff --git a/app/Views/leads_list.php b/app/Views/leads_list.php index f15c18b0..23ac3bdf 100644 --- a/app/Views/leads_list.php +++ b/app/Views/leads_list.php @@ -215,8 +215,7 @@ table.dataTable tbody td { - Email History @@ -344,6 +343,7 @@ document.addEventListener("DOMContentLoaded", function () { // Handle clicks on dropdown items customDropdown.querySelectorAll('.dropdown-item').forEach(item => { item.addEventListener('click', function(e) { + console.log("##############"); e.preventDefault(); e.stopPropagation(); @@ -358,7 +358,13 @@ document.addEventListener("DOMContentLoaded", function () { if (id) { getLeadsDataForEdit(id, lead_form_type); } - }else{ + }else if (this.classList.contains('btnHistory')) { + let lead_id = this.getAttribute('data-id'); + if(lead_id){ console.log("******** Clicked from td lead_id-", lead_id); getLeadsDataForMailHistory(lead_id); } + else{ console.log("******** Clicked from td but i don`t have lead_id"); } + + } + else{ const onclickAttr = this.getAttribute('onclick'); if (onclickAttr) { eval(onclickAttr); @@ -387,6 +393,16 @@ document.addEventListener("DOMContentLoaded", function () { activeDropdown = null; } }); + + document.addEventListener("click", function(e) { + if (e.target.closest(".btnHistory")) { + let lead_id = e.target.closest(".btnHistory").dataset.id; + console.log("******** in triple dot id available - " + lead_id); + getLeadsDataForMailHistory(lead_id); + } + else{ console.log("******** in triple dot but id not available"); } + }); + }); @@ -462,146 +478,141 @@ document.addEventListener("DOMContentLoaded", function () { window.location.href = url; } - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ /assets/images/nhance-loader-fast.gif" height="40" width="40" alt="Loading..."> +
+
+ + + +
+ + + +
+ + +
+ + + +
+ + +
+ + + + + + +
+
+
Welcome first_name) ? get_session_userdata()->first_name : 'NOT SET') ?>
+
+
+ + +
+ +
+ + +
+ + + + + + + +
+    + +
+ + + +
+
+
+ + +
+ + + + + + +
+
+ + +
\ No newline at end of file diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php index 7cac8e54..a131e7ad 100644 --- a/app/Views/thz_notes.php +++ b/app/Views/thz_notes.php @@ -538,6 +538,10 @@ hr{ var form = document.getElementById("ticketForm"); var id = form.querySelector("[name='thz_id']").value; var formData = new FormData(form); + + var btn = document.querySelector("button[onclick='submitTicket()']"); + btn.disabled = true; + btn.innerText = "Saving..."; $.ajax({ url: "", @@ -559,6 +563,10 @@ hr{ error: function(xhr) { toastr.error("Something went wrong!", 'Error'); console.error(xhr.responseText); + }, + complete: function() { + btn.disabled = false; + btn.innerText = "Save"; } }); } diff --git a/app/Views/vehicle_master_list.php b/app/Views/vehicle_master_list.php index e51bfe16..15f7678e 100644 --- a/app/Views/vehicle_master_list.php +++ b/app/Views/vehicle_master_list.php @@ -125,7 +125,7 @@ table.dataTable tbody td { -
-
+
+
+ + +