diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 7ca3546c..0ab28311 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -431,6 +431,10 @@ $routes->get('deleteCoatingMachineDetails' , 'StockController::deleteCoatingMach
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'drierMachineDetails', 'StockController::drierMachineDetails');
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addOrEditdrierMachineDetails', 'StockController::addOrEditdrierMachineDetails');
 
+$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'factoryVehicleDieselDetails', 'StockController::factoryVehicleDieselDetails');
+$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addOrEditfactoryVehicleDieselDetails', 'StockController::addOrEditfactoryVehicleDieselDetails');
+
+
 //incomingSilicaSandDetaails
 $routes->match(['GET','POST'],'incomingSilicaSandDetails', 'StockController::loadView_incomingSilicaSandDetails');
 $routes->post('updateIncomingSilicaSandDetails', 'StockController::updateIncomingSilicaSandDetails');
diff --git a/app/Controllers/Employeedetails.php b/app/Controllers/Employeedetails.php
index b6c0d291..4a150801 100755
--- a/app/Controllers/Employeedetails.php
+++ b/app/Controllers/Employeedetails.php
@@ -224,7 +224,6 @@ class Employeedetails extends BaseController
     $ContactNumber = $this->request->getPost('ContactNumber');
     $Gender =  $this->request->getPost('gender');
     $MartialStatus =  $this->request->getPost('MartialStatus');
-    $BloodGroup =  $this->request->getPost('bloodgroup');
     $CurrentAddress =  $this->request->getPost('currentaddress');
     $permanentaddress =  $this->request->getPost('permanentaddress');
     $desigination =  $this->request->getPost('desigination');
@@ -296,7 +295,6 @@ class Employeedetails extends BaseController
       'Gender' => $Gender,
       'DateofBirth' => $DOB,
       'ContactNumber' => $ContactNumber,
-      'BloodGroup' => $BloodGroup,
       'MartialStatus' => $MartialStatus,
       'DateofJoining' => $DOJ,
       'PreviousYearsOfExp' => $Previousexperience,
@@ -411,7 +409,6 @@ class Employeedetails extends BaseController
     $MartialConfigID = 'C012';
     $QualificationConfigID = 'C014';
     $DesignationConfigID = 'C010';
-    $BloodGroupConfigID = 'C011';
     $LocationConfigID = 'C031';
 
     $data['Gender'] = $this->employeedetails_model->getConfigValue($GenderConfigID);
@@ -419,7 +416,6 @@ class Employeedetails extends BaseController
     $data['bankdetails'] = $this->employeedetails_model->getBankDetails();
     $data['Qualification'] = $this->employeedetails_model->getConfigValue($QualificationConfigID);
     $data['Designation'] = $this->employeedetails_model->getConfigValue($DesignationConfigID);
-    $data['BloodGroup'] = $this->employeedetails_model->getConfigValue($BloodGroupConfigID);
     $data['Location'] = $this->employeedetails_model->getConfigValue($LocationConfigID);
     $data['Department'] = $this->employeedetails_model->getDepartment();
     $data['hra_rate'] = $this->appConfig->where('config_key', 1)->get()->getRow()->config_value;
@@ -582,7 +578,6 @@ class Employeedetails extends BaseController
     $MartialConfigID = 'C012';
     $QualificationConfigID = 'C014';
     $DesignationConfigID = 'C010';
-    $BloodGroupConfigID = 'C011';
     $LocationConfigID = 'C031';
 
     //print_r('hai');
@@ -590,7 +585,6 @@ class Employeedetails extends BaseController
     $data['MartialList'] = $this->employeedetails_model->getConfigValue($MartialConfigID);
     $data['QualificationList'] = $this->employeedetails_model->getConfigValue($QualificationConfigID);
     $data['DesignationList'] = $this->employeedetails_model->getConfigValue($DesignationConfigID);
-    $data['BloodGroupList'] = $this->employeedetails_model->getConfigValue($BloodGroupConfigID);
     $data['bankdetails'] = $this->employeedetails_model->getBankDetails();
     $data['Location'] = $this->employeedetails_model->getConfigValue($LocationConfigID);
     $data['DepartmentList'] = $this->employeedetails_model->getDepartment();
@@ -693,7 +687,6 @@ class Employeedetails extends BaseController
 
     $Gender =  $this->request->getPost('gender');
     $MartialStatus =  $this->request->getPost('MartialStatus');
-    $BloodGroup =  $this->request->getPost('bloodgroup');
     $CurrentAddress =  $this->request->getPost('currentaddress');
     $permanentaddress =  $this->request->getPost('permanentaddress');
     $desigination =  $this->request->getPost('desigination');
@@ -786,7 +779,6 @@ class Employeedetails extends BaseController
       'Gender' => $Gender,
       'DateofBirth' => $DOB,
       'ContactNumber' => $ContactNumber,
-      'BloodGroup' => $BloodGroup,
       'MartialStatus' => $MartialStatus,
       'DateofJoining' => $DOJ,
       'PreviousYearsOfExp' => $Previousexperience,
diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php
index 21b5750e..4168d9cc 100644
--- a/app/Controllers/StockController.php
+++ b/app/Controllers/StockController.php
@@ -5,6 +5,9 @@ namespace App\Controllers;
 use App\Controllers\BaseController;
 use App\Models\CoatingMachineDetailsModel;
 use App\Models\DrierMachineDetailsModel;
+use App\Models\FactoryMachineModel;
+use App\Models\FactoryVehicleDieselDetailsModel;
+use App\Models\FactoryVehicleDieselStockSummaryModel;
 use App\Models\IncomingSilicaSandDetailsModel;
 use App\Models\Inwardgateregister_model;
 use App\Models\Rawmaterialdetails_model;
@@ -16,10 +19,13 @@ class StockController extends BaseController
 
     protected  $coatingMachineDetails_model;
     protected  $drierMachineDetails_model;
+    protected  $factoryMachine_model;
+    protected  $factoryVehicleDieselDetails_model;
+    protected  $factoryVehicleDieselStockSummary_model;
+    protected $session;
     protected  $incomingSilicaSandDetails_model;
     protected  $inwardGateRegister_model;
     protected  $rawmaterialdetails_model;
-    protected  $session;
   
     /**
      * This is default constructor of the class
@@ -29,6 +35,9 @@ class StockController extends BaseController
       parent::__construct();
       $this->coatingMachineDetails_model = new CoatingMachineDetailsModel();
       $this->drierMachineDetails_model = new DrierMachineDetailsModel();
+      $this->factoryMachine_model = new FactoryMachineModel();
+      $this->factoryVehicleDieselDetails_model = new FactoryVehicleDieselDetailsModel();
+      $this->factoryVehicleDieselStockSummary_model = new FactoryVehicleDieselStockSummaryModel();
       $this->rawmaterialdetails_model  = new Rawmaterialdetails_model();
       $this->incomingSilicaSandDetails_model = new IncomingSilicaSandDetailsModel();
       $this->inwardGateRegister_model = new Inwardgateregister_model();
@@ -392,4 +401,14 @@ class StockController extends BaseController
         echo "Data successfully saved.";
     }
 
+
+    public function factoryVehicleDieselDetails()
+    {
+      
+        $machine = $this->factoryMachine_model->where('energy_type', 'diesel')->where('is_active', 1)->findAll(); 
+
+        dd($machine);
+
+    }
+
 }
diff --git a/app/Models/FactoryVehicleDieselDetailsModel.php b/app/Models/FactoryVehicleDieselDetailsModel.php
new file mode 100644
index 00000000..7a441358
--- /dev/null
+++ b/app/Models/FactoryVehicleDieselDetailsModel.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class FactoryVehicleDieselDetailsModel extends Model
+{
+    protected $table = 't_factoryVehicleDieselDetails';  
+    protected $primaryKey = 'id';                        
+
+    protected $allowedFields = [
+        'date',
+        'machine_id',
+        'opening_reading',
+        'closing_reading',
+        'filling_diesel',
+        'consumption',
+        'running_hours',
+        'mileage'
+    ];
+
+    protected $useTimestamps = true; 
+    protected $createdField = 'created_at';
+    protected $updatedField = 'updated_at';
+
+   
+}
diff --git a/app/Models/FactoryVehicleDieselStockSummaryModel.php b/app/Models/FactoryVehicleDieselStockSummaryModel.php
new file mode 100644
index 00000000..b3b37486
--- /dev/null
+++ b/app/Models/FactoryVehicleDieselStockSummaryModel.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class FactoryVehicleDieselStockSummaryModel extends Model
+{
+    protected $table = 't_factoryVehicleDieselStockSummary'; 
+    protected $primaryKey = 'id';                             
+
+    protected $allowedFields = [
+        'date',
+        'opening',
+        'purchase_diesel',
+        'filling_diesel',
+        'balance_stock'
+    ];
+
+    protected $useTimestamps = true;  
+    protected $createdField = 'created_at';
+    protected $updatedField = 'updated_at';
+
+   
+}
diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php
index 95b555e0..e7f19309 100755
--- a/app/Views/addEmployeenew.php
+++ b/app/Views/addEmployeenew.php
@@ -10,7 +10,6 @@
 <script>
     $(document).ready(function() {
         $("#gender").select2();
-        $("#bloodgroup").select2();
         $("#MartialStatus").select2();
         $("#desigination").select2();
         $("#work_location").select2();
@@ -513,8 +512,8 @@
                                                         <div class="col-md-4 pad"><label>Date Of Birth</label><span
                                                                 class="badge">*</span>
                                                             <input id="DateofBirth" required name="DateofBirth"
-                                                                onkeypress="return false;" maxlength="10"
-                                                                onchange="getAge();" class="form-control " data-provide="datepicker" data-date-format="dd-mm-yyyy">
+                                                                 maxlength="10"  onchange="getAge();" 
+                                                                 class="form-control "  data-date-format="dd-mm-yyyy">
                                                         </div>
                                                         <div class="col-md-4 pad"><label>Age</label>
                                                             <input type="text" name="age" id="age" class="form-control"
@@ -567,23 +566,7 @@
                                                     <div class="row mb-3">
 
 
-                                                        <div class="col-md-4 pad">
-                                                            <label>Blood group</label><span class="badge">*</span>
-                                                            <select class="form-control" id="bloodgroup" name="bloodgroup" required
-                                                                class="form-control select2">
-                                                                <option value="">Select Blood group</option>
-                                                                <?php
-                                                                if (!empty($BloodGroup)) {
-                                                                    foreach ($BloodGroup as $rl) {
-                                                                ?>
-                                                                        <option value="<?php echo $rl->ConfigValue ?>">
-                                                                            <?php echo $rl->ConfigValue ?></option>
-                                                                <?php
-                                                                    }
-                                                                }
-                                                                ?>
-                                                            </select>
-                                                        </div>
+                                                     
 
 
                                                         <div class="col-md-4 pad">
@@ -684,8 +667,8 @@
                                                         <div class="col-md-3"><label>Date Of Joining</label><span
                                                                 class="badge">*</span>
                                                             <input id="dateofjoining" name="dateofjoining"
-                                                                onkeypress="return false;" maxlength="10" required
-                                                                class="form-control" data-provide="datepicker" data-date-format="dd-mm-yyyy">
+                                                                 maxlength="10" required
+                                                                class="form-control"  data-date-format="dd-mm-yyyy">
                                                         </div>
                                                         <div class="col-md-3"><label>Previous Years of Experience</label>
                                                             <input type="text" id="Previousexperience" name="Previousexperience"
@@ -1229,11 +1212,7 @@
             return false;
         }
 
-        if ($("option:selected", $("#bloodgroup")).val() == "-1") {
-            alert('Please Select Blood group ');
-            $("#bloodgroup").focus();
-            return false;
-        }
+
         if ($("#currentaddress").val().length < 1) {
             alert('Please Enter  Current Address');
             return false;
diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php
index 72db588e..edf6deb2 100755
--- a/app/Views/editEmployeenew.php
+++ b/app/Views/editEmployeenew.php
@@ -17,7 +17,6 @@ $Gender = '';
 $DateofBirth = '';
 $ContactNumber = '';
 $EmailId = '';
-$BloodGroup = '';
 $MartialStatus = '';
 $DateofJoining = '';
 $PreviousYearsOfExp = '';
@@ -76,7 +75,6 @@ if (!empty($EmpDetails)) {
         $DOB = $from->format('d-m-Y');
         $ContactNumber = $Emp->ContactNumber;
         $EmailId = $Emp->EmailId;
-        $BloodGroup = $Emp->BloodGroup;
         $MartialStatus = $Emp->MartialStatus;
         $DateofJoining = $Emp->DateofJoining;
         $dtDOJ = new DateTime($DateofJoining);
@@ -405,31 +403,7 @@ if (!empty($EmpDetails)) {
 
                                                     <div class="row mb-3">
 
-                                                    <div class="col-md-4 pad">
-
-                                                            <label>Blood group</label><span class="badge">*</span>
-                                                            <select id="bloodgroup" name="bloodgroup" required
-                                                                class="form-control select2">
-                                                                <option value="<?php echo $BloodGroup; ?>">
-                                                                    <?php echo $BloodGroup ?>
-                                                                </option>
-                                                                <?php foreach ($BloodGroupList as $rl): ?>
-                                                                    <?php $rl1 = $rl->ConfigValue; ?>
-                                                                    <?php if (trim($rl1) != trim($BloodGroup)): ?>
-                                                                        <?php if (isset($_POST['BloodGroup']) && $_POST['BloodGroup'] == $rl1): ?>
-                                                                            <option value="<?= esc($rl1) ?>" selected="selected">
-                                                                                <?= esc($rl->ConfigValue) ?>
-                                                                            </option>
-                                                                        <?php else: ?>
-                                                                            <option value="<?= esc($rl1) ?>">
-                                                                                <?= esc($rl->ConfigValue) ?>
-                                                                            </option>
-                                                                        <?php endif; ?>
-                                                                    <?php endif; ?>
-                                                                <?php endforeach; ?>
-
-                                                            </select>
-                                                        </div>
+                                                    
 
 
                                                         <div class="col-md-4 pad">
@@ -953,9 +927,9 @@ if (!empty($EmpDetails)) {
                                                                 value="<?php echo $AadharNo; ?>" title=" : 12 digit number">
                                                         </div>
                                                         <div class="col-md-3">
-                                                            <label>PAN Number</label><span class="badge">*</span>
+                                                            <label>PAN Number</label>
                                                             <input type="text" id="panno" style="text-transform: uppercase"
-                                                                maxlength="10" name="panno" placeholder="PAN Number" required
+                                                                maxlength="10" name="panno" placeholder="PAN Number" 
                                                                 onchange="validatePAN();" class="form-control"
                                                                 value="<?php echo $PANNo; ?>"
                                                                 onkeypress="return alpha(event);"
@@ -1266,11 +1240,7 @@ if (!empty($EmpDetails)) {
             return;
         }
 
-        if ($("option:selected", $("#bloodgroup")).val() == "-1") {
-            alert('Please Select Blood group ');
-            $("#bloodgroup").focus();
-            return;
-        }
+       
         if ($("#currentaddress").val().length < 1) {
             alert('Please Enter  Current Address');
             return;
@@ -1508,7 +1478,6 @@ if (!empty($EmpDetails)) {
 
     $(document).ready(function() {
         $("#gender").select2();
-        $("#bloodgroup").select2();
         $("#MartialStatus").select2();
         $("#desigination").select2();
         $("#departmentname").select2();