RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

Browse Source
This commit is contained in:
vadivel J 2024-10-24 17:59:06 +05:30
commit 9c9adde8cd
4 changed files with 52 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/Views/AmendPOlist.php
View File

@ -4,8 +4,7 @@
.pagination { .pagination {
margin: 0px !important; margin: 0px !important;
} }
</style>
<style>
.Date-filter-form { .Date-filter-form {
display: flex; display: flex;
align-items: center; align-items: center;
@ -105,8 +104,8 @@
<div class="error" id="error"></div> <div class="error" id="error"></div>
</form> </form>
<div class="card-body"> <div class="card-body" style="overflow-x:scroll;">
<table id="amend_po_list" class="table dt-responsive wrap w-100"> <table id="amend_po_list" class="table table-bordered table-hover">
<thead> <thead>
<tr> <tr>
<!-- <th>#</th> --> <!-- <th>#</th> -->
@ -205,33 +204,8 @@
</div> <!-- content --> </div> <!-- content -->
</div> </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> <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).ready(function() {
$(document).on('click', '.text-truncate', function() { $(document).on('click', '.text-truncate', function() {
@ -249,12 +223,8 @@
[10, 20, 30, 50, "All"] [10, 20, 30, 50, "All"]
], // Rows per page options ], // Rows per page options
responsive: true, // Responsive table responsive: true, // Responsive table
order: [], // Default ordering (column index 0, descending) order:false,
columnDefs: [{
targets: '_all',
className: 'text-truncate'
}, // Apply truncation to all columns
],
language: { language: {
paginate: { paginate: {
next: '<i class="fas fa-angle-right"></i>', // Next button icon next: '<i class="fas fa-angle-right"></i>', // Next button icon

12
app/Views/POlist.php
View File

@ -211,13 +211,13 @@
?> ?>
<td> <td>
<?php if(session()->get('roleText') != 'Auditor'){ ?>
<a data-toggle="tooltip" title="<?php echo $record->PONO; ?> - Click here to Edit Purchase Order details" <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 href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType. '&CapitalRange=' . $record->CapitalRange; ?>">
. '&CapitalRange=' . $record->CapitalRange; ?>">
<i class="fa fa-pencil-alt" data-toggle="tooltip"> </i> <i class="fa fa-pencil-alt" data-toggle="tooltip"> </i>
&nbsp;&nbsp;&nbsp;</a> &nbsp;&nbsp;&nbsp;
</a>
<?php } ?>
</td> </td>
<?php <?php
} else { } else {
@ -274,7 +274,7 @@
[10, 20, 30, 50, -1], [10, 20, 30, 50, -1],
[10, 20, 30, 50, "All"] [10, 20, 30, 50, "All"]
], // Rows per page options ], // Rows per page options
responsive: false, // Responsive table responsive: true, // Responsive table
ordering: false, ordering: false,
language: { language: {
paginate: { paginate: {

3
app/Views/includes/new_header.php
View File

@ -631,8 +631,9 @@
<?php if(session()->get('roleText') != 'Auditor'){?> <?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(); ?>EmergencyPO" class="dropdown-item">Emergency Purchase Order </a>
<a href="<?php echo base_url(); ?>Report_pending_purchase" class="dropdown-item">Pending 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> <a href="<?php echo base_url(); ?>amendmentpurchaseorder" class="dropdown-item">Amendment Purchase Order</a>
<?php } ?>
</div> </div>
</div> </div>

188
app/Views/porelease_view.php
View File

@ -7,82 +7,17 @@ if (empty($Status)) {
?> ?>
<style> <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 */
}
.dataTables_wrapper .top {
display: flex;
justify-content: space-between;
align-items: center;
.table-bordered>thead>tr>th, }
.table-bordered>tbody>tr>th, th,
.table-bordered>tfoot>tr>th, td {
.table-bordered>thead>tr>td, white-space: nowrap;
.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>
.Date-filter-form { .Date-filter-form {
display: flex; display: flex;
align-items: center; align-items: center;
@ -169,8 +104,8 @@ if (empty($Status)) {
<div class="error" id="error"></div> <div class="error" id="error"></div>
</form> </form>
<div class="card-body"> <div class="card-body" style="overflow-x:scroll;">
<table id="po_release" class="table dt-responsive wrap w-100"> <table id="po_release" class="table table-bordered table-hover">
<thead> <thead>
<tr> <tr>
<th>Created Date</th> <th>Created Date</th>
@ -180,12 +115,12 @@ if (empty($Status)) {
<th>Supplier Name</th> <th>Supplier Name</th>
<th>Created By</th> <th>Created By</th>
<th>Department</th> <th>Department</th>
<!-- <th>Created Date</th> -->
<th>Total Order Value</th> <th>Total Order Value</th>
<th>Approved By</th> <th>Approved By</th>
<th>Status</th> <th>Status</th>
<?php if(session()->get('roleText') != 'Auditor'){?>
<th>Action</th> <th>Action</th>
<?php } ?>
<th>Remarks</th> <th>Remarks</th>
@ -207,19 +142,14 @@ 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><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->RType ?> </td>
<td><?php echo $record->CostCenterName ?> </td> <td><?php echo $record->CostCenterName ?> </td>
<!-- <td><?php // echo $record->CostCenterCode
?></td> --> <td >
<td class="supplier-name" style="text-wrap: balance;">
<div class="supplier-content">
<?php echo $record->SupplierName ?> <?php echo $record->SupplierName ?>
</div>
</td> </td>
<td><?php echo $record->FirstName ?></td> <td><?php echo $record->FirstName ?></td>
<td><?php echo $record->DepartmentName ?></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> <td><?php echo $record->TotalOrderValue ?></td>
@ -250,20 +180,22 @@ if (empty($Status)) {
?> ?>
</td> </td>
<?php if(session()->get('roleText') != 'Auditor'){?>
<td> <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 ?>');"> <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">Select Action</option>
<!-- <option value="1">Release</option> --> <!-- <option value="1">Release</option> -->
<option value="1">Approve And Release</option> <option value="1">Approve And Release</option>
<option value="2">OnHold</option> <option value="2">OnHold</option>
</select> </select>
<?php } ?> <?php } ?>
</td> </td>
<?php } ?>
<td contenteditable="true" id="remarks<?php echo $index; ?>"> <td contenteditable="true" id="remarks<?php echo $index; ?>">
<?php <?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>
<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> <script>
$(document).ready(function() { $(document).ready(function() {
$(document).on('click', '.text-truncate', function() {
$(this).toggleClass('expanded');
});
// Initialize the DataTable // Initialize the DataTable
var table = $('#po_release').DataTable({ var table = $('#po_release').DataTable({
@ -578,13 +478,9 @@ if (empty($Status)) {
[10, 20, 30, 50, -1], [10, 20, 30, 50, -1],
[10, 20, 30, 50, "All"] [10, 20, 30, 50, "All"]
], // Rows per page options ], // Rows per page options
responsive: true, // Responsive table responsive: true,
order: [], // Default ordering (column index 0, descending) order: false,
columnDefs: [{
targets: '_all',
className: 'text-truncate'
},
],
language: { language: {
paginate: { paginate: {
next: '<i class="fas fa-angle-right"></i>', // Next button icon next: '<i class="fas fa-angle-right"></i>', // Next button icon
@ -601,26 +497,10 @@ if (empty($Status)) {
window.location="PORelease" 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>
<script> <script>
@ -638,7 +518,7 @@ if (empty($Status)) {
$('#toDate').val(''); $('#toDate').val('');
} }
}); });
}); });
</script> </script>