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

Power module : GWM

Browse Source
This commit is contained in:
Gowtham M 2024-11-08 11:45:12 +05:30
parent dac2812848
commit dd5f71886b
6 changed files with 714 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Config/Routes.php
View File

@ -435,6 +435,9 @@ $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addOrEditdrierMachineDetails',
$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'factoryVehicleDieselDetails', 'StockController::factoryVehicleDieselDetails');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addOrEditfactoryVehicleDieselDetails', 'StockController::addOrEditfactoryVehicleDieselDetails');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'powerConsumptionDetails', 'StockController::powerConsumptionDetails');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addOrEditPowerConsumptionDetails', 'StockController::addOrEditPowerConsumptionDetails');
//incoming Silica Sand Detaails
$routes->match(['GET','POST'],'incomingSilicaSandDetails', 'StockController::loadView_incomingSilicaSandDetails');

152
app/Controllers/StockController.php
View File

@ -3,6 +3,7 @@
namespace App\Controllers;
use App\Controllers\BaseController;
use App\Models\PowerConsumptionDetails;
use App\Models\CoatingMachineDetailsModel;
use App\Models\DrierMachineDetailsModel;
use App\Models\FactoryMachineModel;
@ -18,6 +19,7 @@ use DateTime;
class StockController extends BaseController
{
protected $powerConsumptionDetails_model;
protected $coatingMachineDetails_model;
protected $drierMachineDetails_model;
protected $factoryMachine_model;
@ -37,6 +39,7 @@ class StockController extends BaseController
{
$this->db = \Config\Database::connect();
parent::__construct();
$this->powerConsumptionDetails_model = new PowerConsumptionDetails();
$this->coatingMachineDetails_model = new CoatingMachineDetailsModel();
$this->drierMachineDetails_model = new DrierMachineDetailsModel();
$this->factoryMachine_model = new FactoryMachineModel();
@ -697,21 +700,146 @@ class StockController extends BaseController
}
foreach ($transformedData as $row) {
if($row['machine_id'] == 0)
{
// Summary data: if machine_id is 0, it indicates summary data. This distinction is used because these records will be stored in a separate table.
$this->factoryVehicleDieselStockSummary_model->where('date',$row['date'])->set($row)->update();
}else{
// Diesel - factory vehicle data :
$existingRow = $this->factoryVehicleDieselDetails_model->where('date', $row['date'])->where('machine_id', $row['machine_id'])->first();
if ($existingRow) {
$this->factoryVehicleDieselDetails_model->update($existingRow['id'], $row);
} else {
$this->factoryVehicleDieselDetails_model->insert($row);
}
}
}
echo "Data successfully saved.";
}
public function powerConsumptionDetails()
{
$currentMonth = $this->request->getPost('month') ? $this->request->getPost('month') : date('M-Y');
$monthData = $this->getMonthDatesFromInput($currentMonth);
$data['startDate'] = $monthData[0]['database'];
$data['endDate'] = $monthData[count($monthData)-1]['database'];
$data['datefordropdown'] = $currentMonth;
//Machine Details
$data['machineDetails'] = $this->factoryMachine_model->where('energy_type', 'electric')->where('is_active', 1)->findAll();
if(!count([$data['machineDetails']]))
{
return $this->response->setBody("<script>alert('No Machine data available');</script>");
}
//Diesel Consumption Details
$data['powerConsumptionDetails'] = $this->getElectricConsumptionPivot($data['machineDetails'] , $data['startDate'] , $data['endDate']);
if(!count($data['powerConsumptionDetails']))
{
//insert empty data
$tempInsert = [];
foreach ($monthData as $key => $value) {
array_push($tempInsert,['date'=>$value['database'] , 'machine_id'=>$data['machineDetails'][0]['id'] ]);
}
$this->powerConsumptionDetails_model->insertBatch($tempInsert);
$data['powerConsumptionDetails'] = $this->getElectricConsumptionPivot($data['machineDetails'] , $data['startDate'] , $data['endDate']);
}
$data['machineName'] = array_column($data['machineDetails'], 'machine_name');
$this->global['pageTitle'] = 'Power Consumption Details';
$this->loadViews("powerConsumptionDetails", $this->global, $data, NULL);
}
public function getElectricConsumptionPivot($machineDetails , $startDate , $endDeate)
{
$machineIds = array_column($machineDetails, 'id');
if (empty($machineIds)) { return []; }
$fields = ['opening_units', 'closing_units', 'total_units'];
$pivotColumns = [];
foreach ($machineIds as $machineId) {
foreach ($fields as $field) {
$pivotColumns[] = "MAX(CASE WHEN machine_id = $machineId THEN $field ELSE 0 END) AS {$field}_{$machineId}";
}
}
$pivotColumnString = implode(", ", $pivotColumns);
$sql = "SELECT `date`, $pivotColumnString FROM `t_powerConsumptionDetails`
WHERE machine_id IN (" . implode(",", $machineIds) . ") AND `date` >= ? AND `date` <= ?
GROUP BY `date`";
$query = $this->db->query($sql, [$startDate,$endDeate]);
$result = $query->getResultArray();
return $result;
}
public function addOrEditPowerConsumptionDetails()
{
$electricMachineTableData = json_decode($this->request->getPost('electricMachineTableData'), true);
$transformedData = [];
foreach ($electricMachineTableData 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_units' => 0.00,
'closing_units' => 0.00,
'total_units' => 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);
}
$existingRow = $this->powerConsumptionDetails_model->where('date', $row['date'])->where('machine_id', $row['machine_id'])->first();
if ($existingRow) {
$this->powerConsumptionDetails_model->update($existingRow['id'], $row);
} else {
$this->powerConsumptionDetails_model->insert($row);
}
}

25
app/Models/PowerConsumptionDetails.php Normal file
View File

@ -0,0 +1,25 @@
<?php
namespace App\Models;
use CodeIgniter\Model;
class PowerConsumptionDetails extends Model
{
protected $table = 't_powerConsumptionDetails';
protected $primaryKey = 'id';
protected $allowedFields = [
'date',
'machine_id',
'opening_units',
'closing_units',
'total_units'
];
protected $useTimestamps = true;
protected $createdField = 'created_at';
protected $updatedField = 'updated_at';
}

11
app/Views/factoryDieselMachineDetails.php
View File

@ -7,7 +7,6 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
}
.fht-table,
.fht-table thead,
.fht-table tfoot,
@ -255,7 +254,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
<div class="card">
<div class="card-body">
<div class="card-body" >
<form action="<?= base_url('factoryVehicleDieselDetails'); ?>" method="post">
@ -338,7 +337,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
</tr>
</thead>
<tbody>
<tbody >
<?php foreach ($dieselConsumptionDetails as $key => $row): ?>
<tr id="<?php echo $key + 1; ?>">
<?php foreach ($columns as $index => $column): ?>
@ -386,7 +385,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
</tr>
<?php endforeach; ?>
</tbody>
</table>
@ -630,10 +629,6 @@ function navigateToMachine() {
const cell = targetRow.cells[i];
if (cell) {
// Scroll the table to ensure the highlighted cell is visible
// table.scrollTop = targetRow.offsetTop - table.clientHeight / 2; // Adjust vertical scroll
// table.scrollLeft = cell.offsetLeft - table.clientWidth / 2; // Adjust horizontal scroll
cell.style.transition = "background-color 0.5s";
cell.style.backgroundColor = "#df9675";

2
app/Views/includes/new_header.php
View File

@ -775,6 +775,8 @@
<a href="<?php echo base_url(); ?>factoryVehicleDieselDetails" class="dropdown-item"><i class="ri-file-info-line align-middle mr-1"></i>Diesel - Factory Vehicle </a>
<a href="<?php echo base_url(); ?>powerConsumptionDetails" class="dropdown-item"><i class="ri-file-info-line align-middle mr-1"></i>Power Consumption </a>
<a href="<?php echo base_url(); ?>bagStockDetails" class="dropdown-item"><i class="ri-file-info-line align-middle mr-1"></i>Bag Stock Details</a>
</div>
</div>

541
app/Views/powerConsumptionDetails.php Normal file
View File

@ -0,0 +1,541 @@
<?php
$datefordropdown = format_date($datefordropdown, 0, 'M-Y');
?>
<style type="text/css">
.num {
text-align: right;
}
.fht-table,
.fht-table thead,
.fht-table tfoot,
.fht-table tbody,
.fht-table tr,
.fht-table th,
.fht-table td {
margin: 0;
}
.fht-table td {
text-align: center;
}
.fht-table td:hover {
background-color: #41a1c8;
color: #ffffff;
}
.fht-table {
border: 0 none;
height: auto;
width: auto;
border-collapse: collapse;
border-spacing: 0;
/*table-layout: fixed; Algoritmo de distribucion fijo */
white-space: nowrap;
}
.fht-table th,
.fht-table td {
overflow: hidden;
}
.fht-table-wrapper,
.fht-table-wrapper .fht-thead,
.fht-table-wrapper .fht-tfoot,
.fht-table-wrapper .fht-fixed-column .fht-tbody,
.fht-table-wrapper .fht-fixed-body .fht-tbody,
.fht-table-wrapper .fht-tbody {
overflow: hidden;
position: relative;
}
.fht-table-wrapper .fht-fixed-body .fht-tbody,
.fht-table-wrapper .fht-tbody {
overflow: auto;
}
.fht-table-wrapper .fht-table .fht-cell {
overflow: hidden;
height: 1px;
}
.fht-table-wrapper .fht-fixed-column,
.fht-table-wrapper .fht-fixed-body {
top: 0;
left: 0;
position: absolute;
}
.fht-table-wrapper .fht-fixed-column {
z-index: 1;
}
.fht-fixed-body .fht-thead table {
margin-right: 20px;
border: 0 none;
}
/*For Examples*/
.ContenedorTabla {
height: 500px;
margin: 0 auto;
overflow: auto;
width: auto;
position: relative;
}
.header,
.main {
display: inline-block;
height: auto;
width: 100%;
}
.titulosHeader {
border-bottom: 1px solid #e8bb25;
height: auto;
margin-bottom: 10px;
padding-bottom: 8px;
padding-top: 8px;
width: 100%;
}
.celda_encabezado_general {
background-color: #00a65a;
border: 1px solid #ccc;
color: #ffffff;
font-weight: bold;
padding: 2px 4px;
text-align: center;
}
._Separador {
background-color: #fff;
height: 12px;
border-left: 1px solid #ccc;
border-right: 1px solid #ccc;
width: 7px;
}
._Separador div {
width: 4px;
}
.celda_normal {
border: 1px solid #ccc;
padding: 2px 4px;
}
/*style excel*/
.excel_cell {
border: 1px solid #CCC;
color: #222;
text-align: center;
font-size: 13px;
font-weight: normal;
padding: 4px;
white-space: pre-line;
empty-cells: show;
}
._cell_header {
background-color: #EEE;
}
._cell_Default {
background-color: #FFF;
text-align: left;
}
.excel_cell div {
width: 30px;
height: 20px;
}
#electricMachineTable th:nth-child(1),
#electricMachineTable td:nth-child(1) {
position: sticky;
left: 0;
background-color: #00a65a;
z-index: 2;
border-right: 2px solid #ddd;
color: #ffffff;
}
</style>
<div class="modal fade" id="bs-example-modal-lg" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="myLargeModalLabel">Navigation Options</h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
</div>
<div class="modal-body">
<div class="row">
<!-- Machine Dropdown -->
<div class="col-md-6">
<div class="form-group">
<label for="machineDropdown">Select Machine</label>
<select id="machineDropdown" class="form-control">
<option value="">Select Machine</option>
<?php foreach ($machineName as $name): ?>
<option value="<?= $name; ?>"><?= $name; ?></option>
<?php endforeach; ?>
</select>
</div>
</div>
<!-- Date Dropdown -->
<div class="col-md-6">
<div class="form-group">
<label for="dateDropdown">Select Date</label>
<select id="dateDropdown" class="form-control">
<option value="01-11-2024">01-11-2024</option>
<option value="02-11-2024">02-11-2024</option>
<option value="10-11-2024">10-11-2024</option>
<option value="15-11-2024">15-11-2024</option>
<option value="25-11-2024">25-11-2024</option>
<option value="30-11-2024">30-11-2024</option>
</select>
</div>
</div>
</div>
<button class="btn btn-primary float-right" onclick="navigateToMachine()">Navigate</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<div class="content-page">
<div class="content">
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div>
<div class="row">
<div class="col-6">
<div class="page-title-box page-title-box-alt">
<div class="page-title-right">
<ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="javascript: void(0);">Stocks</a></li>
<li class="breadcrumb-item active">
<h4 class="page-title">Diesel - Factory Vehicle Details</h4>
</li>
</ol>
</div>
</div>
</div>
<div class="col-6 text-right">
<!-- Right-aligned buttons or links can be added here -->
</div>
</div>
<div class="row">
<div class="col-12">
<div class="card">
<div class="card-body" >
<form action="<?= base_url('factoryVehicleDieselDetails'); ?>" method="post">
<div class="row">
<div class="col-2">
<?php $today = date('M-Y'); ?>
<input type="text" name="month" id="month"
value="<?php echo $datefordropdown; ?>" class="form-control"
data-provide="datepicker" data-date-format="M-yyyy"
data-date-min-view-mode="1">
</div>
<div class="col-2">
<input type="submit" value="Change Month" class="btn btn-success"
style="margin-top:0px;">
</div>
<div class="col-2">
</div>
<div class="col-6">
<div class="dropdown float-right">
<a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown"
aria-expanded="false">
<i class="mdi mdi-dots-vertical m-0 text-muted h3"></i>
</a>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a>
<a class="dropdown-item" href="#">Export</a>
</div>
</div>
</div>
</div>
</form>
<!-- Add table-responsive for horizontal scroll -->
<div class="table-responsive">
<?php
$columns = array_keys($powerConsumptionDetails[0]);
function formatHeader($key)
{
$parts = explode('_', $key);
if (is_numeric(end($parts))) { array_pop($parts); }
return ucwords(implode(' ', $parts));
}
?>
<table id="electricMachineTable" class="fht-table table-striped"
style="font-size: small;">
<thead>
<tr>
<th class="celda_encabezado_general" style="padding: 10px;"></th>
<?php foreach ($machineName as $name): ?>
<th class="celda_encabezado_general" colspan="3" data-id="<?= $name; ?>"
style="padding: 10px;"><?= $name; ?></th>
<?php endforeach; ?>
</tr>
</thead>
<thead>
<tr>
<?php foreach ($columns as $column): ?>
<th class="celda_encabezado_general" style="padding: 10px;"
id="<?= $column ?>"><?= formatHeader($column) ?></th>
<?php endforeach; ?>
</tr>
</thead>
<tbody >
<?php foreach ($powerConsumptionDetails 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 Units'): ?>
<td class="celda_normal" <?= ($key == 0) ? 'contenteditable="true"' : ''; ?> style="padding: 5px;"><?= $row[$column] ?? 'N/A' ?></td>
<?php elseif(formatHeader($column) == 'Closing Units'): ?>
<td class="celda_normal" contenteditable="true" onkeyup="calculateTotalUnits(this.parentNode.id,this.textContent);" style="padding: 5px;"><?= $row[$column] ?? 'N/A' ?></td>
<?php else : ?>
<td class="celda_normal" style="padding: 5px;"><?= $row[$column] ?? 'N/A' ?></td>
<?php endif; ?>
<?php endforeach; ?>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div><!-- End table-responsive -->
<div class="row">
<div class="col-md-12 text-right">
<input type="button" class="btn btn-success" id="save" value="save">
</div>
</div>
</div>
</div> <!-- End card-body -->
</div> <!-- End card -->
</div> <!-- End col -->
</div> <!-- End row -->
</div>
</div> <!-- End container-fluid -->
</div>
</div>
<script type="text/javascript">
$(document).ready(function() {
$('#save').click(function() {
// Get headers from the second <thead> as keys
var headers = [];
$("#electricMachineTable thead:nth-child(2) th").each(function() {
headers.push($(this).attr("id"));
});
// Convert table to JSON using custom headers as keys
var tableData = [];
$("#electricMachineTable 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: {
electricMachineTableData: jsonData,
},
type: "POST",
url: "<?php echo base_url() ?>/addOrEditPowerConsumptionDetails",
success: function(data) {
if (data) {
$('#loader').hide();
alert(data);
}
}
});
});
});
</script>
<script>
function openingReading(parentId, textContent) {
}
function calculateTotalUnits(parentId, textContent) {
var tr = $('#' + parentId);
var currentTd = $(event.target);
var tdIndex = currentTd.index();
// Total Units calculation
closingUnits = currentTd.text();
openingUnits = tr.find('td:eq(' + (tdIndex - 1) + ')').text();
totalUnits = closingUnits - openingUnits;
if (totalUnits != NaN && totalUnits != Infinity)
tr.find('td:eq(' + (tdIndex + 1) + ')').text(totalUnits.toFixed(2));
//next opening reading
nextTrIndex = parseInt(parentId, 10) + 1
var nexttr = $('#' + nextTrIndex);
nexttr.find('td:eq(' + (tdIndex - 1) + ')').text(textContent);
}
function navigateToMachine() {
$('.close').click();
const machineDropdown = document.getElementById('machineDropdown');
const dateDropdown = document.getElementById('dateDropdown');
const selectedMachine = machineDropdown.value;
const selectedDate = dateDropdown.value;
const table = document.getElementById('electricMachineTable');
const headerCells = table.querySelectorAll('thead tr:nth-child(1) th');
const rows = table.querySelectorAll('tbody tr');
let targetColumnIndex = -1;
headerCells.forEach((header, index) => {
if (header.getAttribute('data-id') === selectedMachine) {
targetColumnIndex = index;
}
});
if (targetColumnIndex === -1) {
console.log("Machine column not found.");
return;
}
let targetRow = null;
rows.forEach(row => {
const dateCell = row.querySelector('td:first-child');
if (dateCell && dateCell.textContent.trim() === selectedDate) {
targetRow = row;
}
});
if (!targetRow) {
console.log("Date row not found.");
return;
}
targetColumnIndex = targetColumnIndex - 1;
targetColumnIndex = targetColumnIndex * 3;
targetColumnIndex = targetColumnIndex + 1;
targetRow.cells[targetColumnIndex].scrollIntoView({
behavior: 'smooth',
inline: 'center',
block: 'center'
});
const highlightDuration = 10000;
for (let i = targetColumnIndex; i < targetColumnIndex + 3; i++) {
const cell = targetRow.cells[i];
if (cell) {
cell.style.transition = "background-color 0.5s";
cell.style.backgroundColor = "#df9675";
setTimeout(() => {
cell.style.backgroundColor = "";
}, highlightDuration);
}
}
}
</script>