From e57b2c8d44df8d42893a0ae6440728b032be3785 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Wed, 26 Mar 2025 14:04:02 +0530
Subject: [PATCH] stock module - 26-03-2025

---
 app/Views/stock/CoatingMachineDetail.php     |  14 +-
 app/Views/stock/bagStockDetails.php          |  22 +--
 app/Views/stock/dieselStockDetails.php       |  21 ++-
 app/Views/stock/drierMachineDetails.php      |  13 +-
 app/Views/stock/dustAndRoughStockDetails.php | 131 +++++++++++++++++-
 app/Views/stock/gasStockDetails.php          |  11 +-
 app/Views/stock/powerConsumptionDetails.php  |  24 ++--
 app/Views/stock/resinStockDetails.php        |  29 ++--
 app/Views/stock/trpSandUseStockDetails.php   | 134 ++++++++++++++++++-
 9 files changed, 334 insertions(+), 65 deletions(-)

diff --git a/app/Views/stock/CoatingMachineDetail.php b/app/Views/stock/CoatingMachineDetail.php
index a7eac7d7..ae119fc1 100644
--- a/app/Views/stock/CoatingMachineDetail.php
+++ b/app/Views/stock/CoatingMachineDetail.php
@@ -327,16 +327,16 @@
                                         </div>
 
 
-                                        <div class="col-8">
-
-                                            <!-- <a style="cursor:pointer"
-                                                            class="dropdown-item" data-toggle="modal" data-target="#filterModalId">
-                                                            Filter
-                                            </a> -->
+                                        <div class="col-7">
                                                   
                                         </div>
 
-                                        <div class="col-lg-1 ">
+                                        <div class="col-2">
+
+                                            <a style="cursor:pointer"
+                                                            class="btn btn-secondary " data-toggle="modal" data-target="#filterModalId">
+                                                            Date Filter
+                                            </a>
 
                                             <button type="button" class="btn btn-success m-0" data-target="#coatingMachineDetailModal"
                                                 data-toggle="modal">
diff --git a/app/Views/stock/bagStockDetails.php b/app/Views/stock/bagStockDetails.php
index 1ce9a012..27687fc7 100644
--- a/app/Views/stock/bagStockDetails.php
+++ b/app/Views/stock/bagStockDetails.php
@@ -345,13 +345,12 @@
                                             if($month == date('M-Y') ){ 
                                             ?>
 
-                                            <div class="col-7">
-                                                <!-- right now client is not using this -->
-                                                    <!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
+                                            <div class="col-6">
+                                                    
                                                     
                                             </div>
 
-                                                <div class="col-2 m-0">
+                                                <div class="col-3 m-0">
                                                     <button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId"
                                                         data-toggle="modal">
                                                         Customize
@@ -359,16 +358,16 @@
                                                 
                                             <?php 
                                             }  else { ?>
-                                                <div class="col-8">
+                                                <div class="col-7">
                                                         <!-- right now client is not using this -->
                                                             <!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
                                                             
                                                     </div>
-                                                <div class="col-1">
+                                                <div class="col-2">
                                             <?php 
                                             }                                      
                                             ?>
-
+                                                <a class="btn btn-secondary" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a>
                                                 <input type="button" class="btn btn-success px-4" id="saveId" value="Save">          
                                                 
                                             </div>
@@ -773,7 +772,7 @@
                     <div class="col-md-6">
                         <div class="form-group">
                             <label for="bagDropdown">Select Bag</label>
-                            <select id="bagDropdown" class="form-control">
+                            <select id="bagDropdown" class="form-control select2">
                                 <option value="">Select Bag</option>
                                 <?php foreach($bagMaterials as $bagMaterial): ?> 
                                     <option value="  <?= $bagMaterial['MaterialName']?>"> 
@@ -791,7 +790,7 @@
                     <div class="col-md-6">
                         <div class="form-group">
                             <label for="dateDropdown">Select Date</label>
-                            <select id="dateDropdown" class="form-control">
+                            <select id="dateDropdown" class="form-control select2">
                                 <?php foreach($datesInMonth as $selectDate): ?>
                                 <?php  $selectDate=DateTime::createFromFormat('Y-m-d', $selectDate)->format('d-m-Y'); ?>
                                   <option value="<?=$selectDate?>"><?=$selectDate?></option>
@@ -809,6 +808,11 @@
 
 
 
+<script>
+    $(document).ready(function(){
+        $('.select2').select2();
+    })
+</script>
 
 
 
diff --git a/app/Views/stock/dieselStockDetails.php b/app/Views/stock/dieselStockDetails.php
index 4d9fcea8..214a44f7 100644
--- a/app/Views/stock/dieselStockDetails.php
+++ b/app/Views/stock/dieselStockDetails.php
@@ -338,13 +338,12 @@ foreach ($period as $day) {
                                                 if($month == date('M-Y') ){ 
                                                 ?>
 
-                                                <div class="col-7">
-                                                    <!-- right now client is not using this -->
-                                                        <!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
+                                                <div class="col-6">
                                                         
                                                 </div>
 
-                                                    <div class="col-2 m-0">
+                                                    <div class="col-3 m-0">
+                                                        
                                                         <button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId"
                                                             data-toggle="modal">
                                                             Customize
@@ -352,15 +351,14 @@ foreach ($period as $day) {
                                                     
                                                 <?php 
                                                 }  else { ?>
-                                                      <div class="col-8">
-                                                            <!-- right now client is not using this -->
-                                                                <!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
-                                                                
+                                                      <div class="col-7">
+
                                                         </div>
-                                                    <div class="col-1">
+                                                    <div class="col-2">
                                                 <?php 
                                                 }                                      
                                                 ?>
+                                                     <a class="btn btn-secondary" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a>
 
                                                     <input type="button" class="btn btn-success px-4" id="saveId" value="Save">          
                                                     
@@ -933,7 +931,7 @@ foreach ($period as $day) {
                         <div class="col-md-6">
                             <div class="form-group">
                                 <label for="dieselDropdown">Select Bag</label>
-                                <select id="dieselDropdown" class="form-control">
+                                <select id="dieselDropdown" class="form-control select2">
                                     <option value="">Select Diesel</option>
                                     <?php foreach ($dieselMachines as $dieselMachine): ?>
                                         <option value="  <?= $dieselMachine['machine_name'] ?>">
@@ -951,7 +949,7 @@ foreach ($period as $day) {
                         <div class="col-md-6">
                             <div class="form-group">
                                 <label for="dateDropdown">Select Date</label>
-                                <select id="dateDropdown" class="form-control">
+                                <select id="dateDropdown" class="form-control select2">
                                     <?php foreach ($datesInMonth as $selectDate): ?>
                                         <?php $selectDate = DateTime::createFromFormat('Y-m-d', $selectDate)->format('d-m-Y'); ?>
                                         <option value="<?= $selectDate ?>"><?= $selectDate ?></option>
@@ -1634,6 +1632,7 @@ foreach ($period as $day) {
 <script>
     $(document).ready(function(){
         $('#customizeHeader').select2();
+        $('.select2').select2();
     })
   
 </script>
diff --git a/app/Views/stock/drierMachineDetails.php b/app/Views/stock/drierMachineDetails.php
index 6cffbfa1..fa7b44f8 100644
--- a/app/Views/stock/drierMachineDetails.php
+++ b/app/Views/stock/drierMachineDetails.php
@@ -323,15 +323,18 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                             
                                         </div>
                                        
-                                        <div class="col-8">
+                                        <div class="col-7">
                                             <!-- right now client is not using this -->
-                                            <!-- <a style="cursor:pointer"
-                                                        class="dropdown-item" data-toggle="modal" data-target="#filterModalId">Filter</a> -->
-                                           
+                                            
 
                                         </div>
 
-                                        <div class="col-lg-1 ">
+                                        <div class="col-2 ">
+
+                                            <a style="cursor:pointer"
+                                                        class="btn btn-secondary" data-toggle="modal" data-target="#filterModalId">
+                                                        Date Filter</a>
+                                           
 
                                             <button type="button" class="btn btn-success m-0" data-target="#additionalEntriesModalId"
                                                 data-toggle="modal">
diff --git a/app/Views/stock/dustAndRoughStockDetails.php b/app/Views/stock/dustAndRoughStockDetails.php
index cb884ba6..9c3e4de6 100644
--- a/app/Views/stock/dustAndRoughStockDetails.php
+++ b/app/Views/stock/dustAndRoughStockDetails.php
@@ -319,11 +319,15 @@
                                             
                                         </div>
 
-                                        <div class="col-2">
+                                        <div class="col-1">
                                                 
                                         </div>
 
-                                        <div class="col-1">
+                                        <div class="col-2">
+                                        <a style="cursor:pointer"
+                                                            class="btn btn-secondary " data-toggle="modal" data-target="#filterModalId">
+                                                            Date Filter
+                                            </a>
                                              <button class="btn btn-success m-0 px-3"  type="button" id="saveId">Save</button> 
                                         </div>
 
@@ -499,10 +503,133 @@
 </div>
 
 
+<!-- modal section -->
+
+<!-- filter modal -->
+<div class="modal fade" id="filterModalId" tabindex="-1" role="dialog" aria-labelledby="filterModalLabelId" aria-hidden="true">
+    <div class="modal-dialog modal-md">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="filterModalLabelId">Filter Options</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body">
+                <div class="row">
 
 
 
+                <?php
+                    $currentDateInDmY = date('d-m-Y');
+                ?>
 
+                <?php   
+                    $startDate = DateTime::createFromFormat('M-Y', $month);
+
+                    if ($startDate) {
+                        $startDate->modify('first day of this month');
+                        $daysInMonth = $startDate->format('t');
+                        $dateArray = [];
+
+                        for ($i = 0; $i < $daysInMonth; $i++) {
+                            $dateArray[] = $startDate->format('d-m-Y');
+                            $startDate->modify('+1 day');
+                        }
+                    } else {
+                        echo "Invalid date format.";
+                    }
+                    ?>
+
+
+                    <!-- From Date Filter -->
+                    <div class="col-md-6">
+                        <div class="form-group">
+                            <label for="fromDateFilter">Select From Date</label>
+
+                                <select id="fromDateFilter" name="fromDateFilter" class="form-control select2">
+                                    <?php if (!empty($dateArray)) : ?>
+                                            <?php foreach ($dateArray as $index => $date) : ?>
+                                                <option value="<?= $date ?>"  ><?= $date ?></option>
+                                            <?php endforeach; ?>
+                                        <?php endif; ?>
+                                </select>
+                        </div>  
+                    </div>  
+
+                    <!-- To Date Filter -->
+                    <div class="col-md-6">
+                        <div class="form-group">
+                            <label for="toDateFilter">Select Date</label>
+
+                                <select id="toDateFilter" name="toDateFilter" class="form-control select2">
+
+                                <?php if (!empty($dateArray)) : ?>
+                                        <?php foreach ($dateArray as $date) : ?>
+                                            <option value="<?= $date ?>" <?= ($date == $currentDateInDmY) || ($date == $dateArray[9]) ?"selected" :" " ?> ><?= $date ?></option>
+                                        <?php endforeach; ?>
+                                    <?php endif; ?>
+
+                                </select>
+                        </div>
+                    </div>
+                </div>
+                <button class="btn btn-primary float-right" onclick="customFilterDate()">Filter</button>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div>
+
+
+<!-- end modal section -->
+
+
+<script>
+    function customFilterDate(){
+
+            let fromDate = $('#fromDateFilter').val(); //01-12-2024
+            let toDate   = $('#toDateFilter').val();   //05-12-2024
+
+            $('#dustAndRoughStockDetailsTableId').find('tbody tr').each(function() {
+                const rowCells = $(this).find('td');
+                let tableDate = rowCells.eq(0).text();  
+                let result = checkDateRange(fromDate,toDate,tableDate);
+                if (result) {
+                    $(this).show(); 
+                } else {
+                    $(this).hide(); 
+                }
+
+            });
+
+                $('#filterModalId').modal('hide');
+
+        }
+
+
+
+        function checkDateRange(fromDate, toDate, tableDate) {
+            // Convert the dates to a comparable format (YYYY-MM-DD)
+            let from = convertToDate(fromDate);
+            let to   = convertToDate(toDate);
+            let table = convertToDate(tableDate);
+
+            // Return true if the table date is within the range
+            return table >= from && table <= to;
+        }
+
+
+        function convertToDate(dateString) {
+            // Convert from DD-MM-YYYY to YYYY-MM-DD for comparison
+            let parts = dateString.split('-');
+            return new Date(parts[2], parts[1] - 1, parts[0]); // Year, Month (0-based), Day
+        }
+
+</script>
+
+<script>
+    $(document).ready(function(){
+        $('.select2').select2();
+    })
+</script>
 
 
 <script type="text/javascript">
diff --git a/app/Views/stock/gasStockDetails.php b/app/Views/stock/gasStockDetails.php
index 1af33fa9..61addb9e 100644
--- a/app/Views/stock/gasStockDetails.php
+++ b/app/Views/stock/gasStockDetails.php
@@ -290,14 +290,17 @@
                                             
                                         </div>
                                        
-                                        <div class="col-8">
+                                        <div class="col-7">
                                             <!-- right now client is not using this -->
-                                            <!-- <a style="cursor:pointer"
-                                                        class="dropdown-item" data-toggle="modal" data-target="#filterModalId">Filter</a> -->
+                                           
                                                   
                                         </div>
 
-                                        <div class="col-1  ">
+                                        <div class="col-2">
+
+                                            <a style="cursor:pointer"
+                                                class="btn btn-secondary" data-toggle="modal" data-target="#filterModalId">
+                                                    Date Filter</a>
 
                                             <button type="button" class="btn btn-success m-0 px-4" id="saveId" >
                                                 Save
diff --git a/app/Views/stock/powerConsumptionDetails.php b/app/Views/stock/powerConsumptionDetails.php
index 94025a3e..89dda7b1 100644
--- a/app/Views/stock/powerConsumptionDetails.php
+++ b/app/Views/stock/powerConsumptionDetails.php
@@ -360,13 +360,11 @@ foreach ($period as $day) {
                                             if($month == date('M-Y') ){ 
                                             ?>
 
-                                            <div class="col-7">
-                                                <!-- right now client is not using this -->
-                                                    <!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
+                                            <div class="col-6">
                                                     
                                             </div>
 
-                                                <div class="col-2 m-0">
+                                                <div class="col-3 m-0">
                                                     <button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId"
                                                         data-toggle="modal">
                                                         Customize
@@ -374,16 +372,13 @@ foreach ($period as $day) {
                                                 
                                             <?php 
                                             }  else { ?>
-                                                <div class="col-8">
-                                                        <!-- right now client is not using this -->
-                                                            <!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
-                                                            
+                                                <div class="col-7">
                                                     </div>
-                                                <div class="col-1">
+                                                <div class="col-2">
                                             <?php 
                                             }                                      
                                             ?>
-
+                                                <a class="btn btn-secondary" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a>
                                                 <input type="button" class="btn btn-success px-4" id="saveId" value="Save">          
                                                 
                                             </div>
@@ -956,7 +951,7 @@ foreach ($period as $day) {
                         <div class="col-md-6">
                             <div class="form-group">
                                 <label for="powerDropdown">Select Bag</label>
-                                <select id="powerDropdown" class="form-control">
+                                <select id="powerDropdown" class="form-control select2">
                                     <option value="">Select Electric Machines</option>
                                     <?php foreach ($electricMachines as $powerMachine): ?>
                                         <option value="  <?= $powerMachine['machine_name'] ?>">
@@ -974,7 +969,7 @@ foreach ($period as $day) {
                         <div class="col-md-6">
                             <div class="form-group">
                                 <label for="dateDropdown">Select Date</label>
-                                <select id="dateDropdown" class="form-control">
+                                <select id="dateDropdown" class="form-control select2">
                                     <?php foreach ($datesInMonth as $selectDate): ?>
                                         <?php $selectDate = DateTime::createFromFormat('Y-m-d', $selectDate)->format('d-m-Y'); ?>
                                         <option value="<?= $selectDate ?>"><?= $selectDate ?></option>
@@ -991,6 +986,11 @@ foreach ($period as $day) {
 </div>
 
 
+<script>
+    $(document).ready(function(){
+        $('.select2').select2();
+    })
+</script>
 
 
 <script>
diff --git a/app/Views/stock/resinStockDetails.php b/app/Views/stock/resinStockDetails.php
index a7e4922a..8a3f7b37 100644
--- a/app/Views/stock/resinStockDetails.php
+++ b/app/Views/stock/resinStockDetails.php
@@ -348,13 +348,11 @@ foreach ($period as $day) {
                                             if($month == date('M-Y') ){ 
                                             ?>
 
-                                            <div class="col-7">
-                                                <!-- right now client is not using this -->
-                                                    <!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
-                                                    
+                                            <div class="col-6">
+                                                   
                                             </div>
 
-                                                <div class="col-2 m-0">
+                                                <div class="col-3 m-0">
                                                     <button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId"
                                                         data-toggle="modal">
                                                         Customize
@@ -362,16 +360,14 @@ foreach ($period as $day) {
                                                 
                                             <?php 
                                             }  else { ?>
-                                                <div class="col-8">
-                                                        <!-- right now client is not using this -->
-                                                            <!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
-                                                            
+                                                <div class="col-7">    
                                                     </div>
-                                                <div class="col-1">
+                                                <div class="col-2">
                                             <?php 
                                             }                                      
                                             ?>
-
+                                                <a class="btn btn-secondary" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a>
+                                                                                                    
                                                 <input type="button" class="btn btn-success px-4" id="saveId" value="Save">          
                                                 
                                             </div>
@@ -762,7 +758,7 @@ foreach ($period as $day) {
                         <div class="col-md-6">
                             <div class="form-group">
                                 <label for="resinDropdown">Select Bag</label>
-                                <select id="resinDropdown" class="form-control">
+                                <select id="resinDropdown" class="form-control select2">
                                     <option value="">Select Resin</option>
                                     <?php foreach ($resinMaterials as $resinMaterial): ?>
                                         <option value="  <?= $resinMaterial['MaterialName'] ?>">
@@ -780,7 +776,7 @@ foreach ($period as $day) {
                         <div class="col-md-6">
                             <div class="form-group">
                                 <label for="dateDropdown">Select Date</label>
-                                <select id="dateDropdown" class="form-control">
+                                <select id="dateDropdown" class="form-control select2">
                                     <?php foreach ($datesInMonth as $selectDate): ?>
                                         <?php $selectDate = DateTime::createFromFormat('Y-m-d', $selectDate)->format('d-m-Y'); ?>
                                         <option value="<?= $selectDate ?>"><?= $selectDate ?></option>
@@ -815,6 +811,13 @@ foreach ($period as $day) {
 
 
 
+<script>
+    $(document).ready(function(){
+        $('.select2').select2();
+    })
+</script>
+
+
 <script>
     function navigateToResin() {
         $('.close').click();
diff --git a/app/Views/stock/trpSandUseStockDetails.php b/app/Views/stock/trpSandUseStockDetails.php
index ff1f1c7e..eae61a86 100644
--- a/app/Views/stock/trpSandUseStockDetails.php
+++ b/app/Views/stock/trpSandUseStockDetails.php
@@ -308,11 +308,15 @@
                                                 
                                             </div>
 
-                                            <div class="col-3">
+                                            <div class="col-2">
                                                     
                                             </div>
 
-                                            <div class="col-1">
+                                            <div class="col-2">
+                                                <a style="cursor:pointer"
+                                                                class="btn btn-secondary " data-toggle="modal" data-target="#filterModalId">
+                                                                Date Filter
+                                                </a>
                                                 <button class="btn btn-success m-0 px-3"  type="button" id="saveId">Save</button> 
                                             </div>
 
@@ -529,7 +533,133 @@
 
 
 
+<!-- modal section -->
 
+<!-- filter modal -->
+<div class="modal fade" id="filterModalId" tabindex="-1" role="dialog" aria-labelledby="filterModalLabelId" aria-hidden="true">
+    <div class="modal-dialog modal-md">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="filterModalLabelId">Filter Options</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+
+
+
+                <?php
+                    $currentDateInDmY = date('d-m-Y');
+                ?>
+
+                <?php   
+                    $startDate = DateTime::createFromFormat('M-Y', $month);
+
+                    if ($startDate) {
+                        $startDate->modify('first day of this month');
+                        $daysInMonth = $startDate->format('t');
+                        $dateArray = [];
+
+                        for ($i = 0; $i < $daysInMonth; $i++) {
+                            $dateArray[] = $startDate->format('d-m-Y');
+                            $startDate->modify('+1 day');
+                        }
+                    } else {
+                        echo "Invalid date format.";
+                    }
+                    ?>
+
+
+                    <!-- From Date Filter -->
+                    <div class="col-md-6">
+                        <div class="form-group">
+                            <label for="fromDateFilter">Select From Date</label>
+
+                                <select id="fromDateFilter" name="fromDateFilter" class="form-control select2">
+                                    <?php if (!empty($dateArray)) : ?>
+                                            <?php foreach ($dateArray as $index => $date) : ?>
+                                                <option value="<?= $date ?>"  ><?= $date ?></option>
+                                            <?php endforeach; ?>
+                                        <?php endif; ?>
+                                </select>
+                        </div>  
+                    </div>  
+
+                    <!-- To Date Filter -->
+                    <div class="col-md-6">
+                        <div class="form-group">
+                            <label for="toDateFilter">Select Date</label>
+
+                                <select id="toDateFilter" name="toDateFilter" class="form-control select2">
+
+                                <?php if (!empty($dateArray)) : ?>
+                                        <?php foreach ($dateArray as $date) : ?>
+                                            <option value="<?= $date ?>" <?= ($date == $currentDateInDmY) || ($date == $dateArray[9]) ?"selected" :" " ?> ><?= $date ?></option>
+                                        <?php endforeach; ?>
+                                    <?php endif; ?>
+
+                                </select>
+                        </div>
+                    </div>
+                </div>
+                <button class="btn btn-primary float-right" onclick="customFilterDate()">Filter</button>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div>
+
+
+<!-- end modal section -->
+
+
+<script>
+    function customFilterDate(){
+
+            let fromDate = $('#fromDateFilter').val(); //01-12-2024
+            let toDate   = $('#toDateFilter').val();   //05-12-2024
+
+            $('#trpSandUseStockDetailsTableId').find('tbody tr').each(function() {
+                const rowCells = $(this).find('td');
+                let tableDate = rowCells.eq(0).text();  
+                let result = checkDateRange(fromDate,toDate,tableDate);
+                if (result) {
+                    $(this).show(); 
+                } else {
+                    $(this).hide(); 
+                }
+
+            });
+
+                $('#filterModalId').modal('hide');
+
+        }
+
+
+
+        function checkDateRange(fromDate, toDate, tableDate) {
+            // Convert the dates to a comparable format (YYYY-MM-DD)
+            let from = convertToDate(fromDate);
+            let to   = convertToDate(toDate);
+            let table = convertToDate(tableDate);
+
+            // Return true if the table date is within the range
+            return table >= from && table <= to;
+        }
+
+
+        function convertToDate(dateString) {
+            // Convert from DD-MM-YYYY to YYYY-MM-DD for comparison
+            let parts = dateString.split('-');
+            return new Date(parts[2], parts[1] - 1, parts[0]); // Year, Month (0-based), Day
+        }
+
+</script>
+
+<script>
+    $(document).ready(function(){
+        $('.select2').select2();
+    })
+</script>