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

stock module - 26-03-2025

Browse Source
This commit is contained in:
vadivelJ96 2025-03-26 14:04:02 +05:30
parent 4e5e0f3f09
commit e57b2c8d44
9 changed files with 334 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Views/stock/CoatingMachineDetail.php
View File

@ -327,16 +327,16 @@
</div> </div>
<div class="col-8"> <div class="col-7">
<!-- <a style="cursor:pointer"
class="dropdown-item" data-toggle="modal" data-target="#filterModalId">
Filter
</a> -->
</div> </div>
<div class="col-lg-1 "> <div class="col-2">
<a style="cursor:pointer"
class="btn btn-secondary " data-toggle="modal" data-target="#filterModalId">
Date Filter
</a>
<button type="button" class="btn btn-success m-0" data-target="#coatingMachineDetailModal" <button type="button" class="btn btn-success m-0" data-target="#coatingMachineDetailModal"
data-toggle="modal"> data-toggle="modal">

22
app/Views/stock/bagStockDetails.php
View File

@ -345,13 +345,12 @@
if($month == date('M-Y') ){ if($month == date('M-Y') ){
?> ?>
<div class="col-7"> <div class="col-6">
<!-- right now client is not using this -->
<!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
</div> </div>
<div class="col-2 m-0"> <div class="col-3 m-0">
<button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId" <button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId"
data-toggle="modal"> data-toggle="modal">
Customize Customize
@ -359,16 +358,16 @@
<?php <?php
} else { ?> } else { ?>
<div class="col-8"> <div class="col-7">
<!-- right now client is not using this --> <!-- right now client is not using this -->
<!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> --> <!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
</div> </div>
<div class="col-1"> <div class="col-2">
<?php <?php
} }
?> ?>
<a class="btn btn-secondary" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a>
<input type="button" class="btn btn-success px-4" id="saveId" value="Save"> <input type="button" class="btn btn-success px-4" id="saveId" value="Save">
</div> </div>
@ -773,7 +772,7 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="bagDropdown">Select Bag</label> <label for="bagDropdown">Select Bag</label>
<select id="bagDropdown" class="form-control"> <select id="bagDropdown" class="form-control select2">
<option value="">Select Bag</option> <option value="">Select Bag</option>
<?php foreach($bagMaterials as $bagMaterial): ?> <?php foreach($bagMaterials as $bagMaterial): ?>
<option value=" <?= $bagMaterial['MaterialName']?>"> <option value=" <?= $bagMaterial['MaterialName']?>">
@ -791,7 +790,7 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="dateDropdown">Select Date</label> <label for="dateDropdown">Select Date</label>
<select id="dateDropdown" class="form-control"> <select id="dateDropdown" class="form-control select2">
<?php foreach($datesInMonth as $selectDate): ?> <?php foreach($datesInMonth as $selectDate): ?>
<?php $selectDate=DateTime::createFromFormat('Y-m-d', $selectDate)->format('d-m-Y'); ?> <?php $selectDate=DateTime::createFromFormat('Y-m-d', $selectDate)->format('d-m-Y'); ?>
<option value="<?=$selectDate?>"><?=$selectDate?></option> <option value="<?=$selectDate?>"><?=$selectDate?></option>
@ -809,6 +808,11 @@
<script>
$(document).ready(function(){
$('.select2').select2();
})
</script>

21
app/Views/stock/dieselStockDetails.php
View File

@ -338,13 +338,12 @@ foreach ($period as $day) {
if($month == date('M-Y') ){ if($month == date('M-Y') ){
?> ?>
<div class="col-7"> <div class="col-6">
<!-- right now client is not using this -->
<!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
</div> </div>
<div class="col-2 m-0"> <div class="col-3 m-0">
<button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId" <button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId"
data-toggle="modal"> data-toggle="modal">
Customize Customize
@ -352,15 +351,14 @@ foreach ($period as $day) {
<?php <?php
} else { ?> } else { ?>
<div class="col-8"> <div class="col-7">
<!-- right now client is not using this -->
<!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
</div> </div>
<div class="col-1"> <div class="col-2">
<?php <?php
} }
?> ?>
<a class="btn btn-secondary" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a>
<input type="button" class="btn btn-success px-4" id="saveId" value="Save"> <input type="button" class="btn btn-success px-4" id="saveId" value="Save">
@ -933,7 +931,7 @@ foreach ($period as $day) {
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="dieselDropdown">Select Bag</label> <label for="dieselDropdown">Select Bag</label>
<select id="dieselDropdown" class="form-control"> <select id="dieselDropdown" class="form-control select2">
<option value="">Select Diesel</option> <option value="">Select Diesel</option>
<?php foreach ($dieselMachines as $dieselMachine): ?> <?php foreach ($dieselMachines as $dieselMachine): ?>
<option value=" <?= $dieselMachine['machine_name'] ?>"> <option value=" <?= $dieselMachine['machine_name'] ?>">
@ -951,7 +949,7 @@ foreach ($period as $day) {
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="dateDropdown">Select Date</label> <label for="dateDropdown">Select Date</label>
<select id="dateDropdown" class="form-control"> <select id="dateDropdown" class="form-control select2">
<?php foreach ($datesInMonth as $selectDate): ?> <?php foreach ($datesInMonth as $selectDate): ?>
<?php $selectDate = DateTime::createFromFormat('Y-m-d', $selectDate)->format('d-m-Y'); ?> <?php $selectDate = DateTime::createFromFormat('Y-m-d', $selectDate)->format('d-m-Y'); ?>
<option value="<?= $selectDate ?>"><?= $selectDate ?></option> <option value="<?= $selectDate ?>"><?= $selectDate ?></option>
@ -1634,6 +1632,7 @@ foreach ($period as $day) {
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$('#customizeHeader').select2(); $('#customizeHeader').select2();
$('.select2').select2();
}) })
</script> </script>

13
app/Views/stock/drierMachineDetails.php
View File

@ -323,15 +323,18 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
</div> </div>
<div class="col-8"> <div class="col-7">
<!-- right now client is not using this --> <!-- right now client is not using this -->
<!-- <a style="cursor:pointer"
class="dropdown-item" data-toggle="modal" data-target="#filterModalId">Filter</a> -->
</div> </div>
<div class="col-lg-1 "> <div class="col-2 ">
<a style="cursor:pointer"
class="btn btn-secondary" data-toggle="modal" data-target="#filterModalId">
Date Filter</a>
<button type="button" class="btn btn-success m-0" data-target="#additionalEntriesModalId" <button type="button" class="btn btn-success m-0" data-target="#additionalEntriesModalId"
data-toggle="modal"> data-toggle="modal">

131
app/Views/stock/dustAndRoughStockDetails.php
View File

@ -319,11 +319,15 @@
</div> </div>
<div class="col-2"> <div class="col-1">
</div> </div>
<div class="col-1"> <div class="col-2">
<a style="cursor:pointer"
class="btn btn-secondary " data-toggle="modal" data-target="#filterModalId">
Date Filter
</a>
<button class="btn btn-success m-0 px-3" type="button" id="saveId">Save</button> <button class="btn btn-success m-0 px-3" type="button" id="saveId">Save</button>
</div> </div>
@ -499,10 +503,133 @@
</div> </div>
<!-- modal section -->
<!-- filter modal -->
<div class="modal fade" id="filterModalId" tabindex="-1" role="dialog" aria-labelledby="filterModalLabelId" aria-hidden="true">
<div class="modal-dialog modal-md">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="filterModalLabelId">Filter Options</h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
</div>
<div class="modal-body">
<div class="row">
<?php
$currentDateInDmY = date('d-m-Y');
?>
<?php
$startDate = DateTime::createFromFormat('M-Y', $month);
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="form-group">
<label for="fromDateFilter">Select From Date</label>
<select id="fromDateFilter" name="fromDateFilter" class="form-control select2">
<?php if (!empty($dateArray)) : ?>
<?php foreach ($dateArray as $index => $date) : ?>
<option value="<?= $date ?>" ><?= $date ?></option>
<?php endforeach; ?>
<?php endif; ?>
</select>
</div>
</div>
<!-- To Date Filter -->
<div class="col-md-6">
<div class="form-group">
<label for="toDateFilter">Select Date</label>
<select id="toDateFilter" name="toDateFilter" class="form-control select2">
<?php if (!empty($dateArray)) : ?>
<?php foreach ($dateArray as $date) : ?>
<option value="<?= $date ?>" <?= ($date == $currentDateInDmY) || ($date == $dateArray[9]) ?"selected" :" " ?> ><?= $date ?></option>
<?php endforeach; ?>
<?php endif; ?>
</select>
</div>
</div>
</div>
<button class="btn btn-primary float-right" onclick="customFilterDate()">Filter</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div>
<!-- end modal section -->
<script>
function customFilterDate(){
let fromDate = $('#fromDateFilter').val(); //01-12-2024
let toDate = $('#toDateFilter').val(); //05-12-2024
$('#dustAndRoughStockDetailsTableId').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();
}
});
$('#filterModalId').modal('hide');
}
function checkDateRange(fromDate, toDate, tableDate) {
// Convert the dates to a comparable format (YYYY-MM-DD)
let from = convertToDate(fromDate);
let to = convertToDate(toDate);
let table = convertToDate(tableDate);
// Return true if the table date is within the range
return table >= from && table <= to;
}
function convertToDate(dateString) {
// Convert from DD-MM-YYYY to YYYY-MM-DD for comparison
let parts = dateString.split('-');
return new Date(parts[2], parts[1] - 1, parts[0]); // Year, Month (0-based), Day
}
</script>
<script>
$(document).ready(function(){
$('.select2').select2();
})
</script>
<script type="text/javascript"> <script type="text/javascript">

11
app/Views/stock/gasStockDetails.php
View File

@ -290,14 +290,17 @@
</div> </div>
<div class="col-8"> <div class="col-7">
<!-- right now client is not using this --> <!-- right now client is not using this -->
<!-- <a style="cursor:pointer"
class="dropdown-item" data-toggle="modal" data-target="#filterModalId">Filter</a> -->
</div> </div>
<div class="col-1 "> <div class="col-2">
<a style="cursor:pointer"
class="btn btn-secondary" data-toggle="modal" data-target="#filterModalId">
Date Filter</a>
<button type="button" class="btn btn-success m-0 px-4" id="saveId" > <button type="button" class="btn btn-success m-0 px-4" id="saveId" >
Save Save

24
app/Views/stock/powerConsumptionDetails.php
View File

@ -360,13 +360,11 @@ foreach ($period as $day) {
if($month == date('M-Y') ){ if($month == date('M-Y') ){
?> ?>
<div class="col-7"> <div class="col-6">
<!-- right now client is not using this -->
<!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
</div> </div>
<div class="col-2 m-0"> <div class="col-3 m-0">
<button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId" <button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId"
data-toggle="modal"> data-toggle="modal">
Customize Customize
@ -374,16 +372,13 @@ foreach ($period as $day) {
<?php <?php
} else { ?> } else { ?>
<div class="col-8"> <div class="col-7">
<!-- right now client is not using this -->
<!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
</div> </div>
<div class="col-1"> <div class="col-2">
<?php <?php
} }
?> ?>
<a class="btn btn-secondary" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a>
<input type="button" class="btn btn-success px-4" id="saveId" value="Save"> <input type="button" class="btn btn-success px-4" id="saveId" value="Save">
</div> </div>
@ -956,7 +951,7 @@ foreach ($period as $day) {
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="powerDropdown">Select Bag</label> <label for="powerDropdown">Select Bag</label>
<select id="powerDropdown" class="form-control"> <select id="powerDropdown" class="form-control select2">
<option value="">Select Electric Machines</option> <option value="">Select Electric Machines</option>
<?php foreach ($electricMachines as $powerMachine): ?> <?php foreach ($electricMachines as $powerMachine): ?>
<option value=" <?= $powerMachine['machine_name'] ?>"> <option value=" <?= $powerMachine['machine_name'] ?>">
@ -974,7 +969,7 @@ foreach ($period as $day) {
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="dateDropdown">Select Date</label> <label for="dateDropdown">Select Date</label>
<select id="dateDropdown" class="form-control"> <select id="dateDropdown" class="form-control select2">
<?php foreach ($datesInMonth as $selectDate): ?> <?php foreach ($datesInMonth as $selectDate): ?>
<?php $selectDate = DateTime::createFromFormat('Y-m-d', $selectDate)->format('d-m-Y'); ?> <?php $selectDate = DateTime::createFromFormat('Y-m-d', $selectDate)->format('d-m-Y'); ?>
<option value="<?= $selectDate ?>"><?= $selectDate ?></option> <option value="<?= $selectDate ?>"><?= $selectDate ?></option>
@ -991,6 +986,11 @@ foreach ($period as $day) {
</div> </div>
<script>
$(document).ready(function(){
$('.select2').select2();
})
</script>
<script> <script>

29
app/Views/stock/resinStockDetails.php
View File

@ -348,13 +348,11 @@ foreach ($period as $day) {
if($month == date('M-Y') ){ if($month == date('M-Y') ){
?> ?>
<div class="col-7"> <div class="col-6">
<!-- right now client is not using this -->
<!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
</div> </div>
<div class="col-2 m-0"> <div class="col-3 m-0">
<button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId" <button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId"
data-toggle="modal"> data-toggle="modal">
Customize Customize
@ -362,16 +360,14 @@ foreach ($period as $day) {
<?php <?php
} else { ?> } else { ?>
<div class="col-8"> <div class="col-7">
<!-- right now client is not using this -->
<!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
</div> </div>
<div class="col-1"> <div class="col-2">
<?php <?php
} }
?> ?>
<a class="btn btn-secondary" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a>
<input type="button" class="btn btn-success px-4" id="saveId" value="Save"> <input type="button" class="btn btn-success px-4" id="saveId" value="Save">
</div> </div>
@ -762,7 +758,7 @@ foreach ($period as $day) {
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="resinDropdown">Select Bag</label> <label for="resinDropdown">Select Bag</label>
<select id="resinDropdown" class="form-control"> <select id="resinDropdown" class="form-control select2">
<option value="">Select Resin</option> <option value="">Select Resin</option>
<?php foreach ($resinMaterials as $resinMaterial): ?> <?php foreach ($resinMaterials as $resinMaterial): ?>
<option value=" <?= $resinMaterial['MaterialName'] ?>"> <option value=" <?= $resinMaterial['MaterialName'] ?>">
@ -780,7 +776,7 @@ foreach ($period as $day) {
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="dateDropdown">Select Date</label> <label for="dateDropdown">Select Date</label>
<select id="dateDropdown" class="form-control"> <select id="dateDropdown" class="form-control select2">
<?php foreach ($datesInMonth as $selectDate): ?> <?php foreach ($datesInMonth as $selectDate): ?>
<?php $selectDate = DateTime::createFromFormat('Y-m-d', $selectDate)->format('d-m-Y'); ?> <?php $selectDate = DateTime::createFromFormat('Y-m-d', $selectDate)->format('d-m-Y'); ?>
<option value="<?= $selectDate ?>"><?= $selectDate ?></option> <option value="<?= $selectDate ?>"><?= $selectDate ?></option>
@ -815,6 +811,13 @@ foreach ($period as $day) {
<script>
$(document).ready(function(){
$('.select2').select2();
})
</script>
<script> <script>
function navigateToResin() { function navigateToResin() {
$('.close').click(); $('.close').click();

134
app/Views/stock/trpSandUseStockDetails.php
View File

@ -308,11 +308,15 @@
</div> </div>
<div class="col-3"> <div class="col-2">
</div> </div>
<div class="col-1"> <div class="col-2">
<a style="cursor:pointer"
class="btn btn-secondary " data-toggle="modal" data-target="#filterModalId">
Date Filter
</a>
<button class="btn btn-success m-0 px-3" type="button" id="saveId">Save</button> <button class="btn btn-success m-0 px-3" type="button" id="saveId">Save</button>
</div> </div>
@ -529,7 +533,133 @@
<!-- modal section -->
<!-- filter modal -->
<div class="modal fade" id="filterModalId" tabindex="-1" role="dialog" aria-labelledby="filterModalLabelId" aria-hidden="true">
<div class="modal-dialog modal-md">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="filterModalLabelId">Filter Options</h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
</div>
<div class="modal-body">
<div class="row">
<?php
$currentDateInDmY = date('d-m-Y');
?>
<?php
$startDate = DateTime::createFromFormat('M-Y', $month);
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="form-group">
<label for="fromDateFilter">Select From Date</label>
<select id="fromDateFilter" name="fromDateFilter" class="form-control select2">
<?php if (!empty($dateArray)) : ?>
<?php foreach ($dateArray as $index => $date) : ?>
<option value="<?= $date ?>" ><?= $date ?></option>
<?php endforeach; ?>
<?php endif; ?>
</select>
</div>
</div>
<!-- To Date Filter -->
<div class="col-md-6">
<div class="form-group">
<label for="toDateFilter">Select Date</label>
<select id="toDateFilter" name="toDateFilter" class="form-control select2">
<?php if (!empty($dateArray)) : ?>
<?php foreach ($dateArray as $date) : ?>
<option value="<?= $date ?>" <?= ($date == $currentDateInDmY) || ($date == $dateArray[9]) ?"selected" :" " ?> ><?= $date ?></option>
<?php endforeach; ?>
<?php endif; ?>
</select>
</div>
</div>
</div>
<button class="btn btn-primary float-right" onclick="customFilterDate()">Filter</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div>
<!-- end modal section -->
<script>
function customFilterDate(){
let fromDate = $('#fromDateFilter').val(); //01-12-2024
let toDate = $('#toDateFilter').val(); //05-12-2024
$('#trpSandUseStockDetailsTableId').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();
}
});
$('#filterModalId').modal('hide');
}
function checkDateRange(fromDate, toDate, tableDate) {
// Convert the dates to a comparable format (YYYY-MM-DD)
let from = convertToDate(fromDate);
let to = convertToDate(toDate);
let table = convertToDate(tableDate);
// Return true if the table date is within the range
return table >= from && table <= to;
}
function convertToDate(dateString) {
// Convert from DD-MM-YYYY to YYYY-MM-DD for comparison
let parts = dateString.split('-');
return new Date(parts[2], parts[1] - 1, parts[0]); // Year, Month (0-based), Day
}
</script>
<script>
$(document).ready(function(){
$('.select2').select2();
})
</script>