From 4b64e8dfc810547468fd26e799e10b8a153dfc68 Mon Sep 17 00:00:00 2001
From: vadivel J <jvadivel.1996@gmail.com>
Date: Fri, 4 Oct 2024 08:59:55 +0530
Subject: [PATCH] changes in factory module

---
 app/Controllers/FactoryMachineController.php    | 2 +-
 app/Views/factoryMachineMasterDetails.php       | 4 ++--
 app/Views/factoryMachineMasterDetailsCreate.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Controllers/FactoryMachineController.php b/app/Controllers/FactoryMachineController.php
index ba5025be..29611338 100644
--- a/app/Controllers/FactoryMachineController.php
+++ b/app/Controllers/FactoryMachineController.php
@@ -72,7 +72,7 @@ class FactoryMachineController extends BaseController
 
         $data['masterData'] = $this->factoryMachineMaster_model->where('id', $id)->where('is_active', 1)->first();
 
-        //here we are using create Factory Machine Master Detail view for
+        //here we are using same view - create Factory Machine Master Detail for
         // updating Factory Machine Master Detail   
 
         return $this->loadViews("factoryMachineMasterDetailsCreate", $this->global, $data, NULL);
diff --git a/app/Views/factoryMachineMasterDetails.php b/app/Views/factoryMachineMasterDetails.php
index ce4aa781..d6067f58 100644
--- a/app/Views/factoryMachineMasterDetails.php
+++ b/app/Views/factoryMachineMasterDetails.php
@@ -127,11 +127,11 @@
                                             <td align="center">
                                                 <a data-toggle="tooltip" 
                                                href="<?php echo base_url(); ?>loadView_updateFactoryMachineMasterDetail?id=<?php echo $record['id'] ?>"
-                                                target="new"><i class="fa fa-pencil-alt" data-toggle="tooltip" 
+                                                ><i class="fa fa-pencil-alt" data-toggle="tooltip" 
                                                 title="-  Click here to Edit "></i>
                                                                 &nbsp;&nbsp;&nbsp;
                                                 </a>
-                                            </td>
+                                            </td>   
                                         </tr>
                                 <?php
                                     }
diff --git a/app/Views/factoryMachineMasterDetailsCreate.php b/app/Views/factoryMachineMasterDetailsCreate.php
index da538921..be5281b4 100644
--- a/app/Views/factoryMachineMasterDetailsCreate.php
+++ b/app/Views/factoryMachineMasterDetailsCreate.php
@@ -88,7 +88,7 @@ $energyType=$masterData['energy_type']??'';
                                        
                                     <button type="submit"  class="btn btn-success">Submit</button>
                                     &nbsp;  
-                                    <button type="button"  class="btn btn-danger ">
+                                    <button type="button"  class="btn btn-danger" onclick="window.history.back();">
                                     Cancel</button>
                                     </div>