From 0cb9a8ffe4850ca8a9b961d61a83d90649e7e054 Mon Sep 17 00:00:00 2001
From: bitbucket <bitbucket@venbainfotech.com>
Date: Mon, 2 Sep 2024 15:55:28 +0530
Subject: [PATCH] HR module : GWM

---
 app/Models/Inwardgateregister_model.php | 15 +++++-
 app/Views/attendance.php                | 30 ++++++------
 app/Views/includes/new_footer.php       |  1 +
 app/Views/includes/new_header.php       | 62 ++++++++++++++-----------
 app/Views/monthlypayinputs.php          |  7 ++-
 app/Views/viewinwardgateregister.php    | 12 ++++-
 6 files changed, 78 insertions(+), 49 deletions(-)

diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php
index 79c5ccb1..1e9534d1 100755
--- a/app/Models/Inwardgateregister_model.php
+++ b/app/Models/Inwardgateregister_model.php
@@ -342,10 +342,21 @@ class Inwardgateregister_model extends Model
 	function ViewigrListing()
     {
 
-        $builder = $this->db->table('t_igr_master igr')
-            ->select('igr.*,PO.IsOpenOrder,PO.DeliveryDate,sup.SupplierName,PO.POType')
+        // $builder = $this->db->table('t_igr_master igr')
+        //     ->select('igr.*,PO.IsOpenOrder,PO.DeliveryDate,sup.SupplierName,PO.POType,trans.name as TransporterName')
+        //     ->join('t_purchaseorder_master PO', 'igr.PONO = PO.PONO')
+        //     ->join('t_supplierdetailsn` sup', 'PO.SupplierID = sup.SupplierID')
+		// 	->join('t_transporter` trans', 'igr.TransporterId = trans.id' , 'left')
+        //     ->where('igr.IGRStatus !=', MRIR_CREATED)
+		// 	->orderBy('igr.CreatedDate', 'desc');
+
+		$builder = $this->db->table('t_igr_details igr_details')
+            ->select('igr.*,PO.IsOpenOrder,PO.DeliveryDate,sup.SupplierName,PO.POType,trans.name as TransporterName,item.MaterialName, igr_details.QuantityAsPerInvoice as ReceivedQuantity , igr_details.NetWeight as NetWeight')
+			->join('t_igr_master igr', 'igr_details.IGRNo = igr.IGRNo')
             ->join('t_purchaseorder_master PO', 'igr.PONO = PO.PONO')
             ->join('t_supplierdetailsn` sup', 'PO.SupplierID = sup.SupplierID')
+			->join('t_transporter` trans', 'igr.TransporterId = trans.id' , 'left')
+			->join('t_materialmaster` item', 'igr_details.MaterialCode = item.MaterialCode' , 'left')
             ->where('igr.IGRStatus !=', MRIR_CREATED)
 			->orderBy('igr.CreatedDate', 'desc');
         $query = $builder->get();
diff --git a/app/Views/attendance.php b/app/Views/attendance.php
index b2639110..46b797b0 100644
--- a/app/Views/attendance.php
+++ b/app/Views/attendance.php
@@ -1,9 +1,11 @@
-<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
-<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
+<!-- <script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
+<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script> -->
 <!-- <script src="<?php echo base_url() ?>public/assets/js/jquery.CongelarFilaColumna.js"></script> -->
 
 
 
+
+
 <?php
 $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
 //echo $datefordropdown;
@@ -466,7 +468,7 @@ $currentday = date('d');
                                 <div class="row">
                                     <div class="col-md-12 text-right">
                                         <input type="button" class="btn btn-success" id="c" value="save"
-                                            onClick="getAllData();">
+                                            ">
                                     </div>
                                 </div>
                             </div>
@@ -488,13 +490,11 @@ $currentday = date('d');
 
 <!-- <script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script> -->
 <script type="text/javascript">
-    $("#month").datepicker({
-        minViewMode: 1,
-        format: 'M-yyyy'
-    });
+   
 
-
-    function getAllData() {
+   $(document).ready(function() {
+            // Click event for the button
+            $('#c').click(function() {
 
         var s = findInvalidData();
 
@@ -519,7 +519,7 @@ $currentday = date('d');
             var currentdate = '01-' + currentmonth + '-' + currentyear;
 
             var totaldata = 0;
-            $('.content').loader('show');
+            // $('.content').loader('show');
             $.ajax({
                 data: {
                     param1: alldata,
@@ -532,7 +532,7 @@ $currentday = date('d');
 
                 success: function(data) {
                     if (data) {
-                        $('.content').loader('hide');
+                        // $('.content').loader('hide');
                         alert(data);
                         //totaldata = totaldata + parseFloat(data);
                         //console.log(data);
@@ -546,7 +546,7 @@ $currentday = date('d');
         } else {
             alert('Plesae Provide Working Hrs and OT Hrs Correctly..!');
         }
-    }
+    }); });
 </script>
 
 
@@ -554,9 +554,9 @@ $currentday = date('d');
     $(document).ready(function() {
 
 
-        $("#attendance").CongelarFilaColumna({
-            lboHoverTr: true
-        });
+        // $("#attendance").CongelarFilaColumna({
+        //     lboHoverTr: true
+        // });
         $('html').bind('keypress', function(e) {
 
 
diff --git a/app/Views/includes/new_footer.php b/app/Views/includes/new_footer.php
index 5e0753ce..6a24dc58 100644
--- a/app/Views/includes/new_footer.php
+++ b/app/Views/includes/new_footer.php
@@ -45,6 +45,7 @@
         <script src="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-select/js/dataTables.select.min.js"></script>
         <script src="<?php echo base_url(); ?>public/new_assets/libs/pdfmake/build/pdfmake.min.js"></script>
         <script src="<?php echo base_url(); ?>public/new_assets/libs/pdfmake/build/vfs_fonts.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/table-to-json/1.0.0/jquery.tabletojson.js"></script>
        
         <!-- third party js ends -->
 
diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php
index c9114af6..a3c907ff 100644
--- a/app/Views/includes/new_header.php
+++ b/app/Views/includes/new_header.php
@@ -11,8 +11,7 @@
         <link rel="shortcut icon" href="<?php echo base_url(); ?>public/new_assets/images/RI_favicon.png">
 
 
-		<!-- icons -->
-		<link href="<?php echo base_url(); ?>public/new_assets/css/icons.min.css" rel="stylesheet" type="text/css" />
+
         <!-- third party css -->
         <link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-bs4/css/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
         <link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" rel="stylesheet" type="text/css" />
@@ -31,36 +30,42 @@
 		<link href="<?php echo base_url(); ?>public/new_assets/css/icons.min.css" rel="stylesheet" type="text/css" />
         <link href="<?php echo base_url(); ?>public/new_assets/libs/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
 
-        <!-- jquery -->
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+        <link href="<?php echo base_url(); ?>public/new_assets/libs/c3/c3.min.css" rel="stylesheet" type="text/css" />
+
+        <!-- Latest jQuery -->
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
+       
+
+        <!-- Chart.js -->
         <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
 
-		<link href="<?php echo base_url(); ?>public/new_assets/libs/c3/c3.min.css" rel="stylesheet" type="text/css" />
-
+                
 
+        <!-- DataTables CSS -->
         <link href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css" rel="stylesheet">
-        <!-- DataTables Buttons CSS -->
         <link href="https://cdn.datatables.net/buttons/2.3.6/css/buttons.dataTables.min.css" rel="stylesheet">
-
-        <!-- jQuery -->
-        <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+            
         <!-- DataTables JS -->
         <script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
-        <!-- DataTables Buttons JS -->
         <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 for Excel export -->
         <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+
         <!-- pdfmake for PDF export -->
         <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/pdfmake.min.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/vfs_fonts.js"></script>
+
+        <!-- Additional Styles -->
         <link href="https://cdn.jsdelivr.net/npm/remixicon@2.5.0/fonts/remixicon.css" rel="stylesheet">
         <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet">
 
         <!-- Scroll the table left to right -->
         <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.13/jquery.mousewheel.min.js"></script>
+     
 
         <link href="<?php echo base_url(); ?>public/new_assets/libs/bootstrap-datepicker/css/bootstrap-datepicker.min.css" rel="stylesheet" type="text/css" />
 
@@ -128,21 +133,21 @@
             color: red;
             background-color: #fff;
         }
-  .btn-cancel {
-    background-color: grey; /* Red color */
-    color: white;
-    padding: 10px 20px;
-    text-align: center;
-    text-decoration: none;
-    display: inline-block;
-    margin: 4px 2px;
-    cursor: pointer;
-}
+        .btn-cancel {
+            background-color: grey; /* Red color */
+            color: white;
+            padding: 10px 20px;
+            text-align: center;
+            text-decoration: none;
+            display: inline-block;
+            margin: 4px 2px;
+            cursor: pointer;
+        }
 
-.btn-cancel:hover {
-    background-color: #02a8b5; /* Darker red on hover */
-    color: white;
-}
+        .btn-cancel:hover {
+            background-color: #02a8b5; /* Darker red on hover */
+            color: white;
+        }
 </style>
 
     <style>
@@ -213,6 +218,9 @@
         }
     </style>
     <style>
+        .dataTables_wrapper .dataTables_paginate .paginate_button{
+            padding: .0em 0em !important;
+        }
        .dataTables_wrapper .dataTables_paginate .paginate_button:hover {
             color: black !important; /* Text color */
             border: 1px solid white; /* Light border color */
@@ -226,7 +234,7 @@
         }
 
     </style>
-        <style>
+    <style>
         /* Style for DataTable buttons */
         .dt-buttons .btn {
             background-color: white; /* White background for buttons */
@@ -282,7 +290,7 @@
 </style>
 
     </head>
-
+   
     <body class="loading" data-layout-mode="horizontal" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": true}'>
 
         <!-- Begin page -->
diff --git a/app/Views/monthlypayinputs.php b/app/Views/monthlypayinputs.php
index a8d63dd3..dd282299 100644
--- a/app/Views/monthlypayinputs.php
+++ b/app/Views/monthlypayinputs.php
@@ -27,8 +27,7 @@
 
     ?>
 
- <script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
- <script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
+
 
  <script>
      $('html').bind('keypress', function(e) {
@@ -626,7 +625,7 @@
          //alert(JSON.stringify(alldata));
          alldata = JSON.stringify(alldata)
          var month = $('#monthyear').val();
-         $('.content').loader('show');
+        //  $('.content').loader('show');
          $.ajax({
              data: {
                  param1: alldata,
@@ -639,7 +638,7 @@
                 console.log(data);
                 
                  if (data) {
-                     $('.content').loader('hide');
+                    //  $('.content').loader('hide');
                      alert(data);
                      //console.log(data);
 
diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php
index 0fa89a14..45363d8b 100644
--- a/app/Views/viewinwardgateregister.php
+++ b/app/Views/viewinwardgateregister.php
@@ -183,9 +183,14 @@
 											<th>Supplier Name</th>
 											<th>Invoice No</th>
 											<th>Invoice Date </th>
+											<th>Item</th>
+											<th>Rec Qty</th>
+											<th>Net Weight</th>
 											<th>Vechicle No</th>
+											<th>Driver</th>
+											<th>Transporter</th>
 											<th>IGR Status</th>
-											<th></th>
+											<th>Action</th>
 										</tr>
 									</thead>
 									<tbody>
@@ -209,7 +214,12 @@
 											<td align="right"><?php
 													$date = new DateTime($record->DeliveryChellanDate);
 													echo $date->format('d-m-Y'); ?></td> 
+											<td><?php echo $record->MaterialName ?></td>
+											<td><?php echo $record->ReceivedQuantity ?></td>
+											<td><?php echo $record->NetWeight ?></td>
 											<td><?php echo $record->VehicleNo ?></td>
+											<td><?php echo $record->DriverName ?></td>
+											<td><?php echo $record->TransporterName ?></td>
 											<td><?php echo $record->IGRStatus == 'ST074' ? 'Draft' : 'Completed';  ?></td>
 											<td>
 													<a target="_blank" href="<?php echo base_url('download-files/' . $record->IGRNO); ?>">