From 1fbe885b502d4bb637d0e7f4e98c40710789cf03 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Sat, 11 Jan 2025 19:06:21 +0530
Subject: [PATCH] stock module latest today  vadivel J 11-1-2025

---
 app/Controllers/StockController.php     | 37 +++++----
 app/Models/Rawmaterialdetails_model.php | 16 +++-
 app/Views/drierMachineDetails.php       |  1 +
 app/Views/incomingSilicaSandDetails.php | 99 +++++++++++++++++++++++--
 4 files changed, 131 insertions(+), 22 deletions(-)

diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php
index 61271b8a..67ef970f 100644
--- a/app/Controllers/StockController.php
+++ b/app/Controllers/StockController.php
@@ -324,7 +324,18 @@ class StockController extends BaseController
 
         $this->global['pageTitle'] = 'Incoming Silica Sand Details';
 
-        $materialCodes = $this->rawmaterialdetails_model->getAllSilicaRawMaterialCode();
+        $materialCodes = [];
+
+        $silicaSandMaterialCodes = $this->rawmaterialdetails_model->getAllSilicaRawMaterialCode();
+
+        $materialCodes [] = $silicaSandMaterialCodes;
+
+        $wasteCoreSandMaterialCodes = $this->rawmaterialdetails_model->getAllWasteCoreSandMaterialCode();
+
+        $materialCodes [] = $wasteCoreSandMaterialCodes;
+
+        $materialCodes = call_user_func_array('array_merge', $materialCodes);
+
 
         if (!empty($materialCodes)) {
             $data['igrDetails'] = $this->inwardGateRegister_model->findIgrDetailsForIncomingSilicaSand($materialCodes, $month, $remark);
@@ -423,16 +434,16 @@ class StockController extends BaseController
         $dbData = [
             'igrNo_fk'     => $postData['igrNo'],
             'materialCode' => $postData['materialCode'],
-            '_10' => $postData['10Mm'],
-            '_20' => $postData['20Mm'],
-            '_30' => $postData['30Mm'],
-            '_40' => $postData['40Mm'],
-            '_50' => $postData['50Mm'],
-            '_70' => $postData['70Mm'],
-            '_100' => $postData['100Mm'],
-            '_140' => $postData['140Mm'],
-            '_200' => $postData['200Mm'],
-            '_300' => $postData['300Mm'],
+            '_10' => $postData['_10Mm'],
+            '_20' => $postData['_20Mm'],
+            '_30' => $postData['_30Mm'],
+            '_40' => $postData['_40Mm'],
+            '_50' => $postData['_50Mm'],
+            '_70' => $postData['_70Mm'],
+            '_100' => $postData['_100Mm'],
+            '_140' => $postData['_140Mm'],
+            '_200' => $postData['_200Mm'],
+            '_300' => $postData['_300Mm'],
             'pan'  => $postData['pan'],
             'total'          => $postData['total'],
             'plus20Loss'     => $postData['plus20Loss'],
@@ -459,9 +470,9 @@ class StockController extends BaseController
 
 
         if ($updated) {
-            return redirect()->back()->with('success', 'Data Saved Successfully..!!');
+            return $this->response->setJSON(['status' => 'success', 'message' => 'Data Updated Successfully']);
         } else {
-            return redirect()->back()->with('error', 'Error Saving Data..!!');
+            return $this->response->setJSON(['status' => 'error', 'message' => 'Failed to update data']);
         }
     }
 
diff --git a/app/Models/Rawmaterialdetails_model.php b/app/Models/Rawmaterialdetails_model.php
index ccf87edc..6696437a 100755
--- a/app/Models/Rawmaterialdetails_model.php
+++ b/app/Models/Rawmaterialdetails_model.php
@@ -144,12 +144,24 @@ class Rawmaterialdetails_model extends Model
 
         $builder = $this->db->table('t_materialmaster')
         ->select('MaterialCode')
-        ->like('LOWER(MaterialName)', 'silica sand')
+        ->where('Category', 'silica sand')
         ->orderBy('CreatedDate', 'desc');
         $query = $builder->get();
         $materialResults = $query->getResultArray();
 
-       return $materialCodes = array_column($materialResults, 'MaterialCode');
+       return  array_column($materialResults, 'MaterialCode');
+    }
+
+    function getAllWasteCoreSandMaterialCode(){
+
+        $builder = $this->db->table('t_materialmaster')
+        ->select('MaterialCode')
+        ->where('Category', 'waste core')
+        ->orderBy('CreatedDate', 'desc');
+        $query = $builder->get();
+        $materialResults = $query->getResultArray();
+
+       return  array_column($materialResults, 'MaterialCode');
     }
 
     function getAllBagMaterialCode(){
diff --git a/app/Views/drierMachineDetails.php b/app/Views/drierMachineDetails.php
index 16842267..63640b21 100644
--- a/app/Views/drierMachineDetails.php
+++ b/app/Views/drierMachineDetails.php
@@ -653,6 +653,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
 
             console.log('alldata', alldata);
 
+             
             $('#drierTable tbody tr:visible').each(function(index) {
 
              if (alldata[index]) {
diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php
index 6583336c..5ed1bba2 100644
--- a/app/Views/incomingSilicaSandDetails.php
+++ b/app/Views/incomingSilicaSandDetails.php
@@ -354,7 +354,7 @@
 
                                             <!-- 'td:eq(7)' --> 
                                                 <td class="celda_normal" style="color:#02d0eb;  background:white;"  contenteditable="true">
-                                                <select class="status grade-condition" style="width:100px;">
+                                                <select class="status grade-condition select2" style="width:100px;">
                                                         <option value="">Select</option>
                                                         <option value="wet"
                                                         <?php echo ($record['gradeCondition'] == 'wet') ? "selected":''; ?>
@@ -499,7 +499,7 @@
 
                                             <!-- 'td:eq(33)' -->
                                                 <td class="celda_normal" style="color:#02d0eb;  background:white;"  contenteditable="true">
-                                                <select class="status sand-status" style="width:210px;">
+                                                <select class="status sand-status select2" style="width:210px;">
                                                         <option value="noRemark">Select</option>
                                                         <option value="accepted"
                                                         <?php echo ($record['remark'] == 'accepted') ? "selected":''; ?>
@@ -576,7 +576,7 @@
       <div class="modal-body p-4" id="content">
       <div style="text-align: right;"><small>REF:RIPL/DAD/R02</small></div>
 
-      <form action="<?php echo base_url('/updateLabReport')?>" method="POST">
+      <form >
         <header class="clearfix">
         <div class="row">
             <div class="col-3" width="100px;">
@@ -643,9 +643,11 @@
                          id="dwnldGradeId">50-60</td>
                 </tr>
                 <tr>
+
                 <td style="text-align: left !important; width:25%;"><b>Clay %</b></td>
                     <td  contenteditable="true"  
                          id="dwnldClayId">20</td>
+
                 </tr>
                 <tr>
                 <td style="text-align: left !important; width:25%;"><b>Moisture Actual %</b></td>
@@ -825,9 +827,21 @@
               
                 <tr >
                     <th contenteditable="true" 
-                    style="text-align: center !important; height: 50px;">&nbsp;&nbsp;</th>
+                    style="text-align: center !important;">
+
+                    <select class="test-or-approve select2" name="testedBy" id="testedById">
+                       <option value="0"> </option>
+                    </select>
+                
+                </th>
                     <th contenteditable="true"   
-                    style="text-align: center !important; height: 50px;">&nbsp;&nbsp;</th>
+                    style="text-align: center !important; ">
+                
+                    <select class="test-or-approve select2" name="approvedBy" id="approvedById">
+                        <option value="0">Select</option>
+                    </select>
+
+                </th>
                 </tr>
                 <tr >
                     <th style="text-align: center !important;">Tested By</th>
@@ -869,7 +883,7 @@
 
       <div class="modal-footer">
         <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-        <button type="submit" class="btn btn-success" >Save</button>
+        <button type="button" id="labReportSubmitId" class="btn btn-success" >Save</button>
         <button type="button" id="pdfGenerateId" class="btn btn-primary">Download</button>
       </div>
     </form>
@@ -1262,8 +1276,79 @@
 <!-- adding select 2  -->
 <script>
 
-     $('.status').select2({
+$(document).ready(function() {
+        $('.sand-status' ).select2({
             placeholder: "Select",
         });
 
+        $('.grade-condition' ).select2({
+            placeholder: "Select",
+        });
+        $('.test-or-approve' ).select2({
+            placeholder: "Select",
+        });
+
+    });
+   
+
+      
+
+</script>
+
+
+<script>
+    $('#labReportSubmitId').click(function(){
+
+        $.ajax({
+         url  : "<?php echo base_url('/updateLabReport')?>",
+         type : "POST",
+         data : {
+            id              : $('#issdId').val(),
+            igrNo           : $('#igrNo').val(),
+            materialCode    : $('#materialCode').val(),
+            qty             : $('#qty').val(),
+            _10Mm           : $('#10Mm').val(),
+            _20Mm           : $('#20Mm').val(),
+            _30Mm           : $('#30Mm').val(),
+            _40Mm           : $('#40Mm').val(),
+            _50Mm           : $('#50Mm').val(),
+            _70Mm           : $('#70Mm').val(),
+            _100Mm          : $('#100Mm').val(),
+            _140Mm          : $('#140Mm').val(),
+            _200Mm          : $('#200Mm').val(),
+            _300Mm          : $('#300Mm').val(),
+            pan             : $('#pan').val(),
+            total           : $('#total').val(),
+            moistureSpec    : $('#moistureSpec').val(),
+            moistureActual  : $('#moistureActual').val(),
+            moistureLoss    : $('#moistureLoss').val(),
+            moistureLossQty : $('#moistureLossQty').val(),
+            plus20Loss      : $('#plus20Loss').val(),
+            plus30Loss      : $('#plus30Loss').val(),
+            sieveLossQty    : $('#sieveLossQty').val(),
+            salableQty      : $('#salableQty').val(),
+            remark          : $('#dwnldAcceptedId').text(),
+            gradeCondition  : $('#dwnldGradeId').text()
+         },
+         success: function(data){
+            alert("Data Saved Successfully..!!");
+            console.log(data);
+            window.location.reload();
+         },
+         error : function(xhr, status, error){
+            alert("An error occurred while processing the request. Please try again.");        
+            console.error("Error Code:", xhr.status);     
+            console.error("Error Message:", error);        
+            console.error("Response Text:", xhr.responseText);  
+         }
+         ,
+         complete: function(){
+            $('#loader').hide();  
+            console.log("ajax call is completed..!!")
+         }
+         
+        })
+      
+       
+    })
 </script>
\ No newline at end of file