Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

This commit is contained in:
Gowtham M 2025-03-26 12:18:49 +05:30
commit 678178af7f
4 changed files with 32 additions and 14 deletions

View File

@ -421,14 +421,14 @@
<td class="celda_normal"><?php echo $record['perHourCoatingSandQTY'] ?? '' ?></td> <td class="celda_normal"><?php echo $record['perHourCoatingSandQTY'] ?? '' ?></td>
<!-- td:eq(12) --> <!-- td:eq(12) -->
<!-- edit and download option..!! --> <!-- edit and download option..!! -->
<td class="celda_normal" style="background-color:white;"> <td class="celda_normal" >
<a data-toggle="tooltip" class="edit-btn" <a data-toggle="tooltip" class="edit-btn"
data-target="editCoatingMachineDetailModal" data-toggle="modal" data-target="editCoatingMachineDetailModal" data-toggle="modal"
style="cursor:pointer;"> style="cursor:pointer;">
<i class="fa fa-edit" <i class="fa fa-edit"
title="Click here to Edit "></i> title="Click here to Edit ">
</i>
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
</a> </a>

View File

@ -485,7 +485,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
</td> </td>
<!-- td:eq(15) edit --> <!-- td:eq(15) edit -->
<td class="celda_normal" style="background-color:white;"> <td class="celda_normal" >
<a type="button" class="edit-btn" > <a type="button" class="edit-btn" >
<i class="fa fa-edit"></i> <i class="fa fa-edit"></i>
</a> </a>

View File

@ -225,15 +225,33 @@
color: #ffffff; color: #ffffff;
} }
/* Table Wrapper for Scrolling */
.table-responsive { .table-responsive {
overflow-x: auto; overflow-x: auto;
overflow-y: auto; overflow-y: auto;
max-height: 700px; max-height: 500px;
/* Adjust as needed */ max-width: 100%;
position: relative; position: relative;
} }
/* Adjust heights based on screen zoom */
@media only screen and (min-height: 1400px) { /* Approximate Zoom < 100% */
.table-responsive { max-height: 425px; }
}
@media only screen and (min-height: 1200px) { /* Approximate Zoom ~ 90% */
.table-responsive { max-height: 500px; }
}
@media only screen and (min-height: 1000px) { /* Approximate Zoom ~ 80% */
.table-responsive { max-height: 600px; }
}
@media only screen and (min-height: 800px) { /* Approximate Zoom ~ 75% */
.table-responsive { max-height: 650px; }
}
td { td {
min-width: 100px; min-width: 100px;
max-width: 100px; max-width: 100px;

View File

@ -172,7 +172,7 @@
/* <!-- ad9271 into ffffff brown-light to green-light --> */ /* <!-- ad9271 into ffffff brown-light to green-light --> */
text-align: center; text-align: center;
border: 1px solid #ccc; border: 1px solid #ccc;
padding: 10px 4px; padding: 12px 4px;
} }
#trpProductionStockDetailsTableId tfoot tr td.celda_normal { #trpProductionStockDetailsTableId tfoot tr td.celda_normal {
@ -1419,8 +1419,8 @@ $timeOtions[] = "12:00 AM";
'absTotal' => (int)$trpAbstract["ED Details"]['opening_stock'] + $summary['edProduction'], 'absTotal' => (int)$trpAbstract["ED Details"]['opening_stock'] + $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 ),
'absClosingStock' => (int)$trpAbstract["ED Details"]['opening_stock'] + $summary['edProduction'] - ($summary['edUsage'] + ($summary['coolerBags'] * 1250 ) + ($summary['cycloneWaste'] * 1250 ) + ( $summary['edWaste'] * 1250 ) ), 'absClosingStock' => (int)$trpAbstract["ED Details"]['opening_stock'] + $summary['edProduction'] - ($summary['edUsage'] + ($summary['coolerBags'] * 1250 ) + ($summary['cycloneWaste'] * 1250 ) + ( $summary['edWaste'] * 1250 ) ),
'absPhysicalStock' =>(int)$trpAbstract["ED Details"]['physical_stock'], 'absPhysicalStock' =>(int)$trpAbstract["ED Details"]['physical_stock'],
'absRemarks' => $trpAbstract["ED Details"]['remarks'], 'absRemarks' => $trpAbstract["ED Details"]['remarks'],
], ],
[ [
'absDate' => $trpAbstract["TRP Total Sand"]['date'] , 'absDate' => $trpAbstract["TRP Total Sand"]['date'] ,
@ -1471,8 +1471,8 @@ $timeOtions[] = "12:00 AM";
'absTotal' =>(int)$trpAbstract["Water Consumption"]['opening_stock'] + $summary['waterReceipt'], 'absTotal' =>(int)$trpAbstract["Water Consumption"]['opening_stock'] + $summary['waterReceipt'],
'absConsumption' => $summary['waterConsumption'], 'absConsumption' => $summary['waterConsumption'],
'absClosingStock' =>(int)$trpAbstract["Water Consumption"]['opening_stock'] + $summary['waterReceipt'] - $summary['waterConsumption'], 'absClosingStock' =>(int)$trpAbstract["Water Consumption"]['opening_stock'] + $summary['waterReceipt'] - $summary['waterConsumption'],
'absPhysicalStock' =>(int)$trpAbstract["Water Consumption"]['physical_stock'], 'absPhysicalStock' =>(int)$trpAbstract["Water Consumption"]['physical_stock'],
'absRemarks' => $trpAbstract["Water Consumption"]['remarks'], 'absRemarks' => $trpAbstract["Water Consumption"]['remarks'],
], ],
[ [
'absDate' => $trpAbstract["Power Consumption"]['date'] , 'absDate' => $trpAbstract["Power Consumption"]['date'] ,
@ -1484,8 +1484,8 @@ $timeOtions[] = "12:00 AM";
'absTotal' =>'', 'absTotal' =>'',
'absConsumption' => $summary['ebReading'], 'absConsumption' => $summary['ebReading'],
'absClosingStock' =>'', 'absClosingStock' =>'',
'absPhysicalStock' =>(int)$trpAbstract["Power Consumption"]['physical_stock'], 'absPhysicalStock' =>(int)$trpAbstract["Power Consumption"]['physical_stock'],
'absRemarks' => $trpAbstract["Power Consumption"]['remarks'], 'absRemarks' => $trpAbstract["Power Consumption"]['remarks'],
] ]
]; ];