From d0627e4b8ec8915103554b11d559be8d338d70e2 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 13 Mar 2025 17:48:22 +0530
Subject: [PATCH] changes in stock module 13-03-2025

---
 app/Views/editRawmaterial.php |   4 +-
 app/Views/editconfig.php      | 106 ++++++++++++++++++----------------
 2 files changed, 58 insertions(+), 52 deletions(-)

diff --git a/app/Views/editRawmaterial.php b/app/Views/editRawmaterial.php
index 76b374a8..c7de4012 100755
--- a/app/Views/editRawmaterial.php
+++ b/app/Views/editRawmaterial.php
@@ -113,7 +113,7 @@ if ($total <= $reorder) {
                 <div class="col-12">
                     <div class="page-title-box page-title-box-alt">
                         <h4 class="page-title">Edit Material - <?php echo $MaterialCode; ?> Details</h4>
-                        <button type="button" class="btn btn-secondary" onclick="history.back()">
+                        <button type="button" class="btn btn-secondary" onclick="window.location.href='<?= base_url() ?>rawmaterialListing'">
                             <span class="bold">Cancel</span>
                         </button>
                     </div>
@@ -307,7 +307,7 @@ if ($total <= $reorder) {
                                     </div>
                                 </div>
                                 <div class="box-footer text-right">
-                                    <button type="button" class="btn btn-secondary" onclick="history.back()">
+                                    <button type="button" class="btn btn-secondary" onclick="window.location.href='<?= base_url() ?>rawmaterialListing'">
                                         <span class="bold">Cancel</span>
                                     </button>
                                     <input type="button" id="editRawMaterialBtnId" class="btn btn-success" value="Submit" />
diff --git a/app/Views/editconfig.php b/app/Views/editconfig.php
index af880666..1fa1a7cc 100755
--- a/app/Views/editconfig.php
+++ b/app/Views/editconfig.php
@@ -247,45 +247,45 @@ if (!empty($master)) {
 
 
 
-        <!-- modal_sec_starts -->
+    <!-- modal_sec_starts -->
 
-            <!-- Modal For Add Configuration -->
-            <div class="modal fade" id="AddConfiguration" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-                aria-hidden="true">
-                <div class="modal-dialog">
-                    <div class="modal-content">
-                        <!-- Modal Header -->
-                        <div class="modal-header">
-                            <h4 class="modal-title" id="myModalLabel">Add Configuration</h4>
-                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                        </div>
+        <!-- Modal For Add Configuration -->
+        <div class="modal fade" id="AddConfiguration" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+            aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <!-- Modal Header -->
+                    <div class="modal-header">
+                        <h4 class="modal-title" id="myModalLabel">Add Configuration</h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                    </div>
 
-                        <!-- Modal Body -->
-                        <div class="modal-body">
-                            <form class="form-horizontal" role="form">
-                                <div class="form-group">
-                                    <div class="row">
-                                        <div class="col-md-4">
-                                            Configuration Value :
-                                        </div>
-                                        <div class="col-md-5">
-                                            <input class="form-control" name="AddConfigValue" id="AddConfigValue"
-                                                type="text">
-                                        </div>
+                    <!-- Modal Body -->
+                    <div class="modal-body">
+                        <form class="form-horizontal" role="form">
+                            <div class="form-group">
+                                <div class="row">
+                                    <div class="col-md-4">
+                                        Configuration Value :
+                                    </div>
+                                    <div class="col-md-5">
+                                        <input class="form-control" name="AddConfigValue" id="AddConfigValue"
+                                            type="text">
                                     </div>
                                 </div>
-                            </form>
-                        </div>
+                            </div>
+                        </form>
+                    </div>
 
-                        <!-- Modal Footer -->
-                        <div class="modal-footer">
-                            <a class="btn btn-success" style="background-color: grey;border: none;margin-right:10px"
-                                data-dismiss="modal">Cancel</a>
-                            <button type="button" class="btn btn-success font " id="tempClickAdd"> Add </button>
-                        </div>
+                    <!-- Modal Footer -->
+                    <div class="modal-footer">
+                        <a class="btn btn-success" style="background-color: grey;border: none;margin-right:10px"
+                            data-dismiss="modal">Cancel</a>
+                        <button type="button" class="btn btn-success font " id="tempClickAdd"> Add </button>
                     </div>
                 </div>
             </div>
+        </div>
 
     <!-- Modal For Edit Configuration -->
             <div class="modal fade" id="EditConfiguration" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
@@ -360,25 +360,25 @@ if (!empty($master)) {
             </div>
 
 
-            <!-- Material listing  Modal -->
-                <div class="modal fade" id="scrollable-modal" tabindex="-1" role="dialog" aria-labelledby="scrollableModalTitle" aria-hidden="true" style="max-width: 100%;">
-                    <div class="modal-dialog modal-dialog-scrollable" role="document" style="max-width: 50%;">
-                        <div class="modal-content">
-                            <div class="modal-header">
-                                <h5 class="modal-title" id="scrollableModalTitle"></h5>
-                                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                                    <span aria-hidden="true">&times;</span>
-                                </button>
-                            </div>
-                            <div class="modal-body">
-                                <!-- Table will be dynamically inserted here -->
-                            </div>
-                            <div class="modal-footer">
-                                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                            </div>
-                        </div><!-- /.modal-content -->
-                    </div><!-- /.modal-dialog -->
-                </div><!-- /.modal -->
+    <!-- Material listing  Modal -->
+        <div class="modal fade" id="scrollable-modal" tabindex="-1" role="dialog" aria-labelledby="scrollableModalTitle" aria-hidden="true" style="max-width: 100%;">
+            <div class="modal-dialog modal-dialog-scrollable" role="document" style="max-width: 50%;">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title" id="scrollableModalTitle"></h5>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <!-- Table will be dynamically inserted here -->
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                    </div>
+                </div><!-- /.modal-content -->
+            </div><!-- /.modal-dialog -->
+        </div><!-- /.modal -->
 
 
 
@@ -554,9 +554,15 @@ if (!empty($master)) {
 
         //this click function is used for showing material codes in modal window , MC created using a particular configuration value
             $(".config-category").click(function () {
+
+               
                     
                     const key_id = $(this).data("key");
+
                     const value = $(this).data("value");
+                    
+                    console.log(value);
+
                     $('#loader').show();
 
                     $('#scrollableModalTitle').text(`List of Materials created using ${value} `);