diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php
index 08de9d9d..a16a4e52 100644
--- a/app/Controllers/StockController.php
+++ b/app/Controllers/StockController.php
@@ -1717,12 +1717,14 @@ class StockController extends BaseController
- $data['trpProductionDetails'] = $this->TrpProduction_model->trpProductionDetails($startDate,$endDate);
+ $result = $this->TrpProduction_model->trpProductionDetails($startDate,$endDate);
+ $data['trpProductionDetails'] = $result[0] ;
- // dd($data['trpProductionDetails']);
+ $data['crsClientList'] = $result[1] ;
+
+ $data['wcsSupplierList'] = $result[2] ;
- // dd($this->db->getLastQuery());
$date = DateTime::createFromFormat('Y-m', $month);
@@ -1737,8 +1739,6 @@ class StockController extends BaseController
return $this->loadViews("stock/trpProductionStockDetails", $this->global, $data, NULL);
-
-
}
diff --git a/app/Models/TrpProductionModel.php b/app/Models/TrpProductionModel.php
index 8cf96e23..0b498b98 100644
--- a/app/Models/TrpProductionModel.php
+++ b/app/Models/TrpProductionModel.php
@@ -60,7 +60,7 @@ class TrpProductionModel extends Model
// Subquery definition
$subquery = $this->db->table('t_materialmaster')
->select('materialCode')
- ->where('Category = 328')
+ ->where('Category' ,'waste core') //328 - is for waste core in config master
->get()
->getResultArray();
@@ -78,57 +78,65 @@ class TrpProductionModel extends Model
$builder = $this->db->table('t_trpProductionMaintenanceDetails tpmd');
// Select required columns
- $builder->select([
- 'tpmd.date',
- 'tpmd.openingTime',
- 'tpmd.closingTime',
- 'tpmd.totalHours',
- 'tpmd.coldStart',
- 'tpmd.breakdownHours',
- 'tpmd.burnerFiringHours',
- 'tpmd.sandFeedingHours',
- 'tpmd.workingPersonEngineers',
- 'tpmd.workingPersonSupervisiors',
- 'tpmd.workingPersonOperators',
- 'tpmd.rollerDrivers',
- 'tpmd.natureOfMaintenance',
- 'tpmd.location',
- 'tpmd.description',
+ $builder->select(
+ 'tpmd.date,
+ tpmd.openingTime,
+ tpmd.closingTime,
+ tpmd.totalHours,
+ tpmd.coldStart,
+ tpmd.breakdownHours,
+ tpmd.burnerFiringHours,
+ tpmd.sandFeedingHours,
+ tpd.gasReceiptBg,
+ tpd.gasReceiptPg,
+
+
+ tpd.physicalGasConsumption,
+ IFNULL(tdmd.totalGasConsumption, 0) AS drierGasConsumption,
+ IFNULL(tcmd.totalGasConsumption, 0) AS coatingGasConsumption,
+ tpd.trpPlusDrierGasConsumption,
+ tpd.trpPhysicalGasPerTon,
+ tpd.panelGasConsumption,
+ tpd.panelGasPerTon,
+
+ tigrdot.* ,
- 'tpd.gasReceiptBg',
- 'tpd.gasReceiptPg',
- 'tpd.physicalGasConsumption',
- 'tpd.trpPlusDrierGasConsumption',
- 'tpd.trpPhysicalGasPerTon',
- 'tpd.panelGasConsumption',
- 'tpd.panelGasPerTon',
- 'tpd.edRunningHours',
- 'tpd.edProduction',
- 'tpd.edUsage',
- 'tpd.trpProduction',
- 'tpd.trpProductionPerHour',
- 'tpd.waterReceipt',
- 'tpd.waterConsumption',
- 'tpd.ebReading',
- 'tpd.ebReadingPerUnitTon',
-
- 'tpwd.msSeperation',
- 'tpwd.edWaste',
- 'tpwd.coolerBags',
- 'tpwd.edPlus20Waste',
- 'tpwd.cycloneWaste',
+ tpd.edRunningHours,
+ tpd.edProduction,
+ tpd.edUsage,
- // Aggregated gas consumption
- 'IFNULL(tcmd.totalGasConsumption, 0) AS coatingGasConsumption',
- 'IFNULL(tdmd.totalGasConsumption, 0) AS drierGasConsumption',
+ tpd.trpProduction,
+ tpd.trpProductionPerHour,
- 'tsu.total_kgs AS coating' ,
-
- 'tigrdot.*',
- 'invItems.*'
+ tsu.total_kgs AS coating,
+ invItems.* ,
+ tpd.waterReceipt,
+ tpd.waterConsumption,
+ tpd.ebReading,
+ tpd.ebReadingPerUnitTon,
- ]);
+
+ tpmd.workingPersonEngineers,
+ tpmd.workingPersonSupervisiors,
+ tpmd.workingPersonOperators,
+ tpmd.rollerDrivers,
+ tpmd.natureOfMaintenance,
+ tpmd.location,
+ tpmd.description,
+
+ tpwd.msSeperation,
+ tpwd.edWaste,
+ tpwd.coolerBags,
+ tpwd.edPlus20Waste,
+ tpwd.cycloneWaste,
+
+
+
+'
+
+ );
+
// Join with other tables
$builder->join('t_trpProductionDetails tpd', 'tpd.date = tpmd.date', 'inner');
@@ -170,26 +178,27 @@ class TrpProductionModel extends Model
$crsClientList = array_column($crsClientList, 'client_name');
// Initialize an empty array for dynamic SQL conditions
- $caseStatements = [];
+ $caseStatementsCrs = [];
// Loop through the client list and build dynamic SUM(CASE WHEN...)
- foreach ($crsClientList as $client) {
- // Escape column name (remove spaces and special characters)
- $safeClient = str_replace(' ', '_', $client);
-
+ foreach ($crsClientList as $index => $client) {
+
+ $crsClientList[$index] = $client."_crs";
+ $clientCrs = $client."_crs";
+
// Add the condition to the array
- $caseStatements[] = "SUM(CASE WHEN clients.client_name = " . $this->db->escape($client) . " THEN invItems.item_quantity ELSE 0 END) AS `$safeClient`";
+ $caseStatementsCrs[] = "SUM(CASE WHEN clients.client_name = " . $this->db->escape($client) . " THEN invItems.item_quantity ELSE 0 END) AS `$clientCrs`";
}
// Convert array to a comma-separated string
- $caseSQL = implode(', ', $caseStatements);
+ $caseSQLCrs = implode(', ', $caseStatementsCrs);
$subquery3 = $this->db->table('ip_invoice_items invItems')
->select([
'invItems.item_date_added',
- $caseSQL
+ $caseSQLCrs
])
->join('ip_invoices inv', 'inv.invoice_id = invItems.invoice_id', 'left')
->join('ip_clients clients', 'clients.client_id = inv.client_id', 'left')
@@ -210,19 +219,46 @@ class TrpProductionModel extends Model
$materialCodes = ! empty($materialCodes) ? $materialCodes : ['600374','600422','600434'];
-
+
+
+ $wcsSupplierList = $this->db->table('t_igr_details tigrd')
+ ->distinct()
+ ->select('ts.SupplierName as supplierName')
+ ->join('t_igr_master tigm', 'tigm.IGRNo = tigrd.IGRNo', 'left')
+ ->join('t_purchaseorder_master tpom', 'tpom.PONO = tigm.PONO', 'left')
+ ->join('t_supplierdetailsn ts', 'tpom.SupplierID = ts.SupplierID', 'left')
+ ->whereIn('tigrd.MaterialCode', $materialCodes)
+ ->where('tigrd.CreatedDate >=', $startDate)
+ ->where('tigrd.CreatedDate <=', $endDate)
+ ->groupBy('DATE(tigrd.CreatedDate)')
+ ->get()
+ ->getResultArray();
+
+
+ $wcsSupplierList = array_column($wcsSupplierList, 'supplierName');
+
+ // Initialize an empty array for dynamic SQL conditions
+ $caseStatementsWcs = [];
+
+ // Loop through the client list and build dynamic SUM(CASE WHEN...)
+ foreach ($wcsSupplierList as $index => $supplier) {
+
+ $wcsSupplierList[$index] = $supplier."_wcs";
+ $supplierWcs = $supplier."_wcs";
+
+ // Add the condition to the array
+ $caseStatementsWcs[] = "SUM(CASE WHEN ts.SupplierName = " . $this->db->escape($supplier) . " THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS `$supplierWcs` ";
+ }
+
+ // Convert array to a comma-separated string
+ $caseSQLWcs = implode(', ', $caseStatementsWcs);
+
// Subquery: Waste Core Sand Suppliers
$subquery4 = $this->db->table('t_igr_details tigrd')
->select([
'DATE(tigrd.CreatedDate) AS CreatedDate', // Convert CreatedDate to DATE format
- "SUM(CASE WHEN ts.SupplierName = 'Ashok leyland limited foundry divn-SPU' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS ALs_wcs",
- "SUM(CASE WHEN ts.SupplierName = 'Ashok leyland limited foundry divn-ENU' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS ALe_wcs",
- "SUM(CASE WHEN ts.SupplierName = 'MADRAS ENGINEERING INDUSTRIES PRIVATE LIMITED' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS ME_wcs",
- "SUM(CASE WHEN ts.SupplierName = 'SIDDHARTH INDUSTRIES' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS SI_wcs",
- "SUM(CASE WHEN ts.SupplierName = 'Caparo Engineering India Limited' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS caparo_wcs",
- "SUM(CASE WHEN ts.SupplierName = 'NEMAK ALUMINIUM CASTING INDIA PVT LTD' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS Nemak_wcs",
- "SUM(CASE WHEN ts.SupplierName = 'DR Axion India Private Limited' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS DR_wcs"
+ $caseSQLWcs
])
->join('t_igr_master tigm', 'tigm.IGRNo = tigrd.IGRNo', 'left')
->join('t_purchaseorder_master tpom', 'tpom.PONO = tigm.PONO', 'left')
@@ -254,7 +290,7 @@ class TrpProductionModel extends Model
$query = $builder->get();
$result = $query->getResultArray();
- return $result;
+ return [$result,$crsClientList,$wcsSupplierList];
}
diff --git a/app/Views/stock/trpProductionStockDetails.php b/app/Views/stock/trpProductionStockDetails.php
index 9c863f62..86fff64e 100644
--- a/app/Views/stock/trpProductionStockDetails.php
+++ b/app/Views/stock/trpProductionStockDetails.php
@@ -191,7 +191,7 @@
background-color: #50bbd9; /* Green background */
color: #ffffff;
border: 1px solid #ddd;
- padding: 10px;
+ padding: 1px;
white-space: normal; /* Allows text to wrap */
word-wrap: break-word; /* Breaks long words if needed */
text-align: center; /* Centers text for better alignment */
@@ -221,11 +221,15 @@
max-width: 100px;
}
+ .location{
+ min-width:200px;
+ min-height: 200px;
+ }
-
-
-
-
+ .description{
+ min-width:400px;
+ min-height: 200px;
+ }
@@ -264,7 +268,7 @@ foreach ($period as $day) {
$timeOptions = [];
foreach (["AM", "PM"] as $meridian) {
- for ($hour = 0; $hour < 12; $hour++) {
+ for ($hour = 0; $hour < 12; $hour++) {
for ($minute = 0; $minute < 60; $minute += 15) {
$formattedHour = $hour === 0 ? 12 : $hour;
$timeOptions[] = sprintf("%02d:%02d %s", $formattedHour, $minute, $meridian);
@@ -380,13 +384,25 @@ $timeOtions[] = "12:00 AM";
| Panel Gas Per Ton |
- Incoming Sand/ Lump details |
+
+ 0){?>
+ Incoming Sand/ Lump details |
+
+
ED details |
TRP Sand |
+
+ Coating |
+
- Usage |
+
+ 0){?>
+ Usage |
+
+
+
Water |
@@ -408,8 +424,7 @@ $timeOtions[] = "12:00 AM";
ED +20 Waste |
- Cyclone Waste |
-
+ Cyclone Waste |
@@ -420,20 +435,16 @@ $timeOtions[] = "12:00 AM";
BG |
PG |
-
- AL(S) |
-
- AL(E) |
-
- ME |
-
- SI |
-
- caparo |
-
- Nemak |
-
- DR |
+
+
+
+
+
+ |
+
+
+
+
Running Hours |
@@ -445,17 +456,16 @@ $timeOtions[] = "12:00 AM";
Production Per Hour |
- Coating |
-
- Hindhuja |
-
- Nemak |
-
- ME |
-
- BI |
-
- Karmen |
+
+
+
+
+
+
+ |
+
+
+
Receipt |
@@ -485,8 +495,8 @@ $timeOtions[] = "12:00 AM";
@@ -555,14 +565,14 @@ $timeOtions[] = "12:00 AM";
+ data-id=" totalHours">
|
@@ -667,56 +677,18 @@ $timeOtions[] = "12:00 AM";
|
-
-
-
-
- |
+
-
-
-
-
- |
+
-
-
-
-
- |
-
-
-
-
-
- |
-
-
-
-
-
- |
+
+
+
+ |
-
-
-
-
- |
-
-
-
-
-
- |
+
@@ -747,7 +719,7 @@ $timeOtions[] = "12:00 AM";
@@ -767,40 +739,22 @@ $timeOtions[] = "12:00 AM";
|
-
-
-
-
+
+
+
+
+
+
+
+ |
+
|
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
+
+
+
+
@@ -942,8 +896,11 @@ $timeOtions[] = "12:00 AM";
$eachDate = $trpProductionDetail['date']; // Unique identifier
+
+
// Initialize the date entry if it doesn't exist
if (!isset($summary['totalHours'])) {
+
$summary = [
'totalHours' => 0,
'coldStart' => 0,
@@ -959,24 +916,12 @@ $timeOtions[] = "12:00 AM";
'trpPhysicalGasPerTon' => 0,
'panelGasConsumption' => 0,
'panelGasPerTon' => 0,
- 'ALs_wcs' => 0,
- 'ALe_wcs' => 0,
- 'ME_wcs' => 0,
- 'SI_wcs' => 0,
- 'caparo_wcs' => 0,
- 'Nemak_wcs' => 0,
- 'DR_wcs' => 0,
'edRunningHours' => 0,
'edProduction' => 0,
'edUsage' => 0,
'trpProduction' => 0,
'trpProductionPerHour' => 0,
'coating' => 0,
- 'ALs_crs' => 0,
- 'Nemak_crs' => 0,
- 'ME_crs' => 0,
- 'BI_crs' => 0,
- 'Karmen_crs' => 0,
'waterReceipt' => 0,
'waterConsumption' => 0,
'ebReading' => 0,
@@ -991,6 +936,15 @@ $timeOtions[] = "12:00 AM";
'cycloneWaste' => 0
];
+
+ foreach($crsClientList as $client){
+ $summary[$client] = 0;
+ }
+
+ foreach($wcsSupplierList as $supplier){
+ $summary[$supplier] = 0;
+ }
+
}
// Sum values for the material
@@ -1009,24 +963,22 @@ $timeOtions[] = "12:00 AM";
$summary['trpPhysicalGasPerTon'] += is_numeric($trpProductionDetail['trpPhysicalGasPerTon']) ? $trpProductionDetail['trpPhysicalGasPerTon'] : 0;
$summary['panelGasConsumption'] += is_numeric($trpProductionDetail['panelGasConsumption']) ? $trpProductionDetail['panelGasConsumption'] : 0;
$summary['panelGasPerTon'] += is_numeric($trpProductionDetail['panelGasPerTon']) ? $trpProductionDetail['panelGasPerTon'] : 0;
- $summary['ALs_wcs'] += is_numeric($trpProductionDetail['ALs_wcs']) ? $trpProductionDetail['ALs_wcs'] : 0;
- $summary['ALe_wcs'] += is_numeric($trpProductionDetail['ALe_wcs']) ? $trpProductionDetail['ALe_wcs'] : 0;
- $summary['ME_wcs'] += is_numeric($trpProductionDetail['ME_wcs']) ? $trpProductionDetail['ME_wcs'] : 0;
- $summary['SI_wcs'] += is_numeric($trpProductionDetail['SI_wcs']) ? $trpProductionDetail['SI_wcs'] : 0;
- $summary['caparo_wcs'] += is_numeric($trpProductionDetail['caparo_wcs']) ? $trpProductionDetail['caparo_wcs'] : 0;
- $summary['Nemak_wcs'] += is_numeric($trpProductionDetail['Nemak_wcs']) ? $trpProductionDetail['Nemak_wcs'] : 0;
- $summary['DR_wcs'] += is_numeric($trpProductionDetail['DR_wcs']) ? $trpProductionDetail['DR_wcs'] : 0;
+
+ foreach($wcsSupplierList as $supplier){
+ $summary[$supplier] += is_numeric($trpProductionDetail[$supplier]) ? $trpProductionDetail[$supplier] : 0;
+ }
+
$summary['edRunningHours'] += is_numeric($trpProductionDetail['edRunningHours']) ? $trpProductionDetail['edRunningHours'] : 0;
$summary['edProduction'] += is_numeric($trpProductionDetail['edProduction']) ? $trpProductionDetail['edProduction'] : 0;
$summary['edUsage'] += is_numeric($trpProductionDetail['edUsage']) ? $trpProductionDetail['edUsage'] : 0;
$summary['trpProduction'] += is_numeric($trpProductionDetail['trpProduction']) ? $trpProductionDetail['trpProduction'] : 0;
$summary['trpProductionPerHour'] += is_numeric($trpProductionDetail['trpProductionPerHour']) ? $trpProductionDetail['trpProductionPerHour'] : 0;
$summary['coating'] += is_numeric($trpProductionDetail['coating']) ? $trpProductionDetail['coating'] : 0;
- $summary['ALs_crs'] += is_numeric($trpProductionDetail['ALs_crs']) ? $trpProductionDetail['ALs_crs'] : 0;
- $summary['Nemak_crs'] += is_numeric($trpProductionDetail['Nemak_crs']) ? $trpProductionDetail['Nemak_crs'] : 0;
- $summary['ME_crs'] += is_numeric($trpProductionDetail['ME_crs']) ? $trpProductionDetail['ME_crs'] : 0;
- $summary['BI_crs'] += is_numeric($trpProductionDetail['BI_crs']) ? $trpProductionDetail['BI_crs'] : 0;
- $summary['Karmen_crs'] += is_numeric($trpProductionDetail['Karmen_crs']) ? $trpProductionDetail['Karmen_crs'] : 0;
+
+ foreach($crsClientList as $client){
+ $summary[$client] += is_numeric($trpProductionDetail[$client]) ? $trpProductionDetail[$client] : 0;
+ }
+
$summary['waterReceipt'] += is_numeric($trpProductionDetail['waterReceipt']) ? $trpProductionDetail['waterReceipt'] : 0;
$summary['waterConsumption'] += is_numeric($trpProductionDetail['waterConsumption']) ? $trpProductionDetail['waterConsumption'] : 0;
$summary['ebReading'] += is_numeric($trpProductionDetail['ebReading']) ? $trpProductionDetail['ebReading'] : 0;
@@ -1081,14 +1033,26 @@ $timeOtions[] = "12:00 AM";
Panel Gas Consumption |
Panel Gas Per Ton |
+
- Incoming Sand/ Lump details |
+
+ 0){?>
+ Incoming Sand/ Lump details |
+
+
ED details |
TRP Sand |
+
+ Coating |
+
- Usage |
+
+ 0){?>
+ Usage |
+
+
Water |
@@ -1111,7 +1075,7 @@ $timeOtions[] = "12:00 AM";
ED +20 Waste |
Cyclone Waste |
-
+
@@ -1122,20 +1086,13 @@ $timeOtions[] = "12:00 AM";
BG |
PG |
-
- AL(S) |
-
- AL(E) |
-
- ME |
-
- SI |
-
- caparo |
-
- Nemak |
-
- DR |
+
+
+
+ |
+
+
+
Running Hours |
@@ -1147,17 +1104,16 @@ $timeOtions[] = "12:00 AM";
Production Per Hour |
- Coating |
+
- Hindhuja |
-
- Nemak |
-
- ME |
-
- BI |
-
- Karmen |
+
+
+
+ |
+
+
+
+
Receipt |
@@ -1296,48 +1252,14 @@ $timeOtions[] = "12:00 AM";
-
-
-
-
- |
-
-
-
-
- |
+
+
+
+ |
+
-
-
-
-
- |
-
-
-
-
-
- |
-
-
-
-
-
- |
-
-
-
-
-
-
- |
-
-
-
-
-
- |
@@ -1377,32 +1299,14 @@ $timeOtions[] = "12:00 AM";
-
-
-
-
- |
+
+
+
+
+ |
+
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
@@ -1461,13 +1365,13 @@ $timeOtions[] = "12:00 AM";
-
+ |
|
-
+ |
|
@@ -1572,7 +1476,7 @@ $timeOtions[] = "12:00 AM";
-
+
@@ -1654,42 +1558,42 @@ $timeOtions[] = "12:00 AM";
const rowData = {
- Date : rowCells.eq(0).text().trim() ,
+ Date : rowCells.eq(0).text().trim() ,
openingTime : openingTime ,
closingTime : closingTime ,
- totalHours : rowCells.eq(3).text().trim() ,
- coldStart : rowCells.eq(4).text().trim() ,
- breakdownHours : rowCells.eq(5).text().trim() ,
- burnerFiringHours : rowCells.eq(6).text().trim() ,
- sandFeedingHours : rowCells.eq(7).text().trim() ,
- gasReceiptBg : rowCells.eq(8).text().trim() ,
- gasReceiptPg : rowCells.eq(9).text().trim() ,
- physicalGasConsumption : rowCells.eq(10).text().trim() ,
- trpPlusDrierGasConsumption : rowCells.eq(13).text().trim() ,
- trpPhysicalGasPerTon : rowCells.eq(14).text().trim() ,
- panelGasConsumption : rowCells.eq(15).text().trim() ,
- panelGasPerTon : rowCells.eq(16).text().trim() ,
- edRunningHours : rowCells.eq(24).text().trim() ,
- edProduction : rowCells.eq(25).text().trim() ,
- edUsage : rowCells.eq(26).text().trim() ,
- waterConsumption : rowCells.eq(26).text().trim() ,
- trpProduction : rowCells.eq(27).text().trim() ,
- trpProductionPerHour : rowCells.eq(28).text().trim() ,
- waterReceipt : rowCells.eq(35).text().trim() ,
- ebReading : rowCells.eq(37).text().trim() ,
- ebReadingPerUnitTon : rowCells.eq(38).text().trim() ,
- workingPersonEngineers : rowCells.eq(39).text().trim() ,
- workingPersonSupervisiors : rowCells.eq(40).text().trim() ,
- workingPersonOperators : rowCells.eq(41).text().trim() ,
- rollerDrivers : rowCells.eq(42).text().trim() ,
- natureOfMaintenance : rowCells.eq(43).text().trim() ,
- location : rowCells.eq(44).text().trim() ,
- description : rowCells.eq(45).text().trim() ,
- msSeperation : rowCells.eq(46).text().trim() ,
- edWaste : rowCells.eq(47).text().trim() ,
- coolerBags : rowCells.eq(48).text().trim() ,
- edPlus20Waste : rowCells.eq(49).text().trim() ,
- cycloneWaste : rowCells.eq(50).text().trim()
+ totalHours : $(this).find(`td[data-id='${dateInYmD} totalHours']`),
+ coldStart : $(this).find(`td[data-id='${dateInYmD} coldStart']`) ,
+ breakdownHours : $(this).find(`td[data-id='${dateInYmD} breakdownHours']`) ,
+ burnerFiringHours : $(this).find(`td[data-id='${dateInYmD} burnerFiringHours']`) ,
+ sandFeedingHours : $(this).find(`td[data-id='${dateInYmD} sandFeedingHours']`) ,
+ gasReceiptBg : $(this).find(`td[data-id='${dateInYmD} gasReceiptBg']`) ,
+ gasReceiptPg : $(this).find(`td[data-id='${dateInYmD} gasReceiptPg']`) ,
+ physicalGasConsumption : $(this).find(`td[data-id='${dateInYmD} physicalGasConsumption']`) ,
+ trpPlusDrierGasConsumption : $(this).find(`td[data-id='${dateInYmD} trpPlusDrierGasConsumption']`) ,
+ trpPhysicalGasPerTon : $(this).find(`td[data-id='${dateInYmD} trpPhysicalGasPerTon']`) ,
+ panelGasConsumption : $(this).find(`td[data-id='${dateInYmD} panelGasConsumption']`) ,
+ panelGasPerTon : $(this).find(`td[data-id='${dateInYmD} panelGasPerTon']`) ,
+ edRunningHours : $(this).find(`td[data-id='${dateInYmD} edRunningHours']`) ,
+ edProduction : $(this).find(`td[data-id='${dateInYmD} edProduction']`) ,
+ edUsage : $(this).find(`td[data-id='${dateInYmD} edUsage']`) ,
+ waterConsumption : $(this).find(`td[data-id='${dateInYmD} waterConsumption']`) ,
+ trpProduction : $(this).find(`td[data-id='${dateInYmD} trpProduction']`) ,
+ trpProductionPerHour : $(this).find(`td[data-id='${dateInYmD} trpProductionPerHour']`) ,
+ waterReceipt : $(this).find(`td[data-id='${dateInYmD} waterReceipt']`) ,
+ ebReading : $(this).find(`td[data-id='${dateInYmD} ebReading']`) ,
+ ebReadingPerUnitTon : $(this).find(`td[data-id='${dateInYmD} ebReadingPerUnitTon']`) ,
+ workingPersonEngineers : $(this).find(`td[data-id='${dateInYmD} workingPersonEngineers']`) ,
+ workingPersonSupervisiors : $(this).find(`td[data-id='${dateInYmD} workingPersonSupervisiors']`) ,
+ workingPersonOperators : $(this).find(`td[data-id='${dateInYmD} workingPersonOperators']`) ,
+ rollerDrivers : $(this).find(`td[data-id='${dateInYmD} rollerDrivers']`) ,
+ natureOfMaintenance : $(this).find(`td[data-id='${dateInYmD} natureOfMaintenance']`) ,
+ location : $(this).find(`td[data-id='${dateInYmD} location']`) ,
+ description : $(this).find(`td[data-id='${dateInYmD} description']`) ,
+ msSeperation : $(this).find(`td[data-id='${dateInYmD} msSeperation']`) ,
+ edWaste : $(this).find(`td[data-id='${dateInYmD} edWaste']`) ,
+ coolerBags : $(this).find(`td[data-id='${dateInYmD} coolerBags']`) ,
+ edPlus20Waste : $(this).find(`td[data-id='${dateInYmD} edPlus20Waste']`) ,
+ cycloneWaste : $(this).find(`td[data-id='${dateInYmD} cycloneWaste']`) ,
};
@@ -1778,38 +1682,57 @@ $timeOtions[] = "12:00 AM";
let tr = $(tdElement).closest('tr');
+ let date = tr.find('td:eq(0)').text().trim() ;
- let totalHours = validateInput(tr.find('td:eq(3)').text().trim()) ?? 0;
- let coldStart = validateInput(tr.find('td:eq(4)').text().trim()) ?? 0;
- let breakdownHours = validateInput(tr.find('td:eq(5)').text().trim()) ?? 0;
- let burnerFiringHours = tr.find('td:eq(6)').text().trim() ?? 0;
- let sandFeedingHours = tr.find('td:eq(7)').text().trim() ?? 0;
+ date = `${date.split('-')[2]}-${date.split('-')[1]}-${date.split('-')[0]}`;
+
+ let totalHours = validateInput(document.querySelector(`td.totalHours[data-id="${date} totalHours"]`).innerText) ?? 0;
+
+ let coldStart = validateInput(document.querySelector(`td.coldStart[data-id="${date} coldStart"]`).innerText) ?? 0;
+
+ let breakdownHours = validateInput(document.querySelector(`td.breakdownHours[data-id="${date} breakdownHours"]`).innerText) ?? 0;
+
+ let burnerFiringHours = validateInput(document.querySelector(`td.burnerFiringHours[data-id="${date} burnerFiringHours"]`).innerText) ?? 0;
+
+ let sandFeedingHours = validateInput(document.querySelector(`td.sandFeedingHours[data-id="${date} sandFeedingHours"]`).innerText) ?? 0;
- let gasReceiptBg = tr.find('td:eq(8)').text().trim() ?? 0;
- let gasReceiptPg = tr.find('td:eq(9)').text().trim() ?? 0;
- let physicalGasConsumption = validateInput(tr.find('td:eq(10)').text().trim()) ?? 0;
- let drierGasConsumption = validateInput(tr.find('td:eq(11)').text().trim()) ?? 0;
- let coatingGasConsumption = validateInput(tr.find('td:eq(12)').text().trim()) ?? 0;
- let trpPlusDrierGasConsumption = tr.find('td:eq(13)').text().trim() ?? 0;
- let trpPhysicalGasPerTon = tr.find('td:eq(14)').text().trim() ?? 0;
- let panelGasConsumption = (tr.find('td:eq(15)').text().trim()) ?? 0;
- let panelGasPerTon = tr.find('td:eq(16)').text().trim() ?? 0;
+ let gasReceiptBg = validateInput(document.querySelector(`td.gasReceiptBg[data-id="${date} gasReceiptBg"]`).innerText) ?? 0;
+
+ let gasReceiptPg = validateInput(document.querySelector(`td.gasReceiptPg[data-id="${date} gasReceiptPg"]`).innerText) ?? 0;
+
+ let physicalGasConsumption = validateInput(document.querySelector(`td.physicalGasConsumption[data-id="${date} physicalGasConsumption"]`).innerText) ?? 0;
+
+ let drierGasConsumption = validateInput(document.querySelector(`td.drierGasConsumption[data-id="${date} drierGasConsumption"]`).innerText) ?? 0;
+
+ let coatingGasConsumption = validateInput(document.querySelector(`td.coatingGasConsumption[data-id="${date} coatingGasConsumption"]`).innerText) ?? 0;
+
+ let trpPlusDrierGasConsumption = validateInput(document.querySelector(`td.trpPlusDrierGasConsumption[data-id="${date} trpPlusDrierGasConsumption"]`).innerText) ?? 0;
+
+ let trpPhysicalGasPerTon = validateInput(document.querySelector(`td.trpPhysicalGasPerTon[data-id="${date} trpPhysicalGasPerTon"]`).innerText) ?? 0;
+
+ let panelGasConsumption = validateInput(document.querySelector(`td.panelGasConsumption[data-id="${date} panelGasConsumption"]`).innerText) ?? 0;
+
+ let panelGasPerTon = validateInput(document.querySelector(`td.panelGasPerTon[data-id="${date} panelGasPerTon"]`).innerText) ?? 0;
+
+ let edRunningHours = validateInput(document.querySelector(`td.edRunningHours[data-id="${date} edRunningHours"]`).innerText) ?? 0;
+
+ let edProduction = validateInput(document.querySelector(`td.edProduction[data-id="${date} edProduction"]`).innerText) ?? 0;
+
+ let edUsage = validateInput(document.querySelector(`td.edUsage[data-id="${date} edUsage"]`).innerText) ?? 0;
+
+ let trpProduction = validateInput(document.querySelector(`td.trpProduction[data-id="${date} trpProduction"]`).innerText) ?? 0;
+
+ let trpProductionPerHour = validateInput(document.querySelector(`td.trpProductionPerHour[data-id="${date} trpProductionPerHour"]`).innerText) ?? 0;
+
+ let coating = validateInput(document.querySelector(`td.coating[data-id="${date} coating"]`).innerText) ?? 0;
- let edRunningHours = tr.find('td:eq(24)').text().trim() ?? 0;
- let edProduction = tr.find('td:eq(25)').text().trim() ?? 0;
- let edUsage = tr.find('td:eq(26)').text().trim() ?? 0;
- let trpProduction = validateInput(tr.find('td:eq(27)').text().trim()) ?? 0;
- let trpProductionPerHour = tr.find('td:eq(28)').text().trim() ?? 0;
- let coating = tr.find('td:eq(29)').text().trim() ?? 0;
-
- let ebReading = tr.find('td:eq(37)').text().trim() ?? 0;
- let ebReadingPerUnitTon = tr.find('td:eq(38)').text().trim() ?? 0;
+ let ebReading = validateInput(document.querySelector(`td.ebReading[data-id="${date} ebReading"]`).innerText) ?? 0;
+
+ let ebReadingPerUnitTon = validateInput(document.querySelector(`td.ebReadingPerUnitTon[data-id="${date} ebReadingPerUnitTon"]`).innerText) ?? 0;
-
-
- let result = calculateSandFeedingHours(totalHours, coldStart, breakdownHours, burnerFiringHours);
+ let result = calculateSandFeedingHours(totalHours, coldStart, breakdownHours, burnerFiringHours);
sandFeedingHours = result[0];
@@ -1830,19 +1753,22 @@ $timeOtions[] = "12:00 AM";
// Final updation of value into td
- tr.find('td:eq(7)').text(Number.isNaN(sandFeedingHours) ? " " : sandFeedingHours);
+ document.querySelector(`td.sandFeedingHours[data-id="${date} sandFeedingHours"]`).innerText = isFinite(sandFeedingHours) ? sandFeedingHours : " ";
- tr.find('td:eq(6)').text(Number.isNaN(burnerFiringHours) ? " " : burnerFiringHours);
+ document.querySelector(`td.burnerFiringHours[data-id="${date} burnerFiringHours"]`).innerText = isFinite(burnerFiringHours) ? burnerFiringHours : " ";
- tr.find('td:eq(13)').text(Number.isNaN(trpPlusDrierGasConsumption) ? " " : (trpPlusDrierGasConsumption).toFixed(2));
+ document.querySelector(`td.trpPlusDrierGasConsumption[data-id="${date} trpPlusDrierGasConsumption"]`).innerText = isFinite(trpPlusDrierGasConsumption) ? trpPlusDrierGasConsumption : " ";
- tr.find('td:eq(14)').text(Number.isNaN(trpPhysicalGasPerTon) ? " " : (trpPhysicalGasPerTon).toFixed(2));
+ document.querySelector(`td.trpPhysicalGasPerTon[data-id="${date} trpPhysicalGasPerTon"]`).innerText = isFinite(trpPhysicalGasPerTon) ? (trpPhysicalGasPerTon).toFixed(2) : " ";
- tr.find('td:eq(16)').text(Number.isNaN(panelGasPerTon) ? " " : (panelGasPerTon.toFixed(2)));
+ document.querySelector(`td.sandFeedingHours[data-id="${date} sandFeedingHours"]`).innerText = isFinite(sandFeedingHours) ? sandFeedingHours : " ";
- tr.find('td:eq(28)').text(Number.isNaN(trpProductionPerHour) ? " " : (trpProductionPerHour).toFixed(2));
+ document.querySelector(`td.panelGasPerTon[data-id="${date} panelGasPerTon"]`).innerText = isFinite(panelGasPerTon) ? (panelGasPerTon).toFixed(2) : " ";
+
+ document.querySelector(`td.trpProductionPerHour[data-id="${date} trpProductionPerHour"]`).innerText = isFinite(trpProductionPerHour) ? trpProductionPerHour : " ";
+
+ document.querySelector(`td.ebReadingPerUnitTon[data-id="${date} ebReadingPerUnitTon"]`).innerText = isFinite(ebReadingPerUnitTon) ? (ebReadingPerUnitTon).toFixed(2) : " ";
- tr.find('td:eq(38)').text(Number.isNaN(ebReadingPerUnitTon) ? " " : (ebReadingPerUnitTon).toFixed(2));
@@ -1870,6 +1796,9 @@ $timeOtions[] = "12:00 AM";
var tr = $(this).closest('tr');
+ let date = tr.find('td:eq(0)').text().trim() ;
+
+ date = `${date.split('-')[2]}-${date.split('-')[1]}-${date.split('-')[0]}`;
var trpOnTime = tr.find('.trp_on_time').val();
var trpOffTime = tr.find('.trp_off_time').val();
@@ -1898,7 +1827,7 @@ $timeOtions[] = "12:00 AM";
const totalHours = hours + "." + minutes;
- tr.find('td:eq(3)').text(totalHours);
+ document.querySelector(`td.totalHours[data-id="${date} totalHours"]`).innerText = totalHours;
trpStockChange(this);