diff --git a/app/Views/rawmaterialListing.php b/app/Views/rawmaterialListing.php index ba993072..bd30793f 100755 --- a/app/Views/rawmaterialListing.php +++ b/app/Views/rawmaterialListing.php @@ -52,7 +52,6 @@

Material Master Details

- Add New Material
@@ -73,63 +72,77 @@
-
- - - - +
+
+ + + - - + + - -
- -
- -
-
+ + + + +
+ +
+ +
+
- + - + - + -
- - - - -
-
-
- - style="width: 18px; height: 18px;"> - +
+
+ +
+
+
+
+ + style="width: 18px; height: 18px;"> + +
+
+
+
+ + + + + +
diff --git a/app/Views/stock/trpProductionStockDetails.php b/app/Views/stock/trpProductionStockDetails.php index 3ccc7501..010b8c94 100644 --- a/app/Views/stock/trpProductionStockDetails.php +++ b/app/Views/stock/trpProductionStockDetails.php @@ -160,6 +160,22 @@ .celda_normal { + /*background-color: #fff;*/ + /* */ + text-align: center; + border: 1px solid #ccc; + padding: 2px 4px; + } + + #abstractTableId tbody td.celda_normal { + /*background-color: #fff;*/ + /* */ + text-align: center; + border: 1px solid #ccc; + padding: 10px 4px; + } + + #trpProductionStockDetailsTableId tfoot tr td.celda_normal { /*background-color: #fff;*/ /* */ text-align: center; @@ -2063,6 +2079,11 @@ $timeOtions[] = "12:00 AM"; if (trpOnTime != '' && trpOffTime != '') { + if(trpOnTime == trpOffTime){ + document.querySelector(`td.totalHours[data-id="${date} totalHours"]`).innerText = '24.0'; + return; + } + const startDate = new Date(`1970-01-01T${convertTo24Hour(trpOnTime)}`); const endDate = new Date(`1970-01-01T${convertTo24Hour(trpOffTime)}`);