Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme
This commit is contained in:
commit
22a401fcb5
@ -146,7 +146,7 @@ class Rawmaterialdetails_model extends Model
|
||||
|
||||
$builder = $this->db->table('t_materialmaster')
|
||||
->select('MaterialCode')
|
||||
->where('Category', 'silica sand')
|
||||
->where('Category', '248')
|
||||
->orderBy('CreatedDate', 'desc');
|
||||
$query = $builder->get();
|
||||
$materialResults = $query->getResultArray();
|
||||
@ -158,7 +158,7 @@ class Rawmaterialdetails_model extends Model
|
||||
|
||||
$builder = $this->db->table('t_materialmaster')
|
||||
->select('MaterialCode')
|
||||
->where('Category', 'waste core')
|
||||
->where('Category', '328')
|
||||
->orderBy('CreatedDate', 'desc');
|
||||
$query = $builder->get();
|
||||
$materialResults = $query->getResultArray();
|
||||
@ -171,7 +171,7 @@ class Rawmaterialdetails_model extends Model
|
||||
//when no data present for current month we are showing only active materials with filter option
|
||||
$builder = $this->db->table('t_materialmaster')
|
||||
->select('MaterialCode, MaterialName')
|
||||
->where('Category', 'Packing Material')
|
||||
->where('Category', '236')
|
||||
->where('IsActive', 1)
|
||||
->orderBy('MaterialCode', 'asc');
|
||||
$query = $builder->get();
|
||||
@ -184,7 +184,7 @@ class Rawmaterialdetails_model extends Model
|
||||
//when data present with whether material is active or not we have to show them with filter option
|
||||
$builder = $this->db->table('t_materialmaster')
|
||||
->select('MaterialCode, MaterialName')
|
||||
->where('Category', 'Packing Material')
|
||||
->where('Category', '236')
|
||||
->whereIn('MaterialCode', $distinctMaterialCodes)
|
||||
->orderBy('MaterialCode', 'asc');
|
||||
$query = $builder->get();
|
||||
@ -199,7 +199,7 @@ class Rawmaterialdetails_model extends Model
|
||||
$builder = $this->db->table('t_materialmaster')
|
||||
->select('MaterialCode , MaterialName')
|
||||
->where('IsActive', 1)
|
||||
->where('Category', 'Resin')
|
||||
->where('Category', '327')
|
||||
->orderBy('MaterialCode', 'asc');
|
||||
$query = $builder->get();
|
||||
$materialResults = $query->getResultArray();
|
||||
@ -212,6 +212,7 @@ class Rawmaterialdetails_model extends Model
|
||||
{
|
||||
$builder = $this->db->table('t_materialmaster')
|
||||
->select('MaterialCode, MaterialName')
|
||||
->where('Category', '327')
|
||||
->whereIn('MaterialCode', $distinctMaterialCodes) // Matches MaterialCode with the array
|
||||
->orderBy('MaterialCode', 'asc');
|
||||
|
||||
|
||||
@ -704,6 +704,7 @@ foreach ($period as $day) {
|
||||
|
||||
|
||||
<?php
|
||||
// dd($previousMonthDieselMachineStockDetails);
|
||||
foreach ($dieselMachines as $dieselMachineIndex => $dieselMachine) {
|
||||
?>
|
||||
<!-- this will loop till machines present -->
|
||||
@ -731,7 +732,7 @@ foreach ($period as $day) {
|
||||
|
||||
|
||||
|
||||
><?= !empty($previousMonthDieselMachineStockDetails)
|
||||
><?= (!empty($previousMonthDieselMachineStockDetails) && isset($previousMonthDieselMachineStockDetails[$dieselMachineIndex]) )
|
||||
? $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading']
|
||||
:" " ;
|
||||
?>
|
||||
@ -740,7 +741,9 @@ foreach ($period as $day) {
|
||||
<td class="celda_normal closingReading"
|
||||
data-id="<?= $dateInMonth ?> <?= $dieselMachine['id'] ?>"
|
||||
oninput="closingReadingChange(this)"
|
||||
contenteditable="true"><?= !empty($previousMonthDieselMachineStockDetails)
|
||||
contenteditable="true">
|
||||
|
||||
<?= !empty($previousMonthDieselMachineStockDetails) && isset($previousMonthDieselMachineStockDetails[$dieselMachineIndex])
|
||||
? $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading']
|
||||
:" " ;
|
||||
?>
|
||||
|
||||
@ -177,8 +177,10 @@
|
||||
.fht-table thead {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 20; /* Ensure the entire header stays above table rows */
|
||||
background-color: #50bbd9; /* Header background color */
|
||||
z-index: 20;
|
||||
/* Ensure the entire header stays above table rows */
|
||||
background-color: #50bbd9;
|
||||
/* Header background color */
|
||||
}
|
||||
|
||||
.dropdown-menu {
|
||||
@ -191,8 +193,10 @@
|
||||
.fht-table thead th {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 11; /* Higher than table rows but lower than first column */
|
||||
background-color: #50bbd9; /* Green background */
|
||||
z-index: 11;
|
||||
/* Higher than table rows but lower than first column */
|
||||
background-color: #50bbd9;
|
||||
/* Green background */
|
||||
color: #ffffff;
|
||||
border: 1px solid #ddd;
|
||||
padding: 10px;
|
||||
@ -204,7 +208,8 @@
|
||||
position: sticky;
|
||||
left: 0;
|
||||
background-color: #50bbd9;
|
||||
z-index: 15; /* Ensures it stays above other cells */
|
||||
z-index: 15;
|
||||
/* Ensures it stays above other cells */
|
||||
border-right: 2px solid #ddd;
|
||||
color: #ffffff;
|
||||
}
|
||||
@ -213,7 +218,8 @@
|
||||
.table-responsive {
|
||||
overflow-x: auto;
|
||||
overflow-y: auto;
|
||||
max-height: 500px; /* Adjust as needed */
|
||||
max-height: 500px;
|
||||
/* Adjust as needed */
|
||||
position: relative;
|
||||
}
|
||||
|
||||
@ -221,13 +227,6 @@
|
||||
min-width: 100px;
|
||||
max-width: 100px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</style>
|
||||
|
||||
|
||||
@ -411,9 +410,7 @@ foreach ($period as $day) {
|
||||
<?php if ($groupedIndex == 0): ?>
|
||||
oninput="openingTPStockChange(this)"
|
||||
contenteditable="true"
|
||||
<?php endif; ?>
|
||||
|
||||
><?= $totalPower[$groupedIndex]['opening_reading'] ?? ' ' ?></td>
|
||||
<?php endif; ?>><?= $totalPower[$groupedIndex]['opening_reading'] ?? ' ' ?></td>
|
||||
|
||||
|
||||
<td class="celda_normal finalTP"
|
||||
@ -434,24 +431,21 @@ foreach ($period as $day) {
|
||||
</td>
|
||||
|
||||
<td class="celda_normal totalUnitsTP"
|
||||
data-id="<?=$totalPower[$groupedIndex]['date']?>"
|
||||
>
|
||||
data-id="<?= $totalPower[$groupedIndex]['date'] ?>">
|
||||
|
||||
<?= $totalPower[$groupedIndex]['total_units'] ?? ' ' ?>
|
||||
|
||||
</td>
|
||||
|
||||
<td class="celda_normal averagePfTP" contenteditable="true"
|
||||
data-id="<?=$totalPower[$groupedIndex]['date']?>"
|
||||
>
|
||||
data-id="<?= $totalPower[$groupedIndex]['date'] ?>">
|
||||
|
||||
<?= $totalPower[$groupedIndex]['average_pf'] ?? ' ' ?>
|
||||
|
||||
</td>
|
||||
|
||||
<td class="celda_normal presentPfTP" contenteditable="true"
|
||||
data-id="<?=$totalPower[$groupedIndex]['date']?>"
|
||||
>
|
||||
data-id="<?= $totalPower[$groupedIndex]['date'] ?>">
|
||||
|
||||
<?= $totalPower[$groupedIndex]['present_pf'] ?? ' ' ?>
|
||||
|
||||
@ -459,16 +453,14 @@ foreach ($period as $day) {
|
||||
|
||||
<td class="celda_normal mdTP" contenteditable="true"
|
||||
oninput="mdTPStockChange(this)"
|
||||
data-id="<?=$totalPower[$groupedIndex]['date']?>"
|
||||
>
|
||||
data-id="<?= $totalPower[$groupedIndex]['date'] ?>">
|
||||
|
||||
<?= $totalPower[$groupedIndex]['md'] ?? ' ' ?>
|
||||
|
||||
</td>
|
||||
|
||||
<td class="celda_normal mfTP"
|
||||
data-id="<?=$totalPower[$groupedIndex]['date']?>"
|
||||
>
|
||||
data-id="<?= $totalPower[$groupedIndex]['date'] ?>">
|
||||
|
||||
<?= $totalPower[$groupedIndex]['mf'] ?? ' ' ?>
|
||||
|
||||
@ -578,13 +570,6 @@ foreach ($period as $day) {
|
||||
$summary["machineId_$machineId"]['opening_units'] = " ";
|
||||
$summary["machineId_$machineId"]['closing_units'] = " ";
|
||||
$summary["machineId_$machineId"]['total_units'] += is_numeric($powerStock['total_units']) ? $powerStock['total_units'] : 0;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
} ?>
|
||||
|
||||
</tr>
|
||||
@ -694,9 +679,7 @@ foreach ($period as $day) {
|
||||
oninput="openingTPStockChange(this)"
|
||||
contenteditable="true"
|
||||
|
||||
<?php } ?>
|
||||
|
||||
><?php
|
||||
<?php } ?>><?php
|
||||
if (empty($previousMonthTotalPowerMachineStockDetails)) {
|
||||
echo " ";
|
||||
} else {
|
||||
@ -729,29 +712,19 @@ foreach ($period as $day) {
|
||||
data-id="<?= $dateInMonth ?>"> </td>
|
||||
|
||||
<td class="celda_normal totalUnitsTP"
|
||||
data-id="<?= $dateInMonth ?>"
|
||||
|
||||
> </td>
|
||||
data-id="<?= $dateInMonth ?>"> </td>
|
||||
|
||||
<td class="celda_normal averagePfTP" contenteditable="true"
|
||||
data-id="<?= $dateInMonth ?>"
|
||||
|
||||
> </td>
|
||||
data-id="<?= $dateInMonth ?>"> </td>
|
||||
<td class="celda_normal presentPfTP" contenteditable="true"
|
||||
data-id="<?= $dateInMonth ?>"
|
||||
|
||||
> </td>
|
||||
data-id="<?= $dateInMonth ?>"> </td>
|
||||
|
||||
<td class="celda_normal mdTP" contenteditable="true"
|
||||
oninput="mdTPStockChange(this)"
|
||||
data-id="<?= $dateInMonth ?>"
|
||||
|
||||
> </td>
|
||||
data-id="<?= $dateInMonth ?>"> </td>
|
||||
|
||||
<td class="celda_normal mfTP"
|
||||
data-id="<?= $dateInMonth ?>"
|
||||
|
||||
> </td>
|
||||
data-id="<?= $dateInMonth ?>"> </td>
|
||||
|
||||
|
||||
|
||||
@ -772,21 +745,16 @@ foreach ($period as $day) {
|
||||
</td>
|
||||
|
||||
<td class="celda_normal openingUnits"
|
||||
data-id="<?= $dateInMonth ?> <?= $powerMachine['id'] ?>"
|
||||
|
||||
<?php if ($datesInMonthIndex == 0) { ?>
|
||||
|
||||
oninput="openingUnitsChange(this)"
|
||||
contenteditable="true"
|
||||
|
||||
<?php } ?>
|
||||
|
||||
><?php
|
||||
if(empty( $previousMonthPowerConsumptionStockDetails)){
|
||||
echo " " ;
|
||||
}else{
|
||||
echo $previousMonthPowerConsumptionStockDetails[$powerMachineIndex]['closing_units'] ;
|
||||
}
|
||||
data-id="<?= $dateInMonth ?> <?= $powerMachine['id'] ?>">
|
||||
<?= (!empty($previousMonthPowerConsumptionStockDetails) && isset($previousMonthPowerConsumptionStockDetails[$powerMachineIndex]))
|
||||
? $previousMonthPowerConsumptionStockDetails[$powerMachineIndex]['closing_units']
|
||||
: " ";
|
||||
|
||||
?>
|
||||
</td>
|
||||
@ -795,12 +763,10 @@ foreach ($period as $day) {
|
||||
data-id="<?= $dateInMonth ?> <?= $powerMachine['id'] ?>"
|
||||
oninput="closingUnitsChange(this)"
|
||||
contenteditable="true">
|
||||
<?php
|
||||
if(empty( $previousMonthPowerConsumptionStockDetails)){
|
||||
echo " " ;
|
||||
}else{
|
||||
echo $previousMonthPowerConsumptionStockDetails[$powerMachineIndex]['closing_units'] ;
|
||||
}
|
||||
|
||||
<?= (!empty($previousMonthPowerConsumptionStockDetails) && isset($previousMonthPowerConsumptionStockDetails[$powerMachineIndex]))
|
||||
? $previousMonthPowerConsumptionStockDetails[$powerMachineIndex]['closing_units']
|
||||
: " ";
|
||||
|
||||
?>
|
||||
</td>
|
||||
@ -1067,9 +1033,6 @@ foreach ($period as $day) {
|
||||
</script>
|
||||
|
||||
<script>
|
||||
|
||||
|
||||
|
||||
function openingUnitsChange(tdElement) {
|
||||
|
||||
try {
|
||||
@ -1212,16 +1175,9 @@ foreach ($period as $day) {
|
||||
|
||||
return input;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script>
|
||||
|
||||
|
||||
function updateStockValue(date, machine_id, closingUnits) {
|
||||
|
||||
const table = $('#powerStockDetailsTableId');
|
||||
@ -1305,13 +1261,11 @@ foreach ($period as $day) {
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
<script>
|
||||
|
||||
$(document).ready(function() {
|
||||
|
||||
function exportTableToExcel(tableID, filename = '') {
|
||||
@ -1346,9 +1300,6 @@ foreach ($period as $day) {
|
||||
|
||||
|
||||
})
|
||||
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script>
|
||||
@ -1383,5 +1334,4 @@ foreach ($period as $day) {
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
</script>
|
||||
@ -511,6 +511,7 @@ foreach ($period as $day) {
|
||||
}
|
||||
?>>
|
||||
<?php
|
||||
// dd($resinMaterials);
|
||||
foreach ($resinMaterials as $resinMaterialIndex => $resinMaterial) { ?>
|
||||
<!-- this will loop till materials present -->
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user