From 011531cafe4f4da0a1d3c5a7c72ca26e0b394413 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Sat, 21 Dec 2024 09:35:50 +0530
Subject: [PATCH 1/2] purchase module-2  vadivel J 21-12-2024

---
 app/Views/addSupplier.php               |  7 ++++---
 app/Views/editSupplier.php              |  4 ++--
 app/Views/incomingSilicaSandDetails.php | 24 ++++++++++++------------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/Views/addSupplier.php b/app/Views/addSupplier.php
index 4de6577b..077ebcf9 100755
--- a/app/Views/addSupplier.php
+++ b/app/Views/addSupplier.php
@@ -179,9 +179,10 @@
 
                     <div class="col-md-12" style="margin-bottom: 27px;">
                       <div class="col-md-3">
-                        <span for="payablefrom">Payable Terms</span>
-                        <select class="form-control required select2" id="Payment" name="Payment" onchange="payment_hidden();"> <!-- onchange="storeVal(this,'hiddenVal');"> -->
-                          <option value="Date of invoice">Select Payment method</option>
+                        <label for="payablefrom">Payable Terms <span class="text-danger">*</span></label>
+                        <select class="form-control required select2" id="Payment" name="Payment" 
+                        onchange="payment_hidden();" required > 
+                          <option value="">Select Payment method</option>
                           <?php
                           if (!empty($payment)) {
                             foreach ($payment as $pmt) {
diff --git a/app/Views/editSupplier.php b/app/Views/editSupplier.php
index 17ad6115..9d71f04b 100755
--- a/app/Views/editSupplier.php
+++ b/app/Views/editSupplier.php
@@ -502,9 +502,9 @@ if (!empty($supplier)) {
                       <div class="col-md-12" style="margin-bottom: 27px;">
                         <div class="form-row" style="margin-bottom: 20px;">
                           <div class="col-md-4">
-                            <label for="payablefrom">Payable Terms</label>
+                            <label for="payablefrom">Payable Terms <span class="text-danger">*</span></label>
                             <select class="form-control required select2" id="PaymentTerms" name="PaymentTerms"
-                              onchange="payment_hidden();">
+                              onchange="payment_hidden();"  required>
                               <option value="<?php echo $PaymentTerms; ?>"><?php echo $PaymentTerms; ?></option>
                               <?php
                               if (!empty($payment)) {
diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php
index 98452604..f8eb9b83 100644
--- a/app/Views/incomingSilicaSandDetails.php
+++ b/app/Views/incomingSilicaSandDetails.php
@@ -682,7 +682,7 @@
                 </tr>
                 <tr>
                 <td style="text-align: left !important; width:25%;"><b>Moisture %</b></td>
-                    <td contenteditable="true" 
+                    <td contenteditable="true" oninput="calculateRow()" 
                         id="dwnldMoistureId">10</td>
                 </tr>
             </tbody>
@@ -719,7 +719,7 @@
                     <td align="center">10</td>
                     <td align="center">2.0</td>
                     <td align="center">2000</td>
-                    <td align="right" id="dwnld10MmId"></td>
+                    <td align="right" id="dwnld10MmId" contenteditable="true" oninput="calculateRow()"></td>
                     <td align="center">5</td>
                     <td align="right" id="dwnld10MmFId"> </td>
                 </tr>
@@ -727,7 +727,7 @@
                     <td align="center">20</td>
                     <td align="center">0.85</td>
                     <td align="center">0850</td>
-                    <td align="right" id="dwnld20MmId"></td>
+                    <td align="right" id="dwnld20MmId"  contenteditable="true" oninput="calculateRow()"></td>
                     <td align="center">10</td>
                     <td align="right" id="dwnld20MmFId"></td>
                 </tr>
@@ -735,7 +735,7 @@
                     <td align="center">30</td>
                     <td align="center">0.60</td>
                     <td align="center">0600</td>
-                    <td align="right" id="dwnld30MmId"></td>
+                    <td align="right" id="dwnld30MmId"  contenteditable="true" oninput="calculateRow()"></td>
                     <td align="center">20</td>
                     <td align="right" id="dwnld30MmFId"></td>
                 </tr>
@@ -743,7 +743,7 @@
                     <td align="center">40</td>
                     <td align="center">0.42</td>
                     <td align="center">0425</td>
-                    <td align="right" id="dwnld40MmId"></td>
+                    <td align="right" id="dwnld40MmId"  contenteditable="true" oninput="calculateRow()"></td>
                     <td align="center">30</td>
                     <td align="right" id="dwnld40MmFId"></td>
                 </tr>
@@ -751,7 +751,7 @@
                     <td align="center">50</td>
                     <td align="center">0.30</td>
                     <td align="center">0300</td>
-                    <td align="right" id="dwnld50MmId"></td>
+                    <td align="right" id="dwnld50MmId"  contenteditable="true" oninput="calculateRow()"></td>
                     <td align="center">40</td>
                     <td align="right" id="dwnld50MmFId"></td>
                 </tr>
@@ -760,7 +760,7 @@
                     <td align="center">70</td>
                     <td align="center">0.21</td>
                     <td align="center">0212</td>
-                    <td align="right" id="dwnld70MmId"></td>
+                    <td align="right" id="dwnld70MmId"  contenteditable="true" oninput="calculateRow()"></td>
                     <td align="center">50</td>
                     <td align="right" id="dwnld70MmFId"></td>
                 </tr>
@@ -768,7 +768,7 @@
                     <td align="center">100</td>
                     <td align="center">0.15</td>
                     <td align="center">0150</td>
-                    <td align="right" id="dwnld100MmId"></td>
+                    <td align="right" id="dwnld100MmId"  contenteditable="true" oninput="calculateRow()"></td>
                     <td align="center">70</td>
                     <td align="right" id="dwnld100MmFId"></td>
                 </tr>
@@ -776,7 +776,7 @@
                     <td align="center">140</td>
                     <td align="center">0.106</td>
                     <td align="center">0106</td>
-                    <td align="right" id="dwnld140MmId"></td>
+                    <td align="right" id="dwnld140MmId"  contenteditable="true" oninput="calculateRow()"></td>
                     <td align="center">100</td>
                     <td align="right" id="dwnld140MmFId"></td>
                 </tr>
@@ -784,7 +784,7 @@
                     <td align="center">200</td>
                     <td align="center">0.075</td>
                     <td align="center">0075</td>
-                    <td align="right" id="dwnld200MmId"></td>
+                    <td align="right" id="dwnld200MmId"  contenteditable="true" oninput="calculateRow()"></td>
                     <td align="center">140</td>
                     <td align="right" id="dwnld200MmFId"></td>
                 </tr>
@@ -792,7 +792,7 @@
                     <td align="center">300</td>
                     <td align="center">0.053</td>
                     <td align="center">0053</td>
-                    <td align="right" id="dwnld300MmId"></td>
+                    <td align="right" id="dwnld300MmId"  contenteditable="true" oninput="calculateRow()"></td>
                     <td align="center">200</td>
                     <td align="right" id="dwnld300MmFId"></td>
                 </tr>
@@ -801,7 +801,7 @@
                     <td align="center">PAN</td>
                     <td align="center"></td>
                     <td align="center">PAN</td>
-                    <td align="right" id="dwnldPanId"></td>
+                    <td align="right" id="dwnldPanId"  contenteditable="true" oninput="calculateRow()"></td>
                     <td align="center">300</td>
                     <td align="right" id="dwnldPanFId"></td>
                 </tr>

From 7d4de6792f49ea239bd09798c0c844517584d835 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Sat, 21 Dec 2024 14:39:13 +0530
Subject: [PATCH 2/2] stock module-2  vadivel J 21-12-2024

---
 app/Controllers/StockController.php     |  15 +--
 app/Views/drierMachineDetails.php       |  27 +++--
 app/Views/incomingSilicaSandDetails.php | 126 +++++++++++++-----------
 3 files changed, 87 insertions(+), 81 deletions(-)

diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php
index 952f5bc0..aa61707d 100644
--- a/app/Controllers/StockController.php
+++ b/app/Controllers/StockController.php
@@ -413,7 +413,7 @@ class StockController extends BaseController
             '_140' => $postData['140Mm'],
             '_200' => $postData['200Mm'],
             '_300' => $postData['300Mm'],
-            'pan' => $postData['pan'],
+            'pan'  => $postData['pan'],
             'total'          => $postData['total'],
             'plus20loss'     => $postData['plus20Loss'],
             'plus30Loss'     => $postData['plus30Loss'],
@@ -1231,19 +1231,6 @@ class StockController extends BaseController
         ->orderBy('date','asc')
         ->findAll();
 
-        if (!count($data['drierDetails'])) {
-            //insert empty data 
-            $tempInsert = [];
-            foreach ($monthData as $key => $value) {
-                array_push($tempInsert, ['date' => $value['database']]);
-            }
-            $this->drierMachineDetails_model->insertBatch($tempInsert);
-
-            $data['drierDetails'] = $this->drierMachineDetails_model->where('date >=', $data['startDate'])
-            ->where('date <=', $data['endDate'])
-            ->orderBy('date','asc')
-            ->findAll();
-        }
 
         $data['datefordropdown'] = $currentMonth;
 
diff --git a/app/Views/drierMachineDetails.php b/app/Views/drierMachineDetails.php
index 871b2181..96d7adc9 100644
--- a/app/Views/drierMachineDetails.php
+++ b/app/Views/drierMachineDetails.php
@@ -271,8 +271,11 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                             </tr>
 
                                         </thead>
-                                        <tbody style="background-color: #fff;">
 
+                                        <?php if(!empty($drierDetails)){ ?>
+                                        <tbody style="background-color: #fff;">
+                                        
+                                       
                                             <?php $index = 0;
                                             $row = 0;
                                             foreach ($drierDetails as $a) {
@@ -392,14 +395,25 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
 
                                                 </tr>
                                             <?php } ?>
-
+                                        
 
                                         </tbody>
+                                        <?php } ?>
                                     </table>
 
 
+                                    <?php if(empty($drierDetails)){ ?>
+                                        <br><br>
+                                        <div align="center">
+                                        <p><h4 style="color:grey;">No Drier machine details present for this month..!!</h4> </p>
+                                        </div>
+                                        
+                                        <?php } ?>
+
+
                                 </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">
@@ -779,9 +793,6 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
             if (qtyPerHrs && qtyPerHrs != NaN && qtyPerHrs != Infinity)
                 tr.find('td:eq(11)').text(qtyPerHrs.toFixed(3));
 
-
-
-
         }
 
     }
@@ -907,12 +918,12 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
 
     $('#drierTable').find('tbody tr').each(function() {
         const rowCells = $(this).find('td');
-        let tableDate = rowCells.eq(0).text();  // prints every date in the month from 1 to 30 .
+        let tableDate = rowCells.eq(0).text();  
         let result = checkDateRange(fromDate,toDate,tableDate);
         if (result) {
-            $(this).show(); // Show the row if the date is within range
+            $(this).show(); 
         } else {
-            $(this).hide(); // Hide the row if the date is out of range
+            $(this).hide(); 
         }
 
     });
diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php
index f8eb9b83..1070b34b 100644
--- a/app/Views/incomingSilicaSandDetails.php
+++ b/app/Views/incomingSilicaSandDetails.php
@@ -370,7 +370,7 @@
                                                 <!-- calculateRow() for every td change below -->
 
                                             <!-- 'td:eq(9)' -->
-                                                <td class="celda_normal">
+                                                <td class="celda_normal" id="totalSandQty">
                                                     <?php echo $record['Qty']??'0'; ?>
                                                 </td>   
 
@@ -715,11 +715,11 @@
 				
 			</thead>
 			<tbody>
-                <tr>
+                <tr >
                     <td align="center">10</td>
                     <td align="center">2.0</td>
                     <td align="center">2000</td>
-                    <td align="right" id="dwnld10MmId" contenteditable="true" oninput="calculateRow()"></td>
+                    <td align="right" id="dwnld10MmId" contenteditable="true" oninput="calculateRow(this)"></td>
                     <td align="center">5</td>
                     <td align="right" id="dwnld10MmFId"> </td>
                 </tr>
@@ -727,7 +727,7 @@
                     <td align="center">20</td>
                     <td align="center">0.85</td>
                     <td align="center">0850</td>
-                    <td align="right" id="dwnld20MmId"  contenteditable="true" oninput="calculateRow()"></td>
+                    <td align="right" id="dwnld20MmId"  contenteditable="true" oninput="calculateRow(this)"></td>
                     <td align="center">10</td>
                     <td align="right" id="dwnld20MmFId"></td>
                 </tr>
@@ -735,7 +735,7 @@
                     <td align="center">30</td>
                     <td align="center">0.60</td>
                     <td align="center">0600</td>
-                    <td align="right" id="dwnld30MmId"  contenteditable="true" oninput="calculateRow()"></td>
+                    <td align="right" id="dwnld30MmId"  contenteditable="true" oninput="calculateRow(this)"></td>
                     <td align="center">20</td>
                     <td align="right" id="dwnld30MmFId"></td>
                 </tr>
@@ -743,7 +743,7 @@
                     <td align="center">40</td>
                     <td align="center">0.42</td>
                     <td align="center">0425</td>
-                    <td align="right" id="dwnld40MmId"  contenteditable="true" oninput="calculateRow()"></td>
+                    <td align="right" id="dwnld40MmId"  contenteditable="true" oninput="calculateRow(this)"></td>
                     <td align="center">30</td>
                     <td align="right" id="dwnld40MmFId"></td>
                 </tr>
@@ -751,7 +751,7 @@
                     <td align="center">50</td>
                     <td align="center">0.30</td>
                     <td align="center">0300</td>
-                    <td align="right" id="dwnld50MmId"  contenteditable="true" oninput="calculateRow()"></td>
+                    <td align="right" id="dwnld50MmId"  contenteditable="true" oninput="calculateRow(this)"></td>
                     <td align="center">40</td>
                     <td align="right" id="dwnld50MmFId"></td>
                 </tr>
@@ -760,7 +760,7 @@
                     <td align="center">70</td>
                     <td align="center">0.21</td>
                     <td align="center">0212</td>
-                    <td align="right" id="dwnld70MmId"  contenteditable="true" oninput="calculateRow()"></td>
+                    <td align="right" id="dwnld70MmId"  contenteditable="true" oninput="calculateRow(this)"></td>
                     <td align="center">50</td>
                     <td align="right" id="dwnld70MmFId"></td>
                 </tr>
@@ -768,7 +768,7 @@
                     <td align="center">100</td>
                     <td align="center">0.15</td>
                     <td align="center">0150</td>
-                    <td align="right" id="dwnld100MmId"  contenteditable="true" oninput="calculateRow()"></td>
+                    <td align="right" id="dwnld100MmId"  contenteditable="true" oninput="calculateRow(this)"></td>
                     <td align="center">70</td>
                     <td align="right" id="dwnld100MmFId"></td>
                 </tr>
@@ -776,7 +776,7 @@
                     <td align="center">140</td>
                     <td align="center">0.106</td>
                     <td align="center">0106</td>
-                    <td align="right" id="dwnld140MmId"  contenteditable="true" oninput="calculateRow()"></td>
+                    <td align="right" id="dwnld140MmId"  contenteditable="true" oninput="calculateRow(this)"></td>
                     <td align="center">100</td>
                     <td align="right" id="dwnld140MmFId"></td>
                 </tr>
@@ -784,7 +784,7 @@
                     <td align="center">200</td>
                     <td align="center">0.075</td>
                     <td align="center">0075</td>
-                    <td align="right" id="dwnld200MmId"  contenteditable="true" oninput="calculateRow()"></td>
+                    <td align="right" id="dwnld200MmId"  contenteditable="true" oninput="calculateRow(this)"></td>
                     <td align="center">140</td>
                     <td align="right" id="dwnld200MmFId"></td>
                 </tr>
@@ -792,7 +792,7 @@
                     <td align="center">300</td>
                     <td align="center">0.053</td>
                     <td align="center">0053</td>
-                    <td align="right" id="dwnld300MmId"  contenteditable="true" oninput="calculateRow()"></td>
+                    <td align="right" id="dwnld300MmId"  contenteditable="true" oninput="calculateRow(this)"></td>
                     <td align="center">200</td>
                     <td align="right" id="dwnld300MmFId"></td>
                 </tr>
@@ -801,7 +801,7 @@
                     <td align="center">PAN</td>
                     <td align="center"></td>
                     <td align="center">PAN</td>
-                    <td align="right" id="dwnldPanId"  contenteditable="true" oninput="calculateRow()"></td>
+                    <td align="right" id="dwnldPanId"  contenteditable="true" oninput="calculateRow(this)"></td>
                     <td align="center">300</td>
                     <td align="right" id="dwnldPanFId"></td>
                 </tr>
@@ -1298,60 +1298,68 @@
 
 <script>
 
-function calculateRow(rowId){
-   var tr=$(`#`+rowId);
-   var qty=tr.find('td:eq(9)').text();
-   var _10 = tr.find('td:eq(10)').text(); 
-   var _20 = tr.find('td:eq(11)').text(); 
-   var _30 = tr.find('td:eq(12)').text(); 
-   var _40 = tr.find('td:eq(13)').text(); 
-   var _50 = tr.find('td:eq(14)').text(); 
-   var _70 = tr.find('td:eq(15)').text(); 
-   var _100 = tr.find('td:eq(16)').text(); 
-   var _140 = tr.find('td:eq(17)').text(); 
-   var _200 = tr.find('td:eq(18)').text(); 
-   var _300 = tr.find('td:eq(19)').text(); 
-   var pan = tr.find('td:eq(20)').text(); 
-   var total = tr.find('td:eq(21)').text(); 
-   var afsSpec = tr.find('td:eq(22)').text(); 
-   var afsActual = tr.find('td:eq(23)').text(); 
-   var plus20Loss = tr.find('td:eq(24)').text(); 
-   var plus30Loss = tr.find('td:eq(25)').text(); 
-   var moistureSpec = tr.find('td:eq(26)').text(); 
-   var moistureActual = tr.find('td:eq(27)').text(); 
-   var moistureLoss = tr.find('td:eq(28)').text(); 
-   var moistureLossQty = tr.find('td:eq(29)').text(); 
-   var sieveLossQty = tr.find('td:eq(30)').text(); 
-   var salableQty = tr.find('td:eq(31)').text();
+function calculateRow(value){
 
-   let newTotal =parseFloat(_10) +parseFloat(_20) +parseFloat(_30) +parseFloat(_40) +parseFloat(_50) +parseFloat(_70) +parseFloat(_100) +
-   parseFloat(_140) +parseFloat(_200) +parseFloat(_300) +parseFloat(pan);
-   //total td
-   tr.find('td:eq(21)').text(newTotal);
+   var table = $('#meshTableId');
+  
+   var tr = $(value).closest('tr');
+   var weighOfSand  = tr.find('td:eq(3)').text();
+   var factor       = tr.find('td:eq(4)').text();
+    tr.find('td:eq(5)').text(weighOfSand * factor);
    
-   let newPlus20Loss = parseFloat(_10) +parseFloat(_20) ;
-   //plus20Loss td
-   tr.find('td:eq(24)').text(newPlus20Loss);
 
-   let newPlus30Loss = parseFloat(_10) +parseFloat(_20) + parseFloat(_30) ;
-   //plus30Loss td
-   tr.find('td:eq(25)').text(newPlus30Loss); 
+   let result = table.tableToJSON();
+
+    let qty = $('#totalSandQty').val();
+    let totalWeighOfSand   =  0;
+    let totalFactoredValue =  0;
+    let afs = 0 ;
+    let newPlus20Loss = 0 ;
+    let newPlus30Loss = 0 ;
+    let newSieveLossQty = 0 ;
+
+   for(let i=0; i< result.length-2; i++){ // -2 because last two rows cannot be converted to proper table to json
+
+    if(i == 0 || i == 1){
+        newPlus20Loss  += Number(result[i]['WEIGH OF SAND']) ;
+    }
+
+    if(i == 0 || i == 1 || i== 2){
+
+        newPlus30Loss  += Number(result[i]['WEIGH OF SAND']) ;
+        
+        newSieveLossQty = Math.floor((parseFloat(qty) * newPlus30Loss) / 100) ;
+
+    }
+
+    totalWeighOfSand   += Number(result[i]['WEIGH OF SAND']) ;
+    totalFactoredValue += Number(result[i]['TOTAL']) ;
+    afs = (Number(totalFactoredValue)  / Number(totalWeighOfSand)).toFixed(2) ;
+
+    $('#dwnldWeighOfSand').text(totalWeighOfSand);
+    $('#dwnldTotalId').text(totalFactoredValue);
+    $('#dwnldAfsId').text(afs);
+
+
+    
+   }
+
 
    let newMoistureLoss = parseFloat(moistureActual) - parseFloat(moistureSpec) ;
-   //moistureLoss td
-   tr.find('td:eq(28)').text(newMoistureLoss);
 
-   let newMoistureLossQty = Math.round((parseFloat(qty) * newMoistureLoss) / 100 ) ;
-   //moistureLossqty td
-   tr.find('td:eq(29)').text(newMoistureLossQty.toLocaleString());
+    let newMoistureLossQty = Math.round((parseFloat(qty) * newMoistureLoss) / 100 ) ;
 
-   let newSieveLossQty = Math.floor((parseFloat(qty) * newPlus30Loss) / 100) ;
-   //sieveLossQty td
-   tr.find('td:eq(30)').text(newSieveLossQty.toLocaleString());
+    let newSalableQty   = Math.floor(parseFloat(qty) - newMoistureLossQty - newSieveLossQty) ;
+
+   console.log(totalWeighOfSand); //total
+   console.log(totalFactoredValue);
+   console.log(afs);
+
+
+
+   return;
+   
 
-   let newSalableQty = Math.floor(parseFloat(qty) - newMoistureLossQty - newSieveLossQty) ;
-   //salableQty td
-   tr.find('td:eq(31)').text(newSalableQty.toLocaleString());