The-Mechanic/the_mechanic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CHANGE_vehicle_module:GWM

Browse Source
This commit is contained in:
bitbucket 2024-04-08 13:38:16 +05:30
parent 1d182191c0
commit 1022a2cca3
4 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Controllers/Vehicle.php
View File

@ -4,11 +4,22 @@ namespace App\Controllers;
use App\Models\VehicleModel; use App\Models\VehicleModel;
use App\Models\ClientModel; use App\Models\ClientModel;
use App\Models\RoleModel; use App\Models\RoleModel;
use App\Models\BikemakeModel;
use App\Models\BikemodelsModel;
class Vehicle extends BaseController class Vehicle extends BaseController
{ {
public $session;
public function __construct()
{
$this->session = session();
$this->bikeMakeModel = new BikemakeModel();
$this->bikeModelsModel = new BikemodelsModel();
}
public function vehicle_index() public function vehicle_index()
{ {
@ -43,6 +54,7 @@ class Vehicle extends BaseController
$data['client']=$client; $data['client']=$client;
} }
$data['vehicle_id'] = $vehicle_id; $data['vehicle_id'] = $vehicle_id;
$data['makeData'] =$this->bikeMakeModel->findAll();
return view('vehicle_form',$data); return view('vehicle_form',$data);
} }

2
app/Views/layout/footer.php
View File

@ -35,7 +35,7 @@
<!-- /Right-bar --> <!-- /Right-bar -->
<!-- Right bar overlay--> <!-- Right bar overlay-->
<div class="rightbar-overlay"></div>
<!-- Vendor js --> <!-- Vendor js -->
<script src="<?php echo base_url(); ?>/assets/js/vendor.min.js"></script> <script src="<?php echo base_url(); ?>/assets/js/vendor.min.js"></script>

5
app/Views/layout/header.php
View File

@ -98,10 +98,11 @@
<?php } ?> <?php } ?>
<?php if(session()->get('logged_user_role') == 'Floor Manager' || <?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> <li>
<a href="<?php echo base_url('vehicle_index') ?>"> <a href="<?php echo base_url('vehicle_index') ?>">
<i class="ri-message-2-line"></i> <i class="mdi mdi-motorbike"></i>
<span> Vehicle </span> <span> Vehicle </span>
</a> </a>
</li> </li>

33
app/Views/vehicle_form.php
View File

@ -25,7 +25,16 @@
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="inputPassword4" class="col-form-label">Make</label> <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>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="inputPassword4" class="col-form-label">Model</label> <label for="inputPassword4" class="col-form-label">Model</label>
@ -121,6 +130,11 @@ $(document).ready(function() {
$('input[name="postalcode"]').val(selectedClient.postal_code); $('input[name="postalcode"]').val(selectedClient.postal_code);
} }
}); });
$(".SelExample").select2();
}); });
</script> </script>
@ -128,3 +142,20 @@ $(document).ready(function() {
// Define the clients array and populate it with data // Define the clients array and populate it with data
var clients = <?php echo json_encode($client); ?>; var clients = <?php echo json_encode($client); ?>;
</script> </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>