diff --git a/src/main/java/com/gcc/coworkspace/service/BookingService.java b/src/main/java/com/gcc/coworkspace/service/BookingService.java index 6fe66e7..370c36f 100644 --- a/src/main/java/com/gcc/coworkspace/service/BookingService.java +++ b/src/main/java/com/gcc/coworkspace/service/BookingService.java @@ -801,7 +801,7 @@ public class BookingService { * } */ System.out.println("cid"+cid); - if (cid.equals("1") || cid.equals("4") || cid.equals("5") || cid.equals("7") || cid.equals("8") || cid.equals("9") || cid.equals("10") || cid.equals("11") || cid.equals("12") || cid.equals("13") || cid.equals("14") || cid.equals("15") || cid.equals("17")) { + if (cid.equals("1") || cid.equals("4") || cid.equals("5") || cid.equals("7") || cid.equals("8") || cid.equals("9") || cid.equals("10") || cid.equals("11") || cid.equals("12") || cid.equals("13") || cid.equals("14") || cid.equals("15") || cid.equals("17") || cid.equals("18") || cid.equals("19") || cid.equals("20") ) { whatsAppService.sendELearnNmsg(mobile, no_of_person, fromDateFormatted, slottxt, smsename, amount, bookingId); @@ -1268,7 +1268,7 @@ public class BookingService { String sql = "SELECT " + "b.bid, " + "COALESCE(SUM(b.amount), 0) AS overall_amount_collected, " + - "COALESCE(SUM(CASE WHEN b.sid IN (1,8,9,13,14,15,16,17,18,19,20,21,25) THEN b.amount ELSE 0 END), 0) AS learning_zone_amount_collected, " + "COALESCE(SUM(CASE WHEN b.sid IN (1,8,9,13,14,15,16,17,18,19,20,21,25,26,27,28) THEN b.amount ELSE 0 END), 0) AS learning_zone_amount_collected, " + "COALESCE(SUM(CASE WHEN b.sid IN (2, 3, 4,10,11,12,22,23,24) THEN b.amount ELSE 0 END), 0) AS desk_space_amount_collected, " + @@ -1370,12 +1370,12 @@ public class BookingService { * "COALESCE(SUM(CASE WHEN sid = 1 AND slotids = 5 THEN 1 ELSE 0 END), 0) AS slotId_5_count, " * + */ - "COALESCE(SUM(CASE WHEN sid in (1,8,9,13,14,15,16,17,18,19,20,21,25) AND slotids in (1,49,54,63,68,73,78,83,88,93,98,103,112) THEN 1 ELSE 0 END), 0) AS slotId_1_count, " + "COALESCE(SUM(CASE WHEN sid in (1,8,9,13,14,15,16,17,18,19,20,21,25,26,27,28) AND slotids in (1,49,54,63,68,73,78,83,88,93,98,103,112,117,122,127) THEN 1 ELSE 0 END), 0) AS slotId_1_count, " + - "COALESCE(SUM(CASE WHEN sid in (1,8,9,13,14,15,16,17,18,19,20,21,25) AND slotids in (2,50,55,64,69,74,79,84,89,94,99,104,113) THEN 1 ELSE 0 END), 0) AS slotId_2_count, " + - "COALESCE(SUM(CASE WHEN sid in (1,8,9,13,14,15,16,17,18,19,20,21,25) AND slotids in (3,51,56,65,70,75,80,85,90,95,100,105,114) THEN 1 ELSE 0 END), 0) AS slotId_3_count, " + - "COALESCE(SUM(CASE WHEN sid in (1,8,9,13,14,15,16,17,18,19,20,21,25) AND slotids in (4,52,57,66,71,76,81,86,91,96,101,106,115) THEN 1 ELSE 0 END), 0) AS slotId_4_count, " + - "COALESCE(SUM(CASE WHEN sid in (1,8,9,13,14,15,16,17,18,19,20,21,25) AND slotids in (5,53,58,67,72,77,82,87,92,97,102,107,116) THEN 1 ELSE 0 END), 0) AS slotId_5_count, " + + "COALESCE(SUM(CASE WHEN sid in (1,8,9,13,14,15,16,17,18,19,20,21,25,26,27,28) AND slotids in (2,50,55,64,69,74,79,84,89,94,99,104,113,118,123,128) THEN 1 ELSE 0 END), 0) AS slotId_2_count, " + + "COALESCE(SUM(CASE WHEN sid in (1,8,9,13,14,15,16,17,18,19,20,21,25,26,27,28) AND slotids in (3,51,56,65,70,75,80,85,90,95,100,105,114,119,124,129) THEN 1 ELSE 0 END), 0) AS slotId_3_count, " + + "COALESCE(SUM(CASE WHEN sid in (1,8,9,13,14,15,16,17,18,19,20,21,25,26,27,28) AND slotids in (4,52,57,66,71,76,81,86,91,96,101,106,115,120,125,130) THEN 1 ELSE 0 END), 0) AS slotId_4_count, " + + "COALESCE(SUM(CASE WHEN sid in (1,8,9,13,14,15,16,17,18,19,20,21,25,26,27,28) AND slotids in (5,53,58,67,72,77,82,87,92,97,102,107,116,121,126,131) THEN 1 ELSE 0 END), 0) AS slotId_5_count, " + "COALESCE(SUM(CASE WHEN sid in (2,10,22) AND slotids IN (6,7,59,60,108,109) THEN 1 ELSE 0 END), 0) AS half_day_count, " + "COALESCE(SUM(CASE WHEN sid in (3,11,23) AND slotids IN (8,61,110) THEN 1 ELSE 0 END), 0) AS full_day_count, " + @@ -1417,7 +1417,7 @@ public class BookingService { String sql = "SELECT " + "COUNT(booking_id) AS Total_booking_count, " + - "SUM(CASE WHEN cid in (1,4,5,7,8,9,10,11,12,13,14,15,17) THEN 1 ELSE 0 END) AS Learning_zone_count, " + + "SUM(CASE WHEN cid in (1,4,5,7,8,9,10,11,12,13,14,15,17,18,19,20) THEN 1 ELSE 0 END) AS Learning_zone_count, " + "SUM(CASE WHEN cid in (2,6,16) THEN 1 ELSE 0 END) AS Desk_space_count, " + "SUM(CASE WHEN cid = 3 THEN 1 ELSE 0 END) AS Meeting_room_count " + "FROM booking " + diff --git a/src/main/resources/templates/user/home.html b/src/main/resources/templates/user/home.html index 34ed9cd..9c5a578 100644 --- a/src/main/resources/templates/user/home.html +++ b/src/main/resources/templates/user/home.html @@ -1608,7 +1608,7 @@ document.addEventListener('DOMContentLoaded', () => { updateActiveTab(readingZoneBtn); loadPricingDetails(categoryId, 'reading'); } - else if (buildingId === '2' || buildingId === '4' || buildingId === '5' || buildingId === '6' || buildingId === '7' || buildingId === '8' || buildingId === '9' || buildingId === '10' || buildingId === '11' || buildingId ==='13') { + else if (buildingId === '2' || buildingId === '4' || buildingId === '5' || buildingId === '6' || buildingId === '7' || buildingId === '8' || buildingId === '9' || buildingId === '10' || buildingId === '11' || buildingId ==='13' || buildingId === '14' || buildingId === '15' || buildingId === '16') { // hide Desk + Conference for Building 2 (optional logic) deskSpaceBtn.style.display = 'none'; conferenceHallBtn.style.display = 'none';