reworked master transporter and cost details
This commit is contained in:
parent
5126e8b3b7
commit
125a0d986c
@ -1,76 +1,42 @@
|
|||||||
<style>
|
<style>
|
||||||
|
.Date-filter-form {
|
||||||
.Date-filter-form {
|
display: flex;
|
||||||
display: flex;
|
align-items: center;
|
||||||
align-items: center;
|
gap: 10px;
|
||||||
gap: 10px; /* Adjust the gap as needed */
|
/* Adjust the gap as needed */
|
||||||
}
|
}
|
||||||
.Date-filter-form input, .Date-filter-form button {
|
|
||||||
padding: 5px;
|
|
||||||
font-size: 14px;
|
|
||||||
}
|
|
||||||
.Date-filter-form button {
|
|
||||||
background-color: #007bff;
|
|
||||||
color: white;
|
|
||||||
border: none;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
.Date-filter-form button:hover {
|
|
||||||
background-color: #0056b3;
|
|
||||||
}
|
|
||||||
.icon-button {
|
|
||||||
background: none;
|
|
||||||
border: none;
|
|
||||||
cursor: pointer;
|
|
||||||
color: #007bff;
|
|
||||||
font-size: 18px;
|
|
||||||
}
|
|
||||||
.icon-button:hover {
|
|
||||||
color: #0056b3;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
|
.Date-filter-form input,
|
||||||
|
.Date-filter-form button {
|
||||||
|
padding: 5px;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
<div class="modal fade" id="ccwizard" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
.Date-filter-form button {
|
||||||
<div class="modal-dialog">
|
background-color: #007bff;
|
||||||
<div class="modal-content">
|
color: white;
|
||||||
<!-- Modal Header -->
|
border: none;
|
||||||
<div class="modal-header">
|
cursor: pointer;
|
||||||
<button type="button" class="close" data-dismiss="modal">
|
}
|
||||||
<span aria-hidden="true">×</span>
|
|
||||||
<span class="sr-only">Close</span>
|
|
||||||
</button>
|
|
||||||
<center><h4 class="modal-title" id="myModalLabel"></h4></center>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Modal Body -->
|
.Date-filter-form button:hover {
|
||||||
<div class="modal-body">
|
background-color: #0056b3;
|
||||||
<form id="costCenterForm" class="form-horizontal" role="form">
|
}
|
||||||
<div class="form-group">
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-3 col-md-offset-2">
|
|
||||||
Cost Center Name:
|
|
||||||
</div>
|
|
||||||
<div class="col-md-5">
|
|
||||||
<input type="text" name="CostCenterName" id="CostCenterName" class="form-control">
|
|
||||||
<input type="hidden" name="id" id="id" class="form-control">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Modal Footer -->
|
.icon-button {
|
||||||
<div class="modal-footer">
|
background: none;
|
||||||
<a class="btn btn-cancel" data-dismiss="modal">Cancel</a>
|
border: none;
|
||||||
<a class="btn btn-success font tempClick" id="tempClick">
|
cursor: pointer;
|
||||||
<span class="bold">Submit</span>
|
color: #007bff;
|
||||||
</a>
|
font-size: 18px;
|
||||||
</div>
|
}
|
||||||
</div>
|
|
||||||
</div>
|
.icon-button:hover {
|
||||||
</div>
|
color: #0056b3;
|
||||||
<div class="content-page">
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<div class="content-page">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<!-- Start Content-->
|
<!-- Start Content-->
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
@ -83,74 +49,74 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-6 text-right">
|
<div class="col-6 text-right">
|
||||||
<a data-toggle="modal" href="#ccwizard" data-id="0" data-name="" class="btn btn-success">Add New Cost List</a>
|
<a data-toggle="modal" href="#ccwizard" data-id="0" data-name="" class="btn btn-success">Add New Cost List</a>
|
||||||
<a class="btn btn-success" href="<?php echo base_url(); ?>exportcost">Export Cost Details <i class="fa fa-download" aira-hidden="true"></i></a>
|
<a class="btn btn-success" href="<?php echo base_url(); ?>exportcost">Export Cost Details <i class="fa fa-download" aira-hidden="true"></i></a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;">
|
<form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;">
|
||||||
<input type="hidden" name="table" value="requisition">
|
<input type="hidden" name="table" value="requisition">
|
||||||
<label for="fromDate">From:</label>
|
<label for="fromDate">From:</label>
|
||||||
<input class="form-control date_range" type="date" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
|
<input class="form-control date_range" type="date" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
|
||||||
|
|
||||||
<label for="toDate">To:</label>
|
<label for="toDate">To:</label>
|
||||||
<input class="form-control date_range" type="date" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
|
<input class="form-control date_range" type="date" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
|
||||||
|
|
||||||
<button type="submit" class="range_search_button"><i class="fe-search" aria-hidden="true" class="icon-button" title="Search"></i></button>
|
<button type="submit" class="range_search_button"><i class="fe-search" aria-hidden="true" class="icon-button" title="Search"></i></button>
|
||||||
<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
|
<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
|
||||||
<div class="error" id="error"></div>
|
<div class="error" id="error"></div>
|
||||||
</form>
|
</form>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
|
|
||||||
<table id="cost_listing" class="table dt-responsive nowrap w-100">
|
<table id="cost_listing" class="table dt-responsive nowrap w-100">
|
||||||
<thead style="background-color: #ddd;">
|
<thead style="background-color: #ddd;">
|
||||||
<tr>
|
<tr>
|
||||||
<th>Create Date</th>
|
<th>Create Date</th>
|
||||||
<th>Create Time</th>
|
<th>Create Time</th>
|
||||||
<th>Cost Center Code</th>
|
<th>Cost Center Code</th>
|
||||||
<th>Cost Center Name</th>
|
<th>Cost Center Name</th>
|
||||||
<th>Created By</th>
|
<th>Created By</th>
|
||||||
<th>Active</th>
|
<th>Active</th>
|
||||||
<th>Action</th>
|
<th>Action</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<?php
|
<?php
|
||||||
if (!empty($userRecords)) {
|
if (!empty($userRecords)) {
|
||||||
foreach ($userRecords as $record) {
|
foreach ($userRecords as $record) {
|
||||||
$createdat = new DateTime($record->CreatedDate);
|
$createdat = new DateTime($record->CreatedDate);
|
||||||
$date = $createdat->format('d-m-Y');
|
$date = $createdat->format('d-m-Y');
|
||||||
$time = $createdat->format('h:i A');
|
$time = $createdat->format('h:i A');
|
||||||
?>
|
?>
|
||||||
<tr>
|
<tr>
|
||||||
<td><?php echo $date; ?></td>
|
<td><?php echo $date; ?></td>
|
||||||
<td><?php echo $time; ?></td>
|
<td><?php echo $time; ?></td>
|
||||||
<td><?php echo $record->code ?></td>
|
<td><?php echo $record->code ?></td>
|
||||||
<td><?php echo $record->CostCenterName ?></td>
|
<td><?php echo $record->CostCenterName ?></td>
|
||||||
<!-- <td><?php echo $record->ApprovedBy ?></td> -->
|
<!-- <td><?php echo $record->ApprovedBy ?></td> -->
|
||||||
<td><?php echo $record->FirstName ?></td>
|
<td><?php echo $record->FirstName ?></td>
|
||||||
<td><?php
|
<td><?php
|
||||||
$R = '';
|
$R = '';
|
||||||
$record->IsActive == 1 ? $R = 'ACTIVE' : $R = 'INACTIVE';
|
$record->IsActive == 1 ? $R = 'ACTIVE' : $R = 'INACTIVE';
|
||||||
echo $R;
|
echo $R;
|
||||||
?></td>
|
?></td>
|
||||||
<td>
|
<td>
|
||||||
<?php
|
<?php
|
||||||
if ($record->DeletedBy == '') {
|
if ($record->DeletedBy == '') {
|
||||||
?>
|
?>
|
||||||
<a data-toggle="modal" href="#ccwizard" data-id="<?php echo $record->id; ?>" data-name="<?php echo $record->CostCenterName; ?>" ><i class="fas fa-pencil-alt"></i></a>
|
<a data-toggle="modal" href="#ccwizard" data-id="<?php echo $record->id; ?>" data-name="<?php echo $record->CostCenterName; ?>"><i class="fas fa-pencil-alt"></i></a>
|
||||||
<a href="<?php echo base_url() . 'deleteCostCenter?CostCode=' . $record->code; ?>"><i class="fa fa-trash"></i> </a>
|
<a href="<?php echo base_url() . 'deleteCostCenter?CostCode=' . $record->code; ?>"><i class="fa fa-trash"></i> </a>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div> <!-- end card body-->
|
</div> <!-- end card body-->
|
||||||
</div> <!-- end card -->
|
</div> <!-- end card -->
|
||||||
</div><!-- end col-->
|
</div><!-- end col-->
|
||||||
@ -159,29 +125,43 @@
|
|||||||
</div> <!-- container -->
|
</div> <!-- container -->
|
||||||
</div> <!-- content -->
|
</div> <!-- content -->
|
||||||
</div>
|
</div>
|
||||||
|
<!-- for Add and edit Modal -->
|
||||||
|
<div id="ccwizard" class="modal fade" tabindex="-1" role="dialog"
|
||||||
|
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||||
|
<div class="modal-dialog">
|
||||||
|
<div class="modal-content">
|
||||||
|
<div class="modal-header">
|
||||||
|
<h4 class="modal-title"></h4>
|
||||||
|
<button type="button" class="close" data-dismiss="modal"
|
||||||
|
aria-hidden="true">×</button>
|
||||||
|
</div>
|
||||||
|
<div class="modal-body p-4">
|
||||||
|
<form id="transporterForm" class="form-horizontal" role="form">
|
||||||
|
<div class="form-group">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-4 col-md-offset-2">
|
||||||
|
Cost Center Name:
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6">
|
||||||
|
<input type="text" name="CostCenterName" id="CostCenterName" class="form-control">
|
||||||
|
<input type="hidden" name="id" id="id" class="form-control">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
||||||
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
|
</div>
|
||||||
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
|
|
||||||
<script type="text/javascript">
|
|
||||||
// $(function() {
|
|
||||||
// $.fn.dataTable.moment('DD-MM-YYYY HH:mm A');
|
|
||||||
// $('#datatable').DataTable({
|
|
||||||
// "paging": true,
|
|
||||||
// "lengthChange": true,
|
|
||||||
// "searching": true,
|
|
||||||
// "ordering": true,
|
|
||||||
// // "columnDefs" : [{"targets":3, "type":"date-eu"}],
|
|
||||||
// "aaSorting": [
|
|
||||||
// [3, "desc"]
|
|
||||||
// ],
|
|
||||||
// "info": true,
|
|
||||||
// "autoWidth": true
|
|
||||||
|
|
||||||
// });
|
<div class="modal-footer">
|
||||||
// });
|
<button type="button" class="btn btn-secondary waves-effect"
|
||||||
</script>
|
data-dismiss="modal" value="Cancel">Cancel</button>
|
||||||
|
<button type="button"
|
||||||
<script>
|
class="btn btn-info waves-effect waves-light tempClick" id="tempClick">Submit</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div><!-- /.modal -->
|
||||||
|
<script>
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
$("#ccwizard").on("shown.bs.modal", function(e) {
|
$("#ccwizard").on("shown.bs.modal", function(e) {
|
||||||
var id = $(e.relatedTarget).data('id');
|
var id = $(e.relatedTarget).data('id');
|
||||||
@ -189,9 +169,9 @@
|
|||||||
$('#CostCenterName').val('');
|
$('#CostCenterName').val('');
|
||||||
$('#id').val(id);
|
$('#id').val(id);
|
||||||
if (id == 0) {
|
if (id == 0) {
|
||||||
$('.modal-title').html("Add CostCenter");
|
$('.modal-title').html("Add Cost Center");
|
||||||
} else {
|
} else {
|
||||||
$('.modal-title').html("Edit CostCenter");
|
$('.modal-title').html("Edit Cost Center");
|
||||||
$('#CostCenterName').val(name);
|
$('#CostCenterName').val(name);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -209,7 +189,7 @@
|
|||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: "<?php echo base_url();?>fetchCostCenterDetails",
|
url: "<?php echo base_url(); ?>fetchCostCenterDetails",
|
||||||
data: formData,
|
data: formData,
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
@ -229,83 +209,88 @@
|
|||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
$.fn.dataTable.ext.type.order['date-eu-pre'] = function (date) {
|
$.fn.dataTable.ext.type.order['date-eu-pre'] = function(date) {
|
||||||
var dateSplit = date.split('-');
|
var dateSplit = date.split('-');
|
||||||
return (dateSplit[2] + dateSplit[1] + dateSplit[0]) * 1;
|
return (dateSplit[2] + dateSplit[1] + dateSplit[0]) * 1;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Initialize the DataTable
|
// Initialize the DataTable
|
||||||
var table = $('#cost_listing').DataTable({
|
var table = $('#cost_listing').DataTable({
|
||||||
dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
|
dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
|
||||||
buttons: [
|
buttons: [
|
||||||
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
|
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
|
||||||
],
|
],
|
||||||
pageLength: 10, // Default rows per page
|
pageLength: 10, // Default rows per page
|
||||||
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
|
lengthMenu: [
|
||||||
responsive: true, // Responsive table
|
[10, 20, 30, 50, -1],
|
||||||
order: [[0, 'desc']], // Default ordering (column index 0, descending)
|
[10, 20, 30, 50, "All"]
|
||||||
language: {
|
], // Rows per page options
|
||||||
paginate: {
|
responsive: true, // Responsive table
|
||||||
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
order: [
|
||||||
previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
|
[0, 'desc']
|
||||||
|
], // Default ordering (column index 0, descending)
|
||||||
|
language: {
|
||||||
|
paginate: {
|
||||||
|
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
||||||
|
previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
});
|
|
||||||
|
|
||||||
// Date range filter function
|
// Date range filter function
|
||||||
$.fn.dataTable.ext.search.push(
|
$.fn.dataTable.ext.search.push(
|
||||||
function(settings, data, dataIndex) {
|
function(settings, data, dataIndex) {
|
||||||
var fromDate = $('#fromDate').val();
|
var fromDate = $('#fromDate').val();
|
||||||
var toDate = $('#toDate').val();
|
var toDate = $('#toDate').val();
|
||||||
|
|
||||||
if (!fromDate || !toDate) {
|
if (!fromDate || !toDate) {
|
||||||
return true; // If no dates selected, don't filter
|
return true; // If no dates selected, don't filter
|
||||||
|
}
|
||||||
|
|
||||||
|
var dateStr = data[0]; // Assuming the date is in the first column
|
||||||
|
var dateParts = dateStr.split("-");
|
||||||
|
var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]); // Convert dd-mm-yyyy to Date object
|
||||||
|
|
||||||
|
var startDate = new Date(fromDate);
|
||||||
|
var endDate = new Date(toDate);
|
||||||
|
|
||||||
|
// Adjust startDate to include the day before the selected fromDate
|
||||||
|
startDate.setDate(startDate.getDate() - 1);
|
||||||
|
|
||||||
|
// Ensure endDate includes the entire end date by setting time to the end of the day
|
||||||
|
endDate.setHours(23, 59, 59, 999);
|
||||||
|
|
||||||
|
// Return true if the date is within the range
|
||||||
|
return date >= startDate && date <= endDate;
|
||||||
}
|
}
|
||||||
|
);
|
||||||
var dateStr = data[0]; // Assuming the date is in the first column
|
|
||||||
var dateParts = dateStr.split("-");
|
|
||||||
var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]); // Convert dd-mm-yyyy to Date object
|
|
||||||
|
|
||||||
var startDate = new Date(fromDate);
|
|
||||||
var endDate = new Date(toDate);
|
|
||||||
|
|
||||||
// Adjust startDate to include the day before the selected fromDate
|
|
||||||
startDate.setDate(startDate.getDate() - 1);
|
|
||||||
|
|
||||||
// Ensure endDate includes the entire end date by setting time to the end of the day
|
|
||||||
endDate.setHours(23, 59, 59, 999);
|
|
||||||
|
|
||||||
// Return true if the date is within the range
|
// Handle form submission for the date range filter
|
||||||
return date >= startDate && date <= endDate;
|
$("#DateRangeFilter").submit(function(e) {
|
||||||
}
|
e.preventDefault();
|
||||||
);
|
table.draw(); // Redraw the table to apply the filter
|
||||||
|
});
|
||||||
|
|
||||||
// Handle form submission for the date range filter
|
// Reset button functionality
|
||||||
$("#DateRangeFilter").submit(function(e) {
|
$("#resetButton").click(function() {
|
||||||
e.preventDefault();
|
$("#fromDate").val('');
|
||||||
table.draw(); // Redraw the table to apply the filter
|
$("#toDate").val('');
|
||||||
|
table.draw(); // Redraw the table to clear the filter
|
||||||
|
});
|
||||||
|
|
||||||
|
// Automatically focus and open the To Date picker when From Date is selected
|
||||||
|
document.getElementById('fromDate').addEventListener('change', function() {
|
||||||
|
var fromDate = this.value;
|
||||||
|
var toDateInput = document.getElementById('toDate');
|
||||||
|
|
||||||
|
// Set the min attribute of the To Date input to the selected From Date
|
||||||
|
toDateInput.min = fromDate;
|
||||||
|
|
||||||
|
// Optionally reset the To Date input if the current value is before the new min date
|
||||||
|
if (toDateInput.value < fromDate) {
|
||||||
|
toDateInput.value = fromDate;
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Reset button functionality
|
|
||||||
$("#resetButton").click(function() {
|
|
||||||
$("#fromDate").val('');
|
|
||||||
$("#toDate").val('');
|
|
||||||
table.draw(); // Redraw the table to clear the filter
|
|
||||||
});
|
|
||||||
|
|
||||||
// Automatically focus and open the To Date picker when From Date is selected
|
|
||||||
document.getElementById('fromDate').addEventListener('change', function() {
|
|
||||||
var fromDate = this.value;
|
|
||||||
var toDateInput = document.getElementById('toDate');
|
|
||||||
|
|
||||||
// Set the min attribute of the To Date input to the selected From Date
|
|
||||||
toDateInput.min = fromDate;
|
|
||||||
|
|
||||||
// Optionally reset the To Date input if the current value is before the new min date
|
|
||||||
if (toDateInput.value < fromDate) {
|
|
||||||
toDateInput.value = fromDate;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
</script>
|
</script>
|
||||||
@ -38,49 +38,42 @@
|
|||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
<style>
|
<style>
|
||||||
.modal
|
.Date-filter-form {
|
||||||
{
|
display: flex;
|
||||||
padding-right:25% ! important;
|
align-items: center;
|
||||||
}
|
gap: 10px;
|
||||||
.num{
|
/* Adjust the gap as needed */
|
||||||
text-align:right;
|
}
|
||||||
}
|
|
||||||
.modal-content
|
.Date-filter-form input,
|
||||||
{
|
.Date-filter-form button {
|
||||||
width: 800px ! important;
|
padding: 5px;
|
||||||
}
|
font-size: 14px;
|
||||||
th {
|
}
|
||||||
white-space: nowrap;
|
|
||||||
}
|
.Date-filter-form button {
|
||||||
.Date-filter-form {
|
background-color: #007bff;
|
||||||
display: flex;
|
color: white;
|
||||||
align-items: center;
|
border: none;
|
||||||
gap: 10px; /* Adjust the gap as needed */
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
.Date-filter-form input, .Date-filter-form button {
|
|
||||||
padding: 5px;
|
.Date-filter-form button:hover {
|
||||||
font-size: 14px;
|
background-color: #0056b3;
|
||||||
}
|
}
|
||||||
.Date-filter-form button {
|
|
||||||
background-color: #007bff;
|
.icon-button {
|
||||||
color: white;
|
background: none;
|
||||||
border: none;
|
border: none;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
color: #007bff;
|
||||||
.Date-filter-form button:hover {
|
font-size: 18px;
|
||||||
background-color: #0056b3;
|
}
|
||||||
}
|
|
||||||
.icon-button {
|
.icon-button:hover {
|
||||||
background: none;
|
color: #0056b3;
|
||||||
border: none;
|
}
|
||||||
cursor: pointer;
|
</style>
|
||||||
color: #007bff;
|
|
||||||
font-size: 18px;
|
|
||||||
}
|
|
||||||
.icon-button:hover {
|
|
||||||
color: #0056b3;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<div class="content-page">
|
<div class="content-page">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
@ -95,118 +88,119 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-6 text-right">
|
<div class="col-6 text-right">
|
||||||
<a data-toggle="modal" href="#transporterwizard" data-id="0" data-name="" class="btn btn-success">Add New Transporter</a> </div>
|
<a data-toggle="modal" href="#transporterwizard" data-id="0" data-name="" class="btn btn-success">Add New Transporter</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-12">
|
|
||||||
<div class="card">
|
|
||||||
<form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;">
|
|
||||||
<input type="hidden" name="table" value="requisition">
|
|
||||||
<label for="fromDate">From:</label>
|
|
||||||
<input class="form-control date_range" type="date" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
|
|
||||||
|
|
||||||
<label for="toDate">To:</label>
|
|
||||||
<input class="form-control date_range" type="date" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
|
|
||||||
|
|
||||||
<button type="submit" class="range_search_button"><i class="fe-search" aria-hidden="true" class="icon-button" title="Search"></i></button>
|
|
||||||
<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
|
|
||||||
<div class="error" id="error"></div>
|
|
||||||
</form>
|
|
||||||
<div class="card-body">
|
|
||||||
<table id="transporter_list" class="table dt-responsive nowrap w-100">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>Create Date</th>
|
|
||||||
<th>Create Time</th>
|
|
||||||
<th>Transporter ID</th>
|
|
||||||
<th>Transporter Name</th>
|
|
||||||
<th>Created By</th>
|
|
||||||
<th>Active</th>
|
|
||||||
<th>Action</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<?php
|
|
||||||
if (!empty($userRecords)) {
|
|
||||||
foreach ($userRecords as $record) {
|
|
||||||
$createdat = new DateTime($record->created_on);
|
|
||||||
$date = $createdat->format('d-m-Y');
|
|
||||||
$time = $createdat->format('h:i A');
|
|
||||||
?>
|
|
||||||
<tr>
|
|
||||||
<td><?php echo $date; ?></td>
|
|
||||||
<td><?php echo $time; ?></td>
|
|
||||||
<td><?php echo $record->id ?></td>
|
|
||||||
<td><?php echo $record->name ?></td>
|
|
||||||
<td><?php echo $record->FirstName ?></td>
|
|
||||||
<td><?php
|
|
||||||
$a = '';
|
|
||||||
$a = $record->isactive == 1 ? 'ACTIVE' : 'INACTIVE';
|
|
||||||
echo $a;
|
|
||||||
?></td>
|
|
||||||
<td>
|
|
||||||
<a data-toggle="modal" href="#transporterwizard" data-id="<?php echo $record->id; ?>" data-name="<?php echo $record->name; ?>"><i class="fa fa-pencil"></i></a>
|
|
||||||
<?php if ($record->isactive == 1) { ?>
|
|
||||||
<a href="<?php echo base_url() . 'deleteTransporter?id=' . $record->id; ?>"><i class="fa fa-trash"></i> </a>
|
|
||||||
<?php } ?>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<?php
|
|
||||||
}
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</tbody>
|
|
||||||
|
|
||||||
</table>
|
|
||||||
|
|
||||||
</div> <!-- end card body-->
|
|
||||||
</div> <!-- end card -->
|
|
||||||
</div><!-- end col-->
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-12">
|
||||||
|
<div class="card">
|
||||||
|
<form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;">
|
||||||
|
<input type="hidden" name="table" value="requisition">
|
||||||
|
<label for="fromDate">From:</label>
|
||||||
|
<input class="form-control date_range" type="date" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
|
||||||
|
|
||||||
|
<label for="toDate">To:</label>
|
||||||
|
<input class="form-control date_range" type="date" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
|
||||||
|
|
||||||
|
<button type="submit" class="range_search_button"><i class="fe-search" aria-hidden="true" class="icon-button" title="Search"></i></button>
|
||||||
|
<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
|
||||||
|
<div class="error" id="error"></div>
|
||||||
|
</form>
|
||||||
|
<div class="card-body">
|
||||||
|
<table id="transporter_list" class="table dt-responsive nowrap w-100">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Create Date</th>
|
||||||
|
<th>Create Time</th>
|
||||||
|
<th>Transporter ID</th>
|
||||||
|
<th>Transporter Name</th>
|
||||||
|
<th>Created By</th>
|
||||||
|
<th>Active</th>
|
||||||
|
<th>Action</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<?php
|
||||||
|
if (!empty($userRecords)) {
|
||||||
|
foreach ($userRecords as $record) {
|
||||||
|
$createdat = new DateTime($record->created_on);
|
||||||
|
$date = $createdat->format('d-m-Y');
|
||||||
|
$time = $createdat->format('h:i A');
|
||||||
|
?>
|
||||||
|
<tr>
|
||||||
|
<td><?php echo $date; ?></td>
|
||||||
|
<td><?php echo $time; ?></td>
|
||||||
|
<td><?php echo $record->id ?></td>
|
||||||
|
<td><?php echo $record->name ?></td>
|
||||||
|
<td><?php echo $record->FirstName ?></td>
|
||||||
|
<td><?php
|
||||||
|
$a = '';
|
||||||
|
$a = $record->isactive == 1 ? 'ACTIVE' : 'INACTIVE';
|
||||||
|
echo $a;
|
||||||
|
?></td>
|
||||||
|
<td>
|
||||||
|
<?php if ($record->isactive == 1) { ?>
|
||||||
|
<a data-toggle="modal" href="#transporterwizard" data-id="<?php echo $record->id; ?>" data-name="<?php echo $record->name; ?>"><i class="fa fa-pencil"></i></a>
|
||||||
|
<a href="<?php echo base_url() . 'deleteTransporter?id=' . $record->id; ?>"><i class="fa fa-trash"></i> </a>
|
||||||
|
<?php } ?>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<?php
|
||||||
|
}
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</tbody>
|
||||||
|
|
||||||
|
</table>
|
||||||
|
|
||||||
|
</div> <!-- end card body-->
|
||||||
|
</div> <!-- end card -->
|
||||||
|
</div><!-- end col-->
|
||||||
|
</div>
|
||||||
|
|
||||||
</div> <!-- container -->
|
</div> <!-- container -->
|
||||||
</div> <!-- content -->
|
</div> <!-- content -->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- for Add and edit Modal -->
|
<!-- for Add and edit Modal -->
|
||||||
<div id="transporterwizard" class="modal fade" tabindex="-1" role="dialog"
|
<div id="transporterwizard" class="modal fade" tabindex="-1" role="dialog"
|
||||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<h4 class="modal-title"></h4>
|
<h4 class="modal-title"></h4>
|
||||||
<button type="button" class="close" data-dismiss="modal"
|
<button type="button" class="close" data-dismiss="modal"
|
||||||
aria-hidden="true">×</button>
|
aria-hidden="true">×</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body p-4">
|
<div class="modal-body p-4">
|
||||||
<form id="transporterForm" class="form-horizontal" role="form">
|
<form id="transporterForm" class="form-horizontal" role="form">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-4 col-md-offset-2">
|
<div class="col-md-4 col-md-offset-2">
|
||||||
Transporter Name:
|
Transporter Name:
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<input type="text" name="transportername" id="transportername" class="form-control">
|
<input type="text" name="transportername" id="transportername" class="form-control">
|
||||||
<input type="hidden" name="transporterid" id="transporterid" class="form-control">
|
<input type="hidden" name="transporterid" id="transporterid" class="form-control">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button type="button" class="btn btn-secondary waves-effect"
|
<button type="button" class="btn btn-secondary waves-effect"
|
||||||
data-dismiss="modal" value="Cancel">Cancel</button>
|
data-dismiss="modal" value="Cancel">Cancel</button>
|
||||||
<button type="button"
|
<button type="button"
|
||||||
class="btn btn-info waves-effect waves-light tempClick" id="tempClick">Submit</button>
|
class="btn btn-info waves-effect waves-light tempClick" id="tempClick">Submit</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div><!-- /.modal -->
|
</div><!-- /.modal -->
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
$("#transporterwizard").on("shown.bs.modal", function(e) {
|
$("#transporterwizard").on("shown.bs.modal", function(e) {
|
||||||
var id = $(e.relatedTarget).data('id');
|
var id = $(e.relatedTarget).data('id');
|
||||||
@ -234,7 +228,7 @@
|
|||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: "<?php echo base_url();?>fetchTransporterDetails",
|
url: "<?php echo base_url(); ?>fetchTransporterDetails",
|
||||||
data: formData,
|
data: formData,
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
@ -253,78 +247,83 @@
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
// Initialize the DataTable
|
// Initialize the DataTable
|
||||||
var table = $('#transporter_list').DataTable({
|
var table = $('#transporter_list').DataTable({
|
||||||
dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
|
dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
|
||||||
buttons: [
|
buttons: [
|
||||||
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
|
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
|
||||||
],
|
],
|
||||||
pageLength: 10, // Default rows per page
|
pageLength: 10, // Default rows per page
|
||||||
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
|
lengthMenu: [
|
||||||
responsive: true, // Responsive table
|
[10, 20, 30, 50, -1],
|
||||||
order: [[0, 'desc']], // Default ordering (column index 0, descending)
|
[10, 20, 30, 50, "All"]
|
||||||
language: {
|
], // Rows per page options
|
||||||
paginate: {
|
responsive: true, // Responsive table
|
||||||
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
order: [
|
||||||
previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
|
[0, 'desc']
|
||||||
|
], // Default ordering (column index 0, descending)
|
||||||
|
language: {
|
||||||
|
paginate: {
|
||||||
|
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
||||||
|
previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
});
|
|
||||||
|
|
||||||
// Date range filter function
|
// Date range filter function
|
||||||
$.fn.dataTable.ext.search.push(
|
$.fn.dataTable.ext.search.push(
|
||||||
function(settings, data, dataIndex) {
|
function(settings, data, dataIndex) {
|
||||||
var fromDate = $('#fromDate').val();
|
var fromDate = $('#fromDate').val();
|
||||||
var toDate = $('#toDate').val();
|
var toDate = $('#toDate').val();
|
||||||
|
|
||||||
if (!fromDate || !toDate) {
|
if (!fromDate || !toDate) {
|
||||||
return true; // If no dates selected, don't filter
|
return true; // If no dates selected, don't filter
|
||||||
|
}
|
||||||
|
|
||||||
|
var dateStr = data[0]; // Assuming the date is in the first column
|
||||||
|
var dateParts = dateStr.split("-");
|
||||||
|
var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]); // Convert dd-mm-yyyy to Date object
|
||||||
|
|
||||||
|
var startDate = new Date(fromDate);
|
||||||
|
var endDate = new Date(toDate);
|
||||||
|
|
||||||
|
// Adjust startDate to include the day before the selected fromDate
|
||||||
|
startDate.setDate(startDate.getDate() - 1);
|
||||||
|
|
||||||
|
// Ensure endDate includes the entire end date by setting time to the end of the day
|
||||||
|
endDate.setHours(23, 59, 59, 999);
|
||||||
|
|
||||||
|
// Return true if the date is within the range
|
||||||
|
return date >= startDate && date <= endDate;
|
||||||
}
|
}
|
||||||
|
);
|
||||||
var dateStr = data[0]; // Assuming the date is in the first column
|
|
||||||
var dateParts = dateStr.split("-");
|
|
||||||
var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]); // Convert dd-mm-yyyy to Date object
|
|
||||||
|
|
||||||
var startDate = new Date(fromDate);
|
|
||||||
var endDate = new Date(toDate);
|
|
||||||
|
|
||||||
// Adjust startDate to include the day before the selected fromDate
|
|
||||||
startDate.setDate(startDate.getDate() - 1);
|
|
||||||
|
|
||||||
// Ensure endDate includes the entire end date by setting time to the end of the day
|
|
||||||
endDate.setHours(23, 59, 59, 999);
|
|
||||||
|
|
||||||
// Return true if the date is within the range
|
// Handle form submission for the date range filter
|
||||||
return date >= startDate && date <= endDate;
|
$("#DateRangeFilter").submit(function(e) {
|
||||||
}
|
e.preventDefault();
|
||||||
);
|
table.draw(); // Redraw the table to apply the filter
|
||||||
|
});
|
||||||
|
|
||||||
// Handle form submission for the date range filter
|
// Reset button functionality
|
||||||
$("#DateRangeFilter").submit(function(e) {
|
$("#resetButton").click(function() {
|
||||||
e.preventDefault();
|
$("#fromDate").val('');
|
||||||
table.draw(); // Redraw the table to apply the filter
|
$("#toDate").val('');
|
||||||
|
table.draw(); // Redraw the table to clear the filter
|
||||||
|
});
|
||||||
|
|
||||||
|
// Automatically focus and open the To Date picker when From Date is selected
|
||||||
|
document.getElementById('fromDate').addEventListener('change', function() {
|
||||||
|
var fromDate = this.value;
|
||||||
|
var toDateInput = document.getElementById('toDate');
|
||||||
|
|
||||||
|
// Set the min attribute of the To Date input to the selected From Date
|
||||||
|
toDateInput.min = fromDate;
|
||||||
|
|
||||||
|
// Optionally reset the To Date input if the current value is before the new min date
|
||||||
|
if (toDateInput.value < fromDate) {
|
||||||
|
toDateInput.value = fromDate;
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Reset button functionality
|
|
||||||
$("#resetButton").click(function() {
|
|
||||||
$("#fromDate").val('');
|
|
||||||
$("#toDate").val('');
|
|
||||||
table.draw(); // Redraw the table to clear the filter
|
|
||||||
});
|
|
||||||
|
|
||||||
// Automatically focus and open the To Date picker when From Date is selected
|
|
||||||
document.getElementById('fromDate').addEventListener('change', function() {
|
|
||||||
var fromDate = this.value;
|
|
||||||
var toDateInput = document.getElementById('toDate');
|
|
||||||
|
|
||||||
// Set the min attribute of the To Date input to the selected From Date
|
|
||||||
toDateInput.min = fromDate;
|
|
||||||
|
|
||||||
// Optionally reset the To Date input if the current value is before the new min date
|
|
||||||
if (toDateInput.value < fromDate) {
|
|
||||||
toDateInput.value = fromDate;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
</script>
|
</script>
|
||||||
Loading…
Reference in New Issue
Block a user