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

stock changes 07-04-2025

Browse Source
This commit is contained in:
vadivelJ96 2025-04-07 11:11:11 +05:30
parent 0289595c86
commit cb73af8897
12 changed files with 558 additions and 559 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/Models/Inwardgateregister_model.php
View File

@ -1203,9 +1203,13 @@ class Inwardgateregister_model extends Model
public function findIgrDetailsForIncomingSilicaSand($materialCodes, $month, $remark) public function findIgrDetailsForIncomingSilicaSand($materialCodes, $month, $remark)
{ {
$month = new \DateTime($month . "-01"); // Create DateTime for the first day of the month
$builder = $this->db->table('t_igr_details'); $builder = $this->db->table('t_igr_details');
// 1. Select the necessary columns
$builder->select( $builder->select(
't_igr_details.IGRNO, 't_igr_details.IGRNO,
t_igr_details.MaterialCode, t_igr_details.MaterialCode,
@ -1219,13 +1223,16 @@ class Inwardgateregister_model extends Model
issd.*' issd.*'
); );
// 2. Apply the most selective WHERE clause(s) first - in this case, the date range
$nowIST = new \DateTime('now', new \DateTimeZone('Asia/Kolkata'));
$builder->where('Date(t_igr_details.CreatedDate) >=', $nowIST->format('Y-m-01 00:00:00')); $builder->join('t_igr_master igrMast', 'igrMast.IGRNO = t_igr_details.IGRNO');
$builder->where('Date(t_igr_details.CreatedDate) <=', $nowIST->format('Y-m-t 23:59:59')); $builder->join('t_incomingsilicasanddetails issd', 'issd.igrNo_fk = t_igr_details.IGRNO AND issd.materialCode = t_igr_details.MaterialCode', 'left');
$builder->join('t_materialmaster materialMaster', 'materialMaster.MaterialCode = t_igr_details.MaterialCode');
$builder->join('t_configdetails cd', 'cd.key = materialMaster.Category', 'left');
$builder->join('t_purchaseorder_master poMaster', 'poMaster.PONO = igrMast.PONO', 'left');
$builder->join('t_supplierdetailsn supplierDetails', 'supplierDetails.SupplierID = poMaster.SupplierID', 'left');
// 3. Apply other WHERE clause conditions $builder->where('Date(t_igr_details.CreatedDate) >=', $month->format('Y-m-01 00:00:00'));
$builder->where('Date(t_igr_details.CreatedDate) <=', $month->format('Y-m-t 23:59:59'));
$builder->whereIn('t_igr_details.MaterialCode', $materialCodes); $builder->whereIn('t_igr_details.MaterialCode', $materialCodes);
$builder->where('t_igr_details.QuantityAsPerInvoice <>', 0); $builder->where('t_igr_details.QuantityAsPerInvoice <>', 0);
@ -1234,25 +1241,15 @@ class Inwardgateregister_model extends Model
$builder->where('issd.remark', $remark); $builder->where('issd.remark', $remark);
} }
// 4. Apply JOIN clauses
$builder->join('t_igr_master igrMast', 'igrMast.IGRNO = t_igr_details.IGRNO');
$builder->join('t_incomingsilicasanddetails issd', 'issd.igrNo_fk = t_igr_details.IGRNO AND issd.materialCode = t_igr_details.MaterialCode', 'left');
$builder->join('t_materialmaster materialMaster', 'materialMaster.MaterialCode = t_igr_details.MaterialCode');
$builder->join('t_configdetails cd', 'cd.key = materialMaster.Category', 'left');
$builder->join('t_purchaseorder_master poMaster', 'poMaster.PONO = igrMast.PONO', 'left');
$builder->join('t_supplierdetailsn supplierDetails', 'supplierDetails.SupplierID = poMaster.SupplierID', 'left');
// 5. Apply GROUP BY clause
$builder->groupBy('t_igr_details.IGRNO, t_igr_details.MaterialCode'); $builder->groupBy('t_igr_details.IGRNO, t_igr_details.MaterialCode');
// 6. Apply ORDER BY clause
$builder->orderBy('t_igr_details.CreatedDate', 'asc '); $builder->orderBy('t_igr_details.CreatedDate', 'asc ');
// 7. Get the query results
$query = $builder->get(); $query = $builder->get();
return $query->getResultArray(); return $query->getResultArray();
} }
public function getHistoryDetailsforEmail($igr) public function getHistoryDetailsforEmail($igr)

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

@ -373,13 +373,13 @@
<input type="text" id="searchInput" placeholder="Search..." <input type="text" id="searchInput" placeholder="Search..."
class="mt-2" class="mt-2"
style="padding: 8px;margin-bottom: 10px;width: 250px;border: 1px solid #ccc; style="padding: 8px;margin-bottom: 10px;width: 250px;border: 2px solid rgb(123, 11, 214);
border-radius: 5px;margin-right:15px;"> border-radius: 5px;margin-right:15px;">
<i class="fa fa-table btn-lg mt-2" <i class="fa fa-table btn-lg mt-2"
title="Date Range Filter" title="Date Range Filter"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(95, 102, 105)"
data-toggle="modal" data-toggle="modal"
data-target="#filterModalId"> data-target="#filterModalId">
@ -387,13 +387,13 @@
<i class="fa fa-download btn-lg mt-2" <i class="fa fa-download btn-lg mt-2"
title="Excel Download" title="Excel Download"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color: #0b7cba"
id="coatingMachineDetailsExport"> id="coatingMachineDetailsExport">
</i> </i>
<i class="fe-maximize noti-icon btn-lg mt-2" <i class="fe-maximize noti-icon btn-lg mt-2"
title="Full Screen" title="Full Screen"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
onclick="toggleDivFullscreen()"> onclick="toggleDivFullscreen()">
</i> </i>
@ -402,7 +402,7 @@
title="Add Entry" title="Add Entry"
data-target="#coatingMachineDetailModal" data-target="#coatingMachineDetailModal"
data-toggle="modal" data-toggle="modal"
style="font-size: x-large; cursor:pointer;"> style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)" >
</i> </i>
@ -438,11 +438,19 @@
<div class="form-row"> <div class="form-row">
<?php $calendarStartDate = DateTime::createFromFormat('M-Y', $month)->modify('first day of this month')->format('Y-m-d'); ?>
<?php $calendarEndDate = DateTime::createFromFormat('M-Y', $month)->modify('last day of this month')->format('Y-m-d'); ?>
<?php $calendarCurrentDate = DateTime::createFromFormat('M-Y', $month)->format('Y-m-d'); ?>
<!-- date --> <!-- date -->
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label for="dateId">Date</label> <label for="dateId">Date</label>
<span class="badge mandatory">*</span> <span class="badge mandatory">*</span>
<input type="date" class="form-control" id="dateId" name="date" value="" required> <input type="date" class="form-control" id="dateId" name="date"
value="<?=$calendarCurrentDate?>"
min="<?= $calendarStartDate ?>"
max="<?= $calendarEndDate ?>"
required>
</div> </div>
<!-- shift --> <!-- shift -->

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

@ -349,7 +349,7 @@ foreach ($period as $day) {
<input type="text" id="searchInput" placeholder="Search..." <input type="text" id="searchInput" placeholder="Search..."
class="mt-2" class="mt-2"
style="padding: 8px;margin-bottom: 10px;width: 250px;border: 1px solid #ccc; style=" padding: 8px;margin-bottom: 10px;width: 250px;border: 2px solid rgb(123, 11, 214);
border-radius: 5px;margin-right:15px;"> border-radius: 5px;margin-right:15px;">
@ -358,7 +358,7 @@ foreach ($period as $day) {
if ($month == date('M-Y')) { if ($month == date('M-Y')) {
?> ?>
<i class="fa fa-cog btn-lg mt-2" <i class="fa fa-cog btn-lg mt-2"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(95, 102, 105)"
title="Customize" title="Customize"
data-target="#customizeModalId" data-target="#customizeModalId"
data-toggle="modal"> data-toggle="modal">
@ -373,25 +373,25 @@ foreach ($period as $day) {
title="Navigation" title="Navigation"
data-toggle="modal" data-toggle="modal"
data-target="#bs-example-modal-lg" data-target="#bs-example-modal-lg"
style="font-size: x-large; cursor:pointer;"> style="font-size: x-large; cursor:pointer; color: #bd0906">
</i> </i>
<i class="fa fa-download btn-lg mt-2" <i class="fa fa-download btn-lg mt-2"
title="Excel Download" title="Excel Download"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color: #0b7cba"
id="bagStockExport"> id="bagStockExport">
</i> </i>
<i class="fe-maximize noti-icon btn-lg mt-2" <i class="fe-maximize noti-icon btn-lg mt-2"
title="Full Screen" title="Full Screen"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
onclick="toggleDivFullscreen()"> onclick="toggleDivFullscreen()">
</i> </i>
<i class="fas fa-save btn-lg mt-2" <i class="fas fa-save btn-lg mt-2"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">
</i> </i>

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

@ -337,7 +337,7 @@ foreach ($period as $day) {
<input type="text" id="searchInput" placeholder="Search..." <input type="text" id="searchInput" placeholder="Search..."
class="mt-2" class="mt-2"
style="padding: 8px;margin-bottom: 10px;width: 250px;border: 1px solid #ccc; style=" padding: 8px;margin-bottom: 10px;width: 250px;border: 2px solid rgb(123, 11, 214);
border-radius: 5px;margin-right:15px;"> border-radius: 5px;margin-right:15px;">
@ -346,7 +346,7 @@ foreach ($period as $day) {
if ($month == date('M-Y')) { if ($month == date('M-Y')) {
?> ?>
<i class="fa fa-cog btn-lg mt-2" <i class="fa fa-cog btn-lg mt-2"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(95, 102, 105)"
title="Customize" title="Customize"
data-target="#customizeModalId" data-target="#customizeModalId"
data-toggle="modal"> data-toggle="modal">
@ -361,25 +361,26 @@ foreach ($period as $day) {
title="Navigation" title="Navigation"
data-toggle="modal" data-toggle="modal"
data-target="#bs-example-modal-lg" data-target="#bs-example-modal-lg"
style="font-size: x-large; cursor:pointer;"> style="font-size: x-large; cursor:pointer; color: #bd0906">
</i> </i>
<i class="fa fa-download btn-lg mt-2" <i class="fa fa-download btn-lg mt-2"
title="Excel Download" title="Excel Download"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color: #0b7cba"
id="dieselMachineStockDetailsExport "> id="bagStockExport">
</i> </i>
<i class="fe-maximize noti-icon btn-lg mt-2" <i class="fe-maximize noti-icon btn-lg mt-2"
title="Full Screen" title="Full Screen"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
onclick="toggleDivFullscreen()"> onclick="toggleDivFullscreen()">
</i> </i>
<i class="fas fa-save btn-lg mt-2" <i class="fas fa-save btn-lg mt-2"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">
</i> </i>

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

@ -339,13 +339,13 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
<input type="text" id="searchInput" placeholder="Search..." <input type="text" id="searchInput" placeholder="Search..."
class="mt-2" class="mt-2"
style="padding: 8px;margin-bottom: 10px;width: 250px;border: 1px solid #ccc; style="padding: 8px;margin-bottom: 10px;width: 250px;border: 2px solid rgb(123, 11, 214);
border-radius: 5px;margin-right:15px; "> border-radius: 5px;margin-right:15px; ">
<i class="fa fa-table btn-lg mt-2" <i class="fa fa-table btn-lg mt-2"
title="Date Range Filter" title="Date Range Filter"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(95, 102, 105)"
data-toggle="modal" data-toggle="modal"
data-target="#filterModalId"> data-target="#filterModalId">
@ -353,13 +353,13 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
<i class="fa fa-download btn-lg mt-2" <i class="fa fa-download btn-lg mt-2"
title="Excel Download" title="Excel Download"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color: #0b7cba"
id="drierMachineDetailsExport"> id="drierMachineDetailsExport">
</i> </i>
<i class="fe-maximize noti-icon btn-lg mt-2" <i class="fe-maximize noti-icon btn-lg mt-2"
title="Full Screen" title="Full Screen"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
onclick="toggleDivFullscreen()"> onclick="toggleDivFullscreen()">
</i> </i>
@ -368,7 +368,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
title="Add Entry" title="Add Entry"
data-target="#additionalEntriesModalId" data-target="#additionalEntriesModalId"
data-toggle="modal" data-toggle="modal"
style="font-size: x-large; cursor:pointer;"> style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)">
</i> </i>
@ -466,10 +466,12 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
<!--first row --> <!--first row -->
<?php $calendarStartDate = DateTime::createFromFormat('M-Y', $datefordropdown)->modify('first day of this month')->format('Y-m-d'); ?> <?php $calendarStartDate = DateTime::createFromFormat('M-Y', $datefordropdown)->modify('first day of this month')->format('Y-m-d'); ?>
<?php $calendarEndDate = DateTime::createFromFormat('M-Y', $datefordropdown)->modify('last day of this month')->format('Y-m-d'); ?> <?php $calendarEndDate = DateTime::createFromFormat('M-Y', $datefordropdown)->modify('last day of this month')->format('Y-m-d'); ?>
<?php $calendarCurrentDate = DateTime::createFromFormat('M-Y', $datefordropdown)->format('Y-m-d'); ?>
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<label class="form" for="additionalEntryDateId">Date</label> <label class="form" for="additionalEntryDateId">Date</label>
<input type="date" class="form-control" id="additionalEntryDateId" name="date" value="<?= $calendarStartDate ?>" <input type="date" class="form-control" id="additionalEntryDateId" name="date" value="<?= $calendarCurrentDate ?>"
min="<?= $calendarStartDate ?>" max="<?= $calendarEndDate ?>" required> min="<?= $calendarStartDate ?>" max="<?= $calendarEndDate ?>" required>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">

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

@ -359,13 +359,13 @@
<input type="text" id="searchInput" placeholder="Search..." <input type="text" id="searchInput" placeholder="Search..."
class="mt-2" class="mt-2"
style="padding: 8px;margin-bottom: 10px;width: 150px;border: 1px solid #ccc; style="padding: 8px;margin-bottom: 10px;width: 150px;border: 2px solid rgb(123, 11, 214);
border-radius: 5px;margin-right:15px;"> border-radius: 5px;margin-right:15px;">
<i class="fa fa-table btn-lg mt-2" <i class="fa fa-table btn-lg mt-2"
title="Date Range Filter" title="Date Range Filter"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(95, 102, 105)"
data-toggle="modal" data-toggle="modal"
data-target="#filterModalId"> data-target="#filterModalId">
@ -373,20 +373,20 @@
<i class="fa fa-download btn-lg mt-2" <i class="fa fa-download btn-lg mt-2"
title="Excel Download" title="Excel Download"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color: #0b7cba"
id="dustAndRoughStockExport"> id="dustAndRoughStockExport">
</i> </i>
<i class="fe-maximize noti-icon btn-lg mt-2" <i class="fe-maximize noti-icon btn-lg mt-2"
title="Full Screen" title="Full Screen"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
onclick="toggleDivFullscreen()"> onclick="toggleDivFullscreen()">
</i> </i>
<i class="fa fa-save btn-lg mt-2" <i class="fa fa-save btn-lg mt-2"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">
</i> </i>

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

@ -335,13 +335,13 @@
<input type="text" id="searchInput" placeholder="Search..." <input type="text" id="searchInput" placeholder="Search..."
class="mt-2" class="mt-2"
style="padding: 8px;margin-bottom: 10px;width: 250px;border: 1px solid #ccc; style="padding: 8px;margin-bottom: 10px;width: 250px; border: 2px solid rgb(123, 11, 214);
border-radius: 5px;margin-right:15px;"> border-radius: 5px;margin-right:15px;">
<i class="fa fa-table btn-lg mt-2" <i class="fa fa-table btn-lg mt-2"
title="Date Range Filter" title="Date Range Filter"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(95, 102, 105);"
data-toggle="modal" data-toggle="modal"
data-target="#filterModalId"> data-target="#filterModalId">
@ -349,20 +349,20 @@
<i class="fa fa-download btn-lg mt-2" <i class="fa fa-download btn-lg mt-2"
title="Excel Download" title="Excel Download"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color: #0b7cba;"
id="gasStockDetailsExport"> id="gasStockDetailsExport">
</i> </i>
<i class="fe-maximize noti-icon btn-lg mt-2" <i class="fe-maximize noti-icon btn-lg mt-2"
title="Full Screen" title="Full Screen"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
onclick="toggleDivFullscreen()"> onclick="toggleDivFullscreen()">
</i> </i>
<i class="fa fa-save btn-lg mt-2" <i class="fa fa-save btn-lg mt-2"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">
</i> </i>

15
app/Views/stock/incomingSilicaSandDetails.php
View File

@ -340,27 +340,27 @@
<input type="text" id="searchInput" placeholder="Search..." <input type="text" id="searchInput" placeholder="Search..."
class="mt-2" class="mt-2"
style="padding: 8px;margin-bottom: 10px;width: 250px;border: 1px solid #ccc; style="padding: 8px;margin-bottom: 10px;width: 250px; border: 2px solid rgb(123, 11, 214);
border-radius: 5px;margin-right:15px;"> border-radius: 5px;margin-right:15px;">
<i class="fa fa-download btn-lg mt-2" <i class="fa fa-download btn-lg mt-2"
title="Excel Download" title="Excel Download"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color: #0b7cba"
id="incomingSilicaSandDetailsExport"> id="incomingSilicaSandDetailsExport">
</i> </i>
<i class="fe-maximize noti-icon btn-lg mt-2" <i class="fe-maximize noti-icon btn-lg mt-2"
title="Full Screen" title="Full Screen"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
onclick="toggleDivFullscreen()"> onclick="toggleDivFullscreen()">
</i> </i>
<i class="fas fa-save btn-lg mt-2" <i class="fas fa-save btn-lg mt-2"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">
</i> </i>
@ -1577,11 +1577,16 @@
if (i === 0 || i === 1) { if (i === 0 || i === 1) {
newPlus20Loss += Number(result[i]['WEIGH OF SAND']); newPlus20Loss += Number(result[i]['WEIGH OF SAND']);
newSieveLossQty = (parseFloat(qty) * newPlus20Loss) / 100;
} }
if (i === 0 || i === 1 || i === 2) { if (i === 0 || i === 1 || i === 2) {
newPlus30Loss += Number(result[i]['WEIGH OF SAND']); newPlus30Loss += Number(result[i]['WEIGH OF SAND']);
newSieveLossQty = (parseFloat(qty) * newPlus20Loss) / 100;
} }
totalWeighOfSand += Number(result[i]['WEIGH OF SAND']); totalWeighOfSand += Number(result[i]['WEIGH OF SAND']);

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

@ -262,10 +262,10 @@
margin-bottom: 5px; margin-bottom: 5px;
} }
#powerStockDetailsTableId { /* Replace with your table's actual ID or selector */ #powerStockDetailsTableId {
/* Replace with your table's actual ID or selector */
border-collapse: collapse; border-collapse: collapse;
} }
</style> </style>
@ -344,7 +344,7 @@ foreach ($period as $day) {
<input type="text" id="searchInput" placeholder="Search..." <input type="text" id="searchInput" placeholder="Search..."
class="mt-2" class="mt-2"
style="padding: 8px;margin-bottom: 10px;width: 250px;border: 1px solid #ccc; style=" padding: 8px;margin-bottom: 10px;width: 250px;border: 2px solid rgb(123, 11, 214);
border-radius: 5px;margin-right:15px;"> border-radius: 5px;margin-right:15px;">
@ -353,7 +353,7 @@ foreach ($period as $day) {
if ($month == date('M-Y')) { if ($month == date('M-Y')) {
?> ?>
<i class="fa fa-cog btn-lg mt-2" <i class="fa fa-cog btn-lg mt-2"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(95, 102, 105)"
title="Customize" title="Customize"
data-target="#customizeModalId" data-target="#customizeModalId"
data-toggle="modal"> data-toggle="modal">
@ -368,25 +368,25 @@ foreach ($period as $day) {
title="Navigation" title="Navigation"
data-toggle="modal" data-toggle="modal"
data-target="#bs-example-modal-lg" data-target="#bs-example-modal-lg"
style="font-size: x-large; cursor:pointer;"> style="font-size: x-large; cursor:pointer; color: #bd0906">
</i> </i>
<i class="fa fa-download btn-lg mt-2" <i class="fa fa-download btn-lg mt-2"
title="Excel Download" title="Excel Download"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color: #0b7cba"
id="powerConsumptionExport "> id="bagStockExport">
</i> </i>
<i class="fe-maximize noti-icon btn-lg mt-2" <i class="fe-maximize noti-icon btn-lg mt-2"
title="Full Screen" title="Full Screen"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
onclick="toggleDivFullscreen()"> onclick="toggleDivFullscreen()">
</i> </i>
<i class="fas fa-save btn-lg mt-2" <i class="fas fa-save btn-lg mt-2"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">
</i> </i>
@ -1667,12 +1667,9 @@ foreach ($period as $day) {
}); });
}); });
</script> </script>
<script> <script>
//getting modal backdrop inside full screen //getting modal backdrop inside full screen
$(document).ready(function() { $(document).ready(function() {
@ -1695,7 +1692,4 @@ foreach ($period as $day) {
}, 200); }, 200);
}); });
}); });
</script> </script>

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

@ -20,8 +20,10 @@
.fht-table td:hover { .fht-table td:hover {
background-color: rgb(170, 222, 167); background-color: rgb(170, 222, 167);
color: rgb(2, 2, 2); color: rgb(2, 2, 2);
transform: scale(1.25); /* Increases size by 25% */ transform: scale(1.25);
transition: transform 0.5s ease-in-out; /* Smooth scaling effect */ /* Increases size by 25% */
transition: transform 0.5s ease-in-out;
/* Smooth scaling effect */
} }
.fht-table tr:hover { .fht-table tr:hover {
@ -30,11 +32,13 @@
} }
.grab { .grab {
cursor: grab; /* Default open-hand cursor */ cursor: grab;
/* Default open-hand cursor */
} }
.grab:active { .grab:active {
cursor: grabbing; /* Closed-hand cursor when dragging */ cursor: grabbing;
/* Closed-hand cursor when dragging */
} }
/* /*
@ -258,8 +262,9 @@
padding-bottom: 0; padding-bottom: 0;
} }
.card{ margin-bottom: 5px;} .card {
margin-bottom: 5px;
}
</style> </style>
@ -339,7 +344,7 @@ foreach ($period as $day) {
<input type="text" id="searchInput" placeholder="Search..." <input type="text" id="searchInput" placeholder="Search..."
class="mt-2" class="mt-2"
style="padding: 8px;margin-bottom: 10px;width: 250px;border: 1px solid #ccc; style=" padding: 8px;margin-bottom: 10px;width: 250px;border: 2px solid rgb(123, 11, 214);
border-radius: 5px;margin-right:15px;"> border-radius: 5px;margin-right:15px;">
@ -348,7 +353,7 @@ foreach ($period as $day) {
if ($month == date('M-Y')) { if ($month == date('M-Y')) {
?> ?>
<i class="fa fa-cog btn-lg mt-2" <i class="fa fa-cog btn-lg mt-2"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(95, 102, 105)"
title="Customize" title="Customize"
data-target="#customizeModalId" data-target="#customizeModalId"
data-toggle="modal"> data-toggle="modal">
@ -363,25 +368,25 @@ foreach ($period as $day) {
title="Navigation" title="Navigation"
data-toggle="modal" data-toggle="modal"
data-target="#bs-example-modal-lg" data-target="#bs-example-modal-lg"
style="font-size: x-large; cursor:pointer;"> style="font-size: x-large; cursor:pointer; color: #bd0906">
</i> </i>
<i class="fa fa-download btn-lg mt-2" <i class="fa fa-download btn-lg mt-2"
title="Excel Download" title="Excel Download"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color: #0b7cba"
id="resinStockExport"> id="bagStockExport">
</i> </i>
<i class="fe-maximize noti-icon btn-lg mt-2" <i class="fe-maximize noti-icon btn-lg mt-2"
title="Full Screen" title="Full Screen"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
onclick="toggleDivFullscreen()"> onclick="toggleDivFullscreen()">
</i> </i>
<i class="fas fa-save btn-lg mt-2" <i class="fas fa-save btn-lg mt-2"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">
</i> </i>
@ -747,13 +752,11 @@ foreach ($period as $day) {
<?php } ?>> <?php } ?>>
<?php <?php
foreach($previousMonthResinStockDetails as $index => $previousMonthResinStockDetail) foreach ($previousMonthResinStockDetails as $index => $previousMonthResinStockDetail) {
{
if ($previousMonthResinStockDetail['materialCode'] == $resinMaterial['MaterialCode']) { if ($previousMonthResinStockDetail['materialCode'] == $resinMaterial['MaterialCode']) {
echo $previousMonthResinStockDetail['balanceStock']; echo $previousMonthResinStockDetail['balanceStock'];
break; break;
} }
} }
?> ?>
@ -773,13 +776,11 @@ foreach ($period as $day) {
data-id="<?= $dateInMonth ?> <?= $resinMaterial['MaterialCode'] ?>"> data-id="<?= $dateInMonth ?> <?= $resinMaterial['MaterialCode'] ?>">
<?php <?php
foreach($previousMonthResinStockDetails as $index => $previousMonthResinStockDetail) foreach ($previousMonthResinStockDetails as $index => $previousMonthResinStockDetail) {
{
if ($previousMonthResinStockDetail['materialCode'] == $resinMaterial['MaterialCode']) { if ($previousMonthResinStockDetail['materialCode'] == $resinMaterial['MaterialCode']) {
echo $previousMonthResinStockDetail['balanceStock']; echo $previousMonthResinStockDetail['balanceStock'];
break; break;
} }
} }
?> ?>
@ -1226,10 +1227,15 @@ foreach ($period as $day) {
const box = child.getBoundingClientRect(); const box = child.getBoundingClientRect();
const offset = y - box.top - box.height / 2; const offset = y - box.top - box.height / 2;
return offset < 0 && offset > closest.offset return offset < 0 && offset > closest.offset ?
? { offset, element: child } {
: closest; offset,
}, { offset: Number.NEGATIVE_INFINITY }).element; element: child
} :
closest;
}, {
offset: Number.NEGATIVE_INFINITY
}).element;
} }
// Attach drag events to existing items // Attach drag events to existing items
@ -1268,14 +1274,12 @@ foreach ($period as $day) {
} }
}; };
}); });
</script> </script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('#customizeHeader').select2(); $('#customizeHeader').select2();
}) })
</script> </script>
<script> <script>
@ -1332,8 +1336,6 @@ $("#searchInput").on("keyup", function () {
$(this).toggle($(this).text().toLowerCase().indexOf(value) > -1); $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1);
}); });
}); });
</script> </script>
@ -1357,12 +1359,9 @@ $("#searchInput").on("keyup", function () {
}); });
}); });
</script> </script>
<script> <script>
//getting modal backdrop inside full screen //getting modal backdrop inside full screen
$(document).ready(function() { $(document).ready(function() {
@ -1385,8 +1384,4 @@ $("#searchInput").on("keyup", function () {
}, 200); }, 200);
}); });
}); });
</script> </script>

91
app/Views/stock/trpProductionStockDetails.php
View File

@ -405,10 +405,7 @@ $timeOtions[] = "12:00 AM";
<div class="col-2 mt-2"> <div class="col-2 mt-2">
<input type="text" name="month" id="month" value="<?php echo "$month" ?>" <input type="text" name="month" id="month" value="<?php echo "$month" ?>"
class="form-control " class="form-control " readonly
data-provide="datepicker"
data-date-format="M-yyyy"
data-date-min-view-mode="1" readonly
style="max-width: 175px;"> style="max-width: 175px;">
</div> </div>
@ -419,13 +416,13 @@ $timeOtions[] = "12:00 AM";
<input type="text" id="searchInput" placeholder="Search..." <input type="text" id="searchInput" placeholder="Search..."
class="mt-2" class="mt-2"
style="padding: 8px;margin-bottom: 10px;width: 150px;border: 1px solid #ccc; style="padding: 8px;margin-bottom: 10px;width: 150px;border: 2px solid rgb(123, 11, 214);
border-radius: 5px;margin-right:15px;"> border-radius: 5px;margin-right:15px;">
<i class="fa fa-table btn-lg mt-2" <i class="fa fa-table btn-lg mt-2"
title="Date Range Filter" title="Date Range Filter"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(95, 102, 105)"
data-toggle="modal" data-toggle="modal"
data-target="#filterModalId"> data-target="#filterModalId">
@ -433,20 +430,20 @@ $timeOtions[] = "12:00 AM";
<i class="fa fa-download btn-lg mt-2" <i class="fa fa-download btn-lg mt-2"
title="Excel Download" title="Excel Download"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color: #0b7cba"
id="trpProductionDetailsExport"> id="trpProductionDetailsExport">
</i> </i>
<i class="fe-maximize noti-icon btn-lg mt-2" <i class="fe-maximize noti-icon btn-lg mt-2"
title="Full Screen" title="Full Screen"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
onclick="toggleDivFullscreen()"> onclick="toggleDivFullscreen()">
</i> </i>
<i class="fa fa-save btn-lg mt-2" <i class="fa fa-save btn-lg mt-2"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">
</i> </i>
@ -1504,17 +1501,19 @@ $timeOtions[] = "12:00 AM";
</div> </div>
<div class="col-2"> <div class="col-2">
<a href="#">
<i class="fa fa-download btn-lg mt-2" <i class="fa fa-download btn-lg mt-2"
style="font-size: x-large;" style="font-size: x-large; color: #0b7cba"
id="trpAbstractDetailsExport"> id="trpAbstractDetailsExport">
</i> </i>
</a>
<i class="fas fa-save btn-lg "
title="Save"
style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="abstractSaveId">
</i>
<input type="button" class="btn btn-success px-4 mb-3" id="abstractSaveId" value="Save">
</div> </div>
<div class="col-1"> <div class="col-1">
</div> </div>
@ -1709,36 +1708,36 @@ $timeOtions[] = "12:00 AM";
'absRunningHrs' => "", 'absRunningHrs' => "",
'absPerHour' => "", 'absPerHour' => "",
'absOpeningStock' => '', 'absOpeningStock' => '',
'absReceipt' => $totalWcsReceived, 'absReceipt' => $totalWcsReceived == 0 ? " " : $totalWcsReceived,
'absTotal' => $totalWcsReceived, 'absTotal' => $totalWcsReceived == 0 ? " " : $totalWcsReceived,
'absConsumption' => $summary['edProduction'], 'absConsumption' => $summary['edProduction'] == 0 ? " " : $summary['edProduction'] ,
'absClosingStock' => ($totalWcsReceived) - $summary['edProduction'], 'absClosingStock' => ($totalWcsReceived) - $summary['edProduction'] == 0 ? " " : $totalWcsReceived - $summary['edProduction'],
'absPhysicalStock' => '', 'absPhysicalStock' => '',
'absRemarks' => '', 'absRemarks' => '',
], ],
[ [
'absParticulars' => "ED Details", 'absParticulars' => "ED Details",
'absRunningHrs' => $summary['edRunningHours'], 'absRunningHrs' => $summary['edRunningHours'] == 0 ? " " : $summary['edRunningHours'],
'absPerHour' => number_format($summary['edProduction'] / ($summary['edRunningHours'] == 0 ? 1 : $summary['edRunningHours']), 2), 'absPerHour' => number_format($summary['edProduction'] / ($summary['edRunningHours'] == 0 ? 1 : $summary['edRunningHours']), 2) == 0 ? " " : number_format($summary['edProduction'] / ($summary['edRunningHours'] == 0 ? 1 : $summary['edRunningHours']), 2),
'absOpeningStock' => '', 'absOpeningStock' => '',
'absReceipt' => $summary['edProduction'], 'absReceipt' => $summary['edProduction'] == 0 ? " " : $summary['edProduction'],
'absTotal' => $summary['edProduction'], 'absTotal' => $summary['edProduction'] == 0 ? " " : $summary['edProduction'],
'absConsumption' => $summary['edUsage'] + ($summary['coolerBags'] * 1250) + ($summary['cycloneWaste'] * 1250) + ($summary['edWaste'] * 1250), 'absConsumption' => $summary['edUsage'] + ($summary['coolerBags'] * 1250) + ($summary['cycloneWaste'] * 1250) + ($summary['edWaste'] * 1250) == 0 ? " " : $summary['edUsage'] + ($summary['coolerBags'] * 1250) + ($summary['cycloneWaste'] * 1250) + ($summary['edWaste'] * 1250),
'absClosingStock' => $summary['edProduction'] - $summary['edUsage'] + ($summary['coolerBags'] * 1250) + ($summary['cycloneWaste'] * 1250) + ($summary['edWaste'] * 1250), 'absClosingStock' => $summary['edProduction'] - $summary['edUsage'] + ($summary['coolerBags'] * 1250) + ($summary['cycloneWaste'] * 1250) + ($summary['edWaste'] * 1250) == 0 ? " " : $summary['edProduction'] - ($summary['edUsage'] + ($summary['coolerBags'] * 1250) + ($summary['cycloneWaste'] * 1250) + ($summary['edWaste'] * 1250)),
'absPhysicalStock' => '', 'absPhysicalStock' => '',
'absRemarks' => '', 'absRemarks' => '',
], ],
[ [
'absParticulars' => "TRP Total Sand", 'absParticulars' => "TRP Total Sand",
'absRunningHrs' => $summary['sandFeedingHours'], 'absRunningHrs' => $summary['sandFeedingHours'] == 0 ? " " : $summary['sandFeedingHours'],
'absPerHour' => $summary['trpProductionPerHour'], 'absPerHour' => $summary['trpProductionPerHour'] == 0 ? " " : $summary['trpProductionPerHour'],
'absOpeningStock' => '', 'absOpeningStock' => '',
'absReceipt' => $summary['trpProduction'], 'absReceipt' => $summary['trpProduction'] == 0 ? " " : $summary['trpProduction'],
'absTotal' => $summary['trpProduction'], 'absTotal' => $summary['trpProduction'] == 0 ? " " : $summary['trpProduction'],
'absConsumption' => $totalCrsReceived, 'absConsumption' => $totalCrsReceived == 0 ? " " : $totalCrsReceived,
'absClosingStock' => $summary['trpProduction'] - $totalCrsReceived, 'absClosingStock' => $summary['trpProduction'] - $totalCrsReceived == 0 ? " " : $summary['trpProduction'] - $totalCrsReceived,
'absPhysicalStock' => '', 'absPhysicalStock' => '',
'absRemarks' => '', 'absRemarks' => '',
], ],
@ -1746,12 +1745,12 @@ $timeOtions[] = "12:00 AM";
'absParticulars' => "Trp Physical Gas Consumption", 'absParticulars' => "Trp Physical Gas Consumption",
'absRunningHrs' => "", 'absRunningHrs' => "",
'absPerHour' => number_format(($summary['trpPlusDrierGasConsumption']) / (($summary['trpProduction'] == 0 ? 1000 : $summary['trpProduction']) / 1000), 2, '.', ''), 'absPerHour' => number_format(($summary['trpPlusDrierGasConsumption']) / (($summary['trpProduction'] == 0 ? 1000 : $summary['trpProduction']) / 1000), 2, '.', '') == 0 ? " " : number_format(($summary['trpPlusDrierGasConsumption']) / (($summary['trpProduction'] == 0 ? 1000 : $summary['trpProduction']) / 1000), 2, '.', ''),
'absOpeningStock' => '', 'absOpeningStock' => '',
'absReceipt' => $summary['gasReceiptBg'] + $summary['gasReceiptPg'], 'absReceipt' => $summary['gasReceiptBg'] + $summary['gasReceiptPg'] == 0 ? " " : $summary['gasReceiptBg'] + $summary['gasReceiptPg'],
'absTotal' => $summary['gasReceiptBg'] + $summary['gasReceiptPg'], 'absTotal' => $summary['gasReceiptBg'] + $summary['gasReceiptPg'] == 0 ? " " : $summary['gasReceiptBg'] + $summary['gasReceiptPg'],
'absConsumption' => $summary['physicalGasConsumption'], 'absConsumption' => $summary['physicalGasConsumption'] == 0 ? " " : $summary['physicalGasConsumption'],
'absClosingStock' => ($summary['gasReceiptBg'] + $summary['gasReceiptPg']) - $summary['physicalGasConsumption'], 'absClosingStock' => ($summary['gasReceiptBg'] + $summary['gasReceiptPg']) - $summary['physicalGasConsumption'] == 0 ? " " : ($summary['gasReceiptBg'] + $summary['gasReceiptPg']) - $summary['physicalGasConsumption'],
'absPhysicalStock' => '', 'absPhysicalStock' => '',
'absRemarks' => '', 'absRemarks' => '',
], ],
@ -1759,12 +1758,12 @@ $timeOtions[] = "12:00 AM";
'absParticulars' => "Trp Panel Gas Consumption", 'absParticulars' => "Trp Panel Gas Consumption",
'absRunningHrs' => "", 'absRunningHrs' => "",
'absPerHour' => number_format(($summary['panelGasConsumption']) / (($summary['trpProduction'] == 0 ? 1000 : $summary['trpProduction']) / 1000), 2), 'absPerHour' => number_format(($summary['panelGasConsumption']) / (($summary['trpProduction'] == 0 ? 1000 : $summary['trpProduction']) / 1000), 2) == 0 ? " " : number_format(($summary['panelGasConsumption']) / (($summary['trpProduction'] == 0 ? 1000 : $summary['trpProduction']) / 1000), 2),
'absOpeningStock' => '', 'absOpeningStock' => '',
'absReceipt' => $summary['gasReceiptBg'] + $summary['gasReceiptPg'], 'absReceipt' => $summary['gasReceiptBg'] + $summary['gasReceiptPg'] == 0 ? " " : $summary['gasReceiptBg'] + $summary['gasReceiptPg'],
'absTotal' => $summary['gasReceiptBg'] + $summary['gasReceiptPg'], 'absTotal' => $summary['gasReceiptBg'] + $summary['gasReceiptPg'] == 0 ? " " : $summary['gasReceiptBg'] + $summary['gasReceiptPg'],
'absConsumption' => $summary['panelGasConsumption'], 'absConsumption' => $summary['panelGasConsumption'] == 0 ? " " : $summary['panelGasConsumption'] ,
'absClosingStock' => ($summary['gasReceiptBg'] + $summary['gasReceiptPg']) - $summary['panelGasConsumption'], 'absClosingStock' => ($summary['gasReceiptBg'] + $summary['gasReceiptPg']) - $summary['panelGasConsumption'] == 0 ? " " : ($summary['gasReceiptBg'] + $summary['gasReceiptPg']) - $summary['panelGasConsumption'],
'absPhysicalStock' => '', 'absPhysicalStock' => '',
'absRemarks' => '', 'absRemarks' => '',
], ],
@ -1774,9 +1773,9 @@ $timeOtions[] = "12:00 AM";
'absRunningHrs' => "", 'absRunningHrs' => "",
'absPerHour' => "", 'absPerHour' => "",
'absOpeningStock' => '', 'absOpeningStock' => '',
'absReceipt' => $summary['waterReceipt'], 'absReceipt' => $summary['waterReceipt'] == 0 ? " " : $summary['waterReceipt'],
'absTotal' => $summary['waterReceipt'], 'absTotal' => $summary['waterReceipt'] == 0 ? " " : $summary['waterReceipt'],
'absConsumption' => $summary['waterReceipt'] - $summary['waterConsumption'], 'absConsumption' => $summary['waterReceipt'] - $summary['waterConsumption'] == 0 ? " " : $summary['waterReceipt'] - $summary['waterConsumption'],
'absClosingStock' => '', 'absClosingStock' => '',
'absPhysicalStock' => '', 'absPhysicalStock' => '',
'absRemarks' => '', 'absRemarks' => '',
@ -1784,12 +1783,12 @@ $timeOtions[] = "12:00 AM";
[ [
'absParticulars' => "Power Consumption", 'absParticulars' => "Power Consumption",
'absRunningHrs' => $summary['ebReadingPerUnitTon'], 'absRunningHrs' => $summary['ebReadingPerUnitTon'] == 0 ? " " : $summary['ebReadingPerUnitTon'],
'absPerHour' => "", 'absPerHour' => "",
'absOpeningStock' => '', 'absOpeningStock' => '',
'absReceipt' => '', 'absReceipt' => '',
'absTotal' => '', 'absTotal' => '',
'absConsumption' => $summary['ebReading'], 'absConsumption' => $summary['ebReading'] == 0 ? " " : $summary['ebReading'],
'absClosingStock' => '', 'absClosingStock' => '',
'absPhysicalStock' => '', 'absPhysicalStock' => '',
'absRemarks' => '', 'absRemarks' => '',
@ -2534,8 +2533,6 @@ $timeOtions[] = "12:00 AM";
}) })
</script> </script>
<script> <script>
$('#month').change(function() { $('#month').change(function() {
$('#changeMonthForm').submit(); $('#changeMonthForm').submit();

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

@ -345,13 +345,13 @@
<input type="text" id="searchInput" placeholder="Search..." <input type="text" id="searchInput" placeholder="Search..."
class="mt-2" class="mt-2"
style="padding: 8px;margin-bottom: 10px;width: 150px;border: 1px solid #ccc; style="padding: 8px;margin-bottom: 10px;width: 150px;border: 2px solid rgb(123, 11, 214);
border-radius: 5px;margin-right:15px;"> border-radius: 5px;margin-right:15px;">
<i class="fa fa-table btn-lg mt-2" <i class="fa fa-table btn-lg mt-2"
title="Date Range Filter" title="Date Range Filter"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(95, 102, 105)"
data-toggle="modal" data-toggle="modal"
data-target="#filterModalId"> data-target="#filterModalId">
@ -359,20 +359,20 @@
<i class="fa fa-download btn-lg mt-2" <i class="fa fa-download btn-lg mt-2"
title="Excel Download" title="Excel Download"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color: #0b7cba"
id="trpSandUseStockExport"> id="trpSandUseStockExport">
</i> </i>
<i class="fe-maximize noti-icon btn-lg mt-2" <i class="fe-maximize noti-icon btn-lg mt-2"
title="Full Screen" title="Full Screen"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
onclick="toggleDivFullscreen()"> onclick="toggleDivFullscreen()">
</i> </i>
<i class="fa fa-save btn-lg mt-2" <i class="fa fa-save btn-lg mt-2"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer;" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">
</i> </i>