Diesel module : GWM
This commit is contained in:
parent
a79b002b96
commit
0ce21ff5d9
@ -449,25 +449,62 @@ class StockController extends BaseController
|
||||
$data['endDate'] = $monthData[count($monthData)-1]['database'];
|
||||
$data['datefordropdown'] = $currentMonth;
|
||||
|
||||
//Machine Details
|
||||
$data['machineDetails'] = $this->factoryMachine_model->where('energy_type', 'diesel')->where('is_active', 1)->findAll();
|
||||
if(!count([$data['machineDetails']]))
|
||||
{
|
||||
return $this->response->setBody("<script>alert('No Machine data available');</script>");
|
||||
}
|
||||
|
||||
$data['summaryDetails'] = $this->factoryVehicleDieselStockSummary_model
|
||||
->where('date >=', $data['startDate'])
|
||||
->where('date <=', $data['endDate'])
|
||||
->findAll();
|
||||
//Diesel Stock Summary Details
|
||||
$data['summaryDetails'] = $this->factoryVehicleDieselStockSummary_model->select('date,opening_stock as opening_stock_0,purchase_diesel as purchase_diesel_0,total_filling_diesel as total_filling_diesel_0,balance_stock as balance_stock_0')->where('date >=', $data['startDate'])->where('date <=', $data['endDate'])->findAll();
|
||||
if(!count($data['summaryDetails']))
|
||||
{
|
||||
|
||||
//insert empty data
|
||||
$tempInsert = [];
|
||||
foreach ($monthData as $key => $value) {
|
||||
array_push($tempInsert,[ 'date'=>$value['database'] ]);
|
||||
}
|
||||
$this->factoryVehicleDieselStockSummary_model->insertBatch($tempInsert);
|
||||
|
||||
$data['summaryDetails'] = $this->factoryVehicleDieselStockSummary_model->where('date >=', $data['startDate'])->where('date <=', $data['endDate'])->findAll();
|
||||
}
|
||||
|
||||
$data['dieselConsumptionDetails'] = $this->getDieselConsumptionPivot($data['machineDetails'] , $data['startDate'] , $data['endDate']);
|
||||
|
||||
//Diesel Consumption Details
|
||||
$data['dieselConsumptionDetails'] = $this->getDieselConsumptionPivot($data['machineDetails'] , $data['startDate'] , $data['endDate']);
|
||||
if(!count($data['dieselConsumptionDetails']))
|
||||
{
|
||||
//insert empty data
|
||||
$tempInsert = [];
|
||||
foreach ($monthData as $key => $value) {
|
||||
array_push($tempInsert,['date'=>$value['database'] , 'machine_id'=>$data['machineDetails'][0]['id'] ]);
|
||||
}
|
||||
$this->factoryVehicleDieselDetails_model->insertBatch($tempInsert);
|
||||
|
||||
$data['dieselConsumptionDetails'] = $this->getDieselConsumptionPivot($data['machineDetails'] , $data['startDate'] , $data['endDate']);
|
||||
}
|
||||
|
||||
|
||||
$mergedArray = [];
|
||||
|
||||
// Loop through the first array
|
||||
foreach ($data['summaryDetails'] as $item1) {
|
||||
$date = $item1["date"];
|
||||
|
||||
// Find the matching item in the second array by date
|
||||
foreach ($data['dieselConsumptionDetails'] as $item2) {
|
||||
if ($item2["date"] === $date) {
|
||||
// Merge the two arrays
|
||||
$mergedArray[] = array_merge($item1, $item2);
|
||||
break; // Stop once the matching date is found
|
||||
}
|
||||
}
|
||||
}
|
||||
$data['dieselConsumptionDetails'] = $mergedArray;
|
||||
|
||||
$data['machineName'] = array_column($data['machineDetails'], 'machine_name');
|
||||
|
||||
$this->global['pageTitle'] = 'Drier Details';
|
||||
// this is a code that i want to see in $this->global aiyo pakurane ena nu solrathu
|
||||
|
||||
|
||||
$this->loadViews("factoryDieselMachineDetails", $this->global, $data, NULL);
|
||||
|
||||
}
|
||||
@ -498,6 +535,66 @@ class StockController extends BaseController
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function addOrEditfactoryVehicleDieselDetails()
|
||||
{
|
||||
$dieselMachineTableData = json_decode($this->request->getPost('dieselMachineTableData'), true);
|
||||
|
||||
$transformedData = [];
|
||||
foreach ($dieselMachineTableData as $entry) {
|
||||
$date = $entry['date'];
|
||||
|
||||
foreach ($entry as $key => $value) {
|
||||
|
||||
if ($key === 'date') { continue; }
|
||||
|
||||
preg_match('/(.*?)_(\d+)$/', $key, $matches);
|
||||
|
||||
if (count($matches) === 3) {
|
||||
$field = $matches[1];
|
||||
$machineId = $matches[2];
|
||||
|
||||
$insertKey = "{$date}_{$machineId}";
|
||||
if (!isset($transformedData[$insertKey])) {
|
||||
$transformedData[$insertKey] = [
|
||||
'date' => DateTime::createFromFormat('d-m-Y', $date)->format('Y-m-d'),
|
||||
'machine_id' => $machineId,
|
||||
'opening_reading' => 0.00,
|
||||
'closing_reading' => 0.00,
|
||||
'filling_diesel' => 0.00,
|
||||
'consumption' => 0.00,
|
||||
'running_hours' => 0.00,
|
||||
'mileage' => 0.00,
|
||||
];
|
||||
}
|
||||
|
||||
$transformedData[$insertKey][$field] = (float) $value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
foreach ($transformedData as $row) {
|
||||
|
||||
|
||||
// Check if a row with the same date already exists
|
||||
$existingRow = $this->factoryVehicleDieselDetails_model->where('date', $row['date'])->where('machine_id', $row['machine_id'])->first();
|
||||
|
||||
|
||||
if ($existingRow) {
|
||||
// If exists, update the row
|
||||
$this->factoryVehicleDieselDetails_model->update($existingRow['id'], $row);
|
||||
} else {
|
||||
// If not, insert a new row
|
||||
$this->factoryVehicleDieselDetails_model->insert($row);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
echo "Data successfully saved.";
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -11,9 +11,9 @@ class FactoryVehicleDieselStockSummaryModel extends Model
|
||||
|
||||
protected $allowedFields = [
|
||||
'date',
|
||||
'opening',
|
||||
'opening_stock',
|
||||
'purchase_diesel',
|
||||
'filling_diesel',
|
||||
'total_filling_diesel',
|
||||
'balance_stock'
|
||||
];
|
||||
|
||||
|
||||
@ -177,6 +177,21 @@ $currentday = date('d');
|
||||
.modal {
|
||||
padding-right: 30% ! important;
|
||||
}
|
||||
|
||||
/* .fht-table th:nth-child(1),
|
||||
.fht-table td:nth-child(1),
|
||||
.fht-table th:nth-child(2),
|
||||
.fht-table td:nth-child(2),
|
||||
.fht-table th:nth-child(3),
|
||||
.fht-table td:nth-child(3)
|
||||
{
|
||||
position: sticky;
|
||||
left: 0;
|
||||
background-color: #00a65a;
|
||||
z-index: 2;
|
||||
border-right: 2px solid #ddd;
|
||||
color: #ffffff;
|
||||
} */
|
||||
</style>
|
||||
<div class="content-page">
|
||||
<div class="content">
|
||||
|
||||
@ -108,7 +108,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
|
||||
|
||||
|
||||
.celda_encabezado_general {
|
||||
background-color: #c45151f5;
|
||||
background-color: #00a65a;
|
||||
border: 1px solid #ccc;
|
||||
color: #ffffff;
|
||||
font-weight: bold;
|
||||
@ -164,13 +164,20 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#dieselMachineTable th:nth-child(1),
|
||||
#dieselMachineTable td:nth-child(1)
|
||||
{
|
||||
position: sticky;
|
||||
left: 0;
|
||||
background-color: #00a65a;
|
||||
z-index: 2;
|
||||
border-right: 2px solid #ddd;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
|
||||
<div class="content-page">
|
||||
<div class="content">
|
||||
<!-- Start Content-->
|
||||
@ -232,15 +239,15 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
|
||||
return ucwords(implode(' ', $parts));
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
|
||||
<table id="drierTable" class="fht-table table-striped" style="font-size: small;">
|
||||
<table id="dieselMachineTable" class="fht-table table-striped" style="font-size: small;">
|
||||
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="celda_encabezado_general" style="padding: 10px;"></th>
|
||||
<th class="celda_encabezado_general" colspan="4" style="padding: 10px;">Total Diesel</th>
|
||||
<?php foreach ($machineName as $name): ?>
|
||||
<th class="celda_encabezado_general" colspan="6" style="padding: 10px;"><?= $name; ?></th>
|
||||
<?php endforeach; ?>
|
||||
@ -250,20 +257,36 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
|
||||
<thead>
|
||||
<tr>
|
||||
<?php foreach ($columns as $column): ?>
|
||||
<th class="celda_encabezado_general" style="padding: 10px;"><?= formatHeader($column) ?></th>
|
||||
<th class="celda_encabezado_general" style="padding: 10px;" id="<?= $column ?>"><?= formatHeader($column) ?></th>
|
||||
<?php endforeach; ?>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
<?php foreach ($dieselConsumptionDetails as $row): ?>
|
||||
<tr>
|
||||
<?php foreach ($columns as $index => $column): ?>
|
||||
|
||||
<?php foreach ($dieselConsumptionDetails as $key => $row): ?>
|
||||
<tr id="<?php echo $key + 1; ?>">
|
||||
<?php foreach ($columns as $index => $column): ?>
|
||||
|
||||
<?php if($index == 0) : ?>
|
||||
<td class="celda_normal" style="padding: 5px;" ><?php echo DateTime::createFromFormat('Y-m-d', $row[$column])->format('d-m-Y'); ?></td>
|
||||
<?php elseif(formatHeader($column) == 'Opening Reading'): ?>
|
||||
<td class="celda_normal" <?= ($key == 0) ? 'contenteditable="true"' : ''; ?> style="padding: 5px;"><?= $row[$column] ?? 'N/A' ?></td>
|
||||
<?php elseif(formatHeader($column) == 'Closing Reading'): ?>
|
||||
<td class="celda_normal" contenteditable="true" onkeyup="calculateRunningHrs(this.parentNode.id,this.textContent);" style="padding: 5px;"><?= $row[$column] ?? 'N/A' ?></td>
|
||||
<?php elseif(formatHeader($column) == 'Filling Diesel'): ?>
|
||||
<td class="celda_normal" contenteditable="true" onkeyup="calculateTotalFillingDiesel(this.parentNode.id,this.textContent);" style="padding: 5px;"><?= $row[$column] ?? 'N/A' ?></td>
|
||||
<?php elseif(formatHeader($column) == 'Consumption'): ?>
|
||||
<td class="celda_normal" contenteditable="true" onkeyup="calculateMileage(this.parentNode.id,this.textContent);" style="padding: 5px;"><?= $row[$column] ?? 'N/A' ?></td>
|
||||
<?php elseif(formatHeader($column) == 'Running Hours'): ?>
|
||||
<td class="celda_normal" style="padding: 5px;"><?= $row[$column] ?? 'N/A' ?></td>
|
||||
<?php elseif(formatHeader($column) == 'Mileage'): ?>
|
||||
<td class="celda_normal" style="padding: 5px;"><?= $row[$column] ?? 'N/A' ?></td>
|
||||
<?php elseif(formatHeader($column) == 'Opening Stock'): ?>
|
||||
<td class="celda_normal" <?= ($key == 0) ? 'contenteditable="true"' : ''; ?> style="padding: 5px;"><?= $row[$column] ?? 'N/A' ?></td>
|
||||
<?php elseif(formatHeader($column) == 'Purchase Diesel'): ?>
|
||||
<td class="celda_normal" contenteditable="true" onkeyup="calculateBalanceStock(this.parentNode.id,this.textContent);" style="padding: 5px;"><?= $row[$column] ?? 'N/A' ?></td>
|
||||
<?php else : ?>
|
||||
<td class="celda_normal" contenteditable="true" style="padding: 5px;"><?= $row[$column] ?? 'N/A' ?></td>
|
||||
<td class="celda_normal" style="padding: 5px;"><?= $row[$column] ?? 'N/A' ?></td>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php endforeach; ?>
|
||||
@ -303,47 +326,170 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
|
||||
<script type="text/javascript">
|
||||
|
||||
|
||||
$(document).ready(function()
|
||||
{
|
||||
|
||||
$('.timeDropdown').select2({
|
||||
placeholder: "Select a time",
|
||||
});
|
||||
|
||||
$(document).ready(function()
|
||||
{
|
||||
$('#save').click(function() {
|
||||
|
||||
var alldata = $("#drierTable").tableToJSON();
|
||||
// Get headers from the second <thead> as keys
|
||||
var headers = [];
|
||||
$("#dieselMachineTable thead:nth-child(2) th").each(function() {
|
||||
headers.push($(this).attr("id"));
|
||||
});
|
||||
|
||||
|
||||
alldata = JSON.stringify(alldata);
|
||||
// Convert table to JSON using custom headers as keys
|
||||
var tableData = [];
|
||||
$("#dieselMachineTable tbody tr").each(function() {
|
||||
var rowData = {};
|
||||
$(this).find("td").each(function(index) {
|
||||
var key = headers[index] || `column_${index}`;
|
||||
rowData[key] = $(this).text().trim();
|
||||
});
|
||||
tableData.push(rowData);
|
||||
});
|
||||
|
||||
var jsonData = JSON.stringify(tableData);
|
||||
|
||||
|
||||
$('#loader').show();
|
||||
$.ajax({
|
||||
data: {
|
||||
drierData: alldata,
|
||||
dieselMachineTableData: jsonData,
|
||||
},
|
||||
type: "POST",
|
||||
url: "<?php echo base_url() ?>",
|
||||
url: "<?php echo base_url() ?>/addOrEditfactoryVehicleDieselDetails",
|
||||
|
||||
success: function(data) {
|
||||
if (data) {
|
||||
|
||||
|
||||
$('#loader').hide();
|
||||
alert(data);
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script>
|
||||
|
||||
function openingReading(parentId , textContent) {
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
function calculateRunningHrs(parentId , textContent){
|
||||
|
||||
var tr = $('#' + parentId);
|
||||
var currentTd = $(event.target);
|
||||
var tdIndex = currentTd.index();
|
||||
|
||||
// runningHrs calculation
|
||||
closingReading = currentTd.text();
|
||||
openingReading = tr.find('td:eq(' + (tdIndex - 1) + ')').text();
|
||||
runningHrs = closingReading - openingReading;
|
||||
if(runningHrs != NaN && runningHrs != Infinity)
|
||||
tr.find('td:eq(' + (tdIndex + 3) + ')').text(runningHrs.toFixed(2));
|
||||
|
||||
// mileage calculation
|
||||
consumption = tr.find('td:eq(' + (tdIndex + 2) + ')').text();
|
||||
runningHrs = runningHrs.toFixed(2);
|
||||
mileage = consumption / runningHrs;
|
||||
if(mileage != NaN && mileage != Infinity)
|
||||
tr.find('td:eq(' + (tdIndex + 4) + ')').text(mileage.toFixed(2));
|
||||
|
||||
//next opening reading
|
||||
nextTrIndex = parseInt(parentId, 10) + 1
|
||||
var nexttr = $('#' + nextTrIndex);
|
||||
nexttr.find('td:eq(' + (tdIndex - 1) + ')').text(textContent);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
function calculateMileage(parentId , textContent) {
|
||||
|
||||
var tr = $('#' + parentId);
|
||||
var currentTd = $(event.target);
|
||||
var tdIndex = currentTd.index();
|
||||
|
||||
// mileage calculation
|
||||
consumption = currentTd.text();
|
||||
runningHrs = tr.find('td:eq(' + (tdIndex + 1) + ')').text();
|
||||
result = consumption / runningHrs;
|
||||
if(result != NaN && result != Infinity)
|
||||
tr.find('td:eq(' + (tdIndex + 2) + ')').text(result.toFixed(2));
|
||||
|
||||
}
|
||||
|
||||
|
||||
function calculateTotalFillingDiesel(parentId , textContent) {
|
||||
|
||||
var tr = $('#' + parentId);
|
||||
totalFillingDiesel = 0;
|
||||
|
||||
tr.children('td').each(function(index, td) {
|
||||
|
||||
var value = parseFloat($(td).text()) || 0;
|
||||
|
||||
// var headerText = $('table thead th').eq(index).text();
|
||||
var headerText = $('table thead tr:eq(1) th').eq(index).text();
|
||||
|
||||
if(headerText == 'Filling Diesel'){
|
||||
totalFillingDiesel += value;
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
tr.find('td:eq(' + (3) + ')').text(totalFillingDiesel.toFixed(2));
|
||||
|
||||
// Balance Stock calculation
|
||||
openingStock = tr.find('td:eq(' + (1) + ')').text();
|
||||
purchaseDiesel = tr.find('td:eq(' + (2) + ')').text();
|
||||
fillingDiesel = tr.find('td:eq(' + (3) + ')').text();
|
||||
|
||||
balanceStock = (parseFloat(openingStock) + parseFloat(purchaseDiesel)) - parseFloat(fillingDiesel);
|
||||
if(balanceStock != NaN && balanceStock != Infinity)
|
||||
tr.find('td:eq(' + (4) + ')').text(balanceStock.toFixed(2));
|
||||
|
||||
//next opening stock
|
||||
nextTrIndex = parseInt(parentId, 10) + 1
|
||||
var nexttr = $('#' + nextTrIndex);
|
||||
nexttr.find('td:eq(' + (1) + ')').text(balanceStock.toFixed(2));
|
||||
}
|
||||
|
||||
function calculateBalanceStock(parentId , textContent) {
|
||||
|
||||
var tr = $('#' + parentId);
|
||||
var currentTd = $(event.target);
|
||||
var tdIndex = currentTd.index();
|
||||
|
||||
// Balance Stock calculation
|
||||
openingStock = tr.find('td:eq(' + (tdIndex - 1) + ')').text();
|
||||
purchaseDiesel = currentTd.text();
|
||||
fillingDiesel = tr.find('td:eq(' + (tdIndex + 1) + ')').text();
|
||||
|
||||
balanceStock = (parseFloat(openingStock) + parseFloat(purchaseDiesel)) - parseFloat(fillingDiesel);
|
||||
if(balanceStock != NaN && balanceStock != Infinity)
|
||||
tr.find('td:eq(' + (tdIndex + 2) + ')').text(balanceStock.toFixed(2));
|
||||
|
||||
//next opening stock
|
||||
nextTrIndex = parseInt(parentId, 10) + 1
|
||||
var nexttr = $('#' + nextTrIndex);
|
||||
nexttr.find('td:eq(' + (1) + ')').text(balanceStock.toFixed(2));
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user