From 1022a2cca337329f74a971b72f89ec8ccb2c2ae6 Mon Sep 17 00:00:00 2001
From: bitbucket <bitbucket@venbainfotech.com>
Date: Mon, 8 Apr 2024 13:38:16 +0530
Subject: [PATCH] CHANGE_vehicle_module:GWM

---
 app/Controllers/Vehicle.php | 12 ++++++++++++
 app/Views/layout/footer.php |  2 +-
 app/Views/layout/header.php |  5 +++--
 app/Views/vehicle_form.php  | 35 +++++++++++++++++++++++++++++++++--
 4 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/app/Controllers/Vehicle.php b/app/Controllers/Vehicle.php
index c75918e..56fdebb 100644
--- a/app/Controllers/Vehicle.php
+++ b/app/Controllers/Vehicle.php
@@ -4,10 +4,21 @@ namespace App\Controllers;
 use App\Models\VehicleModel;
 use App\Models\ClientModel;
 use App\Models\RoleModel;
+use App\Models\BikemakeModel;
+use App\Models\BikemodelsModel;
 
 
 class Vehicle extends BaseController
 {
+
+
+    public $session;
+    public function __construct()
+	{
+		$this->session = session();
+        $this->bikeMakeModel = new BikemakeModel();
+        $this->bikeModelsModel = new BikemodelsModel();
+    }
  
     public function vehicle_index()
     {
@@ -43,6 +54,7 @@ class Vehicle extends BaseController
             $data['client']=$client;       
         }
             $data['vehicle_id'] = $vehicle_id;
+            $data['makeData'] =$this->bikeMakeModel->findAll();
    
         return view('vehicle_form',$data);
     }
diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php
index a8aa427..18a13c8 100644
--- a/app/Views/layout/footer.php
+++ b/app/Views/layout/footer.php
@@ -35,7 +35,7 @@
 <!-- /Right-bar -->
 
 <!-- Right bar overlay-->
-<div class="rightbar-overlay"></div>
+
 
         <!-- Vendor js -->
         <script src="<?php echo base_url(); ?>/assets/js/vendor.min.js"></script>
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 52bf83a..88d37a8 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -98,10 +98,11 @@
                             <?php } ?>
 
                             <?php if(session()->get('logged_user_role') == 'Floor Manager' || 
-                                    session()->get('logged_user_role') == 'Job Card Manager') { ?>
+                                    session()->get('logged_user_role') == 'Job Card Manager' ||
+                                    session()->get('logged_user_role') == 'Store Manager') { ?>
                                 <li>
                                     <a href="<?php echo base_url('vehicle_index') ?>">
-                                        <i class="ri-message-2-line"></i>
+                                        <i class="mdi mdi-motorbike"></i>
                                         <span> Vehicle </span>
                                     </a>
                                 </li>
diff --git a/app/Views/vehicle_form.php b/app/Views/vehicle_form.php
index c5475ca..eceeb51 100644
--- a/app/Views/vehicle_form.php
+++ b/app/Views/vehicle_form.php
@@ -25,7 +25,16 @@
                     <div class="form-row">
                     <div class="form-group col-md-4">
                             <label for="inputPassword4" class="col-form-label">Make</label>
-                            <input type="text" class="form-control" name="make" placeholder="Make"value="<?= isset($vehicle['make']) ? $vehicle['make'] : '' ?>" required>
+                            <select class="form-control SelExample" name="make"   <?= isset($vehicle['make']) ? '' : 'required' ?>>
+                            <?= isset($vehicle['make']) ? '' : '<option value="">Select a Make</option>' ?>
+                            <?php foreach ($makeData as $value) : ?>
+                            <?php if ((int)$value["isactive"] === 1) : ?>
+                                <option value="<?= $value["make_id"] ?>" <?= isset($vehicle['make']) && $vehicle['make'] == $value["make_id"] ? 'selected' : '' ?>>
+                                    <?= $value["make"]; ?>
+                                </option>
+                            <?php endif; ?>
+                            <?php endforeach; ?>
+                            </select>
                         </div>
                         <div class="form-group col-md-4">
                             <label for="inputPassword4" class="col-form-label">Model</label>
@@ -121,10 +130,32 @@ $(document).ready(function() {
             $('input[name="postalcode"]').val(selectedClient.postal_code);
         }
     });
+
+
+    
+    $(".SelExample").select2();
+ 
 });
 
 </script>
 <script>
     // Define the clients array and populate it with data
     var clients = <?php echo json_encode($client); ?>;
-</script>
\ No newline at end of file
+</script>
+
+<style>
+    .select2-container--default .select2-results__option--highlighted[aria-selected]{
+        color:#ffffff;
+        background: #526dee!important;
+    }
+    .select2-container .select2-selection--single{
+        height: 36px;
+        border:1px solid #ced4da;
+    }
+    .select2-container--default .select2-selection--single .select2-selection__rendered{
+        line-height: 36px;
+    }
+    .select2-container--default .select2-selection--single .select2-selection__arrow{
+        top:4px;
+    }
+</style>    
\ No newline at end of file