From a2cb726d81f4eb1238b54b8170078574bc48f5f5 Mon Sep 17 00:00:00 2001
From: AJITHKUMAR12 <48044092+AJITHKUMAR12@users.noreply.github.com>
Date: Fri, 14 Aug 2026 16:39:38 +0530
Subject: [PATCH] implemented boat service

---
 .../configuration/DataSourceConfig.java       |   11 +
 .../BoatServiceReportController.java          |   68 +
 .../controller/MainController.java            |    5 +
 .../service/BoatServiceReportService.java     |  165 ++
 .../templates/modules/boatreport.html         | 1764 +++++++++++++++++
 5 files changed, 2013 insertions(+)
 create mode 100644 src/main/java/com/gcc/commissionerreview/controller/BoatServiceReportController.java
 create mode 100644 src/main/java/com/gcc/commissionerreview/service/BoatServiceReportService.java
 create mode 100644 src/main/resources/templates/modules/boatreport.html

diff --git a/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java b/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java
index f290539..2472fe3 100644
--- a/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java
+++ b/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java
@@ -268,4 +268,15 @@ public class DataSourceConfig {
 		return dataSource;
 	}
 
+	////////// boatservice //////////////////////
+	@Bean(name = "mysqlbootDataSource")
+	public DataSource mysqlbootDataSource() {
+		DriverManagerDataSource dataSource = new DriverManagerDataSource();
+		dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+		dataSource.setUrl("jdbc:mysql://" + host + "/boat_service");
+		dataSource.setUsername("root");
+		dataSource.setPassword(dbpassword);
+		return dataSource;
+	}
+
 }
diff --git a/src/main/java/com/gcc/commissionerreview/controller/BoatServiceReportController.java b/src/main/java/com/gcc/commissionerreview/controller/BoatServiceReportController.java
new file mode 100644
index 0000000..a526bc9
--- /dev/null
+++ b/src/main/java/com/gcc/commissionerreview/controller/BoatServiceReportController.java
@@ -0,0 +1,68 @@
+package com.gcc.commissionerreview.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+import com.gcc.commissionerreview.service.AttendanceService;
+import com.gcc.commissionerreview.service.BoatServiceReportService;
+
+@RestController
+@RequestMapping("/commissionerreview/api/boatController")
+public class BoatServiceReportController {
+    @Autowired
+    private BoatServiceReportService boatServiceReportService;
+
+    @GetMapping("/report")
+    public ResponseEntity<?> getBoatServiceReport(
+            @RequestParam String fromDate,
+            @RequestParam String toDate) {
+
+        try {
+
+            List<Map<String, Object>> report = boatServiceReportService
+                    .getBoatServiceReport(
+                            fromDate,
+                            toDate);
+
+            return ResponseEntity.ok(report);
+
+        } catch (Exception e) {
+
+            e.printStackTrace();
+
+            return ResponseEntity
+                    .internalServerError()
+                    .body("Failed to load Boat Service Report");
+
+        }
+
+    }
+
+    @GetMapping("/summary")
+    public ResponseEntity<?> getBoatSummary() {
+
+        try {
+
+            Map<String, Object> summary = boatServiceReportService.getBoatSummary();
+
+            return ResponseEntity.ok(summary);
+
+        } catch (Exception e) {
+
+            e.printStackTrace();
+
+            return ResponseEntity
+                    .internalServerError()
+                    .body("Unable to fetch boat summary");
+
+        }
+    }
+
+}
diff --git a/src/main/java/com/gcc/commissionerreview/controller/MainController.java b/src/main/java/com/gcc/commissionerreview/controller/MainController.java
index c3979b0..1b83664 100644
--- a/src/main/java/com/gcc/commissionerreview/controller/MainController.java
+++ b/src/main/java/com/gcc/commissionerreview/controller/MainController.java
@@ -383,4 +383,9 @@ public class MainController {
         return "modules/swimmingpoolreport";
     }
 
+    @GetMapping("/boatreport")
+    public String bootreport(Model model) {
+        return "modules/boatreport";
+    }
+
 }
diff --git a/src/main/java/com/gcc/commissionerreview/service/BoatServiceReportService.java b/src/main/java/com/gcc/commissionerreview/service/BoatServiceReportService.java
new file mode 100644
index 0000000..ac78b93
--- /dev/null
+++ b/src/main/java/com/gcc/commissionerreview/service/BoatServiceReportService.java
@@ -0,0 +1,165 @@
+package com.gcc.commissionerreview.service;
+
+import javax.sql.DataSource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.sql.Date;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+@Service
+public class BoatServiceReportService {
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    public void setDataSource(@Qualifier("mysqlbootDataSource") DataSource dataSource) {
+        this.jdbcTemplate = new JdbcTemplate(dataSource);
+    }
+
+    public List<Map<String, Object>> getBoatServiceReport(
+            String fromDate,
+            String toDate) {
+
+        String sql = """
+
+                SELECT
+
+                    sl.zone AS zone,
+
+                    sl.name AS location,
+
+                    DATE(tkt.ticketdatetime)
+                        AS report_date,
+
+                    tkt.boat_name
+                        AS boat_name,
+
+                    COALESCE(
+                        SUM(tkt.adult_count),
+                        0
+                    ) AS no_of_adults,
+
+                    COALESCE(
+                        SUM(tkt.child_count),
+                        0
+                    ) AS no_of_kids,
+
+                    COUNT(tkt.ticketid)
+                        AS total_bookings,
+
+                    COALESCE(
+                        SUM(tkt.ticket_amount),
+                        0
+                    ) AS total_collection
+
+
+                FROM tickets tkt
+
+
+                LEFT JOIN
+                    service_location sl
+
+                    ON tkt.lid = sl.lid
+
+
+
+                WHERE tkt.status = 'Transaction success'
+                AND
+
+                    tkt.ticketdatetime >= ?
+
+                    AND
+
+                    tkt.ticketdatetime < ?
+
+
+                GROUP BY
+
+                    sl.zone,
+
+                    sl.name,
+
+                    DATE(tkt.ticketdatetime),
+
+                    tkt.boat_name
+
+
+                ORDER BY
+
+                    sl.zone,
+
+                    sl.name,
+
+                    DATE(tkt.ticketdatetime),
+
+                    tkt.boat_name
+
+                """;
+
+        return jdbcTemplate.queryForList(
+                sql,
+                fromDate,
+                toDate);
+
+    }
+
+    public Map<String, Object> getBoatSummary() {
+
+        Map<String, Object> response = new HashMap<>();
+
+        // ==========================================
+        // 1. Total Bookings & Total Revenue
+        // ==========================================
+
+        String summarySql = "SELECT " +
+                "COUNT(ticketid) AS totalbooking, " +
+                "COALESCE(SUM(ticket_amount), 0) AS totalamount " +
+                "FROM tickets";
+
+        Map<String, Object> summary = jdbcTemplate.queryForMap(summarySql);
+
+        // ==========================================
+        // 2. Boat Price
+        // ==========================================
+
+        String priceSql = "SELECT " +
+                "bcid, " +
+                "name, " +
+                "adult_price, " +
+                "child_price " +
+                "FROM boat_config " +
+                "WHERE bcid IN (1, 3) " +
+                "ORDER BY bcid";
+
+        List<Map<String, Object>> boatPrices = jdbcTemplate.queryForList(priceSql);
+
+        // ==========================================
+        // Add both responses
+        // ==========================================
+
+        response.put("totalbooking",
+                summary.get("totalbooking"));
+
+        response.put("totalamount",
+                summary.get("totalamount"));
+
+        response.put("boatPrices",
+                boatPrices);
+
+        return response;
+    }
+}
diff --git a/src/main/resources/templates/modules/boatreport.html b/src/main/resources/templates/modules/boatreport.html
new file mode 100644
index 0000000..f297446
--- /dev/null
+++ b/src/main/resources/templates/modules/boatreport.html
@@ -0,0 +1,1764 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+
+  <meta charset="UTF-8">
+
+  <title>Boat Service Report</title>
+
+  <!-- Bootstrap -->
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css">
+
+  <!-- Font Awesome -->
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+
+  <!-- DataTables -->
+  <link rel="stylesheet" href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css">
+
+  <!-- DataTables Buttons -->
+  <link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.3.6/css/buttons.dataTables.min.css">
+
+
+  <style>
+    body {
+      background-color: #f8f9fa;
+    }
+
+
+    /* Page title */
+
+    .page-header-title h4 {
+
+      margin: 20px 0;
+
+      text-align: center;
+
+      font-weight: bold;
+
+      color: #003366;
+
+      text-transform: uppercase;
+    }
+
+
+    /* Filter section */
+
+    .filter-section {
+
+      background: #ffffff;
+
+      padding: 20px;
+
+      border-radius: 8px;
+
+      box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05);
+
+      margin-bottom: 20px;
+    }
+
+
+    .filter-section label {
+
+      font-weight: 500;
+
+      margin-bottom: 6px;
+    }
+
+
+    /* Report container */
+
+    .report-container {
+
+      background: #ffffff;
+
+      padding: 15px;
+
+      border-radius: 8px;
+
+      box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05);
+
+      overflow-x: auto;
+    }
+
+
+    /* Table */
+
+    #boatReportTable {
+
+      width: 100% !important;
+
+      border-collapse: collapse;
+    }
+
+
+    #boatReportTable thead th {
+
+      background-color: #003366 !important;
+
+      color: white !important;
+
+      text-align: center;
+
+      vertical-align: middle;
+
+      border: 1px solid #dee2e6 !important;
+
+      white-space: nowrap;
+    }
+
+
+    #boatReportTable tbody td {
+
+      text-align: center;
+
+      vertical-align: middle;
+
+      border: 1px solid #dee2e6 !important;
+    }
+
+
+    /* Merged cells */
+
+    #boatReportTable td[rowspan] {
+
+      vertical-align: middle !important;
+
+      font-weight: 500;
+    }
+
+
+    /* Location */
+
+    #boatReportTable td.location-cell {
+
+      min-width: 180px;
+
+      max-width: 250px;
+
+      white-space: normal !important;
+
+      word-break: break-word;
+    }
+
+
+    /* Boat name */
+
+    #boatReportTable td.boat-name-cell {
+
+      min-width: 150px;
+
+      white-space: nowrap;
+    }
+
+
+    /* Date */
+
+    #boatReportTable td.date-cell {
+
+      min-width: 120px;
+
+      white-space: nowrap;
+    }
+
+
+    /* Buttons */
+
+    .filter-buttons {
+
+      display: flex;
+
+      gap: 8px;
+
+      align-items: end;
+
+      height: 100%;
+    }
+
+
+    /* DataTables horizontal scrollbar */
+
+    .dataTables_wrapper {
+
+      width: 100%;
+    }
+
+
+    /* Loader */
+
+    #pageLoader {
+
+      display: none;
+
+      position: fixed;
+
+      top: 0;
+
+      left: 0;
+
+      width: 100%;
+
+      height: 100%;
+
+      background: rgba(255, 255, 255, 0.8);
+
+      z-index: 9999;
+
+      text-align: center;
+    }
+
+
+    #pageLoader .loader-content {
+
+      position: relative;
+
+      top: 50%;
+
+      transform: translateY(-50%);
+    }
+
+
+    #pageLoader p {
+
+      margin-top: 15px;
+
+      font-size: 18px;
+
+      color: #007bff;
+    }
+
+
+    /* DataTables buttons */
+
+    .dt-buttons {
+
+      margin-bottom: 10px;
+    }
+
+
+    .dt-button {
+
+      margin-right: 5px !important;
+    }
+
+
+    /* Responsive */
+
+    @media (max-width: 768px) {
+
+      .filter-buttons {
+
+        margin-top: 15px;
+
+        justify-content: flex-start;
+      }
+
+    }
+
+    .summary-card {
+      min-height: 120px;
+    }
+
+    .summary-icon {
+      width: 45px;
+      height: 45px;
+      border-radius: 8px;
+
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      font-size: 20px;
+    }
+
+    .booking-icon {
+      background: #e8f1ff;
+      color: #0d6efd;
+    }
+
+    .revenue-icon {
+      background: #e9f7ef;
+      color: #198754;
+    }
+
+    .price-icon {
+      background: #fff3cd;
+      color: #d39e00;
+    }
+
+    .boat-price-title {
+      font-weight: 600;
+      font-size: 14px;
+      color: #003366;
+      margin-bottom: 5px;
+    }
+
+    .boat-price-details {
+      font-size: 14px;
+      color: #555;
+    }
+
+    .boat-price-details strong {
+      color: #212529;
+    }
+  </style>
+
+</head>
+
+
+<body>
+
+
+  <div class="container-fluid py-4">
+
+
+    <!-- ========================= -->
+    <!-- PAGE TITLE -->
+    <!-- ========================= -->
+
+    <div class="page-header-title">
+
+      <h4>
+        Boat Service Report
+      </h4>
+
+    </div>
+    <div class="row g-3 mb-4">
+
+      <!-- Total Bookings -->
+      <div class="row g-3 mb-4">
+
+        <!-- Total Bookings -->
+        <div class="col-md-3">
+
+          <div class="card shadow-sm border-0 summary-card">
+
+            <div class="card-body d-flex align-items-center">
+
+              <div class="summary-icon booking-icon">
+                <i class="fas fa-users"></i>
+              </div>
+
+              <div class="ms-3">
+
+                <div class="text-muted fw-semibold">
+                  Total Bookings
+                </div>
+
+                <div class="fs-4 fw-bold" id="totalBookings">
+                  0
+                </div>
+
+              </div>
+
+            </div>
+
+          </div>
+
+        </div>
+
+
+        <!-- Total Revenue -->
+        <div class="col-md-3">
+
+          <div class="card shadow-sm border-0 summary-card">
+
+            <div class="card-body d-flex align-items-center">
+
+              <div class="summary-icon revenue-icon">
+                <i class="fas fa-coins"></i>
+              </div>
+
+              <div class="ms-3">
+
+                <div class="text-muted fw-semibold">
+                  Total Revenue
+                </div>
+
+                <div class="fs-4 fw-bold" id="totalRevenue">
+                  ₹ 0
+                </div>
+
+              </div>
+
+            </div>
+
+          </div>
+
+        </div>
+
+
+        <!-- Boat Price -->
+        <div class="col-md-6">
+
+          <div class="card shadow-sm border-0 summary-card">
+
+            <div class="card-body">
+
+              <div class="d-flex align-items-center mb-2">
+
+                <div class="summary-icon price-icon">
+                  <i class="fas fa-ship"></i>
+                </div>
+
+                <div class="ms-3">
+
+                  <div class="text-muted fw-semibold">
+                    Boat Price
+                  </div>
+
+                </div>
+
+              </div>
+
+
+              <div class="row">
+
+                <!-- Pedaling Boat -->
+                <div class="col-md-6">
+
+                  <div class="boat-price-title">
+                    PEDALING BOAT
+                  </div>
+
+                  <div class="boat-price-details">
+
+                    <span>
+                      Adult:
+                      <strong id="pedalingAdultPrice">
+                        ₹ 0
+                      </strong>
+                    </span>
+
+                    <span class="ms-3">
+                      Child:
+                      <strong id="pedalingChildPrice">
+                        ₹ 0
+                      </strong>
+                    </span>
+
+                  </div>
+
+                </div>
+
+
+                <!-- Speed Boat -->
+                <div class="col-md-6">
+
+                  <div class="boat-price-title">
+                    SPEED BOAT
+                  </div>
+
+                  <div class="boat-price-details">
+
+                    <span>
+                      Adult:
+                      <strong id="speedAdultPrice">
+                        ₹ 0
+                      </strong>
+                    </span>
+
+                    <span class="ms-3">
+                      Child:
+                      <strong id="speedChildPrice">
+                        ₹ 0
+                      </strong>
+                    </span>
+
+                  </div>
+
+                </div>
+
+              </div>
+
+            </div>
+
+          </div>
+
+        </div>
+
+      </div>
+
+
+
+      <!-- ========================= -->
+      <!-- FILTER SECTION -->
+      <!-- ========================= -->
+
+      <div class="filter-section">
+
+        <div class="row g-3">
+
+
+          <!-- From Date -->
+
+          <div class="col-md-3">
+
+            <label for="fromDate">
+              From Date
+            </label>
+
+            <input type="date" id="fromDate" class="form-control">
+
+          </div>
+
+
+
+          <!-- To Date -->
+
+          <div class="col-md-3">
+
+            <label for="toDate">
+              To Date
+            </label>
+
+            <input type="date" id="toDate" class="form-control">
+
+          </div>
+
+
+
+          <!-- Buttons -->
+
+          <div class="col-md-3 d-flex align-items-center" style="padding-top: 25px;">
+
+            <button type="button" class="btn btn-primary me-2" id="searchBtn">
+
+              <i class="fa fa-search"></i>
+              Search
+
+            </button>
+
+            <button type="button" class="btn btn-secondary" id="resetBtn">
+
+              <i class="fa fa-refresh"></i>
+              Reset
+
+            </button>
+
+          </div>
+
+
+
+
+        </div>
+
+
+
+        <!-- ========================= -->
+        <!-- REPORT -->
+        <!-- ========================= -->
+
+        <div class="report-container">
+
+
+          <table id="boatReportTable" class="table table-bordered table-striped" style="width:100%">
+
+            <thead>
+
+              <!-- Main Header -->
+
+              <tr>
+
+                <th rowspan="2">Sl.No</th>
+
+                <th rowspan="2">Zone</th>
+
+                <th rowspan="2">Location</th>
+
+                <th rowspan="2">Date</th>
+
+
+                <!-- Pedaling Boat -->
+
+                <th colspan="4">
+                  PEDALING BOAT
+                </th>
+
+
+                <!-- Speed Boat -->
+
+                <th colspan="4">
+                  SPEED BOAT
+                </th>
+
+
+                <!-- Overall -->
+
+                <th colspan="2">
+                  OVERALL TOTAL
+                </th>
+
+              </tr>
+
+
+              <!-- Sub Header -->
+
+              <tr>
+
+                <!-- Pedaling -->
+
+                <th> Adults</th>
+                <th> Kids</th>
+                <th>Total<br> Bookings</th>
+                <th>Total <br>Collection</th>
+
+
+                <!-- Speed -->
+
+                <th> Adults</th>
+                <th> Kids</th>
+                <th>Total<br> Bookings</th>
+                <th>Total<br> Collection</th>
+
+
+                <!-- Overall -->
+
+                <th>Total Bookings</th>
+                <th>Total Collection</th>
+
+              </tr>
+
+            </thead>
+
+
+            <tbody>
+
+            </tbody>
+
+          </table>
+
+        </div>
+
+
+      </div>
+
+
+
+      <!-- ========================= -->
+      <!-- PAGE LOADER -->
+      <!-- ========================= -->
+
+      <div id="pageLoader">
+
+        <div class="loader-content">
+
+          <div class="spinner-border text-primary" role="status" style="width:3rem;height:3rem;">
+
+          </div>
+
+          <p>
+            Please wait...
+          </p>
+
+        </div>
+
+      </div>
+
+
+
+      <!-- ========================= -->
+      <!-- JAVASCRIPT -->
+      <!-- ========================= -->
+
+      <!-- jQuery -->
+
+      <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js">
+      </script>
+
+
+      <!-- Bootstrap -->
+
+      <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js">
+      </script>
+
+
+      <!-- DataTables -->
+
+      <script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js">
+      </script>
+
+
+      <!-- DataTables Buttons -->
+
+      <script src="https://cdn.datatables.net/buttons/2.3.6/js/dataTables.buttons.min.js">
+      </script>
+
+
+      <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.html5.min.js">
+      </script>
+
+
+      <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.print.min.js">
+      </script>
+
+
+      <!-- JSZip -->
+
+      <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js">
+      </script>
+
+
+      <!-- PDF -->
+
+      <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js">
+      </script>
+
+
+      <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js">
+      </script>
+
+
+      <!-- SweetAlert -->
+
+      <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11">
+      </script>
+
+
+
+      <script>
+
+        $(document).ready(function () {
+
+          let today = new Date().toISOString().split('T')[0];
+
+          $("#fromDate").val(today);
+          $("#toDate").val(today);
+
+          $("#fromDate").attr("max", today);
+          $("#toDate").attr("max", today);
+
+          $("#fromDate").on("change", function () {
+
+            let fromDate = $(this).val();
+
+            $("#toDate").attr("min", fromDate);
+            $("#toDate").attr("max", today);
+
+            let toDate = $("#toDate").val();
+
+            if (toDate && (toDate < fromDate || toDate > today)) {
+              $("#toDate").val("");
+            }
+          });
+
+          loadBoatReport();
+          loadBoatSummary();
+
+        });
+
+
+        /* =========================================
+           SEARCH BUTTON
+        ========================================= */
+
+        $("#searchBtn").click(function () {
+
+          let fromDate =
+            $("#fromDate").val();
+
+          let toDate =
+            $("#toDate").val();
+
+
+
+          /* From Date validation */
+
+          if (!fromDate) {
+
+            Swal.fire({
+
+              icon: "warning",
+
+              title: "Validation",
+
+              text: "Please select From Date."
+
+            });
+
+            return;
+
+          }
+
+
+
+          /* To Date validation */
+
+          if (!toDate) {
+
+            Swal.fire({
+
+              icon: "warning",
+
+              title: "Validation",
+
+              text: "Please select To Date."
+
+            });
+
+            return;
+
+          }
+
+
+
+          /* Date validation */
+
+          if (fromDate > toDate) {
+
+            Swal.fire({
+
+              icon: "warning",
+
+              title: "Validation",
+
+              text: "To Date cannot be before From Date."
+
+            });
+
+            return;
+
+          }
+
+
+
+          loadBoatReport(
+            fromDate,
+            toDate
+          );
+
+        });
+
+
+
+        /* =========================================
+           RESET
+        ========================================= */
+
+        $("#resetBtn").click(function () {
+
+          let today = new Date().toISOString().split('T')[0];
+
+          $("#fromDate").val(today);
+          $("#toDate").val(today);
+
+          $("#toDate").attr("min", today);
+          $("#toDate").attr("max", today);
+
+          loadBoatReport();
+
+
+        });
+        function loadBoatSummary() {
+
+          console.log("Loading Boat Summary...");
+
+          $.ajax({
+
+            url: "/commissionerreview/api/boatController/summary",
+
+            type: "GET",
+
+            dataType: "json",
+
+            success: function (response) {
+
+              console.log("Boat Summary Response:", response);
+
+
+              // ==========================================
+              // Total Bookings
+              // ==========================================
+
+              let totalBooking =
+                Number(response.totalbooking) || 0;
+
+              $("#totalBookings").text(
+                totalBooking
+              );
+
+
+              // ==========================================
+              // Total Revenue
+              // ==========================================
+
+              let totalAmount =
+                Number(response.totalamount) || 0;
+
+              $("#totalRevenue").text(
+                "₹ " +
+                totalAmount.toLocaleString("en-IN")
+              );
+
+
+              // ==========================================
+              // Boat Prices
+              // ==========================================
+
+              let boatPrices =
+                response.boatPrices || [];
+
+
+              boatPrices.forEach(function (item) {
+
+                let name =
+                  String(item.name || "")
+                    .toUpperCase();
+
+
+                let adultPrice =
+                  Number(item.adult_price) || 0;
+
+
+                let childPrice =
+                  Number(item.child_price) || 0;
+
+
+                // Pedaling Boat
+                if (name === "PEDALING BOAT") {
+
+                  $("#pedalingAdultPrice").text(
+                    "₹ " +
+                    adultPrice.toLocaleString("en-IN")
+                  );
+
+                  $("#pedalingChildPrice").text(
+                    "₹ " +
+                    childPrice.toLocaleString("en-IN")
+                  );
+
+                }
+
+
+                // Speed Boat
+                else if (name === "SPEED BOAT") {
+
+                  $("#speedAdultPrice").text(
+                    "₹ " +
+                    adultPrice.toLocaleString("en-IN")
+                  );
+
+                  $("#speedChildPrice").text(
+                    "₹ " +
+                    childPrice.toLocaleString("en-IN")
+                  );
+
+                }
+
+              });
+
+            },
+
+
+            error: function (xhr, status, error) {
+
+              console.error(
+                "Boat Summary API Failed"
+              );
+
+              console.error(
+                "Status:",
+                xhr.status
+              );
+
+              console.error(
+                "Error:",
+                error
+              );
+
+              console.error(
+                "Response:",
+                xhr.responseText
+              );
+
+            }
+
+          });
+
+        }
+
+
+
+        /* =========================================
+           LOAD BOAT REPORT
+        ========================================= */
+
+        /*function loadBoatReport() {
+  
+          let fromDate = $("#fromDate").val();
+          let toDate = $("#toDate").val();
+  
+          $('#pageLoader').show();
+  
+          $.ajax({
+  
+            url: "/commissionerreview/api/boatController/report",
+  
+            type: "GET",
+  
+            data: {
+              fromDate: fromDate,
+              toDate: toDate
+            },
+  
+            success: function (response) {
+  
+              $('#pageLoader').hide();
+  
+              if ($.fn.DataTable.isDataTable('#boatReportTable')) {
+                $('#boatReportTable').DataTable().destroy();
+              }
+  
+              $('#boatReportTable tbody').empty();
+  
+              $("#boatReportTable").DataTable({
+  
+                destroy: true,
+  
+                data: response,
+  
+                processing: true,
+  
+                columns: [
+  
+                  {
+                    data: null,
+                    render: function (data, type, row, meta) {
+                      return meta.row + 1;
+                    }
+                  },
+  
+                  {
+                    data: "zone"
+                  },
+  
+                  {
+                    data: "location"
+                  },
+  
+                  {
+                    data: "report_date",
+                    render: function (data) {
+                      return formatDate(data);
+                    }
+                  },
+  
+                  {
+                    data: "boat_name"
+                  },
+  
+                  {
+                    data: "no_of_adults"
+                  },
+  
+                  {
+                    data: "no_of_kids"
+                  },
+  
+                  {
+                    data: "total_bookings"
+                  },
+  
+                  {
+                    data: "total_collection"
+                  }
+  
+                ],
+  
+                columnDefs: [
+                  {
+                    orderable: false,
+                    targets: [0]
+                  }
+                ],
+  
+                dom: 'Bfrtip',
+  
+                paging: true,
+                pageLength: 10,
+  
+                buttons: [
+                  'excel',
+                  'pdf'
+                ],
+                
+      
+  
+              });
+  
+            },
+  
+            error: function () {
+  
+              $('#pageLoader').hide();
+  
+              Swal.fire({
+                icon: 'error',
+                title: 'Error',
+                text: 'Unable to load Boat Service Report.'
+              });
+  
+            }
+  
+          });
+        }*/
+        function loadBoatReport() {
+
+          let fromDate = $("#fromDate").val();
+          let toDate = $("#toDate").val();
+
+          $('#pageLoader').show();
+
+
+          $.ajax({
+
+            url: "/commissionerreview/api/boatController/report",
+
+            type: "GET",
+
+            data: {
+              fromDate: fromDate,
+              toDate: toDate
+            },
+
+
+            success: function (response) {
+
+              $('#pageLoader').hide();
+
+              console.log("Boat Report Response:", response);
+
+
+              /*
+               * ==========================================
+               * GROUP DATA BY
+               *
+               * Zone + Location + Date
+               * ==========================================
+               */
+
+              let groupedData = {};
+
+
+              response.forEach(function (item) {
+
+                let groupKey =
+                  String(item.zone) + "|" +
+                  String(item.location) + "|" +
+                  String(item.report_date);
+
+
+                /*
+                 * Create group if it does not exist
+                 */
+
+                if (!groupedData[groupKey]) {
+
+                  groupedData[groupKey] = {
+
+                    zone: item.zone,
+
+                    location: item.location,
+
+                    report_date: item.report_date,
+
+
+                    /*
+                     * Pedaling
+                     */
+
+                    pedaling_adults: 0,
+
+                    pedaling_kids: 0,
+
+                    pedaling_bookings: 0,
+
+                    pedaling_collection: 0,
+
+
+                    /*
+                     * Speed
+                     */
+
+                    speed_adults: 0,
+
+                    speed_kids: 0,
+
+                    speed_bookings: 0,
+
+                    speed_collection: 0,
+
+
+                    /*
+                     * Overall
+                     */
+
+                    overall_bookings: 0,
+
+                    overall_collection: 0
+
+                  };
+
+                }
+
+
+                let group =
+                  groupedData[groupKey];
+
+
+                /*
+                 * ======================================
+                 * PEDALING BOAT
+                 * ======================================
+                 */
+
+                if (
+                  item.boat_name &&
+                  item.boat_name.toUpperCase() ===
+                  "PEDALING BOAT"
+                ) {
+
+                  group.pedaling_adults =
+                    Number(item.no_of_adults) || 0;
+
+
+                  group.pedaling_kids =
+                    Number(item.no_of_kids) || 0;
+
+
+                  group.pedaling_bookings =
+                    Number(item.total_bookings) || 0;
+
+
+                  group.pedaling_collection =
+                    Number(item.total_collection) || 0;
+
+                }
+
+
+                /*
+                 * ======================================
+                 * SPEED BOAT
+                 * ======================================
+                 */
+
+                else if (
+                  item.boat_name &&
+                  item.boat_name.toUpperCase() ===
+                  "SPEED BOAT"
+                ) {
+
+                  group.speed_adults =
+                    Number(item.no_of_adults) || 0;
+
+
+                  group.speed_kids =
+                    Number(item.no_of_kids) || 0;
+
+
+                  group.speed_bookings =
+                    Number(item.total_bookings) || 0;
+
+
+                  group.speed_collection =
+                    Number(item.total_collection) || 0;
+
+                }
+
+              });
+
+
+              /*
+               * ==========================================
+               * Convert object to array
+               * ==========================================
+               */
+
+              let reportData =
+                Object.values(groupedData);
+
+
+              /*
+               * ==========================================
+               * Calculate Overall Total
+               * ==========================================
+               */
+
+              reportData.forEach(function (item) {
+
+                item.overall_bookings =
+                  item.pedaling_bookings +
+                  item.speed_bookings;
+
+
+                item.overall_collection =
+                  item.pedaling_collection +
+                  item.speed_collection;
+
+              });
+
+
+              /*
+               * ==========================================
+               * Generate Sl.No
+               * ==========================================
+               */
+
+              reportData.forEach(function (item, index) {
+
+                item.group_sno = index + 1;
+
+              });
+
+
+              /*
+               * ==========================================
+               * Destroy existing DataTable
+               * ==========================================
+               */
+
+              if (
+                $.fn.DataTable.isDataTable(
+                  '#boatReportTable'
+                )
+              ) {
+
+                $('#boatReportTable')
+                  .DataTable()
+                  .destroy();
+
+              }
+
+
+              /*
+               * Clear old data
+               */
+
+              $('#boatReportTable tbody').empty();
+
+
+              /*
+               * ==========================================
+               * Initialize DataTable
+               * ==========================================
+               */
+
+              $("#boatReportTable").DataTable({
+
+                destroy: true,
+
+                data: reportData,
+
+                processing: true,
+
+
+                /*
+                 * ======================================
+                 * COLUMNS
+                 * ======================================
+                 */
+
+                columns: [
+
+                  /*
+                   * 0 - Sl.No
+                   */
+
+                  {
+                    data: "group_sno"
+                  },
+
+
+                  /*
+                   * 1 - Zone
+                   */
+
+                  {
+                    data: "zone"
+                  },
+
+
+                  /*
+                   * 2 - Location
+                   */
+
+                  {
+                    data: "location"
+                  },
+
+
+                  /*
+                   * 3 - Date
+                   */
+
+                  {
+                    data: "report_date",
+
+                    render: function (data) {
+
+                      return formatDate(data);
+
+                    }
+
+                  },
+
+
+                  /*
+                   * ==================================
+                   * PEDALING BOAT
+                   * ==================================
+                   */
+
+                  {
+                    data: "pedaling_adults"
+                  },
+
+                  {
+                    data: "pedaling_kids"
+                  },
+
+                  {
+                    data: "pedaling_bookings"
+                  },
+
+                  {
+                    data: "pedaling_collection"
+                  },
+
+
+                  /*
+                   * ==================================
+                   * SPEED BOAT
+                   * ==================================
+                   */
+
+                  {
+                    data: "speed_adults"
+                  },
+
+                  {
+                    data: "speed_kids"
+                  },
+
+                  {
+                    data: "speed_bookings"
+                  },
+
+                  {
+                    data: "speed_collection"
+                  },
+
+
+                  /*
+                   * ==================================
+                   * OVERALL TOTAL
+                   * ==================================
+                   */
+
+                  {
+                    data: "overall_bookings"
+                  },
+
+                  {
+                    data: "overall_collection"
+                  }
+
+                ],
+
+
+                /*
+                 * ==========================================
+                 * COLUMN DEFINITIONS
+                 * ==========================================
+                 */
+
+                columnDefs: [
+
+                  {
+                    orderable: false,
+                    targets: [0]
+                  }
+
+                ],
+
+
+                /*
+                 * ==========================================
+                 * PAGINATION
+                 * ==========================================
+                 */
+
+                paging: true,
+
+                pageLength: 10,
+
+                lengthMenu: [
+                  [10, 25, 50, 100],
+                  [10, 25, 50, 100]
+                ],
+
+
+                /*
+                 * Keep ordering disabled
+                 */
+
+                ordering: false,
+
+
+                /*
+                 * ==========================================
+                 * BUTTONS
+                 * ==========================================
+                 */
+
+                dom: 'Bfrtip',
+
+                buttons: [
+
+                  {
+                    extend: 'excel',
+
+                    text: 'Excel',
+
+                    title: 'Boat Service Report'
+
+                  },
+
+
+                  {
+                    extend: 'pdf',
+
+                    text: 'PDF',
+
+                    title: 'Boat Service Report',
+
+                    orientation: 'landscape',
+
+                    pageSize: 'A3'
+
+                  }
+
+                ]
+
+              });
+
+            },
+
+
+            /*
+             * ==========================================
+             * ERROR
+             * ==========================================
+             */
+
+            error: function (xhr) {
+
+              $('#pageLoader').hide();
+
+              console.error(
+                "Boat Service Report Error:",
+                xhr
+              );
+
+
+              Swal.fire({
+
+                icon: 'error',
+
+                title: 'Error',
+
+                text:
+                  'Unable to load Boat Service Report.'
+
+              });
+
+            }
+
+          });
+
+        }
+        function mergeBoatReportCells(api) {
+
+          let rows = api.rows({
+            page: 'current'
+          }).nodes();
+
+          let data = api.rows({
+            page: 'current'
+          }).data();
+
+          if (rows.length === 0) {
+            return;
+          }
+
+          let startIndex = 0;
+
+          while (startIndex < rows.length) {
+
+            let currentData = data[startIndex];
+
+            let groupCount = 1;
+
+
+            /*
+             * Find consecutive rows having
+             * same Zone + Location + Date
+             */
+            for (
+              let i = startIndex + 1;
+              i < rows.length;
+              i++
+            ) {
+
+              let nextData = data[i];
+
+              if (
+                String(currentData.zone) === String(nextData.zone) &&
+                String(currentData.location) === String(nextData.location) &&
+                String(currentData.report_date) === String(nextData.report_date)
+              ) {
+
+                groupCount++;
+
+              } else {
+
+                break;
+
+              }
+            }
+
+
+            /*
+             * Merge:
+             *
+             * 0 = Sl.No
+             * 1 = Zone
+             * 2 = Location
+             * 3 = Date
+             */
+
+            if (groupCount > 1) {
+
+              let firstRowCells =
+                $(rows[startIndex]).find("td");
+
+
+              // Sl.No
+              $(firstRowCells[0])
+                .attr("rowspan", groupCount);
+
+
+              // Zone
+              $(firstRowCells[1])
+                .attr("rowspan", groupCount);
+
+
+              // Location
+              $(firstRowCells[2])
+                .attr("rowspan", groupCount);
+
+
+              // Date
+              $(firstRowCells[3])
+                .attr("rowspan", groupCount);
+
+
+              /*
+               * Remove common cells from
+               * remaining rows.
+               *
+               * VERY IMPORTANT:
+               * Remove from RIGHT to LEFT.
+               */
+
+              for (
+                let j = startIndex + 1;
+                j < startIndex + groupCount;
+                j++
+              ) {
+
+                $(rows[j])
+                  .find("td")
+                  .eq(3)
+                  .remove();
+
+                $(rows[j])
+                  .find("td")
+                  .eq(2)
+                  .remove();
+
+                $(rows[j])
+                  .find("td")
+                  .eq(1)
+                  .remove();
+
+                $(rows[j])
+                  .find("td")
+                  .eq(0)
+                  .remove();
+
+              }
+
+            }
+
+
+            startIndex += groupCount;
+
+          }
+
+        }
+        /* =========================================
+           DATE FORMAT
+        ========================================= */
+
+        function formatDate(dateStr) {
+
+
+          if (!dateStr) {
+
+            return "-";
+
+          }
+
+
+
+          dateStr =
+            String(dateStr)
+              .split("T")[0];
+
+
+
+          let parts =
+            dateStr.split("-");
+
+
+
+          if (parts.length !== 3) {
+
+            return dateStr;
+
+          }
+
+
+
+          let year =
+            parts[0];
+
+          let month =
+            parts[1];
+
+          let day =
+            parts[2];
+
+
+
+          return `${day}-${month}-${year}`;
+
+        }
+
+      </script>
+
+
+</body>
+
+</html>
\ No newline at end of file