changes in master details-1 vadivel J 22-11-2024
This commit is contained in:
parent
599e3efd7b
commit
bd0a29ea95
@ -145,11 +145,21 @@ class Department extends BaseController
|
|||||||
|
|
||||||
function reActivateDepartment(){
|
function reActivateDepartment(){
|
||||||
|
|
||||||
|
$depCode = $this->request->getGet('SID');
|
||||||
|
$updateInfo = ['IsActive' => 1];
|
||||||
|
$result = $this->department_model->reActivateDepartment($depCode , $updateInfo);
|
||||||
|
|
||||||
|
return redirect()->route('departmentListing');
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function deleteDepartment(){
|
function deleteDepartment(){
|
||||||
|
$depCode = $this->request->getGet('SID');
|
||||||
|
$updateInfo = ['IsActive' => 0];
|
||||||
|
$result = $this->department_model->reActivateDepartment($depCode , $updateInfo);
|
||||||
|
|
||||||
|
return redirect()->route('departmentListing');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -132,13 +132,21 @@ function getdepcode()
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function reActivateDepartment(){
|
function reActivateDepartment($depCode , $updateInfo){
|
||||||
|
$this->db->table('t_departmentdetails')
|
||||||
|
->where('DEPCode', $depCode)
|
||||||
|
->update($updateInfo);
|
||||||
|
$res = $this->db->affectedRows();
|
||||||
|
return $res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function deleteDepartment(){
|
function deleteDepartment($depCode , $updateInfo){
|
||||||
|
$this->db->table('t_departmentdetails')
|
||||||
|
->where('DEPCode', $depCode)
|
||||||
|
->update($updateInfo);
|
||||||
|
$res = $this->db->affectedRows();
|
||||||
|
return $res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -92,6 +92,7 @@
|
|||||||
?>
|
?>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
<p>( Note :The entries count includes archived data... )</p>
|
||||||
<br>
|
<br>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -54,7 +54,7 @@
|
|||||||
</li>
|
</li>
|
||||||
</ol>
|
</ol>
|
||||||
</div>
|
</div>
|
||||||
<a href="<?php echo base_url();?>addasset" class="btn btn-success">Add New
|
<a href="<?php echo base_url(); ?>addasset" class="btn btn-success">Add New
|
||||||
Asset</a>
|
Asset</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -63,22 +63,29 @@
|
|||||||
<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 form-date-search" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
|
<input class="form-control date_range form-date-search" 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 to-date-search" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
|
<input class="form-control date_range to-date-search" 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"
|
||||||
<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
|
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 style="margin-left:auto">
|
<div style="margin-left:auto">
|
||||||
<div class="form-check" style="margin-right: 25px;">
|
<div class="form-check" style="margin-right: 25px;">
|
||||||
<input class="form-check-input" type="checkbox" id="showArchiveId" name="showArchive"
|
<input class="form-check-input" type="checkbox" id="showArchiveId"
|
||||||
value="1" onchange="showArchiveList()" style="width: 18px; height: 18px;">
|
name="showArchive" value="1" onchange="showArchiveList()"
|
||||||
<label class="form-check-label" for="showArchiveId" style="font-size: 1rem; margin-left: 8px;">
|
style="width: 18px; height: 18px;">
|
||||||
|
<label class="form-check-label" for="showArchiveId"
|
||||||
|
style="font-size: 1rem; margin-left: 8px;">
|
||||||
Show Archive
|
Show Archive
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
@ -90,7 +97,7 @@
|
|||||||
</form>
|
</form>
|
||||||
<div class="card-body" style="overflow-x:scroll;">
|
<div class="card-body" style="overflow-x:scroll;">
|
||||||
|
|
||||||
<table class="table dt-responsive nowrap w-100" id="asset_list_table" >
|
<table class="table dt-responsive nowrap w-100" id="asset_list_table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Created Date</th>
|
<th>Created Date</th>
|
||||||
@ -114,10 +121,12 @@
|
|||||||
if (!empty($userRecords)) {
|
if (!empty($userRecords)) {
|
||||||
foreach ($userRecords as $record) {
|
foreach ($userRecords as $record) {
|
||||||
?>
|
?>
|
||||||
<tr
|
<tr class="<?php if ($record->IsActive == 0) {
|
||||||
class="<?php if($record->IsActive == 0){echo"deactivatedRow";}?>"
|
echo "deactivatedRow";
|
||||||
style="<?php if($record->IsActive == 0){echo"display:none";}?>"
|
} ?>"
|
||||||
>
|
style="<?php if ($record->IsActive == 0) {
|
||||||
|
echo "display:none";
|
||||||
|
} ?>">
|
||||||
|
|
||||||
<?php if (date('d-m-Y', strtotime($record->CreatedDt)) == "30-11--0001") {
|
<?php if (date('d-m-Y', strtotime($record->CreatedDt)) == "30-11--0001") {
|
||||||
$cdate = '00-00-0000';
|
$cdate = '00-00-0000';
|
||||||
@ -141,26 +150,26 @@
|
|||||||
<td>
|
<td>
|
||||||
<?php if ($record->IsActive == 0) { ?>
|
<?php if ($record->IsActive == 0) { ?>
|
||||||
|
|
||||||
<a
|
<a onclick="confirmReActivatingAsset()"
|
||||||
onclick ="confirmReActivatingAsset()"
|
|
||||||
href="<?php echo base_url() . 'assetdetails/reActivateAsset/?AssetID=' . $record->AssetCode ?>"
|
href="<?php echo base_url() . 'assetdetails/reActivateAsset/?AssetID=' . $record->AssetCode ?>"
|
||||||
data-toggle="tooltip" title="<?php echo $record->AssetCode; ?> - Click here to Re-Activate Asset Details">
|
data-toggle="tooltip"
|
||||||
<i class="fa fa-key" ></i>
|
title="<?php echo $record->AssetCode; ?> - Click here to Re-Activate Asset Details">
|
||||||
|
<i class="fa fa-key"></i>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<?php } else { ?>
|
<?php } else { ?>
|
||||||
|
|
||||||
<a
|
<a href="<?php echo base_url() . 'assetdetails/editOldasset/?AssetID=' . $record->AssetCode ?>"
|
||||||
href="<?php echo base_url() . 'assetdetails/editOldasset/?AssetID=' . $record->AssetCode ?>"
|
data-toggle="tooltip"
|
||||||
data-toggle="tooltip" title="<?php echo $record->AssetCode; ?> - Click here to View Asset Details">
|
title="<?php echo $record->AssetCode; ?> - Click here to View Asset Details">
|
||||||
<i class="fa fa-edit" ></i>
|
<i class="fa fa-edit"></i>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a
|
<a onclick="confirmDeleteAsset(event)"
|
||||||
onclick ="confirmDeleteAsset(event)"
|
|
||||||
href="<?php echo base_url() . 'assetdetails/deleteAsset/?AssetID=' . $record->AssetCode ?>"
|
href="<?php echo base_url() . 'assetdetails/deleteAsset/?AssetID=' . $record->AssetCode ?>"
|
||||||
data-toggle="tooltip" title="<?php echo $record->AssetCode; ?> - Click here to Delete Asset Details">
|
data-toggle="tooltip"
|
||||||
<i class="fa fa-trash" ></i>
|
title="<?php echo $record->AssetCode; ?> - Click here to Delete Asset Details">
|
||||||
|
<i class="fa fa-trash"></i>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
@ -185,7 +194,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div> <!-- container -->
|
</div> <!-- container -->
|
||||||
</div> <!-- content -->
|
</div> <!-- content -->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
|
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
|
||||||
@ -194,7 +203,7 @@
|
|||||||
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function() {
|
$(document).ready(function () {
|
||||||
// Initialize the DataTable
|
// Initialize the DataTable
|
||||||
var table = $('#asset_list_table').DataTable({
|
var table = $('#asset_list_table').DataTable({
|
||||||
dom: 'Blfrtip',
|
dom: 'Blfrtip',
|
||||||
@ -218,7 +227,7 @@
|
|||||||
|
|
||||||
// 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();
|
||||||
|
|
||||||
@ -250,20 +259,20 @@
|
|||||||
);
|
);
|
||||||
|
|
||||||
// Handle form submission for the date range filter
|
// Handle form submission for the date range filter
|
||||||
$("#DateRangeFilter").submit(function(e) {
|
$("#DateRangeFilter").submit(function (e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
table.draw(); // Redraw the table to apply the filter
|
table.draw(); // Redraw the table to apply the filter
|
||||||
});
|
});
|
||||||
|
|
||||||
// Reset button functionality
|
// Reset button functionality
|
||||||
$("#resetButton").click(function() {
|
$("#resetButton").click(function () {
|
||||||
$("#fromDate").val('');
|
$("#fromDate").val('');
|
||||||
$("#toDate").val('');
|
$("#toDate").val('');
|
||||||
table.draw(); // Redraw the table to clear the filter
|
table.draw(); // Redraw the table to clear the filter
|
||||||
});
|
});
|
||||||
|
|
||||||
// Automatically focus and open the To Date picker when From Date is selected
|
// Automatically focus and open the To Date picker when From Date is selected
|
||||||
document.getElementById('fromDate').addEventListener('change', function() {
|
document.getElementById('fromDate').addEventListener('change', function () {
|
||||||
var fromDate = this.value;
|
var fromDate = this.value;
|
||||||
var toDateInput = document.getElementById('toDate');
|
var toDateInput = document.getElementById('toDate');
|
||||||
|
|
||||||
@ -283,7 +292,7 @@
|
|||||||
let isChecked = $("#showArchiveId").prop('checked');
|
let isChecked = $("#showArchiveId").prop('checked');
|
||||||
|
|
||||||
// Show or hide the rows based on checkbox status
|
// Show or hide the rows based on checkbox status
|
||||||
$(".deactivatedRow").each(function() {
|
$(".deactivatedRow").each(function () {
|
||||||
if (isChecked) {
|
if (isChecked) {
|
||||||
$(this).show();
|
$(this).show();
|
||||||
} else {
|
} else {
|
||||||
@ -292,20 +301,27 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function () {
|
||||||
|
let table = $('#asset_list_table').DataTable();
|
||||||
|
|
||||||
|
showArchiveList();
|
||||||
|
|
||||||
|
table.on('draw', function () {
|
||||||
showArchiveList();
|
showArchiveList();
|
||||||
});
|
});
|
||||||
|
|
||||||
function confirmReActivatingAsset(event){
|
});
|
||||||
|
|
||||||
|
function confirmReActivatingAsset(event) {
|
||||||
let result = confirm("Do You Want to Re-Activate Asset details ?");
|
let result = confirm("Do You Want to Re-Activate Asset details ?");
|
||||||
|
|
||||||
if(result){return;}else{event.preventDefault();}
|
if (result) { return; } else { event.preventDefault(); }
|
||||||
}
|
}
|
||||||
|
|
||||||
function confirmDeleteAsset(){
|
function confirmDeleteAsset() {
|
||||||
let result = confirm("Do You Want to Delete Asset details ?");
|
let result = confirm("Do You Want to Delete Asset details ?");
|
||||||
|
|
||||||
if(result){return;}else{event.preventDefault();}
|
if (result) { return; } else { event.preventDefault(); }
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
@ -146,6 +146,7 @@
|
|||||||
?>
|
?>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
<p>( Note :The entries count includes archived data... )</p>
|
||||||
</div> <!-- end card body-->
|
</div> <!-- end card body-->
|
||||||
</div> <!-- end card -->
|
</div> <!-- end card -->
|
||||||
</div><!-- end col-->
|
</div><!-- end col-->
|
||||||
@ -416,6 +417,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
|
let table = $('#cost_listing').DataTable();
|
||||||
|
|
||||||
|
showArchiveList();
|
||||||
|
|
||||||
|
table.on('draw', function () {
|
||||||
showArchiveList();
|
showArchiveList();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
@ -90,16 +90,35 @@
|
|||||||
<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 form-date-search" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
|
<input class="form-control date_range form-date-search" 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 to-date-search" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
|
<input class="form-control date_range to-date-search" 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 style="margin-left:auto">
|
||||||
|
<div class="form-check" style="margin-right: 25px;">
|
||||||
|
<input class="form-check-input" type="checkbox" id="showArchiveId" name="showArchive" value="1"
|
||||||
|
onchange="showArchiveList()" style="width: 18px; height: 18px;">
|
||||||
|
<label class="form-check-label" for="showArchiveId" style="font-size: 1rem; margin-left: 8px;">
|
||||||
|
Show Archive
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<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>
|
<div class="error" id="error"></div>
|
||||||
</form>
|
</form>
|
||||||
<div class="card-body" style="overflow-x:scroll;">
|
<div class="card-body" style="overflow-x:scroll;">
|
||||||
@ -119,7 +138,11 @@
|
|||||||
if (!empty($userRecords)) {
|
if (!empty($userRecords)) {
|
||||||
foreach ($userRecords as $record) {
|
foreach ($userRecords as $record) {
|
||||||
?>
|
?>
|
||||||
<tr>
|
<tr class="<?php if ($record->IsActive == 0) {
|
||||||
|
echo "deactivatedRow";
|
||||||
|
} ?>" style="<?php if ($record->IsActive == 0) {
|
||||||
|
echo "display:none";
|
||||||
|
} ?>">
|
||||||
<!-- <td title=" - Click here to view department details"> </td> -->
|
<!-- <td title=" - Click here to view department details"> </td> -->
|
||||||
<?php if (date('d-m-Y', strtotime($record->CreatedDt)) == "30-11--0001") {
|
<?php if (date('d-m-Y', strtotime($record->CreatedDt)) == "30-11--0001") {
|
||||||
$cdate = '00-00-0000';
|
$cdate = '00-00-0000';
|
||||||
@ -127,16 +150,33 @@
|
|||||||
$cdate = date('d-m-Y', strtotime($record->CreatedDt));
|
$cdate = date('d-m-Y', strtotime($record->CreatedDt));
|
||||||
} ?>
|
} ?>
|
||||||
<td><?php echo $cdate; ?> </td>
|
<td><?php echo $cdate; ?> </td>
|
||||||
<td><?php echo $record->DEPCode;?></td>
|
<td><?php echo $record->DEPCode; ?></td>
|
||||||
<td><?php echo $record->DepartmentName ?></td>
|
<td><?php echo $record->DepartmentName ?></td>
|
||||||
<td><?php echo $record->HeadDept ?></td>
|
<td><?php echo $record->HeadDept ?></td>
|
||||||
<td><?php if ($record->IsActive == 0) { ?>
|
<td>
|
||||||
<a href="<?php echo base_url() . 'reActivateDepartment/?SID=' . $record->DEPCode ?>" data-toggle="tooltip" title="<?php echo $record->DEPCode ?> - Click here to Re activate Department Details"><i class="fas fa-key"></i></a></u>
|
<?php if ($record->IsActive == 0) { ?>
|
||||||
|
|
||||||
|
<a href="<?php echo base_url() . 'reActivateDepartment/?SID=' . $record->DEPCode ?>"
|
||||||
|
data-toggle="tooltip"
|
||||||
|
title="<?php echo $record->DEPCode ?> - Click here to Re activate Department Details"><i
|
||||||
|
class="fas fa-key"></i></a></u>
|
||||||
|
|
||||||
<?php } else { ?>
|
<?php } else { ?>
|
||||||
<a href="<?php echo base_url() . 'editOlddepartment/?SID=' . $record->DEPCode ?>" data-toggle="tooltip" title="<?php echo $record->DEPCode ?> - Click here to View Department Details"><i class="fas fa-edit"></i></a></u>
|
|
||||||
|
<a href="<?php echo base_url() . 'editOlddepartment/?SID=' . $record->DEPCode ?>"
|
||||||
|
data-toggle="tooltip"
|
||||||
|
title="<?php echo $record->DEPCode ?> - Click here to View Department Details"><i
|
||||||
|
class="fas fa-edit"></i></a></u>
|
||||||
|
|
||||||
|
|
||||||
<a href="<?php echo base_url() . 'deleteDepartment/?SID=' . $record->DEPCode ?>" data-toggle="tooltip" title="<?php echo $record->DEPCode ?> - Click here to Delete Department Details"><i class="fas fa-trash"></i></a></u>
|
|
||||||
|
<a href="<?php echo base_url() . 'deleteDepartment/?SID=' . $record->DEPCode ?>"
|
||||||
|
data-toggle="tooltip"
|
||||||
|
title="<?php echo $record->DEPCode ?> - Click here to Delete Department Details"><i
|
||||||
|
class="fas fa-trash"></i></a></u>
|
||||||
|
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
@ -146,6 +186,7 @@
|
|||||||
?>
|
?>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
<p>( Note :The entries count includes archived data... )</p>
|
||||||
</div> <!-- end card body-->
|
</div> <!-- end card body-->
|
||||||
</div> <!-- end card -->
|
</div> <!-- end card -->
|
||||||
</div><!-- end col-->
|
</div><!-- end col-->
|
||||||
@ -158,8 +199,8 @@
|
|||||||
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
|
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></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;
|
||||||
};
|
};
|
||||||
@ -187,7 +228,7 @@
|
|||||||
|
|
||||||
// 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();
|
||||||
console.log(fromDate); // e.g., 01-09-2024
|
console.log(fromDate); // e.g., 01-09-2024
|
||||||
@ -221,20 +262,20 @@
|
|||||||
);
|
);
|
||||||
|
|
||||||
// Handle form submission for the date range filter
|
// Handle form submission for the date range filter
|
||||||
$("#DateRangeFilter").submit(function(e) {
|
$("#DateRangeFilter").submit(function (e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
table.draw(); // Redraw the table to apply the filter
|
table.draw(); // Redraw the table to apply the filter
|
||||||
});
|
});
|
||||||
|
|
||||||
// Reset button functionality
|
// Reset button functionality
|
||||||
$("#resetButton").click(function() {
|
$("#resetButton").click(function () {
|
||||||
$("#fromDate").val('');
|
$("#fromDate").val('');
|
||||||
$("#toDate").val('');
|
$("#toDate").val('');
|
||||||
table.draw(); // Redraw the table to clear the filter
|
table.draw(); // Redraw the table to clear the filter
|
||||||
});
|
});
|
||||||
|
|
||||||
// Automatically focus and open the To Date picker when From Date is selected
|
// Automatically focus and open the To Date picker when From Date is selected
|
||||||
document.getElementById('fromDate').addEventListener('change', function() {
|
document.getElementById('fromDate').addEventListener('change', function () {
|
||||||
var fromDate = this.value;
|
var fromDate = this.value;
|
||||||
var toDateInput = document.getElementById('toDate');
|
var toDateInput = document.getElementById('toDate');
|
||||||
|
|
||||||
@ -248,3 +289,33 @@
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
|
||||||
|
function showArchiveList() {
|
||||||
|
let isChecked = $("#showArchiveId").prop('checked');
|
||||||
|
|
||||||
|
// Show or hide the rows based on checkbox status
|
||||||
|
$(".deactivatedRow").each(function () {
|
||||||
|
if (isChecked) {
|
||||||
|
$(this).show();
|
||||||
|
} else {
|
||||||
|
$(this).hide();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
$(document).ready(function () {
|
||||||
|
let table = $('#department_list_table').DataTable();
|
||||||
|
|
||||||
|
showArchiveList();
|
||||||
|
|
||||||
|
table.on('draw', function () {
|
||||||
|
showArchiveList();
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
</script>
|
||||||
@ -162,6 +162,7 @@
|
|||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
<p>( Note :The entries count includes archived data... )</p>
|
||||||
</div> <!-- end card body-->
|
</div> <!-- end card body-->
|
||||||
</div> <!-- end card -->
|
</div> <!-- end card -->
|
||||||
</div><!-- end col-->
|
</div><!-- end col-->
|
||||||
@ -277,8 +278,15 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function () {
|
||||||
|
let table = $('#raw_material_list_table').DataTable();
|
||||||
|
|
||||||
showArchiveList();
|
showArchiveList();
|
||||||
|
|
||||||
|
table.on('draw', function () {
|
||||||
|
showArchiveList();
|
||||||
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
<style>
|
<style>
|
||||||
.Date-filter-form {
|
.Date-filter-form {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@ -34,10 +34,10 @@
|
|||||||
.icon-button:hover {
|
.icon-button:hover {
|
||||||
color: #0056b3;
|
color: #0056b3;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
<div class="content-page">
|
<div class="content-page">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<?php
|
<?php
|
||||||
helper('form');
|
helper('form');
|
||||||
@ -68,22 +68,29 @@
|
|||||||
<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 form-date-search" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
|
<input class="form-control date_range form-date-search" 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 to-date-search" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
|
<input class="form-control date_range to-date-search" 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"
|
||||||
<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
|
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 style="margin-left:auto">
|
<div style="margin-left:auto">
|
||||||
<div class="form-check" style="margin-right: 25px;">
|
<div class="form-check" style="margin-right: 25px;">
|
||||||
<input class="form-check-input" type="checkbox" id="showArchiveId" name="showArchive"
|
<input class="form-check-input" type="checkbox" id="showArchiveId"
|
||||||
value="1" onchange="showArchiveList()" style="width: 18px; height: 18px;">
|
name="showArchive" value="1" onchange="showArchiveList()"
|
||||||
<label class="form-check-label" for="showArchiveId" style="font-size: 1rem; margin-left: 8px;">
|
style="width: 18px; height: 18px;">
|
||||||
|
<label class="form-check-label" for="showArchiveId"
|
||||||
|
style="font-size: 1rem; margin-left: 8px;">
|
||||||
Show Archive
|
Show Archive
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
@ -116,10 +123,12 @@
|
|||||||
foreach ($userRecords as $record) {
|
foreach ($userRecords as $record) {
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<tr
|
<tr class="<?php if ($record->IsActive == 0) {
|
||||||
class="<?php if($record->IsActive == 0){echo"deactivatedRow";}?>"
|
echo "deactivatedRow";
|
||||||
style="<?php if($record->IsActive == 0){echo"display:none";}?>"
|
} ?>"
|
||||||
>
|
style="<?php if ($record->IsActive == 0) {
|
||||||
|
echo "display:none";
|
||||||
|
} ?>">
|
||||||
|
|
||||||
<?php if (date('d-m-Y', strtotime($record->CreatedOn)) == "30-11--0001") {
|
<?php if (date('d-m-Y', strtotime($record->CreatedOn)) == "30-11--0001") {
|
||||||
$cdate = '00-00-0000';
|
$cdate = '00-00-0000';
|
||||||
@ -138,20 +147,25 @@
|
|||||||
<td><?php echo $record->PaymentTerms ?></td>
|
<td><?php echo $record->PaymentTerms ?></td>
|
||||||
<td><?php if ($record->IsActive == 0) { ?>
|
<td><?php if ($record->IsActive == 0) { ?>
|
||||||
|
|
||||||
<a style="cursor:pointer;" onclick="reActivateSupplier('<?php echo $record->SupplierID; ?>')"><i class="fa fa-key" style="color:#02a8b5;"></i> </a>
|
<a style="cursor:pointer;"
|
||||||
|
onclick="reActivateSupplier('<?php echo $record->SupplierID; ?>')"><i
|
||||||
|
class="fa fa-key"
|
||||||
|
style="color:#02a8b5;"></i> </a>
|
||||||
|
|
||||||
<?php } else { ?>
|
<?php } else { ?>
|
||||||
|
|
||||||
<a class="a-tag-link"
|
<a class="a-tag-link"
|
||||||
href="<?= base_url() ?>viewsupplier?SID=<?= $record->SupplierID ?>&Payment=<?= $record->PaymentTerms ?>"
|
href="<?= base_url() ?>viewsupplier?SID=<?= $record->SupplierID ?>&Payment=<?= $record->PaymentTerms ?>"
|
||||||
data-toggle="tooltip"
|
data-toggle="tooltip"
|
||||||
title="<?= $record->SupplierID ?> - Click here to edit Supplier details"><i class="fa fa-edit" style="color:#02a8b5;"></i>
|
title="<?= $record->SupplierID ?> - Click here to edit Supplier details"><i
|
||||||
|
class="fa fa-edit" style="color:#02a8b5;"></i>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a style="cursor:pointer;"
|
<a style="cursor:pointer;" data-toggle="tooltip"
|
||||||
data-toggle="tooltip"
|
|
||||||
title="<?= $record->SupplierID ?> - Click here to delete Supplier details"
|
title="<?= $record->SupplierID ?> - Click here to delete Supplier details"
|
||||||
onclick="deletesupplier('<?php echo $record->SupplierID; ?>')"><i class="fa fa-trash" style="color:#02a8b5;"></i>
|
onclick="deletesupplier('<?php echo $record->SupplierID; ?>')"><i
|
||||||
|
class="fa fa-trash"
|
||||||
|
style="color:#02a8b5;"></i>
|
||||||
</a>
|
</a>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
</td>
|
</td>
|
||||||
@ -162,6 +176,7 @@
|
|||||||
?>
|
?>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
<p>( Note :The entries count includes archived data... )</p>
|
||||||
</div> <!-- end card body-->
|
</div> <!-- end card body-->
|
||||||
</div> <!-- end card -->
|
</div> <!-- end card -->
|
||||||
</div><!-- end col-->
|
</div><!-- end col-->
|
||||||
@ -169,10 +184,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div> <!-- container -->
|
</div> <!-- container -->
|
||||||
</div> <!-- content -->
|
</div> <!-- content -->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
|
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
||||||
function deletesupplier(sid) {
|
function deletesupplier(sid) {
|
||||||
|
|
||||||
@ -183,21 +198,21 @@
|
|||||||
id: sid
|
id: sid
|
||||||
},
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url();?>deletesupplier",
|
url: "<?php echo base_url(); ?>deletesupplier",
|
||||||
success: function(data) {
|
success: function (data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
|
|
||||||
alert(data);
|
alert(data);
|
||||||
location.reload();
|
location.reload();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function (xhr, status, error) {
|
||||||
// Handle errors
|
// Handle errors
|
||||||
console.error('AJAX Error:', error); // Logs the actual error
|
console.error('AJAX Error:', error); // Logs the actual error
|
||||||
console.error('Status:', status); // Logs the status like "timeout", "error", etc.
|
console.error('Status:', status); // Logs the status like "timeout", "error", etc.
|
||||||
console.error('Response:', xhr.responseText); // Logs the server's response
|
console.error('Response:', xhr.responseText); // Logs the server's response
|
||||||
},
|
},
|
||||||
complete: function(xhr, status) {
|
complete: function (xhr, status) {
|
||||||
// Code to run after AJAX call is complete, regardless of success or error
|
// Code to run after AJAX call is complete, regardless of success or error
|
||||||
console.log('AJAX call completed');
|
console.log('AJAX call completed');
|
||||||
console.log('Status:', status);
|
console.log('Status:', status);
|
||||||
@ -219,21 +234,21 @@
|
|||||||
id: sid
|
id: sid
|
||||||
},
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url();?>reActivateSupplier",
|
url: "<?php echo base_url(); ?>reActivateSupplier",
|
||||||
success: function(data) {
|
success: function (data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
|
|
||||||
alert(data);
|
alert(data);
|
||||||
location.reload();
|
location.reload();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function (xhr, status, error) {
|
||||||
// Handle errors
|
// Handle errors
|
||||||
console.error('AJAX Error:', error); // Logs the actual error
|
console.error('AJAX Error:', error); // Logs the actual error
|
||||||
console.error('Status:', status); // Logs the status like "timeout", "error", etc.
|
console.error('Status:', status); // Logs the status like "timeout", "error", etc.
|
||||||
console.error('Response:', xhr.responseText); // Logs the server's response
|
console.error('Response:', xhr.responseText); // Logs the server's response
|
||||||
},
|
},
|
||||||
complete: function(xhr, status) {
|
complete: function (xhr, status) {
|
||||||
// Code to run after AJAX call is complete, regardless of success or error
|
// Code to run after AJAX call is complete, regardless of success or error
|
||||||
console.log('AJAX call completed');
|
console.log('AJAX call completed');
|
||||||
console.log('Status:', status);
|
console.log('Status:', status);
|
||||||
@ -246,10 +261,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
</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;
|
||||||
};
|
};
|
||||||
@ -277,7 +292,7 @@
|
|||||||
|
|
||||||
// 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();
|
||||||
console.log(fromDate); // e.g., 01-09-2024
|
console.log(fromDate); // e.g., 01-09-2024
|
||||||
@ -312,20 +327,20 @@
|
|||||||
|
|
||||||
|
|
||||||
// Handle form submission for the date range filter
|
// Handle form submission for the date range filter
|
||||||
$("#DateRangeFilter").submit(function(e) {
|
$("#DateRangeFilter").submit(function (e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
table.draw(); // Redraw the table to apply the filter
|
table.draw(); // Redraw the table to apply the filter
|
||||||
});
|
});
|
||||||
|
|
||||||
// Reset button functionality
|
// Reset button functionality
|
||||||
$("#resetButton").click(function() {
|
$("#resetButton").click(function () {
|
||||||
$("#fromDate").val('');
|
$("#fromDate").val('');
|
||||||
$("#toDate").val('');
|
$("#toDate").val('');
|
||||||
table.draw(); // Redraw the table to clear the filter
|
table.draw(); // Redraw the table to clear the filter
|
||||||
});
|
});
|
||||||
|
|
||||||
// Automatically focus and open the To Date picker when From Date is selected
|
// Automatically focus and open the To Date picker when From Date is selected
|
||||||
document.getElementById('fromDate').addEventListener('change', function() {
|
document.getElementById('fromDate').addEventListener('change', function () {
|
||||||
var fromDate = this.value;
|
var fromDate = this.value;
|
||||||
var toDateInput = document.getElementById('toDate');
|
var toDateInput = document.getElementById('toDate');
|
||||||
|
|
||||||
@ -344,7 +359,7 @@
|
|||||||
let isChecked = $("#showArchiveId").prop('checked');
|
let isChecked = $("#showArchiveId").prop('checked');
|
||||||
|
|
||||||
// Show or hide the rows based on checkbox status
|
// Show or hide the rows based on checkbox status
|
||||||
$(".deactivatedRow").each(function() {
|
$(".deactivatedRow").each(function () {
|
||||||
if (isChecked) {
|
if (isChecked) {
|
||||||
$(this).show();
|
$(this).show();
|
||||||
} else {
|
} else {
|
||||||
@ -353,9 +368,15 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function () {
|
||||||
|
let table = $('#datatable').DataTable();
|
||||||
|
|
||||||
|
showArchiveList();
|
||||||
|
|
||||||
|
table.on('draw', function () {
|
||||||
showArchiveList();
|
showArchiveList();
|
||||||
});
|
});
|
||||||
|
|
||||||
</script>
|
});
|
||||||
|
|
||||||
|
</script>
|
||||||
@ -186,7 +186,7 @@
|
|||||||
</tbody>
|
</tbody>
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
|
<p>( Note :The entries count includes archived data... )</p>
|
||||||
</div> <!-- end card body-->
|
</div> <!-- end card body-->
|
||||||
</div> <!-- end card -->
|
</div> <!-- end card -->
|
||||||
</div><!-- end col-->
|
</div><!-- end col-->
|
||||||
@ -435,7 +435,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
|
let table = $('#transporter_list').DataTable();
|
||||||
|
|
||||||
|
showArchiveList();
|
||||||
|
|
||||||
|
table.on('draw', function () {
|
||||||
showArchiveList();
|
showArchiveList();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
Loading…
Reference in New Issue
Block a user