diff --git a/app/Views/editrequisitionform.php b/app/Views/editrequisitionform.php index d0828867..a0cd2af7 100755 --- a/app/Views/editrequisitionform.php +++ b/app/Views/editrequisitionform.php @@ -643,15 +643,15 @@ td { $.ajax({ data: $('.requistion').serialize() + "&serviceSchedule=" + serviceSchedule + "&servicePeriod=" + servicePeriod + "&noOfService=" + noOfService, type: "POST", - url: "EditRequisition", + url: "EditRequisition" , success: function(data) { if (data) { - $('#loader').hide(); - alert(data); - $('#txtRowCount').val(''); - $('#txtDeletedRow').val(''); + $('#loader').hide() ; + alert(data) ; + $('#txtRowCount').val('') ; + $('#txtDeletedRow').val('') ; - window.location = "Requisition"; + window.location = "Requisition" ; } else { $('#loader').hide(); diff --git a/app/Views/gasStockDetails.php b/app/Views/gasStockDetails.php index 0ccc81fd..9c69ce4e 100644 --- a/app/Views/gasStockDetails.php +++ b/app/Views/gasStockDetails.php @@ -329,19 +329,25 @@ + + + + " contenteditable="true" + oninput = "gasConsumptionChange(this)" >0 0 + >0 0 + + + + + + + @@ -455,6 +470,12 @@ + + + + + + @@ -715,9 +736,10 @@ let currentBalanceStock = Number(totalGas) - ( Number(toatalGasConsumption) ); document.querySelector(`td.total[data-id="${dataId}"]`).innerText = totalGas; + document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText =toatalGasConsumption ; document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText = currentBalanceStock; - updateStockValue( date,currentBalanceStock ) + updateStockValue( date,currentBalanceStock ) } catch(error){ console.error("There is an error updating stock ..!!" + error); diff --git a/app/Views/requisitionform.php b/app/Views/requisitionform.php index 833e50f8..6257b75a 100755 --- a/app/Views/requisitionform.php +++ b/app/Views/requisitionform.php @@ -816,7 +816,7 @@ if (!empty($Emp)) { url: "addNewRequisition", success: function(data) { if (data) { - // $('#content').loader('hide'); + alert(data); $('#txtRowCount').val(''); $('#txtDeletedRow').val(''); diff --git a/app/Views/resinStockDetails.php b/app/Views/resinStockDetails.php index e035e394..4c2dfd5f 100644 --- a/app/Views/resinStockDetails.php +++ b/app/Views/resinStockDetails.php @@ -110,6 +110,16 @@ text-align: center; } + .celda_encabezado_total { + background-color:rgb(162, 41, 0); + border: 1px solid #ccc; + color: #ffffff; + font-weight: bold; + padding: 6px 10px; + ; + text-align: center; + } + ._Separador { background-color: #fff; @@ -301,8 +311,43 @@ foreach ($period as $day) { "-" , + 'receipt' => 0, + 'used' => 0, + 'balanceStock' => 0, + ]; + } + + // Sum values for the material + ; + $summary[$materialCode]['opening'] = "-" ; + $summary[$materialCode]['receipt'] += $resinStock['receipt']; + $summary[$materialCode]['used'] += $resinStock['used']; + $summary[$materialCode]['balanceStock'] = $resinStock['balanceStock']; + } + } + + return $summary; + } + + // Example usage: + $summary = sumMaterialValues($groupedResinStockDetails); + + + foreach ($groupedResinStockDetails as $groupedResinStockDetailsIndex => $resinStockDetails) { + ?> > - $resinStock) { ?> + $resinStock) { + + ?> format('d-m-Y'); @@ -369,6 +416,40 @@ foreach ($period as $day) { +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Total SumOpening StockReceiptUsedBalance Stock
+