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

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

Browse Source
This commit is contained in:
VE10-Sanjeev 2025-02-21 12:57:07 +00:00
commit 22a401fcb5
4 changed files with 423 additions and 468 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Models/Rawmaterialdetails_model.php
View File

@ -146,7 +146,7 @@ class Rawmaterialdetails_model extends Model
$builder = $this->db->table('t_materialmaster') $builder = $this->db->table('t_materialmaster')
->select('MaterialCode') ->select('MaterialCode')
->where('Category', 'silica sand') ->where('Category', '248')
->orderBy('CreatedDate', 'desc'); ->orderBy('CreatedDate', 'desc');
$query = $builder->get(); $query = $builder->get();
$materialResults = $query->getResultArray(); $materialResults = $query->getResultArray();
@ -158,7 +158,7 @@ class Rawmaterialdetails_model extends Model
$builder = $this->db->table('t_materialmaster') $builder = $this->db->table('t_materialmaster')
->select('MaterialCode') ->select('MaterialCode')
->where('Category', 'waste core') ->where('Category', '328')
->orderBy('CreatedDate', 'desc'); ->orderBy('CreatedDate', 'desc');
$query = $builder->get(); $query = $builder->get();
$materialResults = $query->getResultArray(); $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 //when no data present for current month we are showing only active materials with filter option
$builder = $this->db->table('t_materialmaster') $builder = $this->db->table('t_materialmaster')
->select('MaterialCode, MaterialName') ->select('MaterialCode, MaterialName')
->where('Category', 'Packing Material') ->where('Category', '236')
->where('IsActive', 1) ->where('IsActive', 1)
->orderBy('MaterialCode', 'asc'); ->orderBy('MaterialCode', 'asc');
$query = $builder->get(); $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 //when data present with whether material is active or not we have to show them with filter option
$builder = $this->db->table('t_materialmaster') $builder = $this->db->table('t_materialmaster')
->select('MaterialCode, MaterialName') ->select('MaterialCode, MaterialName')
->where('Category', 'Packing Material') ->where('Category', '236')
->whereIn('MaterialCode', $distinctMaterialCodes) ->whereIn('MaterialCode', $distinctMaterialCodes)
->orderBy('MaterialCode', 'asc'); ->orderBy('MaterialCode', 'asc');
$query = $builder->get(); $query = $builder->get();
@ -199,7 +199,7 @@ class Rawmaterialdetails_model extends Model
$builder = $this->db->table('t_materialmaster') $builder = $this->db->table('t_materialmaster')
->select('MaterialCode , MaterialName') ->select('MaterialCode , MaterialName')
->where('IsActive', 1) ->where('IsActive', 1)
->where('Category', 'Resin') ->where('Category', '327')
->orderBy('MaterialCode', 'asc'); ->orderBy('MaterialCode', 'asc');
$query = $builder->get(); $query = $builder->get();
$materialResults = $query->getResultArray(); $materialResults = $query->getResultArray();
@ -212,6 +212,7 @@ class Rawmaterialdetails_model extends Model
{ {
$builder = $this->db->table('t_materialmaster') $builder = $this->db->table('t_materialmaster')
->select('MaterialCode, MaterialName') ->select('MaterialCode, MaterialName')
->where('Category', '327')
->whereIn('MaterialCode', $distinctMaterialCodes) // Matches MaterialCode with the array ->whereIn('MaterialCode', $distinctMaterialCodes) // Matches MaterialCode with the array
->orderBy('MaterialCode', 'asc'); ->orderBy('MaterialCode', 'asc');

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

@ -704,6 +704,7 @@ foreach ($period as $day) {
<?php <?php
// dd($previousMonthDieselMachineStockDetails);
foreach ($dieselMachines as $dieselMachineIndex => $dieselMachine) { foreach ($dieselMachines as $dieselMachineIndex => $dieselMachine) {
?> ?>
<!-- this will loop till machines present --> <!-- 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'] ? $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading']
:" " ; :" " ;
?> ?>
@ -740,7 +741,9 @@ foreach ($period as $day) {
<td class="celda_normal closingReading" <td class="celda_normal closingReading"
data-id="<?= $dateInMonth ?> <?= $dieselMachine['id'] ?>" data-id="<?= $dateInMonth ?> <?= $dieselMachine['id'] ?>"
oninput="closingReadingChange(this)" oninput="closingReadingChange(this)"
contenteditable="true"><?= !empty($previousMonthDieselMachineStockDetails) contenteditable="true">
<?= !empty($previousMonthDieselMachineStockDetails) && isset($previousMonthDieselMachineStockDetails[$dieselMachineIndex])
? $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading'] ? $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading']
:" " ; :" " ;
?> ?>

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

@ -177,8 +177,10 @@
.fht-table thead { .fht-table thead {
position: sticky; position: sticky;
top: 0; top: 0;
z-index: 20; /* Ensure the entire header stays above table rows */ z-index: 20;
background-color: #50bbd9; /* Header background color */ /* Ensure the entire header stays above table rows */
background-color: #50bbd9;
/* Header background color */
} }
.dropdown-menu { .dropdown-menu {
@ -191,8 +193,10 @@
.fht-table thead th { .fht-table thead th {
position: sticky; position: sticky;
top: 0; top: 0;
z-index: 11; /* Higher than table rows but lower than first column */ z-index: 11;
background-color: #50bbd9; /* Green background */ /* Higher than table rows but lower than first column */
background-color: #50bbd9;
/* Green background */
color: #ffffff; color: #ffffff;
border: 1px solid #ddd; border: 1px solid #ddd;
padding: 10px; padding: 10px;
@ -204,7 +208,8 @@
position: sticky; position: sticky;
left: 0; left: 0;
background-color: #50bbd9; 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; border-right: 2px solid #ddd;
color: #ffffff; color: #ffffff;
} }
@ -213,7 +218,8 @@
.table-responsive { .table-responsive {
overflow-x: auto; overflow-x: auto;
overflow-y: auto; overflow-y: auto;
max-height: 500px; /* Adjust as needed */ max-height: 500px;
/* Adjust as needed */
position: relative; position: relative;
} }
@ -221,13 +227,6 @@
min-width: 100px; min-width: 100px;
max-width: 100px; max-width: 100px;
} }
</style> </style>
@ -411,9 +410,7 @@ foreach ($period as $day) {
<?php if ($groupedIndex == 0): ?> <?php if ($groupedIndex == 0): ?>
oninput="openingTPStockChange(this)" oninput="openingTPStockChange(this)"
contenteditable="true" contenteditable="true"
<?php endif; ?> <?php endif; ?>><?= $totalPower[$groupedIndex]['opening_reading'] ?? ' ' ?></td>
><?= $totalPower[$groupedIndex]['opening_reading'] ?? ' ' ?></td>
<td class="celda_normal finalTP" <td class="celda_normal finalTP"
@ -434,24 +431,21 @@ foreach ($period as $day) {
</td> </td>
<td class="celda_normal totalUnitsTP" <td class="celda_normal totalUnitsTP"
data-id="<?=$totalPower[$groupedIndex]['date']?>" data-id="<?= $totalPower[$groupedIndex]['date'] ?>">
>
<?= $totalPower[$groupedIndex]['total_units'] ?? ' ' ?> <?= $totalPower[$groupedIndex]['total_units'] ?? ' ' ?>
</td> </td>
<td class="celda_normal averagePfTP" contenteditable="true" <td class="celda_normal averagePfTP" contenteditable="true"
data-id="<?=$totalPower[$groupedIndex]['date']?>" data-id="<?= $totalPower[$groupedIndex]['date'] ?>">
>
<?= $totalPower[$groupedIndex]['average_pf'] ?? ' ' ?> <?= $totalPower[$groupedIndex]['average_pf'] ?? ' ' ?>
</td> </td>
<td class="celda_normal presentPfTP" contenteditable="true" <td class="celda_normal presentPfTP" contenteditable="true"
data-id="<?=$totalPower[$groupedIndex]['date']?>" data-id="<?= $totalPower[$groupedIndex]['date'] ?>">
>
<?= $totalPower[$groupedIndex]['present_pf'] ?? ' ' ?> <?= $totalPower[$groupedIndex]['present_pf'] ?? ' ' ?>
@ -459,16 +453,14 @@ foreach ($period as $day) {
<td class="celda_normal mdTP" contenteditable="true" <td class="celda_normal mdTP" contenteditable="true"
oninput="mdTPStockChange(this)" oninput="mdTPStockChange(this)"
data-id="<?=$totalPower[$groupedIndex]['date']?>" data-id="<?= $totalPower[$groupedIndex]['date'] ?>">
>
<?= $totalPower[$groupedIndex]['md'] ?? ' ' ?> <?= $totalPower[$groupedIndex]['md'] ?? ' ' ?>
</td> </td>
<td class="celda_normal mfTP" <td class="celda_normal mfTP"
data-id="<?=$totalPower[$groupedIndex]['date']?>" data-id="<?= $totalPower[$groupedIndex]['date'] ?>">
>
<?= $totalPower[$groupedIndex]['mf'] ?? ' ' ?> <?= $totalPower[$groupedIndex]['mf'] ?? ' ' ?>
@ -578,13 +570,6 @@ foreach ($period as $day) {
$summary["machineId_$machineId"]['opening_units'] = " "; $summary["machineId_$machineId"]['opening_units'] = " ";
$summary["machineId_$machineId"]['closing_units'] = " "; $summary["machineId_$machineId"]['closing_units'] = " ";
$summary["machineId_$machineId"]['total_units'] += is_numeric($powerStock['total_units']) ? $powerStock['total_units'] : 0; $summary["machineId_$machineId"]['total_units'] += is_numeric($powerStock['total_units']) ? $powerStock['total_units'] : 0;
} ?> } ?>
</tr> </tr>
@ -694,9 +679,7 @@ foreach ($period as $day) {
oninput="openingTPStockChange(this)" oninput="openingTPStockChange(this)"
contenteditable="true" contenteditable="true"
<?php } ?> <?php } ?>><?php
><?php
if (empty($previousMonthTotalPowerMachineStockDetails)) { if (empty($previousMonthTotalPowerMachineStockDetails)) {
echo " "; echo " ";
} else { } else {
@ -729,29 +712,19 @@ foreach ($period as $day) {
data-id="<?= $dateInMonth ?>"> </td> data-id="<?= $dateInMonth ?>"> </td>
<td class="celda_normal totalUnitsTP" <td class="celda_normal totalUnitsTP"
data-id="<?= $dateInMonth ?>" data-id="<?= $dateInMonth ?>"> </td>
> </td>
<td class="celda_normal averagePfTP" contenteditable="true" <td class="celda_normal averagePfTP" contenteditable="true"
data-id="<?= $dateInMonth ?>" data-id="<?= $dateInMonth ?>"> </td>
> </td>
<td class="celda_normal presentPfTP" contenteditable="true" <td class="celda_normal presentPfTP" contenteditable="true"
data-id="<?= $dateInMonth ?>" data-id="<?= $dateInMonth ?>"> </td>
> </td>
<td class="celda_normal mdTP" contenteditable="true" <td class="celda_normal mdTP" contenteditable="true"
oninput="mdTPStockChange(this)" oninput="mdTPStockChange(this)"
data-id="<?= $dateInMonth ?>" data-id="<?= $dateInMonth ?>"> </td>
> </td>
<td class="celda_normal mfTP" <td class="celda_normal mfTP"
data-id="<?= $dateInMonth ?>" data-id="<?= $dateInMonth ?>"> </td>
> </td>
@ -772,21 +745,16 @@ foreach ($period as $day) {
</td> </td>
<td class="celda_normal openingUnits" <td class="celda_normal openingUnits"
data-id="<?= $dateInMonth ?> <?= $powerMachine['id'] ?>"
<?php if ($datesInMonthIndex == 0) { ?> <?php if ($datesInMonthIndex == 0) { ?>
oninput="openingUnitsChange(this)" oninput="openingUnitsChange(this)"
contenteditable="true" contenteditable="true"
<?php } ?> <?php } ?>
><?php data-id="<?= $dateInMonth ?> <?= $powerMachine['id'] ?>">
if(empty( $previousMonthPowerConsumptionStockDetails)){ <?= (!empty($previousMonthPowerConsumptionStockDetails) && isset($previousMonthPowerConsumptionStockDetails[$powerMachineIndex]))
echo " " ; ? $previousMonthPowerConsumptionStockDetails[$powerMachineIndex]['closing_units']
}else{ : " ";
echo $previousMonthPowerConsumptionStockDetails[$powerMachineIndex]['closing_units'] ;
}
?> ?>
</td> </td>
@ -795,12 +763,10 @@ foreach ($period as $day) {
data-id="<?= $dateInMonth ?> <?= $powerMachine['id'] ?>" data-id="<?= $dateInMonth ?> <?= $powerMachine['id'] ?>"
oninput="closingUnitsChange(this)" oninput="closingUnitsChange(this)"
contenteditable="true"> contenteditable="true">
<?php
if(empty( $previousMonthPowerConsumptionStockDetails)){ <?= (!empty($previousMonthPowerConsumptionStockDetails) && isset($previousMonthPowerConsumptionStockDetails[$powerMachineIndex]))
echo " " ; ? $previousMonthPowerConsumptionStockDetails[$powerMachineIndex]['closing_units']
}else{ : " ";
echo $previousMonthPowerConsumptionStockDetails[$powerMachineIndex]['closing_units'] ;
}
?> ?>
</td> </td>
@ -1067,9 +1033,6 @@ foreach ($period as $day) {
</script> </script>
<script> <script>
function openingUnitsChange(tdElement) { function openingUnitsChange(tdElement) {
try { try {
@ -1212,16 +1175,9 @@ foreach ($period as $day) {
return input; return input;
} }
</script> </script>
<script> <script>
function updateStockValue(date, machine_id, closingUnits) { function updateStockValue(date, machine_id, closingUnits) {
const table = $('#powerStockDetailsTableId'); const table = $('#powerStockDetailsTableId');
@ -1305,13 +1261,11 @@ foreach ($period as $day) {
}) })
} }
</script> </script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
function exportTableToExcel(tableID, filename = '') { function exportTableToExcel(tableID, filename = '') {
@ -1346,9 +1300,6 @@ foreach ($period as $day) {
}) })
</script> </script>
<script> <script>
@ -1383,5 +1334,4 @@ foreach ($period as $day) {
} }
} }
}); });
</script> </script>

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

@ -511,6 +511,7 @@ foreach ($period as $day) {
} }
?>> ?>>
<?php <?php
// dd($resinMaterials);
foreach ($resinMaterials as $resinMaterialIndex => $resinMaterial) { ?> foreach ($resinMaterials as $resinMaterialIndex => $resinMaterial) { ?>
<!-- this will loop till materials present --> <!-- this will loop till materials present -->