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:
Gowtham M 2024-12-24 17:34:12 +05:30
commit 5a97a6ebeb
2 changed files with 75 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controllers/StockController.php
View File

@ -1322,8 +1322,7 @@ class StockController extends BaseController
$consumption = $row['Tot Gas Consumption']; $consumption = $row['Tot Gas Consumption'];
$dateToBeInserted = $data['date']; $dateToBeInserted = $data['date'];
$this->updateGasStockConsumption($dateToBeInserted, $consumption); $this->updateGasStockConsumption($dateToBeInserted, $consumption);
$inserts[] = $data; $inserts[] = $data;
} }

94
app/Views/drierMachineDetails.php
View File

@ -447,34 +447,58 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
<div class="modal-body"> <div class="modal-body">
<div class="row"> <div class="row">
<!-- Date Filter --> <?php
$currentDateInDmY = date('d-m-Y');
?>
<?php
$startDate = DateTime::createFromFormat('M-Y', $datefordropdown);
if ($startDate) {
$startDate->modify('first day of this month');
$daysInMonth = $startDate->format('t');
$dateArray = [];
for ($i = 0; $i < $daysInMonth; $i++) {
$dateArray[] = $startDate->format('d-m-Y');
$startDate->modify('+1 day');
}
} else {
echo "Invalid date format.";
}
?>
<!-- From Date Filter -->
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="fromDateFilter">Select Date</label> <label for="fromDateFilter">Select From Date</label>
<select id="fromDateFilter" name="fromDateFilter" class="form-control"> <select id="fromDateFilter" name="fromDateFilter" class="form-control">
<?php foreach ($drierDetails as $a) : <?php if (!empty($dateArray)) : ?>
$selectDate = DateTime::createFromFormat('Y-m-d', $a['date'])->format('d-m-Y'); ?> <?php foreach ($dateArray as $index => $date) : ?>
<option value="<?= $selectDate ?>"><?= $selectDate ?></option> <option value="<?= $date ?>" ><?= $date ?></option>
<?php endforeach; ?>
<?php endif; ?>
</select>
</div>
</div>
<?php endforeach; ?> <!-- To Date Filter -->
</select>
</div>
</div>
<!-- Date Filter -->
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="toDateFilter">Select Date</label> <label for="toDateFilter">Select Date</label>
<select id="toDateFilter" name="toDateFilter" class="form-control"> <select id="toDateFilter" name="toDateFilter" class="form-control">
<?php foreach ($drierDetails as $a) :
$selectDate = DateTime::createFromFormat('Y-m-d', $a['date'])->format('d-m-Y'); ?> <?php if (!empty($dateArray)) : ?>
<option value="<?= $selectDate ?>"><?= $selectDate ?></option> <?php foreach ($dateArray as $date) : ?>
<?php endforeach; ?> <option value="<?= $date ?>" <?= ($date == $currentDateInDmY) || ($date == $dateArray[9]) ?"selected" :" " ?> ><?= $date ?></option>
<?php endforeach; ?>
<?php endif; ?>
</select> </select>
</div> </div>
</div> </div>
</div> </div>
<button class="btn btn-primary float-right" onclick="filterDate()">Filter</button> <button class="btn btn-primary float-right" onclick="customFilterDate()">Filter</button>
</div> </div>
</div><!-- /.modal-content --> </div><!-- /.modal-content -->
</div><!-- /.modal-dialog --> </div><!-- /.modal-dialog -->
@ -621,17 +645,22 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
var alldata = $("#drierTable").tableToJSON(); var alldata = $("#drierTable").tableToJSON();
$('#drierTable tbody tr').each(function(index) { console.log('alldata', alldata);
$('#drierTable tbody tr:visible').each(function(index) {
if (alldata[index]) {
let row = alldata[index]; let row = alldata[index];
// Get the selected values from dropdowns // Get the selected values from dropdowns
row['Drier On Time'] = $(this).find('.drier_on_time').val(); row['Drier On Time'] = $(this).find('.drier_on_time').val();
row['Drier Off Time'] = $(this).find('.drier_off_time').val(); row['Drier Off Time'] = $(this).find('.drier_off_time').val();
row['Supplier Name'] = $(this).find('.supplier_name').val(); row['Supplier Name'] = $(this).find('.supplier_name').val();
}
}); });
alldata = JSON.stringify(alldata); alldata = JSON.stringify(alldata);
@ -911,7 +940,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
<script> <script>
function filterDate(){ function customFilterDate(){
let fromDate = $('#fromDateFilter').val(); //01-12-2024 let fromDate = $('#fromDateFilter').val(); //01-12-2024
let toDate = $('#toDateFilter').val(); //05-12-2024 let toDate = $('#toDateFilter').val(); //05-12-2024
@ -932,6 +961,31 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
} }
$(document).ready(function() {
initialFilterDate();
});
function initialFilterDate(){
let fromDate = $('#fromDateFilter').val(); //01-12-2024
let toDate = $('#toDateFilter').val(); //05-12-2024
console.log("from Date and to date ..!!")
console.log(fromDate,toDate);
$('#drierTable').find('tbody tr').each(function() {
const rowCells = $(this).find('td');
let tableDate = rowCells.eq(0).text();
let result = checkDateRange(fromDate,toDate,tableDate);
if (result) {
$(this).show();
} else {
$(this).hide();
}
});
}
function checkDateRange(fromDate, toDate, tableDate) { function checkDateRange(fromDate, toDate, tableDate) {
// Convert the dates to a comparable format (YYYY-MM-DD) // Convert the dates to a comparable format (YYYY-MM-DD)