Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme
This commit is contained in:
commit
678178af7f
@ -421,14 +421,14 @@
|
||||
<td class="celda_normal"><?php echo $record['perHourCoatingSandQTY'] ?? '' ?></td>
|
||||
<!-- td:eq(12) -->
|
||||
<!-- edit and download option..!! -->
|
||||
<td class="celda_normal" style="background-color:white;">
|
||||
|
||||
<td class="celda_normal" >
|
||||
|
||||
<a data-toggle="tooltip" class="edit-btn"
|
||||
data-target="editCoatingMachineDetailModal" data-toggle="modal"
|
||||
style="cursor:pointer;">
|
||||
<i class="fa fa-edit"
|
||||
title="Click here to Edit "></i>
|
||||
title="Click here to Edit ">
|
||||
</i>
|
||||
|
||||
</a>
|
||||
|
||||
|
||||
@ -485,7 +485,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
|
||||
</td>
|
||||
|
||||
<!-- td:eq(15) edit -->
|
||||
<td class="celda_normal" style="background-color:white;">
|
||||
<td class="celda_normal" >
|
||||
<a type="button" class="edit-btn" >
|
||||
<i class="fa fa-edit"></i>
|
||||
</a>
|
||||
|
||||
@ -225,15 +225,33 @@
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
/* Table Wrapper for Scrolling */
|
||||
.table-responsive {
|
||||
overflow-x: auto;
|
||||
overflow-y: auto;
|
||||
max-height: 700px;
|
||||
/* Adjust as needed */
|
||||
max-height: 500px;
|
||||
max-width: 100%;
|
||||
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 {
|
||||
min-width: 100px;
|
||||
max-width: 100px;
|
||||
|
||||
@ -172,7 +172,7 @@
|
||||
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
||||
text-align: center;
|
||||
border: 1px solid #ccc;
|
||||
padding: 10px 4px;
|
||||
padding: 12px 4px;
|
||||
}
|
||||
|
||||
#trpProductionStockDetailsTableId tfoot tr td.celda_normal {
|
||||
@ -1419,8 +1419,8 @@ $timeOtions[] = "12:00 AM";
|
||||
'absTotal' => (int)$trpAbstract["ED Details"]['opening_stock'] + $summary['edProduction'],
|
||||
'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 ) ),
|
||||
'absPhysicalStock' =>(int)$trpAbstract["ED Details"]['physical_stock'],
|
||||
'absRemarks' => $trpAbstract["ED Details"]['remarks'],
|
||||
'absPhysicalStock' =>(int)$trpAbstract["ED Details"]['physical_stock'],
|
||||
'absRemarks' => $trpAbstract["ED Details"]['remarks'],
|
||||
],
|
||||
[
|
||||
'absDate' => $trpAbstract["TRP Total Sand"]['date'] ,
|
||||
@ -1471,8 +1471,8 @@ $timeOtions[] = "12:00 AM";
|
||||
'absTotal' =>(int)$trpAbstract["Water Consumption"]['opening_stock'] + $summary['waterReceipt'],
|
||||
'absConsumption' => $summary['waterConsumption'],
|
||||
'absClosingStock' =>(int)$trpAbstract["Water Consumption"]['opening_stock'] + $summary['waterReceipt'] - $summary['waterConsumption'],
|
||||
'absPhysicalStock' =>(int)$trpAbstract["Water Consumption"]['physical_stock'],
|
||||
'absRemarks' => $trpAbstract["Water Consumption"]['remarks'],
|
||||
'absPhysicalStock' =>(int)$trpAbstract["Water Consumption"]['physical_stock'],
|
||||
'absRemarks' => $trpAbstract["Water Consumption"]['remarks'],
|
||||
],
|
||||
[
|
||||
'absDate' => $trpAbstract["Power Consumption"]['date'] ,
|
||||
@ -1484,8 +1484,8 @@ $timeOtions[] = "12:00 AM";
|
||||
'absTotal' =>'',
|
||||
'absConsumption' => $summary['ebReading'],
|
||||
'absClosingStock' =>'',
|
||||
'absPhysicalStock' =>(int)$trpAbstract["Power Consumption"]['physical_stock'],
|
||||
'absRemarks' => $trpAbstract["Power Consumption"]['remarks'],
|
||||
'absPhysicalStock' =>(int)$trpAbstract["Power Consumption"]['physical_stock'],
|
||||
'absRemarks' => $trpAbstract["Power Consumption"]['remarks'],
|
||||
]
|
||||
];
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user