diff --git a/app/Controllers/Jobcard.php b/app/Controllers/Jobcard.php
index c2d7503..e431e12 100755
--- a/app/Controllers/Jobcard.php
+++ b/app/Controllers/Jobcard.php
@@ -395,7 +395,8 @@ class Jobcard extends BaseController
     public function new_jobcard($job_card_id,$rework = null)
     {
         if ($job_card_id === '0') {
-           $data['page_name']="Create Job Card";
+
+            $data['page_name']="Create Job Card";
             $data['jobs'] = [];  
             $data['jobcardfiles'] = [];  
             $ClientModel = new ClientModel();
@@ -598,13 +599,14 @@ class Jobcard extends BaseController
             $data['logged_user_role'] = $this->session->get('logged_user_role');
             if($rework == 're-work') { $data['rework']= true; }
 
-            if($this->session->get('logged_user_role') == "Floor Manager")
-            {
-                $RoleModel = new RoleModel();
-                $data['workers'] = $RoleModel->get_workers($this->session->get('logged_user_branch_id'));
+           
                 
-            }
+          
+            
         }
+
+        $RoleModel = new RoleModel();
+        $data['workers'] = $RoleModel->get_workers($this->session->get('logged_user_branch_id'));
         $data['job_card_id'] = $job_card_id;
         $bikeMakeModel = new BikeMakeModel();
         $data['makeData'] =$bikeMakeModel->findAll();
@@ -617,13 +619,8 @@ class Jobcard extends BaseController
     
     public function add_jobs()
     {
-        // echo $this->request->getPost('issued_items');die;
-        // echo $this->request->getPost('products');die;
-        // echo $this->request->getPost('delete_items');die;
-        // echo $this->request->getPost('issued_items');die;
-        // echo json_encode($this->request->getPost());die;
-        // echo "<pre>";
-        // print_r($this->request->getPost());die;
+
+      // dd($this->request->getPost());
         $JobcardModel = new JobcardModel();
         if($this->session->get('logged_user_role') == "Store Manager") {
             $data['status'] = $this->request->getPost('status');
@@ -663,14 +660,14 @@ class Jobcard extends BaseController
             'note'=> $this->request->getPost('note'),
             'status'=> $this->request->getPost('status'),
             'assigned_to'=> json_encode($this->request->getPost('assigned_to')),
-            'subtotal'=> $this->request->getPost('sub_total'), // (isset($rework) ? 0 : $this->request->getPost('sub_total') ),
-            'tax'=> $this->request->getPost('invoicetax'), //(isset($rework) ? 0 : $this->request->getPost('invoicetax') ),
-            'discount'=> $this->request->getPost('discount'), //($this->request->getPost('discount')) == '' ? 0 :  $this->request->getPost('discount'),
-            'total'=> $this->request->getPost('grand_total'), //(isset($rework) ? 0 : $this->request->getPost('grand_total') ),
+            'trial_mechanic'=> $this->request->getPost('trial_mechanic'),
+            'subtotal'=> $this->request->getPost('sub_total'), 
+            'tax'=> $this->request->getPost('invoicetax'), 
+            'discount'=> $this->request->getPost('discount'), 
+            'total'=> $this->request->getPost('grand_total'),
             'isactive' => 1
         ];
-        // echo "<pre>";
-        // print_r($job_card_data);die;
+       
         $status = $this->request->getPost('status'); 
         // Insert or update sales order
         $job_card_id = $this->request->getPost('job_card_id');
@@ -698,17 +695,13 @@ class Jobcard extends BaseController
                 $orderNumber = 'JC-' . date('md') . '-' . str_pad($job_card_id, 5, '0', STR_PAD_LEFT);
                 $JobcardModel->update($job_card_id, ['order_number' => $orderNumber]);
             }
-            // print_r($orderNumber);die;
-            // Update sales order with generated order number
+           
         }
                                                             
         /********** INSERT SERVICE DATA ************/
         $data = json_decode($_POST['products']);
         $service_data = $data[0]->service;
 
-                // echo "<pre>";
-        // print_r($service_data);die;
-
         foreach ($service_data as $item) {
             // Insert into the service table
             $service['job_card_id'] = $job_card_id;
diff --git a/app/Models/JobcardModel.php b/app/Models/JobcardModel.php
index 009a23a..25caa33 100755
--- a/app/Models/JobcardModel.php
+++ b/app/Models/JobcardModel.php
@@ -9,7 +9,7 @@ class JobcardModel extends Model
     'order_number','client_mobile_no','client_name',
     'billing_address','billing_city','billing_state','billing_country',
     'billing_postal_code','fuel_qty', 'meter', 'delivery_date', 'note',
-    'status','assigned_to', 'is_rework','subtotal','tax', 'discount','total','isactive','mode_of_payment'];
+    'status','assigned_to', 'is_rework','subtotal','tax', 'discount','total','isactive','mode_of_payment','trial_mechanic'];
 
 
 
diff --git a/app/Models/RoleModel.php b/app/Models/RoleModel.php
index e300cb2..4bde616 100755
--- a/app/Models/RoleModel.php
+++ b/app/Models/RoleModel.php
@@ -21,7 +21,7 @@ class RoleModel extends Model
         $this->join('users', 'users.role = roles.role_id');
         $this->where('roles.isactive', 1);
         $this->where('users.isactive', 1);
-        $this->whereIn('roles.roles', ['Mechanic','Helper']);
+        $this->whereIn('roles.roles', ['Senior Mechanic','Mechanic','Helper']);
         $this ->where('users.branch_id',$logged_user_branch_id);
         return $this->findAll();
     }
diff --git a/app/Views/job_card_form.php b/app/Views/job_card_form.php
index 9623e56..c2ebe21 100755
--- a/app/Views/job_card_form.php
+++ b/app/Views/job_card_form.php
@@ -22,17 +22,28 @@
         top:4px;
     }
 
-    .select2-container .select2-selection--multiple{
-        height: 36px;
-        border:1px solid #ced4da;
-    }
-    .select2-container--default .select2-selection--multiple .select2-selection__rendered{
-        line-height: 36px;
-    }
-    .select2-container--default .select2-selection--multiple .select2-selection__arrow{
-        top:4px;
-    }
+   
 </style>  
+<style>
+    .select2-container .select2-selection--multiple .select2-selection__choice{
+        padding: 5px 7px 5px 0 !important;
+        color: #000000;
+       
+    }
+    .select2-container--default .select2-results__option--highlighted[aria-selected]{
+        color:#ffffff;
+        background-color: #526dee;
+    }
+    .select2-container--default .select2-results__option{
+        border-bottom: 1px solid #dddddd;
+    }
+    .select2-container--default .select2-results__option[aria-selected=true]{
+        color: #000000;
+        background-color: #3efba4;
+        font-weight: 500; 
+        border-bottom: 1px solid #747474;  
+    }
+</style>
 <div class="row">
         <div class="col-12">
             <div class="page-title-box page-title-box-alt">
@@ -153,20 +164,36 @@
                                     <?php endif; ?>
                                 </select>
                             </div>
-                            <?php if(isset($workers) && $jobs['status'] == 'Created') { ?>
+                            <?php if(isset($workers)) { ?>
+
                                 <div class="form-group col-md-3">
                                     <label for="inputPassword4" class="col-form-label">Assign To</label>
-                                    <select class="form-control SelExample" name="assigned_to[]" id="assigned_to" multiple>
-                                    <?= isset($jobs['assigned_to']) ? '' : '<option value="">Select a Make</option>' ?>
+                                    <select class="form-control SelExample" name="assigned_to[]" id="assigned_to"  data-toggle="select2" multiple>
+                                    <?= isset($jobs['assigned_to']) ? '' : '<option value="">Select a Mechanic</option>' ?>
                                     <?php foreach ($workers as $value) : ?>
                                     <?php if ((int)$value["isactive"] === 1) : ?>
                                         <option value="<?= $value["user_id"] ?>" <?= isset($jobs['assigned_to']) && is_array(json_decode($jobs['assigned_to'])) && in_array($value["user_id"], json_decode($jobs['assigned_to'])) ? 'selected' : ''; ?>>
-                                            <?= $value["name"]; ?>
+                                            <?= $value["name"]." - ".$value['roles']; ?>
                                         </option>
                                     <?php endif; ?>
                                     <?php endforeach; ?>
                                     </select>
                                 </div>
+
+                                <div class="form-group col-md-3">
+                                    <label for="inputPassword4" class="col-form-label">Trial Mechanic</label>
+                                    <select class="form-control SelExample" name="trial_mechanic" id="trial_mechanic"  data-toggle="select2" >
+                                    <?= isset($jobs['trial_mechanic']) ? '' : '<option value="">Select a Mechanic</option>' ?>
+                                    <?php foreach ($workers as $value) : ?>
+                                    <?php if ((int)$value["isactive"] === 1) : ?>
+                                        <option value="<?= $value["user_id"] ?>" <?= isset($jobs['trial_mechanic']) &&  $value["user_id"] = $jobs['trial_mechanic'] ? 'selected' : ''; ?>>
+                                            <?= $value["name"]." - ".$value['roles']; ?>
+                                        </option>
+                                    <?php endif; ?>
+                                    <?php endforeach; ?>
+                                    </select>
+                                </div>
+                                
                             <?php } ?>
                             <div class="form-group col-md-6">
                                 <label for="inputPassword4" class="col-form-label">Note<span class="text-danger"></span></label>
@@ -2080,14 +2107,14 @@ $closestTR.remove();
 
 <script>
     $(document).ready(function(){
-    // Initialize select2
-    $(".SelExample").select2();
+        // Initialize select2
+        $(".SelExample").select2();
     });
     function initializeSelect2() {
-    $('.SelExample').select2({
-      width: '249px' // Adjust width as needed
-    });
-  }
+        $('.SelExample').select2({
+        width: '249px' // Adjust width as needed
+        });
+     }
 </script>   
 <script> 
     $(document).ready(function() {