-
-
-
-
-
-
-
"
- class="form-control mt-2" >
+
+
"
+ class="form-control mt-2">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -477,9 +533,9 @@ foreach ($period as $day) {
Machine |
-
- Total Diesel
- |
+
+ Total Diesel
+ |
@@ -493,11 +549,11 @@ foreach ($period as $day) {
- | Date |
- Opening |
- Purchase Diesel |
- Filling Diesel |
- Balance Stock |
+ Date |
+ Opening |
+ Purchase Diesel |
+ Filling Diesel |
+ Balance Stock |
@@ -519,11 +575,11 @@ foreach ($period as $day) {
$dieselStockDetails) {
-
+
?>
>
- format('d-m-Y');
- ?>
+ format('d-m-Y');
+ ?>
- |
-
- |
+
+
+ |
-
- oninput="openingTDStockChange(this)"
- contenteditable="true"
-
-
- > |
+
+
+ oninput="openingTDStockChange(this)"
+ contenteditable="true"
+ > |
-
-
+
+ oninput="purchaseTDStockChange(this)"
+ contenteditable="true">
-
+
- |
+
-
+ |
-
+
- |
+
- ">
- if (!isset($summary['totalPurchaseDiesel'])) {
- $summary['opening_diesel'] = '-' ;
- $summary['totalPurchaseDiesel'] = 0 ;
- $summary['totalFillingDiesel'] = 0 ;
- $summary['balanceStock'] = 0 ;
- }
+
- $summary['totalPurchaseDiesel'] += is_numeric($totalDiesel[$groupedDieselMachineStockDetailsIndex]['purchase_diesel'] ) ? $totalDiesel[$groupedDieselMachineStockDetailsIndex]['purchase_diesel'] : 0 ;
- $summary['totalFillingDiesel'] += is_numeric($totalDiesel[$groupedDieselMachineStockDetailsIndex]['total_filling_diesel']) ? $totalDiesel[$groupedDieselMachineStockDetailsIndex]['total_filling_diesel'] : 0 ;
- $summary['balanceStock'] = is_numeric($totalDiesel[$groupedDieselMachineStockDetailsIndex]['balance_stock']) ? $totalDiesel[$groupedDieselMachineStockDetailsIndex]['balance_stock'] : 0 ;
-
- ?>
+
+
+
- $dieselStock) { ?>
+ $dieselStock) { ?>
@@ -614,7 +667,7 @@ foreach ($period as $day) {
|
-
+
|
@@ -626,7 +679,7 @@ foreach ($period as $day) {
oninput="openingReadingChange(this)"
contenteditable="true"
>
-
+
@@ -661,8 +714,7 @@ foreach ($period as $day) {
+ data-id=" ">
@@ -670,249 +722,230 @@ foreach ($period as $day) {
|
-
+
|
- "-" ,
- 'closing_reading' => 0 ,
- 'filling_diesel' => 0 ,
- 'consumption' => 0 ,
- 'running_hours' => 0 ,
- 'mileage' => 0 ,
- ];
- }
+ // Initialize the material entry if it doesn't exist
+ if (!isset($summary["machineId_$machineId"])) {
+ $summary["machineId_$machineId"] = [
+ 'opening_reading' => "-",
+ 'closing_reading' => 0,
+ 'filling_diesel' => 0,
+ 'consumption' => 0,
+ 'running_hours' => 0,
+ 'mileage' => 0,
+ ];
+ }
- // Sum values for the material
-
- $summary["machineId_$machineId"]['opening_reading'] = 0 ;
- $summary["machineId_$machineId"]['closing_reading'] = is_numeric($dieselStock['closing_reading']) ? $dieselStock['closing_reading'] : 0 ;
- $summary["machineId_$machineId"]['filling_diesel'] += is_numeric($dieselStock['filling_diesel']) ? $dieselStock['filling_diesel'] : 0 ;
- $summary["machineId_$machineId"]['consumption'] += is_numeric($dieselStock['consumption']) ? $dieselStock['consumption'] : 0 ;
- $summary["machineId_$machineId"]['running_hours'] += is_numeric($dieselStock['running_hours']) ? $dieselStock['running_hours'] : 0 ;
+ // Sum values for the material
- if($summary["machineId_$machineId"]['running_hours'] > 0){
- $dieselMileage = round(
- $summary["machineId_$machineId"]['consumption'] / $summary["machineId_$machineId"]['running_hours'],
- 2
- );
-
- }else{
- $dieselMileage = 0 ;
- }
+ $summary["machineId_$machineId"]['opening_reading'] = 0;
+ $summary["machineId_$machineId"]['closing_reading'] = is_numeric($dieselStock['closing_reading']) ? $dieselStock['closing_reading'] : 0;
+ $summary["machineId_$machineId"]['filling_diesel'] += is_numeric($dieselStock['filling_diesel']) ? $dieselStock['filling_diesel'] : 0;
+ $summary["machineId_$machineId"]['consumption'] += is_numeric($dieselStock['consumption']) ? $dieselStock['consumption'] : 0;
+ $summary["machineId_$machineId"]['running_hours'] += is_numeric($dieselStock['running_hours']) ? $dieselStock['running_hours'] : 0;
+
+ if ($summary["machineId_$machineId"]['running_hours'] > 0) {
+ $dieselMileage = round(
+ $summary["machineId_$machineId"]['consumption'] / $summary["machineId_$machineId"]['running_hours'],
+ 2
+ );
+ } else {
+ $dieselMileage = 0;
+ }
- $summary["machineId_$machineId"]['mileage'] = is_numeric( $dieselMileage) ? $dieselMileage : 0 ;
+ $summary["machineId_$machineId"]['mileage'] = is_numeric($dieselMileage) ? $dieselMileage : 0;
+ } ?>
-
-
-
-
-
- } ?>
-
-
-
+
+
- |
- Total
- |
+
+ Total
+ |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
-
+
- |
- |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
+ |
+ |
-
+
-
-
+
+
-
-
+
-
- $dateInMonth) { ?>
- $dateInMonth) { ?>
+
format('d-m-Y');
+ if ($dateInMonthDmYFormat === $currentDate) {
+ echo 'style="background: #cef0ad;"';
+ }
+ ?>>
+
+ format('d-m-Y');
+
+ ?>
+
+ |
+
+ |
+
+
+
+
+ oninput="openingTDStockChange(this)"
+ contenteditable="true"
+
+ > |
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+
+ $dieselMachine) {
+ ?>
+
+
+
+
+
+
+ |
+
+
+
+ |
+
+
+
+ oninput="openingReadingChange(this)"
+ contenteditable="true"
+
+ >
format('d-m-Y');
- if ($dateInMonthDmYFormat === $currentDate) {
- echo 'style="background: #cef0ad;"';
+ foreach ($previousMonthDieselMachineStockDetails as $index => $previousMonthDieselMachineStockDetail) {
+ if ($previousMonthDieselMachineStockDetail['machine_id'] == $dieselMachine['id']) {
+ echo $previousMonthDieselMachineStockDetail['closing_reading'];
+ break;
+ }
}
- ?> >
-
- format('d-m-Y');
-
- ?>
-
- |
-
- |
-
-
-
-
- oninput="openingTDStockChange(this)"
- contenteditable="true"
-
-
-
- > |
-
-
-
- |
-
- |
-
-
- |
-
+ ?>
+
+
$dieselMachine) {
- ?>
-
-
- |
-
- |
+ foreach ($previousMonthDieselMachineStockDetails as $index => $previousMonthDieselMachineStockDetail) {
+ if ($previousMonthDieselMachineStockDetail['machine_id'] == $dieselMachine['id']) {
+ echo $previousMonthDieselMachineStockDetail['closing_reading'];
+ break;
+ }
+ }
-
-
- |
+ ?>
+
- |
-
+ |
- oninput="openingReadingChange(this)"
- contenteditable="true"
+ |
-
-
-
-
- >
-
- $previousMonthDieselMachineStockDetail)
- {
- if($previousMonthDieselMachineStockDetail['machine_id'] == $dieselMachine['id']){
- echo $previousMonthDieselMachineStockDetail['closing_reading'] ;
- break;
- }
-
- }
- ?>
-
-
-
-
- $previousMonthDieselMachineStockDetail)
- {
- if($previousMonthDieselMachineStockDetail['machine_id'] == $dieselMachine['id']){
- echo $previousMonthDieselMachineStockDetail['closing_reading'] ;
- break;
- }
-
- }
-
- ?>
- |
-
- |
-
- |
-
- |
-
- |
-
-
+ |
-
+
+
+
-
+
@@ -928,56 +961,10 @@ foreach ($period as $day) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/app/Views/stock/drierMachineDetails.php b/app/Views/stock/drierMachineDetails.php
index b516ec5b..3e2976ef 100644
--- a/app/Views/stock/drierMachineDetails.php
+++ b/app/Views/stock/drierMachineDetails.php
@@ -20,7 +20,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
input[type="date"]::-webkit-calendar-picker-indicator {
- transform: scale(2.0);
+ transform: scale(2.0);
cursor: pointer;
}
@@ -46,15 +46,17 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
}
.fht-table td:hover {
- background-color: rgb(170, 222, 167);
- color:rgb(2, 2, 2);
- transform: scale(1.25); /* Increases size by 25% */
- transition: transform 0.5s ease-in-out; /* Smooth scaling effect */
+ background-color: rgb(170, 222, 167);
+ color: rgb(2, 2, 2);
+ transform: scale(1.25);
+ /* Increases size by 25% */
+ transition: transform 0.5s ease-in-out;
+ /* Smooth scaling effect */
}
.fht-table tr:hover {
- background-color: rgb(170, 222, 167);
- color:rgb(2, 2, 2);
+ background-color: rgb(170, 222, 167);
+ color: rgb(2, 2, 2);
}
.fht-table {
@@ -136,7 +138,8 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
.celda_encabezado_general {
- background-color:rgb(80, 187, 217); /* blue background */
+ background-color: rgb(80, 187, 217);
+ /* blue background */
border: 1px solid #ccc;
color: #ffffff;
font-weight: bold;
@@ -144,14 +147,18 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
text-align: center;
min-width: 120px;
max-width: 120px;
- white-space: normal; /* Allows text to wrap */
- word-wrap: break-word; /* Breaks long words if needed */
- text-align: center; /* Centers text for better alignment */
- max-width: 150px; /* Set a max width to control wrapping */
+ white-space: normal;
+ /* Allows text to wrap */
+ word-wrap: break-word;
+ /* Breaks long words if needed */
+ text-align: center;
+ /* Centers text for better alignment */
+ max-width: 150px;
+ /* Set a max width to control wrapping */
}
.celda_encabezado_total {
- background-color:#ffffff;
+ background-color: #ffffff;
border: 1px solid white;
color: #ffffff;
font-weight: bold;
@@ -211,27 +218,27 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
.fht-table th:nth-child(1),
- .fht-table th:nth-child(1)
- {
+ .fht-table th:nth-child(1) {
position: sticky;
left: 0;
top: 0;
- background-color:rgb(80, 187, 217); /* blue background */
- z-index: 7!important;
- border-right: 2px solid #ddd;
+ background-color: rgb(80, 187, 217);
+ /* blue background */
+ z-index: 7 !important;
+ border-right: 2px solid #ddd;
color: #ffffff;
}
- .fht-table td:nth-child(1)
- {
+ .fht-table td:nth-child(1) {
position: sticky;
left: 0;
- background-color:rgb(80, 187, 217); /* blue background */
+ background-color: rgb(80, 187, 217);
+ /* blue background */
z-index: 2;
- border-right: 2px solid #ddd;
+ border-right: 2px solid #ddd;
color: #ffffff;
-
+
}
.table-responsive {
@@ -246,22 +253,25 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
.fht-table thead th {
position: sticky;
top: 0;
- z-index: 5!important;
+ z-index: 5 !important;
}
tfoot tr {
- background-color:rgb(235, 236, 203);
+ background-color: rgb(235, 236, 203);
}
- body[data-layout-mode = horizontal] .container-fluid{
+ body[data-layout-mode=horizontal] .container-fluid {
max-width: 100%;
}
- .card-body{
- padding-top : 10px;
+
+ .card-body {
+ padding-top: 10px;
padding-bottom: 0;
}
- .card{ margin-bottom: 5px;}
+ .card {
+ margin-bottom: 5px;
+ }
@@ -281,7 +291,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
-
+
@@ -309,69 +319,454 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
+
+
+
+
+
+
+
+
+
+
+
+
+
+ modify('first day of this month');
+ $daysInMonth = $startDate->format('t');
+ $dateArray = [];
+
+ for ($i = 0; $i < $daysInMonth; $i++) {
+ $dateArray[] = $startDate->format('d-m-Y');
+ $startDate->modify('+1 day');
+ }
+ } else {
+ echo "Invalid date format.";
+ }
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -380,212 +775,210 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
-
- | Date |
- Drier On Time |
- Drier Off Time |
- Running Hrs |
- Supplier Name |
-
- Input Sand Qty (Metric Ton) |
- Input Sand Moisture(%) |
- Sand Dried Qty (Metric Ton) |
- Total Gas Consumption |
- Gas Per Ton |
- Qty Per Hrs (Metric Ton) |
- Moisture Loss Qty (Metric Ton) |
- Dust Qty (Metric Ton) |
- Customer Name |
+ Date |
+ Drier On Time |
+ Drier Off Time |
+ Running Hrs |
+ Supplier Name |
+
+ Input Sand Qty (Metric Ton) |
+ Input Sand Moisture(%) |
+ Sand Dried Qty (Metric Ton) |
+ Total Gas Consumption |
+ Gas Per Ton |
+ Qty Per Hrs (Metric Ton) |
+ Moisture Loss Qty (Metric Ton) |
+ Dust Qty (Metric Ton) |
+
+ Customer Name |
id |
- Action |
+ Action |
-
-
-
-
-
-
- format('Y-m-d');
- $currentDate = date('Y-m-d');
- if ($date === $currentDate) {
- echo 'style="background: #cef0ad;"';
- }
- ?>
-
- format('d-m-Y');
- ?>
-
- >
-
-
-
- |
-
- |
+
+
-
-
-
- |
+
-
-
-
- |
+
- |
-
- |
+ format('Y-m-d');
+ $currentDate = date('Y-m-d');
+ if ($date === $currentDate) {
+ echo 'style="background: #cef0ad;"';
+ }
+ ?>
-
-
- $value) {
- if ($a['supplier_name'] == $value->SupplierID) {
- echo $value->SupplierName;
+ format('d-m-Y');
+ ?>>
+
+
+
+ |
+
+ |
+
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+ $value) {
+ if ($a['supplier_name'] == $value->SupplierID) {
+ echo $value->SupplierName;
}
- } ?>
- |
+ } ?>
+
-
-
-
- |
+
+
+
+ |
-
-
-
- |
+
+
+
+ |
-
-
-
- |
+
+
+
+ |
-
-
-
- |
+
+
+
+ |
-
-
-
- |
+
+
+
+ |
-
-
-
- |
-
+
+
+
+ |
-
-
-
- |
-
-
-
-
- |
+
+
+
+ |
-
-
-
- |
-
-
-
- |
+
+
+
+ |
-
-
-
-
-
+
+ |
+
+ |
-
+
+
+
+ |
-
-
-
- |
+
+
+
+
+
+
+ |
+
+
+
+
+ |
-
-
+
+
-
-
-
-
- |
- Total
- |
+
+
+
+
+ |
+ Total
+ |
- |
- |
- |
+ |
- |
- |
+ |
- |
- |
- |
+ |
+ |
|
|
- |
- |
-
-
+ |
+ |
+
+
-
+
-
No Drier machine details present for this month..!!
+
+
No Drier machine details present for this month..!!
+
-
+
@@ -607,395 +1000,8 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
-
-
-
-
-
-
-
-
-
-
-
- modify('first day of this month');
- $daysInMonth = $startDate->format('t');
- $dateArray = [];
-
- for ($i = 0; $i < $daysInMonth; $i++) {
- $dateArray[] = $startDate->format('d-m-Y');
- $startDate->modify('+1 day');
- }
- } else {
- echo "Invalid date format.";
- }
- ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1013,58 +1019,68 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
@@ -1072,7 +1088,6 @@ $('#drierTable tbody').on('click', '.edit-btn', function() {
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/app/Views/stock/dustAndRoughStockDetails.php b/app/Views/stock/dustAndRoughStockDetails.php
index d3348f8d..331eb25e 100644
--- a/app/Views/stock/dustAndRoughStockDetails.php
+++ b/app/Views/stock/dustAndRoughStockDetails.php
@@ -18,11 +18,13 @@
}
.grab {
- cursor: grab; /* Default open-hand cursor */
+ cursor: grab;
+ /* Default open-hand cursor */
}
.grab:active {
- cursor: grabbing; /* Closed-hand cursor when dragging */
+ cursor: grabbing;
+ /* Closed-hand cursor when dragging */
}
/* .fht-table td[contenteditable="true"] {
@@ -31,15 +33,17 @@
} */
.fht-table td:hover {
- background-color: rgb(170, 222, 167);
- color:rgb(2, 2, 2);
- transform: scale(1.25); /* Increases size by 25% */
- transition: transform 0.5s ease-in-out; /* Smooth scaling effect */
+ background-color: rgb(170, 222, 167);
+ color: rgb(2, 2, 2);
+ transform: scale(1.25);
+ /* Increases size by 25% */
+ transition: transform 0.5s ease-in-out;
+ /* Smooth scaling effect */
}
.fht-table tr:hover {
- background-color: rgb(170, 222, 167);
- color:rgb(2, 2, 2);
+ background-color: rgb(170, 222, 167);
+ color: rgb(2, 2, 2);
}
.fht-table {
@@ -239,20 +243,36 @@
}
/* Adjust heights based on screen zoom */
- @media only screen and (min-height: 1400px) { /* Approximate Zoom < 100% */
- .table-responsive { max-height: 425px; }
+ @media only screen and (min-height: 1400px) {
+
+ /* Approximate Zoom < 100% */
+ .table-responsive {
+ max-height: 425px;
+ }
}
- @media only screen and (min-height: 1200px) { /* Approximate Zoom ~ 90% */
- .table-responsive { max-height: 500px; }
+ @media only screen and (min-height: 1200px) {
+
+ /* Approximate Zoom ~ 90% */
+ .table-responsive {
+ max-height: 500px;
+ }
}
- @media only screen and (min-height: 1000px) { /* Approximate Zoom ~ 80% */
- .table-responsive { max-height: 600px; }
+ @media only screen and (min-height: 1000px) {
+
+ /* Approximate Zoom ~ 80% */
+ .table-responsive {
+ max-height: 600px;
+ }
}
- @media only screen and (min-height: 800px) { /* Approximate Zoom ~ 75% */
- .table-responsive { max-height: 650px; }
+ @media only screen and (min-height: 800px) {
+
+ /* Approximate Zoom ~ 75% */
+ .table-responsive {
+ max-height: 650px;
+ }
}
td {
@@ -261,23 +281,22 @@
}
tfoot tr {
- background-color:rgb(235, 236, 203);
+ background-color: rgb(235, 236, 203);
}
- body[data-layout-mode = horizontal] .container-fluid{
+ body[data-layout-mode=horizontal] .container-fluid {
max-width: 100%;
}
- .card-body{
- padding-top : 0;
- padding-bottom : 0;
+ .card-body {
+ padding-top: 0;
+ padding-bottom: 0;
}
- .card{ margin-bottom: 5px;}
-
-
-
+ .card {
+ margin-bottom: 5px;
+ }
@@ -308,234 +327,304 @@
-
+
-
+
+
+
+
-
+
+
+
+
+
+
+
-
-
+
+
+
+ modify('first day of this month');
+ $daysInMonth = $startDate->format('t');
+ $dateArray = [];
+
+ for ($i = 0; $i < $daysInMonth; $i++) {
+ $dateArray[] = $startDate->format('d-m-Y');
+ $startDate->modify('+1 day');
+ }
+ } else {
+ echo "Invalid date format.";
+ }
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
- | Date |
- Final Rough |
- Dust |
- Total |
-
+ class="celda_encabezado_general" rowspan="2" colspan="1">Date
+ Final Rough |
+ Dust |
+ Total |
+
- | +16 Mesh |
- 10 Ton Dryer |
-
-
+ +16 Mesh |
+ 10 Ton Dryer |
+
+
-
+
- $dustAndRoughStockDetail){
- ?>
- format('d-m-Y');
- if ($dateInMonthDmYFormat === $currentDate) { echo 'style="background: #cef0ad;"';}
- ?>
- >
-
- |
- |
+ if (!empty($dustAndRoughStockDetails)) {
- |
+ $summary = [];
- |
+ foreach ($dustAndRoughStockDetails as $dustAndRoughStockDetailsIndex => $dustAndRoughStockDetail) {
+ ?>
+
format('d-m-Y');
+ if ($dateInMonthDmYFormat === $currentDate) {
+ echo 'style="background: #cef0ad;"';
+ }
+ ?>>
- |
-
+
+
+ |
- "
+ oninput="finalRoughStockChange(this)"
+ contenteditable="true">
- //before closing inner loop
+ |
- if (!isset($summary['finalRough'])) {
- $summary['finalRough'] = 0 ;
- $summary['dust'] = 0 ;
- $summary['total'] = 0 ;
- }
+ |
+
+
+
+ $summary['finalRough'] += $dustAndRoughStockDetail['finalRough'] == "-" ? 0 : (float) $dustAndRoughStockDetail['finalRough'];
+ $summary['dust'] += $dustAndRoughStockDetail['dust'] == "-" ? 0 : (float) $dustAndRoughStockDetail['dust'];
+ $summary['total'] += $dustAndRoughStockDetail['total'] == "-" ? 0 : (float) $dustAndRoughStockDetail['total'];
+ } ?>
- | Total |
- |
- |
- |
+ Total |
+ |
+ |
+ |
-
-
- modify('first day of this month')->format('Y-m-d');
- $endDate = $date->modify('last day of this month')->format('Y-m-d');
-
- $datesInMonth = [];
- $period = new DatePeriod(
- new DateTime($startDate),
- new DateInterval('P1D'),
- (new DateTime($endDate))->modify('+1 day')
- );
+ format('Y-m-d');
- }
+ $date = DateTime::createFromFormat('M-Y', $month);
- foreach($datesInMonth as $datesInMonthIndex => $dateInMonth){
+ $startDate = $date->modify('first day of this month')->format('Y-m-d');
+ $endDate = $date->modify('last day of this month')->format('Y-m-d');
+
+ $datesInMonth = [];
+
+
+ $period = new DatePeriod(
+ new DateTime($startDate),
+ new DateInterval('P1D'),
+ (new DateTime($endDate))->modify('+1 day')
+ );
+
+ foreach ($period as $day) {
+ $datesInMonth[] = $day->format('Y-m-d');
+ }
+
+ foreach ($datesInMonth as $datesInMonthIndex => $dateInMonth) {
?>
- >
+ |
+
- >
- |
-
- |
+
- |
+ |
- |
+ |
- |
-
-
+ |
+
+
-
-
-
+
+
+
@@ -553,143 +642,66 @@
-
-
-
-
-
-
-
-
-
- modify('first day of this month');
- $daysInMonth = $startDate->format('t');
- $dateArray = [];
-
- for ($i = 0; $i < $daysInMonth; $i++) {
- $dateArray[] = $startDate->format('d-m-Y');
- $startDate->modify('+1 day');
- }
- } else {
- echo "Invalid date format.";
- }
- ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/app/Views/stock/gasStockDetails.php b/app/Views/stock/gasStockDetails.php
index 1f2ef177..029b2079 100644
--- a/app/Views/stock/gasStockDetails.php
+++ b/app/Views/stock/gasStockDetails.php
@@ -18,15 +18,17 @@
}
.fht-table td:hover {
- background-color: rgb(170, 222, 167);
- color:rgb(2, 2, 2);
- transform: scale(1.25); /* Increases size by 25% */
- transition: transform 0.5s ease-in-out; /* Smooth scaling effect */
+ background-color: rgb(170, 222, 167);
+ color: rgb(2, 2, 2);
+ transform: scale(1.25);
+ /* Increases size by 25% */
+ transition: transform 0.5s ease-in-out;
+ /* Smooth scaling effect */
}
.fht-table tr:hover {
- background-color: rgb(170, 222, 167);
- color:rgb(2, 2, 2);
+ background-color: rgb(170, 222, 167);
+ color: rgb(2, 2, 2);
}
.fht-table {
@@ -158,14 +160,14 @@
}
.celda_encabezado_total {
- background-color:#ffffff !important;
+ background-color: #ffffff !important;
border: 1px solid #ffffff;
color: #ffffff !important;
font-weight: bold;
padding: 6px 10px;
text-align: center;
}
-
+
.celda_normal {
/*background-color: #fff;*/
/* */
@@ -179,12 +181,14 @@
.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 {
- z-index :25 ;
+ .dropdown-menu {
+ z-index: 25;
}
@@ -193,8 +197,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;
@@ -206,7 +212,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;
}
@@ -221,41 +228,58 @@
}
/* Adjust heights based on screen zoom */
- @media only screen and (min-height: 1400px) { /* Approximate Zoom < 100% */
- .table-responsive { max-height: 425px; }
+ @media only screen and (min-height: 1400px) {
+
+ /* Approximate Zoom < 100% */
+ .table-responsive {
+ max-height: 425px;
+ }
}
- @media only screen and (min-height: 1200px) { /* Approximate Zoom ~ 90% */
- .table-responsive { max-height: 500px; }
+ @media only screen and (min-height: 1200px) {
+
+ /* Approximate Zoom ~ 90% */
+ .table-responsive {
+ max-height: 500px;
+ }
}
- @media only screen and (min-height: 1000px) { /* Approximate Zoom ~ 80% */
- .table-responsive { max-height: 600px; }
+ @media only screen and (min-height: 1000px) {
+
+ /* Approximate Zoom ~ 80% */
+ .table-responsive {
+ max-height: 600px;
+ }
}
- @media only screen and (min-height: 800px) { /* Approximate Zoom ~ 75% */
- .table-responsive { max-height: 650px; }
+ @media only screen and (min-height: 800px) {
+
+ /* Approximate Zoom ~ 75% */
+ .table-responsive {
+ max-height: 650px;
+ }
}
- td{
- min-width: 100px;
- max-width: 100px;
+ td {
+ min-width: 100px;
+ max-width: 100px;
}
tfoot tr {
- background-color:rgb(235, 236, 203);
+ background-color: rgb(235, 236, 203);
}
- body[data-layout-mode = horizontal] .container-fluid{
+ body[data-layout-mode=horizontal] .container-fluid {
max-width: 100%;
}
- .card-body{ padding-bottom: 0;}
- .card{ margin-bottom: 5px;}
-
-
-
+ .card-body {
+ padding-bottom: 0;
+ }
+ .card {
+ margin-bottom: 5px;
+ }
-
+
@@ -291,419 +315,470 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ modify('first day of this month');
+ $daysInMonth = $startDate->format('t');
+ $dateArray = [];
+
+ for ($i = 0; $i < $daysInMonth; $i++) {
+ $dateArray[] = $startDate->format('d-m-Y');
+ $startDate->modify('+1 day');
+ }
+ } else {
+ echo "Invalid date format.";
+ }
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+ | RIPL |
+ Gas Stock |
+ FBD 10 Ton Dryer |
+ Sand Dried |
+ Coating Machine |
+ Sand Coated |
+ TRP |
+ Sand TRP |
+ Rotary Drier |
+
- | RIPL |
- Gas Stock |
- FBD 10 Ton Dryer |
- Sand Dried |
- Coating Machine |
- Sand Coated |
- TRP |
- Sand TRP |
- Rotary Drier |
+ Date |
+ Opening Stock |
+ Purchase(Bharath) |
+ Purchase(Indian) |
+ Total |
+ Consumption |
+ Balance Stock |
+ Consumption |
+ Ton |
+ Consumption |
+ Ton |
+ Panel Consumption |
+ Physical Consumption |
+ Ton |
+ Consumption |
+
-
- | Date |
- Opening Stock |
- Purchase(Bharath) |
- Purchase(Indian) |
- Total |
- Consumption |
- Balance Stock |
- Consumption |
- Ton |
- Consumption |
- Ton |
- Panel Consumption |
- Physical Consumption |
- Ton |
- Consumption |
-
-
-
-
- $gasStockDetail){
-
- $date = Datetime::createFromFormat('Y-m-d',$gasStockDetail['date'])->format('d-m-Y')
+
+ $gasStockDetail) {
+
+ $date = Datetime::createFromFormat('Y-m-d', $gasStockDetail['date'])->format('d-m-Y')
?>
-
-
+
+
+ $currentDate = date('d-m-Y');
+ if ($date === $currentDate) {
+ echo 'style="background: #cef0ad;"';
+ }
+ ?>>
-
- |
+
+ |
-
-
-
- oninput="openingStockChange(this)"
- data-id=""
- >
- |
+
+
+
+ oninput="openingStockChange(this)"
+ data-id="">
+ |
-
-
- |
+
+
+ |
-
-
- |
+
+
+ |
-
-
- |
+
+
+ |
-
-
- |
+
+
+ |
-
-
- |
+
+
+ |
-
-
- |
+
+
+ |
-
-
- |
+
+
+ |
-
-
-
- |
+
+
+
+ |
-
-
-
- |
+
+
+
+ |
-
-
-
- |
+
+
+
+ |
-
-
-
- |
+
+
+
+ |
-
-
-
- |
+
+
+
+ |
-
-
-
- |
+
+
+
+ |
-
+
+
+ "-" ,
- 'purchaseBharath' => 0 ,
- 'purchaseIndian' => 0 ,
- 'total' => 0 ,
- 'consumption' => 0 ,
- 'balanceStock' => 0 ,
- 'drierMachineGasConsumption'=>0,
+ 'opening' => "-",
+ 'purchaseBharath' => 0,
+ 'purchaseIndian' => 0,
+ 'total' => 0,
+ 'consumption' => 0,
+ 'balanceStock' => 0,
+ 'drierMachineGasConsumption' => 0,
'sandDried' => 0,
- 'coatingMachineGasconsumption'=>0,
+ 'coatingMachineGasconsumption' => 0,
'coatedSand' => 0,
'trp_panel_gas_consumption' => 0,
'trp_physical_gas_consumption' => 0,
'trp_sand_production' => 0,
- 'rotary_drier_consumption' => 0
+ 'rotary_drier_consumption' => 0
];
- }
+ }
//
// Sum values for the material
-
- $summary["opening"] = 0 ;
- $summary["purchaseBharath"] += is_numeric($gasStockDetail['purchaseBharath']) ? $gasStockDetail['purchaseBharath'] : 0 ;
- $summary["purchaseIndian"] += is_numeric($gasStockDetail['purchaseIndian']) ? $gasStockDetail['purchaseIndian'] : 0 ;
- $summary["total"] += is_numeric($gasStockDetail['total']) ? $gasStockDetail['total'] : 0 ;
- $summary["consumption"] += is_numeric($gasStockDetail['consumption']) ? $gasStockDetail['consumption'] : 0 ;
- $summary["balanceStock"] += is_numeric($gasStockDetail['balanceStock']) ? $gasStockDetail['balanceStock'] : 0 ;
- $summary["drierMachineGasConsumption"] += is_numeric( $gasStockDetail['drierMachineGasConsumption']) ? $gasStockDetail['drierMachineGasConsumption'] : 0 ;
- $summary["sandDried"] += is_numeric( $gasStockDetail['sandDried']) ? $gasStockDetail['sandDried'] : 0 ;
- $summary["coatingMachineGasconsumption"] += is_numeric($gasStockDetail['coatingMachineGasconsumption']) ? $gasStockDetail['coatingMachineGasconsumption'] : 0 ;
- $summary["coatedSand"] += is_numeric($gasStockDetail['coatedSand']) ? $gasStockDetail['coatedSand'] : 0 ;
- $summary["trp_panel_gas_consumption"] += is_numeric($gasStockDetail['trp_panel_gas_consumption']) ? $gasStockDetail['trp_panel_gas_consumption'] : 0 ;
- $summary["trp_physical_gas_consumption"] += is_numeric($gasStockDetail['trp_physical_gas_consumption']) ? $gasStockDetail['trp_physical_gas_consumption'] : 0 ;
+ $summary["opening"] = 0;
+ $summary["purchaseBharath"] += is_numeric($gasStockDetail['purchaseBharath']) ? $gasStockDetail['purchaseBharath'] : 0;
+ $summary["purchaseIndian"] += is_numeric($gasStockDetail['purchaseIndian']) ? $gasStockDetail['purchaseIndian'] : 0;
+ $summary["total"] += is_numeric($gasStockDetail['total']) ? $gasStockDetail['total'] : 0;
+ $summary["consumption"] += is_numeric($gasStockDetail['consumption']) ? $gasStockDetail['consumption'] : 0;
+ $summary["balanceStock"] += is_numeric($gasStockDetail['balanceStock']) ? $gasStockDetail['balanceStock'] : 0;
- $summary["trp_sand_production"] += is_numeric($gasStockDetail['trp_sand_production']) ? $gasStockDetail['trp_sand_production'] : 0 ;
- $summary["rotary_drier_consumption"] += is_numeric($gasStockDetail['rotary_drier_consumption']) ? $gasStockDetail['rotary_drier_consumption'] : 0 ;
-
-
-
-
-
-
+ $summary["drierMachineGasConsumption"] += is_numeric($gasStockDetail['drierMachineGasConsumption']) ? $gasStockDetail['drierMachineGasConsumption'] : 0;
+ $summary["sandDried"] += is_numeric($gasStockDetail['sandDried']) ? $gasStockDetail['sandDried'] : 0;
+ $summary["coatingMachineGasconsumption"] += is_numeric($gasStockDetail['coatingMachineGasconsumption']) ? $gasStockDetail['coatingMachineGasconsumption'] : 0;
+ $summary["coatedSand"] += is_numeric($gasStockDetail['coatedSand']) ? $gasStockDetail['coatedSand'] : 0;
+ $summary["trp_panel_gas_consumption"] += is_numeric($gasStockDetail['trp_panel_gas_consumption']) ? $gasStockDetail['trp_panel_gas_consumption'] : 0;
+ $summary["trp_physical_gas_consumption"] += is_numeric($gasStockDetail['trp_physical_gas_consumption']) ? $gasStockDetail['trp_physical_gas_consumption'] : 0;
+
+ $summary["trp_sand_production"] += is_numeric($gasStockDetail['trp_sand_production']) ? $gasStockDetail['trp_sand_production'] : 0;
+ $summary["rotary_drier_consumption"] += is_numeric($gasStockDetail['rotary_drier_consumption']) ? $gasStockDetail['rotary_drier_consumption'] : 0;
} ?>
-
-
+
+
- |
- Total
- |
+
+ Total
+ |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
-
-
+
+
- modify('first day of this month')->format('Y-m-d');
- $endDate = $date->modify('last day of this month')->format('Y-m-d');
+ $startDate = $date->modify('first day of this month')->format('Y-m-d');
+ $endDate = $date->modify('last day of this month')->format('Y-m-d');
- $datesInMonth = [];
+ $datesInMonth = [];
- $period = new DatePeriod(
- new DateTime($startDate),
- new DateInterval('P1D'),
- (new DateTime($endDate))->modify('+1 day')
- );
-
- foreach ($period as $day) {
- $datesInMonth[] = $day->format('Y-m-d');
- }
+ $period = new DatePeriod(
+ new DateTime($startDate),
+ new DateInterval('P1D'),
+ (new DateTime($endDate))->modify('+1 day')
+ );
- foreach ($datesInMonth as $datesInMonthIndex => $dateInMonth) {
-
- $dateInMonthDmYFormat = Datetime::createFromFormat('Y-m-d',$dateInMonth)->format('d-m-Y');
-
- ?>
+ foreach ($period as $day) {
+ $datesInMonth[] = $day->format('Y-m-d');
+ }
-
- $dateInMonth) {
- format('d-m-Y');
- $currentDate = date('d-m-Y');
- if ($dateInMonthDmYFormat === $currentDate) { echo 'style="background: #cef0ad;"'; }
?>
- >
-
- |
-
-
- oninput="openingStockChange(this)"
- data-id=""
- > |
- |
+
+
+ "
- >
- | |
- |
+ $currentDate = date('d-m-Y');
+ if ($dateInMonthDmYFormat === $currentDate) {
+ echo 'style="background: #cef0ad;"';
+ }
+ ?>>
- |
- |
- |
- |
- |
+ |
+
+
+ oninput="openingStockChange(this)"
+ data-id=""> |
+ |
- |
+ |
- |
+ |
+ |
+ |
- |
-
-
-
+ |
+ |
+ |
+ |
+
+ |
+
+ |
+
+ |
+
+ |
+
+
+
-
-
-
-
+
+
+
+
@@ -731,72 +806,6 @@
-
-
-
-
-
-
-
-
-
-
- modify('first day of this month');
- $daysInMonth = $startDate->format('t');
- $dateArray = [];
-
- for ($i = 0; $i < $daysInMonth; $i++) {
- $dateArray[] = $startDate->format('d-m-Y');
- $startDate->modify('+1 day');
- }
- } else {
- echo "Invalid date format.";
- }
- ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -807,16 +816,14 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/Views/stock/incomingSilicaSandDetails.php b/app/Views/stock/incomingSilicaSandDetails.php
index 5306965f..0a04a2ff 100644
--- a/app/Views/stock/incomingSilicaSandDetails.php
+++ b/app/Views/stock/incomingSilicaSandDetails.php
@@ -1,5 +1,4 @@
-
-
+ .card {
+ margin-bottom: 5px;
+ }
+
@@ -269,12 +270,12 @@
-
+
- Stocks
-
-
Incoming Silica Sand Details
-
+ Incoming Silica Sand Details
+
@@ -287,25 +288,25 @@
- getFlashdata('error');
- if ($error) {
- ?>
-
-
- getFlashdata('error'); ?>
-
-
- getFlashdata('success');
- if ($success) {
- ?>
-
-
- getFlashdata('success'); ?>
-
-
+ getFlashdata('error');
+ if ($error) {
+ ?>
+
+
+ getFlashdata('error'); ?>
+
+
+ getFlashdata('success');
+ if ($success) {
+ ?>
+
+
+ getFlashdata('success'); ?>
+
+
@@ -313,455 +314,817 @@
@@ -774,374 +1137,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1149,65 +1145,65 @@
@@ -1441,8 +1439,7 @@
-
+
+ })
+
-
+
-
+
+
+
+
+
+
\ No newline at end of file
+
+
diff --git a/app/Views/stock/powerConsumptionDetails.php b/app/Views/stock/powerConsumptionDetails.php
index f33958d8..a572855e 100644
--- a/app/Views/stock/powerConsumptionDetails.php
+++ b/app/Views/stock/powerConsumptionDetails.php
@@ -474,6 +474,54 @@ foreach ($period as $day) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -934,55 +982,9 @@ foreach ($period as $day) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
+
+
diff --git a/app/Views/stock/resinStockDetails.php b/app/Views/stock/resinStockDetails.php
index ca737253..e06bc111 100644
--- a/app/Views/stock/resinStockDetails.php
+++ b/app/Views/stock/resinStockDetails.php
@@ -416,7 +416,7 @@ foreach ($period as $day) {
-
-
"
+
"
class="form-control mt-2" data-provide="datepicker"
data-date-format="M-yyyy" data-date-min-view-mode="1">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -758,72 +806,10 @@ foreach ($period as $day) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
diff --git a/app/Views/stock/trpProductionStockDetails.php b/app/Views/stock/trpProductionStockDetails.php
index 2dcb7995..194b1364 100644
--- a/app/Views/stock/trpProductionStockDetails.php
+++ b/app/Views/stock/trpProductionStockDetails.php
@@ -455,6 +455,82 @@ $timeOtions[] = "12:00 AM";
+
+
+
+
+
+
+
+
+
+
+
+
+ modify('first day of this month');
+ $daysInMonth = $startDate->format('t');
+ $dateArray = [];
+
+ for ($i = 0; $i < $daysInMonth; $i++) {
+ $dateArray[] = $startDate->format('d-m-Y');
+ $startDate->modify('+1 day');
+ }
+ } else {
+ echo "Invalid date format.";
+ }
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -643,7 +719,7 @@ $timeOtions[] = "12:00 AM";
- |