From 198ab869129c27c36999b19bb79b8fc910e72c87 Mon Sep 17 00:00:00 2001
From: Smart <gowtham.m@venbainfotech.com>
Date: Thu, 24 Oct 2024 14:25:41 +0530
Subject: [PATCH 1/2] Auditor login Changes : GWM

---
 app/Views/AmendPOlist.php         |  44 ++-----
 app/Views/POlist.php              |  12 +-
 app/Views/includes/new_header.php |   3 +-
 app/Views/porelease_view.php      | 196 ++++++------------------------
 4 files changed, 53 insertions(+), 202 deletions(-)

diff --git a/app/Views/AmendPOlist.php b/app/Views/AmendPOlist.php
index 48768bd1..e54990bc 100755
--- a/app/Views/AmendPOlist.php
+++ b/app/Views/AmendPOlist.php
@@ -4,8 +4,7 @@
     .pagination {
         margin: 0px !important;
     }
-</style>
-<style>
+
     .Date-filter-form {
         display: flex;
         align-items: center;
@@ -105,8 +104,8 @@
                                
                                <div class="error" id="error"></div>
                            </form>
-                            <div class="card-body">
-                                <table id="amend_po_list" class="table dt-responsive wrap w-100">
+                            <div class="card-body" style="overflow-x:scroll;">
+                                <table id="amend_po_list" class="table  table-bordered table-hover">
                                     <thead>
                                         <tr>
                                             <!-- <th>#</th> -->
@@ -205,33 +204,8 @@
     </div> <!-- content -->
 </div>
 
-<!-- /.content-wrapper -->
-<!-- <script>
-  $(function() {
-    $.fn.dataTable.moment('DD-MM-YYYY');
-    $('#example1').DataTable({
-      "paging": true,
-      "lengthChange": true,
-      "searching": true,
-      "ordering": true,
-      // "columnDefs" : [{"targets":3, "type":"date-eu"}],
-      "aaSorting": [
-        [2, "desc"]
-      ],
-
-      "info": true,
-      "autoWidth": false
-    });
-  });
-</script> -->
-<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
 <script>
-    $(document).ready(function() {
-        $.fn.dataTable.ext.type.order['date-eu-pre'] = function(date) {
-            var dateSplit = date.split('-');
-            return (dateSplit[2] + dateSplit[1] + dateSplit[0]) * 1;
-        };
-    });
+   
 
     $(document).ready(function() {
         $(document).on('click', '.text-truncate', function() {
@@ -248,13 +222,9 @@
                 [10, 20, 30, 50, -1],
                 [10, 20, 30, 50, "All"]
             ], // Rows per page options
-            responsive: true, // Responsive table
-            order: [], // Default ordering (column index 0, descending)
-            columnDefs: [{
-                    targets: '_all',
-                    className: 'text-truncate'
-                }, // Apply truncation to all columns
-            ],
+            responsive: false, // Responsive table
+            order:false,
+            
             language: {
                 paginate: {
                     next: '<i class="fas fa-angle-right"></i>', // Next button icon
diff --git a/app/Views/POlist.php b/app/Views/POlist.php
index 1410bdde..2002a31a 100755
--- a/app/Views/POlist.php
+++ b/app/Views/POlist.php
@@ -211,13 +211,13 @@
                                                     ?>
 
                                                         <td>
-
+                                                            <?php if(session()->get('roleText') != 'Auditor'){ ?>
                                                             <a data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to Edit Purchase Order details"
-                                                                href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType
-                                                                            . '&CapitalRange=' . $record->CapitalRange; ?>">
+                                                                href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType. '&CapitalRange=' . $record->CapitalRange; ?>">
                                                                 <i class="fa fa-pencil-alt" data-toggle="tooltip"> </i>
-                                                                &nbsp;&nbsp;&nbsp;</a>
-
+                                                                &nbsp;&nbsp;&nbsp;
+                                                            </a>
+                                                            <?php } ?>
                                                         </td>
                                                     <?php
                                                     } else {
@@ -274,7 +274,7 @@
                 [10, 20, 30, 50, -1],
                 [10, 20, 30, 50, "All"]
             ], // Rows per page options
-            responsive: false, // Responsive table
+            responsive: true, // Responsive table
             ordering: false,
             language: {
                 paginate: {
diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php
index b5559e96..275abede 100755
--- a/app/Views/includes/new_header.php
+++ b/app/Views/includes/new_header.php
@@ -631,8 +631,9 @@
                                             <?php if(session()->get('roleText') != 'Auditor'){?>
                                             <a href="<?php echo base_url(); ?>EmergencyPO" class="dropdown-item">Emergency Purchase Order </a>
                                             <a href="<?php echo base_url(); ?>Report_pending_purchase" class="dropdown-item">Pending Purchase Order </a>
-                                            <?php } ?>
                                             <a href="<?php echo base_url(); ?>amendmentpurchaseorder" class="dropdown-item">Amendment Purchase Order</a>
+                                            <?php } ?>
+                                            
                                         </div>
                                     </div>
 
diff --git a/app/Views/porelease_view.php b/app/Views/porelease_view.php
index 58dee7b1..74fca376 100755
--- a/app/Views/porelease_view.php
+++ b/app/Views/porelease_view.php
@@ -7,82 +7,17 @@ if (empty($Status)) {
 ?>
 
 <style>
-	/* Default minimized state */
-	.supplier-content {
-		max-width: 150px;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		cursor: pointer;
-		height: 20px;
-		/* Minimized height */
-		transition: height 0.3s ease-out;
-		/* Smooth transition */
-	}
+	
 
-	/* Expanded state with fixed height and scrolling */
-	.supplier-content.expand {
-		height: 100px;
-		/* Fixed height for expanded state */
-		white-space: normal;
-		/* Allows wrapping */
-		overflow-y: auto;
-		/* Enable vertical scrolling */
-		transition: height 0.3s ease-in;
-		/* Smooth transition for height */
-	}
-
-
-
-
-
-
-	.table-bordered>thead>tr>th,
-	.table-bordered>tbody>tr>th,
-	.table-bordered>tfoot>tr>th,
-	.table-bordered>thead>tr>td,
-	.table-bordered>tbody>tr>td,
-	.table-bordered>tfoot>tr>td {
-		border: 1px solid #333;
-	}
-
-	.modal-content {
-		width: 1000px ! important;
-	}
-
-	.modal {
-		padding-right: 25% ! important;
-	}
-
-	#Requisition_filter {
-		float: inline-end;
-	}
-
-	#Requisition_wrapper .row .col-sm-4 {
-		flex-basis: 50%;
-		float: inline-end;
-	}
-
-	#Requisition_paginate .pagination {
-		flex-basis: 50%;
-		float: inline-end;
-		margin: 0 0 15px;
-	}
-
-	#Requisition_wrapper .row:nth-child(3),
-	#Requisition_wrapper .row:nth-child(1) {
-		padding: 0 15px;
-	}
-
-	#Requisition_info {
-		margin-top: 5px;
-	}
-
-	.dataTables_wrapper {
-		padding-bottom: 0;
-	}
-</style>
-<style>
+	.dataTables_wrapper .top {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+	th,
+    td {
+        white-space: nowrap;
+    }
 	.Date-filter-form {
 		display: flex;
 		align-items: center;
@@ -169,8 +104,8 @@ if (empty($Status)) {
                                 
                                 <div class="error" id="error"></div>
                             </form>
-							<div class="card-body">
-								<table id="po_release" class="table dt-responsive wrap w-100">
+							<div class="card-body" style="overflow-x:scroll;">
+								<table id="po_release" class="table  table-bordered table-hover">
 									<thead>
 										<tr>
 											<th>PO Date</th>
@@ -180,12 +115,12 @@ if (empty($Status)) {
 											<th>Supplier Name</th>
 											<th>Created By</th>
 											<th>Department</th>
-											<!-- <th>Created Date</th> -->
-
 											<th>Total Order Value</th>
 											<th>Approved By</th>
 											<th>Status</th>
+											<?php if(session()->get('roleText') != 'Auditor'){?>
 											<th>Action</th>
+											<?php } ?>
 											<th>Remarks</th>
 
 
@@ -207,20 +142,15 @@ if (empty($Status)) {
 													<td><a style="cursor: pointer; color: #039985; text-decoration: none;" target="_blank" href="<?php echo base_url() ?>purchaseorder/CreatePOPrint?PONO=<?php echo $record->PONO ?>&ReqType=<?php echo $record->RType ?>" data-id="<%=index%>" data-userid="<?php echo $record->PONO ?>"><?php echo $record->PONO ?> </td>
 													<td><?php echo $record->RType ?> </td>
 													<td><?php echo $record->CostCenterName ?> </td>
-													<!-- <td><?php // echo $record->CostCenterCode
-																?></td> -->
-													<td class="supplier-name" style="text-wrap: balance;">
-														<div class="supplier-content">
+													
+													<td  >
+														
 															<?php echo $record->SupplierName ?>
-														</div>
+														
 													</td>
 													<td><?php echo $record->FirstName ?></td>
 													<td><?php echo $record->DepartmentName ?></td>
-													<!-- <td align="right"><?php // $Cdt =	new DateTime($record->CreatedDate);
-																			// $CreatedDate =  $Cdt->format('d-m-Y');
-																			// echo  $CreatedDate;
-																			?></td> -->
-
+													
 
 													<td><?php echo $record->TotalOrderValue ?></td>
 
@@ -250,20 +180,22 @@ if (empty($Status)) {
 														?>
 													</td>
 
+													<?php if(session()->get('roleText') != 'Auditor'){?>
 													<td>
-													<?php if ($record->StatusCode == PO_APPROVER_ONHOLD or $record->StatusCode == PO_CREATED or $record->StatusCode == REQITEM_Emergency_PO_CREATED) { ?>
-														
+														<?php if ($record->StatusCode == PO_APPROVER_ONHOLD or $record->StatusCode == PO_CREATED or $record->StatusCode == REQITEM_Emergency_PO_CREATED) { ?>
+															
 
-															<select name="selectId" id="selectId" onchange="showvalue('<?php echo $record->PONO ?>','<?php echo $index; ?>',this.options[this.selectedIndex].value,'<?php echo $record->Remarks ?>');">
-																<option value="-1">Select Action</option>
-																<!-- <option value="1">Release</option> -->
-																<option value="1">Approve And Release</option>
-																<option value="2">OnHold</option>
-															</select>
-														
+																<select name="selectId" id="selectId" onchange="showvalue('<?php echo $record->PONO ?>','<?php echo $index; ?>',this.options[this.selectedIndex].value,'<?php echo $record->Remarks ?>');">
+																	<option value="-1">Select Action</option>
+																	<!-- <option value="1">Release</option> -->
+																	<option value="1">Approve And Release</option>
+																	<option value="2">OnHold</option>
+																</select>
+															
 
-													<?php }  ?>
+														<?php }  ?>
 													</td>
+													<?php } ?>
 
 													<td contenteditable="true" id="remarks<?php echo $index; ?>">
 																<?php
@@ -525,47 +457,15 @@ if (empty($Status)) {
 
 		});
 
-		$.fn.dataTable.moment('DD-MM-YYYY');
-		// $('#Requisition').DataTable({
-		// 	columnDefs: [{ width: 200}],
-		// 	fixedColumns: true,
-		// 	paging: true,
-		// 	lengthChange: true,
-		// 	searching: true,
-		// 	ordering: true,
-		// 	aaSorting: [[ 0, "desc" ]],
-
-		// 	info: true,
-		// 	autoWidth: true,
-		// 	pageLength: 10,           
-		// 	lengthMenu: [10, 25, 50, 100] 
-
-
-		// }); 
 	});
 </script>
 
-<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
-<script src="https://cdn.datatables.net/buttons/2.3.4/js/dataTables.buttons.min.js"></script>
-<script src="https://cdn.datatables.net/buttons/2.3.4/js/buttons.html5.min.js"></script>
-<script src="https://cdn.datatables.net/buttons/2.3.4/js/buttons.print.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-<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>
-<script src="https://cdn.datatables.net/plug-ins/1.13.6/sorting/datetime-moment.js"></script>
-<script>
-	$.fn.dataTable.ext.type.order['date-eu-pre'] = function(date) {
-		var dateSplit = date.split('/');
-		return (dateSplit[2] + dateSplit[1] + dateSplit[0]) * 1;
-	};
-</script>
+
 
 
 <script>
 	$(document).ready(function() {
-		$(document).on('click', '.text-truncate', function() {
-            $(this).toggleClass('expanded');
-        });
+		
 
 		// Initialize the DataTable
 		var table = $('#po_release').DataTable({
@@ -578,13 +478,9 @@ if (empty($Status)) {
 				[10, 20, 30, 50, -1],
 				[10, 20, 30, 50, "All"]
 			], // Rows per page options
-			responsive: true, // Responsive table
-			order: [], // Default ordering (column index 0, descending)
-			columnDefs: [{
-                    targets: '_all',
-                    className: 'text-truncate'
-                }, 
-            ],
+			responsive: true, 
+			order: false,
+			
 			language: {
 				paginate: {
 					next: '<i class="fas fa-angle-right"></i>', // Next button icon
@@ -601,26 +497,10 @@ if (empty($Status)) {
 			window.location="PORelease"
 		});
 
-		// Automatically focus and open the To Date picker when From Date is selected
+		
 	
 	});
-	$(document).ready(function() {
-		$('.supplier-content').on('click', function() {
-			var $this = $(this);
 
-			if (!$this.hasClass('expand')) {
-				// Expand: Set to fixed height with scroll
-				$this.addClass('expand');
-			} else {
-				// Collapse: Reset to minimized height
-				// $this.css('height', '20px').removeClass('expand');
-				$this.removeClass('expand');
-			}
-		});
-	});
-	$(document).ready(function() {
-        $('[data-toggle="tooltip"]').tooltip();
-    });
 </script>
 
 <script>
@@ -638,7 +518,7 @@ if (empty($Status)) {
             $('#toDate').val('');
           
         }
-    });
+    	});
     });
    
 </script>
\ No newline at end of file

From 2a9014449ad9efb2e95c76c37d2160eac8b8d7a7 Mon Sep 17 00:00:00 2001
From: Smart <gowtham.m@venbainfotech.com>
Date: Thu, 24 Oct 2024 14:46:04 +0530
Subject: [PATCH 2/2] Auditor login Changes : GWM

---
 app/Views/AmendPOlist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Views/AmendPOlist.php b/app/Views/AmendPOlist.php
index e54990bc..77285f0e 100755
--- a/app/Views/AmendPOlist.php
+++ b/app/Views/AmendPOlist.php
@@ -222,7 +222,7 @@
                 [10, 20, 30, 50, -1],
                 [10, 20, 30, 50, "All"]
             ], // Rows per page options
-            responsive: false, // Responsive table
+            responsive: true, // Responsive table
             order:false,
             
             language: {