changes in report page for freen commitee

src/main/java/in/gov/chennaicorporation/gccoffice/greencommittee/service/PendinglistService.java

@@ -197,7 +197,7 @@ public class PendinglistService {
 	}
 
 	public Map<String, Object> getRegDetails(String ref) {
-		String sql = "SELECT * FROM reg_details WHERE is_active = 1 AND ref_id = ?";
+		String sql = "SELECT r.*,dm.name as deptname FROM reg_details r LEFT JOIN dept_master dm ON dm.id=r.dept_id WHERE r.is_active = 1 AND r.ref_id = ?";
 		return jdbcTemplate.queryForMap(sql, ref);
 	}
 
@@ -216,9 +216,12 @@ public class PendinglistService {
 
 		Map<String, Object> response = new HashMap<>();
 
+		// String sql = "SELECT r.*,dm.name as deptname FROM reg_details r LEFT JOIN
+		// dept_master dm ON dm.id=r.dept_id WHERE r.is_active = 1 AND r.ref_id = ?";
+
 		// 1 — Application details
 		Map<String, Object> app = jdbcTemplate.queryForMap(
-				"SELECT *,DATE_FORMAT(cdate, '%d-%m-%Y %l:%i %p') as r_Cdate FROM reg_details WHERE ref_id=? AND is_active=1",
+				"SELECT r.*,DATE_FORMAT(r.cdate, '%d-%m-%Y %l:%i %p') as r_Cdate,dm.name as deptname,dm.govt_type as dgovt_type FROM reg_details r LEFT JOIN dept_master dm ON dm.id=r.dept_id WHERE r.ref_id=? AND r.is_active=1",
 				refId);
 
 		// 2 — Complaint details (grouped)

src/main/resources/application.properties

@@ -1,5 +1,5 @@
-#spring.profiles.active=local
-spring.profiles.active=production
+spring.profiles.active=local
+#spring.profiles.active=production
 #For Server production
 #assets.base-url=/gcc/assets/
 #For local test

src/main/resources/templates/modules/greencommittee/pendinglist.html

@@ -140,7 +140,7 @@
                                                     <th class="text-center">Address</th>
                                                     <th class="text-center">Remarks</th>
                                                     <th class="text-center">No of trees</th>
-                                                    <th class="text-center">Details of Complaints</th>
+                                                    <th class="text-center">Applicant Request</th>
                                                     <th class="text-center no-sort">Action</th>
                                                 </tr>
                                             </thead>
@@ -512,6 +512,7 @@
 
 
         function renderDetails(details) {
+            console.log(details);
 
             let app = details.application;
             let inspections = details.inspections;
@@ -534,14 +535,17 @@
             } else if (app.cby === "department") {
 
                 petitionerHtml = `
-                    <div class="col-md-6">
+                   <!-- <div class="col-md-6">
                         <p><strong>Department:</strong> ${app.dept_name}</p>
-                    </div>
+                    </div>-->
+                    <div class="col-md-6">
+    <p><strong>Department:</strong> ${app.dept_name ? app.dept_name : app.deptname}</p>
+</div>
                     <div class="col-md-6">
                         <p><strong>Designation:</strong> ${app.designation}</p>
                     </div>
                     <div class="col-md-6">
-                        <p><strong>Govt Type:</strong> ${app.govt_type}</p>
+                        <p><strong>Govt Type:</strong> ${app.govt_type ? app.govt_type : app.dgovt_type}</p>
                     </div>
                     <div class="col-md-6">
                         <p><strong>Phone:</strong> ${app.ph_no}</p>
@@ -793,6 +797,7 @@
                 method: 'GET',
                 contentType: 'application/json',
                 success: function (data) {
+                    console.log(data);
 
                     $('#pageLoader').hide();
                     let tableContainer = $('#RequestListDatatable');
@@ -820,23 +825,30 @@
                             { data: 'zone', defaultContent: '-', className: 'text-center' },
                             { data: 'ward', defaultContent: '-', className: 'text-center' },
                             { data: 'cby', defaultContent: '-', className: 'text-center' },
+                            /*   {
+                                   data: null,
+                                   render: function (data, type, row) {
+   
+                                       // public user
+                                       if (row.cby === "public") {
+                                           return row.p_name ?? "-";
+                                       }
+   
+                                       // department user
+                                       if (row.cby === "department") {
+                                           let deptName = row.dept_name ? row.dept_name : "-";
+                                           let desg = row.designation ? row.designation : "";
+                                           return `${deptName} / ${desg}`;
+                                       }
+   
+                                       return "-";
+                                   },
+                                   className: 'text-center'
+                               },*/
                             {
                                 data: null,
                                 render: function (data, type, row) {
-
-                                    // public user
-                                    if (row.cby === "public") {
-                                        return row.p_name ?? "-";
-                                    }
-
-                                    // department user
-                                    if (row.cby === "department") {
-                                        let deptName = row.dept_name ? row.dept_name : "-";
-                                        let desg = row.designation ? row.designation : "";
-                                        return `${deptName} / ${desg}`;
-                                    }
-
-                                    return "-";
+                                    return row.p_name || row.dept_name || row.deptname || "-";
                                 },
                                 className: 'text-center'
                             },