diff --git a/application/config/testing/database.php b/application/config/testing/database.php
index e6c4a9c..55ec504 100644
--- a/application/config/testing/database.php
+++ b/application/config/testing/database.php
@@ -78,7 +78,7 @@
 	'hostname' => 'localhost',
 	'username' => 'root',
 	'password' => '',
-	'database' => 'ams',
+	'database' => 'test',
 	'dbdriver' => 'mysqli',
 	'dbprefix' => '',
 	'pconnect' => FALSE,
diff --git a/application/config/testing/routes.php b/application/config/testing/routes.php
index f17dbb6..f00df48 100644
--- a/application/config/testing/routes.php
+++ b/application/config/testing/routes.php
@@ -54,5 +54,5 @@
 $route['translate_uri_dashes'] = FALSE;
 
 //modules routes
-$route['logout'] = 'auth/logout';
-$route['login'] = 'auth';
+$route['logout'] = 'Auth/logout';
+$route['login'] = 'Auth';
diff --git a/application/core/Admin_Controller.php b/application/core/Admin_Controller.php
index e518d3a..240bc65 100644
--- a/application/core/Admin_Controller.php
+++ b/application/core/Admin_Controller.php
@@ -29,6 +29,7 @@ public function __construct()
         }
         $global_data['settings'] = $this->auth_model->get_settings();
         $global_data['business'] = $this->auth_model->get_business(0);
+        // print_r($global_data['business']);
         $this->load->vars($global_data);
         $this->load->library('user_agent');
         
diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php
index f10541b..4ee740f 100644
--- a/application/core/MY_Controller.php
+++ b/application/core/MY_Controller.php
@@ -47,8 +47,9 @@ public function __construct()
         // Copyright
         // $this->global_data['copyright_from_mycontroller'] = $date;
         // $this->load->vars($this->global_data);
-        $this->load->module('layout'); 
-		$this->load->module('audit');
+        ### Syntax : $this->load->module('module_name', $params, $object_name);
+        $this->load->module('Layout'); 
+		$this->load->module('Audit');
 		
     }
 }
diff --git a/application/core/MY_Model.php b/application/core/MY_Model.php
index b89a38a..52f739f 100644
--- a/application/core/MY_Model.php
+++ b/application/core/MY_Model.php
@@ -34,6 +34,8 @@ function edit_option_md5($action, $id, $table){
     function update($action,$id,$table){
         $this->db->where('id',$id);
         $this->db->update($table,$action);
+       
+
     }
 
     // update function
@@ -120,11 +122,38 @@ function select_by_business_id($table,$business_id)
         $this->db->select();
         $this->db->from($table);
         $this->db->where('business_id', $business_id);
+        // $this->db->where('is_active ', 1);
         $this->db->order_by('id','ASC');
         $query = $this->db->get();
         $query = $query->result();  
         return $query;
     }
+
+    // select category data
+    function select_by_category_data($table,$business_id)
+    {
+        $this->db->select();
+        $this->db->from($table);
+        $this->db->where('business_id', $business_id);
+        $this->db->where('is_active ', 1);
+        $this->db->order_by('id','ASC');
+        $query = $this->db->get();
+        $query = $query->result();  
+        return $query;
+    }
+
+        // select department data
+        function select_by_department_data($table,$business_id)
+        {
+            $this->db->select();
+            $this->db->from($table);
+            $this->db->where('business_id', $business_id);
+            $this->db->where('is_active ', 1);
+            $this->db->order_by('id','ASC');
+            $query = $this->db->get();
+            $query = $query->result();  
+            return $query;
+        }
 	
 	// select by business_id and type
     function select_by_business_id_and_type($table,$business_id,$type)
diff --git a/application/helpers/custom_helper.php b/application/helpers/custom_helper.php
index 24952ac..e254012 100644
--- a/application/helpers/custom_helper.php
+++ b/application/helpers/custom_helper.php
@@ -78,6 +78,23 @@ function user()
         }
     }
 
+    if (!function_exists('employee')) 
+    {
+        function employee()
+        {
+            // Get a reference to the controller object
+            $ci =& get_instance();
+            $emp = $ci->auth_model->get_logged_employee();
+            if (empty($emp)) 
+            {
+                $ci->auth_model->logout();
+            } else {
+                return $emp;
+            }
+
+        }
+    }
+
     if (!function_exists('hash_password')) {
         function hash_password($password)
         {   
@@ -151,6 +168,23 @@ function show_year($date){
         }
     }
 
+    if(!function_exists('dateFormat'))
+   {
+    function dateFormat($format='d-m-Y', $givenDate=null)
+    {
+        return date($format, strtotime($givenDate));
+    }
+   }
+
+
+   if(!function_exists('timeFormat'))
+   {
+    function timeFormat($format='h:i:s a', $givenTime=null)
+    {
+        return date($format, strtotime($givenTime));
+    }
+   }
+
 
     //get days
     if (!function_exists('get_days')) {
diff --git a/application/modules/Asset/controllers/Asset.php b/application/modules/Asset/controllers/Asset.php
index 2d40c81..de1beeb 100644
--- a/application/modules/Asset/controllers/Asset.php
+++ b/application/modules/Asset/controllers/Asset.php
@@ -29,22 +29,21 @@ public function __construct()
     {
         // To inherit directly the attributes of the parent class.
         parent::__construct();
-        $this->load->model('MY_Model');
-		 $this->load->model('Asset_model');
-		  $this->load->model('Audit_model');
+		### Syntax : $this->load->model('Model Path' , 'Alias name');
+        ### The second parameter (optional) is used to call the method.
+        $this->load->model('MY_Model','MY_Model');
+		$this->load->model('Asset_model','Asset_model');
+		$this->load->model('Audit/audit_model','Audit_model');
 		$this->load->helper(array('form', 'url'));
+    //   print_r($business);die();
 
-		
     }
 	
 	  public function index()
     {
-		
         $this->layout->set('users', "gowtham");
         $this->layout->buffer('main_content', 'Asset/index');
-        $this->layout->render('default_layout');
-		
-       
+        $this->layout->render('default_layout');  
     }
 	
 	public function addAsset($id='empty')
@@ -64,19 +63,133 @@ public function addAsset($id='empty')
         $this->layout->render('default_layout');
     
     }
-	
-	 public function assetList()
+
+	public function assetLandingPage()
     {
 
-		$assets_list = $this->Asset_model->get_assets(user()->business_id);
+		$assets_list = $this->Asset_model->get_category_wise_assets(user()->business_id);
+		$this->layout->set('tableData', $assets_list);
+        $this->layout->buffer('main_content', 'Asset/asset_landing_page');
+        $this->layout->render('default_layout');
+   
+    }
+	
+	 public function assetList($category , $purchase_date_from = null , $purchase_date_to = null)
+     {
+		
+		$table = 'asset';
+		$assets_list = $this->Asset_model->get_assets(user()->business_id , $category  );
+		    foreach ($assets_list as $key => $value) {
+				// update yearly once
+				if($value->last_updated_year != date('Y'))
+				{
+					// update last_updated_year in db
+					$year['last_updated_year'] = date('Y');
+					// $editCurrentValue = $this->MY_Model->edit_option($year, $value->id, $table);
+					// find difference between two dates
+					$date1 = new DateTime(date('Y-m-d'));
+					$date2 = new DateTime($value->purchase_date);
+					$interval = $date1->diff($date2);
+					$nxt_year = date('Y-m-d', strtotime("+12 months $value->purchase_date"));
+					// echo $nxt_year;die();
+					// echo $interval->y; die();
+					// year intervel greater than 0
+					if($interval->y > 0) 
+					{
+						$curr_month = date('n', strtotime($value->purchase_date));
+						
+						// echo $curr_month;die();
+						$month_array_for_50_percentage = array(10 , 11 , 12 , 1 , 2 ,3);
+						if (in_array($curr_month, $month_array_for_50_percentage) &&  date('Y-m-d') > $nxt_year) 
+						{
+								$cost = $value->cost;
+								// get depreciation value
+								$category_percentage = $this->Asset_model->get_by_category_id($value->category);
+								// percentage formula calculation
+								$category_percentage = $category_percentage[0]['depreciation_percentage'] / 2;
+								$depreciate_value =  $cost * $category_percentage / 100;
+								$cost = abs($depreciate_value - $cost);
+								// echo $cost;die();
+								$category_percentage = $this->Asset_model->get_by_category_id($value->category);
+								for ($i=0 ; $i < $interval->y ; $i++) 
+								{ 
+							        // $category_percentage = $this->Asset_model->get_by_category_id($value->category);
+							        $category_per = $category_percentage[0]['depreciation_percentage'];
+							        $depreciate_value = $cost * $category_per / 100;
+							        $data['current_cost'] = abs($depreciate_value - $cost);
+							        $editCurrentValue = $this->MY_Model->edit_option($data, $value->id, $table);
+									$cost = abs($depreciate_value - $cost);
+								}
+						}
+						else
+						{
+							    $cost = $value->cost;
+								// get depreciation value
+								$category_percentage = $this->Asset_model->get_by_category_id($value->category);
+								// percentage formula calculation
+								$category_percentage = $category_percentage[0]['depreciation_percentage'];
+								$depreciate_value =  $cost * $category_percentage / 100;
+								$cost = abs($depreciate_value - $cost);
+
+							// $cost = $value->cost;
+							// get depreciation value
+							$category_percentage = $this->Asset_model->get_by_category_id($value->category);
+							for ($i=0 ; $i < $interval->y ; $i++) 
+							{ 
+						       $category_per = $category_percentage[0]['depreciation_percentage'];
+						       $depreciate_value =  $cost * $category_per / 100;
+						       // echo $depreciate_value; die();
+						       $data['current_cost'] = abs($depreciate_value- $cost);
+						       $editCurrentValue = $this->MY_Model->edit_option($data, $value->id, $table);
+							   $cost = abs($depreciate_value - $cost);
+							}
+						} 
+					}
+					// year intervel less than 0
+				    else 
+				    {
+                        $curr_month = date('n', strtotime($value->purchase_date));
+						$month_array_for_50_percentage = array(10 , 11 , 12 , 1 , 2 , 3);
+		    	    	if (in_array($curr_month, $month_array_for_50_percentage)) 
+						{
+							$cost = $value->cost;
+							// get depreciation value
+		    	    		$category_percentage = $this->Asset_model->get_by_category_id($value->category);
+							// percentage formula calculation
+							$category_percentage = $category_percentage[0]['depreciation_percentage'] / 2;
+		    	    		$depreciate_value =   $cost * $category_percentage / 100;
+							$data['current_cost'] = abs($cost - $depreciate_value);
+							$editCurrentValue = $this->MY_Model->edit_option($data, $value->id, $table);
+		    	    	}
+						else if(date('Y-m-d') > $nxt_year)
+						{
+							echo $nxt_year;die();
+							$cost = $value->cost;
+							// get depreciation value
+		    	    		$category_percentage = $this->Asset_model->get_by_category_id($value->category);
+							// percentage formula calculation
+		    	    		$depreciate_value =  $cost * $category_percentage[0]['depreciation_percentage'] / 100;
+							$data['current_cost'] = abs($cost - $depreciate_value);
+							$editCurrentValue = $this->MY_Model->edit_option($data, $value->id, $table);
+						}
+						else {
+							$data['current_cost'] = $value->cost;
+							$editCurrentValue = $this->MY_Model->edit_option($data, $value->id, $table);
+						}
+		    	    }
+				}
+		    }
+		$assets_list = $this->Asset_model->get_assets(user()->business_id , $category, $purchase_date_from  , $purchase_date_to);
 		$this->layout->set('tableData', $assets_list);
         $this->layout->buffer('main_content', 'Asset/asset_list');
         $this->layout->render('default_layout');
    
     }
 
+
 	 public function createAssets()
     {
+        
 	    $data=$this->input->post();
 		$data['business_id'] = user()->business_id;
 		$data['created_by'] = user()->name;
@@ -99,6 +212,7 @@ public function createAssets()
 		   }
 		
 		$table="asset";
+				
 		
 		//create asset
 		$create_assets = $this->MY_Model->insert($data,$table);
@@ -106,6 +220,7 @@ public function createAssets()
 		// Qr code
 		$qr_data['qrcode_img'] = (new QRCode)->render(base_url().'Asset/view_asset_details/'.md5($create_assets));
 		$editAssetData = $this->MY_Model->edit_option($qr_data, $create_assets, $table);
+		$editCurrentValue = $this->MY_Model->edit_option($qr_data, $create_assets, $table);
 
 
         if($create_assets)
@@ -119,7 +234,7 @@ public function createAssets()
 		$test = $this->audit->create_history('insert');
 		}
 		
-		redirect('asset/assetList');
+		redirect('Asset/assetList/'.md5($this->input->post('category')));
     
     }
 	
@@ -194,14 +309,16 @@ public function editAssets()
          //audit history generation for update 
 		 $test = $this->audit->create_history('update');
 		 }
-		redirect('asset/assetList');
+		redirect('Asset/assetList/'.md5($this->input->post('category')));
   
     }
 
-  public function deleteAsset($id)
+  public function deleteAsset()
     {
+	$id = $this->input->post('id');
+	$assetdata = $this->Asset_model->get_asset__id($id,'asset',user()->business_id);
     $Data = $this->Asset_model->delete_by_md5_id($id,user()->business_id,'asset');
-	redirect('asset/assetList');
+	redirect('Asset/assetList/'.md5($assetdata->category));
 	}
 	
 
@@ -232,18 +349,6 @@ public function view_qrcode()
     }
 
 
- 
-
-
-
-
-
-
-
-
-
-
-
   public function view_asset_details($id)
     { 
 	    $tab = $this->session->flashdata();
@@ -323,16 +428,17 @@ public function add_or_edit_asset_value()
 		 }
 	   
 		 $this->session->set_flashdata('msg', "asset_value");
-		redirect('asset/view_asset_details/'.md5($this->input->post('asset_id')));
+		redirect('Asset/view_asset_details/'.md5($this->input->post('asset_id')));
 	}else{
 		$get_latest_asset_value = $this->Asset_model->get_latest_asset_value($this->input->post('asset_id_for_add'),user()->business_id);
 		$pre_current_value = $get_latest_asset_value->current_value;
-		if($this->input->post('type') == 'Upgrade')
-		{
-			$data['current_value'] = $pre_current_value + $this->input->post('value');
-		}else if($this->input->post('type') == 'Depreciation') {
-			$data['current_value'] = $pre_current_value - $this->input->post('value');
-		}
+		// if($this->input->post('type') == 'Upgrade')
+		// {
+			// $data['current_value'] = $pre_current_value * $this->input->post('value');
+		// }else if($this->input->post('type') == 'Depreciation') {
+		// 	$data['current_value'] = $pre_current_value - $this->input->post('value');
+		// }
+		$data['current_value'] = $pre_current_value * $this->input->post('value');
 		$data['asset_id'] = $this->input->post('asset_id_for_add');
 		$data['business_id'] = user()->business_id;
 		$data['type'] = $this->input->post('type');
@@ -342,6 +448,7 @@ public function add_or_edit_asset_value()
 		$data['description'] = $this->input->post('description');
 		$data['created_by'] = user()->id;
 		$createAssetValueData = $this->MY_Model->insert($data, 'asset_value');
+		// print_r($createAssetValueData);die();
 		if($createAssetValueData)
 		{
 		//set id $ table name for audit history
@@ -353,11 +460,11 @@ public function add_or_edit_asset_value()
 		$this->audit->create_history('insert');
 		}
 		$this->session->set_flashdata(1); $this->session->set_flashdata('msg', "asset_value");
-		redirect('asset/view_asset_details/'.md5($this->input->post('asset_id_for_add')));
+		redirect('Asset/view_asset_details/'.md5($this->input->post('asset_id_for_add')));
 	}
    }
    
-   
+  
    
    
  public function getAssetUsageForm($id)
@@ -423,7 +530,7 @@ public function add_or_edit_asset_usage()
 		 $this->audit->create_history('update');
 		 }
 		 $this->session->set_flashdata('msg', "asset_usage");
-		redirect('asset/view_asset_details/'.md5($this->input->post('asset_id')));
+		redirect('Asset/view_asset_details/'.md5($this->input->post('asset_id')));
 	}else{
 		$data['asset_id'] = $this->input->post('asset_id_for_add');
 		$data['business_id'] = user()->business_id;
@@ -444,7 +551,7 @@ public function add_or_edit_asset_usage()
 		$this->audit->create_history('insert');
 		}
 		$this->session->set_flashdata('msg', "asset_usage");
-		redirect('asset/view_asset_details/'.md5($this->input->post('asset_id_for_add')));
+		redirect('Asset/view_asset_details/'.md5($this->input->post('asset_id_for_add')));
 	}
    }
 
@@ -495,7 +602,7 @@ public function add_or_edit_asset_amc()
 		 $this->audit->create_history('update');
 		 }
 		 $this->session->set_flashdata('msg', "asset_amc");
-		redirect('asset/view_asset_details/'.md5($this->input->post('asset_id')));
+		redirect('Asset/view_asset_details/'.md5($this->input->post('asset_id')));
 	}else{
 		$data['asset_id'] = $this->input->post('asset_id_for_add');
 		$data['business_id'] = user()->business_id;
@@ -521,7 +628,7 @@ public function add_or_edit_asset_amc()
 		$this->audit->create_history('insert');
 		}
 		$this->session->set_flashdata('msg', "asset_amc");
-		redirect('asset/view_asset_details/'.md5($this->input->post('asset_id_for_add')));
+		redirect('Asset/view_asset_details/'.md5($this->input->post('asset_id_for_add')));
 	}
    }
 
@@ -572,7 +679,7 @@ public function add_or_edit_asset_insurance()
 		 $this->audit->create_history('update');
 		 }
 		 $this->session->set_flashdata('msg', "asset_insurance");
-		redirect('asset/view_asset_details/'.md5($this->input->post('asset_id')));
+		redirect('Asset/view_asset_details/'.md5($this->input->post('asset_id')));
 	}else{
 		$data['asset_id'] = $this->input->post('asset_id_for_add');
 		$data['business_id'] = user()->business_id;
@@ -597,7 +704,7 @@ public function add_or_edit_asset_insurance()
 		$this->audit->create_history('insert');
 		}
 		$this->session->set_flashdata('msg', "asset_insurance");
-		redirect('asset/view_asset_details/'.md5($this->input->post('asset_id_for_add')));
+		redirect('Asset/view_asset_details/'.md5($this->input->post('asset_id_for_add')));
 	}
    }
    
@@ -609,7 +716,7 @@ public function add_or_edit_asset_insurance()
  public function getAssetImageForm($id)
    {
 	
-    $data = array('asset_id'=> $id, 'heading'=>'Add Image' , 'submit_button_title'=>'Submit');
+    $data = array('asset_id'=> $id, 'heading'=>'Add File' , 'submit_button_title'=>'Submit');
 	$htmlPage = $this->load->view('asset_image_form.php',$data,true);
     echo json_encode($htmlPage); 
    }
@@ -623,7 +730,7 @@ public function add_asset_image()
 		
         //file upload confic
         $asset_image['upload_path']          = APPPATH. '../assets/uploads/';
-	    $asset_image['allowed_types']        = 'gif|jpg|png|jpeg';
+	    $asset_image['allowed_types']        = 'gif|jpg|png|jpeg|pdf';
 	    $asset_image['max_size']             = 80000;
 	    //upload
 	    $this->load->library('upload', $asset_image);
@@ -639,7 +746,7 @@ public function add_asset_image()
 		$table="asset_images";
 		$create_assets = $this->MY_Model->insert($data,$table);
 		$this->session->set_flashdata('msg', "asset_image");
-		redirect('asset/view_asset_details/'.md5($this->input->post('asset_id')));
+		redirect('Asset/view_asset_details/'.md5($this->input->post('asset_id')));
     
     }
 
@@ -650,7 +757,7 @@ public function deleteAssetValue($id)
 	$asset_id = $split[1];
     $Data = $this->Asset_model->delete_by_md5_id($key,user()->business_id,'asset_value');
 	$this->session->set_flashdata('msg', "asset_value");
-	redirect('asset/view_asset_details/'.md5($asset_id));
+	redirect('Asset/view_asset_details/'.md5($asset_id));
 	}
  public function deleteAssetUsage($id)
     {
@@ -659,34 +766,37 @@ public function deleteAssetUsage($id)
 	$asset_id = $split[1];
     $Data = $this->Asset_model->delete_by_md5_id($key,user()->business_id,'asset_usage');
 	$this->session->set_flashdata('msg', "asset_usage");
-	redirect('asset/view_asset_details/'.md5($asset_id));
+	redirect('Asset/view_asset_details/'.md5($asset_id));
 	}
- public function deleteAssetAMC($id)
+ public function deleteAssetAMC()
     {
+	$id = $this->input->post('id');
 	$split = preg_split('/_/', $id);
 	$key = $split[0];
 	$asset_id = $split[1];
     $Data = $this->Asset_model->delete_by_md5_id($key,user()->business_id,'amc');
 	$this->session->set_flashdata('msg', "asset_amc");
-	redirect('asset/view_asset_details/'.md5($asset_id));
+	redirect('Asset/view_asset_details/'.md5($asset_id));
 	}
- public function deleteAssetImage($id)
+ public function deleteAssetImage()
     {
+    $id = $this->input->post('id');
 	$split = preg_split('/_/', $id);
 	$key = $split[0];
 	$asset_id = $split[1];
     $Data = $this->Asset_model->delete_by_md5_id($key,user()->business_id,'asset_images');
 	$this->session->set_flashdata('msg', "asset_image");
-	redirect('asset/view_asset_details/'.md5($asset_id));
+	redirect('Asset/view_asset_details/'.md5($asset_id));
 	}
- public function deleteAssetInsurance($id)
+ public function deleteAssetInsurance()
     {
+	$id = $this->input->post('id');
 	$split = preg_split('/_/', $id);
 	$key = $split[0];
 	$asset_id = $split[1];
     $Data = $this->Asset_model->delete_by_md5_id($key,user()->business_id,'amc');
 	$this->session->set_flashdata('msg', "asset_insurance");
-	redirect('asset/view_asset_details/'.md5($asset_id));
+	redirect('Asset/view_asset_details/'.md5($asset_id));
 	}
 
   public function depreciation_report()
@@ -727,8 +837,11 @@ public function masterDataList()
 		$this->layout->set('supplierData', $this->Asset_model->get_third_party_value_by_md5_id(user()->business_id,2));
 		$this->layout->set('service_privoder', $this->Asset_model->get_third_party_value_by_md5_id(user()->business_id,3));
 		$this->layout->set('insurence', $this->Asset_model->get_third_party_value_by_md5_id(user()->business_id,4));
-		$this->layout->set('locationsData', $this->MY_Model->select_by_business_id('locations',user()->business_id));
-		$this->layout->set('categoriesData', $this->MY_Model->select_by_business_id('categories',user()->business_id));
+		$this->layout->set('locationsData', $this->MY_Model->select_by_business_id('locations',user()->business_id,1));
+		$this->layout->set('categoriesData', $this->MY_Model->select_by_category_data('categories',user()->business_id));
+		$this->layout->set('departmentData', $this->MY_Model->select_by_department_data('department_master',user()->business_id));
+		$this->layout->set('leaveData', $this->MY_Model->select_by_department_data('leave_master',user()->business_id));
+		$this->layout->set('enum_value', $this->MY_Model->select_by_department_data('enum',user()->business_id));
 		$this->layout->buffer('main_content', 'Asset/master_list');
         $this->layout->render('default_layout');
        
@@ -737,6 +850,7 @@ public function masterDataList()
 
 	public function getThirdPartyForm($id)
     {
+	
 		$state = $this->MY_Model->select('state');
         if ($id == "manufacture") {
 			$data = array('heading'=> "Manufacturer Details", 'type' => 1 , 'states' => $state , 'submit_button_title'=>'Add' );
@@ -772,7 +886,6 @@ public function getThirdPartyForm($id)
 
 	public function add_or_edit_ThirdPartyForm()
     {
-
 		$table = 'third_parties';
 		$action = $this->input->post();
 		$id = $this->input->post('id');
@@ -780,12 +893,12 @@ public function add_or_edit_ThirdPartyForm()
 		if ($id) {
 			$userData = $this->MY_Model->edit_option($action, $id, $table);
 			$this->session->set_flashdata('msg', $type);
-			redirect('asset/masterDataList');
+			redirect('Asset/masterDataList');
 		} else {
 			$userData = $this->MY_Model->insert($action, $table);
 			if($business->is_master_data_entered == 0){  $this->MY_Model->editBusiness(); }
 			$this->session->set_flashdata('msg', $type);
-			redirect('asset/masterDataList');
+			redirect('Asset/masterDataList');
 		}
        
     }
@@ -816,12 +929,12 @@ public function add_or_edit_LocationForm()
 		if ($id) {
 			$userData = $this->MY_Model->edit_option($action, $id, $table);
 			$this->session->set_flashdata('msg', "location");
-			redirect('asset/masterDataList');
+			redirect('Asset/masterDataList');
 		} else {
 			$userData = $this->MY_Model->insert($action, $table);
 			if($business->is_master_data_entered == 0){  $this->MY_Model->editBusiness(); }
 			$this->session->set_flashdata('msg', "location");
-			redirect('asset/masterDataList');
+			redirect('Asset/masterDataList');
 		}
        
     }
@@ -837,8 +950,8 @@ public function getCatogaryForm($id)
 		}
 		else {
 			$table = 'categories';
-			$location_data = $this->MY_Model->get_by_md5_id($id, $table);
-			$data = array('heading'=> "Catogary Details", 'catogary_data'=> $location_data , 'submit_button_title'=>'Add' );
+			$catogary_data = $this->MY_Model->get_by_md5_id($id, $table);
+			$data = array('heading'=> "Catogary Details", 'catogary_data'=> $catogary_data , 'submit_button_title'=>'Update' );
 			$htmlPage = $this->load->view('catogary_master_form.php',$data,true);
 			echo json_encode($htmlPage);
 		}
@@ -851,27 +964,206 @@ public function add_or_edit_CategoriesForm()
 		$table = 'categories';
 		$action = $this->input->post();
 		$id = $this->input->post('id');
+		// print_r($id);die();
 		if ($id) {
 			$userData = $this->MY_Model->edit_option($action, $id, $table);
 			$this->session->set_flashdata('msg', "categories");
-			redirect('asset/masterDataList');
+			redirect('Asset/masterDataList');
 		} else {
 			$userData = $this->MY_Model->insert($action, $table);
 			if($business->is_master_data_entered == 0){  $this->MY_Model->editBusiness(); }
 			$this->session->set_flashdata('msg', "categories");
-			redirect('asset/masterDataList');
+			redirect('Asset/masterDataList');
 		}
        
     }
 
-	public function deleteThirdPartyData($id)
+	public function getDepartmentForm($id)
     {
+		if ($id == "department") {
+			$table = 'department_master';
+			$data = array('heading'=> "Department Details", 'submit_button_title'=>'Add' );
+			$htmlPage = $this->load->view('department_master_form.php',$data,true);
+			echo json_encode($htmlPage);
+		}
+		else {
+			$table = 'department_master';
+			$department_data = $this->MY_Model->get_by_md5_id($id, $table);
+			$data = array('heading'=> "Department Details", 'department_data'=> $department_data , 'submit_button_title'=>'Update' );
+			$htmlPage = $this->load->view('department_master_form.php',$data,true);
+			echo json_encode($htmlPage);
+		}
+	}
+
+
+	public function add_or_edit_DepartmentForm()
+    {
+
+		$table = 'department_master';
+		$action = $this->input->post();
+		$id = $this->input->post('id');
+		// print_r($id);die();
+		if ($id) {
+			$userData = $this->MY_Model->edit_option($action, $id, $table);
+			$this->session->set_flashdata('msg', "department");
+			redirect('Asset/masterDataList');
+		} else {
+			$userData = $this->MY_Model->insert($action, $table);
+			if($business->is_master_data_entered == 0){  $this->MY_Model->editBusiness(); }
+			$this->session->set_flashdata('msg', "department");
+			redirect('Asset/masterDataList');
+		}
+       
+    }
+
+	public function deleteDepartmentFormData()
+    {
+	    $id = $this->input->post('id');
+	    $table = 'department_master';
+	    $user = $this->Asset_model->get_by_id($id , $table);
+        $Data = $this->Asset_model->delete_by_md5_id($id,user()->business_id,$table);
+	    $this->session->set_flashdata('msg', "department");
+	    redirect('Asset/masterDataList');
+	}
+
+
+
+
+	public function getLeaveForm($id)
+    {
+		if ($id == "leave") {
+			$table = 'leave_master';
+			$data = array('heading'=> "Leave Details", 'submit_button_title'=>'Add' );
+			$htmlPage = $this->load->view('leave_master_form.php',$data,true);
+			echo json_encode($htmlPage);
+		}
+		else {
+			$table = 'leave_master';
+			$leave_data = $this->MY_Model->get_by_md5_id($id, $table);
+			$data = array('heading'=> "Leave Details", 'leave_data'=> $leave_data , 'submit_button_title'=>'Update' );
+			$htmlPage = $this->load->view('leave_master_form.php',$data,true);
+			echo json_encode($htmlPage);
+		}
+	}
+
+
+	public function add_or_edit_LeaveForm()
+    {
+
+		$table = 'leave_master';
+		$action = $this->input->post();
+		$id = $this->input->post('id');
+		if ($id) {
+			$userData = $this->MY_Model->edit_option($action, $id, $table);
+			$this->session->set_flashdata('msg', "leave");
+			redirect('Asset/masterDataList');
+		} else {
+			$userData = $this->MY_Model->insert($action, $table);
+			if($business->is_master_data_entered == 0){  $this->MY_Model->editBusiness(); }
+			$this->session->set_flashdata('msg', "leave");
+			redirect('Asset/masterDataList');
+		}
+       
+    }
+
+    public function deleteLeaveFormData()
+    {
+	    $id = $this->input->post('id');
+	    $table = 'leave_master';
+        $Data = $this->Asset_model->delete_by_md5_id($id,user()->business_id,$table);
+	    $this->session->set_flashdata('msg', "leave");
+	    redirect('Asset/masterDataList');
+	}
+
+/// decline reason 
+
+    public function getDeclineForm($id)
+    {
+		if ($id == "decline") {
+			$table = 'enum';
+			$data = array('heading'=> "Decline Reason", 'submit_button_title'=>'Add' );
+			$htmlPage = $this->load->view('Decline_Reason_form.php',$data,true);
+			echo json_encode($htmlPage);
+		}
+		else {
+			$table = 'enum';
+			$Decline_data = $this->MY_Model->get_by_md5_id($id, $table);
+			$data = array('heading'=> "Decline Reason", 'Decline_data'=> $Decline_data , 'submit_button_title'=>'Update' );
+			$htmlPage = $this->load->view('Decline_Reason_form.php',$data,true);
+			echo json_encode($htmlPage);
+		}
+	}
+
+
+	public function add_or_edit_DeclineForm()
+    {
+
+		$table = 'enum';
+		$action = $this->input->post();
+		$action['is_active'] = 1;
+		$id = $this->input->post('id');
+		if ($id) {
+			$userData = $this->MY_Model->edit_option($action, $id, $table);
+			$this->session->set_flashdata('msg', "decline");
+			redirect('Asset/masterDataList');
+		} else {
+			$userData = $this->MY_Model->insert($action, $table);
+			if($business->is_master_data_entered == 0){  $this->MY_Model->editBusiness(); }
+			$this->session->set_flashdata('msg', "decline");
+			redirect('Asset/masterDataList');
+		}
+       
+    }
+
+
+    public function deleteDeclineFormData()
+    {
+	    $id = $this->input->post('id');
+	    $table = 'enum';
+      $Data = $this->Asset_model->delete_by_md5_id($id,user()->business_id,$table);
+	    $this->session->set_flashdata('msg', "decline");
+	    redirect('Asset/masterDataList');
+	}
+
+
+	
+
+	public function deleteThirdPartyData()
+    {
+	$id = $this->input->post('id');
 	$table = 'third_parties';
 	$user = $this->Asset_model->get_by_id($id , $table);
     $Data = $this->Asset_model->delete_by_md5_id($id,user()->business_id,$table);
 	$this->session->set_flashdata('msg', $user->type);
-	redirect('asset/masterDataList');
+	redirect('Asset/masterDataList');
 	}
 
 
+	public function deleteCategoriesFormData()
+    {
+	$id = $this->input->post('id');
+	$table = 'categories';
+	$user = $this->Asset_model->get_by_id($id , $table);
+    $Data = $this->Asset_model->delete_by_md5_id($id,user()->business_id,$table);
+	$this->session->set_flashdata('msg', "categories");
+	redirect('Asset/masterDataList');
+	}
+
+	public function getDeleteConfirmationPopup()
+	{
+	 $data = array();
+	 $htmlPage = $this->load->view('confirmation_popup.php',$data,true);
+	 echo json_encode($htmlPage); 
+	}
+
+	public function filterAssets()
+	{
+		$split = preg_split('/-/', $this->input->post('reservation'));
+        $purchase_date_from = date_format(date_create($split[0]),"Y-m-d");
+		$purchase_date_to = date_format(date_create($split[1]),"Y-m-d");
+		redirect('Asset/assetList/'.md5($this->input->post('category')).'/'.$purchase_date_from.'/'.$purchase_date_to);
+	}
+
+
+
 }
diff --git a/application/modules/Asset/models/Asset_model.php b/application/modules/Asset/models/Asset_model.php
index e1a7a2a..37d1185 100644
--- a/application/modules/Asset/models/Asset_model.php
+++ b/application/modules/Asset/models/Asset_model.php
@@ -1,8 +1,25 @@
 <?php
 class Asset_model extends MY_Model {
 
-    public function get_assets($business_id)
+
+    public function get_category_wise_assets($business_id)
     {
+        $this->db->select('A.* , A.category as category_value , SUM(A.cost) as total , SUM(A.current_cost) as total_current_cost , categories.name as category_name ');
+        $this->db->group_by('A.category');  
+        $this->db->from('asset A');
+		$this->db->join('categories', 'categories.id = A.category', 'left');
+        $this->db->where('A.business_id', $business_id);
+        $this->db->order_by('A.id','ASC');
+		$this->db->where('A.is_active', 1);
+        $query = $this->db->get();
+        $query = $query->result(); 
+        return $query;
+    }
+
+
+    public function get_assets($business_id , $category , $purchase_date_from = null , $purchase_date_to = null)
+    {
+       
         $this->db->select('A.* , categories.name as category_name , third_parties.name as manufacturer_name ,tp.name as supplier_name , locations.location as location_name , status.display_name as status_display_name');
         $this->db->from('asset A');
 		$this->db->join('categories', 'categories.id = A.category', 'left');
@@ -11,10 +28,17 @@ public function get_assets($business_id)
 		$this->db->join('locations', 'locations.id = A.location', 'left');
 		$this->db->join('status', 'status.id = A.status', 'left');
         $this->db->where('A.business_id', $business_id);
+        $this->db->where('md5(A.category)', $category);
+        if($purchase_date_from != null && $purchase_date_to != null)
+        {
+            $this->db->where('A.purchase_date >=', $purchase_date_from);
+            $this->db->where('A.purchase_date <=', $purchase_date_to);
+        }
         $this->db->order_by('A.id','ASC');
 		$this->db->where('A.is_active', 1);
         $query = $this->db->get();
-        $query = $query->result();  
+        $query = $query->result(); 
+         
         return $query;
     }
 
@@ -34,7 +58,16 @@ public function get_asset_by_md5_id($id,$business_id)
         return $query;
     } 
 	
-	
+    public function get_by_category_id($id)
+    {
+        $this->db->select();
+        $this->db->from('categories');
+        $this->db->where('id', $id);
+		$this->db->where('is_active', 1);
+        $query = $this->db->get();
+        $query = $query->result_array(); 
+        return $query;
+    }
 
  public function get_by_asset_id($id,$table,$business_id)
     {
@@ -47,6 +80,19 @@ public function get_by_asset_id($id,$table,$business_id)
         $query = $query->result(); 
         return $query;
     }
+
+ public function get_asset__id($id,$table,$business_id)
+    {
+        $this->db->select();
+        $this->db->from($table);
+        $this->db->where('business_id', $business_id);
+        $this->db->where('md5(id)', $id);
+		$this->db->where('is_active', 1);
+        $query = $this->db->get();
+        $query = $query->row(); 
+        return $query;
+    }
+
 public function get_amc_with_join($id,$business_id)
     {
         $this->db->select('A.* , third_parties.name as service_provider_name ');
@@ -137,7 +183,7 @@ public function get_latest_asset_value($asset_id,$business_id)
 	public function amc_insurance_report($type,$business_id)
     { 
 	  $query = $this->db->query("SELECT amc.*,service_provider.name as service_provider_name,insurance_company.name as insurance_company_name,
-       asset.id,asset.name as asset_name,asset.tag,asset.serial,asset.model,asset.purchase_date,asset.cost as purchase_cost,status.name as status , categories.name as category,locations.location as location,manufacturer.name as manufacturer, Supplier.name as Supplier
+       asset.id,asset.name as asset_name,asset.tag,asset.serial,asset.model,asset.purchase_date,asset.cost as purchase_cost,status.display_name as status , categories.name as category,locations.location as location,manufacturer.name as manufacturer, Supplier.name as Supplier
        FROM asset 
        LEFT JOIN amc ON asset.id = amc.asset_id AND amc.created_at = (SELECT MAX(amc.created_at) FROM amc
        WHERE asset.id = amc.asset_id and amc.is_active=1 and amc.type=".$type.")
@@ -157,7 +203,7 @@ public function amc_insurance_report($type,$business_id)
 	public function depreciation_report($business_id)
     { 
 	 $query = $this->db->query("SELECT asset_value.*,
-      asset.id,asset.name as asset_name,asset.tag,asset.serial,asset.model,asset.purchase_date,asset.cost as purchase_cost,status.name as status , categories.name as category,locations.location as location,manufacturer.name as manufacturer, Supplier.name as Supplier
+      asset.id,asset.name as asset_name,asset.tag,asset.serial,asset.current_cost,asset.model,asset.purchase_date,asset.cost as purchase_cost,status.display_name as status , categories.name as category,locations.location as location,manufacturer.name as manufacturer, Supplier.name as Supplier 
       FROM asset 
       LEFT JOIN asset_value ON asset.id = asset_value.asset_id AND asset_value.created_at = (SELECT MAX(asset_value.created_at) FROM asset_value WHERE asset.id = asset_value.asset_id and asset_value.is_active=1)
       LEFT JOIN status ON asset.status = status.id
diff --git a/application/modules/Asset/views/Decline_Reason_form.php b/application/modules/Asset/views/Decline_Reason_form.php
new file mode 100644
index 0000000..968bf0e
--- /dev/null
+++ b/application/modules/Asset/views/Decline_Reason_form.php
@@ -0,0 +1,39 @@
+
+<div class="modal-dialog modal-lm">
+<div class="modal-content">
+
+<div class="modal-header">
+<h4 class="modal-title" id="myModalLabel2"><?php echo $heading; ?></h4>
+<button type="button" id="close-form" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span>
+</button>
+</div>
+
+<form  data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Asset/add_or_edit_DeclineForm">				  
+<div class="modal-body">
+<div class="x_content">
+<br />
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">	
+<input type="hidden" name="id" value="<?php if(isset($Decline_data)) { echo $Decline_data->id; } ?>">	
+<input type="hidden" name="business_id" value="<?php echo user()->business_id; ?>">	
+
+<input type="hidden" name="enum_type" value="decline">	
+
+	
+<div class="form-group row">
+<label class="col-form-label col-md-3 col-sm-3 ">Reason<a style="color:red;">*</a></label>
+<div class="col-md-9 col-sm-9 ">
+<input type="text" class="form-control" name="enum_value" value="<?php if(isset($Decline_data)) { echo $Decline_data->enum_value; } ?>" required>
+</div>
+</div>
+
+</div>
+</div>
+<div class="modal-footer">
+<button type="button" class="btn btn-secondary" data-dismiss="modal"  id="close-form">Close</button>
+<button type="submit" class="btn btn-primary"><?php echo $submit_button_title; ?></button>
+</div>
+</form>
+</div>
+</div>
+
+
diff --git a/application/modules/Asset/views/amc_reports_list.php b/application/modules/Asset/views/amc_reports_list.php
index 963f110..ea09986 100644
--- a/application/modules/Asset/views/amc_reports_list.php
+++ b/application/modules/Asset/views/amc_reports_list.php
@@ -43,7 +43,7 @@
 					 <td class=" "> <?php echo $value['serial']; ?> </td>
 					 <td class=" "> <?php echo $value['model']; ?> </td>
 					 <td class=" "> <?php echo $value['service_provider_name']; ?> </td>
-					 <td class=" "> <?php echo $value['cost']; ?> </td>
+					 <td class=" " style=" text-align: right;"> <?php echo $value['cost']; ?> </td>
 					 <td class=" "> <?php echo  my_date_show($value['valid_from']); ?> </td>
 					 <td class=" "> <?php echo my_date_show($value['valid_to']); ?> </td>
 					 <td class=" "> <?php echo $value['status']; ?> </td>
diff --git a/application/modules/Asset/views/asset_landing_page.php b/application/modules/Asset/views/asset_landing_page.php
new file mode 100644
index 0000000..2e3c6c3
--- /dev/null
+++ b/application/modules/Asset/views/asset_landing_page.php
@@ -0,0 +1,55 @@
+
+<form id="otp-form">
+<input type="hidden" id="csrf" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">	
+</form>
+<div class="col-md-12 col-sm-12 ">
+                <div class="x_panel">
+                   <div class="x_title">
+                    <h2>Assets Details </h2>
+                    <div class="clearfix"></div>
+                  </div>
+                 <div class="x_content">
+                  <div class="row">
+                   <div class="col-sm-12">
+        <div class="card-box table-responsive"> 
+
+        <table id="datatable-buttons"  class="table table-striped table-bordered bulk_action"  width="100%">
+                      <thead style="white-space: nowrap;">
+                          <tr class="headings">
+                            <!-- <th><input type="checkbox" id="check_all" ></th> -->
+						    <th class="column-title">Asset Category </th>
+                            <th class="column-title">Total Purchase Cost </th>
+                            <th class="column-title">Total Current Cost </th>
+							<!-- <th class="column-title" style="min-width:120px;">Action </th> -->
+                          </tr>
+                      </thead>
+                      <tbody>
+                      <?php foreach ($tableData as $key => $value) { ?>
+					        <tr class="even pointer" onclick="window.location='<?php echo base_url();?>Asset/assetList/<?php echo md5($value->category) ?>';">
+                            <!-- <td><input type="checkbox" id="check-all" value="<?php echo $value->id; ?>" ></td> -->
+							<td class=" "> <?php echo $value->category_name; ?> </td>
+                            <td class=" " style=" text-align: right;"> <?php echo $value->total; ?> </td>
+                            <td class=" " style=" text-align: right;"> <?php echo $value->total_current_cost; ?> </td>
+					        <!-- <td style=" text-align: center;  font-size: 16px;">
+					            <a href="<?php echo base_url()?>Asset/assetList/<?php echo md5($value->category);?>" > <i class="fa fa-eye" title="View"></i></a>
+                              &nbsp;
+                            </td> -->
+                            </tr>
+					   <?php } ?>
+                      </tbody>
+        </table>
+					
+				  </div>	
+                </div>
+              </div>
+            </div>
+           </div>
+</div>
+
+<br/>
+
+<div class="modal fade bs-example-modal-lg" id="ItemModal" tabindex="-1" role="dialog" aria-hidden="true"></div>
+
+<div style="display:none" id="sub-value">
+
+</div>
\ No newline at end of file
diff --git a/application/modules/Asset/views/asset_list.php b/application/modules/Asset/views/asset_list.php
index bd482c6..9b2c76b 100644
--- a/application/modules/Asset/views/asset_list.php
+++ b/application/modules/Asset/views/asset_list.php
@@ -1,18 +1,20 @@
 
+
 <form id="otp-form">
 <input type="hidden" id="csrf" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">	
 </form>
 <div class="col-md-12 col-sm-12 ">
+
                 <div class="x_panel">
                    <div class="x_title">
                     <h2>Assets Details </h2>
 				
                     <ul class="nav navbar-right panel_toolbox">
                     <?php if(user()->action_permit != 'view' )  { ?>
-					          <a href="<?php echo base_url();?>asset/addAsset" class="btn btn-sm btn-primary">Add Asset</a>
+                    <a href="<?php echo base_url();?>Asset/addAsset" class="btn btn-sm btn-primary">Add Asset</a>
                     <?php } ?>
-                    <button class="btn btn-sm btn-secondary" onclick="deleteRow();">Remove</button>
-                    <button class="btn btn-sm btn-info" onclick="viewQr();">View QR</button>
+                    <button class="btn btn-sm btn-secondary" onclick="deleteRow();" hidden>Remove</button>
+                    <button class="btn btn-sm btn-info" onclick="viewQr();" hidden>View QR</button>
                       <!-- <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
                       </li> -->
                     </ul>
@@ -21,18 +23,42 @@
                  <div class="x_content">
                   <div class="row">
                    <div class="col-sm-12">
-                  <div class="card-box table-responsive"> 
+        <div class="card-box table-responsive"> 
+<form class="" method="post" action="<?php echo base_url()?>Asset/filterAssets">
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"	>
+<input type="hidden" name="category" value="<?php echo $tableData[0]->category; ?>"	>
+  <fieldset>
+  <div class="col-md-5 col-sm-5 " for="first-name"> </div>
+  <div class="col-md-3 col-sm-3 " for="first-name"><h2>  &nbsp; &nbsp;Filter with purchase date : </h2> </div>
+  <div class="col-md-3 col-sm-3 ">
+  <div class="control-group ">
+      <div class="controls">
+      <div class="input-prepend input-group">
+    
+      <input type="text" style="width: 200px" name="reservation" id="reservation" class="form-control" value="" />
+      </div>
+      </div>
+    </div>
+  </div>
+  <div class="col-md-1 col-sm-1 ">
+  <button class="btn btn-sm btn-info" type="submit" style="height:37px;">Submit</button>
+  </div>
+  </fieldset>
+</form>
         <table id="datatable-buttons"  class="table table-striped table-bordered bulk_action"  width="100%">
                       <thead style="white-space: nowrap;">
                           <tr class="headings">
                             <th><input type="checkbox" id="check_all" ></th>
 						                <th class="column-title">Asset Name </th>
-                            <th class="column-title">Manufacturer </th>
+                            <th class="column-title">Purchase Date </th>
+                            <th class="column-title">Purchase Cost </th>
+                            <th class="column-title">Current Value </th>
+                            <!-- <th class="column-title">Manufacturer </th>
 							              <th class="column-title">Tag </th>
                             <th class="column-title">Serial </th>
                             <th class="column-title">Model </th>
 							              <th class="column-title">Category </th>
-                            <th class="column-title">Status </th>
+                            <th class="column-title">Status </th> -->
 							              <!-- <th class="column-title">Notes </th>
                             <th class="column-title">Warranty </th>
                             <th class="column-title">Order No </th>
@@ -48,12 +74,16 @@
 					                <tr class="even pointer">
                             <td><input type="checkbox" id="check-all" value="<?php echo $value->id; ?>" ></td>
 							              <td class=" "> <?php echo $value->name; ?> </td>
-                            <td class=" "><?php echo $value->manufacturer_name; ?> </td>
+                            <td class=" "> <?php echo my_date_show($value->purchase_date); ?> </td>
+                            <td class=" " style=" text-align: right;"> <?php echo $value->cost; ?> </td>
+                            <td class=" " style=" text-align: right;"> <?php echo $value->current_cost; ?></td>
+                            <!-- <td class=" "> <?php echo $value->name; ?> </td> -->
+                            <!-- <td class=" "><?php echo $value->manufacturer_name; ?> </td>
 						                <td class=" "><?php echo $value->tag; ?></td>
                             <td class=" "><?php echo $value->serial; ?></td>
                             <td class=" "><?php echo $value->model; ?></td>
 							              <td class=" "><?php echo $value->category_name; ?></td>
-							              <td class=" "><?php echo $value->status_display_name; ?></td>
+							              <td class=" "><?php echo $value->status_display_name; ?></td> -->
 							              <!--<td class=" "><?php echo $value->notes; ?> </td>
                             <td class=" "><?php echo $value->warranty; ?> </td>
                             <td class=" "><?php echo $value->order_no; ?></td>
@@ -63,17 +93,20 @@
 							              <td class=" "><?php echo $value->location_name; ?></td> -->
 					                  <td style=" text-align: center;  font-size: 16px;">
                             <?php if(user()->action_permit != 'view' )  { ?>
-	                            <a href="<?php echo base_url()?>Asset/editAsset/<?php echo md5($value->id);?>" ><i class="fa fa-pencil"></i></a>
+                             
+                            
+	                            <a href="<?php echo base_url()?>Asset/editAsset/<?php echo md5($value->id);?>" ><i class="fa fa-pencil" title="Edit"></i></a>
 							                &nbsp;
-	                            <a href="<?php echo base_url()?>Asset/addAsset/<?php echo md5($value->id);?>" ><i class="fa fa-copy"></i></a>
+	                            <a href="<?php echo base_url()?>Asset/addAsset/<?php echo md5($value->id);?>" ><i class="fa fa-copy" title="Copy"></i></a>
 							                &nbsp;
-	                            <a href="<?php echo base_url()?>Asset/deleteAsset/<?php echo md5($value->id);?>" ><i class="fa fa-trash"></i></a>
+                              <a><i class="fa fa-trash deleteAsset" data-toggle="modal" data-target=".bs-example-modal-sm"   id="<?php echo md5($value->id);?>"  ></i></a>
+	                            <!-- <a href="<?php echo base_url()?>Asset/deleteAsset/<?php echo md5($value->id);?>" ><i class="fa fa-trash" title="Delete"></i></a> -->
 							                &nbsp;
                               <?php } ?>
-					                    <a href="<?php echo base_url()?>Asset/view_asset_details/<?php echo md5($value->id);?>" > <i class="fa fa-eye"></i></a>
+					                    <a href="<?php echo base_url()?>Asset/view_asset_details/<?php echo md5($value->id);?>" > <i class="fa fa-eye" title="View"></i></a>
                               &nbsp;
 					                    <!-- <a  href="<?php echo base_url()?>Asset/view_qr_code/<?php echo md5($value->id);?>" > <i class="fa fa-qrcode"></i></a> -->
-                              <a href="#" class="qr_view" id="<?php echo $value->id; ?>"> <i class="fa fa-qrcode"></i></a>
+                              <a href="#" class="qr_view" id="<?php echo $value->id; ?>"> <i class="fa fa-qrcode" title="QR code"></i></a>
                             </td>
                           </tr>
 					            <?php } ?>
@@ -94,19 +127,51 @@
 <div style="display:none" id="sub-value">
 
 </div>
-
+<div class="modal bs-example-modal-sm" tabindex="-1" role="dialog" aria-hidden="true" id="popup"> </div>
 <script>
+
+$("input[type='checkbox']").change(function(){
+    if($('input[type="checkbox"]:not(:checked)').length == $('input[type="checkbox"]').length){
+        console.log('all checked');
+        $('.btn-secondary').attr("hidden",true);
+        $('.btn-info').attr("hidden",true);
+    }
+});
+
+$('input:checkbox').click(function() {
+  $('.btn-secondary').removeAttr('hidden');
+  $('.btn-info').removeAttr('hidden');
+});
+
+
+$('.deleteAsset').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Asset/deleteAsset";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Asset/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#popup').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+
+
 function deleteRow() {
   var csrf_data = $("#otp-form").serialize();
   delete_id = [];
   document.querySelectorAll('#datatable-buttons #check-all:checked').forEach(e => {
     delete_id.push(e.value)
     e.parentNode.parentNode.remove();
+    console.log("tes----"+e.parentNode.parentNode);
   });
   console.log(delete_id);
   $.ajax({ 
       type: "post",
-      url: "<?php echo base_url()?>asset/deleteMultipleAsset",
+      url: "<?php echo base_url()?>Asset/deleteMultipleAsset",
       data: {data:delete_id,'<?php echo $this->security->get_csrf_token_name(); ?>': $('#csrf').val()},
       json: true,
       success: function(response) {
@@ -128,7 +193,7 @@ function viewQr() {
   console.log(view_qr_id);
   $.ajax({ 
       type: "post",
-      url: "<?php echo base_url()?>asset/view_qrcode",
+      url: "<?php echo base_url()?>Asset/view_qrcode",
       data: {data:view_qr_id,'<?php echo $this->security->get_csrf_token_name(); ?>': $('#csrf').val()},
       json: true,
       success: function(response) {
@@ -150,7 +215,7 @@ function viewQr() {
   view_qr_id.push(id)
   $.ajax({ 
       type: "post",
-      url: "<?php echo base_url()?>asset/view_qrcode",
+      url: "<?php echo base_url()?>Asset/view_qrcode",
       data: {data:view_qr_id,'<?php echo $this->security->get_csrf_token_name(); ?>': $('#csrf').val()},
       json: true,
       success: function(response) {
diff --git a/application/modules/Asset/views/asset_sub_value_list.php b/application/modules/Asset/views/asset_sub_value_list.php
index 7b70c42..1b2a2a8 100644
--- a/application/modules/Asset/views/asset_sub_value_list.php
+++ b/application/modules/Asset/views/asset_sub_value_list.php
@@ -8,12 +8,12 @@
                   <div class="x_content">
 
                     <ul class="nav nav-tabs bar_tabs" id="myTab" role="tablist">
-                      <li class="nav-item">
+                      <!-- <li class="nav-item">
                         <a class="nav-link" id="asset_value-tab" data-toggle="tab" href="#asset_value" role="tab" aria-controls="asset_value" aria-selected="true">Asset Values</a>
                       </li>
                       <li class="nav-item">
                         <a class="nav-link" id="asset_usage-tab" data-toggle="tab" href="#asset_usage" role="tab" aria-controls="asset_usage" aria-selected="false">Asset usage</a>
-                      </li>
+                      </li> -->
                       <li class="nav-item">
                         <a class="nav-link" id="asset_amc-tab" data-toggle="tab" href="#asset_amc" role="tab" aria-controls="asset_amc" aria-selected="false">Support</a>
                       </li>
@@ -21,7 +21,7 @@
                         <a class="nav-link" id="asset_insurance-tab" data-toggle="tab" href="#asset_insurance" role="tab" aria-controls="asset_insurance" aria-selected="false">Insurance</a>
                       </li>
 					   <li class="nav-item">
-                        <a class="nav-link" id="asset_image-tab" data-toggle="tab" href="#asset_image" role="tab" aria-controls="asset_image" aria-selected="false">Asset Images</a>
+                        <a class="nav-link" id="asset_image-tab" data-toggle="tab" href="#asset_image" role="tab" aria-controls="asset_image" aria-selected="false">Asset Files</a>
                       </li>
 					  <li class="nav-item">
                         <a class="nav-link" id="audit_history-tab" data-toggle="tab" href="#audit_history" role="tab" aria-controls="audit_history" aria-selected="false">Audit History</a>
@@ -35,7 +35,7 @@
 
 
 					
-        <div class="tab-pane fade" id="asset_value" role="tabpanel" aria-labelledby="asset_value-tab">
+        <!-- <div class="tab-pane fade" id="asset_value" role="tabpanel" aria-labelledby="asset_value-tab">
         <ul class="nav navbar-right panel_toolbox">
         <?php if(user()->action_permit != 'view' )  { ?>
 		<a  type="button" class="asset_value" id="<?php echo $asset_id."_add"; ?>" data-toggle="modal" data-target=".bs-example-modal-sm" style=" text-align: center;  font-size: 25px; color:#2A3F54;	">
@@ -82,7 +82,7 @@
                </table>
 			  </div>
  </div>  
-          
+           -->
 					  
 					  
 					  
@@ -118,9 +118,9 @@
                             <td>
 &nbsp;
 <a class="asset_usage" id="<?php echo md5($value->id); ?>" data-toggle="modal" data-target=".bs-example-modal-sm" style="font-size: 16px;">
-<i class="fa fa-pencil"></i></a>
+<i class="fa fa-pencil" title="Edit"></i></a>
 &nbsp;
- <a href="<?php echo base_url()?>Asset/deleteAssetUsage/<?php echo md5($value->id)."_".$value->asset_id;?>" style="font-size: 16px;" ><i class="fa fa-trash"></i></a>
+ <a href="<?php echo base_url()?>Asset/deleteAssetUsage/<?php echo md5($value->id)."_".$value->asset_id;?>" style="font-size: 16px;" ><i class="fa fa-trash" title="Delete"></i></a>
 							</td>  <?php } ?>
                             </tr>
 					<?php } ?>
@@ -136,7 +136,7 @@
        <ul class="nav navbar-right panel_toolbox">
        <?php if(user()->action_permit != 'view' )  { ?>
 		 <a  type="button" class="asset_amc" id="<?php echo $asset_id."_add"; ?>" data-toggle="modal" data-target=".bs-example-modal-sm" style=" text-align: center;  font-size: 25px; color:#2A3F54;	">
-		 <li class="fa fa-plus-circle"></li></a>
+		 <li class="fa fa-plus-circle" title="Add New"></li></a>
      <?php } ?>
         </ul>	</br> 
     <div class="card-box table-responsive"> 
@@ -144,31 +144,33 @@
                         <thead>
                           <tr class="headings">
                             <th class="column-title" width="15%">Service Provider </th>
-                            <th class="column-title" width="13%">Cost </th>
-							<th class="column-title" width="13.5%">Valid From </th>
+                            <th class="column-title" width="13%" >Cost </th>
+							              <th class="column-title" width="13.5%">Valid From </th>
                             <th class="column-title" width="13.5%">Valid To </th>
-							<th class="column-title" width="13.5%">Expire on </th>
-							<th class="column-title" width="15%">Description </th>  
+							              <th class="column-title" width="13.5%">Expire on </th>
+							              <th class="column-title" width="15%">Description </th>  
                             <th class="column-title" width="10%">Action </th> 							
                           </tr>
                         </thead>
 
                         <tbody>
                      <?php foreach ($asset_amc as $key => $value) { ?>
-					        <tr class="even pointer">
-                            <td class=" "><?php echo $value->service_provider_name; ?></td>
-							<td class=" "><?php echo $value->cost; ?></td>
-							<td class=" "><?php echo my_date_show($value->valid_from); ?></td>
-							<td class=" "><?php echo my_date_show($value->valid_to); ?></td>
-							<td class=" "><?php echo day_different($value->valid_to)." days left"; ?></td>
-							<td class=" "><?php echo $value->description; ?></td>
-              <?php if(user()->action_permit != 'view' )  { ?>
-							<td>
+					            <tr class="even pointer">
+                          <td class=" "><?php echo $value->service_provider_name; ?></td>
+							            <td class=" " style=" text-align: right;"><?php echo $value->cost; ?></td>
+							            <td class=" "><?php echo my_date_show($value->valid_from); ?></td>
+							            <td class=" "><?php echo my_date_show($value->valid_to); ?></td>
+							            <td class=" "><?php echo day_different($value->valid_to)." days left"; ?></td>
+							            <td class=" "><?php echo $value->description; ?></td>
+                          <?php if(user()->action_permit != 'view' )  { ?>
+							           <td>
 						&nbsp;
 <a class="asset_amc" id="<?php echo md5($value->id); ?>" data-toggle="modal" data-target=".bs-example-modal-sm" style="font-size: 16px;">
-<i class="fa fa-pencil"></i></a>
-&nbsp;
- <a href="<?php echo base_url()?>Asset/deleteAssetAMC/<?php echo md5($value->id)."_".$value->asset_id;?>" style="font-size: 16px;"><i class="fa fa-trash"></i></a>
+<i class="fa fa-pencil" title="Edit"></i></a>
+&nbsp;&nbsp;
+<a class="deleteAssetAMC" data-toggle="modal" data-target=".bs-example-modal-sm" style="font-size: 16px;"  id="<?php echo md5($value->id)."_".$value->asset_id;?>">
+<i class="fa fa-trash " ></i></a>
+ <!-- <a href="<?php echo base_url()?>Asset/deleteAssetAMC/<?php echo md5($value->id)."_".$value->asset_id;?>" style="font-size: 16px;"><i class="fa fa-trash" title="Edit"></i></a> -->
 							</td>
               <?php }?>
                             </tr>
@@ -185,7 +187,7 @@
        <ul class="nav navbar-right panel_toolbox">
        <?php if(user()->action_permit != 'view' )  { ?>
 		 <a  type="button" class="asset_insurance" id="<?php echo $asset_id."_add"; ?>" data-toggle="modal" data-target=".bs-example-modal-sm" style=" text-align: center;  font-size: 25px; color:#2A3F54;	">
-		 <li class="fa fa-plus-circle"></li></a>
+		 <li class="fa fa-plus-circle" title="Add New"></li></a>
      <?php } ?>
         </ul>	</br> 
     <div class="card-box table-responsive"> 
@@ -193,11 +195,11 @@
                         <thead>
                           <tr class="headings">
                             <th class="column-title" width="15%">Insurance Company </th>
-							 <th class="column-title" width="13%">Cost </th>
-							<th class="column-title" width="13.5%">Valid From </th>
+							              <th class="column-title" width="13%">Cost </th>
+							              <th class="column-title" width="13.5%">Valid From </th>
                             <th class="column-title" width="13.5%">Valid To </th>
-							<th class="column-title" width="13.5%">Expire on </th>
-							<th class="column-title" width="15%">Description </th>  
+							              <th class="column-title" width="13.5%">Expire on </th>
+							              <th class="column-title" width="15%">Description </th>  
                             <th class="column-title" width="10%">Action </th> 							
                           </tr>
                         </thead>
@@ -206,7 +208,7 @@
                      <?php foreach ($asset_insurance as $key => $value) { ?>
 					        <tr class="even pointer">
 							<td class=" "><?php echo $value->insurance_company_name; ?></td>
-							<td class=" "><?php echo $value->cost; ?></td>
+							<td class=" " style=" text-align: right;"><?php echo $value->cost; ?></td>
 							<td class=" "><?php echo my_date_show($value->valid_from); ?></td>
 							<td class=" "><?php echo my_date_show($value->valid_to); ?></td>
 							<td class=" "><?php echo day_different($value->valid_to)." days left"; ?></td>
@@ -215,9 +217,11 @@
 							<td>
 						&nbsp;
 <a class="asset_insurance" id="<?php echo md5($value->id); ?>" data-toggle="modal" data-target=".bs-example-modal-sm" style="font-size: 16px;">
-<i class="fa fa-pencil"></i></a>
+<i class="fa fa-pencil" title="Edit"></i></a>
 &nbsp;
- <a href="<?php echo base_url()?>Asset/deleteAssetInsurance/<?php echo md5($value->id)."_".$value->asset_id;?>" style="font-size: 16px;"><i class="fa fa-trash"></i></a>
+<a class="deleteAssetInsurance" data-toggle="modal" data-target=".bs-example-modal-sm" style="font-size: 16px;"  id="<?php echo md5($value->id)."_".$value->asset_id;?>">
+<i class="fa fa-trash " ></i></a>
+ <!-- <a href="<?php echo base_url()?>Asset/deleteAssetInsurance/<?php echo md5($value->id)."_".$value->asset_id;?>" style="font-size: 16px;"><i class="fa fa-trash" title="Delete"></i></a> -->
 							</td>
               <?php } ?>
                             </tr>
@@ -233,7 +237,7 @@
 	    <ul class="nav navbar-right panel_toolbox">
       <?php if(user()->action_permit != 'view' )  { ?>
 		 <a  type="button" class="asset_image" id="<?php echo $asset_id;  ?>" data-toggle="modal" data-target=".bs-example-modal-sm" style=" text-align: center;  font-size: 25px; color:#2A3F54;	">
-		 <li class="fa fa-plus-circle"></li></a>
+		 <li class="fa fa-plus-circle" title="Add New"></li></a>
      <?php } ?>
         </ul>	</br> </br> 
 			 <div class="row">
@@ -241,26 +245,37 @@
                 <div class="x_panel">
 				  <div class="x_content">
                      <div class="row">
-					  <?php foreach ($asset_images as $key => $value) { ?>
+	<?php foreach ($asset_images as $key => $value) {  $EXTENSION = pathinfo($value->image, PATHINFO_EXTENSION);  ?>
 					       
 					
-                      <div class="col-md-55">
-                        <div class="thumbnail">
-                          <div class="image view view-first">
-  <img style="width: 100%; display: block;" src="<?php echo base_url(); ?>assets/uploads/<?php echo $value->image; ?>" alt="image" />
-						  <div class="mask">
-						      <p>&nbsp;</p>
-                              <div class="tools tools-bottom">
-  <a class="delete_asset_image" href="<?php echo base_url()?>Asset/deleteAssetImage/<?php echo md5($value->id)."_".$value->asset_id;?>" style="font-size: 16px;" >
-  <i class="fa fa-trash"></i>
+  <div class="col-md-55">
+  <div class="thumbnail">
+  <div class="image view view-first">
+    <?php if($EXTENSION == 'pdf') { ?>
+    <embed  style="width: 100%; display: block;" src="<?php echo base_url(); ?>assets/uploads/<?php echo $value->image; ?>" alt="image" />
+    <?php } else { ?>
+    <img style="width: 100%; display: block;" src="<?php echo base_url(); ?>assets/uploads/<?php echo $value->image; ?>" alt="image" />
+    <?php } ?>
+	<div class="mask">
+	<p>&nbsp;</p>
+  <div class="tools tools-bottom">
+  <a class="deleteAssetImage" data-toggle="modal" data-target=".bs-example-modal-sm" style="font-size: 16px;"  id="<?php echo md5($value->id)."_".$value->asset_id;?>">
+<i class="fa fa-trash " ></i></a>
+  <!-- <a class="delete_asset_image" href="<?php echo base_url()?>Asset/deleteAssetImage/<?php echo md5($value->id)."_".$value->asset_id;?>" style="font-size: 16px;" >
+  <i class="fa fa-trash" title="Delete"></i> -->
   </a>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
+  <?php if($EXTENSION == 'pdf') { ?>
+  <a href="<?php echo base_url()?>/assets/uploads/<?php echo $value->image; ?>" download>
+  <i class="fa fa-download" title="Download"></i>
+  </a>
+  <?php } ?>
+  </div>
+  </div>
+  </div>
+  </div>
+  </div>
                     
-                     <?php } ?>
+ <?php } ?>
 					  
                     </div>
 					 </div>
@@ -307,38 +322,84 @@
     <input type="hidden" class="form-control" id="change_active" value="<?php echo $this->session->flashdata('msg'); ?>" />
 		 
 
-    
+    <div class="modal bs-example-modal-sm" tabindex="-1" role="dialog" aria-hidden="true" id="popup"> </div>   
 
 
     <script>
 
-// $(document).ready(function(){
+$(document).ready(function(){
 
-//   if ($('#change_active').val() == "asset_value") {
-//     $('#asset_value-tab').removeClass('nav-link').addClass('nav-link active');
-//     $('#asset_value').removeClass('tab-pane fade').addClass('tab-pane fade show active');
-//   }
-//   else if ($('#change_active').val() == "asset_usage") {
-//     $('#asset_usage-tab').removeClass('nav-link').addClass('nav-link active');
-//     $('#asset_usage').removeClass('tab-pane fade').addClass('tab-pane fade show active');
-//   }
-//   else if ($('#change_active').val() == "asset_amc") {
-//     $('#asset_amc-tab').removeClass('nav-link').addClass('nav-link active');
-//     $('#asset_amc').removeClass('tab-pane fade').addClass('tab-pane fade show active');
-//   }
-//   else if ($('#change_active').val() == "asset_insurance") {
-//     $('#asset_insurance-tab').removeClass('nav-link').addClass('nav-link active');
-//     $('#asset_insurance').removeClass('tab-pane fade').addClass('tab-pane fade show active');
-//   }
-//   else if ($('#change_active').val() == "asset_image") {
-//     $('#asset_image-tab').removeClass('nav-link').addClass('nav-link active');
-//     $('#asset_image').removeClass('tab-pane fade').addClass('tab-pane fade show active');
-//   }
-//   else{
-//     $('#asset_value-tab').removeClass('nav-link').addClass('nav-link active');
-//     $('#asset_value').removeClass('tab-pane fade').addClass('tab-pane fade show active');
-//   }
-// });
+  // if ($('#change_active').val() == "asset_value") {
+  //   $('#asset_value-tab').removeClass('nav-link').addClass('nav-link active');
+  //   $('#asset_value').removeClass('tab-pane fade').addClass('tab-pane fade show active');
+  // }
+  // else if ($('#change_active').val() == "asset_usage") {
+  //   $('#asset_usage-tab').removeClass('nav-link').addClass('nav-link active');
+  //   $('#asset_usage').removeClass('tab-pane fade').addClass('tab-pane fade show active');
+  // }
+  if ($('#change_active').val() == "asset_amc") {
+    $('#asset_amc-tab').removeClass('nav-link').addClass('nav-link active');
+    $('#asset_amc').removeClass('tab-pane fade').addClass('tab-pane fade show active');
+  }
+  else if ($('#change_active').val() == "asset_insurance") {
+    $('#asset_insurance-tab').removeClass('nav-link').addClass('nav-link active');
+    $('#asset_insurance').removeClass('tab-pane fade').addClass('tab-pane fade show active');
+  }
+  else if ($('#change_active').val() == "asset_image") {
+    $('#asset_image-tab').removeClass('nav-link').addClass('nav-link active');
+    $('#asset_image').removeClass('tab-pane fade').addClass('tab-pane fade show active');
+  }
+  else{
+    $('#asset_value-tab').removeClass('nav-link').addClass('nav-link active');
+    $('#asset_amc').removeClass('tab-pane fade').addClass('tab-pane fade show active');
+  }
+});
 
+
+
+$('.deleteAssetAMC').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Asset/deleteAssetAMC";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Asset/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#edit-form').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+
+$('.deleteAssetInsurance').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Asset/deleteAssetInsurance";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Asset/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#edit-form').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+
+$('.deleteAssetImage').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Asset/deleteAssetImage";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Asset/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#edit-form').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
 </script>
 		
\ No newline at end of file
diff --git a/application/modules/Asset/views/asset_usage_form.php b/application/modules/Asset/views/asset_usage_form.php
index aecd60f..cc7e8e4 100644
--- a/application/modules/Asset/views/asset_usage_form.php
+++ b/application/modules/Asset/views/asset_usage_form.php
@@ -20,7 +20,7 @@
 <div class="x_content">
 <br />
 
-<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"	
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"	>
 <input type="hidden" name="id" value="<?php if(isset($assetUsageData)) { echo $assetUsageData->id; } ?>">	
 <input type="hidden" name="asset_id" value="<?php if(isset($assetUsageData)) { echo $assetUsageData->asset_id; } ?>">	
 <input type="hidden" name="business_id" value="<?php if(isset($assetUsageData)) { echo $assetUsageData->business_id; } ?>">	
diff --git a/application/modules/Asset/views/catogary_master_form.php b/application/modules/Asset/views/catogary_master_form.php
index 3df6111..1fb3842 100644
--- a/application/modules/Asset/views/catogary_master_form.php
+++ b/application/modules/Asset/views/catogary_master_form.php
@@ -17,9 +17,16 @@
 <input type="hidden" name="business_id" value="<?php echo user()->business_id; ?>">	
 	
 <div class="form-group row">
-<label class="col-form-label col-md-3 col-sm-3 ">Catogary</label>
+<label class="col-form-label col-md-3 col-sm-3 ">Catogary<a style="color:red;">*</a></label>
 <div class="col-md-9 col-sm-9 ">
-<input type="text" class="form-control" name="name" value="<?php if(isset($catogary_data)) { echo $catogary_data->name; } ?>">
+<input type="text" class="form-control" name="name" value="<?php if(isset($catogary_data)) { echo $catogary_data->name; } ?>" required>
+</div>
+</div>
+
+<div class="form-group row">
+<label class="col-form-label col-md-3 col-sm-3 ">Depreciation %<a style="color:red;">*</a></label>
+<div class="col-md-9 col-sm-9 ">
+<input type="number" class="form-control" min="1" max="100" name="depreciation_percentage" value="<?php if(isset($catogary_data)) { echo $catogary_data->depreciation_percentage; } ?>" required>
 </div>
 </div>
 
diff --git a/application/modules/Asset/views/confirmation_popup.php b/application/modules/Asset/views/confirmation_popup.php
new file mode 100644
index 0000000..d6f94c0
--- /dev/null
+++ b/application/modules/Asset/views/confirmation_popup.php
@@ -0,0 +1,26 @@
+
+	
+	
+<div class="modal-dialog modal-sm">
+<div class="modal-content">
+
+<div class="modal-header">
+<h6 class="modal-title" id="myModalLabel2">Are you sure you want to delete</h6>
+<button type="button" id="close-form" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span>
+</button>
+</div>
+</br>
+<center>
+<form  class="delete_url" method="post" action="" id="">
+<button type="button" class="btn btn-sm btn-secondary" id="close-form" data-dismiss="modal" aria-label="Close">No</button>	
+&nbsp; &nbsp; &nbsp; &nbsp;
+<input type="hidden" class="delete_id" name="id" value="">
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"	>
+<button type="submit" class="btn btn-sm btn-primary" id="">Yes</button>
+</form>
+</center>
+</br>
+</div>
+</div>
+ 
+
diff --git a/application/modules/Asset/views/department_master_form.php b/application/modules/Asset/views/department_master_form.php
new file mode 100644
index 0000000..23940a4
--- /dev/null
+++ b/application/modules/Asset/views/department_master_form.php
@@ -0,0 +1,36 @@
+
+<div class="modal-dialog modal-lm">
+<div class="modal-content">
+
+<div class="modal-header">
+<h4 class="modal-title" id="myModalLabel2"><?php echo $heading; ?></h4>
+<button type="button" id="close-form" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span>
+</button>
+</div>
+
+<form  data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Asset/add_or_edit_DepartmentForm" >				  
+<div class="modal-body">
+<div class="x_content">
+<br />
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">	
+<input type="hidden" name="id" value="<?php if(isset($department_data)) { echo $department_data->id; } ?>">	
+<input type="hidden" name="business_id" value="<?php echo user()->business_id; ?>">	
+	
+<div class="form-group row">
+<label class="col-form-label col-md-3 col-sm-3 ">Name<a style="color:red;">*</a></label>
+<div class="col-md-9 col-sm-9 ">
+<input type="text" class="form-control" name="name" value="<?php if(isset($department_data)) { echo $department_data->name; } ?>" required>
+</div>
+</div>
+
+</div>
+</div>
+<div class="modal-footer">
+<button type="button" class="btn btn-secondary" data-dismiss="modal"  id="close-form">Close</button>
+<button type="submit" class="btn btn-primary"><?php echo $submit_button_title; ?></button>
+</div>
+</form>
+</div>
+</div>
+
+
diff --git a/application/modules/Asset/views/depreciation_list.php b/application/modules/Asset/views/depreciation_list.php
index bc07f73..887d31e 100644
--- a/application/modules/Asset/views/depreciation_list.php
+++ b/application/modules/Asset/views/depreciation_list.php
@@ -39,9 +39,9 @@
 					 <td class=" "> <?php echo $value['tag']; ?> </td>
 					 <td class=" "> <?php echo $value['serial']; ?> </td>
 					 <td class=" "> <?php echo $value['model']; ?> </td>
-					 <td class=" "> <?php echo $value['purchase_date']; ?> </td>
-					 <td class=" "> <?php echo $value['purchase_cost']; ?> </td>
-					 <td class=" "> <?php echo $value['current_value']; ?> </td>
+					 <td class=" "> <?php echo my_date_show($value['purchase_date']); ?> </td>
+					 <td class=" " style=" text-align: right;"> <?php echo $value['purchase_cost']; ?> </td>
+					 <td class=" " style=" text-align: right;"> <?php echo $value['current_cost']; ?> </td>
                      <td class=" "> <?php echo $value['status']; ?> </td>
                           
                             </tr>
diff --git a/application/modules/Asset/views/edit_asset.php b/application/modules/Asset/views/edit_asset.php
index 8f87bdd..83bc464 100644
--- a/application/modules/Asset/views/edit_asset.php
+++ b/application/modules/Asset/views/edit_asset.php
@@ -7,7 +7,7 @@
 <div class="page-title">
 <div class="title_left"><h3><?php if(isset($viewData)) { echo "View Asset"; }else{ echo "Edit Asset"; } ?></h3></div>
 </div>
-<a class="btn btn-sm btn-primary" style="float: right;" href="<?php echo base_url();?>asset/assetList">Assets List</a>
+<a class="btn btn-sm btn-primary" style="float: right;" href="<?php echo base_url();?>Asset/assetLandingPage">Assets List</a>
 <div class="clearfix"></div>
 <div class="row">
 <div class="col-md-12 col-sm-12 ">
diff --git a/application/modules/Asset/views/insurance_reports_list.php b/application/modules/Asset/views/insurance_reports_list.php
index 382a143..f54992d 100644
--- a/application/modules/Asset/views/insurance_reports_list.php
+++ b/application/modules/Asset/views/insurance_reports_list.php
@@ -42,7 +42,7 @@
 					 <td class=" "> <?php echo $value['serial']; ?> </td>
 					 <td class=" "> <?php echo $value['model']; ?> </td>
 					 <td class=" "> <?php echo $value['insurance_company_name']; ?> </td>
-					 <td class=" "> <?php echo $value['cost']; ?> </td>
+					 <td class=" " style=" text-align: right;"> <?php echo $value['cost']; ?> </td>
 					 <td class=" "> <?php echo  my_date_show($value['valid_from']); ?> </td>
 					 <td class=" "> <?php echo my_date_show($value['valid_to']); ?> </td>
 					 <td class=" "> <?php echo $value['status']; ?> </td>
diff --git a/application/modules/Asset/views/leave_master_form.php b/application/modules/Asset/views/leave_master_form.php
new file mode 100644
index 0000000..b3cccaf
--- /dev/null
+++ b/application/modules/Asset/views/leave_master_form.php
@@ -0,0 +1,43 @@
+
+<div class="modal-dialog modal-lm">
+<div class="modal-content">
+
+<div class="modal-header">
+<h4 class="modal-title" id="myModalLabel2"><?php echo $heading; ?></h4>
+<button type="button" id="close-form" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span>
+</button>
+</div>
+
+<form  data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Asset/add_or_edit_LeaveForm">				  
+<div class="modal-body">
+<div class="x_content">
+<br />
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">	
+<input type="hidden" name="id" value="<?php if(isset($leave_data)) { echo $leave_data->id; } ?>">	
+<input type="hidden" name="business_id" value="<?php echo user()->business_id; ?>">	
+	
+<div class="form-group row">
+<label class="col-form-label col-md-3 col-sm-3 ">Leave Type<a style="color:red;">*</a></label>
+<div class="col-md-9 col-sm-9 ">
+<input type="text" class="form-control" name="type" value="<?php if(isset($leave_data)) { echo $leave_data->type; } ?>" required>
+</div>
+</div>
+
+<div class="form-group row">
+<label class="col-form-label col-md-3 col-sm-3 ">Days<a style="color:red;">*</a></label>
+<div class="col-md-9 col-sm-9 ">
+<input type="text" class="form-control" name="days" value="<?php if(isset($leave_data)) { echo $leave_data->days; } ?>" required>
+</div>
+</div>
+
+</div>
+</div>
+<div class="modal-footer">
+<button type="button" class="btn btn-secondary" data-dismiss="modal"  id="close-form">Close</button>
+<button type="submit" class="btn btn-primary"><?php echo $submit_button_title; ?></button>
+</div>
+</form>
+</div>
+</div>
+
+
diff --git a/application/modules/Asset/views/master_list.php b/application/modules/Asset/views/master_list.php
index 94b5652..a82b84d 100644
--- a/application/modules/Asset/views/master_list.php
+++ b/application/modules/Asset/views/master_list.php
@@ -1,7 +1,7 @@
  
           <div class="x_panel">
             <div class="x_title">
-                   <h2>Details</h2>
+                   <h2>Asset Master</h2>
                    <div class="clearfix"></div>
                  </div>
                  <div class="x_content">
@@ -37,7 +37,7 @@
         <ul class="nav navbar-right panel_toolbox">
         <?php if(user()->action_permit != 'view' )  { ?>
 		<a  type="button" class="manufacture" id="" style=" text-align: center;  font-size: 25px; color:#2A3F54;	">
-		 <li class="fa fa-plus-circle"></li></a>
+		 <li class="fa fa-plus-circle" title="Add New"></li></a>
      <?php } ?>
         </ul>	</br> 
    <div class="card-box table-responsive"> 		
@@ -47,11 +47,11 @@
                             <th class="column-title" width="15%">Name </th>
                             <th class="column-title" width="15%">Phone </th>
                             <th class="column-title" width="15%">Email </th>
+                            <th class="column-title" width="10%">GST </th>
 							              <th class="column-title" width="15%">Address </th>
                             <th class="column-title" width="15%">City </th> 
 							              <th class="column-title" width="15%">State </th> 
                             <th class="column-title" width="10%">Pincode </th>
-                            <th class="column-title" width="10%">Gst </th>
                             <th class="column-title" width="10%">Action </th> 		  							
                           </tr>
                         </thead>
@@ -61,17 +61,19 @@
                             <td class=" "><?php echo $value->name; ?></td>
                             <td class=" "><?php echo $value->phone; ?></td>
 							              <td class=" "><?php echo $value->email; ?></td>
+                            <td class=" "><?php echo $value->gst; ?></td>
 							              <td class=" "><?php echo $value->address; ?></td>
 							              <td class=" "><?php echo $value->city; ?></td>
 							              <td class=" "><?php echo $value->state; ?></td>
                             <td class=" "><?php echo $value->pincode; ?></td>
-                            <td class=" "><?php echo $value->gst; ?></td>
                             <?php if(user()->action_permit != 'view' )  { ?>
 							              <td>
                               <a class="manufacture" id="<?php echo md5($value->id); ?>" style="font-size: 16px;" >
-                              <i class="fa fa-pencil"></i></a>
+                              <i class="fa fa-pencil" title="Edit"></i></a>
                               &nbsp;
-                              <a href="<?php echo base_url()?>Asset/deleteThirdPartyData/<?php echo md5($value->id); ?>" style="font-size: 16px;"><i class="fa fa-trash"></i></a>
+                              <a class="deleteManufacturerData" data-toggle="modal" data-target=".bs-example-modal-sm"  style="font-size: 16px;" id="<?php echo md5($value->id); ?>">
+                              <i class="fa fa-trash " ></i></a>
+                              <!-- <a href="<?php echo base_url()?>Asset/deleteThirdPartyData/<?php echo md5($value->id); ?>" style="font-size: 16px;"><i class="fa fa-trash" title="Delete"></i></a> -->
                             </td>
                       <?php } ?>
                           </tr>
@@ -88,7 +90,7 @@
         <ul class="nav navbar-right panel_toolbox">
         <?php if(user()->action_permit != 'view' )  { ?>
 		<a  type="button" class="supplier" id="" style=" text-align: center;  font-size: 25px; color:#2A3F54;	">
-		 <li class="fa fa-plus-circle"></li></a>
+		 <li class="fa fa-plus-circle" title="Add New"></li></a>
      <?php } ?>
         </ul>	</br> 
    <div class="card-box table-responsive"> 		
@@ -98,11 +100,11 @@
                             <th class="column-title" width="15%">Name </th>
                             <th class="column-title" width="15%">Phone </th>
                             <th class="column-title" width="15%">Email </th>
+                            <th class="column-title" width="10%">GST </th>
 							              <th class="column-title" width="15%">Address </th>
                             <th class="column-title" width="15%">City </th> 
 							              <th class="column-title" width="15%">State </th> 
                             <th class="column-title" width="10%">Pincode </th>
-                            <th class="column-title" width="10%">Gst </th>
                             <th class="column-title" width="10%">Action </th> 		  							
                           </tr>
                         </thead>
@@ -112,17 +114,19 @@
                             <td class=" "><?php echo $value->name; ?></td>
                             <td class=" "><?php echo $value->phone; ?></td>
 							              <td class=" "><?php echo $value->email; ?></td>
+                            <td class=" "><?php echo $value->gst; ?></td>
 							              <td class=" "><?php echo $value->address; ?></td>
 							              <td class=" "><?php echo $value->city; ?></td>
 							              <td class=" "><?php echo $value->state; ?></td>
                             <td class=" "><?php echo $value->pincode; ?></td>
-                            <td class=" "><?php echo $value->gst; ?></td>
                             <?php if(user()->action_permit != 'view' )  { ?>
 							              <td>
                               <a class="supplier" id="<?php echo md5($value->id); ?>" style="font-size: 16px;" >
-                              <i class="fa fa-pencil"></i></a>
+                              <i class="fa fa-pencil" title="Edit"></i></a>
                               &nbsp;
-                              <a href="<?php echo base_url()?>Asset/deleteThirdPartyData/<?php echo md5($value->id); ?>" style="font-size: 16px;"><i class="fa fa-trash"></i></a>
+                              <a class="deleteSupplierData" data-toggle="modal" data-target=".bs-example-modal-sm" style="font-size: 16px;"  id="<?php echo md5($value->id); ?>">
+                              <i class="fa fa-trash " ></i></a>
+                              <!-- <a href="<?php echo base_url()?>Asset/deleteThirdPartyData/<?php echo md5($value->id); ?>" style="font-size: 16px;"><i class="fa fa-trash" title="Delete"></i></a> -->
                             </td>
                       <?php } ?>
                           </tr>
@@ -138,7 +142,7 @@
         <ul class="nav navbar-right panel_toolbox">
         <?php if(user()->action_permit != 'view' )  { ?>
 		<a  type="button" class="service_privoder" id="" style=" text-align: center;  font-size: 25px; color:#2A3F54;	">
-		 <li class="fa fa-plus-circle"></li></a>
+		 <li class="fa fa-plus-circle" title="Add New"></li></a>
      <?php } ?>
         </ul>	</br> 
    <div class="card-box table-responsive"> 		
@@ -148,11 +152,11 @@
                             <th class="column-title" width="15%">Name </th>
                             <th class="column-title" width="15%">Phone </th>
                             <th class="column-title" width="15%">Email </th>
+                            <th class="column-title" width="10%">GST </th>
 							              <th class="column-title" width="15%">Address </th>
                             <th class="column-title" width="15%">City </th> 
 							              <th class="column-title" width="15%">State </th> 
                             <th class="column-title" width="10%">Pincode </th>
-                            <th class="column-title" width="10%">Gst </th>
                             <th class="column-title" width="10%">Action </th> 		  							
                           </tr>
                         </thead>
@@ -162,17 +166,19 @@
                             <td class=" "><?php echo $value->name; ?></td>
                             <td class=" "><?php echo $value->phone; ?></td>
 							              <td class=" "><?php echo $value->email; ?></td>
+                            <td class=" "><?php echo $value->gst; ?></td>
 							              <td class=" "><?php echo $value->address; ?></td>
 							              <td class=" "><?php echo $value->city; ?></td>
 							              <td class=" "><?php echo $value->state; ?></td>
                             <td class=" "><?php echo $value->pincode; ?></td>
-                            <td class=" "><?php echo $value->gst; ?></td>
                             <?php if(user()->action_permit != 'view' )  { ?>
 							              <td>
                               <a class="service_privoder" id="<?php echo md5($value->id); ?>" style="font-size: 16px;" >
-                              <i class="fa fa-pencil"></i></a>
+                              <i class="fa fa-pencil" title="Edit"></i></a>
                               &nbsp;
-                              <a href="<?php echo base_url()?>Asset/deleteThirdPartyData/<?php echo md5($value->id); ?>" style="font-size: 16px;"><i class="fa fa-trash"></i></a>
+                              <a class="deleteServicePrivoderData" data-toggle="modal" data-target=".bs-example-modal-sm" style="font-size: 16px;"  id="<?php echo md5($value->id); ?>">
+                              <i class="fa fa-trash " ></i></a>
+                              <!-- <a href="<?php echo base_url()?>Asset/deleteThirdPartyData/<?php echo md5($value->id); ?>" style="font-size: 16px;"><i class="fa fa-trash" title="Delete"></i></a> -->
                             </td>
                       <?php } ?>
                           </tr>
@@ -188,7 +194,7 @@
         <ul class="nav navbar-right panel_toolbox">
         <?php if(user()->action_permit != 'view' )  { ?>
 		<a  type="button" class="insurence" id="" style=" text-align: center;  font-size: 25px; color:#2A3F54;	">
-		 <li class="fa fa-plus-circle"></li></a>
+		 <li class="fa fa-plus-circle" title="Add New"></li></a>
      <?php } ?>
         </ul>	</br> 
    <div class="card-box table-responsive"> 		
@@ -198,11 +204,11 @@
                             <th class="column-title" width="15%">Name </th>
                             <th class="column-title" width="15%">Phone </th>
                             <th class="column-title" width="15%">Email </th>
+                            <th class="column-title" width="10%">GST </th>
 							              <th class="column-title" width="15%">Address </th>
                             <th class="column-title" width="15%">City </th> 
 							              <th class="column-title" width="15%">State </th> 
                             <th class="column-title" width="10%">Pincode </th>
-                            <th class="column-title" width="10%">Gst </th>
                             <th class="column-title" width="10%">Action </th> 		  							
                           </tr>
                         </thead>
@@ -212,17 +218,19 @@
                             <td class=" "><?php echo $value->name; ?></td>
                             <td class=" "><?php echo $value->phone; ?></td>
 							              <td class=" "><?php echo $value->email; ?></td>
+                            <td class=" "><?php echo $value->gst; ?></td>
 							              <td class=" "><?php echo $value->address; ?></td>
 							              <td class=" "><?php echo $value->city; ?></td>
 							              <td class=" "><?php echo $value->state; ?></td>
                             <td class=" "><?php echo $value->pincode; ?></td>
-                            <td class=" "><?php echo $value->gst; ?></td>
                             <?php if(user()->action_permit != 'view' )  { ?>
 							              <td>
                               <a class="insurence" id="<?php echo md5($value->id); ?>" style="font-size: 16px;" >
-                              <i class="fa fa-pencil"></i></a>
+                              <i class="fa fa-pencil" title="Edit"></i></a>
                               &nbsp;
-                              <a href="<?php echo base_url()?>Asset/deleteThirdPartyData/<?php echo md5($value->id); ?>" style="font-size: 16px;"><i class="fa fa-trash"></i></a>
+                              <a class="deleteInsurenceData" data-toggle="modal" data-target=".bs-example-modal-sm" style="font-size: 16px;"  id="<?php echo md5($value->id); ?>">
+                              <i class="fa fa-trash " ></i></a>
+                              <!-- <a href="<?php echo base_url()?>Asset/deleteThirdPartyData/<?php echo md5($value->id); ?>" style="font-size: 16px;"><i class="fa fa-trash" title="Delete"></i></a> -->
                             </td>
                       <?php } ?>
                           </tr>
@@ -238,7 +246,7 @@
         <ul class="nav navbar-right panel_toolbox">
         <?php if(user()->action_permit != 'view' )  { ?>
 		<a  type="button" class="location" id="" style=" text-align: center;  font-size: 25px; color:#2A3F54;	">
-		 <li class="fa fa-plus-circle"></li></a>
+		 <li class="fa fa-plus-circle" title="Add New"></li></a>
      <?php } ?>
         </ul>	</br> 
    <div class="card-box table-responsive"> 		
@@ -275,29 +283,33 @@
         <ul class="nav navbar-right panel_toolbox">
         <?php if(user()->action_permit != 'view' )  { ?>
 		<a  type="button" class="catogary" id="" style=" text-align: center;  font-size: 25px; color:#2A3F54;	">
-		 <li class="fa fa-plus-circle"></li></a>
+		 <li class="fa fa-plus-circle" title="Add New"></li></a>
      <?php } ?>
         </ul>	</br> 
    <div class="card-box table-responsive"> 		
         <table  class="table table-bordered table-striped"  cellspacing="0" width="100%">
                         <thead>
                           <tr class="headings">
-                            <th class="column-title" width="15%">Catogary </th> 	
-                            <!-- <th class="column-title" width="10%">Action </th> 		  							 -->
+                            <th class="column-title" width="15%">Catogary </th> 
+                            <th class="column-title" width="15%">Depreciation % </th> 		
+                            <th class="column-title" width="10%">Action </th> 		  							
                           </tr>
                         </thead>
                         <tbody>
                       <?php foreach ($categoriesData as $key => $value) { ?>
 					                  <tr class="even pointer">
                             <td class=" "><?php echo $value->name; ?></td>
-                            <!-- <?php if(user()->action_permit != 'view' )  { ?>
+                            <td class=" "><?php echo $value->depreciation_percentage; ?></td>
+                            <?php if(user()->action_permit != 'view' )  { ?>
 							              <td>
-                              <a class="location" id="<?php echo md5($value->id); ?>" style="font-size: 16px;" >
-                              <i class="fa fa-pencil"></i></a>
+                              <a class="catogary" id="<?php echo md5($value->id); ?>" style="font-size: 16px;" >
+                              <i class="fa fa-pencil" title="Edit"></i></a>
                               &nbsp;
-                              <a href="<?php echo base_url()?>Asset/deleteThirdPartyData/<?php echo md5($value->id); ?>" style="font-size: 16px;"><i class="fa fa-trash"></i></a>
+                              <a class="deleteCategoriesData" data-toggle="modal" data-target=".bs-example-modal-sm" style="font-size: 16px;"  id="<?php echo md5($value->id); ?>">
+                              <i class="fa fa-trash " ></i></a>
+                              <!-- <a href="<?php echo base_url()?>Asset/deleteCategoriesFormData/<?php echo md5($value->id); ?>" style="font-size: 16px;"><i class="fa fa-trash" title="Delete"></i></a> -->
                             </td>
-                      <?php } ?> -->
+                      <?php } ?> 
                           </tr>
 					<?php } ?>
                         </tbody>
@@ -305,6 +317,7 @@
 		</div>
  </div> 
 
+
 <!-- ------------------------------------------------------------------------- -->
           
 
@@ -313,10 +326,174 @@
 
 					  
 					  
+    </div>
+  </div>
+</div>
+
+
+
+
+                                           <!-- EMPLOYEE MASTER
+###################################################################################################################
+###################################################################################################################
+################################################################################################################### -->
+
+
+<div class="x_panel">
+            <div class="x_title">
+                   <h2>Employee Master</h2>
+                   <div class="clearfix"></div>
+                 </div>
+                 <div class="x_content">
+                   <ul class="nav nav-tabs bar_tabs" id="myTab" role="tablist">
+                    
+                     <li class="nav-item">
+                       <a class="nav-link" id="department-tab" data-toggle="tab" href="#department" role="tab" aria-controls="department" aria-selected="false">Department</a>
+                     </li>
+
+                     <li class="nav-item">
+                       <a class="nav-link" id="leave-tab" data-toggle="tab" href="#leave" role="tab" aria-controls="leave" aria-selected="false">Leave</a>
+                     </li>
+                     
+                     <li class="nav-item">
+                       <a class="nav-link" id="decline-tab" data-toggle="tab" href="#decline" role="tab" aria-controls="decline" aria-selected="false">Decline Reason</a>
+                     </li>
+                   </ul>
+					
+					
+        <div class="tab-content" id="myTabContent">
+
+
+
+
+<!------------------------------ DEPARTMENT DATA		 ------------------------------>
+<div class="tab-pane fade" id="department" role="tabpanel" aria-labelledby="department-tab">
+        <ul class="nav navbar-right panel_toolbox">
+        <?php if(user()->action_permit != 'view' )  { ?>
+		<a  type="button" class="department" id="" style=" text-align: center;  font-size: 25px; color:#2A3F54;	">
+		 <li class="fa fa-plus-circle" title="Add New"></li></a>
+     <?php } ?>
+        </ul>	</br> 
+   <div class="card-box table-responsive"> 		
+        <table  class="table table-bordered table-striped"  cellspacing="0" width="100%">
+                        <thead>
+                          <tr class="headings">
+                            <th class="column-title" width="15%">Name </th> 
+                            <th class="column-title" width="10%">Action </th> 		  							
+                          </tr>
+                        </thead>
+                        <tbody>
+                      <?php foreach ($departmentData as $key => $value) { ?>
+					                  <tr class="even pointer">
+                            <td class=" "><?php echo $value->name; ?></td>
+                            <?php if(user()->action_permit != 'view' )  { ?>
+							              <td>
+                              <a class="department" id="<?php echo md5($value->id); ?>" style="font-size: 16px;" >
+                              <i class="fa fa-pencil" title="Edit"></i></a>
+                              &nbsp;
+                              <a class="deleteDepartmentData" data-toggle="modal" data-target=".bs-example-modal-sm" style="font-size: 16px;"  id="<?php echo md5($value->id); ?>">
+                              <i class="fa fa-trash " ></i></a>
+                              <!-- <a href="<?php echo base_url()?>Asset/deleteCategoriesFormData/<?php echo md5($value->id); ?>" style="font-size: 16px;"><i class="fa fa-trash" title="Delete"></i></a> -->
+                            </td>
+                      <?php } ?> 
+                          </tr>
+					<?php } ?>
+                        </tbody>
+        </table>
+		</div>
+ </div> 
+
+<!-- ------------------------------------------------------------------------- -->	
+
+
+<!------------------------------ LEAVE DATA    ------------------------------------->
+<div class="tab-pane fade" id="leave" role="tabpanel" aria-labelledby="leave-tab">
+        <ul class="nav navbar-right panel_toolbox">
+        <?php if(user()->action_permit != 'view' )  { ?>
+    <a  type="button" class="leave" id="" style=" text-align: center;  font-size: 25px; color:#2A3F54;  ">
+     <li class="fa fa-plus-circle" title="Add New"></li></a>
+     <?php } ?>
+        </ul> </br> 
+   <div class="card-box table-responsive">    
+        <table  class="table table-bordered table-striped"  cellspacing="0" width="100%">
+                        <thead>
+                          <tr class="headings">
+                            <th class="column-title" width="15%">Leave Type </th> 
+                            <th class="column-title" width="15%">Days </th> 
+                            <th class="column-title" width="10%">Action </th>                     
+                          </tr>
+                        </thead>
+                        <tbody>
+                      <?php foreach ($leaveData as $key => $value) { ?>
+                            <tr class="even pointer">
+                            <td class=" "><?php echo $value->type; ?></td>
+                            <td class=" "><?php echo $value->days; ?></td>
+                            <?php if(user()->action_permit != 'view' )  { ?>
+                            <td>
+                              <a class="leave" id="<?php echo md5($value->id); ?>" style="font-size: 16px;" >
+                              <i class="fa fa-pencil" title="Edit"></i></a>
+                              &nbsp;
+                              <a class="deleteLeaveData" data-toggle="modal" data-target=".bs-example-modal-sm" style="font-size: 16px;"  id="<?php echo md5($value->id); ?>">
+                              <i class="fa fa-trash " ></i></a>
+                              <!-- <a href="<?php echo base_url()?>Asset/deleteCategoriesFormData/<?php echo md5($value->id); ?>" style="font-size: 16px;"><i class="fa fa-trash" title="Delete"></i></a> -->
+                            </td>
+                      <?php } ?> 
+                          </tr>
+          <?php } ?>
+                        </tbody>
+        </table>
+    </div>
+ </div> 
+
+<!-- ------------------------------------------------------------------------- -->  
+
+
+<!------------------------------ DECLINE REASON ------------------------------>
+<div class="tab-pane fade" id="decline" role="tabpanel" aria-labelledby="decline-tab">
+        <ul class="nav navbar-right panel_toolbox">
+        <?php if(user()->action_permit != 'view' )  { ?>
+    <a  type="button" class="decline" id="" style=" text-align: center;  font-size: 25px; color:#2A3F54;  ">
+     <li class="fa fa-plus-circle" title="Add New"></li></a>
+     <?php } ?>
+        </ul> </br> 
+   <div class="card-box table-responsive">    
+        <table  class="table table-bordered table-striped"  cellspacing="0" width="100%">
+                        <thead>
+                          <tr class="headings">
+                            <th class="column-title" width="15%">Reason</th> 
+                            <th class="column-title" width="10%">Action </th>                     
+                          </tr>
+                        </thead>
+                        <tbody>
+                      <?php foreach ($enum_value as $key => $value) { ?>
+                            <tr class="even pointer">
+                            <td class=" "><?php echo $value->enum_value; ?></td>
+                            <?php if(user()->action_permit != 'view' )  { ?>
+                            <td>
+                              <a class="decline" id="<?php echo md5($value->id); ?>" style="font-size: 16px;" >
+                              <i class="fa fa-pencil" title="Edit"></i></a>
+                              &nbsp;
+                              <a class="deletedeclineData" data-toggle="modal" data-target=".bs-example-modal-sm" style="font-size: 16px;"  id="<?php echo md5($value->id); ?>">
+                              <i class="fa fa-trash " ></i></a>
+            
+                            </td>
+                      <?php } ?> 
+                          </tr>
+          <?php } ?>
+                        </tbody>
+        </table>
+    </div>
+ </div> 
+
+<!-- ------------------------------------------------------------------------- --> 
+
+					  
+					  
     </div>
   </div>
 </div>
         
+
 <input type="hidden" class="form-control" id="change_active" value="<?php echo $this->session->flashdata('msg'); ?>" />
 
 
@@ -332,6 +509,10 @@
     $('#catogary-tab').removeClass('nav-link').addClass('nav-link active');
     $('#catogary').removeClass('tab-pane fade').addClass('tab-pane fade show active');
   }
+  else if ($('#change_active').val() == "department") {
+    $('#department-tab').removeClass('nav-link').addClass('nav-link active');
+    $('#department').removeClass('tab-pane fade').addClass('tab-pane fade show active');
+  }
   else if ($('#change_active').val() == "1") {
     $('#manufacture-tab').removeClass('nav-link').addClass('nav-link active');
     $('#manufacture').removeClass('tab-pane fade').addClass('tab-pane fade show active');
@@ -348,19 +529,26 @@
     $('#insurence-tab').removeClass('nav-link').addClass('nav-link active');
     $('#insurence').removeClass('tab-pane fade').addClass('tab-pane fade show active');
   }
+  else if ($('#change_active').val() == "leave") {
+    $('#leave-tab').removeClass('nav-link').addClass('nav-link active');
+    $('#leave').removeClass('tab-pane fade').addClass('tab-pane fade show active');
+  }
+  else if ($('#change_active').val() == "decline") {
+    $('#decline-tab').removeClass('nav-link').addClass('nav-link active');
+    $('#decline').removeClass('tab-pane fade').addClass('tab-pane fade show active');
+  }
   else{
-    $('#manufacture-tab').removeClass('nav-link').addClass('nav-link active');
-    $('#manufacture').removeClass('tab-pane fade').addClass('tab-pane fade show active');
+
   }
 });
   
 $(document).on('click','.manufacture',function(){
   var id = $(this).attr("id")
   if (id) {
-    var URL = "<?php echo base_url();?>asset/getThirdPartyForm/"+id
+    var URL = "<?php echo base_url();?>Asset/getThirdPartyForm/"+id
   } 
   else {
-    var URL = "<?php echo base_url();?>asset/getThirdPartyForm/"+"manufacture"
+    var URL = "<?php echo base_url();?>Asset/getThirdPartyForm/"+"manufacture"
   }
   $.ajax({
         url: URL,
@@ -377,10 +565,10 @@
 $(document).on('click','.supplier',function(){
   var id = $(this).attr("id")
   if (id) {
-    var URL = "<?php echo base_url();?>asset/getThirdPartyForm/"+id
+    var URL = "<?php echo base_url();?>Asset/getThirdPartyForm/"+id
   } 
   else {
-    var URL = "<?php echo base_url();?>asset/getThirdPartyForm/"+"supplier"
+    var URL = "<?php echo base_url();?>Asset/getThirdPartyForm/"+"supplier"
   }
   $.ajax({
         url: URL,
@@ -397,10 +585,10 @@
 $(document).on('click','.service_privoder',function(){
   var id = $(this).attr("id")
   if (id) {
-    var URL = "<?php echo base_url();?>asset/getThirdPartyForm/"+id
+    var URL = "<?php echo base_url();?>Asset/getThirdPartyForm/"+id
   } 
   else {
-    var URL = "<?php echo base_url();?>asset/getThirdPartyForm/"+"service_privoder"
+    var URL = "<?php echo base_url();?>Asset/getThirdPartyForm/"+"service_privoder"
   }
   $.ajax({
         url: URL,
@@ -418,10 +606,10 @@
 $(document).on('click','.insurence',function(){
   var id = $(this).attr("id")
   if (id) {
-    var URL = "<?php echo base_url();?>asset/getThirdPartyForm/"+id
+    var URL = "<?php echo base_url();?>Asset/getThirdPartyForm/"+id
   } 
   else {
-    var URL = "<?php echo base_url();?>asset/getThirdPartyForm/"+"insurence"
+    var URL = "<?php echo base_url();?>Asset/getThirdPartyForm/"+"insurence"
   }
   $.ajax({
         url: URL,
@@ -439,10 +627,10 @@
 $(document).on('click','.location',function(){  
   var id = $(this).attr("id")
   if (id) {
-    var URL = "<?php echo base_url();?>asset/getLocationForm/"+id
+    var URL = "<?php echo base_url();?>Asset/getLocationForm/"+id
   } 
   else {
-    var URL = "<?php echo base_url();?>asset/getLocationForm/"+"location"
+    var URL = "<?php echo base_url();?>Asset/getLocationForm/"+"location"
   }
   $.ajax({
         url: URL,
@@ -456,13 +644,14 @@
 
 
 $(document).on('click','.catogary',function(){
-  var id = $(this).attr("id")
+  var id = $(this).attr("id");
   if (id) {
-    var URL = "<?php echo base_url();?>asset/getCatogaryForm/"+id
+    var URL = "<?php echo base_url();?>Asset/getCatogaryForm/"+id
   } 
   else {
-    var URL = "<?php echo base_url();?>asset/getCatogaryForm/"+"catogary"
+    var URL = "<?php echo base_url();?>Asset/getCatogaryForm/"+"catogary"
   }
+  console.log(URL);
   $.ajax({
         url: URL,
         type:"GET",
@@ -474,6 +663,192 @@
         }
     });
 });
+
+$(document).on('click','.department',function(){
+  var id = $(this).attr("id");
+  if (id) {
+    var URL = "<?php echo base_url();?>Asset/getDepartmentForm/"+id
+  } 
+  else {
+    var URL = "<?php echo base_url();?>Asset/getDepartmentForm/"+"department"
+  }
+  console.log(URL);
+  $.ajax({
+        url: URL,
+        type:"GET",
+        success:function(data){
+		
+          $('#edit-form').html(JSON.parse(data));
+          $('.bs-example-modal-sm').modal("show");
+		 
+        }
+    });
+});
+
+
+$(document).on('click','.leave',function(){
+  var id = $(this).attr("id");
+  if (id) {
+    var URL = "<?php echo base_url();?>Asset/getLeaveForm/"+id
+  } 
+  else {
+    var URL = "<?php echo base_url();?>Asset/getLeaveForm/"+"leave"
+  }
+  console.log(URL);
+  $.ajax({
+        url: URL,
+        type:"GET",
+        success:function(data){
+		
+          $('#edit-form').html(JSON.parse(data));
+          $('.bs-example-modal-sm').modal("show");
+		 
+        }
+    });
+});
+
+
+$(document).on('click','.decline',function(){
+  var id = $(this).attr("id");
+  if (id) {
+    var URL = "<?php echo base_url();?>Asset/getDeclineForm/"+id
+  } 
+  else {
+    var URL = "<?php echo base_url();?>Asset/getDeclineForm/"+"decline"
+  }
+  console.log(URL);
+  $.ajax({
+        url: URL,
+        type:"GET",
+        success:function(data){
+    
+          $('#edit-form').html(JSON.parse(data));
+          $('.bs-example-modal-sm').modal("show");
+     
+        }
+    });
+});
+
+$('.deleteManufacturerData').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Asset/deleteThirdPartyData";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Asset/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#edit-form').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+
+$('.deleteSupplierData').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Asset/deleteThirdPartyData";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Asset/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#edit-form').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+
+$('.deleteServicePrivoderData').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Asset/deleteThirdPartyData";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Asset/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#edit-form').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+
+$('.deleteInsurenceData').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Asset/deleteThirdPartyData";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Asset/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#edit-form').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+
+$('.deleteCategoriesData').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Asset/deleteCategoriesFormData";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Asset/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#edit-form').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+
+$('.deleteDepartmentData').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Asset/deleteDepartmentFormData";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Asset/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#edit-form').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+
+$('.deleteLeaveData').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Asset/deleteLeaveFormData";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Asset/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#edit-form').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+
+$('.deletedeclineData').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Asset/deleteDeclineFormData";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Asset/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#edit-form').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+
 </script>
 	 
 		 
diff --git a/application/modules/Asset/views/third_party_master_form.php b/application/modules/Asset/views/third_party_master_form.php
index 57262d6..ba37c6c 100644
--- a/application/modules/Asset/views/third_party_master_form.php
+++ b/application/modules/Asset/views/third_party_master_form.php
@@ -18,37 +18,44 @@
 <input type="hidden" name="business_id" value="<?php echo user()->business_id; ?>">	
 	
 <div class="form-group row">
-<label class="col-form-label col-md-3 col-sm-3 ">Name</label>
+<label class="col-form-label col-md-3 col-sm-3 ">Name<a style="color:red;">*</a></label>
 <div class="col-md-9 col-sm-9 ">
-<input type="text" class="form-control" name="name" value="<?php if(isset($third_party_data)) { echo $third_party_data->name; } ?>">
+<input type="text" class="form-control" name="name" value="<?php if(isset($third_party_data)) { echo $third_party_data->name; } ?>" required >
 </div>
 </div>
 
 <div class="form-group row">
 <label class="col-form-label col-md-3 col-sm-3 ">Phone</label>
 <div class="col-md-9 col-sm-9 ">
-<input type="text" pattern="[6-9]{1}[0-9]{9}" title="Phone number with 6-9 and remaing 9 digit with 0-9" class="form-control" name="phone" value="<?php if(isset($third_party_data)) { echo $third_party_data->phone; } ?>">
+<input type="text" pattern="[6-9]{1}[0-9]{9}" title="Phone number with 6-9 and remaing 9 digit with 0-9" class="form-control" name="phone" value="<?php if(isset($third_party_data)) { echo $third_party_data->phone; } ?>"  >
 </div>
 </div>
 
 <div class="form-group row">
 <label class="col-form-label col-md-3 col-sm-3 ">Email</label>
 <div class="col-md-9 col-sm-9 ">
-<input type="email" class="form-control" name="email" value="<?php if(isset($third_party_data)) { echo $third_party_data->email; } ?>">
+<input type="email" class="form-control" name="email" value="<?php if(isset($third_party_data)) { echo $third_party_data->email; } ?>" >
+</div>
+</div>
+
+<div class="form-group row">
+<label class="col-form-label col-md-3 col-sm-3 ">GST<a style="color:red;">*</a></label>
+<div class="col-md-9 col-sm-9 ">
+<input type="text" class="form-control" name="gst" value="<?php if(isset($third_party_data)) { echo $third_party_data->gst; } ?>" required>
 </div>
 </div>
 
 <div class="form-group row">
 <label class="col-form-label col-md-3 col-sm-3 ">Address</label>
 <div class="col-md-9 col-sm-9 ">
-<input type="text" class="form-control" name="address" value="<?php if(isset($third_party_data)) { echo $third_party_data->address; } ?>">
+<input type="text" class="form-control" name="address" value="<?php if(isset($third_party_data)) { echo $third_party_data->address; } ?>"  >
 </div>
 </div>
 
 <div class="form-group row">
 <label class="col-form-label col-md-3 col-sm-3 ">City</label>
 <div class="col-md-9 col-sm-9 ">
-<input type="text" class="form-control" name="city" value="<?php if(isset($third_party_data)) { echo $third_party_data->city; } ?>">
+<input type="text" class="form-control" name="city" value="<?php if(isset($third_party_data)) { echo $third_party_data->city; } ?>"  >
 </div>
 </div>
 
@@ -69,18 +76,12 @@
 </div>
 
 <div class="form-group row">
-<label class="col-form-label col-md-3 col-sm-3 ">Pincode</label>
+<label class="col-form-label col-md-3 col-sm-3 "  >Pincode</label>
 <div class="col-md-9 col-sm-9 ">
 <input type="text" class="form-control" name="pincode" value="<?php if(isset($third_party_data)) { echo $third_party_data->pincode; } ?>">
 </div>
 </div>
 
-<div class="form-group row">
-<label class="col-form-label col-md-3 col-sm-3 ">Gst</label>
-<div class="col-md-9 col-sm-9 ">
-<input type="text" class="form-control" name="gst" value="<?php if(isset($third_party_data)) { echo $third_party_data->gst; } ?>">
-</div>
-</div>
 
 </div>
 </div>
diff --git a/application/modules/Auth/controllers/Auth.php b/application/modules/Auth/controllers/Auth.php
index 8264932..a204b91 100644
--- a/application/modules/Auth/controllers/Auth.php
+++ b/application/modules/Auth/controllers/Auth.php
@@ -25,8 +25,10 @@ public function __construct()
     {
         // To inherit directly the attributes of the parent class.
         parent::__construct();
-        $this->load->model('auth_model');
-        $this->load->model('MY_Model');
+        ### Syntax : $this->load->model('Model Path' , 'Alias name');
+        ### The second parameter (optional) is used to call the method.
+        $this->load->model('Auth_model','auth_model');
+        $this->load->model('MY_Model','MY_Model');
     }
 
 
@@ -44,10 +46,10 @@ public function index()
         // Example
         if(check_auth())
         {
-            redirect('dashboard');
+            redirect('Dashboard');
         }
         else{
-        $this->layout->load_view('auth/login');    
+        $this->layout->load_view('Auth/login');    
         }
         // $this->load->view('welcome/welcome_message');
         // $this->load->view('welcome_message');
@@ -122,7 +124,7 @@ public function authendicate()
                 );
                 $data = $this->security->xss_clean($data);
                 $this->session->set_userdata($data); 
-                redirect('dashboard');
+                redirect('Dashboard');
             }
             // pass the value 1 when the username or password is wrong
             $this->session->set_flashdata('msg',"password doesn't match");
@@ -137,7 +139,7 @@ public function logout()
 
     public function lost_your_password()
     {
-        $this->layout->load_view("auth/otp_verification");
+        $this->layout->load_view("Auth/otp_verification");
     }
 
     public function send__mail(){
diff --git a/application/modules/Auth/models/Auth_model.php b/application/modules/Auth/models/Auth_model.php
index 777babb..a14d13b 100644
--- a/application/modules/Auth/models/Auth_model.php
+++ b/application/modules/Auth/models/Auth_model.php
@@ -34,6 +34,18 @@ public function get_logged_user()
         }
     }
 
+     public function get_logged_employee()
+    {
+        if ($this->is_logged_in()) {
+            $this->db->select('u.*, e.*');
+            $this->db->from('users as u');
+            $this->db->join('employees as e', 'e.user_id = u.id', 'LEFT');
+            $this->db->where('u.id', $this->session->userdata('id'));
+            $query = $this->db->get();
+            return $query->row();
+        }
+    }
+
     //get user by id
     public function get_user($id)
     {
diff --git a/application/modules/Auth/views/login.php b/application/modules/Auth/views/login.php
index 6bdf674..3bba26c 100644
--- a/application/modules/Auth/views/login.php
+++ b/application/modules/Auth/views/login.php
@@ -31,26 +31,26 @@
       <div class="login_wrapper">
         <div class="animate form login_form">
           <section class="login_content">
-            <form method="post" action="<?php echo base_url().'auth/authendicate'?>">
+            <form method="post" action="<?php echo base_url().'Auth/authendicate'?>">
 			  <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">	
               <h1>Sign In</h1>
               <div>
-                <input type="text" class="form-control" value="admin@abc.com" name="user_name" placeholder="Username" required="" />
+                <input type="text" class="form-control" value="" name="user_name" placeholder="Username" required="" />
               </div>
               <div>
-                <input type="password" class="form-control" value="password" name="password" placeholder="Password" required="" />
+                <input type="password" class="form-control" value="" name="password" placeholder="Password" required="" />
                 <p id='message' style="color:red"><?php echo $this->session->flashdata('msg'); ?></p>
               </div>
               <div>
                 <button type="submit" class="btn btn-primary">Log in</button>
-                <a class="reset_pass" href="<?php echo base_url();?>auth/lost_your_password">Lost your password?</a>
+                <a class="reset_pass" href="<?php echo base_url();?>Auth/lost_your_password">Lost your password?</a>
               </div>
 
               <div class="clearfix"></div>
 
               <div class="separator">
                 <!-- <p class="change_link">New to site? -->
-                  <!-- <a href="<?php echo base_url().'auth/lost_your_password'?>" class="to_register"> Create Account </a>
+                  <!-- <a href="<?php echo base_url().'Auth/lost_your_password'?>" class="to_register"> Create Account </a>
                 </p> -->
 
                 <div class="clearfix"></div>
diff --git a/application/modules/Backend/controllers/Backend.php b/application/modules/Backend/controllers/Backend.php
index e8be1ed..dcccbeb 100644
--- a/application/modules/Backend/controllers/Backend.php
+++ b/application/modules/Backend/controllers/Backend.php
@@ -48,6 +48,7 @@ public function index()
         // Example
         // $this->load->render_page('backend/dashboard',[]);
         echo 'Hi from Backend_Controller&index function';//die();
+        redirect('login');
     }
 
     public function str_length()
diff --git a/application/modules/Business/controllers/Business.php b/application/modules/Business/controllers/Business.php
index 613ffea..c0b27aa 100644
--- a/application/modules/Business/controllers/Business.php
+++ b/application/modules/Business/controllers/Business.php
@@ -25,8 +25,10 @@ public function __construct()
     {
         // To inherit directly the attributes of the parent class.
         parent::__construct();
-        $this->load->model('MY_Model');
-		 $this->load->model('Business_model');
+		### Syntax : $this->load->model('Model Path' , 'Alias name');
+        ### The second parameter (optional) is used to call the method.
+        $this->load->model('MY_Model','MY_Model');
+		$this->load->model('Business_model','Business_model');
 		$this->load->helper(array('form', 'url'));
     }
 	
@@ -103,9 +105,9 @@ public function create_business()
 		// $create_business = 3;
 		if($add_admin == 1)
 		{
-		redirect('user/addUser/'.$create_business);
+		redirect('User/addUser/'.$create_business);
 		}else{
-	    redirect('business/business_list');
+	    redirect('Business/business_list');
 		}
     
     }
@@ -161,15 +163,15 @@ public function edit_business()
          //audit history generation for update 
 		 $test = $this->audit->create_history('update');
 		 }
-		if(is_superadmin()){ redirect('business/business_list');}
-		else if(is_admin()){ redirect('user/businessProfile/'.md5(user()->business_id)); }
+		if(is_superadmin()){ redirect('Business/business_list');}
+		else if(is_admin()){ redirect('User/businessProfile/'.md5(user()->business_id)); }
  
     }
 
   public function delete_business($id)
     {
     $Data = $this->Business_model->delete_by_md5_id($id,user()->business_id,'asset');
-	redirect('business/business_list');
+	redirect('Business/business_list');
 	}
 
 }
diff --git a/application/modules/Business/views/business_list.php b/application/modules/Business/views/business_list.php
index ee3a7c3..893f173 100644
--- a/application/modules/Business/views/business_list.php
+++ b/application/modules/Business/views/business_list.php
@@ -7,7 +7,7 @@
                     <h2>Business Details </h2>
 					
                     <ul class="nav navbar-right panel_toolbox">
-					 <a href="<?php echo base_url();?>business/add_business" class="btn btn-sm btn-primary">Add Business</a>
+           <a href="<?php echo base_url();?>Business/add_business" class="btn btn-sm btn-primary">Add Business</a>
                       <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
                       </li>
                     </ul>
@@ -54,10 +54,10 @@
                             <td class=" "><?php echo $value->logo; ?> </td>
                            
 					<td style=" text-align: center;  font-size: 16px;">
-	                 <a href="<?php echo base_url()?>business/get_business/<?php echo md5($value->id);?>" ><i class="fa fa-pencil"></i></a>
+	                 <a href="<?php echo base_url()?>Business/get_business/<?php echo md5($value->id);?>" ><i class="fa fa-pencil"></i></a>
 							 
 							 &nbsp;
-	                 <a href="<?php echo base_url()?>business/delete_business/<?php echo md5($value->id);?>" ><i class="fa fa-trash"></i></a>
+	                 <a href="<?php echo base_url()?>Business/delete_business/<?php echo md5($value->id);?>" ><i class="fa fa-trash"></i></a>
 						
                      &nbsp;
                     <a> <i id="<?php echo md5($value->id);?>" class="bi bi-card-list" title="History"></i></a>
@@ -89,7 +89,7 @@
   var id = $(this).attr("id")
     $.ajax({ 
       type: "get",
-      url: "<?php echo base_url()?>user/view_business_history/"+id,
+      url: "<?php echo base_url()?>User/view_business_history/"+id,
       success: function(response) {
         response = JSON.parse(response);
         console.log(response);
diff --git a/application/modules/Business/views/edit_business.php b/application/modules/Business/views/edit_business.php
index f57c259..7a67cec 100644
--- a/application/modules/Business/views/edit_business.php
+++ b/application/modules/Business/views/edit_business.php
@@ -10,7 +10,7 @@
 <h3>Edit Business</h3>
 </div>
 
-<a class="btn btn-sm btn-primary" style="float: right;" href="<?php echo base_url();?>business/business_list">Business List</a>
+<a class="btn btn-sm btn-primary" style="float: right;" href="<?php echo base_url();?>Business/business_list">Business List</a>
 </div>
 <div class="clearfix"></div>
 <div class="row">
diff --git a/application/modules/Dashboard/controllers/Dashboard.php b/application/modules/Dashboard/controllers/Dashboard.php
index f41cae1..efccc76 100644
--- a/application/modules/Dashboard/controllers/Dashboard.php
+++ b/application/modules/Dashboard/controllers/Dashboard.php
@@ -25,7 +25,9 @@ public function __construct()
     {
         // To inherit directly the attributes of the parent class.
         parent::__construct();
-		$this->load->model('Dashboard_model');
+        ### Syntax : $this->load->model('Model Path' , 'Alias name');
+        ### The second parameter (optional) is used to call the method.
+		$this->load->model('Dashboard_model','Dashboard_model');
     }
 
     /**
@@ -72,7 +74,7 @@ public function index()
         $business_count = $this->Dashboard_model->get_business_count();
 		$this->layout->set('business_count', $business_count);
         }
-        $this->layout->buffer('main_content', 'dashboard/dashboard');
+        $this->layout->buffer('main_content', 'Dashboard/dashboard');
         $this->layout->render('default_layout');
 
     }
diff --git a/application/modules/Dashboard/views/ams.code-workspace b/application/modules/Dashboard/views/ams.code-workspace
deleted file mode 100644
index f7f79c3..0000000
--- a/application/modules/Dashboard/views/ams.code-workspace
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "../../../.."
-		},
-		{
-			"path": "../../../../../demo"
-		},
-		{
-			"path": "../../../../../codeigniter-3-crud"
-		}
-	],
-	"settings": {}
-}
\ No newline at end of file
diff --git a/application/modules/Dashboard/views/dashboard.php b/application/modules/Dashboard/views/dashboard.php
index 26feec1..71b73e6 100644
--- a/application/modules/Dashboard/views/dashboard.php
+++ b/application/modules/Dashboard/views/dashboard.php
@@ -5,9 +5,8 @@
           <div class="tile_count">
 
           <?php if (is_superadmin()) { ?>
-
           <div class="col-md-6 col-sm-4  tile_stats_count">
-            <span class="count_top"><i class="fa fa-building"></i> Total Business</span>
+            <span class="count_top"><i class="fa fa-building"></i> Total Business </span>
             <div class="count"><?php echo $business_count; ?></div>
             <!--<span class="count_bottom"><i class="green">4% </i> From last Week</span> -->
           </div>
@@ -265,11 +264,16 @@
       
         <!-- /page content -->
 <?php if (is_admin() ||  user()->action_permit != 'view') { ?>
-<input type="hidden" value="<?php if(is_admin() || is_user()){ echo $business->is_master_data_entered; } ?>" id="master_key_exist" >
+<!-- <input type="hidden" value="<?php if(is_admin() || !is_null(is_user()) ){ echo $business->is_master_data_entered; } ?>" id="master_key_exist" > -->
+<?php } ?>
+
+<?php if (is_superadmin()) { ?>
+<input type="hidden" value="sadmin" id="sadmin">
 <?php } ?>
 
 <script>
 $( document ).ready(function() {
+  if($("#sadmin").val() != "sadmin")
 	var master_value =  $("#master_key_exist").val();
 	if(master_value == 0)
 	{
diff --git a/application/modules/Delegation/controllers/Delegation.php b/application/modules/Delegation/controllers/Delegation.php
new file mode 100644
index 0000000..8bb360c
--- /dev/null
+++ b/application/modules/Delegation/controllers/Delegation.php
@@ -0,0 +1,119 @@
+<?php defined('BASEPATH') or exit('No direct script access allowed');
+
+use chillerlan\QRCode\Data\QRMatrix;
+use chillerlan\QRCode\QRCode;
+use chillerlan\QRCode\QROptions;
+
+date_default_timezone_set('Asia/Kolkata');
+
+/**
+ * AMS
+ *
+ * @package    HMVC
+ * @author     Venba
+ * @copyright  2022 Venba
+ * @license    https://venbainfotech.com/licenses/MIT  MIT License
+ * @link       <URI> (description)
+ * @version    GIT: $Id$
+ * @since      Version 0.0.1
+ * @filesource
+ *
+ */
+
+class Delegation extends Admin_Controller
+{
+    /**
+     * [__construct description]
+     *
+     * @method __construct
+     */
+    public function __construct()
+    {
+        // To inherit directly the attributes of the parent class.
+        parent::__construct();
+		### Syntax : $this->load->model('Model Path' , 'Alias name');
+        ### The second parameter (optional) is used to call the method.
+        $this->load->model('MY_Model','MY_Model');
+		$this->load->model('Delegation_model','Delegation_model');
+        $this->load->model('Employee/Employee_model','Emp_model');
+        $this->load->model('Audit/Audit_model','audit_model');
+		$this->load->helper(array('form', 'url'));
+
+    }
+	
+	 public function Delegation_form()
+    {   
+        $business_id = user()->business_id;
+        $Employee_list = $this->Delegation_model->Employee_list_by_business_id($business_id);
+        $this->layout->set('emp', $Employee_list);
+        $this->layout->buffer('main_content', 'Delegation/delegation_form');
+        $this->layout->render('Employee_Layout');
+    }
+
+    public function Assign_Delecation()
+    {
+      $data = $this->input->post();
+      $data['business_id'] = user()->business_id;
+      $data['delegated_at'] = date('d-m-Y H:i');
+      $data['is_active'] = 1;
+
+      $table="delegation";
+      $Delecation = $this->MY_Model->insert($data, $table);
+
+
+      $this->session->set_flashdata('Success', 'Delegation Assigned Successfully');
+      redirect('Delegation/Delegation_list');
+    }
+
+
+    public function Edit_Delegation()
+    {   
+        $id = $this->input->get('id');
+        $business_id = user()->business_id;
+        $Employee_list = $this->Delegation_model->Employee_list_by_business_id($business_id);
+        $Delegation_list_Row = $this->Delegation_model->Delegation_list_by_id($id);
+        $this->layout->set('emp', $Employee_list);
+        $this->layout->set('Delegation_list', $Delegation_list_Row);
+        $this->layout->buffer('main_content', 'Delegation/edit_delegation_form');
+        $this->layout->render('Employee_Layout');
+    }
+
+
+    public function Edit_Create_Delecation()
+    {
+
+      $action = $this->input->post();
+      unset($action['id']);
+      $id = $this->input->post('id');
+      //var_dump($id); die();
+      $action['business_id'] = user()->business_id;
+      $action['updated_at'] = date('d-m-Y H:i a');
+      $action['is_active'] = 1;
+
+      $table="delegation";
+      $Delecation = $this->MY_Model->edit_option($action, $id, $table);
+      $this->session->set_flashdata('Success', 'Delegation Updated Successfully');
+      redirect('Delegation/Delegation_list');
+    }
+
+
+    public function Delegation_list()
+    {
+      $business_id = user()->business_id;
+      $Delegation_list = $this->Delegation_model->Get_Delegation_list($business_id);
+      $get_emp_id = null;
+        if (!empty($get_delegation)) {
+
+            $get_emp_id = array_shift($Delegation_list)->delegated_to;
+        }
+      $get_emp_name = $this->Delegation_model->Get_emp_name_list($get_emp_id, 
+        $business_id);
+      $this->layout->set('tableData', $Delegation_list);
+      $this->layout->set('empname', $get_emp_name);
+      $this->layout->buffer('main_content', 'Delegation/delegation_list');
+      $this->layout->render('Employee_Layout');
+    }
+
+
+
+}
diff --git a/application/modules/Delegation/models/Delegation_model.php b/application/modules/Delegation/models/Delegation_model.php
new file mode 100644
index 0000000..40bb671
--- /dev/null
+++ b/application/modules/Delegation/models/Delegation_model.php
@@ -0,0 +1,88 @@
+<?php
+class Delegation_model extends MY_Model {
+
+     public function Employee_list_by_business_id($business_id)
+    {
+        
+        $this->db->select('users.name, employees.user_id');
+        $this->db->from('users');
+        $this->db->join('employees', 'employees.user_id = users.id');
+        $this->db->where('users.business_id', $business_id);
+        $this->db->where('users.is_active', 1);
+        $this->db->where('employees.is_active', 1);
+        $query = $this->db->get();
+
+        if ($query->num_rows() > 0) {
+            return $query->result();
+        } else {
+            
+            return;
+        }
+    }
+
+    public function Get_Delegation_list($business_id)
+    {
+        $this->db->select('A.* , name', 'users.name');
+        $this->db->from('delegation A');
+        $this->db->join('users', 'users.id = A.delegated_to', 'left');
+        $this->db->where('A.business_id', $business_id);
+        $this->db->order_by('id','DESC');
+        $this->db->where('A.is_active', 1);
+        $query = $this->db->get();
+        $query = $query->result();  
+        return $query;
+
+    }
+
+    public function Get_emp_name_list($get_emp_id, $business_id)
+
+     {
+        
+            $this->db->select('name');
+            $this->db->from('users');
+            $this->db->where('id', $get_emp_id);
+            $this->db->where('business_id', $business_id);
+            $query = $this->db->get();
+           if ($query->num_rows() > 0) {
+            return $query->result();
+        } else {
+            return;
+        }
+
+     }
+
+     public function Delegation_list_by_id($id)
+     {
+        $this->db->select('A.*, name', 'users.name');
+        $this->db->from('delegation A');
+        $this->db->join('users', 'users.id = A.delegated_to', 'left');
+        $this->db->where('md5(A.id)', $id);
+        $this->db->where('A.is_active', 1);
+        $query = $this->db->get();
+           if ($query->num_rows() > 0) {
+            return $query->result();
+        } else {
+            return;
+        }
+
+     }
+
+
+     public function ExpenceDecline($id, $data)
+     {
+        $this->db->where('id',$id);
+        $this->db->where('status', 'pending');
+        $this->db->update('expence_list', $data);
+        return;
+     }
+
+      public function Expencecancle($id, $data)
+     {
+        $this->db->where('md5(id)',$id);
+        $this->db->where('status', 'pending');
+        $this->db->update('expence_list', $data);
+        return;
+     }
+
+
+}
\ No newline at end of file
diff --git a/application/modules/Delegation/views/delegation_form.php b/application/modules/Delegation/views/delegation_form.php
new file mode 100644
index 0000000..c575726
--- /dev/null
+++ b/application/modules/Delegation/views/delegation_form.php
@@ -0,0 +1,158 @@
+<!-- bootstrap-daterangepicker -->
+    <script src="https://localhost/ams//assets/default/moment/min/moment.min.js"></script>
+    <script src="https://localhost/ams//assets/default/bootstrap-daterangepicker/daterangepicker.js"></script>
+    <!-- bootstrap-datetimepicker -->    
+    <script src="https://localhost/ams//assets/default/bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
+
+    <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+    <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+
+
+<!-- Body page content -->
+<style>
+    .alert-success  {
+    background-color: #dff0d8;
+    color: #3c763d;
+    border-color: #d6e9c6;   
+}
+
+.flash-message {
+    padding: 15px 15px;
+    margin-bottom: 10px;
+    border-radius: 5px;
+    margin-left: 650px;
+}
+
+</style>
+
+<div class="clearfix"></div>
+<div class="row">
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+<div class="x_title">
+
+<ul class="nav navbar-right panel_toolbox">
+   <a href="<?php echo base_url();?>Delegation/Delegation_list" class="btn  btn-primary" style="margin-top: 20px;">Back</a>
+</ul>
+
+<h1>Delegate</h1>
+
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+<br />
+<form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Delegation/Assign_Delecation" enctype="multipart/form-data">
+
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">    
+
+<div class="item form-group">
+
+<label class="control-label col-md-2 col-sm-2 " for="first-name"> From Date<a style="color:red;">*</a> </label>
+   <div class="col-md-3 col-sm-3 ">
+    <div class='input-group date'onclick="openDatePicker('fromdate')">
+     <input type='text' class="form-control"  placeholder="DD-MM-YYYY" id="fromdate" name="from_date" value="" required />
+      </div>
+ </div>
+
+
+<label class="control-label col-md-1 col-sm-1" for="last-name">To Date<a style="color:red;">*</a> </label>
+<div class="col-md-3 col-sm-3 ">
+    <div class='input-group date' onclick="openDatePicker('todate')">
+    <input type='text' class="form-control input-field" placeholder="DD-MM-YYYY " id="todate" name= "to_date" value="" required />
+    </div>
+</div>
+
+<input type='hidden' name="emp_id" value="<?php echo user()->id; ?>" required />
+
+</div>
+
+
+<div class="item form-group">
+
+    <label class="control-label col-md-2 col-sm-2 " for="last-name">Delegated To<a style="color:red;">*</a> </label>
+    <div class="col-md-7 col-sm-7 ">
+    <select id="emp_id" name="delegated_to" required="required" class="form-control" >
+    <option value="">--Select--</option>
+    <?php foreach ($emp as $key => $value) { ?>
+        <?php if($value->user_id != user()->id) { ?>
+              
+    <option value="<?php echo $value->user_id; ?>"><?php echo $value->name; ?></option>
+    <?php } } ?>
+
+
+    </select>
+    </div>
+
+</div>
+
+
+<div class="ln_solid"></div>
+<div class="item form-group">
+<div class=" offset-md-8">
+<button class="btn btn-secondary" onclick="history.back()">Cancel</button>
+<button class="btn btn-primary" type="reset">Reset</button>
+<button type="submit" class="btn btn-success">Submit</button>
+</div>
+</div>
+
+</form>
+</div>
+</div>
+</div>
+
+
+</div>  
+</div> 
+</div>
+
+ <script>
+            // Initialize datepickers
+            var dateFormat = "dd-mm-yy";
+            var fromDateInput = $("#fromdate");
+            var toDateInput = $("#todate");
+
+            fromDateInput.datepicker({
+                dateFormat: dateFormat,
+                onSelect: function (dateText, inst) {
+                    toDateInput.datepicker("option", "minDate", dateText);
+                    validateDateRange();
+                }
+            });
+
+            toDateInput.datepicker({
+                dateFormat: dateFormat,
+                onSelect: function (dateText, inst) {
+                    validateDateRange();
+                }
+            });
+
+
+            // Function to validate the date range
+            function validateDateRange() {
+                var fromDate = fromDateInput.datepicker("getDate");
+                var toDate = toDateInput.datepicker("getDate");
+
+                // Check if both dates are selected
+                if (!fromDate || !toDate) {
+                    $("#error-msg").text("Please select both From Date and To Date");
+                    return false;
+                }
+
+                // Compare the dates
+                if (fromDate > toDate) {
+                    $("#error-msg").text("From Date cannot be after To Date");
+                    return false;
+                }
+
+                // Clear the error message if the date range is valid
+                $("#error-msg").text("");
+                return true;
+            }
+
+
+
+    
+</script>
+
+
diff --git a/application/modules/Delegation/views/delegation_list.php b/application/modules/Delegation/views/delegation_list.php
new file mode 100644
index 0000000..e64d8dd
--- /dev/null
+++ b/application/modules/Delegation/views/delegation_list.php
@@ -0,0 +1,114 @@
+
+<head>
+<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css'> 
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.4/jquery.min.js"></script>
+
+<style>
+
+   .alert-success  {
+    background-color: #dff0d8;
+    color: #3c763d;
+    border-color: #d6e9c6;   
+}
+
+.flash-message {
+    padding: 15px 15px;
+    margin-bottom: 10px;
+    border-radius: 5px;
+    margin-left: 600px;
+}
+
+div.dataTables_wrapper div.dataTables_filter{
+      margin-top: -44px !important; //search to up
+
+
+
+</style>
+
+</head>
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+  <div class="x_title">
+
+    <?php if ($this->session->userdata('Success')): ?>
+
+    <div class="alert-success flash-message" id="customPrompt" style="text-align: right;">
+        <h2><?php echo $this->session->userdata('Success'); ?></h2>
+         <span  onclick="$('#customPrompt').hide()" style="text-align: right;" ><i class="fa fa-times" aria-hidden="true"></i></span>
+    </div>
+     <?php endif; ?>
+     <?php $this->session->unset_userdata('Success');?>
+
+    <ul class="nav navbar-right panel_toolbox">
+      
+       <a href="<?php echo base_url();?>Delegation/Delegation_form" class="btn btn-sm btn-primary" style="margin-top: 20px;">Assign Delegation</a>
+    </ul>
+   <h1>Delegation List</h1>
+    
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+ <div class="row">
+  <div class="col-sm-12" style="overflow: auto;">
+    <table id="datatable-buttons"  class="table table-striped table-bordered"  width="100%">
+      <thead>
+        <tr class="headings">						                 
+				       <th class="column-title">Delegate Duration</th>
+                <th class="column-title">Delegated To </th>
+                <th class="column-title"> Delegation Date </th>                
+                <th class="column-title" >Action </th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php foreach ($tableData as $key => $value) { ?>
+
+          <?php if(user()->id == $value->emp_id) { ?>
+
+				<tr class="even pointer">
+                   
+                    <td class=" "><?php echo $value->from_date;?> to <?php echo $value->to_date;?> </td> 
+                    <td class=" "><?php echo $value->name; ?> (<?php echo $value->delegated_to; ?>)</td>
+                    <td class=" "> <?php echo $value->delegated_at;?> </td>
+                    <td style=" text-align: center;  font-size: 16px;">
+
+                        <a href="<?php echo base_url('Delegation/Edit_Delegation')?>?id=<?php echo md5($value->id);?> "><i class="fa fa-edit" aria-hidden="true"title="Edit"></i></a> &nbsp;
+
+                    </td>
+        </tr>
+			<?php } } ?>
+      </tbody>
+    </table>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+
+<div id="customPrompt" class="modal">
+  <div class="modal-content ">
+    <span  onclick="$('#customPrompt').hide()" style="text-align: right;"><i class="fa fa-times fa-2x" aria-hidden="true"></i></span>
+    <h3>Decline Reason</h3>
+    <input list="browsers" style="padding:20px; margin:6px;" id="decline_reason" required name="myBrowser" /> 
+<datalist id="browsers" >
+    <?php foreach ($dropdown as $key => $value) { ?>
+    <option value="<?php echo $value->enum_value; ?>"><?php echo $value->enum_value; ?></option>
+    <?php } ?>
+</datalist>
+
+<button onclick="submitCustomPrompt()" type="button" class="btn btn-primary">Submit</button>
+ 
+  </div>
+</div>
+
+<br/>
+
+<div class="modal fade bs-example-modal-lg" id="ItemModal" tabindex="-1" role="dialog" aria-hidden="true"></div>
+<div class="modal bs-example-modal-sm" tabindex="-1" role="dialog" aria-hidden="true" id="popup"> </div>
+
+
+
+
+
diff --git a/application/modules/Delegation/views/edit_delegation_form.php b/application/modules/Delegation/views/edit_delegation_form.php
new file mode 100644
index 0000000..674cc6c
--- /dev/null
+++ b/application/modules/Delegation/views/edit_delegation_form.php
@@ -0,0 +1,174 @@
+<!-- bootstrap-daterangepicker -->
+    <script src="https://localhost/ams//assets/default/moment/min/moment.min.js"></script>
+    <script src="https://localhost/ams//assets/default/bootstrap-daterangepicker/daterangepicker.js"></script>
+    <!-- bootstrap-datetimepicker -->    
+    <script src="https://localhost/ams//assets/default/bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
+    
+
+    <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+    <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+
+
+<!-- Body page content -->
+<style>
+    .alert-success  {
+    background-color: #dff0d8;
+    color: #3c763d;
+    border-color: #d6e9c6;   
+}
+
+.flash-message {
+    padding: 10px;
+    margin-bottom: 10px;
+    border-radius: 5px;
+    margin-left: 690px;
+}
+</style>
+
+<div class="clearfix"></div>
+<div class="row">
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+<div class="x_title">
+
+<?php if ($this->session->userdata('Create')): ?>
+    <div class="alert-success flash-message" id="customPrompt" style="text-align: right;">
+        <h2><?php echo $this->session->userdata('Create'); ?></h2>
+         <span  onclick="$('#customPrompt').hide()" style="text-align: right;" ><i class="fa fa-times" aria-hidden="true"></i></span>
+    </div>
+<?php endif; ?>
+<?php $this->session->unset_userdata('Create');?>
+
+<ul class="nav navbar-right panel_toolbox">
+   <a href="<?php echo base_url();?>Delegation/Delegation_list" class="btn  btn-primary" style="margin-top: 20px;">Back</a>
+</ul>
+
+<h1>Edit Delegate</h1>
+
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+<br />
+
+<?php foreach( $Delegation_list as $data) { ?>
+
+<form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Delegation/Edit_Create_Delecation" enctype="multipart/form-data">
+
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">    
+
+<div class="item form-group">
+
+<label class="control-label col-md-2 col-sm-2 " for="first-name"> From Date<a style="color:red;">*</a> </label>
+   <div class="col-md-3 col-sm-3 ">
+    <div class='input-group date'>
+     <input type='text' class="form-control"  placeholder="DD-MM-YYYY" id="fromdate" name="from_date" value="<?php echo $data->from_date ?>" required />
+      </div>
+ </div>
+
+
+<label class="control-label col-md-1 col-sm-1" for="last-name">To Date<a style="color:red;">*</a> </label>
+<div class="col-md-3 col-sm-3 ">
+    <div class='input-group date' >
+    <input type='text' class="form-control" placeholder="DD-MM-YYYY" id="todate" name= "to_date" value="<?php echo $data->to_date ?>" required />
+    </div>
+</div>
+
+<input type='hidden' name="emp_id" value="<?php echo user()->id; ?>" required />
+
+<input type='hidden' name="id" value="<?php echo $data->id; ?>" required />
+
+</div>
+
+
+<div class="item form-group">
+
+    <label class="control-label col-md-2 col-sm-2 " for="last-name">Delegated To<a style="color:red;">*</a> </label>
+    <div class="col-md-7 col-sm-7 ">
+    <select id="emp_id" name="delegated_to" required="required" class="form-control" >
+    <option value="<?php echo $data->delegated_to; ?>"><?php echo $data->name; ?></option>
+    <?php foreach ($emp as $key => $value) { ?>
+
+        <?php if($value->user_id != user()->id) { ?>
+              
+    <option value="<?php echo $value->user_id; ?>"><?php echo $value->name; ?></option>
+
+    <?php } } ?>
+
+
+    </select>
+    </div>
+
+</div>
+
+
+<div class="ln_solid"></div>
+<div class="item form-group">
+<div class=" offset-md-8">
+<button class="btn btn-secondary" onclick="history.back()">Cancel</button>
+<button class="btn btn-primary" type="reset">Reset</button>
+<button type="submit" class="btn btn-success">Update</button>
+</div>
+</div>
+
+</form>
+
+<?php }  ?>
+
+</div>
+</div>
+</div>
+
+
+</div>  
+</div> 
+</div>
+<script>
+            // Initialize datepickers
+            var dateFormat = "dd-mm-yy";
+            var fromDateInput = $("#fromdate");
+            var toDateInput = $("#todate");
+
+            fromDateInput.datepicker({
+                dateFormat: dateFormat,
+                onSelect: function (dateText, inst) {
+                    toDateInput.datepicker("option", "minDate", dateText);
+                    validateDateRange();
+                }
+            });
+
+            toDateInput.datepicker({
+                dateFormat: dateFormat,
+                onSelect: function (dateText, inst) {
+                    validateDateRange();
+                }
+            });
+
+
+            // Function to validate the date range
+            function validateDateRange() {
+                var fromDate = fromDateInput.datepicker("getDate");
+                var toDate = toDateInput.datepicker("getDate");
+
+                // Check if both dates are selected
+                if (!fromDate || !toDate) {
+                    $("#error-msg").text("Please select both From Date and To Date");
+                    return false;
+                }
+
+                // Compare the dates
+                if (fromDate > toDate) {
+                    $("#error-msg").text("From Date cannot be after To Date");
+                    return false;
+                }
+
+                // Clear the error message if the date range is valid
+                $("#error-msg").text("");
+                return true;
+            }
+
+
+
+    
+</script>
+
diff --git a/application/modules/Employee/.gitkeep b/application/modules/Employee/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/application/modules/Employee/controllers/Employee.php b/application/modules/Employee/controllers/Employee.php
new file mode 100644
index 0000000..e9e3c21
--- /dev/null
+++ b/application/modules/Employee/controllers/Employee.php
@@ -0,0 +1,557 @@
+<?php defined('BASEPATH') or exit('No direct script access allowed');
+
+use chillerlan\QRCode\Data\QRMatrix;
+use chillerlan\QRCode\QRCode;
+use chillerlan\QRCode\QROptions;
+
+/**
+ * AMS
+ *
+ * @package    HMVC
+ * @author     Venba
+ * @copyright  2022 Venba
+ * @license    https://venbainfotech.com/licenses/MIT  MIT License
+ * @link       <URI> (description)
+ * @version    GIT: $Id$
+ * @since      Version 0.0.1
+ * @filesource
+ *
+ */
+
+class Employee extends Admin_Controller
+{
+    /**
+     * [__construct description]
+     *
+     * @method __construct
+     */
+    public function __construct()
+    {
+        // To inherit directly the attributes of the parent class.
+        parent::__construct();
+		### Syntax : $this->load->model('Model Path' , 'Alias name');
+        ### The second parameter (optional) is used to call the method.
+        $this->load->model('MY_Model','MY_Model');
+		$this->load->model('Employee_model','Emp_model');
+        $this->load->model('Audit/Audit_model','audit_model');
+		$this->load->helper(array('form', 'url'));
+
+    }
+	
+	public function index()
+    {
+		
+        $this->layout->set('users', "gowtham");
+        $this->layout->buffer('main_content', 'Asset/index');
+        $this->layout->render('Employee_Layout');
+	 
+    }
+
+
+    public function empList()
+    {  
+        $emp_list = $this->Emp_model->get_employee(user()->business_id);
+		$this->layout->set('tableData', $emp_list);
+        $this->layout->buffer('main_content', 'Employee/emp_list');
+        $this->layout->render('Employee_Layout');
+    }
+
+    public function addEmployee($businessId = 0)
+    {
+        $manager = $this->Emp_model->get_employee(user()->business_id);
+        $this->layout->set('manager', $manager);
+        $this->layout->set('departmentData', $this->MY_Model->select_by_department_data('department_master',user()->business_id));
+        $this->layout->buffer('main_content', 'Employee/add_emp');
+        $this->layout->render('Employee_Layout');
+    
+    }
+
+    public function add_employee_education()
+    {
+
+        $id = $this->input->post('id');
+        if ($id) {
+            $data = $this->input->post();
+            // $id = $this->input->post('id');
+            $data['business_id'] = user()->business_id;
+            $table="employee_qualification";
+            $create_user = $this->MY_Model->update_md5($data,md5($id),$table);
+            redirect('Employee/editEmployee/'.md5($this->input->post('emp_id')));
+        }
+        else{
+            $data = $this->input->post();
+            // $id = $this->input->post('id');
+            $data['business_id'] = user()->business_id;
+            $table="employee_qualification";
+            $create_user = $this->MY_Model->insert($data,$table);
+            redirect('Employee/editEmployee/'.md5($this->input->post('emp_id')));
+        }
+
+    
+    }
+
+    public function add_employee_history()
+    {
+
+        $id = $this->input->post('id');
+        if ($id) {
+            $data = $this->input->post();
+            // $id = $this->input->post('id');
+            $data['business_id'] = user()->business_id;
+            $table="employee_history";
+            $create_user = $this->MY_Model->update_md5($data,md5($id),$table);
+            redirect('Employee/editEmployee/'.md5($this->input->post('emp_id')));
+        }
+        else{
+            $data = $this->input->post();
+            // $id = $this->input->post('id');
+            $data['business_id'] = user()->business_id;
+            $table="employee_history";
+            $create_user = $this->MY_Model->insert($data,$table);
+            redirect('Employee/editEmployee/'.md5($this->input->post('emp_id')));
+        }
+    
+    }
+
+    public function createEmp()
+    {
+        //insert in users table
+        $data = array(
+            
+            'business_id' => user()->business_id,
+            'name' => $this->input->post('name'),
+            'email' => $this->input->post('email'),
+            'user_name' => $this->input->post('user_name'),
+            'mobile' => $this->input->post('mobile'),
+            'password' => hash_password($this->input->post('password'))
+
+        );
+
+        $table="users";
+        $create_user = $this->MY_Model->insert($data,$table);
+
+        //audit
+        if($create_user)
+        {
+        //set id $ table name for audit history
+        $this->audit->set('id',$create_user);
+        $this->audit->set('table',$table);
+        //fetch new_data after post data insert
+        $this->audit->fetch('new_data');
+        //audit history generation  for insert   
+        $test = $this->audit->create_history('insert');
+        }
+
+        //file upload confic
+        $config['upload_path']          = APPPATH. '../assets/uploads/';
+	    $config['allowed_types']        = 'gif|jpg|png|jpeg';
+	    $config['max_size']             = 80000;
+	    //upload
+	    $this->load->library('upload', $config);
+	    $this->upload->initialize($config);
+	    if ( ! $this->upload->do_upload('image'))
+           {
+             $error = array('error' => $this->upload->display_errors());
+            
+           } 
+		    
+            $upload_image = $this->upload->data(); 
+
+        //insert in employees table
+        if($create_user == true)   
+        {
+
+        $data=$this->input->post();
+        unset($data['name']);
+        unset($data['email']); 
+        unset($data['user_name']);
+        unset($data['mobile']);
+        unset($data['password']);
+        unset($data['confirm_password']);
+        $data['user_id'] = $create_user; 
+        $data['profile_pic'] = $upload_image['file_name'];
+        $data['business_id'] = user()->business_id;   
+
+		$table="employees";
+		$create_emp_details = $this->MY_Model->insert($data,$table);
+    }
+        //audit
+        if($create_emp_details)
+		{
+		//set id $ table name for audit history
+		$this->audit->set('id',$create_user);
+		$this->audit->set('table',$table);
+		//fetch new_data after post data insert
+		$this->audit->fetch('new_data');
+        //audit history generation	for insert	 
+		$test = $this->audit->create_history('insert');
+		}
+		redirect('Employee/addEmployee');
+    
+    }
+
+    public function add_employee_file()
+    {
+        // print_r($this->input->post());die();
+	    $data=$this->input->post();
+        $data['business_id'] = user()->business_id;
+        // $data['emp_id'] = $this->input->post('emp_id');
+
+         //file upload confic
+         $config['upload_path']          = APPPATH. '../assets/uploads/';
+         $config['allowed_types']        = 'gif|jpg|png|pdf|jpeg';
+         $config['max_size']             = 80000;
+         //upload
+         $this->load->library('upload', $config);
+         $this->upload->initialize($config);
+         if ( ! $this->upload->do_upload('file_name'))
+         {
+            $error = array('error' => $this->upload->display_errors());
+          } else{
+           $upload_image = $this->upload->data();
+           $data['file_name'] = $upload_image['file_name'];
+          }
+
+            
+
+		$table="employee_doc";
+        unset($data['image1']);
+		$create_user = $this->MY_Model->insert($data,$table);
+        //audit
+        if($create_user)
+		{
+		//set id $ table name for audit history
+		$this->audit->set('id',$create_user);
+		$this->audit->set('table',$table);
+		//fetch new_data after post data insert
+		$this->audit->fetch('new_data');
+        //audit history generation	for insert	 
+		$test = $this->audit->create_history('insert');
+		}
+		redirect('Employee/editEmployee/'.md5($this->input->post('emp_id')));
+    
+    }
+
+
+    public function editEmployee($id)
+    { 
+        $images = $this->Emp_model->get_data(user()->business_id , $id , 'employee_doc'); //984647 , 1
+        $add_education = $this->Emp_model->get_data(user()->business_id , $id , 'employee_qualification');
+        $employee_history = $this->Emp_model->get_data(user()->business_id , $id , 'employee_history');
+        $empData = $this->Emp_model->get_emp_by_md5_id($id,user()->business_id);
+        $manager_name = $this->Emp_model->get_manager_name($empData->manager);
+        $manager = $this->Emp_model->get_employee(user()->business_id);
+        $data = array(
+
+            'submit_button_title' => 'update' , 
+            'heading' => 'Edit'  , 
+            'id' => $empData->user_id , 
+            'images' => $images,
+            'add_education' => $add_education,
+            'employee_history' => $employee_history
+        );
+
+        $emp_sub_list_htmlPage = $this->load->view('emp_sub_list.php',$data,true);
+        $this->layout->set('manager', $manager);
+        $this->layout->set('manager_name', $manager_name);
+        $this->layout->set('departmentData', $this->MY_Model->select_by_department_data('department_master',user()->business_id));
+        $this->layout->set('emp_sub_list_htmlPage', $emp_sub_list_htmlPage);
+		$this->layout->set('editData', $empData);
+        $this->layout->buffer('main_content', 'Employee/edit_emp');
+        $this->layout->render('Employee_Layout');
+   
+    }
+
+
+    public function editEmployees()
+    {  
+      $table = "users";  
+      $id = $this->input->post('user_id');
+
+         //set id $ table name for audit history
+         $this->audit->set('id',$this->input->post('id'));
+         $this->audit->set('table',$table);
+         //fetch old_data before new_data update
+         $this->audit->fetch('old_data');
+      
+      $action = array(
+            'name' => $this->input->post('name'),
+            'email' => $this->input->post('email'),
+            'mobile' => $this->input->post('mobile'),
+      );
+       //set id $ table name for audit history
+         $this->audit->set('id',$this->input->post('user_id'));
+         $this->audit->set('table',$table);
+         //fetch old_data before new_data update
+         $this->audit->fetch('old_data');
+          //update new data 
+      $empuserData = $this->MY_Model->edit_option($action, $id, $table);
+       if($empuserData)
+         {
+         //fetch new_data after post data update
+         $this->audit->fetch('new_data');
+         //audit history generation for update 
+         $test = $this->audit->create_history('update');
+         }
+
+
+        $table="employees";
+        $action = $this->input->post();    
+        unset($action['name']);
+        unset($action['email']); 
+        unset($action['mobile']);
+
+                //file upload confic
+                $config['upload_path']          = APPPATH. '../assets/uploads/';
+                $config['allowed_types']        = 'gif|jpg|png|jpeg';
+                $config['max_size']             = 80000;
+                //upload
+                $this->load->library('upload', $config);
+                $this->upload->initialize($config);
+                if ( ! $this->upload->do_upload('image'))
+                   {
+                     $error = array('error' => $this->upload->display_errors());
+                    
+                      unset($action['asset_img']);
+                   } else{
+                    $upload_image = $this->upload->data();
+                    $action['profile_pic'] = $upload_image['file_name'];
+                     
+                   }
+        
+        $id = $this->input->post('id');
+         //set id $ table name for audit history
+         $this->audit->set('id',$this->input->post('id'));
+         $this->audit->set('table',$table);
+         //fetch old_data before new_data update
+         $this->audit->fetch('old_data');
+         //update new data 
+        $empData = $this->MY_Model->edit_option($action, $id, $table);
+        if($empData)
+         {
+         //fetch new_data after post data update
+         $this->audit->fetch('new_data');
+         //audit history generation for update 
+         $test = $this->audit->create_history('update');
+         }
+        redirect('Employee/empList');
+  
+    }
+
+    public function getDeleteConfirmationPopup()
+	{
+	    $data = array();
+	    $htmlPage = $this->load->view('confirmation_popup.php',$data,true);
+	    echo json_encode($htmlPage); 
+	}
+
+    public function deleteEmp()
+    {
+	    $id = $this->input->post('id');
+        $Data = $this->Emp_model->delete_emp_by_md5_id($id,user()->business_id);
+	    redirect('Employee/empList');
+	}
+
+    public function deleteEmpImage()
+    {
+	    $id = $this->input->post('id');
+        $empData = $this->Emp_model->get_emp_by_md5_id($this->input->post('id'),user()->business_id,'employees');
+        $Data = $this->Emp_model->delete_emp_by_md5_id($id,user()->business_id,'employee_doc');
+	    redirect('Employee/editEmployee/'.md5($empData->emp_id));
+	}
+
+    public function deleteEmpQualification()
+    {
+	    $id = $this->input->post('id');
+        $empData = $this->Emp_model->get_emp_by_md5_id($this->input->post('id'),user()->business_id,'employee_qualification');
+        $Data = $this->Emp_model->delete_emp_by_md5_id($id,user()->business_id,'employee_qualification');
+	    redirect('Employee/editEmployee/'.md5($empData->emp_id));
+	}
+
+    public function deleteEmpHistory()
+    {
+	    $id = $this->input->post('id');
+        $empData = $this->Emp_model->get_emp_by_md5_id($this->input->post('id'),user()->business_id,'employee_history');
+        $Data = $this->Emp_model->delete_emp_by_md5_id($id,user()->business_id,'employee_history');
+	    redirect('Employee/editEmployee/'.md5($empData->emp_id));
+	}
+
+    public function view_emp_history($id)
+    {
+        $table = 'employees';
+        $user_history = $this->audit_model->get_history( $id , $table , user()->business_id);
+        $data = array('title'=> "Employee History" , 'name' => 'Employee' , 'user_history'=> $user_history );
+        $htmlPage = $this->load->view('view_history.php',$data,true);
+        echo json_encode($htmlPage);
+    }
+
+    public function editEmp_qualification($id)
+    {
+        $table = 'employee_qualification';
+        $data = $this->Emp_model->get_data(user()->business_id , $id , $table);
+        echo json_encode($data);
+    }
+
+    public function editEmp_history($id)
+    {
+        $table = 'employee_history';
+        $data = $this->Emp_model->get_data(user()->business_id , $id , $table);
+        echo json_encode($data);
+    }
+
+
+    
+    // public function expence_form()
+    // {
+
+    //     $this->layout->buffer('main_content', 'Employee/expence_form');
+    //     $this->layout->render('Employee_Layout');
+    // }
+
+    //  public function get_emp_name()
+    // {
+    //     $emp = $this->Emp_model->get_employee_name(user()->business_id);  
+    //     $html = '<option>--select Employee--</option>'; 
+    //       foreach($emp as $val) 
+    //        {
+    //         if($val->user_id != user()->id)
+    //           {
+    //           $html .='<option id="'.$val->manager.'" value="'.$val->user_id.'">'.$val->name.'</option>';
+    //           }
+    //       }  
+    //     echo json_encode($html);
+    // }
+
+    // public function rise_expence_request()
+    // {
+
+    //     $data = $this->input->post();
+    //     unset($data['bill']);
+
+
+    //     //file upload confic
+    //     $config['upload_path']          = APPPATH. '../assets/uploads/Expence_Bill/';
+    //     $config['allowed_types']        = 'gif|jpg|png|jpeg|pdf';
+    //     $config['file_name']            = time();
+    //     $config['max_size']             = 80000;
+    //     //upload
+    //     $this->load->library('upload', $config);
+    //     $this->upload->initialize($config);
+    //     $this->upload->do_upload('bill');
+    //     if ( ! $this->upload->do_upload('bill'))
+    //        {
+    //          $error = array('error' => $this->upload->display_errors());
+    //          //print_r($error);
+
+    //        } else{
+    //         $upload_image = $this->upload->data();
+    //         $data['bill'] = $upload_image['file_name'];
+             
+    //        }
+      
+       
+    //     if(isset($data['emp_id'])){ 
+    //         $emp_id =$this->input->post('emp_id');
+    //     }else{
+    //         $emp_id = user()->id;
+    //     }
+    //     $data['emp_id'] =  $emp_id;
+    //     $data['business_id'] = user()->business_id;
+    //     $data['status'] = 'pending';
+    //     $data['created_at']  = date('Y-m-d H:i:s');
+    //     $data['is_active'] = 1;
+    //     // echo '<pre>';
+    //     // print_r($data); die();
+
+       
+    //     $table="expence_list";
+    //     $create_leave = $this->MY_Model->insert($data,$table);
+       
+    //     redirect('Employee/expence_form');
+
+    // }
+
+
+    // public function expence_list()
+    // {
+    //     $business_id = user()->business_id;
+    //     $expence_list = $this->Emp_model->get_expence_list($business_id);
+    //     // echo '<pre>';
+    //     // print_r($expence_list); die();
+    //     $decline_dropdown = $this->Emp_model->decline_dropdown($business_id);
+    //     $this->layout->set('tableData', $expence_list);
+    //     $this->layout->set('dropdown', $decline_dropdown);
+    //     $this->layout->buffer('main_content', 'Employee/expence_list');
+    //     $this->layout->render('Employee_Layout');
+    // }
+
+
+    //    public function Approve_Expence()
+    // {
+    //    $id=$this->input->get('id');          
+    //    $action['status'] = 'Approved';
+    //    $action['approved_by']= user()->name;
+    //    $action['approved_at'] = date('d-m-Y H:i:s');
+    //    $table = "expence_list";
+    //    $this->MY_Model->edit_option($action, $id, $table);
+    //    redirect('Employee/expence_list');
+    // }
+
+    //   public function Manager_Approvel()
+    // {
+    //    $id=$this->input->get('id');          
+    //    $action['status'] = 'Approved';
+    //    $action['approved_by']= user()->name;
+    //    $action['approved_at'] = date('d-m-Y H:i:s');
+    //    $table = "expence_list";
+    //    $this->MY_Model->edit_option($action, $id, $table);
+    //    redirect('Employee/expence_list');
+    // }
+
+    // public function Decline_expence()
+    // {   
+    //   $id=$this->input->get('id');
+    //   $data['status'] = 'Declined';
+    //   $data['declined_at'] = date('d-m-Y H:i:s');
+    //   $data['DReason'] = $this->input->get('reason');
+    //   $this->Leave_model->LeaveDecline($id, $data);
+    //   return true;
+    // }
+
+    // public function cancled_expence()
+    // {   
+    //   $id=$this->input->get('id');
+    //   $data['status'] = 'canceled';
+    //   $data['cancled_at'] = date('d-m-Y H:i:s');
+    //   $this->Leave_model->Leavecancle($id, $data);
+    //   redirect('Leave/LeaveHistory');
+    // }
+
+    // public function expence_emp_list()
+    // {
+    //     $expence_emp_list = $this->Leave_model->get_leave_with_emp_name(user()->business_id);
+    //     $this->layout->set('tableData', $expence_emp_list);
+    //     $this->layout->buffer('main_content', 'Leave/leavehistory');
+    //     $this->layout->render('Employee_Layout');
+    // }
+
+
+    // public function manager_approvel_list()
+    // { 
+    //     $business_id = user()->business_id;
+    //     $user_id = user()->id;
+    //     $manager = $this->Leave_model->under_emp_manager($user_id, $business_id);
+    //     $decline_dropdown = $this->Leave_model->decline_dropdown($business_id);
+    //     $leave_list = $this->Leave_model->get_with_emp_name(user()->business_id);
+    //     $this->layout->set('tableData', $leave_list);
+    //     $this->layout->set('manager', $manager);
+    //     $this->layout->buffer('main_content', 'Leave/manager_approvel');
+    //     $this->layout->render('Employee_Layout');
+    // }
+
+
+
+
+
+
+}
diff --git a/application/modules/Employee/models/.gitkeep b/application/modules/Employee/models/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/application/modules/Employee/models/Employee_model.php b/application/modules/Employee/models/Employee_model.php
new file mode 100644
index 0000000..b3edab7
--- /dev/null
+++ b/application/modules/Employee/models/Employee_model.php
@@ -0,0 +1,80 @@
+<?php
+class Employee_model extends MY_Model {
+
+    public function get_employee($business_id)
+    {
+
+        $this->db->select('users.*, employees.*');
+        $this->db->from('users');
+        $this->db->join('employees', 'employees.user_id = users.id');
+        $this->db->where('users.business_id', $business_id);
+        $this->db->where('users.is_active', 1);
+        $this->db->where('employees.is_active', 1);
+        $query = $this->db->get();
+
+        if ($query->num_rows() > 0) {
+            return $query->result();
+        } else {
+            return;
+        }
+    }
+
+    public function get_emp_by_md5_id($id,$business_id)
+    {   
+       
+        $this->db->select('users.*, employees.*');
+        $this->db->from('users');
+        $this->db->join('employees', 'users.id = employees.user_id');
+        $this->db->where('users.is_active', 1);
+        $this->db->where('employees.is_active', 1);
+        $this->db->where('users.business_id', $business_id);
+        $this->db->where('md5(employees.user_id)', $id);
+      
+
+        $query = $this->db->get();
+
+        if ($query->num_rows() > 0) {
+            return $query->row();
+        } else {
+            return false;
+        }
+
+    } 
+
+
+     public function delete_emp_by_md5_id($id,$business_id)
+    {
+        $this->db->where('id', $id);
+        $this->db->where('business_id', $business_id);
+        $this->db->set('is_active',0);
+        $this->db->update('users');
+        $this->db->where('user_id', $id);
+        $this->db->where('business_id', $business_id);
+        $this->db->set('is_active',0);
+        $this->db->update('employees');
+        return;
+    }  
+
+    public function get_data($business_id , $id , $table)
+    {
+        $this->db->select('*');
+        $this->db->from($table);
+        $this->db->where('md5(emp_id)', $id);
+        $this->db->where('business_id', $business_id);
+        $this->db->where('is_active', 1);
+        $query = $this->db->get();
+        $query = $query->result();  
+        return $query;
+    } 
+
+    public function get_manager_name($manager_id)
+    {
+        $this->db->select('*');
+        $this->db->from('users');
+        $this->db->where('id', $manager_id);
+        $query = $this->db->get();
+        return $query->result();
+    }
+
+
+}
\ No newline at end of file
diff --git a/application/modules/Employee/views/.gitkeep b/application/modules/Employee/views/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/application/modules/Employee/views/add_emp.php b/application/modules/Employee/views/add_emp.php
new file mode 100644
index 0000000..830504c
--- /dev/null
+++ b/application/modules/Employee/views/add_emp.php
@@ -0,0 +1,272 @@
+
+<!-- Body page content -->
+
+
+
+<div class="">
+<div class="page-title">
+    <div class="title_left"><h3>Add Employee</h3></div>
+</div>
+<div class="clearfix"></div>
+<div class="row">
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+<!-- <div class="x_title">
+
+<ul class="nav navbar-right panel_toolbox">
+<li><a class="collapse-link"><i id="chevron" class="fa fa-chevron-up"></i></a></li>
+</li>
+</ul>
+<h6>Add Employee Information</h6>
+<div class="clearfix"></div>
+</div> -->
+<!-- <div class="x_content"> -->
+<br />
+<form id="form" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Employee/createEmp" enctype="multipart/form-data">
+
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">	
+
+<li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a></li>
+</li>
+
+<div class="x_title">
+<h5>Personal Information<a style="color:red;">*</a> <i id="chevron1" class=" collapse-link " aria-hidden="true" data-toggle="collapse" data-target="#demo" style="font-size:20px;"></i></h5>
+<div class="clearfix"></div>
+</div><br />	
+<div class="collapse" id="demo">
+    <div class="item form-group">
+                                   
+        <label class="control-label col-md-1 col-sm-1 " for="first-name"> Name<a style="color:red;">*</a> </label>
+        <div class="col-md-5 col-sm-5 ">
+        <input type="text" id="name" name="name" value="<?php if(isset($editData)) { echo $editData->name; } ?>" required="required" class="form-control ">
+        </div>
+        
+        <label class="control-label col-md-1 col-sm-1 " for="email"> Email<a style="color:red;">*</a> </label>
+        <div class="col-md-5 col-sm-5 ">
+        <input id="email" name="email" value="<?php if(isset($editData)) { echo $editData->email; } ?>" required="required" class="form-control" type="email" >
+        </div>
+                    
+    </div>
+                    
+    <div class="item form-group">
+    
+        <label class="control-label col-md-1 col-sm-1 " for="email"> Mobile<a style="color:red;">*</a> </label>
+        <div class="col-md-5 col-sm-5 ">
+        <input id="mobile" name="mobile" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" required="required" class="form-control" type="text">
+        </div>
+        
+        <label class="control-label col-md-1 col-sm-1 " for="first-name">Department<a style="color:red;">*</a> </label>
+        <div class="col-md-5 col-sm-5 ">
+        <select id="department" name="department" required="required" class="form-control" >
+        <option value="<?php if(isset($editData)) { echo $editData->department; } ?>"><?php if(isset($assetData)) { echo $editData->department; } ?></option>
+        <?php foreach ($departmentData as $key => $value) { ?>
+        <option value="<?php echo $value->name; ?>"><?php echo $value->name; ?></option>
+        <?php } ?>
+        </select>
+        </div>
+    
+    </div>
+    
+    <div class="item form-group">
+                    
+        <label class="control-label col-md-1 col-sm-1 " for="email"> Gender<a style="color:red;">*</a> </label>
+        <div class="col-md-5 col-sm-5 " style="padding:10px;">                   
+        <input type="radio" name="gender" value="male" />Male
+        <input type="radio" name="gender" value="female" />Female
+        </div>
+        
+        <label class="control-label col-md-1 col-sm-1 " for="first-name">Marital Status<a style="color:red;">*</a> </label>
+        <div class="col-md-5 col-sm-5 ">
+        <select id="marital_status" name="marital_status" required="required" class="form-control" >
+        <option value="">--Select--</option>
+        <option value="single">Single</option>
+        <option value="married">Married</option>
+        <option value="others">Others</option>
+        </select>
+        </div>
+                           
+    </div>
+
+        <div class="item form-group">
+
+<label class="control-label col-md-1 col-sm-1 " for="first-name"> Username<a style="color:red;">*</a> </label>
+<div class="col-md-3 col-sm-3 ">
+<input type="text" id="user_name" name="user_name" value="" required="required" class="form-control ">
+</div>
+
+<label class="control-label col-md-1 col-sm-1 " for="last-name"> Password<a style="color:red;">*</a> </label>
+<div class="col-md-3 col-sm-3 ">
+<input type="password" id="password" minlength="8" name="password" value="" required="required" class="form-control " title="password must have alphabets  &#013;password requires 6 characters minimum">
+<span toggle="#password" id="toggle-password" class="fa fa-fw fa-eye field-icon toggle-password"></span>              
+</div>
+
+<label class="control-label col-md-1 col-sm-1 " for="last-name"> Confirm Password<a style="color:red;">*</a> </label>
+<div class="col-md-3 col-sm-3 ">
+<input type="password" id="confirm_password" name="confirm_password" value="" required="required" class="form-control ">
+<span id='message'></span>
+</div>
+
+
+</div> 
+
+</div>                     
+<!-- -----------------------------------------	 -->
+<div class="x_title">
+<h5>Emergency Contact <i id="chevron2" class="fa fa-chevron-circle-down" aria-hidden="true" data-toggle="collapse" data-target="#demo1" style="font-size:20px;"></i></h5>
+<div class=""></div>
+</div><br />	
+<div class="collapse" id="demo1">          
+    <div class="item form-group">
+                       
+        <label class="control-label col-md-1 col-sm-1 " for="first-name"> Name</label>
+        <div class="col-md-5 col-sm-5 ">
+        <input type="text" id="relation_name" name="relation_name" value="<?php if(isset($editData)) { echo $editData->name; } ?>" class="form-control ">
+        </div>
+        
+        <label class="control-label col-md-1 col-sm-1 " for="email"> Relationship</label>
+        <div class="col-md-5 col-sm-5 ">
+        <input id="relationship" name="relationship" value="<?php if(isset($editData)) { echo $editData->email; } ?>" class="form-control" type="text" >
+        </div>
+                   
+    </div>
+    
+    <div class="item form-group">
+                       
+       <label class="control-label col-md-1 col-sm-1 " for="first-name"> Mobile</label>
+       <div class="col-md-5 col-sm-5 ">
+       <input type="text" id="relation_mobile" name="relation_mobile" value="<?php if(isset($editData)) { echo $editData->name; } ?>" class="form-control ">
+       </div>
+       
+       <label class="control-label col-md-1 col-sm-1 " for="email"> Home Tel</label>
+       <div class="col-md-5 col-sm-5 ">
+       <input id="relation_tel" name="relation_tel" value="<?php if(isset($editData)) { echo $editData->relation_tel; } ?>" class="form-control" type="text" >
+       </div>
+                  
+    </div>
+</div>
+<!-- -----------------------------------------	 -->
+<div class="x_title">
+<h5>Address Details <i id="chevron3" class="fa fa-chevron-circle-down" aria-hidden="true" data-toggle="collapse" data-target="#demo2" style="font-size:20px;"></i></h5>
+<div class="clearfix"></div>
+</div><br />	
+<div class="collapse" id="demo2"> 						
+
+    <div class="item form-group">
+                   
+        <label class="control-label col-md-1 col-sm-1 " for="first-name"> Address</label>
+        <div class="col-md-5 col-sm-5 ">
+        <input type="text" id="address" name="address" value="<?php if(isset($editData)) { echo $editData->address; } ?>" class="form-control ">
+        </div>
+        
+        <label class="control-label col-md-1 col-sm-1 " for="email"> City</label>
+        <div class="col-md-5 col-sm-5 ">
+        <input id="city" name="city" value="<?php if(isset($editData)) { echo $editData->city; } ?>" class="form-control" type="text" >
+        </div>
+    
+    </div>
+    
+    <div class="item form-group">
+                   
+        <label class="control-label col-md-1 col-sm-1 " for="first-name"> State</label>
+        <div class="col-md-5 col-sm-5 ">
+        <input type="text" id="state" name="state" value="<?php if(isset($editData)) { echo $editData->state; } ?>" class="form-control ">
+        </div>
+        
+        <label class="control-label col-md-1 col-sm-1 " for="email"> Pincode</label>
+        <div class="col-md-5 col-sm-5 ">
+        <input id="pincode" name="pincode" value="<?php if(isset($editData)) { echo $editData->pincode; } ?>" class="form-control" type="text" >
+        </div>
+    
+    </div>
+</div>
+<!-- ----------------------------------------------------------------------------------->
+<div class="x_title">
+<h5>Additional Information <i id="chevron4" class="fa fa-chevron-circle-down" aria-hidden="true" data-toggle="collapse" data-target="#demo3" style="font-size:20px;"></i></h5>
+<div class="clearfix"></div>
+</div><br/>	
+<div class="collapse" id="demo3"> 	
+    <div class="item form-group">
+                                   
+        <label class="control-label col-md-1 col-sm-1 " for="first-name"> Employee Id</label>
+        <div class="col-md-5 col-sm-5 ">
+        <input type="text" id="employee_id" name="emp_id" value="<?php if(isset($editData)) { echo $editData->name; } ?>" class="form-control ">
+        </div>
+        
+        <label class="control-label col-md-1 col-sm-1 " for="email">Join date</label>
+        <div class="col-md-5 col-sm-5 ">
+        <input id="j_date" name="j_date" value="<?php if(isset($editData)) { echo $editData->email; } ?>" class="form-control" type="date" >
+        </div>
+    
+    </div>
+    
+    <div class="item form-group">
+    
+        <label class="control-label col-md-1 col-sm-1 " for="email"> Salary</label>
+        <div class="col-md-5 col-sm-5 ">
+        <input id="salary" name="salary" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" class="form-control" type="text">
+        </div>
+        
+        <label class="control-label col-md-1 col-sm-1 " for="first-name"> Comment</label>
+        <div class="col-md-5 col-sm-5 ">
+        <input id="comment" name="comment" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" class="form-control" type="text">
+        </div>
+    
+    </div>
+
+    <div class="item form-group">
+                   
+       <label class="control-label col-md-1 col-sm-1 " for="first-name"> Photo Upload</label>
+       <div class="col-md-5 col-sm-5 ">
+       <input type="file" id="image" name="image" value="<?php if(isset($editData)) { echo $editData->profile_pic; } ?>" class="form-control ">
+       <img class="profilepic__image" style="width: 50%; display: block;padding:10px;" src="" alt="Avatar">
+       </div>
+
+       <label class="control-label col-md-1 col-sm-1 " for="first-name"> Manager</label>
+       <div class="col-md-5 col-sm-5 ">
+       <select id="manager" name="manager" class="form-control">
+        <option value="">--Select--</option>
+        <?php foreach ($manager as $key => $value) { ?>
+        <option value="<?php echo $value->user_id; ?>"><?php echo $value->name; ?></option>
+        <?php } ?>
+        </select>
+       </div>
+    
+    </div>
+</div>
+<!-- -----------------------------------------	 -->
+
+<div class="ln_solid"></div>
+<div class="item form-group">
+<div class="offset-md-8">
+<button class="btn btn-secondary" onclick="history.back()">Cancel</button>
+<button class="btn btn-primary" type="reset">Reset</button>
+<button type="submit" class="btn btn-success">Submit</button>
+</div>
+</div>
+
+</form>
+</div>
+</div>
+</div>
+</div>	
+<!-- /Body page content -->
+<script>
+$(document).ready(function(){
+    // $('.fa fa-chevron-up').click();
+    // setTimeout(() => { $('#chevron1').click(); }, 500);
+});
+
+
+$(document).on('change','#image',function(){
+  
+  const file = this.files[0];
+      if (file){
+        let reader = new FileReader();
+        reader.onload = function(event){
+          $('#image').attr('src', event.target.result);
+          $('.profilepic__image').attr('src', event.target.result);
+        }
+        reader.readAsDataURL(file);
+      }
+});
+</script>
\ No newline at end of file
diff --git a/application/modules/Employee/views/add_emp1.php b/application/modules/Employee/views/add_emp1.php
new file mode 100644
index 0000000..0e052ac
--- /dev/null
+++ b/application/modules/Employee/views/add_emp1.php
@@ -0,0 +1,398 @@
+<div class="col-md-12 col-sm-12">
+<div class="x_panel">
+<div class="x_title">
+  <ul class="nav navbar-right panel_toolbox">
+    <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
+    </li>
+  </ul>
+  <h2>Add Employee</h2>
+  <div class="clearfix"></div>
+</div>
+<div class="x_content">
+
+    <div class="col-xs-3">
+      <!-- Nav tabs -->
+      <div class="nav nav-tabs flex-column  bar_tabs" id="v-pills-tab" role="tablist" aria-orientation="vertical">
+        <a class="nav-link active" id="personal_detail-tab" data-toggle="pill" href="#personal_detail" role="tab" aria-controls="personal_detail" aria-selected="true">Personal Details</a>
+        <a class="nav-link" id="contact_detail-tab" data-toggle="pill" href="#contact_detail" role="tab" aria-controls="contact_detail" aria-selected="false">Contact Detail</a>
+        <a class="nav-link" id="qualification-tab" data-toggle="pill" href="#qualification" role="tab" aria-controls="qualification" aria-selected="false">Qualification</a>
+        <a class="nav-link" id="employee_history-tab" data-toggle="pill" href="#employee_history" role="tab" aria-controls="employee_history" aria-selected="false">Employee History</a>
+        <a class="nav-link" id="additional_info-tab" data-toggle="pill" href="#additional_info" role="tab" aria-controls="additional_info" aria-selected="false">Additional Information</a>
+      </div>
+    </div>
+
+    <div class="col-xs-12">
+      <!-- Tab panes -->
+      <div class="tab-content" id="v-pills-tabContent">
+
+    <!-- ---------------------------------------------------personal_detail----------------------------------------------------- -->
+
+        <div class="tab-pane fade show active" id="personal_detail" role="tabpanel" aria-labelledby="personal_detail-tab">
+
+        <h6>Personal Details</h6>
+        <div class="clearfix"></div>
+        <div class="x_content">
+            <form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Employee/createEmp" enctype="multipart/form-data">
+
+                <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">	
+                
+                <div class="item form-group">
+                               
+                    <label class="control-label col-md-2 col-sm-1 " for="first-name"> Name<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input type="text" id="name" name="name" value="<?php if(isset($editData)) { echo $editData->name; } ?>" required="required" class="form-control ">
+                    </div>
+                    
+                    <label class="control-label col-md-2 col-sm-1 " for="email"> Email<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="email" name="email" value="<?php if(isset($editData)) { echo $editData->email; } ?>" required="required" class="form-control" type="email" >
+                    </div>
+                
+                </div>
+                
+                <div class="item form-group">
+                
+                    <label class="control-label col-md-2 col-sm-1 " for="email"> Mobile<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="mobile" name="mobile" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" required="required" class="form-control" type="text">
+                    </div>
+                    
+                    <label class="control-label col-md-2 col-sm-1 " for="first-name">Department<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <select id="department" name="department" required="required" class="form-control" >
+                    <option value="<?php if(isset($editData)) { echo $editData->department; } ?>"><?php if(isset($assetData)) { echo $editData->department; } ?></option>
+                    <?php foreach ($departmentData as $key => $value) { ?>
+                    <option value="<?php echo $value->id; ?>"><?php echo $value->name; ?></option>
+                    <?php } ?>
+                    </select>
+                    </div>
+                
+                </div>
+
+                <div class="item form-group">
+                
+                <label class="control-label col-md-2 col-sm-1 " for="email"> Gender<a style="color:red;">*</a> </label>
+                <div class="col-md-5 col-sm-5 " style="padding:10px;">                   
+                <input type="radio" name="gender" value="male" />Male
+                <input type="radio" name="gender" value="female" />Female
+                </div>
+                
+                <label class="control-label col-md-2 col-sm-1 " for="first-name">Marital Status<a style="color:red;">*</a> </label>
+                <div class="col-md-5 col-sm-5 ">
+                <select id="marital_status" name="marital_status" required="required" class="form-control" >
+                <option value="">--Select--</option>
+                <option value="single">Single</option>
+                <option value="married">Married</option>
+                <option value="others">Others</option>
+                </select>
+                </div>
+            
+            </div>
+            <br />	<h6>Emergency Contact</h6>  <div class="x_title">	</div>	<br />	
+
+            <div class="item form-group">
+                               
+                <label class="control-label col-md-2 col-sm-1 " for="first-name"> Name<a style="color:red;">*</a> </label>
+                <div class="col-md-5 col-sm-5 ">
+                <input type="text" id="relation_name" name="relation_name" value="<?php if(isset($editData)) { echo $editData->name; } ?>" required="required" class="form-control ">
+                </div>
+                
+                <label class="control-label col-md-2 col-sm-1 " for="email"> Relationship<a style="color:red;">*</a> </label>
+                <div class="col-md-5 col-sm-5 ">
+                <input id="Relationship" name="Relationship" value="<?php if(isset($editData)) { echo $editData->email; } ?>" required="required" class="form-control" type="text" >
+                </div>
+                           
+            </div>
+
+            <div class="item form-group">
+                               
+               <label class="control-label col-md-2 col-sm-1 " for="first-name"> Mobile<a style="color:red;">*</a> </label>
+               <div class="col-md-5 col-sm-5 ">
+               <input type="text" id="relation_mobile" name="relation_mobile" value="<?php if(isset($editData)) { echo $editData->name; } ?>" required="required" class="form-control ">
+               </div>
+               
+               <label class="control-label col-md-2 col-sm-1 " for="email"> Home Tel<a style="color:red;">*</a> </label>
+               <div class="col-md-5 col-sm-5 ">
+               <input id="relation_tel" name="relation_tel" value="<?php if(isset($editData)) { echo $editData->email; } ?>" required="required" class="form-control" type="text" >
+               </div>
+                          
+            </div>
+            </form>
+                <div class="ln_solid"></div>
+                <div class="item form-group">
+                <div class="offset-md-8">
+                <button class="btn btn-secondary" onclick="history.back()">Cancel</button>
+                <button type="submit" class="btn btn-success">Save</button>
+                </div>
+                </div>
+            </div>
+        </div>
+
+    <!-- ---------------------------------------------------contact_detail----------------------------------------------------- -->
+
+        <div class="tab-pane fade" id="contact_detail" role="tabpanel" aria-labelledby="contact_detail-tab">
+        <h6>Contact Details</h6>
+        <div class="clearfix"></div>
+        <div class="x_content">
+            <form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Employee/createEmp" enctype="multipart/form-data">
+
+                <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">	
+                
+                <div class="item form-group">
+                               
+                    <label class="control-label col-md-2 col-sm-1 " for="first-name"> Address<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input type="text" id="address" name="address" value="<?php if(isset($editData)) { echo $editData->name; } ?>" required="required" class="form-control ">
+                    </div>
+                    
+                    <label class="control-label col-md-2 col-sm-1 " for="email"> City<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="city" name="city" value="<?php if(isset($editData)) { echo $editData->email; } ?>" required="required" class="form-control" type="text" >
+                    </div>
+                
+                </div>
+                
+                <div class="item form-group">
+                
+                    <label class="control-label col-md-2 col-sm-1 " for="email"> State<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="state" name="state" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" required="required" class="form-control" type="text">
+                    </div>
+                    
+                    <label class="control-label col-md-2 col-sm-1 " for="first-name">Postal Code<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="pincode" name="pincode" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" required="required" class="form-control" type="text">
+                    </div>
+                
+                </div>
+
+                <div class="item form-group">
+                
+                    <label class="control-label col-md-2 col-sm-1 " for="email"> Country<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="country" name="country" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" required="required" class="form-control" type="text">
+                    </div>
+
+                </div>
+
+                
+            </form>
+                <div class="ln_solid"></div>
+                <div class="item form-group">
+                <div class="offset-md-8">
+                <button class="btn btn-secondary" onclick="history.back()">Cancel</button>
+                <button type="submit" class="btn btn-success">Save</button>
+                </div>
+                </div>
+            </div>
+        </div>
+
+    <!-- ---------------------------------------------------qualification----------------------------------------------------- -->
+
+        <div class="tab-pane fade" id="qualification" role="tabpanel" aria-labelledby="qualification-tab">
+           <h6>Add Education</h6>
+        <div class="clearfix"></div>
+        <div class="x_content">
+            <form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Employee/createEmp" enctype="multipart/form-data">
+
+                <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">	
+                
+                <!-- <div class="item form-group">
+                               
+                    <label class="control-label col-md-2 col-sm-1 " for="first-name"> Company<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input type="text" id="company" name="company" value="<?php if(isset($editData)) { echo $editData->name; } ?>" required="required" class="form-control ">
+                    </div>
+                    
+                    <label class="control-label col-md-2 col-sm-1 " for="email"> Job Title<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="job_title" name="job_title" value="<?php if(isset($editData)) { echo $editData->email; } ?>" required="required" class="form-control" type="text" >
+                    </div>
+                
+                </div>
+                
+                <div class="item form-group">
+                
+                    <label class="control-label col-md-2 col-sm-1 " for="email"> From<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="from" name="from" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" required="required" class="form-control" type="text">
+                    </div>
+                    
+                    <label class="control-label col-md-2 col-sm-1 " for="first-name"> To<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="to" name="to" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" required="required" class="form-control" type="text">
+                    </div>
+                
+                </div>
+
+                <div class="item form-group">
+                
+                    <label class="control-label col-md-2 col-sm-1 " for="email"> Comment<a style="color:red;">*</a> </label>
+                    <div class="col-md-12 col-sm-12 " >
+                    <input id="country" name="country" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" required="required" class="form-control" type="text">
+                    </div>
+                
+                </div> -->
+
+                <!-- <br />	<h6>Add Education</h6>  <div class="x_title">	</div>	<br /> -->
+
+                <div class="item form-group">
+                               
+                    <label class="control-label col-md-2 col-sm-1 " for="first-name"> Level<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input type="text" id="level" name="level" value="<?php if(isset($editData)) { echo $editData->name; } ?>" required="required" class="form-control ">
+                    </div>
+                    
+                    <label class="control-label col-md-2 col-sm-1 " for="email"> Institute<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="institute" name="institute" value="<?php if(isset($editData)) { echo $editData->email; } ?>" required="required" class="form-control" type="text" >
+                    </div>
+                
+                </div>
+
+                <div class="item form-group">
+                               
+                    <label class="control-label col-md-2 col-sm-1 " for="first-name"> Major<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input type="text" id="major" name="major" value="<?php if(isset($editData)) { echo $editData->name; } ?>" required="required" class="form-control ">
+                    </div>
+                    
+                    <label class="control-label col-md-2 col-sm-1 " for="email"> GPA/Score<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="cgpa" name="cgpa" value="<?php if(isset($editData)) { echo $editData->email; } ?>" required="required" class="form-control" type="text" >
+                    </div>
+                
+                </div>
+                
+                <div class="item form-group">
+                
+                    <label class="control-label col-md-2 col-sm-1 " for="email"> From<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="q_from" name="q_from" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" required="required" class="form-control" type="text">
+                    </div>
+                    
+                    <label class="control-label col-md-2 col-sm-1 " for="first-name"> To<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="q_to" name="q_to" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" required="required" class="form-control" type="text">
+                    </div>
+                
+                </div>
+           
+            </form>
+                <div class="ln_solid"></div>
+                <div class="item form-group">
+                <div class="offset-md-8">
+                <button class="btn btn-secondary" onclick="history.back()">Cancel</button>
+                <button type="submit" class="btn btn-success">Save</button>
+                </div>
+                </div>
+            </div>
+        </div>
+
+    <!-- ---------------------------------------------------employee_history----------------------------------------------------- -->
+
+        <div class="tab-pane fade" id="employee_history" role="tabpanel" aria-labelledby="employee_history-tab">
+        <h6>Employee History</h6>
+        <div class="clearfix"></div>
+        <div class="x_content">
+            <form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Employee/createEmp" enctype="multipart/form-data">
+
+                <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">	
+                
+                <div class="item form-group">
+                               
+                    <label class="control-label col-md-2 col-sm-1 " for="first-name"> Company Name<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input type="text" id="c_name" name="c_name" value="<?php if(isset($editData)) { echo $editData->name; } ?>" required="required" class="form-control ">
+                    </div>
+                    
+                    <label class="control-label col-md-2 col-sm-1 " for="email"> Role<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="role" name="role" value="<?php if(isset($editData)) { echo $editData->email; } ?>" required="required" class="form-control" type="text" >
+                    </div>
+                
+                </div>
+                
+                <div class="item form-group">
+                
+                    <label class="control-label col-md-2 col-sm-1 " for="email"> From<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="h_from" name="from" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" required="required" class="form-control" type="text">
+                    </div>
+                    
+                    <label class="control-label col-md-2 col-sm-1 " for="first-name"> To<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="h_to" name="to" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" required="required" class="form-control" type="text">
+                    </div>
+                
+                </div>
+
+                
+            </form>
+                <div class="ln_solid"></div>
+                <div class="item form-group">
+                <div class="offset-md-8">
+                <button class="btn btn-secondary" onclick="history.back()">Cancel</button>
+                <button type="submit" class="btn btn-success">Save</button>
+                </div>
+                </div>
+            </div>
+        </div>
+
+    <!-- ---------------------------------------------------additional_info----------------------------------------------------- -->
+
+        <div class="tab-pane fade" id="additional_info" role="tabpanel" aria-labelledby="additional_info-tab">
+        <h6>Additional Information</h6>
+        <div class="clearfix"></div>
+        <div class="x_content">
+            <form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Employee/createEmp" enctype="multipart/form-data">
+
+                <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">	
+                
+                <div class="item form-group">
+                               
+                    <label class="control-label col-md-2 col-sm-1 " for="first-name"> Employee Id<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input type="text" id="employee_id" name="employee_id" value="<?php if(isset($editData)) { echo $editData->name; } ?>" required="required" class="form-control ">
+                    </div>
+                    
+                    <label class="control-label col-md-2 col-sm-1 " for="email">Join date<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="j_date" name="j_date" value="<?php if(isset($editData)) { echo $editData->email; } ?>" required="required" class="form-control" type="text" >
+                    </div>
+                
+                </div>
+                
+                <div class="item form-group">
+                
+                    <label class="control-label col-md-2 col-sm-1 " for="email"> Salary<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="salary" name="salary" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" required="required" class="form-control" type="text">
+                    </div>
+                    
+                    <label class="control-label col-md-2 col-sm-1 " for="first-name"> Comment<a style="color:red;">*</a> </label>
+                    <div class="col-md-5 col-sm-5 ">
+                    <input id="comment" name="comment" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" required="required" class="form-control" type="text">
+                    </div>
+                
+                </div>
+
+                
+            </form>
+                <div class="ln_solid"></div>
+                <div class="item form-group">
+                <div class="offset-md-8">
+                <button class="btn btn-secondary" onclick="history.back()">Cancel</button>
+                <button type="submit" class="btn btn-success">Save</button>
+                </div>
+                </div>
+            </div>
+        </div>
+
+    <!-- ----------------------------------------------------------------------------------------------------------------------- -->
+      </div>
+    </div>
+
+</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/application/modules/Employee/views/confirmation_popup.php b/application/modules/Employee/views/confirmation_popup.php
new file mode 100644
index 0000000..d6f94c0
--- /dev/null
+++ b/application/modules/Employee/views/confirmation_popup.php
@@ -0,0 +1,26 @@
+
+	
+	
+<div class="modal-dialog modal-sm">
+<div class="modal-content">
+
+<div class="modal-header">
+<h6 class="modal-title" id="myModalLabel2">Are you sure you want to delete</h6>
+<button type="button" id="close-form" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span>
+</button>
+</div>
+</br>
+<center>
+<form  class="delete_url" method="post" action="" id="">
+<button type="button" class="btn btn-sm btn-secondary" id="close-form" data-dismiss="modal" aria-label="Close">No</button>	
+&nbsp; &nbsp; &nbsp; &nbsp;
+<input type="hidden" class="delete_id" name="id" value="">
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"	>
+<button type="submit" class="btn btn-sm btn-primary" id="">Yes</button>
+</form>
+</center>
+</br>
+</div>
+</div>
+ 
+
diff --git a/application/modules/Employee/views/edit_emp.php b/application/modules/Employee/views/edit_emp.php
new file mode 100644
index 0000000..2a245f1
--- /dev/null
+++ b/application/modules/Employee/views/edit_emp.php
@@ -0,0 +1,289 @@
+
+<!-- Body page content -->
+
+
+
+<div class="">
+<div class="page-title">
+
+<div class="title_left">
+<h3>Edit Employee</h3>
+</div>
+
+
+</div>
+<div class="clearfix"></div>
+<div class="row">
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+<!-- <div class="x_title">
+
+<ul class="nav navbar-right panel_toolbox">
+<li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a></li>
+</li>
+</ul>
+<h6>General Information</h6>
+<div class="clearfix"></div>
+</div>
+<div class="x_content"> -->
+<br />
+<form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Employee/editEmployees" enctype="multipart/form-data">
+
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">
+<input type="hidden" name="id" value="<?php echo $editData->id; ?>">
+<input type="hidden" name="user_id" value="<?php echo $editData->user_id; ?>">
+
+<div class="x_title">
+<h5>Personal Information<a style="color:red;">*</a> <i id="chevron1" class="fa fa-chevron-circle-down" aria-hidden="true" data-toggle="collapse" data-target="#demo" style="font-size:20px;"></i></h5>
+<div class="clearfix"></div>
+</div><br />	
+<div class="collapse" id="demo">
+    <div class="item form-group">
+                   
+        <label class="control-label col-md-1 col-sm-1 " for="first-name"> Name<a style="color:red;">*</a> </label>
+        <div class="col-md-5 col-sm-5 ">
+        <input type="text" id="name" name="name" value="<?php if(isset($editData)) { echo $editData->name; } ?>" required="required" class="form-control ">
+        </div>
+        
+        <label class="control-label col-md-1 col-sm-1 " for="email"> Email<a style="color:red;">*</a> </label>
+        <div class="col-md-5 col-sm-5 ">
+        <input id="email" name="email" value="<?php if(isset($editData)) { echo $editData->email; } ?>" required="required" class="form-control" type="email" >
+        </div>
+    
+    </div>
+    
+    <div class="item form-group">
+    
+        <label class="control-label col-md-1 col-sm-1 " for="email"> Mobile<a style="color:red;">*</a> </label>
+        <div class="col-md-5 col-sm-5 ">
+        <input id="mobile" name="mobile" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" required="required" class="form-control" type="tel" >
+        </div>
+        
+        <label class="control-label col-md-1 col-sm-1 " for="last-name">Department<a style="color:red;">*</a> </label>
+        <div class="col-md-5 col-sm-5 ">
+        <select id="department" name="department" required="required" class="form-control" placeholder="choose" <?php if(isset($viewData)) { echo "readonly"; } ?>>
+        <option value="<?php echo $editData->department; ?>"><?php echo $editData->department; ?></option>
+        <?php foreach ($departmentData as $key => $value) { ?>
+        <option value="<?php echo $value->name; ?>"><?php echo $value->name; ?></option>
+        <?php } ?>
+        </select>
+        </div>
+    
+    </div>
+
+    <div class="item form-group">
+                    
+        <label class="control-label col-md-1 col-sm-1 " for="email"> Gender<a style="color:red;">*</a> </label>
+        <div class="col-md-5 col-sm-5 " style="padding:10px;">
+        <?php 
+        if ($editData->gender == 'male') 
+        {
+            echo '<input type="radio" name="gender" value="male" checked/>Male';
+            echo '&nbsp&nbsp';
+            echo '<input type="radio" name="gender" value="female" />Female';
+        }
+        else
+        {
+            echo '<input type="radio" name="gender" value="male"/>Male';
+            echo '&nbsp&nbsp';
+            echo '<input type="radio" name="gender" value="female" checked/>Female';
+        } ?>
+        </div>
+        
+        <label class="control-label col-md-1 col-sm-1 " for="first-name">Marital Status<a style="color:red;">*</a> </label>
+        <div class="col-md-5 col-sm-5 ">
+        <select id="marital_status" name="marital_status" required="required" class="form-control" placeholder="choose" <?php if(isset($viewData)) { echo "readonly"; } ?>>
+        <option value="<?php echo $editData->marital_status; ?>"><?php echo ucfirst($editData->marital_status); ?></option>
+        <?php 
+        if ($editData->marital_status != 'single') 
+        {
+            echo '<option value="single">Single</option>';
+        }
+        if ($editData->marital_status != 'married') 
+        {
+            echo '<option value="married">Married</option>';
+        }
+        if ($editData->marital_status != 'others') 
+        {
+            echo '<option value="others">Others</option>';
+        } 
+        ?>
+        </select>
+        </div>
+                           
+    </div>
+
+</div>
+<!-- -----------------------------------------	 -->
+<div class="x_title">
+<h5>Emergency Contact <i id="chevron2" class="fa fa-chevron-circle-down" aria-hidden="true" data-toggle="collapse" data-target="#demo1" style="font-size:20px;"></i></h5>
+<div class=""></div>
+</div><br />	
+<div class="collapse" id="demo1"> 
+<div class="item form-group">
+                       
+       <label class="control-label col-md-1 col-sm-1 " for="first-name"> Name</label>
+       <div class="col-md-5 col-sm-5 ">
+       <input type="text" id="relation_name" name="relation_name" value="<?php if(isset($editData)) { echo $editData->relation_name; } ?>" class="form-control ">
+       </div>
+       
+       <label class="control-label col-md-1 col-sm-1 " for="email"> Relationship</label>
+       <div class="col-md-5 col-sm-5 ">
+       <input id="relationship" name="relationship" value="<?php if(isset($editData)) { echo $editData->relationship; } ?>" class="form-control" type="text" >
+       </div>
+                  
+   </div>
+   
+   <div class="item form-group">
+                      
+      <label class="control-label col-md-1 col-sm-1 " for="first-name"> Mobile</label>
+      <div class="col-md-5 col-sm-5 ">
+      <input type="text" id="relation_mobile" name="relation_mobile" value="<?php if(isset($editData)) { echo $editData->relation_mobile; } ?>" class="form-control ">
+      </div>
+      
+      <label class="control-label col-md-1 col-sm-1 " for="email"> Home Tel</label>
+      <div class="col-md-5 col-sm-5 ">
+      <input id="relation_tel" name="relation_tel" value="<?php if(isset($editData)) { echo $editData->relation_tel; } ?>" class="form-control" type="text" >
+      </div>
+                 
+   </div>
+</div>
+<!-- -----------------------------------------	 -->
+<div class="x_title">
+<h5>Address Detail <i id="chevron2" class="fa fa-chevron-circle-down" aria-hidden="true" data-toggle="collapse" data-target="#demo2" style="font-size:20px;"></i></h5>
+<div class=""></div>
+</div><br />	
+<div class="collapse" id="demo2"> 
+    <div class="item form-group">
+                   
+        <label class="control-label col-md-1 col-sm-1 " for="first-name"> Address</label>
+        <div class="col-md-5 col-sm-5 ">
+        <input type="text" id="address" name="address" value="<?php if(isset($editData)) { echo $editData->address; } ?>" class="form-control ">
+        </div>
+        
+        <label class="control-label col-md-1 col-sm-1 " for="email"> City</label>
+        <div class="col-md-5 col-sm-5 ">
+        <input id="city" name="city" value="<?php if(isset($editData)) { echo $editData->city; } ?>" class="form-control" type="text" >
+        </div>
+    
+    </div>
+    
+    <div class="item form-group">
+                   
+        <label class="control-label col-md-1 col-sm-1 " for="first-name"> State</label>
+        <div class="col-md-5 col-sm-5 ">
+        <input type="text" id="state" name="state" value="<?php if(isset($editData)) { echo $editData->state; } ?>" class="form-control ">
+        </div>
+        
+        <label class="control-label col-md-1 col-sm-1 " for="email"> Pincode</label>
+        <div class="col-md-5 col-sm-5 ">
+        <input id="pincode" name="pincode" value="<?php if(isset($editData)) { echo $editData->pincode; } ?>" class="form-control" type="text" >
+        </div>
+    
+    </div>
+</div>
+<!-- -----------------------------------------	 -->
+<div class="x_title">
+<h5>Additional Information <i id="chevron4" class="fa fa-chevron-circle-down" aria-hidden="true" data-toggle="collapse" data-target="#demo3" style="font-size:20px;"></i></h5>
+<div class="clearfix"></div>
+</div><br />	
+<div class="collapse" id="demo3"> 
+    <div class="item form-group">
+                   
+        <label class="control-label col-md-1 col-sm-1 " for="first-name"> Employee Id</label>
+        <div class="col-md-5 col-sm-5 ">
+        <input type="text" id="emp_id" name="emp_id" value="<?php if(isset($editData)) { echo $editData->emp_id; } ?>"class="form-control ">
+        </div>
+        
+        <label class="control-label col-md-1 col-sm-1 " for="email"> Joining Date</label>
+        <div class="col-md-5 col-sm-5 ">
+        <input id="j_date" name="j_date" value="<?php if(isset($editData)) { echo $editData->j_date; } ?>" class="form-control" type="date" >
+        </div>
+    
+    </div>
+
+    <div class="item form-group">
+    
+    <label class="control-label col-md-1 col-sm-1 " for="email"> Salary</label>
+    <div class="col-md-5 col-sm-5 ">
+    <input id="salary" name="salary" value="<?php if(isset($editData)) { echo $editData->salary; } ?>" class="form-control" type="text">
+    </div>
+    
+    <label class="control-label col-md-1 col-sm-1 " for="first-name"> Comment</label>
+    <div class="col-md-5 col-sm-5 ">
+    <input id="comment" name="comment" value="<?php if(isset($editData)) { echo $editData->comment; } ?>" class="form-control" type="text">
+    </div>
+
+</div>
+    
+    <div class="item form-group">
+                   
+        <label class="control-label col-md-1 col-sm-1 " for="first-name"> Photo Upload</label>
+        <div class="col-md-5 col-sm-5 ">
+        <input type="file" id="image" name="image" value="<?php if(isset($editData->profile_pic)) { echo $editData->profile_pic; } ?>" class="form-control ">
+        <img class="profilepic__image" style="width: 50%; display: block;padding:10px;" src="<?php echo base_url();?>/assets/uploads/<?php echo $editData->profile_pic ?>" alt="Avatar" title="Change the avatar">
+        </div>
+
+        <label class="control-label col-md-1 col-sm-1 " for="first-name"> Manager</label>
+        <div class="col-md-5 col-sm-5 ">
+          <select id="manager" name="manager" class="form-control">
+          <option value="<?php echo $manager_name[0]->name; ?>"><?php echo $manager_name[0]->name; ?></option>
+          <?php foreach ($manager as $key => $value) { ?>
+          <option value="<?php echo $value->user_id; ?>"><?php echo $value->name; ?></option>
+          <?php } ?>
+          </select>        
+        </div>
+    
+    </div>
+</div>
+
+
+
+
+
+
+
+
+
+<!-- <div class="ln_solid"></div> -->
+<div class="item form-group">
+<div class=" offset-md-8">
+<button class="btn btn-primary" onclick="history.back()">Cancel</button>
+<button type="submit" class="btn btn-success">Update</button>
+</div>
+</div>
+
+</form>
+</div>
+</div>
+</div>
+
+
+
+
+
+
+<br/>
+
+<div  id="sub-value" class="col-md-12 col-sm-12">
+<?php echo $emp_sub_list_htmlPage; ?>
+</div>
+
+
+</div>	
+</div>	
+<script>
+    $(document).on('change','#image',function(){
+  
+  const file = this.files[0];
+      if (file){
+        let reader = new FileReader();
+        reader.onload = function(event){
+          $('#image').attr('src', event.target.result);
+          $('.profilepic__image').attr('src', event.target.result);
+        }
+        reader.readAsDataURL(file);
+      }
+});
+</script>
+<!-- /Body page content -->
diff --git a/application/modules/Employee/views/emp_list.php b/application/modules/Employee/views/emp_list.php
new file mode 100644
index 0000000..030fa1b
--- /dev/null
+++ b/application/modules/Employee/views/emp_list.php
@@ -0,0 +1,105 @@
+<head>
+<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css'> 
+</head>
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+  <div class="x_title">
+   <h2>Employee Details </h2>
+		<ul class="nav navbar-right panel_toolbox">
+    <!-- <?php if(user()->action_permit != 'view' )  { ?> -->
+			 <a href="<?php echo base_url();?>Employee/addEmployee" class="btn btn-sm btn-primary">Add Employee</a>
+       <!-- <?php } ?> -->
+                   <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a></li>
+    </ul>
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+ <div class="row">
+  <div class="col-sm-12">
+    <table id="datatable-buttons"  class="table table-striped table-bordered"  width="100%">
+      <thead>
+        <tr class="headings">						                 
+				<th class="column-title">Name </th>
+        <th class="column-title">Email </th>
+				<th class="column-title">Mobile </th>
+        <th class="column-title" >Department </th>
+				<th class="column-title" >Action </th>
+        </tr>
+      </thead>
+      <tbody>
+    
+        <?php if (!is_null($tableData)) {
+        foreach ($tableData as $key => $value) { ?>
+				<tr class="even pointer">
+					<td class=" "> <?php echo $value->name; ?> </td>
+                    <!-- <?php if (is_superadmin()) { ?>
+                    <td class=" "> <?php echo $value->business ?> </td>
+                    <?php
+                    } ?> -->
+          <td class=" "><?php echo $value->email; ?> </td>
+					<td class=" "><?php echo $value->mobile; ?></td>
+          <td class=" "><?php echo $value->department; ?></td>
+					<td style=" text-align: center;  font-size: 16px;">
+
+          <a href="<?php echo base_url()?>Employee/editEmployee/<?php echo md5($value->user_id);?>" ><i class="fa fa-pencil" title="Edit"></i></a> &nbsp;
+
+          <a><i class="fa fa-trash deleteEmp" data-toggle="modal" data-target=".bs-example-modal-sm" title="Delete" id="<?php echo $value->user_id;?>"></i></a>&nbsp;
+
+	         <!-- <a href="<?php echo base_url()?>Employee/deleteEmployee/<?php echo md5($value->id);?>" ><i class="fa fa-trash" title="Edit"></i></a> &nbsp; -->
+
+            <a> <i id="<?php echo md5($value->user_id);?>" class="bi bi-card-list" title="History"></i></a>&nbsp;
+          </td>
+        </tr>
+			<?php }}?>
+      </tbody>
+    </table>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+
+<br/>
+
+<!-- Large modal -->
+<!-- <button type="button" class="btn btn-primary" data-toggle="modal" data-target=".bs-example-modal-lg" hidden>Large modal</button> -->
+<div class="modal fade bs-example-modal-lg" id="ItemModal" tabindex="-1" role="dialog" aria-hidden="true"></div>
+<div class="modal bs-example-modal-sm" tabindex="-1" role="dialog" aria-hidden="true" id="popup"> </div>
+
+<div style="display:none" id="sub-value">
+
+<script>
+$('.deleteEmp').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Employee/deleteEmp";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Employee/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#popup').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+
+
+$(document).on('click','.bi-card-list',function(){
+  var id = $(this).attr("id")
+    $.ajax({ 
+      type: "get",
+      url: "<?php echo base_url()?>Employee/view_emp_history/"+id,
+      success: function(response) {
+        response = JSON.parse(response);
+        console.log(response);
+        $('.bs-example-modal-lg').html(response);
+        $('.bs-example-modal-lg').modal("show");
+      },
+      error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) }
+    });
+});
+</script>
+
+</div>
+
diff --git a/application/modules/Employee/views/emp_sub_list.php b/application/modules/Employee/views/emp_sub_list.php
new file mode 100644
index 0000000..06368f3
--- /dev/null
+++ b/application/modules/Employee/views/emp_sub_list.php
@@ -0,0 +1,461 @@
+ 
+          <div class="x_panel">
+            <div class="x_title">
+                   <h2>Details</h2>
+                   <div class="clearfix"></div>
+                 </div>
+                 <div class="x_content">
+                   <ul class="nav nav-tabs bar_tabs" id="myTab" role="tablist">
+                   <li class="nav-item">
+                       <a class="nav-link" id="add_edu-tab" data-toggle="tab" href="#add_education" role="tab" aria-controls="add_edu-tab" aria-selected="true">Employee Education</a>
+                     </li>
+                     <li class="nav-item">
+                       <a class="nav-link" id="emp_history-tab" data-toggle="tab" href="#employee_history" role="tab" aria-controls="emp_history-tab" aria-selected="true">Employee History</a>
+                     </li>
+                     <li class="nav-item">
+                       <a class="nav-link" id="upload_files" data-toggle="tab" href="#upload_image" role="tab" aria-controls="upload_files" aria-selected="true">Upload Files</a>
+                     </li>
+                   </ul>
+					
+					
+        <div class="tab-content" id="myTabContent">
+
+
+
+<!------------------------------ add_education ------------------------------->
+<div class="tab-pane fade" id="add_education" role="tabpanel" aria-labelledby="add_edu-tab">
+        <ul class="nav navbar-right panel_toolbox">
+        <?php if(user()->action_permit != 'view' )  { ?>
+		<a  type="button" class="add_education" id="<?php echo md5($id) ?>" data-toggle="modal" data-target="#edit-form_add_education" style=" text-align: center;  font-size: 25px; color:#2A3F54;	">
+		 <li class="fa fa-plus-circle" title="Add New"></li></a>
+     <?php } ?>
+        </ul>	</br> 
+   <div class="card-box table-responsive"> 		
+        <table  class="table table-bordered table-striped"  cellspacing="0" width="100%">
+                        <thead>
+                          <tr class="headings">
+                            <th class="column-title" width="15%">Level </th>
+                            <th class="column-title" width="15%">Institute </th>
+                            <th class="column-title" width="15%">Major </th>
+                            <th class="column-title" width="10%">GPA/Score </th>
+							              <th class="column-title" width="15%">From </th>
+                            <th class="column-title" width="15%">To </th> 
+                            <th class="column-title" width="10%">Action </th> 		  							
+                          </tr>
+                        </thead>
+                        <tbody>
+                      <?php foreach ($add_education as $key => $value) { ?>
+					                  <tr class="even pointer">
+                            <td class=" "><?php echo $value->level; ?></td>
+                            <td class=" "><?php echo $value->institute; ?></td>
+							              <td class=" "><?php echo $value->major; ?></td>
+                            <td class=" "><?php echo $value->cgpa; ?></td>
+							              <td class=" "><?php echo $value->q_from; ?></td>
+							              <td class=" "><?php echo $value->q_to; ?></td>
+                            <?php if(user()->action_permit != 'view' )  { ?>
+							              <td>
+                              <a class="edit_education" id="<?php echo md5($value->emp_id); ?>" style="font-size: 16px;" >
+                              <i class="fa fa-pencil" title="Edit"></i></a>
+                              &nbsp;
+                              <a class="deleteAddEducationData" data-toggle="modal" data-target=".bs-example-modal-sm"  style="font-size: 16px;" id="<?php echo md5($value->id); ?>">
+                              <i class="fa fa-trash " ></i></a>
+                              <!-- <a href="<?php echo base_url()?>Asset/deleteThirdPartyData/<?php echo md5($value->id); ?>" style="font-size: 16px;"><i class="fa fa-trash" title="Delete"></i></a> -->
+                            </td>
+                      <?php } ?>
+                          </tr>
+					<?php } ?>
+                        </tbody>
+        </table>
+		</div>
+ </div>  
+<!------------------------------ emp_hostory --------------------------------->
+<div class="tab-pane fade" id="employee_history" role="tabpanel" aria-labelledby="emp_history-tab">
+        <ul class="nav navbar-right panel_toolbox">
+        <?php if(user()->action_permit != 'view' )  { ?>
+		<a  type="button" class="employee_history" id="<?php echo md5($id) ?>" data-toggle="modal" data-target="#edit-form_add_history" style=" text-align: center;  font-size: 25px; color:#2A3F54;	">
+		 <li class="fa fa-plus-circle" title="Add New"></li></a>
+     <?php } ?>
+        </ul>	</br> 
+   <div class="card-box table-responsive"> 		
+        <table  class="table table-bordered table-striped"  cellspacing="0" width="100%">
+                        <thead>
+                          <tr class="headings">
+                            <th class="column-title" width="15%">Company Name </th>
+                            <th class="column-title" width="15%">Role </th>
+							              <th class="column-title" width="15%">From </th>
+                            <th class="column-title" width="15%">To </th> 
+                            <th class="column-title" width="10%">Action </th> 		  							
+                          </tr>
+                        </thead>
+                        <tbody>
+                      <?php foreach ($employee_history as $key => $value) { ?>
+					                  <tr class="even pointer">
+                            <td class=" "><?php echo $value->c_name; ?></td>
+                            <td class=" "><?php echo $value->role; ?></td>
+							              <td class=" "><?php echo $value->h_from; ?></td>
+							              <td class=" "><?php echo $value->h_to; ?></td>
+                            <?php if(user()->action_permit != 'view' )  { ?>
+							              <td>
+                              <a class="edit_employee_history" id="<?php echo md5($id) ?>" style="font-size: 16px;" >
+                              <i class="fa fa-pencil" title="Edit"></i></a>
+                              &nbsp;
+                              <a class="deleteEmpHistoryData" data-toggle="modal" data-target=".bs-example-modal-sm"  style="font-size: 16px;" id="<?php echo md5($value->id); ?>">
+                              <i class="fa fa-trash " ></i></a>
+                              <!-- <a href="<?php echo base_url()?>Asset/deleteThirdPartyData/<?php echo md5($value->id); ?>" style="font-size: 16px;"><i class="fa fa-trash" title="Delete"></i></a> -->
+                            </td>
+                      <?php } ?>
+                          </tr>
+					<?php } ?>
+                        </tbody>
+        </table>
+		</div>
+ </div>
+<!------------------------------ UPLOAD FILE DATA ---------------------------->
+<div class="tab-pane fade" id="upload_image" role="tabpanel" aria-labelledby="upload_files">
+	    <ul class="nav navbar-right panel_toolbox">
+      <!-- <?php if(user()->action_permit != 'view' )  { ?> -->
+		   <a  type="button" class="add_image_emp" id="<?php echo md5($id) ?>" data-toggle="modal" data-target="#edit-form_add_image" style=" text-align: center;  font-size: 25px; color:#2A3F54;	">
+		   <li class="fa fa-plus-circle" title="Add New"></li></a>
+     <!-- <?php } ?> -->
+            </ul>	</br> </br> 
+			 <div class="row">
+              <div class="col-md-12">
+                <div class="x_panel">
+				  <div class="x_content">
+                     <div class="row">
+	<?php foreach ($images as $key => $value) {  $EXTENSION = pathinfo($value->file_name, PATHINFO_EXTENSION);  ?>
+					       
+					
+  <div class="col-md-55">
+  <div class="thumbnail">
+  <div class="image view view-first">
+    <?php if($EXTENSION == 'pdf') { ?>
+        <embed  style="width: 100%; display: block;" src="<?php echo base_url(); ?>assets/uploads/<?php echo $value->file_name; ?>" alt="image" />
+    <?php } else { ?>
+        <img style="width: 100%; display: block;" src="<?php echo base_url(); ?>assets/uploads/<?php echo $value->file_name; ?>" alt="image" />
+    <?php } ?>
+	<div class="mask">
+	<p>&nbsp;</p>
+  <div class="tools tools-bottom">
+    <a class="deleteuploadImage" data-toggle="modal" data-target=".bs-example-modal-sm" style="font-size: 16px;"  id="<?php echo md5($value->id);?>"><i class="fa fa-trash" ></i></a>
+  <?php if($EXTENSION == 'pdf') { ?>
+    <a href="<?php echo base_url()?>/assets/uploads/<?php echo $value->file_name; ?>" download><i class="fa fa-download" title="Download"></i></a>
+  <?php } ?>
+  </div>
+  </div>
+  </div>
+  <p><?php echo $value->f_name; ?></p>
+  </div>
+  </div>
+          
+ <?php } ?>
+					  
+                    </div>
+					 </div>
+                    </div>
+                   </div>
+                  </div>  
+               
+			   </div>
+
+
+
+
+<!-- ################################################################### -->
+<!-------------------------------FORM------------------------------>
+<!-------------------------------FILE MODEL FORM------------------------------>
+<div class="modal bs-example-modal-sm" tabindex="-1" role="dialog" aria-hidden="true" id="edit-form_add_image">
+  <div class="modal-dialog modal-lm">
+  <div class="modal-content">
+  
+  <div class="modal-header">
+  <h3 class="modal-title" id="myModalLabel2"><?php echo $heading; ?></h3>
+  <button type="button" id="close-form" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span>
+  </button>
+  </div>
+  
+  <form  data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Employee/add_employee_file" enctype="multipart/form-data">				  
+  <div class="modal-body">
+  <div class="x_content">
+  <br />
+  <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">	
+  <input type="hidden" name="emp_id" value="<?php echo $id; ?>">	
+  
+
+  <div class="form-group row">
+  <label class="col-form-label col-md-3 col-sm-3 ">Name<a style="color:red;">*</a></label>
+  <div class="col-md-9 col-sm-9 ">
+  <input type="text" id="f_name" name="f_name" value="" required="required" class="form-control ">
+  </div>
+  </div>
+
+
+  <div class="form-group row">
+  <label class="col-form-label col-md-3 col-sm-3 ">File Upload<a style="color:red;">*</a></label>
+  <div class="col-md-9 col-sm-9 ">
+  <input type="file" id="file_name" name="file_name" value="" required="required" class="form-control ">
+  </div>
+  </div>
+  
+  </div>
+  </div>
+  <div class="modal-footer">
+  <button type="button" class="btn btn-secondary" data-dismiss="modal"  id="close-form">Close</button>
+  <button type="submit" class="btn btn-primary"><?php echo $submit_button_title; ?></button>
+  </div>
+  </form>
+  </div>
+  </div>
+</div>	
+<!-------------------------------add_education MODEL FORM--------------------->
+<div class="modal bs-example-modal-sm" tabindex="-1" role="dialog" aria-hidden="true" id="edit-form_add_education">
+  <div class="modal-dialog modal-lm">
+  <div class="modal-content">
+  
+  <div class="modal-header">
+  <h3 class="modal-title" id="myModalLabel2"><?php echo $heading; ?></h3>
+  <button type="button" id="close-form" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span>
+  </button>
+  </div>
+  
+  <form  data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Employee/add_employee_education" enctype="multipart/form-data">				  
+  <div class="modal-body">
+  <div class="x_content">
+  <br />
+  <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">	
+  <input type="hidden" name="emp_id" value="<?php echo $id; ?>">
+  <input type="hidden" name="id" class="edu_id" value="">	
+  
+  <div class="form-group row">
+  <label class="col-form-label col-md-3 col-sm-3 ">Level<a style="color:red;">*</a></label>
+  <div class="col-md-9 col-sm-9 ">
+  <input type="text" id="level" name="level" value="" required="required" class="form-control ">
+  </div>
+  </div>
+
+  <div class="form-group row">
+  <label class="col-form-label col-md-3 col-sm-3 ">Institute<a style="color:red;">*</a></label>
+  <div class="col-md-9 col-sm-9 ">
+  <input id="institute" name="institute" value="" required="required" class="form-control" type="text" >
+  </div>
+  </div>
+
+  <div class="form-group row">
+  <label class="col-form-label col-md-3 col-sm-3 ">Major<a style="color:red;">*</a></label>
+  <div class="col-md-9 col-sm-9 ">
+  <input type="text" id="major" name="major" value="" required="required" class="form-control ">
+  </div>
+  </div>
+
+  <div class="form-group row">
+  <label class="col-form-label col-md-3 col-sm-3 ">GPA/Score<a style="color:red;">*</a></label>
+  <div class="col-md-9 col-sm-9 ">
+  <input id="cgpa" name="cgpa" value="" required="required" class="form-control" type="text" >
+  </div>
+  </div>
+  
+  <div class="form-group row">
+  <label class="col-form-label col-md-3 col-sm-3 ">From<a style="color:red;">*</a></label>
+  <div class="col-md-9 col-sm-9 ">
+  <input id="q_from" name="q_from" value="" required="required" class="form-control" type="text">
+  </div>
+  </div>
+
+  <div class="form-group row">
+  <label class="col-form-label col-md-3 col-sm-3 ">To<a style="color:red;">*</a></label>
+  <div class="col-md-9 col-sm-9 ">
+  <input id="q_to" name="q_to" value="" required="required" class="form-control" type="text">
+  </div>
+  </div>
+
+  </div>
+  </div>
+  <div class="modal-footer">
+  <button type="button" class="btn btn-secondary" data-dismiss="modal"  id="close-form">Close</button>
+  <button type="submit" class="btn btn-primary"><?php echo $submit_button_title; ?></button>
+  </div>
+  </form>
+  </div>
+  </div>
+</div>	 
+<!-------------------------------emp_history MODEL FORM--------------------->  
+<div class="modal bs-example-modal-sm" tabindex="-1" role="dialog" aria-hidden="true" id="edit-form_add_history">
+  <div class="modal-dialog modal-lm">
+  <div class="modal-content">
+  
+  <div class="modal-header">
+  <h3 class="modal-title" id="myModalLabel2"><?php echo $heading; ?></h3>
+  <button type="button" id="close-form" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span>
+  </button>
+  </div>
+  
+  <form  data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Employee/add_employee_history" enctype="multipart/form-data">				  
+  <div class="modal-body">
+  <div class="x_content">
+  <br />
+  <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">	
+  <input type="hidden" name="emp_id" value="<?php echo $id; ?>">	
+  <input type="hidden" name="id" class="his_id" value="">	
+  
+  <div class="form-group row">
+  <label class="col-form-label col-md-3 col-sm-3 ">Company Name<a style="color:red;">*</a></label>
+  <div class="col-md-9 col-sm-9 ">
+  <input type="text" id="c_name" name="c_name" value="" required="required" class="form-control ">
+  </div>
+  </div>
+
+  <div class="form-group row">
+  <label class="col-form-label col-md-3 col-sm-3 ">Role<a style="color:red;">*</a></label>
+  <div class="col-md-9 col-sm-9 ">
+  <input id="role" name="role" value="" required="required" class="form-control" type="text" >
+  </div>
+  </div>
+
+  <div class="form-group row">
+  <label class="col-form-label col-md-3 col-sm-3 ">From<a style="color:red;">*</a></label>
+  <div class="col-md-9 col-sm-9 ">
+  <input id="h_from" name="h_from" value="" required="required" class="form-control" type="text">
+  </div>
+  </div>
+
+  <div class="form-group row">
+  <label class="col-form-label col-md-3 col-sm-3 ">To<a style="color:red;">*</a></label>
+  <div class="col-md-9 col-sm-9 ">
+  <input id="h_to" name="h_to" value="" required="required" class="form-control" type="text">
+  </div>
+  </div>
+  
+  </div>
+  </div>
+  <div class="modal-footer">
+  <button type="button" class="btn btn-secondary" data-dismiss="modal"  id="close-form">Close</button>
+  <button type="submit" class="btn btn-primary"><?php echo $submit_button_title; ?></button>
+  </div>
+  </form>
+  </div>
+  </div>
+</div>	
+<!-------------------------------------------------------------------------->  
+			   
+	   
+
+					  
+					  
+    </div>
+  </div>
+</div>
+        
+<div class="modal bs-example-modal-sm" tabindex="-1" role="dialog" aria-hidden="true" id="popup"> </div>   
+
+<script>
+
+$(document).on('click','.edit_education',function(){
+  var id = $(this).attr("id");
+  console.log(id);
+  var URL = "<?php echo base_url();?>Employee/editEmp_qualification/"+id
+  $.ajax({
+        url: URL,
+        type:"get",
+        success:function(data){
+          value = JSON.parse(data);
+          console.log(value);
+          $('.edu_id').val(value[0].id);
+          $('#level').val(value[0].level);
+          $('#institute').val(value[0].institute);
+          $('#major').val(value[0].major);
+          $('#cgpa').val(value[0].cgpa);
+          $('#q_from').val(value[0].q_from);
+          $('#q_to').val(value[0].q_to);
+          $('#edit-form_add_education').modal("show");
+        }
+    });
+});
+
+$(document).on('click','.edit_employee_history',function(){
+  var id = $(this).attr("id");
+  var URL = "<?php echo base_url();?>Employee/editEmp_history/"+id
+  $.ajax({
+        url: URL,
+        type:"get",
+        success:function(data){
+          value = JSON.parse(data);
+          $('.his_id').val(value[0].id);
+          $('#c_name').val(value[0].c_name);
+          $('#role').val(value[0].role);
+          $('#h_from').val(value[0].h_from);
+          $('#h_to').val(value[0].h_to);
+          $('#edit-form_add_history').modal("show");
+        }
+    });
+});
+
+  
+$(document).on('click','.add_image',function(){
+  var id = $(this).attr("id")
+  if (id) {
+    var URL = "<?php echo base_url();?>Employee/uploadForm/"+id
+  } 
+  else {
+    var URL = "<?php echo base_url();?>Employee/uploadForm/"+"uploadform"
+  }
+  $.ajax({
+        url: URL,
+        type:"GET",
+        success:function(data){
+          $('#edit-form_add_image').html(JSON.parse(data));
+          $('.bs-example-modal-sm add_image').modal("show");
+        }
+    });
+});
+
+$('.deleteAddEducationData').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Employee/deleteEmpQualification";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Employee/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#edit-form_add_image').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+
+$('.deleteEmpHistoryData').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Employee/deleteEmpHistory";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Employee/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#edit-form_add_image').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+
+$('.deleteuploadImage').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Employee/deleteEmpImage";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Employee/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#edit-form_add_image').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+</script>
+	 
+		 
+		 
+		 
+		 
+		
\ No newline at end of file
diff --git a/application/modules/Employee/views/expence_form.php b/application/modules/Employee/views/expence_form.php
new file mode 100644
index 0000000..e137d80
--- /dev/null
+++ b/application/modules/Employee/views/expence_form.php
@@ -0,0 +1,185 @@
+
+<!-- Body page content -->
+
+
+
+<div class="">
+<div class="page-title">
+
+<div class="title_left">
+<h3>Expence Request</h3>
+</div>
+
+
+</div>
+<div class="clearfix"></div>
+<div class="row">
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+<div class="x_title">
+
+<ul class="nav navbar-right panel_toolbox">
+<li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a></li>
+</li>
+</ul>
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+<br />
+<form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Employee/rise_expence_request" enctype="multipart/form-data">
+
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">    
+
+
+<div class="item form-group">
+ 
+
+</div>
+
+<div class="item form-group">
+    
+    <label class="control-label col-md-2 col-sm-2 " for="last-name">Expence Requisted For</label>
+    <div class="col-md-5 col-sm-5 ">
+        
+    <input type="radio" name="created_by" value="self"style="margin:10px;"checked /><b>Self</b>
+
+    <input type="radio" name="created_by" value="<?php echo user()->name;?>" style="margin: 10px;" /><b>Others</b>
+  
+    </div>
+</div>
+<div class="item form-group">
+     <label class="control-label col-md-2 col-sm-2  " for="last-name"> Employee Name </label>
+     <div class="col-md-5 col-sm-5 ">
+        <select id="user_dropdown" name="emp_id" style="margin-top: 10px;padding-bottom: 10px;" class="form-control manager" >  </select>
+     </div>
+</div>
+
+
+
+<div class="item form-group">
+
+<label class="control-label col-md-2 col-sm-2 " for="first-name"> Date of expence</label>
+<div class="col-md-5 col-sm-5 ">
+  <div class="form-group">
+        <div class='input-group date' id='myDatepicker'>
+           <input type='text' class="form-control" name="date_of_expence" value="<?php if(isset($expenceData)) { echo $expenceData->purchase_date; } ?>" />
+                <span class="input-group-addon">
+                  <li class="fa fa-calendar"></li>
+                </span>
+         </div>
+   </div>
+                            
+</div>
+</div>
+
+<div class="item form-group">
+
+<label class="control-label col-md-2 col-sm-2 " for="first-name"> Expence Cost </label>
+<div class="col-md-5 col-sm-5 ">
+<input id="cost" name="amount" value="<?php if(isset($assetData)) { echo $assetData->cost; } ?>" class="form-control" type="text" name="middle-name">
+</div>
+</div>
+
+
+
+<div class="item form-group">
+<label class="control-label col-md-2 col-sm-2 " for="last-name">Description</label>
+    <div class="col-md-5 col-sm-5">
+    <textarea id="comments" name="comments" value=""  class="form-control"  style="height:200px !important;" type="text" ></textarea>
+       
+         <input type="hidden" id="manager_id" name="manager" value=""> 
+
+    </div>
+</div>
+
+
+<div class="item form-group">
+
+<label class="control-label col-md-2 col-sm-2 " for="first-name">Expence Bill</label>
+<div class="col-md-5 col-sm-5 ">
+<input id="formFile" name="bill" class="typeFile" type="file" >
+</div>
+
+</div>
+
+
+<div class="ln_solid"></div>
+<div class="item form-group">
+<div class=" offset-md-8">
+<button class="btn btn-secondary" onclick="history.back()">Cancel</button>
+<button class="btn btn-primary" type="reset">Reset</button>
+<button type="submit" class="btn btn-success">Submit</button>
+</div>
+</div>
+
+</form>
+</div>
+</div>
+</div>
+
+
+</div>  
+</div>  
+<!-- /Body page content -->
+
+
+<script>
+$(document).ready(function(){
+
+      var currentUserName = '<?php echo user()->name; ?>';
+      var currentUserId = '<?php echo user()->id; ?>';
+      $('#user_dropdown').append('<option   value="' + currentUserId + '">' + 
+        currentUserName + '</option>');
+      $('#user_dropdown').prop('disabled', true);
+
+$('#user_dropdown').on('change',function() {
+     
+});
+
+
+ $('input[type="radio"][name="created_by"]').change(function() {
+        var selectedValue = $(this).val();
+        var $userDropdown = $('#user_dropdown');
+
+        $userDropdown.empty();
+
+        if (selectedValue === 'self') {
+            
+            var currentUserName = '<?php echo user()->name; ?>';
+            var currentUserId = '<?php echo user()->id; ?>';
+            $userDropdown.append('<option value="' + currentUserId + '">' + currentUserName + '</option>');
+            $userDropdown.prop('disabled', true);
+        } else if (selectedValue === '<?php echo user()->name; ?>') {
+
+            $.ajax({
+                url: '<?php echo base_url('Employee/get_emp_name/')?>"', 
+                method: 'GET',
+                dataType: 'json',
+                success: function(response) {
+
+                     $('#user_dropdown').append(response);
+                    $('#user_dropdown').prop('disabled', false);
+                },
+                error: function(xhr, status, error) {
+                    console.error(error);
+                }
+            });
+        }
+    });
+     
+});
+
+</script>
+
+ <script>
+    
+//get manager id from the dropdown employee assign the value to  $("#manager_id") input field
+
+$("#user_dropdown").on("change", function(){
+   let manager_id = $(this).children(":selected").attr("id");
+
+   $("#manager_id").val(manager_id);
+    
+})
+
+ </script>
\ No newline at end of file
diff --git a/application/modules/Employee/views/expence_list.php b/application/modules/Employee/views/expence_list.php
new file mode 100644
index 0000000..238e230
--- /dev/null
+++ b/application/modules/Employee/views/expence_list.php
@@ -0,0 +1,296 @@
+
+<head>
+<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css'> 
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.4/jquery.min.js"></script>
+
+<style>
+  .design {
+  display: none;
+  position: fixed;
+  z-index: 1;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  background-color: rgba(0, 0, 0, 0.4);
+}
+
+.design-form {
+  background-color: #fefefe;
+  margin: 15% auto;
+  padding: 20px;
+  border: 1px solid #888;
+  width: 380px;
+  height: 280px;
+  text-align: center;
+}
+
+button {
+  margin-top: 10px;
+}
+</style>
+
+<style>
+
+#myImg {
+  border-radius: 5px;
+  cursor: pointer;
+  transition: 0.3s;
+}
+
+#myImg:hover {opacity: 0.7;}
+
+/* The Modal (background) */
+.modal {
+  display: none; /* Hidden by default */
+  position: fixed; /* Stay in place */
+  z-index: 1; /* Sit on top */
+  padding-top: 100px; /* Location of the box */
+  left: 0;
+  top: 0;
+  width: 100%; /* Full width */
+  height: 100%; /* Full height */
+  overflow: auto; /* Enable scroll if needed */
+  background-color: rgb(0,0,0); /* Fallback color */
+  background-color: rgba(0,0,0,0.9); /* Black w/ opacity */
+}
+
+/* Modal Content (image) */
+.modal-content {
+  margin: auto;
+  display: block;
+  width: 80%;
+  max-width: 700px;
+}
+
+/* Caption of Modal Image */
+#caption {
+  margin: auto;
+  display: block;
+  width: 80%;
+  max-width: 700px;
+  text-align: center;
+  color: #ccc;
+  padding: 10px 0;
+  height: 150px;
+}
+
+/* Add Animation */
+.modal-content, #caption {  
+  -webkit-animation-name: zoom;
+  -webkit-animation-duration: 0.6s;
+  animation-name: zoom;
+  animation-duration: 0.6s;
+}
+
+@-webkit-keyframes zoom {
+  from {-webkit-transform:scale(0)} 
+  to {-webkit-transform:scale(1)}
+}
+
+@keyframes zoom {
+  from {transform:scale(0)} 
+  to {transform:scale(1)}
+}
+
+.close {
+  position: absolute;
+  top: 15px;
+  right: 35px;
+  color: #f1f1f1;
+  font-size: 40px;
+  font-weight: bold;
+  transition: 0.3s;
+}
+
+.close:hover,
+.close:focus {
+  color: #bbb;
+  text-decoration: none;
+  cursor: pointer;
+}
+
+/* 100% Image Width on Smaller Screens */
+@media only screen and (max-width: 700px){
+  .modal-content {
+    width: 100%;
+  }
+}
+</style>
+
+</head>
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+  <div class="x_title">
+   <h1>Expence List</h1>
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+ <div class="row">
+  <div class="col-sm-12" style="overflow: auto;">
+    <table id="datatable-buttons"  class="table table-striped table-bordered"  width="100%">
+      <thead>
+        <tr class="headings">						                 
+				        <th class="column-title">Creadted Date</th>
+                <th class="column-title">Employee Id</th>
+                <th class="column-title">Employee Name</th>
+                <th class="column-title">Expence Date</th>
+                <th class="column-title">Expence Raised By</th>
+                <th class="column-title">Expence Cost(₹)</th>
+                <th class="column-title">Expence Bill</th>
+                <th class="column-title">Comments </th>
+                <th class="column-title">Status </th>
+				        <th class="column-title" >Action </th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php foreach ($tableData as $key => $value) { ?>
+				<tr class="even pointer">
+                   
+                    <td class=" "><?php echo $value->created_at; ?> </td> 
+                    <td class=" "><?php echo $value->emp_id; ?> </td>
+                    <td class=" "><?php echo $value->name; ?> </td>
+					          <td class=" "><?php echo $value->date_of_expence; ?></td>
+                    <td class=" "><?php echo $value->created_by; ?></td>
+                    <td class=" ">₹ <?php echo $value->amount; ?></td>
+                    <td class=" "> 
+                    <img id="myImg" style="width: 50%; display: block;" src="<?php echo base_url(); ?>assets/uploads/Expence_Bill/<?php echo $value->bill; ?>" alt="invoice"/>
+                    </td>
+                    <td class=" "><?php echo $value->comments; ?></td>
+					          <?php if($value->status == 'pending'){ ?>
+                      <td style="color:#e68a00"><?php echo $value->status; ?></td>
+                    <?php }
+                    else if($value->status == 'Approved'){ ?>
+                      <td style="color:green"><?php echo $value->status; ?>By <?php echo $value->approved_by; ?><br><?php echo $value->approved_at;?></td>
+                    <?php }
+                    else if($value->status == 'Declined'){ ?>
+                      <td style="color:red"><?php echo $value->status; ?><br><?php echo $value->DReason; ?></td>
+                    <?php }
+                    else if($value->status == 'canceled'){ ?>
+                       <td style="color:darkcyan;"><?php echo $value->status; ?></td>
+                    <?php }
+                    else{
+
+                    }?>
+                    <td style=" text-align: center;  font-size: 16px;">
+
+                       <?php if($value->status == 'pending') { ?>
+
+                        <a href="<?php echo base_url('Employee/Approve_Expence')?>?id=<?php echo $value->id;?> "><i class="fa fa-check" aria-hidden="true"title="Approve" onclick = "return confirm('Are you sure to Approve This Leave ')" ></i></a> &nbsp;
+
+          
+                        <a href="#"><i class="fa fa-times test" aria-hidden="true" title="Decline"  onclick="showCustomPrompt()"
+                        id= "<?php echo $value->id; ?>"></i></a>&nbsp;
+
+                      <?php } ?>
+          </td>
+        </tr>
+			<?php } ?>
+      </tbody>
+    </table>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+
+<div id="customPrompt" class="design">
+  <div class="design-form ">
+    <span  onclick="$('#customPrompt').hide()">X</span>
+    <h3>Decline Reason</h3>
+    <input list="browsers" id="decline_reason" required name="myBrowser" /> 
+<datalist id="browsers" >
+    <?php foreach ($dropdown as $key => $value) { ?>
+    <option value="<?php echo $value->enum_value; ?>"><?php echo $value->enum_value; ?></option>
+    <?php } ?>
+</datalist>
+
+<button onclick="submitCustomPrompt()" type="button" class="btn btn-primary">Submit</button>
+ 
+  </div>
+</div>
+
+<br/>
+
+<div class="modal fade bs-example-modal-lg" id="ItemModal" tabindex="-1" role="dialog" aria-hidden="true"></div>
+<div class="modal bs-example-modal-sm" tabindex="-1" role="dialog" aria-hidden="true" id="popup"> </div>
+
+
+<script>
+
+  function showCustomPrompt() {
+  var customPrompt = document.getElementById("customPrompt");
+  customPrompt.style.display = "block";
+}
+
+function submitCustomPrompt() {
+  
+  var id = $('.test').attr("id");
+  var reason = document.getElementById("decline_reason").value;
+
+  if( reason != "")
+
+   $.ajax(
+      {
+        data:{id : id , reason : reason },
+        url:"<?php echo base_url('Employee/Decline_expence');?>",
+        type:"get",
+        success: function(response) {
+           
+            window.location ='<?php echo base_url('Employee/expence_list');?>';
+      }
+
+
+      }); 
+    else 
+
+         alert('Decline Reason is required');
+}
+
+</script>
+</div>
+  
+<!-- The Modal -->
+<div id="myModal" class="modal">
+  <span class="close">&times;</span>
+  <img class="modal-content" id="img01">
+  <div id="caption"></div>
+</div>
+
+<script>
+ 
+ 
+ 
+ $(document).ready(function(){ 
+
+
+
+$('#myImg').on('click', function(){
+
+var modal = document.getElementById("myModal");
+var modalImg = document.getElementById("img01");
+var captionText = document.getElementById("caption");
+img.onclick = function(){
+  modal.style.display = "block";
+  modalImg.src = this.src;
+  captionText.innerHTML = this.alt;
+}
+
+// Get the <span> element that closes the modal
+var span = document.getElementsByClassName("close")[0];
+
+// When the user clicks on <span> (x), close the modal
+span.onclick = function() { 
+  modal.style.display = "none";
+}
+
+});
+});
+</script>
+
+
+
diff --git a/application/modules/Employee/views/view_history.php b/application/modules/Employee/views/view_history.php
new file mode 100644
index 0000000..0fe2f60
--- /dev/null
+++ b/application/modules/Employee/views/view_history.php
@@ -0,0 +1,40 @@
+ 
+<!-- Large modal -->
+<!-- <button type="button" class="btn btn-primary" data-toggle="modal" data-target=".bs-example-modal-lg" hidden>Large modal</button> -->
+<!-- <div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true"> -->
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title" id="myModalLabel"><?php echo $title;  ?></h4>
+        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <!-- <?php echo json_encode($user_history) ?> -->
+<?php foreach ($user_history as $key => $value) { ?>
+  <div id="data" style="padding : 10px;">
+              <lable class="col-form-label" id="first-line"><?php echo my_date_show_time($value->created_at). "  " ?><i><?php echo $value->user_name; ?></i></lable></br>
+							<lable class="column-title" style="color : black;" >
+							<?php 
+							$column_name = str_replace("_"," ",$value->column_name);
+              $column_name = ucwords($column_name);
+							if($value->old_value == null)
+							{ 
+                echo "$name "." ' $value->new_value ' "." Created"; 
+              }
+              else
+              {  
+                echo $column_name." Changed from "."'$value->old_value'"." to "."'$value->new_value'"; 
+              }
+							?>
+							</lable></br>
+  </div>
+  <?php } ?>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+        <!-- <button type="button" class="btn btn-primary">Save changes</button> -->
+      </div>
+    </div>
+  </div>
+<!-- </div> -->
\ No newline at end of file
diff --git a/application/modules/Expence/controllers/Expence.php b/application/modules/Expence/controllers/Expence.php
new file mode 100644
index 0000000..3c76984
--- /dev/null
+++ b/application/modules/Expence/controllers/Expence.php
@@ -0,0 +1,259 @@
+<?php defined('BASEPATH') or exit('No direct script access allowed');
+
+use chillerlan\QRCode\Data\QRMatrix;
+use chillerlan\QRCode\QRCode;
+use chillerlan\QRCode\QROptions;
+
+date_default_timezone_set('Asia/Kolkata');
+
+/**
+ * AMS
+ *
+ * @package    HMVC
+ * @author     Venba
+ * @copyright  2022 Venba
+ * @license    https://venbainfotech.com/licenses/MIT  MIT License
+ * @link       <URI> (description)
+ * @version    GIT: $Id$
+ * @since      Version 0.0.1
+ * @filesource
+ *
+ */
+
+class Expence extends Admin_Controller
+{
+    /**
+     * [__construct description]
+     *
+     * @method __construct
+     */
+    public function __construct()
+    {
+        // To inherit directly the attributes of the parent class.
+        parent::__construct();
+		### Syntax : $this->load->model('Model Path' , 'Alias name');
+        ### The second parameter (optional) is used to call the method.
+        $this->load->model('MY_Model','MY_Model');
+		$this->load->model('Expence_model','Expence_model');
+        $this->load->model('Employee/Employee_model','Emp_model');
+        $this->load->model('Audit/Audit_model','audit_model');
+		$this->load->helper(array('form', 'url'));
+
+    }
+	
+	 public function expence_form()
+    {
+
+        $this->layout->buffer('main_content', 'Expence/expence_form');
+        $this->layout->render('Employee_Layout');
+    }
+
+     public function get_emp_name()
+    {
+        $emp = $this->Expence_model->get_employee_name(user()->business_id);  
+        $html = '<option>--select Employee--</option>'; 
+          foreach($emp as $val) 
+           {
+            if($val->user_id != user()->id)
+              {
+              $html .='<option id="'.$val->manager.'" value="'.$val->user_id.'">'.$val->name.'</option>';
+              }
+          }  
+        echo json_encode($html);
+    }
+
+    public function rise_expence_request()
+    {   
+        $data = $this->input->post();
+        unset($data['bill']);
+
+
+        //file upload confic
+        $config['upload_path']          = APPPATH. '../assets/uploads/Expence_Bill/';
+        $config['allowed_types']        = 'gif|jpg|png|jpeg|pdf';
+        $config['file_name']            = time();
+        $config['max_size']             = 80000;
+        //upload
+        $this->load->library('upload', $config);
+        $this->upload->initialize($config);
+        $this->upload->do_upload('bill');
+        if ( ! $this->upload->do_upload('bill'))
+           {
+             $error = array('error' => $this->upload->display_errors());
+             //print_r($error);
+
+           } else{
+            $upload_image = $this->upload->data();
+            $data['bill'] = $upload_image['file_name'];
+             
+           }
+      
+       
+        if(isset($data['emp_id'])){ 
+            $emp_id =$this->input->post('emp_id');
+        }else{
+            $emp_id = user()->id;
+        }
+        $data['emp_id'] =  $emp_id;
+
+        if($data['manager']){
+             $manager = $this->input->post('manager'); 
+        }else{
+            $manager = employee()->manager;
+        }
+        $data['manager'] =  $manager;
+        $data['business_id'] = user()->business_id;
+        $data['status'] = 'pending';
+        $data['created_date']  = date('d-m-Y');
+        $data['created_time']  = date('H:i A');
+        $data['is_active'] = 1;
+ 
+       
+        $table="expence_list";
+        $create_leave = $this->MY_Model->insert($data,$table);
+       
+        $this->session->set_flashdata('Create', 'Claim Request Rised Successfully');
+        redirect('Expence/expence_form');
+        }
+
+
+    public function edit_expence()
+    {   
+        $id = $this->input->get('id');
+        $get_expence = $this->Expence_model->get_expence_list_by_id($id);
+        $this->layout->set('get_expence', $get_expence);
+        $this->layout->buffer('main_content', 'Expence/edit_expence');
+        $this->layout->render('Employee_Layout');
+    }
+
+
+    public function edit_rise_expence_request()
+    {
+
+        $action = $this->input->post();
+        unset($action['bill']);
+        unset($action['id']);
+        $id = $this->input->post('id');
+
+
+        //file upload confic
+        $config['upload_path']          = APPPATH. '../assets/uploads/Expence_Bill/';
+        $config['allowed_types']        = 'gif|jpg|png|jpeg|pdf';
+        $config['file_name']            = time();
+        $config['max_size']             = 80000;
+        //upload
+        $this->load->library('upload', $config);
+        $this->upload->initialize($config);
+        $this->upload->do_upload('bill');
+        if ( ! $this->upload->do_upload('bill'))
+           {
+             $error = array('error' => $this->upload->display_errors());
+             //print_r($error);
+
+           } else{
+            $upload_image = $this->upload->data();
+            $action['bill'] = $upload_image['file_name'];
+             
+           }
+      
+       
+        if(isset($data['emp_id'])){ 
+            $emp_id =$this->input->post('emp_id');
+        }else{
+            $emp_id = user()->id;
+        }
+        $action['emp_id'] =  $emp_id;
+        $action['business_id'] = user()->business_id;
+        $action['status'] = 'pending';
+        $action['updated_at']  = date('d-m-Y H:i:s');
+        $action['updated_by'] = user()->id;
+        $action['is_active'] = 1;
+     
+        $table="expence_list";
+        $create_leave = $this->MY_Model->edit_option($action, $id, $table);
+        $this->session->set_flashdata('update', 'Claim Request Updated Successfully');
+        redirect('Expence/Emp_Expence_List');
+
+    }
+
+
+    public function expence_list()
+    {
+        $business_id = user()->business_id;
+        $expence_list = $this->Expence_model->get_expence_list($business_id);
+        $this->layout->set('tableData', $expence_list);
+        $this->layout->buffer('main_content', 'Expence/expence_list');
+        $this->layout->render('Employee_Layout');
+    }
+
+
+       public function Approve_Expence()
+    {
+       $id=$this->input->get('id');          
+       $action['status'] = 'Approved';
+       $action['approved_by']= user()->name;
+       $action['approved_at'] = date('d-m-Y H:i:s');
+       $table = "expence_list";
+       $this->MY_Model->edit_option($action, $id, $table);
+       $this->session->set_flashdata('approve', 'Claim Request Approved');
+       redirect('Expence/expence_list');
+    }
+
+    public function manager_approvel_list()
+    { 
+        $business_id = user()->business_id;
+        $user_id = user()->id;
+        $expence_list = $this->Expence_model->get_expence_list($business_id);
+        $get_delegation = $this->Expence_model->Get_delegation_id($business_id);
+        //print_r($expence_list); die();
+        $this->layout->set('get_delegation', $get_delegation);
+        $this->layout->set('tableData', $expence_list);
+        $this->layout->buffer('main_content', 'Expence/expence_manager_approvel');
+        $this->layout->render('Employee_Layout');
+    }
+
+      public function Manager_Approvel()
+    {
+       $id=$this->input->get('id');          
+       $action['status'] = 'Approved';
+       $action['approved_by']= user()->name;
+       $action['approved_at'] = date('d-m-Y H:i:s');
+       $table = "expence_list";
+       $this->MY_Model->edit_option($action, $id, $table);
+       $this->session->set_flashdata('manager_approve', 'Claim Request Approved');
+       redirect('Expence/manager_approvel_list');
+    }
+
+    public function Emp_Expence_List()
+    {
+        $Emp_Expence_List = $this->Expence_model->get_expence_list(user()->business_id);
+        $this->layout->set('tableData', $Emp_Expence_List);
+        $this->layout->buffer('main_content', 'Expence/emp_expence_list');
+        $this->layout->render('Employee_Layout');
+    }
+
+
+
+    public function Decline_expence()
+    {   
+      $id=$this->input->get('id');
+      $data['status'] = 'Declined';
+      $data['declined_at'] = date('d-m-Y H:i:s');
+      $data['DReason'] = $this->input->get('reason');
+      $this->Expence_model->ExpenceDecline($id, $data);
+      return true;
+    }
+
+    public function cancled_expence()
+    {   
+      $id=$this->input->get('id');
+      $data['status'] = 'canceled';
+      $data['canceled_at'] = date('d-m-Y H:i:s');
+      $this->Expence_model->Expencecancle($id, $data);
+      $this->session->set_flashdata('cancel', 'Claim Request Canceled....     ');
+      redirect('Expence/emp_expence_list');
+    }
+
+
+
+}
diff --git a/application/modules/Expence/models/Expence_model.php b/application/modules/Expence/models/Expence_model.php
new file mode 100644
index 0000000..63f8b93
--- /dev/null
+++ b/application/modules/Expence/models/Expence_model.php
@@ -0,0 +1,97 @@
+<?php
+class Expence_model extends MY_Model {
+
+     public function get_employee_name($business_id)
+    {
+        
+        $this->db->select('users.name, employees.user_id, employees.manager');
+        $this->db->from('users');
+        $this->db->join('employees', 'employees.user_id = users.id');
+        $this->db->where('users.business_id', $business_id);
+        $this->db->where('users.is_active', 1);
+        $this->db->where('employees.is_active', 1);
+        $query = $this->db->get();
+
+        if ($query->num_rows() > 0) {
+            return $query->result();
+        } else {
+            return;
+        }
+    }
+
+    public function get_expence_list($business_id)
+    {
+        $this->db->select('A.* , name', 'users.name');
+        $this->db->from('expence_list A');
+        $this->db->join('users', 'users.id = A.emp_id', 'left');
+        //$this->db->join('delegation', 'delegation.emp_id = users.id', 'left');
+        $this->db->where('A.business_id', $business_id);
+        $this->db->order_by('id','DESC');
+        $this->db->where('A.is_active', 1);
+        $query = $this->db->get();
+        $query = $query->result();  
+        return $query;
+
+    }
+
+    public function decline_dropdown($business_id)
+
+     {
+        
+            $this->db->select('*');
+            $this->db->from('enum');
+            $this->db->where('enum_type', 'decline');
+            $this->db->where('business_id', $business_id);
+            $query = $this->db->get();
+           if ($query->num_rows() > 0) {
+            return $query->result();
+        } else {
+            return;
+        }
+
+     }
+
+     public function get_expence_list_by_id($id)
+     {
+        $this->db->select('*');
+        $this->db->from('expence_list');
+        $this->db->where('md5(id)', $id);
+        $this->db->where('is_active', 1);
+        $query = $this->db->get();
+           if ($query->num_rows() > 0) {
+            return $query->result();
+        } else {
+            return;
+        }
+
+     }
+
+
+     public function ExpenceDecline($id, $data)
+     {
+        $this->db->where('id',$id);
+        $this->db->where('status', 'pending');
+        $this->db->update('expence_list', $data);
+        return;
+     }
+
+      public function Expencecancle($id, $data)
+     {
+        $this->db->where('md5(id)',$id);
+        $this->db->where('status', 'pending');
+        $this->db->update('expence_list', $data);
+        return;
+     }
+
+     public function Get_delegation_id($business_id)
+     {
+        $this->db->select('*');
+        $this->db->from('delegation');
+        $this->db->where('business_id', $business_id);
+        //$this->db->where('delegated_to', $emp_id);
+        $this->db->where('is_active', 1);
+        $query = $this->db->get();
+        return $query->result();  
+     }
+
+}
\ No newline at end of file
diff --git a/application/modules/Expence/views/edit_expence.php b/application/modules/Expence/views/edit_expence.php
new file mode 100644
index 0000000..cb24657
--- /dev/null
+++ b/application/modules/Expence/views/edit_expence.php
@@ -0,0 +1,213 @@
+
+<!-- Body page content -->
+
+
+
+<div class="">
+<div class="page-title">
+ <ul class="nav navbar-right panel_toolbox">
+       <li><a href="<?php echo base_url();?>Expence/emp_expence_list" class="btn btn-primary" style="margin-top: 22px;">Back</a></li>
+    </ul>   
+<h1>Edit Expense</h1>
+</div>
+
+
+</div>
+<div class="clearfix"></div>
+<div class="row">
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+<div class="x_title">
+
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+<br />
+
+<?php if(!empty($get_expence)) { ?> 
+  
+  <?php foreach( $get_expence as $data) { ?>
+
+<form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Expence/edit_rise_expence_request" enctype="multipart/form-data">
+
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">   
+
+<input type="hidden" name="id" value="<?php echo $data->id; ?>"> 
+
+
+<div class="item form-group">
+ 
+
+</div>
+
+<div class="item form-group">
+    
+    <label class="control-label col-md-2 col-sm-2 " for="last-name">Expense Requisted For</label>
+    <div class="col-md-5 col-sm-5 ">
+        
+    <input type="radio" name="created_by" value="self"style="margin:10px;"checked /><b>Self</b>
+
+    <input type="radio" name="created_by" value="<?php echo user()->name;?>" style="margin: 10px;" /><b>Others</b>
+  
+    </div>
+</div>
+<div class="item form-group">
+     <label class="control-label col-md-2 col-sm-2  " for="last-name"> Employee Name <a style="color:red;">*</a></label>
+     <div class="col-md-5 col-sm-5 ">
+        <select id="user_dropdown" name="emp_id" style="margin-top: 10px;padding-bottom: 10px;" class="form-control manager" >  </select>
+     </div>
+</div>
+
+
+
+<div class="item form-group">
+
+<label class="control-label col-md-2 col-sm-2 " for="first-name"> Date of expence<a style="color:red;">*</a></label>
+<div class="col-md-5 col-sm-5 ">
+  <div class="form-group">
+        <div class='input-group date'>
+           <input type='text' placeholder="DD-MM-YYYY" class="form-control" id='myDatepicker' required name="date_of_expence" value="<?php echo $data->date_of_expence; ?>" />
+         </div>
+   </div>
+                            
+</div>
+</div>
+
+<div class="item form-group">
+
+<label class="control-label col-md-2 col-sm-2 " for="first-name"> Expense Cost <a style="color:red;">*</a></label>
+<div class="col-md-5 col-sm-5 ">
+<input id="cost" name="amount" required value="<?php echo $data->amount; ?>" class="form-control" type="text" name="middle-name">
+</div>
+</div>
+
+
+
+<div class="item form-group">
+<label class="control-label col-md-2 col-sm-2 " for="last-name">Description</label>
+    <div class="col-md-5 col-sm-5">
+    <textarea id="comments" name="comments" value=""  class="form-control"  style="height:200px !important;" type="text" ><?php echo $data->comments;?></textarea>
+       
+         <!-- <input type="hidden" id="manager_id" name="manager" value="">  -->
+
+    </div>
+</div>
+
+
+<div class="item form-group">
+
+<label class="control-label col-md-2 col-sm-2 " required for="first-name">Upload Bill</label>
+<div class="col-md-5 col-sm-5 ">
+<input id="formFile" name="bill" onchange="PreviewImage()" class="typeFile" type="file">
+</div>
+</div>
+
+<div class="item form-group">
+
+<label class="control-label col-md-2 col-sm-2 " required for="first-name"></label>
+<div class="col-md-2 col-sm-2 ">
+<img src="<?php echo base_url(); ?>/assets/uploads/Expence_Bill/<?php echo $data->bill; ?>" style="height: 100px; width: 100px;" id="uploadPreview" class="avatar img-circle img-thumbnail" alt="avatar"><br><br>
+
+</div>
+
+ </div>   
+
+
+<div class="ln_solid"></div>
+<div class="item form-group">
+<div class=" offset-md-8">
+<button class="btn btn-secondary" onclick="history.back()">Cancel</button>
+<button class="btn btn-primary" type="reset">Reset</button>
+<button type="submit" class="btn btn-success">Update</button>
+</div>
+</div>
+
+</form>
+
+<?php } } ?>
+</div>
+</div>
+</div>
+
+
+</div>  
+</div>  
+<!-- /Body page content -->
+
+
+<script>
+$(document).ready(function(){
+
+      var currentUserName = '<?php echo user()->name; ?>';
+      var currentUserId = '<?php echo user()->id; ?>';
+      $('#user_dropdown').append('<option   value="' + currentUserId + '">' + 
+        currentUserName + '</option>');
+      $('#user_dropdown').prop('disabled', true);
+
+$('#user_dropdown').on('change',function() {
+     
+});
+
+
+ $('input[type="radio"][name="created_by"]').change(function() {
+        var selectedValue = $(this).val();
+        var $userDropdown = $('#user_dropdown');
+
+        $userDropdown.empty();
+
+        if (selectedValue === 'self') {
+            
+            var currentUserName = '<?php echo user()->name; ?>';
+            var currentUserId = '<?php echo user()->id; ?>';
+            $userDropdown.append('<option value="' + currentUserId + '">' + currentUserName + '</option>');
+            $userDropdown.prop('disabled', true);
+        } else if (selectedValue === '<?php echo user()->name; ?>') {
+
+            $.ajax({
+                url: '<?php echo base_url('Expence/get_emp_name/')?>"', 
+                method: 'GET',
+                dataType: 'json',
+                success: function(response) {
+
+                     $('#user_dropdown').append(response);
+                    $('#user_dropdown').prop('disabled', false);
+                },
+                error: function(xhr, status, error) {
+                    console.error(error);
+                }
+            });
+        }
+    });
+     
+});
+
+
+    $('#myDatepicker').datetimepicker({
+        format: 'DD.MM.YYYY'
+    });
+
+</script>
+
+ <script>
+    
+//get manager id from the dropdown employee assign the value to  $("#manager_id") input field
+
+$("#user_dropdown").on("change", function(){
+   let manager_id = $(this).children(":selected").attr("id");
+
+   $("#manager_id").val(manager_id);
+    
+})
+
+ </script>
+
+ <script>  
+    function PreviewImage() {
+            var oFReader = new FileReader();
+            oFReader.readAsDataURL(document.getElementById("formFile").files[0]);
+
+            oFReader.onload = function (oFREvent) {
+                document.getElementById("uploadPreview").src = oFREvent.target.result;
+            };
+        };
+    </script>
\ No newline at end of file
diff --git a/application/modules/Expence/views/emp_expence_list.php b/application/modules/Expence/views/emp_expence_list.php
new file mode 100644
index 0000000..11cd107
--- /dev/null
+++ b/application/modules/Expence/views/emp_expence_list.php
@@ -0,0 +1,195 @@
+<head>
+<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css'> 
+
+<style>
+    /* Modal Popup Styles */
+    .modal {
+        display: none; /* Hide the modal by default */
+        position: fixed;
+        z-index: 1;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        overflow: auto;
+        background-color: rgba(0, 0, 0, 0.9);
+    }
+
+    .modal img {
+        display: block;
+        margin: 0 auto;
+        max-width: 80%;
+        max-height: 100%;
+        margin-top: 5%;
+        margin-bottom: 5%;
+    }
+
+    .close {
+        color: #fff;
+        font-size: 40px;
+        font-weight: bold;
+        position: absolute;
+        top: 10px;
+        right: 20px;
+        cursor: pointer;
+    }
+    div.dataTables_wrapper div.dataTables_filter{
+      margin-top: -44px !important; //search to up
+    }
+
+    .alert-success  {
+        background-color: #dff0d8;
+        color: #3c763d;
+        border-color: #d6e9c6;   
+    }
+
+    .flash-message {
+        padding: 10px;
+        margin-bottom: 10px;
+        border-radius: 5px;
+        margin-left: 690px;
+    }
+</style>
+
+</head>
+
+
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+  <div class="x_title">
+
+    <?php if ($this->session->userdata('update')): ?>
+    <div class="alert-success flash-message" id="customPrompt" style="text-align: right;">
+        <?php echo $this->session->userdata('update'); ?>
+         <span  onclick="$('#customPrompt').hide()" style="text-align: right;" ><i class="fa fa-times" aria-hidden="true"></i></span>
+    </div>
+    <?php endif; ?>
+    <?php $this->session->unset_userdata('update');?>
+
+    <?php if ($this->session->userdata('cancel')): ?>
+    <div class="alert alert-dark flash-message" id="customPrompt" style="text-align: right;">
+        <?php echo $this->session->userdata('cancel'); ?>
+         <span  onclick="$('#customPrompt').hide()" style="text-align: right;" ><i class="fa fa-times" aria-hidden="true"></i></span>
+    </div>
+    <?php endif; ?>
+    <?php $this->session->unset_userdata('cancel');?>
+
+
+    <ul class="nav navbar-right panel_toolbox">
+
+       <a href="<?php echo base_url();?>Expence/expence_form" class="btn btn-sm btn-primary" style="margin-top: 20px;">New Claim</a>
+
+       <?php if(is_user() || user()->role == null) { ?>
+       <a href="<?php echo base_url();?>Expence/manager_approvel_list" class="btn btn-sm btn-warning" style="margin-top: 20px;">My Approval</a>
+       <?php } ?>
+
+       <?php if(is_admin()) { ?>
+        <a href="<?php echo base_url();?>Expence/expence_list" class="btn btn-sm btn-warning" style="margin-top: 20px;">My Approval</a>
+       <?php }?>
+       
+    </ul>
+   <h1>Expense Claims</h1>
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+ <div class="row">
+  <div class="col-sm-12">
+    <table id="datatable-buttons"  class="table table-striped table-bordered"  width="100%">
+      <thead>
+        <tr class="headings">
+                <th class="column-title">Claim Date </th>
+                <th class="column-title">Desription</th>
+                <th class="column-title">Expense Date</th>
+				<th class="column-title">Expense Cost(₹)</th>
+                <th class="column-title">Status </th>
+                <th class="column-title">Action </th>
+        </tr>
+      </thead>
+      <tbody>
+
+        <?php foreach ($tableData as $key => $value) { ?>
+          <?php if(user()->id == $value->emp_id) { ?>
+				<tr class="even pointer">
+                    <td class=" "><?php echo dateFormat('d-m-Y',$value->created_at);?>
+                                  <?php echo timeFormat('h:i:s a',$value->created_at);?>
+                    </td>
+                    <td class=" "><?php echo $value->comments; ?></td>
+					          <td class=" "> <?php echo dateFormat('d-m-Y',$value->date_of_expence);?></td>
+                    <td class=" ">₹ <?php echo $value->amount; ?></td>
+                    <?php if($value->status == 'pending'){ ?>
+                      <td style="color:#e68a00"><?php echo $value->status; ?></td>
+                    <?php }
+                    else if($value->status == 'Approved'){ ?>
+                      <td style="color:green"><?php echo $value->status; ?> By <?php echo $value->approved_by; ?><br><?php echo $value->approved_at; ?></td>
+                    <?php }
+                    else if($value->status == 'Declined'){ ?>
+                       <td style="color:red"><?php echo $value->status; ?> <br> <?php echo $value->Dreason; ?></td>
+                    <?php }
+                    else if($value->status == 'canceled'){ ?>
+                       <td style="color:darkcyan;"><?php echo $value->status; ?></td>
+                    <?php }
+                    else{
+
+                    }?>
+             <td style=" text-align: center;  font-size: 16px;"> 
+                
+                 <?php if(!empty($value->bill)) { ?>
+
+                <a onclick="openModal('<?php echo base_url(); ?>assets/uploads/Expence_Bill/<?php echo $value->bill; ?>')" title="ViewBill"><i class="fa fa-eye" aria-hidden="true"></i></a><br>
+
+                <?php } ?>
+
+                 <?php if($value->status == 'pending') { ?>
+
+            <a href="<?php echo base_url('Expence/edit_expence')?>?id=<?php echo md5($value->id);?> "><i class="fa fa-edit" aria-hidden="true"title="Edit"></i></a> &nbsp;
+
+               <a href="<?php echo base_url('Expence/cancled_expence')?>?id=<?php echo md5($value->id);?> "><i class="fa fa-ban" aria-hidden="true"title="Cancel"></i></a> &nbsp;
+
+          <?php } ?>
+
+          </td>
+        </tr>
+			<?php } } ?>
+      </tbody>
+    </table>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+
+<br/>
+<div class="modal fade bs-example-modal-lg" id="ItemModal" tabindex="-1" role="dialog" aria-hidden="true"></div>
+<div class="modal bs-example-modal-sm" tabindex="-1" role="dialog" aria-hidden="true" id="popup"> </div>
+
+
+<div id="myModal" class="modal">
+    <span class="close">&times;</span>
+    <img id="modalImage" src="" alt="Image">
+</div>
+
+<!-- JavaScript -->
+<script>
+    function openModal(itemId) {
+        // Get the image URL for the item with the specified ID
+        var imageUrl = itemId;
+
+        // Set the image source of the modal
+        document.getElementById("modalImage").src = imageUrl;
+
+        // Open the modal
+        var modal = document.getElementById("myModal");
+        modal.style.display = "block";
+
+        // Close the modal when the user clicks on the close button
+        var closeButton = document.getElementsByClassName("close")[0];
+        closeButton.onclick = function() {
+            modal.style.display = "none";
+        }
+    }
+</script>
+
+
+
+
+
diff --git a/application/modules/Expence/views/expence_form.php b/application/modules/Expence/views/expence_form.php
new file mode 100644
index 0000000..67b1fee
--- /dev/null
+++ b/application/modules/Expence/views/expence_form.php
@@ -0,0 +1,227 @@
+<!-- bootstrap-daterangepicker -->
+    <script src="https://localhost/ams//assets/default/moment/min/moment.min.js"></script>
+    <script src="https://localhost/ams//assets/default/bootstrap-daterangepicker/daterangepicker.js"></script>
+    <!-- bootstrap-datetimepicker -->    
+    <script src="https://localhost/ams//assets/default/bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
+<!-- Body page content -->
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.4/jquery.min.js"></script>
+<link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+    <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+
+<style>
+    .alert-success  {
+    background-color: #dff0d8;
+    color: #3c763d;
+    border-color: #d6e9c6;   
+}
+
+.flash-message {
+    padding: 20px;
+    margin-bottom: 10px;
+    border-radius: 5px;
+    margin-left: 500px;
+}
+</style>
+
+<div class="clearfix"></div>
+<div class="row">
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+<div class="x_title">
+
+<?php if ($this->session->userdata('Create')): ?>
+    <div class="alert-success flash-message" id="customPrompt" style="text-align: right;">
+        <h2><?php echo $this->session->userdata('Create'); ?></h2>
+         <span  onclick="$('#customPrompt').hide()" style="text-align: right;" ><i class="fa fa-times" aria-hidden="true"></i></span>
+    </div>
+<?php endif; ?>
+<?php $this->session->unset_userdata('Create');?>
+
+<ul class="nav navbar-right panel_toolbox">
+   <a href="<?php echo base_url();?>Expence/emp_expence_list" class="btn  btn-primary" style="margin-top: 20px;">Back</a>
+</ul>
+
+<h1>Expense Claim</h1>
+
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+<br />
+<form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Expence/rise_expence_request" enctype="multipart/form-data">
+
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">    
+
+
+<div class="item form-group">
+ 
+
+</div>
+
+<div class="item form-group">
+    
+    <label class="control-label col-md-2 col-sm-2 " for="last-name">Expense Requisted For</label>
+    <div class="col-md-5 col-sm-5 ">
+        
+    <input type="radio" name="created_by" value="self(<?php echo user()->id;?>)"style="margin:10px;"checked /><b>Self</b>
+
+    <input type="radio" name="created_by" value="<?php echo user()->name;?> (<?php echo user()->id;?>)" style="margin: 10px;" /><b>Others</b>
+  
+    </div>
+</div>
+<div class="item form-group">
+     <label class="control-label col-md-2 col-sm-2  " for="last-name"> Employee Name <a style="color:red;">*</a></label>
+     <div class="col-md-5 col-sm-5 ">
+        <select id="user_dropdown" name="emp_id" style="margin-top: 10px;padding-bottom: 10px;" class="form-control manager" >  </select>
+     </div>
+</div>
+
+
+
+<div class="item form-group">
+
+<label class="control-label col-md-2 col-sm-2 " for="first-name"> Date of Expense<a style="color:red;">*</a></label>
+<div class="col-md-5 col-sm-5 ">
+  <div class="form-group">
+        <div class='input-group date'  >
+           <input type='text'  id='myDatepicker' class="form-control" placeholder="DD-MM-YYYY" required name="date_of_expence" value=""  />
+         </div>
+   </div>
+                            
+</div>
+</div>
+
+<div class="item form-group">
+
+<label class="control-label col-md-2 col-sm-2 " for="first-name"> Expense Cost <a style="color:red;">*</a></label>
+<div class="col-md-5 col-sm-5 ">
+<input id="cost" name="amount" required value="<?php if(isset($assetData)) { echo $assetData->cost; } ?>" class="form-control" type="text" name="middle-name">
+</div>
+</div>
+
+
+
+<div class="item form-group">
+<label class="control-label col-md-2 col-sm-2 " for="last-name">Description</label>
+    <div class="col-md-5 col-sm-5">
+    <textarea id="comments" name="comments" value=""  class="form-control"  style="height:200px !important;" type="text" ></textarea>
+       
+         <input type="hidden" id="manager_id" name="manager" value=""> 
+
+    </div>
+</div>
+
+
+<div class="item form-group">
+
+<label class="control-label col-md-2 col-sm-2 " required for="first-name">Upload Bill </label>
+<div class="col-md-5 col-sm-5 ">
+<input id="formFile" name="bill" onchange="PreviewImage()" class="typeFile" type="file">
+</div>
+</div>
+
+<div class="item form-group">
+
+<label class="control-label col-md-2 col-sm-2 " required for="first-name"></label>
+<div class="col-md-2 col-sm-2 ">
+ <img src="http://ssl.gstatic.com/accounts/ui/avatar_2x.png" width="100" height="100" id="uploadPreview" class="avatar img-circle img-thumbnail" style="height: 100px; width: 100px;" alt="avatar"/>
+</div>
+</div>
+
+
+<div class="ln_solid"></div>
+<div class="item form-group">
+<div class=" offset-md-8">
+<button class="btn btn-secondary" onclick="history.back()">Cancel</button>
+<button class="btn btn-primary" type="reset">Reset</button>
+<button type="submit" class="btn btn-success">Submit</button>
+</div>
+</div>
+
+</form>
+</div>
+</div>
+</div>
+
+
+</div>  
+</div> 
+</div>
+
+<!-- /Body page content -->
+
+
+<script>
+$(document).ready(function(){
+
+      var currentUserName = '<?php echo user()->name; ?>';
+      var currentUserId = '<?php echo user()->id; ?>';
+      $('#user_dropdown').append('<option   value="' + currentUserId + '">' + 
+        currentUserName + '</option>');
+      $('#user_dropdown').prop('disabled', true);
+
+$('#user_dropdown').on('change',function() {
+     
+});
+
+
+ $('input[type="radio"][name="created_by"]').change(function() {
+        var selectedValue = $(this).val();
+        var $userDropdown = $('#user_dropdown');
+
+        $userDropdown.empty();
+
+        if (selectedValue === 'self (<?php echo user()->id;?>)') {
+            
+            var currentUserName = '<?php echo user()->name; ?>';
+            var currentUserId = '<?php echo user()->id; ?>';
+            $userDropdown.append('<option value="' + currentUserId + '">' + currentUserName + '</option>');
+            $userDropdown.prop('disabled', true);
+        } else if (selectedValue === '<?php echo user()->name; ?> (<?php echo user()->id;?>)') {
+
+            $.ajax({
+                url: '<?php echo base_url('Expence/get_emp_name/')?>"', 
+                method: 'GET',
+                dataType: 'json',
+                success: function(response) {
+
+                     $('#user_dropdown').append(response);
+                    $('#user_dropdown').prop('disabled', false);
+                },
+                error: function(xhr, status, error) {
+                    console.error(error);
+                }
+            });
+        }
+    });
+     
+});
+
+</script>
+
+ <script>
+    
+//get manager id from the dropdown employee assign the value to  $("#manager_id") input field
+
+$("#user_dropdown").on("change", function(){
+   let manager_id = $(this).children(":selected").attr("id");
+
+   console.log(manager_id);
+
+   $("#manager_id").val(manager_id);
+    
+})
+
+ </script>
+ <script>
+        function PreviewImage() {
+        var oFReader = new FileReader();
+        oFReader.readAsDataURL(document.getElementById("formFile").files[0]);
+
+        oFReader.onload = function (oFREvent) {
+            document.getElementById("uploadPreview").src = oFREvent.target.result;
+        };
+    };
+</script>
+
+ 
\ No newline at end of file
diff --git a/application/modules/Expence/views/expence_list.php b/application/modules/Expence/views/expence_list.php
new file mode 100644
index 0000000..1546526
--- /dev/null
+++ b/application/modules/Expence/views/expence_list.php
@@ -0,0 +1,257 @@
+
+<head>
+<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css'> 
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.4/jquery.min.js"></script>
+
+<style>
+  .design {
+  display: none;
+  position: fixed;
+  z-index: 1;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  background-color: rgba(0, 0, 0, 0.4);
+}
+
+.design-form {
+  background-color: #fefefe;
+  margin: 15% auto;
+  padding: 20px;
+  border: 1px solid #888;
+  width: 380px;
+  height: 280px;
+  text-align: center;
+}
+
+button {
+  margin-top: 10px;
+}
+
+div.dataTables_wrapper div.dataTables_filter{
+      margin-top: -44px !important; //search to up
+
+</style>
+
+<style>
+    /* Modal Popup Styles */
+    .modal {
+        display: none; /* Hide the modal by default */
+        position: fixed;
+        z-index: 1;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        overflow: auto;
+        background-color: rgba(0, 0, 0, 0.9);
+    }
+
+    .modal img {
+        display: block;
+        margin: 0 auto;
+        max-width: 80%;
+        max-height: 100%;
+        margin-top: 5%;
+        margin-bottom: 5%;
+    }
+
+    .close {
+        color: #fff;
+        font-size: 40px;
+        font-weight: bold;
+        position: absolute;
+        top: 10px;
+        right: 20px;
+        cursor: pointer;
+    }
+
+    .modal-content {
+  background-color: #fefefe;
+  margin: 15% auto;
+  padding: 30px;
+  border: 1px solid #888;
+  width: 380px;
+  height: 280px;
+  text-align: center;
+}
+</style>
+
+
+</head>
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+  <div class="x_title">
+    <ul class="nav navbar-right panel_toolbox">
+       <a href="<?php echo base_url();?>Expence/emp_expence_list" class="btn btn-sm btn-primary" style="margin-top: 20px;">Back</a>
+    </ul>
+   <h1>My Approvals</h1>
+    
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+ <div class="row">
+  <div class="col-sm-12" style="overflow: auto;">
+    <table id="datatable-buttons"  class="table table-striped table-bordered"  width="100%">
+      <thead>
+        <tr class="headings">						                 
+				       <th class="column-title">Claim Date</th>
+                <th class="column-title">Employee Name</th>
+                <th class="column-title">Description </th>
+                <th class="column-title">Expense Date</th>
+                <th class="column-title">Expense Cost(₹)</th>
+                <th class="column-title">Claim Raised By</th>
+                <th class="column-title">Status </th>
+                <th class="column-title" >Action </th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php foreach ($tableData as $key => $value) { ?>
+				<tr class="even pointer">
+                   
+                    <td class=" "><?php echo $value->created_date; ?><br><?php echo $value->created_time;?></td> 
+                    <td class=" "><?php echo $value->name; ?> (<?php echo $value->emp_id; ?>) </td>
+                    <td class=" "><?php echo $value->comments; ?></td>
+					          <td class=" "><?php echo $value->date_of_expence; ?></td>
+                    <td class=" ">₹ <?php echo $value->amount; ?></td>
+                    <td class=" "><?php echo $value->created_by; ?></td>
+                    
+					          <?php if($value->status == 'pending'){ ?>
+                      <td style="color:#e68a00"><?php echo $value->status; ?></td>
+                    <?php }
+                    else if($value->status == 'Approved'){ ?>
+                      <td style="color:green"><?php echo $value->status; ?>By <?php echo $value->approved_by; ?><br><?php echo $value->approved_at;?></td>
+                    <?php }
+                    else if($value->status == 'Declined'){ ?>
+                      <td style="color:red"><?php echo $value->status; ?><br><?php echo $value->Dreason; ?></td>
+                    <?php }
+                    else if($value->status == 'canceled'){ ?>
+                       <td style="color:darkcyan;"><?php echo $value->status; ?></td>
+                    <?php }
+                    else{
+
+                    }?>
+                    <td style=" text-align: center;  font-size: 16px;">
+
+                       <?php if(!empty($value->bill)) { ?>
+
+                       <a onclick="openModal('<?php echo base_url(); ?>assets/uploads/Expence_Bill/<?php echo $value->bill; ?>')" title="ViewBill"><i class="fa fa-eye" aria-hidden="true"></i></a><br>
+
+                       <?php } ?>
+
+                       <?php if($value->status == 'pending') { ?>
+
+                        <a href="<?php echo base_url('Expence/Approve_Expence')?>?id=<?php echo $value->id;?> "><i class="fa fa-check" aria-hidden="true"title="Approve" onclick = "return confirm('Are you sure to Approve This Leave ')" ></i></a> &nbsp;
+
+          
+                        <a href="#"><i class="fa fa-times test" aria-hidden="true" title="Decline"  onclick="showCustomPrompt()"
+                        id= "<?php echo $value->id; ?>"></i></a>&nbsp;
+
+                      <?php } ?>
+          </td>
+        </tr>
+			<?php } ?>
+      </tbody>
+    </table>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+
+<div id="customPrompt" class="modal">
+  <div class="modal-content ">
+    <span  onclick="$('#customPrompt').hide()" style="text-align: right;"><i class="fa fa-times fa-2x" aria-hidden="true"></i></span>
+    <h3>Decline Reason</h3>
+    <input list="browsers" style="padding:20px; margin:6px;" id="decline_reason" required name="myBrowser" /> 
+<datalist id="browsers" >
+    <?php foreach ($dropdown as $key => $value) { ?>
+    <option value="<?php echo $value->enum_value; ?>"><?php echo $value->enum_value; ?></option>
+    <?php } ?>
+</datalist>
+
+<button onclick="submitCustomPrompt()" type="button" class="btn btn-primary">Submit</button>
+ 
+  </div>
+</div>
+
+<br/>
+
+<div class="modal fade bs-example-modal-lg" id="ItemModal" tabindex="-1" role="dialog" aria-hidden="true"></div>
+<div class="modal bs-example-modal-sm" tabindex="-1" role="dialog" aria-hidden="true" id="popup"> </div>
+
+
+<script>
+
+  function showCustomPrompt() {
+  var customPrompt = document.getElementById("customPrompt");
+  customPrompt.style.display = "block";
+}
+
+function submitCustomPrompt() {
+  
+  var id = $('.test').attr("id");
+  var reason = document.getElementById("decline_reason").value;
+
+  if( reason != "")
+
+   $.ajax(
+      {
+        data:{id : id , reason : reason },
+        url:"<?php echo base_url('Expence/Decline_expence');?>",
+        type:"get",
+        success: function(response) {
+           
+            window.location ='<?php echo base_url('Expence/expence_list');?>';
+      }
+
+
+      }); 
+    else 
+
+         alert('Decline Reason is required');
+}
+
+</script>
+</div>
+  
+<div id="myModal" class="modal">
+    <span class="close">&times;</span>
+    <img id="modalImage" src="" alt="Image">
+</div>
+
+<!-- JavaScript -->
+<script>
+    function openModal(itemId) {
+        // Get the image URL for the item with the specified ID
+        var imageUrl = itemId;
+
+        // Set the image source of the modal
+        document.getElementById("modalImage").src = imageUrl;
+
+        // Open the modal
+        var modal = document.getElementById("myModal");
+        modal.style.display = "block";
+
+        // Close the modal when the user clicks on the close button
+        var closeButton = document.getElementsByClassName("close")[0];
+        closeButton.onclick = function() {
+            modal.style.display = "none";
+        }
+    }
+</script>
+
+<script>
+  $(function() {
+    $(".hide-it").hide(5000);
+});
+</script>
+
+
+
+
diff --git a/application/modules/Expence/views/expence_manager_approvel.php b/application/modules/Expence/views/expence_manager_approvel.php
new file mode 100644
index 0000000..3012368
--- /dev/null
+++ b/application/modules/Expence/views/expence_manager_approvel.php
@@ -0,0 +1,251 @@
+
+<head>
+<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css'> 
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.4/jquery.min.js"></script>
+
+<style>
+  .design {
+  display: none;
+  position: fixed;
+  z-index: 1;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: auto; 
+  background-color: rgba(0, 0, 0, 0.4);
+}
+
+.design-form {
+  background-color: #fefefe;
+  margin: 15% auto;
+  padding: 20px;
+  border: 1px solid #888;
+  width: 380px;
+  height: 280px;
+  text-align: center;
+}
+
+button {
+  margin-top: 10px;
+}
+
+div.dataTables_wrapper div.dataTables_filter{
+      margin-top: -44px !important; //search to up
+
+</style>
+
+<style>
+    /* Modal Popup Styles */
+    .modal {
+        display: none; /* Hide the modal by default */
+        position: fixed;
+        z-index: 1;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        overflow: auto;
+        background-color: rgba(0, 0, 0, 0.9);
+    }
+
+    .modal img {
+        display: block;
+        margin: 0 auto;
+        max-width: 80%;
+        max-height: 100%;
+        margin-top: 5%;
+        margin-bottom: 5%;
+    }
+
+    .close {
+        color: #fff;
+        font-size: 40px;
+        font-weight: bold;
+        position: absolute;
+        top: 10px;
+        right: 20px;
+        cursor: pointer;
+    }
+
+    .modal-content {
+  background-color: #fefefe;
+  margin: 15% auto;
+  padding: 30px;
+  border: 1px solid #888;
+  width: 380px;
+  height: 280px;
+  text-align: center;
+}
+</style>
+
+</head>
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+  <div class="x_title">
+     <ul class="nav navbar-right panel_toolbox current-page">
+       <a href="<?php echo base_url();?>Expence/emp_expence_list" class="btn btn-primary current-page" style="margin-top: 20px;">Back</a>
+    </ul>
+   <h1>My Approvals</h1>
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+ <div class="row">
+  <div class="col-sm-12" style="overflow: auto;">
+    <table id="datatable-buttons"  class="table table-striped table-bordered"  width="100%">
+      <thead>
+        <tr class="headings">						                 
+				        <th class="column-title">Claim Date</th>
+                <th class="column-title">Employee Name</th>
+                <th class="column-title">Description </th>
+                <th class="column-title">Expense Date</th>
+                <th class="column-title">Expense Cost(₹)</th>
+                <th class="column-title">Claim Raised By</th>
+                <th class="column-title">Status </th>
+				        <th class="column-title" >Action </th>
+        </tr>
+      </thead>
+      <tbody>
+
+        <?php foreach ($tableData as $key => $value) { ?>
+
+          <?php foreach ($get_delegation as $key => $val) { ?>
+
+            
+
+        <?php if(user()->id == $value->manager || user()->id == $val->delegated_to && date('d-m-Y') >= $val->from_date && date('d-m-Y') <=  $val->to_date && $value->created_date >= $val->from_date && $value->created_date <= $val->to_date ){ ?> 
+
+				<tr class="even pointer">
+
+                    <td class=" "><?php echo $value->created_date; ?><br><?php echo $value->created_time;?></td> 
+                    <td class=" "><?php echo $value->name; ?> (<?php echo $value->emp_id; ?>)</td>
+                     <td class=" "><?php echo $value->comments; ?></td>
+					          <td class=" "><?php echo $value->date_of_expence; ?></td>
+                    <td class=" ">₹ <?php echo $value->amount; ?></td>
+                    <td class=" "><?php echo $value->created_by; ?></td>
+					          <?php if($value->status == 'pending'){ ?>
+                      <td style="color:#e68a00"><?php echo $value->status; ?></td>
+                    <?php }
+                    else if($value->status == 'Approved'){ ?>
+                      <td style="color:green"><?php echo $value->status; ?>By <?php echo $value->approved_by; ?><br><?php echo $value->approved_at;?></td>
+                    <?php }
+                    else if($value->status == 'Declined'){ ?>
+                      <td style="color:red"> <?php echo $value->status; ?><br><?php echo $value->Dreason; ?></td>
+                    <?php }
+                    else if($value->status == 'canceled'){ ?>
+                       <td style="color:darkcyan;"><?php echo $value->status; ?></td>
+                    <?php }
+                    else{
+
+                    }?>
+                    <td style=" text-align: center;  font-size: 16px;">
+                     
+                       <?php if(!empty($value->bill)) { ?>
+
+
+                      <a onclick="openModal('<?php echo base_url(); ?>assets/uploads/Expence_Bill/<?php echo $value->bill; ?>')" title="ViewBill"><i class="fa fa-eye" aria-hidden="true"></i></a><br>
+                    <?php } ?>
+
+                       <?php if($value->status == 'pending') { ?>
+
+                        <a href="<?php echo base_url('Expence/Manager_Approvel')?>?id=<?php echo $value->id;?> "><i class="fa fa-check" aria-hidden="true"title="Approve" onclick = "return confirm('Are you sure to Approve This Claim')"></i></a> &nbsp;
+
+          
+                        <a href="#"><i class="fa fa-times test" aria-hidden="true" title="Decline"  onclick="showCustomPrompt()"
+                        id= "<?php echo $value->id; ?>"></i></a>&nbsp;
+
+                      <?php } ?>
+
+
+          </td>
+        </tr>
+			<?php } } } ?>
+      </tbody>
+    </table>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+
+<div id="customPrompt" class="modal">
+  <div class="modal-content ">
+    <span  onclick="$('#customPrompt').hide()" style="text-align: right;"><i class="fa fa-times fa-2x" aria-hidden="true"></i></span>
+    <h3>Decline Reason</h3>
+    <input list="browsers" style="padding:20px; margin:6px;" id="decline_reason" required name="myBrowser" /> 
+<datalist id="browsers" >
+    <?php foreach ($dropdown as $key => $value) { ?>
+    <option value="<?php echo $value->enum_value; ?>"><?php echo $value->enum_value; ?></option>
+    <?php } ?>
+</datalist>
+
+<button onclick="submitCustomPrompt()" type="button" class="btn btn-primary">Submit</button>
+ 
+  </div>
+</div>
+
+<br/>
+
+<div class="modal fade bs-example-modal-lg" id="ItemModal" tabindex="-1" role="dialog" aria-hidden="true"></div>
+<div class="modal bs-example-modal-sm" tabindex="-1" role="dialog" aria-hidden="true" id="popup"> </div>
+
+
+<script>
+
+  function showCustomPrompt() {
+  var customPrompt = document.getElementById("customPrompt");
+  customPrompt.style.display = "block";
+}
+
+function submitCustomPrompt() {
+  
+  var id = $('.test').attr("id");
+  var reason = document.getElementById("decline_reason").value;
+
+  if( reason != "")
+
+   $.ajax(
+      {
+        data:{id : id , reason : reason },
+        url:"<?php echo base_url('Expence/Decline_expence');?>",
+        type:"get",
+        success: function(response) {
+           
+            window.location ='<?php echo base_url('Expence/expence_list');?>';
+      }
+
+
+      }); 
+    else 
+
+         alert('Decline Reason is required');
+}
+
+</script>
+</div>
+<div id="myModal" class="modal">
+    <span class="close">&times;</span>
+    <img id="modalImage" src="" alt="Image">
+</div>
+
+<!-- JavaScript -->
+<script>
+    function openModal(itemId) {
+
+        var imageUrl = itemId;
+        document.getElementById("modalImage").src = imageUrl;
+        var modal = document.getElementById("myModal");
+        modal.style.display = "block";
+        var closeButton = document.getElementsByClassName("close")[0];
+        closeButton.onclick = function() 
+        {
+            modal.style.display = "none";
+        }
+    }
+</script>
+
+
+
diff --git a/application/modules/Layout/controllers/Layout.php b/application/modules/Layout/controllers/Layout.php
index 20460f4..2e8a64a 100644
--- a/application/modules/Layout/controllers/Layout.php
+++ b/application/modules/Layout/controllers/Layout.php
@@ -71,7 +71,7 @@ public function render($view = 'layout')
         // print_r($this->view_data);die();
         // $this->output->enable_profiler(true);
 
-        $this->load->view('layout/'.$view, $this->view_data);
+        $this->load->view('Layout/'.$view, $this->view_data);
     }
 
     /**
diff --git a/application/modules/Layout/views/Employee_Layout.php b/application/modules/Layout/views/Employee_Layout.php
new file mode 100644
index 0000000..f50a2e8
--- /dev/null
+++ b/application/modules/Layout/views/Employee_Layout.php
@@ -0,0 +1,22 @@
+<!-- top navigation -->
+<?php $this->layout->load_view('Layout/includes/employee_header.php');?>
+<!-- /top navigation -->
+	  
+<!-- menu here -->    
+<?php $this->layout->load_view('Layout/includes/employee_menu.php');?>
+<!-- menu here -->  
+	  
+<!-- Body page content -->
+<div class="right_col" role="main">
+
+	  <?php echo $main_content; ?>	
+	  
+</div>
+<!-- /Body page content -->
+
+<!-- footer content -->
+<?php $this->layout->load_view('Layout/includes/employee_footer.php');?>
+<!-- /footer content -->
+
+
+
diff --git a/application/modules/Layout/views/default_layout.php b/application/modules/Layout/views/default_layout.php
index a82b68f..bd48947 100644
--- a/application/modules/Layout/views/default_layout.php
+++ b/application/modules/Layout/views/default_layout.php
@@ -1,9 +1,9 @@
 <!-- top navigation -->
-<?php $this->layout->load_view('layout/includes/default_header.php');?>
+<?php $this->layout->load_view('Layout/includes/default_header.php');?>
 <!-- /top navigation -->
 	  
 <!-- menu here -->    
-<?php $this->layout->load_view('layout/includes/default_menu.php');?>
+<?php $this->layout->load_view('Layout/includes/default_menu.php');?>
 <!-- menu here -->  
 	  
 <!-- Body page content -->
@@ -15,7 +15,7 @@
 <!-- /Body page content -->
 
 <!-- footer content -->
-<?php $this->layout->load_view('layout/includes/default_footer.php');?>
+<?php $this->layout->load_view('Layout/includes/default_footer.php');?>
 <!-- /footer content -->
 
 
diff --git a/application/modules/Layout/views/includes/default_header.php b/application/modules/Layout/views/includes/default_header.php
index 4fc9d7d..dd07d99 100644
--- a/application/modules/Layout/views/includes/default_header.php
+++ b/application/modules/Layout/views/includes/default_header.php
@@ -10,7 +10,7 @@
 	
 	
 <!---ajax call--->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"> </script>
+    <!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"> </script> -->
 
     <title>Ams</title>
 
@@ -82,9 +82,13 @@
           <div class="nav_menu">
               <div class="nav toggle">
                 <a id="menu_toggle"><i class="fa fa-bars"></i></a>
+               
               </div>
+             
               <nav class="nav navbar-nav">
               <ul class=" navbar-right">
+              <a onclick="history.back()"><span class="glyphicon glyphicon-circle-arrow-left" style="margin-left:-60px;font-size:23px" title="Back"></span></a>
+
                 <li class="nav-item dropdown open" style="padding-left: 15px;">
                   <a href="javascript:;" class="user-profile dropdown-toggle" aria-haspopup="true" id="navbarDropdown" data-toggle="dropdown" aria-expanded="false">
 				  <?php if(user()->profile_image == '' || user()->profile_image == null) { ?>
@@ -96,29 +100,24 @@
 					 <?php  if(check_auth() && is_admin() || is_user()){echo user()->name;}else{echo user()->name; }?>
                   </a>
                   <div class="dropdown-menu dropdown-usermenu pull-right" aria-labelledby="navbarDropdown">
-                    <a class="dropdown-item"  href="<?php echo base_url()?>user/profile/"> Profile</a>
-                    <a class="dropdown-item"  href="<?php echo base_url()?>user/changepassword/">Change Password</a>
+                    <a class="dropdown-item"  href="<?php echo base_url()?>User/profile/"> Profile</a>
+                    <a class="dropdown-item"  href="<?php echo base_url()?>User/changepassword/">Change Password</a>
                     <?php 
                     if (is_admin()) {
                       ?>
-                      <a class="dropdown-item"  href="<?php echo base_url()?>user/businessProfile/<?php echo md5(user()->business_id); ?>"> Business</a>
+                      <a class="dropdown-item"  href="<?php echo base_url()?>User/businessProfile/<?php echo md5(user()->business_id); ?>"> Business</a>
                       <?php
                     }
                     ?>
                     <?php if (is_admin() ||  is_user()) { ?>
-                    <a class="dropdown-item"  href="<?php echo base_url()?>asset/masterDataList/">Masters</a>
+                    <a class="dropdown-item"  href="<?php echo base_url()?>Asset/masterDataList/">Masters</a>
                   <?php } ?>
                      <a class="dropdown-item"  href="#">Settings</a>
                     <!-- <a class="dropdown-item"  href="javascript:;">Help</a> -->
-                    <a class="dropdown-item"  href="<?php echo base_url();?>auth/logout"><i class="fa fa-sign-out pull-right"></i> Log Out</a>
+                    <a class="dropdown-item"  href="<?php echo base_url();?>Auth/logout"><i class="fa fa-sign-out pull-right"></i> Log Out</a>
                   </div>
                 </li>
 
-                <li role="presentation" class="nav-item dropdown open">
-                  <a href="javascript:;" class="dropdown-toggle info-number" id="navbarDropdown1" data-toggle="dropdown" aria-expanded="false">
-                    <i class="fa fa-envelope-o"></i>
-                    <span class="badge bg-green">6</span>
-                  </a>
                   <ul class="dropdown-menu list-unstyled msg_list" role="menu" aria-labelledby="navbarDropdown1">
                     <li class="nav-item">
                       <a class="dropdown-item">
diff --git a/application/modules/Layout/views/includes/default_menu.php b/application/modules/Layout/views/includes/default_menu.php
index d1e5cfd..558848b 100644
--- a/application/modules/Layout/views/includes/default_menu.php
+++ b/application/modules/Layout/views/includes/default_menu.php
@@ -4,14 +4,15 @@
               <a  class="site_title">
 			 <?php  if(check_auth() && is_superadmin()) { ?>
 			  <img src="<?php echo base_url(); ?>/assets/uploads/logo/<?php echo $settings->logo;?>" class="img-circle logo">
-			 <?php  } else if(check_auth() && is_admin() || is_user()) { ?>
-			  <img src="<?php echo base_url(); ?>/assets/uploads/logo/<?php echo $business->logo;?>" class="img-circle logo">
-			 <?php  }  ?>
+
+			 <?php  } else if(check_auth() && is_admin() || !is_null(is_user())) { ?>
+        <img src="<?php echo base_url(); ?>/assets/uploads/logo/<?php echo $business->logo;?>" class="img-circle logo">
+       <?php }  ?>
 			  <span>
-			  <?php  if(check_auth() && is_admin() || is_user())
-			          {echo $business->business_name;}
-		              else if(check_auth() && is_superadmin())
-			          { echo $settings->site_name; }?>
+			  <?php  if(check_auth() && is_admin() || !is_null(is_user()))
+                {echo $business->business_name;}
+                  else if(check_auth() && is_superadmin())
+                { echo $settings->site_name; }?>
 			  </span></a>
             </div>
 
@@ -52,9 +53,9 @@
 				  <?php if(check_auth() && is_admin() || is_user() )  { ?>
                   <li><a><i class="fa fa-university"></i> Assets <span class="fa fa-chevron-down"></span></a>
                     <ul class="nav child_menu">
-                      <li><a href="<?php echo base_url();?>asset/assetList">Assets List</a></li>
+                      <li><a href="<?php echo base_url();?>Asset/assetLandingPage">Assets List</a></li>
                       <?php if(user()->action_permit != 'view' )  { ?>
-                      <li><a href="<?php echo base_url();?>asset/addAsset">Add Asset</a></li>
+                      <li><a href="<?php echo base_url();?>Asset/addAsset">Add Asset</a></li>
                       <?php } ?>
                     </ul>
                   </li>
@@ -62,8 +63,8 @@
                    <?php if(check_auth() && is_superadmin() )  { ?>
 			       <li><a><i class="fa fa-archive"></i> Business <span class="fa fa-chevron-down"></span></a>
                     <ul class="nav child_menu">
-                      <li><a href="<?php echo base_url();?>business/business_list">Business List</a></li>
-                      <li><a href="<?php echo base_url();?>business/add_business">Add Business</a></li>
+                      <li><a href="<?php echo base_url();?>Business/business_list">Business List</a></li>
+                      <li><a href="<?php echo base_url();?>Business/add_business">Add Business</a></li>
                     </ul>
                   </li>
 				  <?php } ?>
@@ -71,19 +72,43 @@
 				  <?php if(check_auth() && is_admin() || is_superadmin() || is_user() )  { ?>
                   <li><a><i class="fa fa-user"></i> Users <span class="fa fa-chevron-down"></span></a>
                     <ul class="nav child_menu">
-                      <li><a href="<?php echo base_url();?>user/userList">Users List</a></li>
+                      <li><a href="<?php echo base_url();?>User/userList">Users List</a></li>
                       <?php if(user()->action_permit != 'view' )  { ?>
-                      <li><a href="<?php echo base_url();?>user/addUser">Add Users</a></li>
+                      <li><a href="<?php echo base_url();?>User/addUser">Add Users</a></li>
                       <?php } ?>
                     </ul>
                   </li>
                   <?php } ?>
+
+                  <?php if(check_auth() && is_admin() || is_superadmin() || is_user() )  { ?>
+                  <li><a href="<?php echo base_url();?>Employee/empList"><i class="fa fa-group"></i> Employee</a></li>
+                  <?php } ?>
+
+                  <?php if(check_auth() && is_user() || user()->role == null )  { ?>
+
+                       <li><a href="<?php echo base_url();?>Leave/leavehistory"><i class="fa fa-calendar-times-o"></i>Leaves</a></li>
+
+                  <?php } ?>
+
+                   <?php if(check_auth() && is_user() || user()->role == null )  { ?>
+
+                      <li><a href="<?php echo base_url();?>Expence/emp_expence_list"><i class="fa fa-money"></i> Expense </a></li>
+
+                   <?php } ?>
+
+                   <?php if(check_auth() && is_user() || user()->role == null )  { ?>
+
+                      <li><a href="<?php echo base_url();?>Delegation/Delegation_list"><i class="fa fa-tasks" aria-hidden="true"></i> Delegation</a></li>
+                    
+                  <?php } ?>
+
+
 				  <?php if(check_auth() && is_admin() || is_user() )  { ?>
                   <li><a><i class="fa fa-clipboard"></i> Reports <span class="fa fa-chevron-down"></span></a>
                     <ul class="nav child_menu">
-                      <li><a href="<?php echo base_url();?>asset/depreciation_report">Depreciation Reports</a></li>
-                      <li><a href="<?php echo base_url();?>asset/amc_report">AMC Reports</a></li>
-					   <li><a href="<?php echo base_url();?>asset/insurance_report">Insurance Reports</a></li>
+                      <li><a href="<?php echo base_url();?>Asset/depreciation_report">Depreciation Reports</a></li>
+                      <li><a href="<?php echo base_url();?>Asset/amc_report">AMC Reports</a></li>
+					   <li><a href="<?php echo base_url();?>Asset/insurance_report">Insurance Reports</a></li>
                     </ul>
                   </li>
                   <?php } ?>
@@ -109,7 +134,7 @@
               <a data-toggle="tooltip" data-placement="top" title="Lock">
                 <span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span>
               </a>
-              <a data-toggle="tooltip" data-placement="top" title="Logout" href="login.html">
+              <a data-toggle="tooltip" data-placement="top" title="Logout" href="<?php echo base_url();?>Auth/logout">
                 <span class="glyphicon glyphicon-off" aria-hidden="true"></span>
               </a>
             </div>
diff --git a/application/modules/Layout/views/includes/employee_footer.php b/application/modules/Layout/views/includes/employee_footer.php
new file mode 100644
index 0000000..44cbcc6
--- /dev/null
+++ b/application/modules/Layout/views/includes/employee_footer.php
@@ -0,0 +1,93 @@
+ <!-- Footer code --> 
+ <footer >
+          <div class="pull-right">
+             <?php  if(check_auth() && is_admin() || is_user()){echo $business->business_name;}else{echo $settings->site_name;}?>
+          </div>
+          <div class="clearfix"></div>
+ </footer>
+<!-- Footer code --> 
+
+
+
+
+ </div>
+    </div>
+
+    <!-- jQuery -->
+    <script src="<?php echo base_url(); ?>/assets/default/jquery/dist/jquery.min.js"></script>
+    <!-- Bootstrap -->
+    <script src="<?php echo base_url(); ?>/assets/default/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
+    <!-- FastClick ------->
+    <script src="<?php echo base_url(); ?>/assets/default/fastclick/lib/fastclick.js"></script>
+    <!-- NProgress ------->
+    <script src="<?php echo base_url(); ?>/assets/default/nprogress/nprogress.js"></script>
+    <!-- Chart.js -------->
+   
+    <!-- gauge.js -->
+    <script src="<?php echo base_url(); ?>/assets/default/gauge.js/dist/gauge.min.js"></script>
+    <!-- bootstrap-progressbar -->
+    <script src="<?php echo base_url(); ?>/assets/default/bootstrap-progressbar/bootstrap-progressbar.min.js"></script>
+    <!-- iCheck -->
+    <script src="<?php echo base_url(); ?>/assets/default/iCheck/icheck.min.js"></script>
+    <!-- Skycons -->
+    <script src="<?php echo base_url(); ?>/assets/default/skycons/skycons.js"></script>
+    <!-- Flot -->
+    <script src="<?php echo base_url(); ?>/assets/default/Flot/jquery.flot.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/Flot/jquery.flot.pie.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/Flot/jquery.flot.time.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/Flot/jquery.flot.stack.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/Flot/jquery.flot.resize.js"></script>
+    <!-- Flot plugins -->
+    <script src="<?php echo base_url(); ?>/assets/default/flot.orderbars/js/jquery.flot.orderBars.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/flot-spline/js/jquery.flot.spline.min.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/flot.curvedlines/curvedLines.js"></script>
+    <!-- DateJS -->
+    <script src="<?php echo base_url(); ?>/assets/default/DateJS/build/date.js"></script>
+    <!-- Custom Theme Scripts -->
+    <script src="<?php echo base_url(); ?>/assets/default/build/js/custom.min.js"></script>
+	<!-- datatables -->
+	<script src="<?php echo base_url(); ?>/assets/default/datatables.net/js/jquery.dataTables.min.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/datatables.net-buttons/js/dataTables.buttons.min.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/datatables.net-buttons/js/buttons.flash.min.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/datatables.net-buttons/js/buttons.html5.min.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/datatables.net-buttons/js/buttons.print.min.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/datatables.net-fixedheader/js/dataTables.fixedHeader.min.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/datatables.net-keytable/js/dataTables.keyTable.min.js"></script>
+  
+    <script src="<?php echo base_url(); ?>/assets/default/datatables.net-scroller/js/dataTables.scroller.min.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/jszip/dist/jszip.min.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/pdfmake/build/pdfmake.min.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/pdfmake/build/vfs_fonts.js"></script>
+	
+
+	<!-- PNotify -->
+    <script src="<?php echo base_url(); ?>/assets/default/pnotify/dist/pnotify.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/pnotify/dist/pnotify.buttons.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/pnotify/dist/pnotify.nonblock.js"></script>
+	
+	
+	
+	
+	
+	
+	
+	
+    <!-- bootstrap-daterangepicker -->
+    <script src="<?php echo base_url(); ?>/assets/default/moment/min/moment.min.js"></script>
+    <script src="<?php echo base_url(); ?>/assets/default/bootstrap-daterangepicker/daterangepicker.js"></script>
+    <!-- bootstrap-datetimepicker -->    
+    <script src="<?php echo base_url(); ?>/assets/default/bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
+   
+
+      
+	 <script src="<?php echo base_url(); ?>/assets/default/customize/ajax.js"></script>
+	
+	
+	
+
+
+
+  </body>
+</html>
diff --git a/application/modules/Layout/views/includes/employee_header.php b/application/modules/Layout/views/includes/employee_header.php
new file mode 100644
index 0000000..0000d95
--- /dev/null
+++ b/application/modules/Layout/views/includes/employee_header.php
@@ -0,0 +1,126 @@
+ <!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <!-- Meta, title, CSS, favicons, etc. -->
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="icon" href="images/favicon.ico" type="image/ico" />
+	
+	
+<!---ajax call--->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"> </script>
+
+    <title>Ams</title>
+
+    <!-- Bootstrap -->
+    <link href="<?php echo base_url(); ?>/assets/default/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
+    <!-- Font Awesome -->
+    <link href="<?php echo base_url(); ?>/assets/default/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+    <!-- NProgress -->
+    <link href="<?php echo base_url(); ?>/assets/default/nprogress/nprogress.css" rel="stylesheet">
+    <!-- iCheck -->
+    <link href="<?php echo base_url(); ?>/assets/default/iCheck/skins/flat/green.css" rel="stylesheet">
+    <!-- bootstrap-progressbar -->
+    <link href="<?php echo base_url(); ?>/assets/default/bootstrap-progressbar/css/bootstrap-progressbar-3.3.4.min.css" rel="stylesheet">
+    <!-- Custom Theme Style -->
+    <link href="<?php echo base_url(); ?>/assets/default/build/css/custom.min.css" rel="stylesheet">
+	 <!-- Datatables -->
+    
+    <link href="<?php echo base_url(); ?>/assets/default/datatables.net-bs/css/dataTables.bootstrap.min.css" rel="stylesheet">
+    <link href="<?php echo base_url(); ?>/assets/default/datatables.net-buttons-bs/css/buttons.bootstrap.min.css" rel="stylesheet">
+    <link href="<?php echo base_url(); ?>/assets/default/datatables.net-fixedheader-bs/css/fixedHeader.bootstrap.min.css" rel="stylesheet">
+    <link href="<?php echo base_url(); ?>/assets/default/datatables.net-responsive-bs/css/responsive.bootstrap.min.css" rel="stylesheet">
+    <link href="<?php echo base_url(); ?>/assets/default/datatables.net-scroller-bs/css/scroller.bootstrap.min.css" rel="stylesheet">
+   
+   
+     <!-- bootstrap-daterangepicker -->
+    <link href="<?php echo base_url(); ?>/assets/default/bootstrap-daterangepicker/daterangepicker.css" rel="stylesheet">
+    <!-- bootstrap-datetimepicker -->
+    <link href="<?php echo base_url(); ?>/assets/default/bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css" rel="stylesheet">
+    <!-- style.css  -->
+    <link href="<?php echo base_url(); ?>/assets/default/customize/style.css" rel="stylesheet">
+   
+    <!-- PNotify -->
+    <link href="<?php echo base_url(); ?>/assets/default/pnotify/dist/pnotify.css" rel="stylesheet">
+    <link href="<?php echo base_url(); ?>/assets/default/pnotify/dist/pnotify.buttons.css" rel="stylesheet">
+    <link href="<?php echo base_url(); ?>/assets/default/pnotify/dist/pnotify.nonblock.css" rel="stylesheet">
+   
+<script>
+  
+
+</script>
+<style>
+.typeFile
+{
+    border: 1px solid #ccc;
+    display: inline-block;
+    padding: 6px 12px;
+    cursor: pointer;
+	width:100%;
+}
+.logo
+{
+	width:28px;
+	height:28px;
+}
+</style>
+  </head>
+
+
+  <body class="nav-md">
+  
+    <div class="container body">
+      <div class="main_container">
+	  
+	  
+	  
+	  
+<!-- Header code -->  
+ <div class="top_nav">
+          <div class="nav_menu">
+              <div class="nav toggle">
+                <a id="menu_toggle"><i class="fa fa-bars"></i></a>
+               
+              </div>
+             
+              <nav class="nav navbar-nav">
+              <ul class=" navbar-right">
+              <a onclick="history.back()"><span class="glyphicon glyphicon-circle-arrow-left" style="margin-left:-60px;font-size:23px" title="Back"></span></a>
+
+                <li class="nav-item dropdown open" style="padding-left: 15px;">
+                  <a href="javascript:;" class="user-profile dropdown-toggle" aria-haspopup="true" id="navbarDropdown" data-toggle="dropdown" aria-expanded="false">
+				  <?php if(user()->profile_image == '' || user()->profile_image == null) { ?>
+				   <img src="<?php echo base_url(); ?>/assets/uploads/profile_picture/profile.jpg" alt="">
+         
+		          <?php } else { ?>
+		           <img src="<?php echo base_url(); ?>/assets/uploads/profile_picture/<?php echo user()->profile_image; ?>" alt="">
+				   <?php }  ?>
+					 <?php  if(check_auth() && is_admin() || is_user()){echo user()->name;}else{echo user()->name; }?>
+                  </a>
+                  <div class="dropdown-menu dropdown-usermenu pull-right" aria-labelledby="navbarDropdown">
+                    <a class="dropdown-item"  href="<?php echo base_url()?>User/profile/"> Profile</a>
+                    <a class="dropdown-item"  href="<?php echo base_url()?>User/changepassword/">Change Password</a>
+                    <?php 
+                    if (is_admin()) {
+                      ?>
+                      <a class="dropdown-item"  href="<?php echo base_url()?>User/businessProfile/<?php echo md5(user()->business_id); ?>"> Business</a>
+                      <?php
+                    }
+                    ?>
+                    <?php if (is_admin() ||  is_user()) { ?>
+                    <a class="dropdown-item"  href="<?php echo base_url()?>Asset/masterDataList/">Masters</a>
+                  <?php } ?>
+                    <a class="dropdown-item"  href="<?php echo base_url();?>Auth/logout"><i class="fa fa-sign-out pull-right"></i> Log Out</a>
+                  </div>
+                </li>
+                  <ul class="dropdown-menu list-unstyled msg_list" role="menu" aria-labelledby="navbarDropdown1">
+    
+                  </ul>
+                </li>
+              </ul>
+            </nav>
+          </div>
+        </div>
+<!-- Header code --> 
\ No newline at end of file
diff --git a/application/modules/Layout/views/includes/employee_menu.php b/application/modules/Layout/views/includes/employee_menu.php
new file mode 100644
index 0000000..de6407b
--- /dev/null
+++ b/application/modules/Layout/views/includes/employee_menu.php
@@ -0,0 +1,172 @@
+        <div class="col-md-3 left_col menu_fixed">   
+		 <div class="left_col scroll-view">
+            <div class="navbar nav_title" style="border: 0;">
+              <a  class="site_title">
+			 <?php  if(check_auth() && is_superadmin()) { ?>
+			  <img src="<?php echo base_url(); ?>/assets/uploads/logo/<?php echo $settings->logo;?>" class="img-circle logo">
+			 <?php  } else if(check_auth() && is_admin() || !is_null(is_user())) { ?>
+			  <img src="<?php echo base_url(); ?>/assets/uploads/logo/<?php echo $business->logo;?>" class="img-circle logo">
+			 <?php }  ?>
+			  <span>
+			  <?php  if(check_auth() && is_admin() || !is_null(is_user()))
+			          {echo $business->business_name;}
+		              else if(check_auth() && is_superadmin())
+			          { echo $settings->site_name; }?>
+			  </span></a>
+            </div>
+
+            <div class="clearfix"></div>
+
+            <!-- menu profile quick info -->
+            <div class="profile clearfix">
+              <div class="profile_pic">
+  <?php if(user()->profile_image == '' || user()->profile_image == null) { ?>
+   <img src="<?php echo base_url(); ?>/assets/uploads/profile_picture/profile.jpg" alt="..." class="img-circle profile_img">
+   <?php } else { ?>
+  <img src="<?php echo base_url(); ?>/assets/uploads/profile_picture/<?php echo user()->profile_image; ?>" 
+ alt="..." class="img-circle profile_img">
+		  
+				   <?php }  ?>
+ 
+              </div>
+              <div class="profile_info">
+                <span>Welcome,</span>
+                <h2> <?php  if(check_auth() && is_admin() || is_user()){echo user()->name;}else{echo user()->name; }?></h2>
+              </div>
+            </div>
+            <!-- /menu profile quick info -->
+
+            <br />
+
+            <!-- sidebar menu -->
+            <div id="sidebar-menu" class="main_menu_side hidden-print main_menu">
+              <div class="menu_section">
+                <h3>General</h3>
+                <ul class="nav side-menu">
+                  <li><a href="<?php echo base_url();?>Auth/"><i class="fa fa-home"></i> Home </a>
+                  </li>
+				 
+
+                  <?php if(check_auth() && is_admin() || is_superadmin() || is_user() )  { ?>
+                      <li><a href="<?php echo base_url();?>Employee/empList"><i class="fa fa-group"></i>Employee List</a></li>
+                  <?php } ?>
+
+                      <?php if(check_auth() && is_user() || user()->role == null )  { ?>
+
+                         <li><a><i class="fa fa-calendar-times-o"></i> Leaves <span class="fa fa-chevron-down"></span></a>
+                          <ul class="nav child_menu">
+
+                            <li><a href="<?php echo base_url();?>Leave/leavehistory">My Leaves</a></li>
+                           
+                            <li><a href="<?php echo base_url();?>Leave/applyLeave">Apply Leave</a></li>
+
+                            <li><a href="<?php echo base_url();?>Leave/manager_approvel">My Approvals</a></li>
+                           
+                          </ul>
+                        </li>
+
+                      <?php } ?>
+
+                  <?php if(check_auth() && is_admin() || is_superadmin() )  { ?>
+                  
+                        <li><a><i class="fa fa-calendar-times-o"></i> Leaves <span class="fa fa-chevron-down"></span></a>
+                          <ul class="nav child_menu">
+
+                            <li><a href="<?php echo base_url();?>Leave/leavehistory">My Leaves</a></li>
+                           
+                            <li><a href="<?php echo base_url();?>Leave/applyLeave">Apply Leave</a></li>
+
+                            <li><a href="<?php echo base_url();?>Leave/manager_approvel">My Approvals</a></li>
+                           
+                          </ul>
+                        </li>
+
+                  <?php } ?>
+                   
+                 <?php if(check_auth() && is_user() || user()->role == null )  { ?>
+
+                        <li><a><i class="fa fa-money"></i> Expense <span class="fa fa-chevron-down"></span></a>
+                          <ul class="nav child_menu">
+
+                            <li><a href="<?php echo base_url();?>Expence/emp_expence_list">My Claims</a></li>
+                           
+                            <li><a href="<?php echo base_url();?>Expence/expence_form">New Claim</a></li>
+
+                            <li><a href="<?php echo base_url();?>Expence/manager_approvel_list">My Approvals</a></li>
+                           
+                          </ul>
+                        </li>
+                    
+                  <?php } ?>
+
+                <?php if(check_auth() && is_admin() || is_superadmin() )  { ?>
+
+                     <li><a><i class="fa fa-money"></i> Expense <span class="fa fa-chevron-down"></span></a>
+                          <ul class="nav child_menu">
+
+                            <li><a href="<?php echo base_url();?>Expence/emp_expence_list">My Claims</a></li>
+                           
+                            <li><a href="<?php echo base_url();?>Expence/expence_form">New Claim</a></li>
+
+                            <li><a href="<?php echo base_url();?>Expence/manager_approvel_list">My Approvals</a></li>
+                           
+                          </ul>
+                        </li>
+                  
+                  <?php } ?>
+
+                  <?php if(check_auth() && is_user() || user()->role == null )  { ?>
+
+                      <li><a><i class="fa fa-tasks"></i> Delegation <span class="fa fa-chevron-down"></span></a>
+                          <ul class="nav child_menu">
+
+                            <li><a href="<?php echo base_url();?>Delegation/Delegation_list">Delegation List</a></li>
+                           
+                            <li><a href="<?php echo base_url();?>Delegation/Delegation/Delegation_form">Assign Delegation</a></li>
+                           
+                          </ul>
+                        </li>
+                    
+                  <?php } ?>
+
+                <?php if(check_auth() && is_admin() || is_superadmin() )  { ?>
+
+                       <li><a><i class="fa fa-tasks"></i> Delegation <span class="fa fa-chevron-down"></span></a>
+                          <ul class="nav child_menu">
+
+                            <li><a href="<?php echo base_url();?>Delegation/Delegation_list">My Claims</a></li>
+                           
+                            <li><a href="<?php echo base_url();?>Delegation/Delegation/Delegation_form">Assign Delegation</a></li>
+                           
+                          </ul>
+                        </li>
+                  
+                  <?php } ?>
+
+                </ul>
+              </div>
+
+              </div>
+
+            </div>
+            <!-- /sidebar menu -->
+
+            <!-- /menu footer buttons -->
+            <div class="sidebar-footer hidden-small">
+              <a data-toggle="tooltip" data-placement="top" title="Settings">
+                <span class="glyphicon glyphicon-cog" aria-hidden="true"></span>
+              </a>
+              <a data-toggle="tooltip" data-placement="top" title="FullScreen">
+                <span class="glyphicon glyphicon-fullscreen" aria-hidden="true"></span>
+              </a>
+              <a data-toggle="tooltip" data-placement="top" title="Lock">
+                <span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span>
+              </a>
+              <a data-toggle="tooltip" data-placement="top" title="Logout" href="<?php echo base_url();?>Auth/logout">
+                <span class="glyphicon glyphicon-off" aria-hidden="true"></span>
+              </a>
+            </div>
+            <!-- /menu footer buttons -->
+          </div>
+		 
+ 
\ No newline at end of file
diff --git a/application/modules/Leave/.gitkeep b/application/modules/Leave/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/application/modules/Leave/controllers/Leave.php b/application/modules/Leave/controllers/Leave.php
new file mode 100644
index 0000000..c74aca1
--- /dev/null
+++ b/application/modules/Leave/controllers/Leave.php
@@ -0,0 +1,386 @@
+<?php defined('BASEPATH') or exit('No direct script access allowed');
+
+use chillerlan\QRCode\Data\QRMatrix;
+use chillerlan\QRCode\QRCode;
+use chillerlan\QRCode\QROptions;
+
+date_default_timezone_set('Asia/Kolkata');
+
+/**
+ * AMS
+ *
+ * @package    HMVC
+ * @author     Venba
+ * @copyright  2022 Venba
+ * @license    https://venbainfotech.com/licenses/MIT  MIT License
+ * @link       <URI> (description)
+ * @version    GIT: $Id$
+ * @since      Version 0.0.1
+ * @filesource
+ *
+ */
+
+class Leave extends Admin_Controller
+{
+    /**
+     * [__construct description]
+     *
+     * @method __construct
+     */
+    public function __construct()
+    {
+        // To inherit directly the attributes of the parent class.
+        parent::__construct();
+		### Syntax : $this->load->model('Model Path' , 'Alias name');
+        ### The second parameter (optional) is used to call the method.
+        $this->load->model('MY_Model','MY_Model');
+		$this->load->model('Leave_model','Leave_model');
+        $this->load->model('Employee/Employee_model','Emp_model');
+        $this->load->model('Audit/Audit_model','audit_model');
+		$this->load->helper(array('form', 'url'));
+
+    }
+	
+	public function index()
+    {
+		
+        $this->layout->set('users', "gowtham");
+        $this->layout->buffer('main_content', 'Asset/index');
+        $this->layout->render('Employee_Layout');
+	 
+    }
+
+    public function leaveList()
+    {
+    
+    $business_id = user()->business_id;
+    $leave_list = $this->Leave_model->get_leave_with_emp_name(user()->business_id);
+    $decline_dropdown = $this->Leave_model->decline_dropdown($business_id);
+	$this->layout->set('tableData', $leave_list);
+    $this->layout->set('dropdown', $decline_dropdown);
+    $this->layout->buffer('main_content', 'Leave/leave_list');
+    $this->layout->render('Employee_Layout');
+    }
+
+    public function applyLeave()
+    {
+        $emp_leave_count = $this->Leave_model->get("emp_leave_days");
+        $emp = $this->Emp_model->get_employee(user()->business_id);
+        $business_id = user()->business_id;
+        $leavetype = $this->Leave_model->getLeaveType($business_id);
+        $this->layout->set('emp', $emp);
+        $this->layout->set('count', $emp_leave_count);
+        $this->layout->set('leavetype', $leavetype);
+        $this->layout->buffer('main_content', 'Leave/apply_leave');
+        $this->layout->render('Employee_Layout');
+    
+    }
+
+    public function get_emp_name()
+    {
+        $emp = $this->Leave_model->get_employee(user()->business_id);   
+        $html = '<option>--select Employee--</option>'; 
+          foreach($emp as $val) 
+           {
+            if($val->user_id != user()->id)
+              {
+              $html .='<option id="'.$val->manager.'" value="'.$val->user_id.'">'.$val->name.'</option>';
+              }
+          }  
+        echo json_encode($html);
+    }
+
+    public function createLeave()
+    {   
+       if($this->input->post('type') === 'Permission')
+       { 
+          $perm_data = $this->input->post();
+          if(isset($perm_data['emp_id'])){ 
+            $emp_id =$this->input->post('emp_id');
+        }else{
+            $emp_id = user()->id;
+        }
+        $perm_data['emp_id'] =  $emp_id;
+         if($data['manager']){
+             $manager = $this->input->post('manager'); 
+        }else{
+            $manager = employee()->manager;
+        }
+        $perm_data['manager'] =  $manager;
+        $perm_data['business_id'] = user()->business_id;
+        $perm_data['status'] = 'pending';
+        $perm_data['created_date']  = date('d-m-Y');
+        $perm_data['created_time']  = date('H:i A');
+        $table="leave_list";
+        $create_permission = $this->MY_Model->insert($perm_data,$table);
+        $this->session->set_flashdata('Success', 'Submitted for Approval');
+        redirect('Leave/LeaveHistory');
+        }
+        
+        $data = $this->input->post();
+        if(isset($data['emp_id'])){ 
+            $emp_id =$this->input->post('emp_id');
+        }else{
+            $emp_id = user()->id;
+        }
+        $data['emp_id'] =  $emp_id;
+         if($data['manager']){
+             $manager = $this->input->post('manager'); 
+        }else{
+            $manager = employee()->manager;
+        }
+        $data['manager'] =  $manager;
+        $data['business_id'] = user()->business_id;
+        $data['status'] = 'pending';
+        $data['created_date']  = date('d-m-Y');
+        $data['created_time']  = date('H:i A');
+        $emp_leave_count = $this->Leave_model->get_leave( $emp_id , user()->business_id , "emp_leave_days");
+        
+        // count number of days between two dates
+        $days_between = ceil(abs(dateFormat('d-m-Y',$this->input->post('to_date')) - dateFormat('d-m-Y',$this->input->post('from_date'))) / 86400);
+        $data['no_of_days'] = $days_between + 1; 
+        $noofdays = $days_between + 1; 
+        if (count($emp_leave_count) != 0) 
+        {
+            $data['leave_bal'] = $emp_leave_count[0]->remaining_days;
+            $days['remaining_days'] = $emp_leave_count[0]->remaining_days;
+            $this->Leave_model->update($days , $emp_id , 'emp_leave_days');
+        }
+        else
+        {
+            $all_leave_count = $this->Leave_model->get_by_type( $this->input->post('type') , user()->business_id , "leave_master");
+            $data['leave_bal'] = $all_leave_count[0]->days;
+            $days['remaining_days'] = $all_leave_count[0]->days;
+      
+            $days['business_id'] =  user()->business_id;
+            $days['emp_id'] =  $emp_id;
+            $days['total_days'] =  $all_leave_count[0]->days;
+            $days['type'] =  $all_leave_count[0]->id;
+            $this->MY_Model->insert($days,'emp_leave_days');
+        }
+
+        $table="leave_list";
+        $create_leave = $this->MY_Model->insert($data,$table);
+       
+        //audit
+        if($create_leave)
+        {
+        //set id $ table name for audit history
+        $this->audit->set('id',$create_leave);
+        $this->audit->set('table',$table);
+        //fetch new_data after post data insert
+        $this->audit->fetch('new_data');
+        //audit history generation  for insert   
+        $test = $this->audit->create_history('insert');
+        }
+        $this->session->set_flashdata('Success', 'Submitted for Approval');
+        redirect('Leave/LeaveHistory');
+    }
+
+
+
+
+
+    public function edit_leave_function()
+    {   
+        $id = $this->input->get('id');
+        $emp_leave_count = $this->Leave_model->get("emp_leave_days");
+        $emp = $this->Emp_model->get_employee(user()->business_id);
+        $business_id = user()->business_id;
+        $leavetype = $this->Leave_model->getLeaveType($business_id);
+        $editleave = $this->Leave_model->editleave($id);
+        $this->layout->set('emp', $emp);
+        $this->layout->set('editleave', $editleave);
+        $this->layout->set('count', $emp_leave_count);
+        $this->layout->set('leavetype', $leavetype);
+        $this->layout->buffer('main_content', 'Leave/edit_leave');
+        $this->layout->render('Employee_Layout');
+    }
+
+    public function editleave()
+    {    
+         if($this->input->post('type') === 'Permission')
+       { 
+          $action = $this->input->post();
+          unset($action['from_date']);
+          unset($action['to_date']);
+          $id = $this->input->post('id');
+
+          if(isset($action['emp_id'])){ 
+            $emp_id =$this->input->post('emp_id');
+        }else{
+            $emp_id = user()->id;
+        }
+        $action['emp_id'] =  $emp_id;
+         if($action['manager']){
+             $manager = $this->input->post('manager'); 
+        }else{
+            $manager = employee()->manager;
+        }
+        $action['manager'] =  $manager;
+        $action['business_id'] = user()->business_id;
+        $action['status'] = 'pending';
+        $action['created_date']  = date('d-m-Y');
+        $action['created_time']  = date('H:i A');
+        $table="leave_list";
+        $create_permission = $this->MY_Model->edit_option($action, $id, $table);
+        $this->session->set_flashdata('Success', 'Submitted for Approval');
+        redirect('Leave/LeaveHistory');
+        }
+        
+
+
+         $action = $this->input->post();
+         $id = $this->input->post('id');
+        if(isset($action['emp_id'])){ 
+            $emp_id =$this->input->post('emp_id');
+        }else{
+            $emp_id = user()->id;
+        }
+        $action['emp_id'] =  $emp_id;
+        $action['business_id'] = user()->business_id;
+        $action['status'] = 'pending';
+        $emp_leave_count = $this->Leave_model->get_leave( $emp_id , user()->business_id , "emp_leave_days");
+        
+        // count number of days between two dates
+        $days_between = ceil(abs(strtotime($this->input->post('to_date')) - strtotime($this->input->post('from_date'))) / 86400);
+        $action['no_of_days'] = $days_between + 1; 
+        $noofdays = $days_between + 1; 
+       
+        if (count($emp_leave_count) != 0) 
+        {
+            $action['leave_bal'] = $emp_leave_count[0]->remaining_days;
+            $days['remaining_days'] = $emp_leave_count[0]->remaining_days;
+            $this->Leave_model->update($days , $emp_id , 'emp_leave_days');
+        }
+        else
+        {
+            $all_leave_count = $this->Leave_model->get_by_type( $this->input->post('type') , user()->business_id , "leave_master");
+            $action['leave_bal'] = $all_leave_count[0]->days;
+            $days['remaining_days'] = $all_leave_count[0]->days;
+      
+            $days['business_id'] =  user()->business_id;
+            $days['emp_id'] =  $emp_id;
+            $days['total_days'] =  $all_leave_count[0]->days;
+            $days['type'] =  $all_leave_count[0]->id;
+            $this->MY_Model->update($days,'emp_leave_days');
+        }
+
+        $table="leave_list";
+        $update_leave = $this->MY_Model->edit_option($action,$id,$table);
+        $this->session->set_flashdata('Success', 'Leave Updated Successfully');
+         redirect('Leave/LeaveHistory');
+       }
+
+    public function get_leave_count($id)
+    {
+        $str = $id;
+        $res = preg_split('~[_]+~', $str, 0, PREG_SPLIT_NO_EMPTY);
+        
+
+        $emp_leave_count = $this->Leave_model->get_leave_based_on_tpye($res[0] , $res[1] , user()->business_id , "emp_leave_days");
+        echo json_encode($emp_leave_count);
+    
+    }
+
+    public function get_all_leave_count($id)
+    {
+       
+        $all_leave_count = $this->Leave_model->get_id( $id , user()->business_id , "leave_master");
+        echo json_encode($all_leave_count);
+    
+    }
+
+      public function ApproveLeave()
+    {
+       $id=$this->input->get('id');
+       $emp_id = $this->Leave_model->get_emp_id($id);
+       $no_of_days = $this->Leave_model->get_Leave_nodays($emp_id);
+       $remaining_days = $this->Leave_model->remaining_days($emp_id, user()->business_id);
+       $balance_days = $remaining_days[0]->remaining_days - $no_of_days->no_of_days;
+
+      
+            $data['leave_bal'] = $balance_days;
+            $days['remaining_days'] = $balance_days;
+            $this->Leave_model->emp_leave_days_update($emp_id, $days);
+            
+
+       $data['status'] = 'Approved';
+       $data['approved_by']= user()->name;
+       $data['approved_at'] = date('d-m-Y H:i:s');
+       $this->Leave_model->LeaveApprove($id, $data); 
+       redirect('Leave/leaveList');
+    }
+
+      public function ManagerLeaveApprove()
+    {
+       $id=$this->input->get('id');
+       $emp_id = $this->Leave_model->get_emp_id($id);
+       $no_of_days = $this->Leave_model->get_Leave_nodays($emp_id);
+       $remaining_days = $this->Leave_model->remaining_days($emp_id, user()->business_id);
+       $balance_days = $remaining_days[0]->remaining_days - $no_of_days->no_of_days;
+
+      
+            $data['leave_bal'] = $balance_days;
+            $days['remaining_days'] = $balance_days;
+            $this->Leave_model->emp_leave_days_update($emp_id, $days);
+            
+
+       $data['status'] = 'Approved';
+       $data['approved_by']= user()->name;
+       $data['approved_at'] = date('d-m-Y H:i:s');
+       $this->Leave_model->LeaveApprove($id, $data);    
+       redirect('Leave/manager_approvel'); 
+    }
+
+    public function Decline()
+    {   
+      $id=$this->input->get('id');
+      $data['status'] = 'Declined';
+      $data['declined_by']= user()->name;
+      $data['declined_at'] = date('d-m-Y H:i:s');
+      $data['DReason'] = $this->input->get('reason');
+      $this->Leave_model->LeaveDecline($id, $data);
+      return true;
+    }
+
+    public function cancled()
+    {   
+      $id=$this->input->get('id');
+      $data['status'] = 'canceled';
+      $data['cancled_at'] = date('d-m-Y H:i:s');
+      $this->Leave_model->Leavecancle($id, $data);
+      $this->session->set_flashdata('Success', 'Leave canceled Successfully');
+      redirect('Leave/LeaveHistory');
+    }
+
+    public function LeaveHistory()
+    {
+        $leave_list = $this->Leave_model->get_leave_with_emp_name(user()->business_id);
+        $this->layout->set('tableData', $leave_list);
+        $this->layout->buffer('main_content', 'Leave/leavehistory');
+        $this->layout->render('Employee_Layout');
+    }
+
+
+    public function manager_approvel()
+    { 
+        $business_id = user()->business_id;
+        $user_id = user()->id;
+        $manager = $this->Leave_model->under_emp_manager($user_id, $business_id);
+        $get_delegation = $this->Leave_model->Get_delegation_id($business_id);
+        $decline_dropdown = $this->Leave_model->decline_dropdown($business_id);
+        $leave_list = $this->Leave_model->get_with_emp_name(user()->business_id);
+        $this->layout->set('tableData', $leave_list);
+        $this->layout->set('dropdown', $decline_dropdown);
+        $this->layout->set('get_delegation', $get_delegation);
+        $this->layout->set('manager', $manager);
+        $this->layout->buffer('main_content', 'Leave/manager_approvel');
+        $this->layout->render('Employee_Layout');
+    }
+
+   
+
+
+
+}
diff --git a/application/modules/Leave/models/.gitkeep b/application/modules/Leave/models/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/application/modules/Leave/models/Leave_model.php b/application/modules/Leave/models/Leave_model.php
new file mode 100644
index 0000000..bbe1352
--- /dev/null
+++ b/application/modules/Leave/models/Leave_model.php
@@ -0,0 +1,264 @@
+<?php
+class Leave_model extends MY_Model {
+
+    public function get_leave_with_emp_name($business_id)
+    {
+        $this->db->select('A.* , name', 'users.name');
+        $this->db->from('leave_list A');
+        $this->db->join('users', 'users.id = A.emp_id', 'left');
+        $this->db->where('A.business_id', $business_id);
+        $this->db->order_by('id','DESC');
+        $this->db->where('A.is_active', 1);
+        $query = $this->db->get();
+        $query = $query->result();  
+        return $query;
+    }
+
+     public function get_with_emp_name($business_id, )
+    {
+        $this->db->select('A.* , name', 'users.name');
+        $this->db->from('leave_list A');
+        $this->db->join('users', 'users.id = A.emp_id', 'left');
+        $this->db->where('A.business_id', $business_id);
+        $this->db->order_by('id','DESC');
+        $this->db->where('A.is_active', 1);
+        $query = $this->db->get();
+        $query = $query->result();  
+        return $query;
+    }
+
+    public function get($table)
+    {
+        $this->db->select('*');
+        $this->db->from($table);
+        $this->db->order_by('id','DESC');
+		$this->db->where('is_active', 1);
+        $query = $this->db->get();
+        $query = $query->result();  
+        return $query;
+    }
+
+    public function remaining_days($emp_id, $business_id)
+    {
+        $this->db->select('remaining_days');
+        $this->db->from('emp_leave_days');
+        $this->db->where('emp_id', $emp_id);
+        $this->db->where('business_id', $business_id);
+        $this->db->where('is_active', 1);
+        $query = $this->db->get();
+        $query = $query->result();  
+        return $query;
+    }
+
+    function get_id($id,$business_id,$table)
+    {
+        $this->db->select();
+        $this->db->from($table);
+        $this->db->where('id', $id);
+        $this->db->where('business_id', $business_id);
+        $this->db->where('is_active', 1);
+        $query = $this->db->get();
+        $query = $query->result();  
+        return $query;
+    } 
+
+    function get_by_type($type,$business_id,$table)
+    {
+        $this->db->select();
+        $this->db->from($table);
+        $this->db->where('type', $type);
+        $this->db->where('business_id', $business_id);
+        $this->db->where('is_active', 1);
+        $query = $this->db->get();
+        $query = $query->result();  
+        return $query;
+    } 
+
+    public function get_employee($business_id)
+    {
+        
+        $this->db->select('users.name, employees.user_id, employees.manager');
+        $this->db->from('users');
+        $this->db->join('employees', 'employees.user_id = users.id');
+        $this->db->where('users.business_id', $business_id);
+        $this->db->where('users.is_active', 1);
+        $this->db->where('employees.is_active', 1);
+        $query = $this->db->get();
+
+        if ($query->num_rows() > 0) {
+            return $query->result();
+        } else {
+            return;
+        }
+    }
+
+    public function get_leave($id , $business_id , $table)
+    {
+        $this->db->select('*');
+        $this->db->from($table);
+        $this->db->where('business_id', $business_id);
+        $this->db->where('emp_id', $id);
+        $this->db->order_by('id','DESC');
+		$this->db->where('is_active', 1);
+        $query = $this->db->get();
+        $query = $query->result();  
+        return $query;
+    }
+
+    public function get_leave_based_on_tpye($id , $type , $business_id , $table)
+    {
+        $this->db->select('*');
+        $this->db->from($table);
+        $this->db->where('business_id', $business_id);
+        $this->db->where('emp_id', $id);
+        $this->db->where('type', $type);
+        $this->db->order_by('id','DESC');
+		$this->db->where('is_active', 1);
+        $query = $this->db->get();
+        $query = $query->result();  
+        return $query;
+    }
+
+    public function get_leave_by_md5_id($id,$business_id,$table)
+    {
+        $this->db->select('*');
+        $this->db->from($table);
+        $this->db->where('business_id', $business_id);
+        $this->db->where('md5(id)', $id);
+        $this->db->where('is_active', 1);
+        $query = $this->db->get();
+        $query = $query->row();  
+        return $query;
+    } 
+
+    function update($action,$id,$table){
+        $this->db->where('emp_id',$id);
+        $this->db->update($table,$action);
+        return;
+    } 
+
+     public function LeaveApprove($id, $data)
+     {
+
+        $this->db->where('id',$id);
+        $this->db->update('leave_list', $data);
+        return;
+
+     }
+
+     public function LeaveDecline($id, $data)
+     {
+        $this->db->where('id',$id);
+        $this->db->where('status', 'pending');
+        $this->db->update('leave_list', $data);
+        return;
+     }
+
+      public function Leavecancle($id, $data)
+     {
+        $this->db->where('md5(id)',$id);
+        $this->db->where('status', 'pending');
+        $this->db->update('leave_list', $data);
+        return;
+     }
+
+
+
+      public function getLeaveType($business_id)
+    {
+
+        $this->db->select('*');
+        $this->db->from('leave_master');
+        $this->db->where('business_id', $business_id);
+        $this->db->where('is_active', 1);
+        return $this->db->get()->result();
+        
+    }
+
+
+     public function get_Leave_nodays($id)
+     {
+        $this->db->select('*');
+        $this->db->from('leave_list');
+        $this->db->where('emp_id',$id);
+        $this->db->where('is_active', 1);
+        $query = $this->db->get();
+        $query = $query->row();  
+        return $query; 
+     }
+
+     public function emp_leave_days_update($id, $days)
+     {
+        $this->db->where('emp_id',$id);
+        $this->db->update('emp_leave_days', $days);
+     }
+     
+     public function get_emp_id($id)
+     {
+        $this->db->select('emp_id');
+        $this->db->where('id', $id); // Assuming $leaveListId is the ID to match
+        $query = $this->db->get('leave_list');
+
+        if ($query->num_rows() > 0) {
+            $row = $query->row();
+            $empId = $row->emp_id;
+            return $empId;
+           
+        }
+        
+     }
+
+
+     public function under_emp_manager($user_id, $business_id)
+     {
+            $this->db->select('manager');
+            $this->db->from('employees');
+            $this->db->where('business_id', $business_id);
+            $query = $this->db->get();
+            return $query->result();
+     }
+
+
+     public function editleave($id)
+     {
+            $this->db->select('*');
+            $this->db->from('leave_list');
+            $this->db->where('md5(id)', $id);
+            $query = $this->db->get();
+           if ($query->num_rows() > 0) {
+            return $query->result();
+        } else {
+            return;
+        }
+     }
+
+     public function decline_dropdown($business_id)
+
+     {
+        
+            $this->db->select('*');
+            $this->db->from('enum');
+            $this->db->where('enum_type', 'decline');
+            $this->db->where('business_id', $business_id);
+            $query = $this->db->get();
+           if ($query->num_rows() > 0) {
+            return $query->result();
+        } else {
+            return;
+        }
+
+     }
+
+     public function Get_delegation_id($business_id)
+     {
+        $this->db->select('*');
+        $this->db->from('delegation');
+        $this->db->where('business_id', $business_id);
+        //$this->db->where('delegated_to', $emp_id);
+        $this->db->where('is_active', 1);
+        $query = $this->db->get();
+        return $query->result();  
+     }
+
+
+}
\ No newline at end of file
diff --git a/application/modules/Leave/views/.gitkeep b/application/modules/Leave/views/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/application/modules/Leave/views/apply_leave.php b/application/modules/Leave/views/apply_leave.php
new file mode 100644
index 0000000..db033f8
--- /dev/null
+++ b/application/modules/Leave/views/apply_leave.php
@@ -0,0 +1,565 @@
+
+<!-- Body page content -->
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.4/jquery.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.3/moment.min.js"></script>
+
+<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.3/moment.min.js"></script>
+<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+<script src="https://code.jquery.com/ui/1.13.0/jquery-ui.min.js"></script>
+
+ <!-- bootstrap-daterangepicker -->
+    <link href="https://localhost/ams//assets/default/bootstrap-daterangepicker/daterangepicker.css" rel="stylesheet">
+    <!-- bootstrap-datetimepicker -->
+    <link href="https://localhost/ams//assets/default/bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css" rel="stylesheet">
+    <!-- style.css  -->
+    <link href="https://localhost/ams//assets/default/customize/style.css" rel="stylesheet">
+
+     <!-- bootstrap-daterangepicker -->
+    <script src="https://localhost/ams//assets/default/moment/min/moment.min.js"></script>
+    <script src="https://localhost/ams//assets/default/bootstrap-daterangepicker/daterangepicker.js"></script>
+    <!-- bootstrap-datetimepicker -->    
+    <script src="https://localhost/ams//assets/default/bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
+
+    <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+    <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+
+
+
+<style>
+
+    input[type=date] {
+       position: relative;
+       /* width: 150px; height: 20px;
+        color: white;*/
+    }
+
+    input[type=date]:before {
+        position: absolute;
+        top: 3px; left: 3px;
+        content: attr(data-date);
+        display: inline-block;
+        color: black;
+    }
+
+    input[type=date]::-webkit-datetime-edit, input::-webkit-inner-spin-button, input::-webkit-clear-button {
+        display: none;s
+    }
+
+    input[type=date]::-webkit-calendar-picker-indicator {
+        position: absolute;
+        top: 3px;
+        right: 0;
+        color: black;
+        opacity: 1;
+    }
+
+    .alert-success  {
+    background-color: #dff0d8;
+    color: #3c763d;
+    border-color: #d6e9c6;   
+}
+
+.flash-message {
+    padding: 10px;
+    margin-bottom: 10px;
+    border-radius: 5px;
+    margin-left: 690px;
+}
+
+.custom-select {
+  display: inline-block;
+  position: relative;
+  font-family: Arial, sans-serif;
+  font-size: 14px;
+  color: #333;
+  padding: 6px 12px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  background-color: #fff;
+  appearance: none;
+  -webkit-appearance: none;
+}
+
+.custom-select::after {
+  content: '\25BC';
+  position: absolute;
+  top: 50%;
+  right: 10px;
+  transform: translateY(-50%);
+  pointer-events: none;
+}
+
+.custom-select:hover {
+  border-color: #999;
+}
+
+.custom-select:focus {
+  border-color: #aaa;
+  outline: none;
+  box-shadow: 0 0 5px rgba(0, 0, 0, 0.1);
+}
+
+.custom-select option {
+  padding: 10px;
+  background-color: #fff;
+}
+
+
+</style>
+
+
+
+<div class="clearfix"></div>
+<div class="row">
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+<div class="x_title">
+
+<ul class="nav navbar-right panel_toolbox">
+   <a href="<?php echo base_url();?>Leave/LeaveHistory" class="btn  btn-primary" style="margin-top: 20px;">Back</a>
+</ul>
+
+<h1>Apply Leave</h1>
+
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+<br />
+<form id="myForm" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Leave/createLeave" enctype="multipart/form-data">
+
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">
+
+             
+<div class="item form-group">
+    
+    <label class="control-label col-md-2 col-sm-2 " for="last-name">Leave Applied For</label>
+    <div class="col-md-5 col-sm-5 ">
+        
+    <input type="radio" name="risedby" value="self(<?php echo user()->id;?>)"style="margin:10px;"checked /><b>Self</b>
+
+    <input type="radio" name="risedby" value="<?php echo user()->name;?>(<?php echo user()->id;?>)" style="margin: 10px;" /><b>Others</b>
+  
+    </div>
+</div>
+<div class="item form-group">
+     <label class="control-label col-md-2 col-sm-2  " for="last-name"> Employee Name </label>
+     <div class="col-md-5 col-sm-5 ">
+        <select id="user_dropdown" name="emp_id" style="margin-top: 10px;padding-bottom: 10px;" class="form-control manager" >  </select>
+     </div>
+</div>    
+
+<div class="item form-group">
+
+    <label class="control-label col-md-2 col-sm-2 " for="last-name">Leave Type<a style="color:red;">*</a> </label>
+    <div class="col-md-5 col-sm-5 ">
+    <select id="type" name="type" required class="form-control" onclick="permission()"  >
+    <option value="">--Select--</option>
+    <?php foreach ($leavetype as $key => $value) { ?>
+    <option id="<?php echo $value->id; ?>" value="<?php echo $value->type; ?>"><?php echo $value->type; ?></option>
+    <?php } ?>
+    </select>
+    </div>
+
+    <label class="control-label col-md-1 col-sm-1 " for="first-name" id="balance" > Balance</label>
+    <div class="col-md-1 col-sm-1 ">
+    <input type="text" id="leave_bal" name="" value="" style="width:90px;" class="form-control " readonly>
+    </div>
+
+</div>
+<!-- <div class="item form-group" id="hidedate" >
+
+    <label class="control-label col-md-2 col-sm-2 " for="first-name"> From Date<a style="color:red;">*</a> </label>
+    <div class="col-md-2 col-sm-2 ">
+    <input id="from_date" name="from_date" value="" required class="form-control"  type="date" data-date="" data-date-format="DD-MM-YYYY"  >
+    </div> 
+    
+    <label class="control-label col-md-1 col-sm-1" for="last-name">To Date<a style="color:red;">*</a> </label>
+    <div class="col-md-2 col-sm-2 ">
+    <input id="to_date" name="to_date" required class="form-control" type="date" date-date=""  data-date-format="DD-MM-YYYY" value="" date-date="">
+    </div>
+    
+    <label class="control-label col-md-1 col-sm-1 " for="last-name"></label>
+    <div class="col-md-2 col-sm-2 ">
+    <input id="dateDifference" value="" readonly class="form-control" style="width:90px;" type="text" >
+    </div>
+
+</div> -->
+
+<div class="item form-group" id="hidedate" >
+
+<label class="control-label col-md-2 col-sm-2 " for="first-name"> From Date<a style="color:red;">*</a> </label>
+   <div class="col-md-2 col-sm-2 ">
+    <div class='input-group date'>
+     <input type='text' class="form-control"  placeholder="DD-MM-YYYY" id="fromdate" name="from_date" value="" required />
+      </div>
+ </div>
+
+
+<label class="control-label col-md-1 col-sm-1" for="last-name">To Date<a style="color:red;">*</a> </label>
+<div class="col-md-2 col-sm-2 ">
+    <div class='input-group date' >
+    <input type='text' class="form-control" placeholder="DD-MM-YYYY" id="todate" name= "to_date" value="" required />
+    </div>
+</div>
+
+
+  <label class="control-label col-md-1 col-sm-1 " for="last-name"></label>
+    <div class="col-md-2 col-sm-2 ">
+    <input id="dateDifference" value="" readonly class="form-control" style="width:90px;" type="text" >
+    </div>
+
+</div>
+
+<div class="item form-group" id="showdate"  >
+
+
+        <label class="control-label col-md-2 col-sm-2 " for="first-name">Date<a style="color:red;">*</a> </label>
+        <div class="col-md-5 col-sm-5 ">
+        <div class='input-group date'>
+           <input type='text' class="form-control" required name="perm_date" placeholder="DD-MM-YYYY" value="" id='myDatepicker'/></div>        
+       </div>
+       </div>    
+
+<div class="item form-group" id="showtime"  >
+
+    <label class="control-label col-md-2 col-sm-2 " for="first-name"> From<a style="color:red;">*</a> </label>
+    <div class="col-md-2 col-sm-2 ">
+    <select class="custom-select" id="from_time" name=from_time required >
+        <option>select time</option>
+    </select>
+    </div>
+    
+    <label class="control-label col-md-1 col-sm-1 " for="last-name">To<a style="color:red;">*</a> </label>
+    <div class="col-md-2 col-sm-2 ">
+    <select id="to_time" class="custom-select" name="to_time" required>
+        <option>select time</option>
+    </select>
+    </div>
+
+</div>
+
+<div class="item form-group">
+
+    <label class="control-label col-md-2 col-sm-2 " for="last-name">Note</label>
+    <div class="col-md-5 col-sm-5">
+    <textarea id="comments" name="comments" value=""  class="form-control"  style="height:100px !important;" type="text" ></textarea>
+       
+         <input type="hidden" id="manager_id" name="manager" value=""> 
+
+    </div>
+
+
+
+</div>
+
+<div class="ln_solid"></div>
+<div class="item form-group">
+<div class=" offset-md-8">
+<button class="btn btn-secondary" onclick="history.back()">Cancel</button>
+<button class="btn btn-primary" type="reset">Reset</button>
+<button type="submit" id="submit" class="btn btn-success">Submit</button>
+</div>
+</div>
+
+</form>
+</div>
+</div>
+</div>
+
+
+</div>	
+</div>	
+<!-- /Body page content -->
+
+
+
+
+<script>
+$(document).ready(function(){
+
+
+
+      var currentUserName = '<?php echo user()->name; ?>';
+      var currentUserId = '<?php echo user()->id; ?>';
+      $('#user_dropdown').append('<option   value="' + currentUserId + '">' + 
+        currentUserName + '</option>');
+      $('#user_dropdown').prop('disabled', true);
+
+$('#user_dropdown').on('change',function() {
+   
+     $('#type').prop('selectedIndex',0);
+     
+});
+
+$('#type').on('change',function() {
+let id = $("#user_dropdown").val();
+
+  var type_id =  $('option:selected', this).attr('id');
+
+  if (id)
+  {
+    $.ajax({ 
+      type: "get",
+      url: "<?php echo base_url()?>Leave/get_leave_count/"+id+'_'+type_id,
+      success: function(response) {
+        response = JSON.parse(response);
+        if(response.length == 0)
+        {   
+            
+            get_all_count(type_id);
+        }
+        else
+        {
+            if(response[0].remaining_days == 1 )
+            {
+            $('#leave_bal').val(response[0].remaining_days + ' day');
+            }
+            else
+             {
+               $('#leave_bal').val(response[0].remaining_days + ' days');
+             }   
+        }
+      },
+      error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) }
+    });
+  }
+  else
+  {
+    $('#leave_bal').val("");
+  }
+});
+
+ $('input[type="radio"][name="risedby"]').change(function() {
+        var selectedValue = $(this).val();
+        var $userDropdown = $('#user_dropdown');
+
+        $userDropdown.empty();
+
+        if (selectedValue === 'self(<?php echo user()->id;?>)') {
+            
+            var currentUserName = '<?php echo user()->name; ?>';
+            var currentUserId = '<?php echo user()->id; ?>';
+            $userDropdown.append('<option value="' + currentUserId + '">' + currentUserName + '</option>');
+            $userDropdown.prop('disabled', true);
+        } else if (selectedValue === '<?php echo user()->name; ?>(<?php echo user()->id;?>)') {
+    
+
+            $.ajax({
+                url: '<?php echo base_url('Leave/get_emp_name/')?>"', 
+                method: 'GET',
+                dataType: 'json',
+                success: function(response) {
+
+                     $('#user_dropdown').append(response);
+                    $('#user_dropdown').prop('disabled', false);
+                },
+            });
+        }
+    });
+     
+});
+
+function get_all_count(id) {
+ 
+    $.ajax({ 
+      type: "get",
+      url: "<?php echo base_url()?>Leave/get_all_leave_count/"+id,
+      success: function(response) {
+        response = JSON.parse(response);
+        console.log(response);
+        $('#leave_bal').val( response[0].days);
+      },
+      error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) }
+    });
+}
+
+
+    $('#myDatepicker').datetimepicker({
+        format: 'DD.MM.YYYY'
+    });
+
+</script>
+
+
+<script>
+$('#showtime').hide()
+$('#showdate').hide()
+    function permission() {
+       
+      console.log($('#showtime').val())
+
+      var type =  $('#type').val();
+    
+    if( type === 'Permission' ){
+
+       $('#hidedate').hide()
+       $('#balance').hide()
+       $('#leave_bal').hide()
+       $('#fromdate').removeAttr('required');
+       $('#todate').removeAttr('required');
+       $('#showtime').show();
+       $('#showdate').show();
+    }
+    else{
+
+       $('#from_time').removeAttr('required');
+       $('#to_time').removeAttr('required');
+       $('#myDatepicker').removeAttr('required');
+       $('#hidedate').show();
+       $('#showtime').hide();
+       $('#showdate').hide();
+       $('#balance').show()
+       $('#leave_bal').show()
+
+    }   
+}
+</script>
+
+
+ <script>
+    
+//get manager id from the dropdown employee assign the value to  $("#manager_id") input field
+
+$("#user_dropdown").on("change", function(){
+   let manager_id = $(this).children(":selected").attr("id");
+
+   $("#manager_id").val(manager_id);
+    
+})
+</script>
+
+  <script>
+    $(document).ready(function() {
+  var selectField = $('#from_time');
+
+  var options = [  '12:00 AM',  '12:30 AM',  '1:00 AM',  '1:30 AM',  '2:00 AM',  '2:30 AM',  '3:00 AM',  '3:30 AM',  '4:00 AM',  '4:30 AM',  '5:00 AM',  '5:30 AM',  '6:00 AM',  '6:30 AM',  '7:00 AM',  '7:30 AM',  '8:00 AM',  '8:30 AM',  '9:00 AM',  '9:30 AM',  '10:00 AM',  '10:30 AM',  '11:00 AM',  '11:30 AM',  '12:00 Noon',  '12:30 PM',  '1:00 PM',  '1:30 PM',  '2:00 PM',  '2:30 PM',  '3:00 PM',  '3:30 PM',  '4:00 PM',  '4:30 PM',  '5:00 PM',  '5:30 PM',  '6:00 PM',  '6:30 PM',  '7:00 PM',  '7:30 PM',  '8:00 PM',  '8:30 PM',  '9:00 PM',  '9:30 PM',  '10:00 PM',  '10:30 PM',  '11:00 PM',  '11:30 PM'];
+
+
+  for (var i = 0; i < options.length; i++) {
+    selectField.append('<option value="' + options[i] + '">' + options[i] + '</option>');
+  }
+});
+
+var selectField = $('#from_time');
+selectField.on('click', function() {
+
+    var selectedValue = $(this).val();
+    console.log(selectedValue);
+
+    var timeSlots = [  '12:00 AM',  '12:30 AM',  '1:00 AM',  '1:30 AM',  '2:00 AM',  '2:30 AM',  '3:00 AM',  '3:30 AM',  '4:00 AM',  '4:30 AM',  '5:00 AM',  '5:30 AM',  '6:00 AM',  '6:30 AM',  '7:00 AM',  '7:30 AM',  '8:00 AM',  '8:30 AM',  '9:00 AM',  '9:30 AM',  '10:00 AM',  '10:30 AM',  '11:00 AM',  '11:30 AM',  '12:00 Noon',  '12:30 PM',  '1:00 PM',  '1:30 PM',  '2:00 PM',  '2:30 PM',  '3:00 PM',  '3:30 PM',  '4:00 PM',  '4:30 PM',  '5:00 PM',  '5:30 PM',  '6:00 PM',  '6:30 PM',  '7:00 PM',  '7:30 PM',  '8:00 PM',  '8:30 PM',  '9:00 PM',  '9:30 PM',  '10:00 PM',  '10:30 PM',  '11:00 PM',  '11:30 PM'];
+
+
+    function filterTimeSlots(startingTime, numberOfHours) {
+  // Find the index of the starting time in the array
+        console.log(startingTime,numberOfHours);
+  const startIndex = timeSlots.findIndex(time => time === startingTime);
+console.log(startIndex);
+  if (startIndex !== -1) {
+  
+    const endIndex = startIndex + (numberOfHours * 2) - 1;
+
+    return timeSlots.slice(startIndex, endIndex + 2);
+  }
+  return [];
+}
+
+// Usage example
+const startingTime = selectedValue;
+const numberOfHours = 4 ;
+const filteredTimeSlots = filterTimeSlots(startingTime, numberOfHours);
+
+filteredTimeSlots.shift();
+var totime = $('#to_time');
+totime.empty();
+for (var i = 0; i < filteredTimeSlots.length; i++) {
+    totime.append('<option value="' + filteredTimeSlots[i] + '">' + filteredTimeSlots[i] + '</option>');
+
+  }
+
+console.log(filteredTimeSlots);
+
+  });
+  </script>
+
+  <script>
+            // Initialize datepickers
+            var dateFormat = "dd-mm-yy";
+            var fromDateInput = $("#fromdate");
+            console.log(fromDateInput);
+            var toDateInput = $("#todate");
+            console.log(toDateInput);
+
+            fromDateInput.datepicker({
+                dateFormat: dateFormat,
+                onSelect: function (dateText, inst) {
+                    toDateInput.datepicker("option", "minDate", dateText);
+                    validateDateRange();
+                    calculateDateDifference();
+                }
+            });
+
+            toDateInput.datepicker({
+                dateFormat: dateFormat,
+                onSelect: function (dateText, inst) {
+                    validateDateRange();
+                    calculateDateDifference();
+                }
+            });
+
+
+            // Function to validate the date range
+            function validateDateRange() {
+                var fromDate = fromDateInput.datepicker("getDate");
+                var toDate = toDateInput.datepicker("getDate");
+
+                // Check if both dates are selected
+                if (!fromDate || !toDate) {
+                    $("#error-msg").text("Please select both From Date and To Date");
+                    return false;
+                }
+
+                // Compare the dates
+                if (fromDate > toDate) {
+                    $("#error-msg").text("From Date cannot be after To Date");
+                    return false;
+                }
+
+                // Clear the error message if the date range is valid
+                $("#error-msg").text("");
+                return true;
+            }
+
+            function calculateDateDifference() {
+                var fromDate = fromDateInput.datepicker("getDate");
+                var toDate = toDateInput.datepicker("getDate");
+
+                if (fromDate && toDate) {
+                    var difference = Math.ceil((toDate - fromDate) / (1000 * 60 * 60 * 24) + 1);
+                    if(difference === 1)s
+                    {
+                    $("#dateDifference").val(difference + ' day');
+                    }
+                    else
+                    {
+                    $("#dateDifference").val(difference + ' days');
+                    }
+                    
+                } else {
+                    $("#dateDifference").val("");
+                }
+            }
+    
+</script>
+
+
+
+  
+
+
+ 
+
+
+
diff --git a/application/modules/Leave/views/assign_leave.php b/application/modules/Leave/views/assign_leave.php
new file mode 100644
index 0000000..aea4e4c
--- /dev/null
+++ b/application/modules/Leave/views/assign_leave.php
@@ -0,0 +1,160 @@
+
+<!-- Body page content -->
+
+
+
+<div class="">
+<div class="page-title">
+
+<div class="title_left">
+<h3>Assign Leave</h3>
+</div>
+
+
+</div>
+<div class="clearfix"></div>
+<div class="row">
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+<div class="x_title">
+
+<!-- <h6>General Information</h6> -->
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+<br />
+<form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Leave/createLeave" enctype="multipart/form-data">
+
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">	
+
+
+<div class="item form-group">
+
+    <label class="control-label col-md-1 col-sm-1 " for="last-name">Employee Name<a style="color:red;">*</a> </label>
+    <div class="col-md-5 col-sm-5 ">
+    <select id="emp_id" name="emp_id" required="required" class="form-control" >
+    <option value="">--Select--</option>
+    <?php foreach ($emp as $key => $value) { ?>
+    <option value="<?php echo $value->id; ?>"><?php echo $value->name; ?></option>
+    <?php } ?>
+    </select>
+    </div>
+
+</div>
+
+<div class="item form-group">
+    
+    <label class="control-label col-md-1 col-sm-1 " for="last-name">Leave Type<a style="color:red;">*</a> </label>
+    <div class="col-md-5 col-sm-5 ">
+    <select id="type" name="type" required="required" class="form-control" >
+    <option value="">--Select--</option>
+    <?php foreach ($leavetype as $key => $value) { ?>
+    <option id="<?php echo $value->id; ?>" value="<?php echo $value->type; ?>"><?php echo $value->type; ?></option>
+    <?php } ?>
+    </select>
+    </div>
+
+    <label class="control-label col-md-1 col-sm-1 " for="first-name"> Leave Balance</label>
+    <div class="col-md-2 col-sm-2 ">
+    <input type="text" id="leave_bal" name="" value="" class="form-control " readonly>
+    </div>
+
+</div>
+
+<div class="item form-group">
+
+    <label class="control-label col-md-1 col-sm-1 " for="first-name"> From Date<a style="color:red;">*</a> </label>
+    <div class="col-md-2 col-sm-2 ">
+    <input id="from_date" name="from_date" value="" required="required" class="form-control" type="date" >
+    </div>
+    
+    <label class="control-label col-md-1 col-sm-1 " for="last-name">To Date<a style="color:red;">*</a> </label>
+    <div class="col-md-2 col-sm-2 ">
+    <input id="to_date" name="to_date" value="" required="required" class="form-control" type="date" >
+    </div>
+
+</div>
+
+<div class="item form-group">
+
+    <label class="control-label col-md-1 col-sm-1 " for="last-name">Comments</label>
+    <div class="col-md-5 col-sm-5">
+    <textarea id="comments" name="comments" value=""  class="form-control"  style="height:100px !important;" type="text" ></textarea>
+    </div>
+
+</div>
+
+<div class="ln_solid"></div>
+<div class="item form-group">
+<div class=" offset-md-8">
+<button class="btn btn-secondary" onclick="history.back()">Cancel</button>
+<button class="btn btn-primary" type="reset">Reset</button>
+<button type="submit" class="btn btn-success">Submit</button>
+</div>
+</div>
+
+</form>
+</div>
+</div>
+</div>
+
+
+
+
+
+
+
+
+</div>	
+</div>	
+<!-- /Body page content -->
+<script>
+var id;
+
+$('#emp_id').on('change', function() {
+  id = this.value;
+});
+
+
+$('#type').on('change',function() {
+  // var type_id = this.id;
+  var type_id =  $('option:selected', this).attr('id');
+  if (id) 
+  {
+    $.ajax({ 
+      type: "get",
+      url: "<?php echo base_url()?>Leave/get_leave_count/"+id+'_'+type_id,
+      success: function(response) {
+        response = JSON.parse(response);
+        console.log(response);
+        if(response.length == 0)
+        {
+            get_all_count(type_id);
+        }
+        else
+        {
+            $('#leave_bal').val(response[0].remaining_days);
+        }
+      },
+      error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) }
+    });
+  }
+  else
+  {
+    $('#leave_bal').val("");
+  }
+});
+
+
+function get_all_count(id) {
+    $.ajax({ 
+      type: "get",
+      url: "<?php echo base_url()?>Leave/get_all_leave_count/"+id,
+      success: function(response) {
+        response = JSON.parse(response);
+        $('#leave_bal').val( response[0].days);
+      },
+      error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) }
+    });
+}
+</script>
diff --git a/application/modules/Leave/views/edit_leave.php b/application/modules/Leave/views/edit_leave.php
new file mode 100644
index 0000000..f8f50aa
--- /dev/null
+++ b/application/modules/Leave/views/edit_leave.php
@@ -0,0 +1,487 @@
+<!-- Body page content -->
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.4/jquery.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.3/moment.min.js"></script>
+
+<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.3/moment.min.js"></script>
+<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+<script src="https://code.jquery.com/ui/1.13.0/jquery-ui.min.js"></script>
+
+  <!-- bootstrap-daterangepicker -->
+    <script src="https://localhost/ams//assets/default/moment/min/moment.min.js"></script>
+    <script src="https://localhost/ams//assets/default/bootstrap-daterangepicker/daterangepicker.js"></script>
+    <!-- bootstrap-datetimepicker -->    
+    <script src="https://localhost/ams//assets/default/bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
+
+    <!-- bootstrap-daterangepicker -->
+    <link href="https://localhost/ams//assets/default/bootstrap-daterangepicker/daterangepicker.css" rel="stylesheet">
+    <!-- bootstrap-datetimepicker -->
+    <link href="https://localhost/ams//assets/default/bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css" rel="stylesheet">
+    <!-- style.css  -->
+    <link href="https://localhost/ams//assets/default/customize/style.css" rel="stylesheet">
+
+    <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+    <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+
+
+<style>
+
+    input[type=date] {
+       position: relative;
+       /* width: 150px; height: 20px;
+        color: white;*/
+    }
+
+    input[type=date]:before {
+        position: absolute;
+        top: 3px; left: 3px;
+        content: attr(data-date);
+        display: inline-block;
+        color: black;
+    }
+
+    input[type=date]::-webkit-datetime-edit, input::-webkit-inner-spin-button, input::-webkit-clear-button {
+        display: none;s
+    }
+
+    input[type=date]::-webkit-calendar-picker-indicator {
+        position: absolute;
+        top: 3px;
+        right: 0;
+        color: black;
+        opacity: 1;
+    }
+</style>
+<div class="">
+<div class="page-title">
+
+<div class="title_left">
+<h3>Edit Leave</h3>
+</div>
+</div>
+<div class="clearfix"></div>
+<div class="row">
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+<div class="x_title">
+
+
+<!-- <h6>General Information</h6> -->
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+<br />
+
+  <?php if(!empty($editleave)) { ?> 
+  
+  <?php foreach( $editleave as $leave) { ?>
+
+<form id="myForm" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url()?>Leave/editleave" enctype="multipart/form-data">
+
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">
+
+             
+<div class="item form-group">
+    
+    <label class="control-label col-md-2 col-sm-2 " for="last-name">Leave Applied For</label>
+    <div class="col-md-5 col-sm-5 ">
+        
+    <input type="radio" name="risedby" value="self"style="margin:10px;"checked /><b>Self</b>
+
+    <input type="radio" name="risedby" value="<?php echo user()->name;?>" style="margin: 10px;" /><b>Others</b>
+  
+    </div>
+</div>
+<div class="item form-group">
+     <label class="control-label col-md-2 col-sm-2  " for="last-name"> Employee Name </label>
+     <div class="col-md-5 col-sm-5 ">
+        <select id="user_dropdown" name="emp_id" style="margin-top: 10px;padding-bottom: 10px;" class="form-control" >  </select>
+     </div>
+</div>    
+
+<div class="item form-group">
+
+    <label class="control-label col-md-2 col-sm-2 " for="last-name">Leave Type<a style="color:red;">*</a> </label>
+    <div class="col-md-5 col-sm-5 ">
+    <select id="type" name="type"  class="form-control" >
+    <option value="<?php echo $leave->type; ?>"><?php echo $leave->type; ?></option>
+    <?php foreach ($leavetype as $key => $value) { ?>
+    <option id="<?php echo $value->id; ?>" value="<?php echo $value->type; ?>"><?php echo $value->type; ?></option>
+    <?php } ?>
+    </select>
+    </div>
+
+    <label class="control-label col-md-1 col-sm-1 " for="first-name"> Balance</label>
+    <div class="col-md-1 col-sm-1 ">
+    <input type="text" id="leave_bal" name="" value="" style="width:90px;" class="form-control " readonly>
+    </div>
+
+</div>
+
+
+<div class="item form-group" id="hidedate">
+
+<label class="control-label col-md-2 col-sm-2 " for="first-name"> From Date<a style="color:red;">*</a> </label>
+   <div class="col-md-2 col-sm-2 ">
+    <div class='input-group date'>
+     <input type='text' class="form-control"  placeholder="DD-MM-YYYY" id="fromdate" name="from_date" value="<?php echo dateFormat('d-m-Y', $leave->from_date); ?>" required />
+         <span class="input-group-addon">
+            <li class="fa fa-calendar"></li>
+            </span>
+      </div>
+ </div>
+
+
+<label class="control-label col-md-1 col-sm-1" for="last-name">To Date<a style="color:red;">*</a> </label>
+<div class="col-md-2 col-sm-2 ">
+    <div class='input-group date' >
+    <input type='text' class="form-control" placeholder="DD-MM-YYYY" id="todate" name= "to_date" value="<?php echo dateFormat('d-m-Y', $leave->to_date); ?>" required />
+     <span class="input-group-addon">
+            <li class="fa fa-calendar"></li>
+    </span>
+    </div>
+</div>
+
+
+  <label class="control-label col-md-1 col-sm-1 " for="last-name"></label>
+    <div class="col-md-2 col-sm-2 ">
+    <input id="dateDifference" value="" readonly class="form-control" style="width:90px;" type="text" >
+    </div>
+
+</div>
+
+<div class="item form-group" id="showdate"  >
+
+       <label class="control-label col-md-2 col-sm-2 " for="first-name">Date<a style="color:red;">*</a> </label>
+        <div class="col-md-5 col-sm-5 ">
+        <div class='input-group date'>
+           <input type='text' class="form-control" required name="perm_date" placeholder="DD-MM-YYYY" value="<?php echo $leave->perm_date; ?>" id='myDatepicker'/></div>        
+       </div>
+   </div>    
+
+<div class="item form-group" id="showtime"  >
+
+    <label class="control-label col-md-2 col-sm-2 " for="first-name"> From<a style="color:red;">*</a> </label>
+    <div class="col-md-2 col-sm-2 ">
+    <select class="custom-select" id="from_time" name=from_time required >
+        <option value="<?php echo $leave->from_time; ?>"><?php echo $leave->from_time; ?></option>
+    </select>
+    </div>
+    
+    <label class="control-label col-md-1 col-sm-1 " for="last-name">To<a style="color:red;">*</a> </label>
+    <div class="col-md-2 col-sm-2 ">
+    <select id="to_time" class="custom-select" name="to_time" required>
+        <option value="<?php echo $leave->to_time; ?>"><?php echo $leave->to_time; ?></option>
+    </select>
+    </div>
+
+</div>
+
+<div class="item form-group">
+
+    <label class="control-label col-md-2 col-sm-2 " for="last-name">Note</label>
+    <div class="col-md-5 col-sm-5">
+    <textarea id="comments" name="comments" value=""  class="form-control"  style="height:100px !important;" type="text" ><?php echo $leave->comments; ?></textarea>
+       
+    <input type="hidden" name="manager" value="<?php echo employee()->manager ?>">
+    <input type="hidden" name="id" value="<?php echo $leave->id; ?>">
+
+    </div>
+
+</div>
+
+<div class="ln_solid"></div>
+<div class="item form-group">
+<div class=" offset-md-8">
+<button class="btn btn-secondary" onclick="history.back()">Cancel</button>
+<button class="btn btn-primary" type="reset">Reset</button>
+<button type="submit" id="submit" onclick="sweert()" class="btn btn-success">Update</button>
+</div>
+</div>
+
+</form>
+
+<?php } }?>
+</div>
+</div>
+</div>
+
+
+</div>  
+</div>  
+<!-- /Body page content -->
+
+
+
+<script>
+$(document).ready(function(){
+
+      var currentUserName = '<?php echo user()->name; ?>';
+      var currentUserId = '<?php echo user()->id; ?>';
+      $('#user_dropdown').append('<option  value="' + currentUserId + '">' + 
+        currentUserName + '</option>');
+      $('#user_dropdown').prop('disabled', true);
+
+$('#user_dropdown').on('change',function() {
+   
+     $('#type').prop('selectedIndex',0);
+     
+});
+
+$('#type').on('change',function() {
+let id = $("#user_dropdown").val();
+
+  var type_id = $('option:selected', this).attr('id');
+
+  if (id)
+  {
+    $.ajax({ 
+      type: "get",
+      url: "<?php echo base_url()?>Leave/get_leave_count/"+id+'_'+type_id,
+      success: function(response) {
+        response = JSON.parse(response);
+        if(response.length == 0)
+        {
+            get_all_count(type_id);
+        }
+        else
+        {
+            if(response[0].remaining_days == 1 )
+            {
+            $('#leave_bal').val(response[0].remaining_days + ' day');
+            }
+            else
+             {
+               $('#leave_bal').val(response[0].remaining_days + ' days');
+             }   
+        }
+      },
+      error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) }
+    });
+  }
+  else
+  {
+    $('#leave_bal').val("");
+  }
+});
+
+ $('input[type="radio"][name="risedby"]').change(function() {
+        var selectedValue = $(this).val();
+        var $userDropdown = $('#user_dropdown');
+
+        $userDropdown.empty();
+
+        if (selectedValue === 'self') {
+            
+            var currentUserName = '<?php echo user()->name; ?>';
+            var currentUserId = '<?php echo user()->id; ?>';
+            $userDropdown.append('<option value="' + currentUserId + '">' + currentUserName + '</option>');
+            $userDropdown.prop('disabled', true);
+        } else if (selectedValue === '<?php echo user()->name; ?>') {
+            
+            $.ajax({
+                url: '<?php echo base_url('Leave/get_emp_name/')?>"', 
+                method: 'GET',
+                dataType: 'json',
+                success: function(response) {
+                     $('#user_dropdown').append(response);
+                    $('#user_dropdown').prop('disabled', false);
+                },
+                error: function(xhr, status, error) {
+                    console.error(error);
+                }
+            });
+        }
+    });
+     
+});
+
+function get_all_count(id) {
+ 
+    $.ajax({ 
+      type: "get",
+      url: "<?php echo base_url()?>Leave/get_all_leave_count/"+id,
+      success: function(response) {
+        response = JSON.parse(response);
+        console.log(response);
+        $('#leave_bal').val( response[0].days);
+      },
+      error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) }
+    });
+}
+
+</script>
+
+<script>
+            // Initialize datepickers
+            var dateFormat = "dd-mm-yy";
+            var fromDateInput = $("#fromdate");
+            console.log(fromDateInput);
+            var toDateInput = $("#todate");
+            console.log(toDateInput);
+
+            fromDateInput.datepicker({
+                dateFormat: dateFormat,
+                onSelect: function (dateText, inst) {
+                    toDateInput.datepicker("option", "minDate", dateText);
+                    validateDateRange();
+                    calculateDateDifference();
+                }
+            });
+
+            toDateInput.datepicker({
+                dateFormat: dateFormat,
+                onSelect: function (dateText, inst) {
+                    validateDateRange();
+                    calculateDateDifference();
+                }
+            });
+
+
+            // Function to validate the date range
+            function validateDateRange() {
+                var fromDate = fromDateInput.datepicker("getDate");
+                var toDate = toDateInput.datepicker("getDate");
+
+                // Check if both dates are selected
+                if (!fromDate || !toDate) {
+                    $("#error-msg").text("Please select both From Date and To Date");
+                    return false;
+                }
+
+                // Compare the dates
+                if (fromDate > toDate) {
+                    $("#error-msg").text("From Date cannot be after To Date");
+                    return false;
+                }
+
+                // Clear the error message if the date range is valid
+                $("#error-msg").text("");
+                return true;
+            }
+
+            function calculateDateDifference() {
+                var fromDate = fromDateInput.datepicker("getDate");
+                var toDate = toDateInput.datepicker("getDate");
+
+                if (!isNaN(fromDate) && !isNaN(toDate)) {
+                    var difference = Math.ceil((toDate - fromDate) / (1000 * 60 * 60 * 24) + 1 );
+                    if(difference == 1)
+                    {
+                    $("#dateDifference").val(difference + ' day');
+                    }
+                    else
+                    {
+                    $("#dateDifference").val(difference + ' days');
+                    }
+                    
+                } else {
+                    $("#dateDifference").val("");
+                }
+            }
+    
+</script>
+
+<script>
+$('#showtime').hide()
+$('#showdate').hide()
+
+$(document).ready(function() { 
+
+    let type =  $('#type').val();
+
+      console.log($('#showtime').val())
+    
+    if( type === 'Permission' ){
+
+       $('#hidedate').hide()
+       $('#balance').hide()
+       $('#leave_bal').hide()
+       $('#fromdate').removeAttr('required');
+       $('#todate').removeAttr('required');
+       $('#showtime').show();
+       $('#showdate').show();
+    }
+    else{
+
+       $('#from_time').removeAttr('required');
+       $('#to_time').removeAttr('required');
+       $('#myDatepicker').removeAttr('required');
+       $('#hidedate').show();
+       $('#showtime').hide();
+       $('#showdate').hide();
+       $('#balance').show()
+       $('#leave_bal').show()
+
+    }   
+
+});
+</script>
+
+ <script>
+    $(document).ready(function() {
+  var selectField = $('#from_time');
+
+  var options = [  '12:00 AM',  '12:30 AM',  '1:00 AM',  '1:30 AM',  '2:00 AM',  '2:30 AM',  '3:00 AM',  '3:30 AM',  '4:00 AM',  '4:30 AM',  '5:00 AM',  '5:30 AM',  '6:00 AM',  '6:30 AM',  '7:00 AM',  '7:30 AM',  '8:00 AM',  '8:30 AM',  '9:00 AM',  '9:30 AM',  '10:00 AM',  '10:30 AM',  '11:00 AM',  '11:30 AM',  '12:00 Noon',  '12:30 PM',  '1:00 PM',  '1:30 PM',  '2:00 PM',  '2:30 PM',  '3:00 PM',  '3:30 PM',  '4:00 PM',  '4:30 PM',  '5:00 PM',  '5:30 PM',  '6:00 PM',  '6:30 PM',  '7:00 PM',  '7:30 PM',  '8:00 PM',  '8:30 PM',  '9:00 PM',  '9:30 PM',  '10:00 PM',  '10:30 PM',  '11:00 PM',  '11:30 PM'];
+
+
+  for (var i = 0; i < options.length; i++) {
+    selectField.append('<option value="' + options[i] + '">' + options[i] + '</option>');
+  }
+});
+
+var selectField = $('#from_time');
+selectField.on('click', function() {
+
+    var selectedValue = $(this).val();
+    console.log(selectedValue);
+
+    var timeSlots = [  '12:00 AM',  '12:30 AM',  '1:00 AM',  '1:30 AM',  '2:00 AM',  '2:30 AM',  '3:00 AM',  '3:30 AM',  '4:00 AM',  '4:30 AM',  '5:00 AM',  '5:30 AM',  '6:00 AM',  '6:30 AM',  '7:00 AM',  '7:30 AM',  '8:00 AM',  '8:30 AM',  '9:00 AM',  '9:30 AM',  '10:00 AM',  '10:30 AM',  '11:00 AM',  '11:30 AM',  '12:00 Noon',  '12:30 PM',  '1:00 PM',  '1:30 PM',  '2:00 PM',  '2:30 PM',  '3:00 PM',  '3:30 PM',  '4:00 PM',  '4:30 PM',  '5:00 PM',  '5:30 PM',  '6:00 PM',  '6:30 PM',  '7:00 PM',  '7:30 PM',  '8:00 PM',  '8:30 PM',  '9:00 PM',  '9:30 PM',  '10:00 PM',  '10:30 PM',  '11:00 PM',  '11:30 PM'];
+
+
+    function filterTimeSlots(startingTime, numberOfHours) {
+  // Find the index of the starting time in the array
+        console.log(startingTime,numberOfHours);
+  const startIndex = timeSlots.findIndex(time => time === startingTime);
+console.log(startIndex);
+  if (startIndex !== -1) {
+  
+    const endIndex = startIndex + (numberOfHours * 2) - 1;
+
+    return timeSlots.slice(startIndex, endIndex + 2);
+  }
+  return [];
+}
+
+// Usage example
+const startingTime = selectedValue;
+const numberOfHours = 4 ;
+const filteredTimeSlots = filterTimeSlots(startingTime, numberOfHours);
+
+filteredTimeSlots.shift();
+var totime = $('#to_time');
+totime.empty();
+for (var i = 0; i < filteredTimeSlots.length; i++) {
+    totime.append('<option value="' + filteredTimeSlots[i] + '">' + filteredTimeSlots[i] + '</option>');
+
+  }
+
+console.log(filteredTimeSlots);
+
+  });
+  </script>
+
+
+    
+
+
+
+
+
+
+ 
+
+
+
diff --git a/application/modules/Leave/views/leave_list.php b/application/modules/Leave/views/leave_list.php
new file mode 100644
index 0000000..62bdfcc
--- /dev/null
+++ b/application/modules/Leave/views/leave_list.php
@@ -0,0 +1,310 @@
+
+<head>
+<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css'> 
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+
+<style>
+  .modal {
+  display: none;
+  position: fixed;
+  z-index: 1;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  background-color: rgba(0, 0, 0, 0.4);
+}
+
+.modal-content {
+  background-color: #fefefe;
+  margin: 15% auto;
+  padding: 20px;
+  border: 1px solid #888;
+  width: 380px;
+  height: 280px;
+  text-align: center;
+}
+
+button {
+  margin-top: 10px;
+}
+
+div.dataTables_wrapper div.dataTables_filter{
+      margin-top: -44px !important; //search move to up
+
+</style>
+
+</head>
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+  <div class="x_title">
+   
+		<ul class="nav navbar-right panel_toolbox">
+			 <a href="<?php echo base_url();?>Leave/LeaveHistory" class="btn btn-sm btn-primary" style="margin-top: 20px;" >Back</a>                 
+    </ul>
+
+    <h1>My Approvals</h1>
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+ <div class="row">
+  <div class="col-sm-12" style="overflow: auto;">
+    <table id="datatable-buttons"  class="table table-striped table-bordered"  width="100%">
+      <thead>
+        <tr class="headings">
+                <th class="column-title">Created Date/Time</th>				            
+                <th class="column-title">Employee Name </th>
+                <th class="column-title">Leave Duration </th>
+				        <th class="column-title">Leave Type </th>
+                <th class="column-title">Leave Raised By</th>
+                <th class="column-title">No of Days </th>
+                <th class="column-title">Status </th>
+                <th class="column-title">Note</th>
+				        <th class="column-title" >Action </th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php foreach ($tableData as $key => $value) { ?>
+				<tr class="even pointer">
+
+                    <td class=" "><?php echo $value->created_date; ?><br><?php echo $value->created_time; ?></td>
+                    <td class=" "><?php echo $value->name; ?> (<?php echo $value->emp_id; ?>) </td>
+                     <?php if($value->from_date == "" && $value->to_date == "") { ?>
+                    <td class="">
+                      <?php echo dateFormat('d-m-Y',$value->perm_date);?><br>
+                      <?php echo timeFormat('h:i a', $value->from_time); ?> to 
+                      <?php echo timeFormat('h:i a', $value->to_time);; ?>
+                    </td>
+                     <?php } else { ?>
+                        
+					          <td class=" "> <?php echo dateFormat('d-m-Y',$value->from_date); echo ' to ';?> <?php echo dateFormat('d-m-Y',$value->to_date);?> </td>
+                    <?php } ?>
+					          <td class=" "><?php echo $value->type; ?></td>
+                    <td class=" "><?php echo $value->risedby; ?></td>
+                    <?php if($value->no_of_days == 0){ ?>
+                    <td class=" ">---</td>
+                    <?php } else { ?>
+                      <td class=""><?php echo $value->no_of_days; ?></td>
+                    <?php } ?>  
+					          <?php if($value->status == 'pending'){ ?>
+                      <td style="color:#e68a00"><?php echo $value->status; ?></td>
+                    <?php }
+                    else if($value->status == 'Approved'){ ?>
+                      <td style="color:green"><?php echo $value->status; ?></td>
+                    <?php }
+                    else if($value->status == 'Declined'){ ?>
+                      <td style="color:red"><?php echo $value->status; ?>by <?php echo $value->declined_by; ?> <br>" <?php echo $value->DReason; ?> "</td>
+                    <?php }
+                    else if($value->status == 'canceled'){ ?>
+                       <td style="color:darkcyan;"><?php echo $value->status; ?></td>
+                    <?php }
+                    else{
+
+                    }?>
+                    <td class=" "><?php echo $value->comments; ?></td>
+                    <td style=" text-align: center;  font-size: 16px;">
+
+                       <?php if($value->status == 'pending') { ?>
+
+                        <a href="<?php echo base_url('Leave/ApproveLeave')?>?id=<?php echo $value->id;?> "><i class="fa fa-check" aria-hidden="true"title="Approve" onclick = "return confirm('Are you sure to Approve This Leave ')" ></i></a> &nbsp;
+
+          
+                        <a href="#"><i class="fa fa-times test" aria-hidden="true" title="Decline"  onclick="showCustomPrompt()"
+                        id= "<?php echo $value->id; ?>"></i></a>&nbsp;
+
+                      <?php } ?>
+          </td>
+        </tr>
+			<?php } ?>
+      </tbody>
+    </table>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+
+<div id="customPrompt" class="modal">
+  <div class="modal-content">
+    <span style="text-align: right;" onclick="$('#customPrompt').hide()"><i class="fa fa-times" aria-hidden="true"></i></span>
+    <h3>Decline Reason</h3>
+    <input list="browsers" onfocus  id="decline_reason" required name="myBrowser" style="margin-top: 10%;padding: 10px;"/> 
+<datalist id="browsers" >
+    <?php foreach ($dropdown as $key => $value) { ?>
+    <option value="<?php echo $value->enum_value; ?>"><?php echo $value->enum_value; ?></option>
+    <?php } ?>
+</datalist>
+
+<button onclick="submitCustomPrompt()" type="button" class="btn btn-primary">Submit</button>
+ 
+  </div>
+</div>
+
+<br/>
+
+<!-- Large modal -->
+<!-- <button type="button" class="btn btn-primary" data-toggle="modal" data-target=".bs-example-modal-lg" hidden>Large modal</button> -->
+<div class="modal fade bs-example-modal-lg" id="ItemModal" tabindex="-1" role="dialog" aria-hidden="true"></div>
+<div class="modal bs-example-modal-sm" tabindex="-1" role="dialog" aria-hidden="true" id="popup"> </div>
+
+<div style="display:none" id="sub-value">
+
+<script>
+$('.deleteEmp').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Employee/deleteEmp";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Employee/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#popup').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+
+
+$(document).on('click','.bi-card-list',function(){
+  var id = $(this).attr("id")
+    $.ajax({ 
+      type: "get",
+      url: "<?php echo base_url()?>Employee/view_emp_history/"+id,
+      success: function(response) {
+        response = JSON.parse(response);
+        console.log(response);
+        $('.bs-example-modal-lg').html(response);
+        $('.bs-example-modal-lg').modal("show");
+      },
+      error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) }
+    });
+});
+</script>
+
+
+<!-- <script>
+$(document).on('click','.test',function(){
+    var id = $(this).attr("id");
+    var reason = prompt("Decline Reason", "");
+   if(reason != null && reason != "" ){ 
+    $.ajax(
+      {
+        data:{id : id , reason : reason },
+        url:"<?php echo base_url('Leave/Decline');?>",
+        type:"get",
+        success: function(response) {
+
+            window.location = '<?php echo base_url('Leave/leaveList');?>';
+      }
+
+
+      });
+  }
+  else if(reason == "")
+    { 
+      alert('Decline Reason is Required');
+    }
+  });
+</script> -->
+
+<!-- <script>
+    
+    var reason = $('#decline_reason').val();
+    $.ajax(
+      {
+        data:{id : id , reason : reason },
+        url:"<?php echo base_url('Leave/Decline');?>",
+        type:"get",
+        success: function(response) {
+
+            window.location = '<?php echo base_url('Leave/leaveList');?>';
+      }
+
+
+      });
+</script> -->
+
+<script>
+
+  function showCustomPrompt() {
+  var customPrompt = document.getElementById("customPrompt");
+  customPrompt.style.display = "block";
+}
+
+function submitCustomPrompt() {
+  
+  var id = $('.test').attr("id");
+  var reason = document.getElementById("decline_reason").value;
+
+  if( reason != "")
+
+   $.ajax(
+      {
+        data:{id : id , reason : reason },
+        url:"<?php echo base_url('Leave/Decline');?>",
+        type:"get",
+        success: function(response) {
+           
+            window.location ='<?php echo base_url('Leave/leaveList');?>';
+      }
+
+
+      }); 
+    else 
+
+         alert('Decline Reason is required');
+
+
+  // var customPrompt = document.getElementById("customPrompt");
+  // customPrompt.style.display = "none";
+
+}
+
+</script>
+
+<script>
+    
+    function alert(){
+
+    const swalWithBootstrapButtons = Swal.mixin({
+  customClass: {
+    confirmButton: 'btn btn-success',
+    cancelButton: 'btn btn-danger'
+  },
+  buttonsStyling: false
+})
+
+swalWithBootstrapButtons.fire({
+  title: 'Are you sure?',
+  text: "You won't be able to Approve this!",
+  icon: false,
+  showCancelButton: true,
+  confirmButtonText: 'Yes, Approved it!',
+  cancelButtonText: 'No, cancel!',
+  reverseButtons: true
+}).then((result) => {
+  if (result.isConfirmed) {
+    swalWithBootstrapButtons.fire(
+      'Approved!',
+      'Leave has been Approved.',
+      'success'
+    )
+  } else if (
+    /* Read more about handling dismissals below */
+    result.dismiss === Swal.DismissReason.cancel
+  ) {
+    swalWithBootstrapButtons.fire(
+      'Cancelled',
+      'Your imaginary file is safe :)',
+      'error'
+    )
+  }
+})
+}
+  </script>
+</div>
+
diff --git a/application/modules/Leave/views/leavehistory.php b/application/modules/Leave/views/leavehistory.php
new file mode 100644
index 0000000..28c1b02
--- /dev/null
+++ b/application/modules/Leave/views/leavehistory.php
@@ -0,0 +1,167 @@
+<head>
+<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css'> 
+<style>
+  .alert-success  {
+    background-color: #dff0d8;
+    color: #3c763d;
+    border-color: #d6e9c6;   
+}
+
+.flash-message {
+    padding: 10px;
+    margin-bottom: 10px;
+    border-radius: 5px;
+    margin-left: 650px;
+}
+
+  div.dataTables_wrapper div.dataTables_filter{
+      margin-top: -44px !important; //search move to up
+
+</style>
+</head>
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+  <div class="x_title">
+
+     <?php if ($this->session->userdata('Success')): ?>
+    <div class="alert-success flash-message" id="customPrompt" style="text-align: right;">
+        <h2><?php echo $this->session->userdata('Success'); ?></h2>
+         <span  onclick="$('#customPrompt').hide()" style="text-align: right;" ><i class="fa fa-times" aria-hidden="true"></i></span>
+    </div>
+    <?php endif; ?>
+    <?php $this->session->unset_userdata('Success');?>
+		<ul class="nav navbar-right panel_toolbox">
+       <a href="<?php echo base_url();?>Leave/applyLeave" class="btn btn-sm btn-primary" style="margin-top: 20px;">Apply Leave</a>
+
+       <?php if(is_user() || user()->role == null) { ?>
+       <a href="<?php echo base_url();?>Leave/manager_approvel" class="btn btn-sm btn-warning" style="margin-top: 20px;">My Approvals</a>
+       <?php } ?>
+
+       <?php if(is_admin()) { ?>
+       <a href="<?php echo base_url();?>Leave/leaveList" class="btn btn-sm btn-warning" style="margin-top: 20px;">My Approvals</a>
+       <?php }?>
+       
+    </ul>
+     
+     <h1>My Leaves</h1>
+
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+ <div class="row">
+  <div class="col-sm-12">
+    <table id="datatable-buttons" class="table table-striped table-bordered"  width="100%">
+      <thead>
+        <tr class="headings">
+                <th class="column-title">Created Date/Time</th>					         
+				        <th class="column-title">Leave Type </th>
+                <th class="column-title">Leave Duration</th>
+                <th class="column-title">No of Days </th>
+                <th class="column-title">Status </th>
+                <th class="column-title">Action </th>
+        </tr>
+      </thead>
+      <tbody>
+
+        <?php foreach ($tableData as $key => $value) { ?>
+          <?php if( user()->id == $value->emp_id) { ?>
+				<tr class="even pointer">
+                    <td class=" "><?php echo $value->created_date; ?><br><?php echo $value->created_time; ?></td>
+                    <td class=" "><?php echo $value->type; ?></td>
+					          <?php if($value->from_date == "" && $value->to_date == "") { ?>
+                    <td class="">
+                      <?php echo dateFormat('d-m-Y',$value->perm_date);?><br>
+                      <?php echo timeFormat('h:i a', $value->from_time); ?> to 
+                      <?php echo timeFormat('h:i a', $value->to_time);; ?>
+                    </td>
+                     <?php } else { ?>
+                        
+                    <td class=" "> <?php echo dateFormat('d-m-Y',$value->from_date); echo ' to ';?> <?php echo dateFormat('d-m-Y',$value->to_date);?> </td>
+                    <?php } ?>
+                    <?php if($value->no_of_days == 0){ ?>
+                    <td class=" ">---</td>
+                    <?php } else { ?>
+                      <td class=""><?php echo $value->no_of_days; ?></td>
+                    <?php } ?> 
+                    <?php if($value->status == 'pending'){ ?>
+                      <td style="color:#e68a00"><?php echo $value->status; ?></td>
+                    <?php }
+                    else if($value->status == 'Approved'){ ?>
+                      <td style="color:green"><?php echo $value->status; ?> By <?php echo $value->approved_by; ?><br><?php echo $value->approved_at; ?></td>
+                    <?php }
+                    else if($value->status == 'Declined'){ ?>
+                       <td style="color:red"><?php echo $value->status; ?> by <?php echo $value->DReason; ?></td>
+                    <?php }
+                    else if($value->status == 'canceled'){ ?>
+                       <td style="color:darkcyan;"><?php echo $value->status; ?></td>
+                    <?php }
+                    else{
+
+                    }?>
+                    
+           <td style=" text-align: center;  font-size: 16px;">
+            <?php if($value->status == 'pending') { ?>
+
+              <a href="<?php echo base_url('Leave/edit_leave_function')?>?id=<?php echo md5($value->id);?> "><i class="fa fa-edit" aria-hidden="true"title="Edit"></i></a> &nbsp;
+
+               <a href="<?php echo base_url('Leave/cancled')?>?id=<?php echo md5($value->id);?> "><i class="fa fa-ban" aria-hidden="true"title="Edit"></i></a> &nbsp;
+
+          <?php } ?>
+          </td>
+
+
+        </tr>
+			<?php } } ?>
+      </tbody>
+    </table>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+
+<br/>
+
+<!-- Large modal -->
+<!-- <button type="button" class="btn btn-primary" data-toggle="modal" data-target=".bs-example-modal-lg" hidden>Large modal</button> -->
+<div class="modal fade bs-example-modal-lg" id="ItemModal" tabindex="-1" role="dialog" aria-hidden="true"></div>
+<div class="modal bs-example-modal-sm" tabindex="-1" role="dialog" aria-hidden="true" id="popup"> </div>
+
+<div style="display:none" id="sub-value">
+
+<script>
+$('.deleteEmp').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Employee/deleteEmp";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Employee/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#popup').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+
+
+$(document).on('click','.bi-card-list',function(){
+  var id = $(this).attr("id")
+    $.ajax({ 
+      type: "get",
+      url: "<?php echo base_url()?>Employee/view_emp_history/"+id,
+      success: function(response) {
+        response = JSON.parse(response);
+        console.log(response);
+        $('.bs-example-modal-lg').html(response);
+        $('.bs-example-modal-lg').modal("show");
+      },
+      error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) }
+    });
+});
+</script>
+
+
+</div>
+
diff --git a/application/modules/Leave/views/manager_approvel.php b/application/modules/Leave/views/manager_approvel.php
new file mode 100644
index 0000000..6b2c1c2
--- /dev/null
+++ b/application/modules/Leave/views/manager_approvel.php
@@ -0,0 +1,255 @@
+<head>
+<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css'> 
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+
+
+<style>
+  .modal {
+  display: none;
+  position: fixed;
+  z-index: 1;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  background-color: rgba(0, 0, 0, 0.4);
+}
+
+.modal-content {
+  background-color: #fefefe;
+  margin: 15% auto;
+  padding: 20px;
+  border: 1px solid #888;
+  width: 380px;
+  height: 280px;
+  text-align: center;
+}
+
+button {
+  margin-top: 10px;
+}
+
+div.dataTables_wrapper div.dataTables_filter{
+      margin-top: -44px !important; //search move to up
+
+</style>
+
+
+</head>
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+  <div class="x_title">
+
+   <ul class="nav navbar-right panel_toolbox">
+       <a href="<?php echo base_url();?>Leave/LeaveHistory" class="btn btn-sm btn-primary" style="margin-top: 20px;" >Back</a>                 
+    </ul>
+
+   <h1>My Approvals</h1>	
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+ <div class="row">
+  <div class="col-sm-12" style="overflow: auto;">
+    <table id="datatable-buttons"  class="table table-striped table-bordered"  width="100%">
+      <thead>
+        <tr class="headings">
+                <th class="column-title">Created Date/Time</th>
+                <th class="column-title">Employee Name </th>
+				        <th class="column-title">Leave Duration </th>
+				        <th class="column-title">Leave Type </th>
+                <th class="column-title">Leave Raised By</th>
+                <th class="column-title">No of Days </th>
+                <th class="column-title">Note</th>
+                <th class="column-title">Status </th>
+				        <th class="column-title" >Action </th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php foreach ($tableData as $key => $value) { ?>      
+
+          <?php foreach ($get_delegation as $key => $val) { ?>
+
+        <?php if(user()->id == $value->manager || user()->id == $val->delegated_to && date('d-m-Y') >= $val->from_date && date('d-m-Y') <=  $val->to_date && $value->created_date >= $val->from_date && $value->created_date <=  $val->to_date  ){ ?>
+
+             <tr class="even pointer">
+                    <td class=" "><?php echo $value->created_date; ?><br><?php echo $value->created_time; ?></td>
+                    <td class=" "><?php echo $value->name; ?> (<?php echo $value->emp_id; ?>) </td>
+					          <?php if($value->from_date == "" && $value->to_date == "") { ?>
+                    <td class="">
+                      <?php echo dateFormat('d-m-Y',$value->perm_date);?><br>
+                      <?php echo timeFormat('h:i a', $value->from_time); ?> to 
+                      <?php echo timeFormat('h:i a', $value->to_time);; ?>
+                    </td>
+                     <?php } else { ?>
+                        
+                    <td class=" "> <?php echo dateFormat('d-m-Y',$value->from_date); echo ' to ';?> <?php echo dateFormat('d-m-Y',$value->to_date);?> </td>
+                    <?php } ?>
+					          <td class=" "><?php echo $value->type; ?></td>
+                    <td class=" "><?php echo $value->risedby; ?></td>
+                    <?php if($value->no_of_days == 0){ ?>
+                    <td class=" ">---</td>
+                    <?php } else { ?>
+                      <td class=""><?php echo $value->no_of_days; ?></td>
+                    <?php } ?>  
+                    <td class=" "><?php echo $value->comments; ?></td>
+					          <?php if($value->status == 'pending'){ ?>
+                      <td style="color:#e68a00"><?php echo $value->status; ?></td>
+                    <?php }
+                    else if($value->status == 'Approved'){ ?>
+                      <td style="color:green"><?php echo $value->status; ?> By <?php echo $value->approved_by; ?><br><?php echo $value->approved_at; ?></td>
+                    <?php }
+                    else if($value->status == 'Declined'){ ?>
+                      <td style="color:red"><?php echo $value->status; ?> by <?php echo $value->declined_by; ?> <br>" <?php echo $value->DReason; ?> "</td>
+                    <?php }
+                    else if($value->status == 'canceled'){ ?>
+                       <td style="color:darkcyan;"><?php echo $value->status; ?></td>
+                    <?php }
+                    else{
+
+                    }?>
+                    <td style=" text-align: center;  font-size: 16px;">
+
+                      <?php if($value->status == 'pending') { ?>
+
+                        <a href="<?php echo base_url('Leave/ManagerLeaveApprove')?>?id=<?php echo $value->id;?> "><i class="fa fa-check" aria-hidden="true"title="Approve" onclick = "return confirm('Are you sure to Approve This Leave ')" ></i></a> &nbsp;
+
+          
+                        <a href="#"><i class="fa fa-times test" aria-hidden="true" title="Decline" id= "<?php echo $value->id; ?>" onclick="showCustomPrompt()"></i></a>&nbsp;
+
+                      <?php } ?>  
+          </td>
+        </tr>
+			<?php } } } ?>
+      </tbody>
+    </table>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+
+<div id="customPrompt" class="modal">
+  <div class="modal-content">
+    <span style="text-align: right;" onclick="$('#customPrompt').hide()"><i class="fa fa-times" aria-hidden="true"></i></span>
+    <h3>Decline Reason</h3>
+    <input list="browsers" onfocus  id="decline_reason" required name="myBrowser" style="margin-top: 10%;padding: 10px;"/> 
+<datalist id="browsers" >
+    <?php foreach ($dropdown as $key => $value) { ?>
+    <option value="<?php echo $value->enum_value; ?>"><?php echo $value->enum_value; ?></option>
+    <?php } ?>
+</datalist>
+
+<button onclick="submitCustomPrompt()" type="button" class="btn btn-primary">Submit</button>
+ 
+  </div>
+</div>
+
+<br/>
+
+<!-- Large modal -->
+<!-- <button type="button" class="btn btn-primary" data-toggle="modal" data-target=".bs-example-modal-lg" hidden>Large modal</button> -->
+<div class="modal fade bs-example-modal-lg" id="ItemModal" tabindex="-1" role="dialog" aria-hidden="true"></div>
+<div class="modal bs-example-modal-sm" tabindex="-1" role="dialog" aria-hidden="true" id="popup"> </div>
+
+<div style="display:none" id="sub-value">
+
+<script>
+$('.deleteEmp').click(function() {
+ var id = $(this).attr('id');
+ var url = "<?php echo base_url()?>Employee/deleteEmp";
+
+  $.ajax({ 
+    url: "<?php echo base_url()?>Employee/getDeleteConfirmationPopup",
+        type:"GET",
+        success:function(data){
+          $('#popup').html(JSON.parse(data));
+          $('.delete_id').attr('value',id);
+          $('.delete_url').attr('action',url); 
+        }
+    });
+});
+
+
+$(document).on('click','.bi-card-list',function(){
+  var id = $(this).attr("id")
+    $.ajax({ 
+      type: "get",
+      url: "<?php echo base_url()?>Employee/view_emp_history/"+id,
+      success: function(response) {
+        response = JSON.parse(response);
+        console.log(response);
+        $('.bs-example-modal-lg').html(response);
+        $('.bs-example-modal-lg').modal("show");
+      },
+      error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) }
+    });
+});
+</script>
+
+
+<!-- <script>
+$(document).on('click','.test',function(){
+    var id = $(this).attr("id");
+    var reason = prompt("Decline Reason", "");
+    console.log(reason);
+   if(reason != null && reason != "" ){ 
+    $.ajax(
+      {
+        data:{id : id , reason : reason },
+        url:"<?php echo base_url('Leave/Decline');?>",
+        type:"get",
+        success: function(response) {
+
+            window.location = '<?php echo base_url('Leave/leaveList');?>';
+      }
+
+
+      });
+  }
+  else if(reason == "")
+    { 
+      alert('Decline Reason is Required');
+    }
+  });
+</script> -->
+<script>
+
+  function showCustomPrompt() {
+  var customPrompt = document.getElementById("customPrompt");
+  customPrompt.style.display = "block";
+}
+
+function submitCustomPrompt() {
+  
+  var id = $('.test').attr("id");
+  var reason = document.getElementById("decline_reason").value;
+
+  if( reason != "")
+
+   $.ajax(
+      {
+        data:{id : id , reason : reason },
+        url:"<?php echo base_url('Leave/Decline');?>",
+        type:"get",
+        success: function(response) {
+           
+            window.location ='<?php echo base_url('Leave/manager_approvel');?>';
+      }
+
+
+      }); 
+    else 
+
+         alert('Decline Reason is required');
+
+
+  // var customPrompt = document.getElementById("customPrompt");
+  // customPrompt.style.display = "none";
+
+}
+
+</script>
+
diff --git a/application/modules/Leave/views/permissions.php b/application/modules/Leave/views/permissions.php
new file mode 100644
index 0000000..419bee5
--- /dev/null
+++ b/application/modules/Leave/views/permissions.php
@@ -0,0 +1,100 @@
+
+<div class="">
+<div class="page-title">
+
+<div class="title_left">
+<h3>Permission</h3>
+</div>
+
+</div>
+<div class="clearfix"></div>
+<div class="row">
+<div class="col-md-12 col-sm-12 ">
+<div class="x_panel">
+<div class="x_title">
+
+
+
+<!-- <h6>General Information</h6> -->
+<div class="clearfix"></div>
+</div>
+<div class="x_content">
+<br />
+<form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Leave/Permission" enctype="multipart/form-data">
+
+<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>">	
+
+
+<div class="item form-group">
+
+    <label class="control-label col-md-1 col-sm-1 " for="last-name">Employee Name<a style="color:red;">*</a> </label>
+    <div class="col-md-5 col-sm-5 ">
+    <select id="emp_id" name="emp_id" required="required" class="form-control" >
+    <option value="">--Select--</option>
+    <?php foreach ($emp as $key => $value) { ?>
+    <option value="<?php echo $value->id; ?>"><?php echo $value->name; ?></option>
+    <?php } ?>
+    </select>
+    </div>
+
+</div>
+
+<!-- <div class="item form-group">
+    
+    <label class="control-label col-md-1 col-sm-1 " for="last-name">Leave Type<a style="color:red;">*</a> </label>
+    <div class="col-md-5 col-sm-5 ">
+    <select id="type" name="type" required="required" class="form-control" >
+    <option value="">--Select--</option>
+    <?php foreach ($leavetype as $key => $value) { ?>
+    <option id="<?php echo $value->id; ?>" value="<?php echo $value->type; ?>"><?php echo $value->type; ?></option>
+    <?php } ?>
+    </select>
+    </div>
+
+    <label class="control-label col-md-1 col-sm-1 " for="first-name"> Leave Balance</label>
+    <div class="col-md-2 col-sm-2 ">
+    <input type="text" id="leave_bal" name="" value="" class="form-control " readonly>
+    </div>
+</div> -->
+
+<div class="item form-group">
+
+    <label class="control-label col-md-1 col-sm-1 " for="first-name"> From<a style="color:red;">*</a> </label>
+    <div class="col-md-2 col-sm-2 ">
+    <input id="from_date" name="from_date" value="" required="required" class="form-control" type="time" >
+    </div>
+    
+    <label class="control-label col-md-1 col-sm-1 " for="last-name">To<a style="color:red;">*</a> </label>
+    <div class="col-md-2 col-sm-2 ">
+    <input id="to_date" name="to_date" value="" required="required" class="form-control" type="time">
+    </div>
+
+</div>
+
+<div class="item form-group">
+
+    <label class="control-label col-md-1 col-sm-1 " for="last-name">Comments</label>
+    <div class="col-md-5 col-sm-5">
+    <textarea id="comments" name="comments" value=""  class="form-control"  style="height:100px !important;" type="text" ></textarea>
+    </div>
+
+</div>
+
+<div class="ln_solid"></div>
+<div class="item form-group">
+<div class=" offset-md-8">
+<button class="btn btn-secondary" onclick="history.back()">Cancel</button>
+<button class="btn btn-primary" type="reset">Reset</button>
+<button type="submit" class="btn btn-success">Submit</button>
+</div>
+</div>
+
+</form>
+</div>
+</div>
+</div>
+
+</div>	
+</div>	
+<!-- /Body page content -->
+
diff --git a/application/modules/User/controllers/Minton_v5.0.0.code-workspace b/application/modules/User/controllers/Minton_v5.0.0.code-workspace
new file mode 100644
index 0000000..c52e3cf
--- /dev/null
+++ b/application/modules/User/controllers/Minton_v5.0.0.code-workspace
@@ -0,0 +1,11 @@
+{
+	"folders": [
+		{
+			"path": "../../../../../Minton_v5.0.0"
+		},
+		{
+			"path": "../../../.."
+		}
+	],
+	"settings": {}
+}
\ No newline at end of file
diff --git a/application/modules/User/controllers/User.php b/application/modules/User/controllers/User.php
index d9e9528..988cf8d 100644
--- a/application/modules/User/controllers/User.php
+++ b/application/modules/User/controllers/User.php
@@ -26,8 +26,8 @@ public function __construct()
         // To inherit directly the attributes of the parent class.
         parent::__construct();
         $this->load->model('MY_Model');
-		$this->load->model('user_model');
-        $this->load->model('audit_model');
+		$this->load->model('User_model','user_model');
+        $this->load->model('Audit/Audit_model','audit_model');
 		// $this->load->helper(array('form', 'url'));
     }
 	
@@ -90,7 +90,7 @@ public function createUser()
         //audit history generation	for insert	 
 		$test = $this->audit->create_history('insert');
 		}
-		redirect('user/userList');
+		redirect('User/userList');
     
     }
 
@@ -126,20 +126,20 @@ public function editUsers()
          //audit history generation for update 
 		 $test = $this->audit->create_history('update');
 		 }
-		redirect('user/userList');
+		redirect('User/userList');
   
     }
 
     public function deleteUser($id)
     {
     $Data = $this->user_model->delete_user_by_md5_id($id,user()->business_id);
-	redirect('user/userList');
+	redirect('User/userList');
 	}
 
     public function activateUser($id)
     {
     $Data = $this->user_model->activate_inactive_users($id,user()->business_id);
-	redirect('user/userList');
+	redirect('User/userList');
 	}
 
     public function profile()
@@ -183,7 +183,7 @@ public function editprofiles()
 		   }
 
 		$userData = $this->MY_Model->edit_option($action, $id, $table);
-		redirect('user/profile');
+		redirect('User/profile');
     }
 
 
@@ -191,7 +191,7 @@ public function changepassword()
     {
         // $password = md5(user()->password);
         // $this->layout->set('pass', $password);
-        $this->layout->buffer('main_content', 'user/change_password');
+        $this->layout->buffer('main_content', 'User/change_password');
         $this->layout->render('default_layout');
     }
 
diff --git a/application/modules/User/models/User_model.php b/application/modules/User/models/User_model.php
index b942f89..7e871bf 100644
--- a/application/modules/User/models/User_model.php
+++ b/application/modules/User/models/User_model.php
@@ -48,6 +48,12 @@ public function delete_user_by_md5_id($id,$business_id)
         }
 		$this->db->set('is_active',0);
         $this->db->update('users');
+        $this->db->where('md5(user_id)', $id);
+        if ($business_id != NULL) {
+            $this->db->where('business_id', $business_id);
+        }
+        $this->db->set('is_active',0);
+        $this->db->update('employees');
         return;
     } 
 
@@ -59,6 +65,12 @@ public function activate_inactive_users($id,$business_id)
         }
 		$this->db->set('is_active',1);
         $this->db->update('users');
+         $this->db->where('md5(user_id)', $id);
+        if ($business_id != NULL) {
+        $this->db->where('business_id', $business_id);
+        }
+        $this->db->set('is_active',1);
+        $this->db->update('employees');
         return;
     } 
 
diff --git a/application/modules/User/views/business.php b/application/modules/User/views/business.php
index f535d11..c9ad744 100644
--- a/application/modules/User/views/business.php
+++ b/application/modules/User/views/business.php
@@ -80,7 +80,7 @@
                         </li>
                       </ul>
 
-                      <a class="btn btn-success" href="<?php echo base_url()?>business/get_business/<?php echo md5($businessData->id);?>"><i class="fa fa-edit m-right-xs"></i>Edit Business</a>
+                      <a class="btn btn-success" href="<?php echo base_url()?>Business/get_business/<?php echo md5($businessData->id);?>"><i class="fa fa-edit m-right-xs"></i>Edit Business</a>
                       <br />
 
                       </div>
diff --git a/application/modules/User/views/change_password.php b/application/modules/User/views/change_password.php
index e039253..cf5c044 100644
--- a/application/modules/User/views/change_password.php
+++ b/application/modules/User/views/change_password.php
@@ -97,7 +97,7 @@
     var data = $("#change-pass").serialize();
     $.ajax({ 
       type: "post",
-      url: "<?php echo base_url();?>user/check_password",
+      url: "<?php echo base_url();?>User/check_password",
       data: data,
       json: true,
       success: function(response) {
@@ -105,7 +105,7 @@
         if (response.status == "success") {
             console.log("ssssssssss");
           $('input[name=csrf_test_name]').val(response.csrf_hash); 
-          location.href = "<?php echo base_url();?>auth/logout";
+          location.href = "<?php echo base_url();?>Auth/logout";
         } 
         else {
             $('input[name=csrf_test_name]').val(response.csrf_hash); 
diff --git a/application/modules/User/views/profile.php b/application/modules/User/views/profile.php
index 99a7bbc..a8e6eae 100644
--- a/application/modules/User/views/profile.php
+++ b/application/modules/User/views/profile.php
@@ -57,7 +57,7 @@
                           if ($userData->profile_image == NULL) {
                           ?>
                           <div class="profilepic"> 
-                            <img style="width: 100%;height: 100%; display: block;" src="<?php echo base_url(); ?>assets/uploads/profile_picture/profile.jpg ?>" alt="Avatar" title="Change the avatar">
+                            <img style="width: 100%;height: 100%; display: block;" src="<?php echo base_url(); ?>/assets/uploads/profile_picture/profile.jpg" alt="Avatar" title="Change the avatar">
                             <input id="file_profile" name="profile_image" class="typeFile1" type="file" hidden/>
                             <div class="profilepic__content">
                               <span class="profilepic__icon"><i class="fa fa-camera" style="font-size:25px;color:black"></i></span>
@@ -68,7 +68,7 @@
                           } else {
                           ?>
                           <div class="profilepic">  
-                            <img class="profilepic__image" style="width: 100%; display: block;border-radius:50%" src="<?php echo base_url(); ?>assets/uploads/profile_picture/<?php echo $userData->profile_image ?> ?>" alt="Avatar" title="Change the avatar">
+                            <img class="profilepic__image" style="width: 100%; display: block;border-radius:50%" src="<?php echo base_url();?>/assets/uploads/profile_picture/<?php echo $userData->profile_image ?>" alt="Avatar" title="Change the avatar">
                             <input id="file_profile" name="profile_image" class="typeFile1" type="file" hidden/>
                             <div class="profilepic__content">
                               <span class="profilepic__icon"><i class="fa fa-camera" style="font-size:25px;color:black"></i></span>
@@ -95,7 +95,7 @@
                       <?php 
                       if (is_superadmin()) {
                       ?>
-                        <a class="btn btn-success" href="<?php echo base_url()?>user/editprofile/<?php echo md5(user()->id);?>"><i class="fa fa-edit m-right-xs"></i>Edit Profile</a>
+                        <a class="btn btn-success" href="<?php echo base_url()?>User/editprofile/<?php echo md5(user()->id);?>"><i class="fa fa-edit m-right-xs"></i>Edit Profile</a>
                         <br />
                       <?php
                       }
diff --git a/application/modules/User/views/user_list.php b/application/modules/User/views/user_list.php
index ed9976a..e33cf94 100644
--- a/application/modules/User/views/user_list.php
+++ b/application/modules/User/views/user_list.php
@@ -7,7 +7,7 @@
    <h2>User Details </h2>
 		<ul class="nav navbar-right panel_toolbox">
     <?php if(user()->action_permit != 'view' )  { ?>
-			 <a href="<?php echo base_url();?>user/addUser" class="btn btn-sm btn-primary">Add User</a>
+			 <a href="<?php echo base_url();?>User/addUser" class="btn btn-sm btn-primary">Add User</a>
        <?php } ?>
                    <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a></li>
     </ul>
@@ -46,16 +46,16 @@
 					<td style=" text-align: center;  font-size: 16px;">
             <?php if ($value->is_active == 1) { ?>
               <?php if(user()->action_permit != 'view' )  { ?>
-              <a href="<?php echo base_url()?>user/editUser/<?php echo md5($value->id);?>" ><i class="fa fa-pencil"></i></a>
+              <a href="<?php echo base_url()?>User/editUser/<?php echo md5($value->id);?>" ><i class="fa fa-pencil" title="Edit"></i></a>
 						  &nbsp;
-	            <a href="<?php echo base_url()?>user/deleteUser/<?php echo md5($value->id);?>" >           
-              <i class="#008000 fa fa-check-circle" style="font-size:20px;" title="deactivate"></i></a>
+	            <a href="<?php echo base_url()?>User/deleteUser/<?php echo md5($value->id);?>" >           
+              <i  class="fa fa-times-circle-o" aria-hidden="true" style="font-size:20px;" title="deactivate"></i></a>
 						  &nbsp;
               <?php } ?>
               <a> <i id="<?php echo md5($value->id);?>" class="bi bi-card-list" title="History"></i></a>
               <?php } ?>
               <?php if ($value->is_active == 0) { ?>
-                <a href="<?php echo base_url()?>user/activateUser/<?php echo md5($value->id);?>" >           
+                <a href="<?php echo base_url()?>User/activateUser/<?php echo md5($value->id);?>" >           
                 <i class="green fa fa-check-circle" style="font-size:20px;" title="activate"></i></a>
                 &nbsp;
                 <a> <i id="<?php echo md5($value->id);?>" class="bi bi-card-list" title="History"></i></a>
@@ -86,7 +86,7 @@
   var id = $(this).attr("id")
     $.ajax({ 
       type: "get",
-      url: "<?php echo base_url()?>user/view_user_history/"+id,
+      url: "<?php echo base_url()?>User/view_user_history/"+id,
       success: function(response) {
         response = JSON.parse(response);
         console.log(response);
diff --git a/assets/default/build/css/custom.min.css b/assets/default/build/css/custom.min.css
index f8c6a83..d156360 100644
--- a/assets/default/build/css/custom.min.css
+++ b/assets/default/build/css/custom.min.css
@@ -1,4 +1,4 @@
-@font-face{font-family:'Glyphicons Halflings';src:url("https://netdna.bootstrapcdn.com/bootstrap/3.0.0/fonts/glyphicons-halflings-regular.eot");src:url("https://netdna.bootstrapcdn.com/bootstrap/3.0.0/fonts/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"),url("https://netdna.bootstrapcdn.com/bootstrap/3.0.0/fonts/glyphicons-halflings-regular.woff") format("woff"),url("https://netdna.bootstrapcdn.com/bootstrap/3.0.0/fonts/glyphicons-halflings-regular.ttf") format("truetype"),url("https://netdna.bootstrapcdn.com/bootstrap/3.0.0/fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular") format("svg")}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-euro:before,.glyphicon-eur:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}.left_col{background:#2A3F54}.container{width:100%;padding:0;max-width:100%}.nav-sm .container.body .col-md-3.left_col{min-height:100%;width:70px;padding:0;z-index:9999;position:absolute}.nav-sm .container.body .col-md-3.left_col.menu_fixed{position:fixed;height:100%}.nav-sm .container.body .col-md-3.left_col .mCSB_container,.nav-sm .container.body .col-md-3.left_col .mCustomScrollBox{overflow:visible}.nav-sm .hidden-small{visibility:hidden}.nav-sm .container.body .right_col{padding:10px 20px;margin-left:70px;z-index:2}.nav-sm .navbar.nav_title{width:70px}.nav-sm .navbar.nav_title a span{display:none}.nav-sm .navbar.nav_title a i{font-size:27px;margin:13px 0 0 3px}.site_title i{border:1px solid #EAEAEA;padding:5px 6px;border-radius:50%}.nav-sm .main_container .top_nav{display:block;margin-left:70px;z-index:2}.nav-sm .nav.side-menu li a{text-align:center !important;font-weight:400;font-size:10px;padding:10px 5px}.nav-sm .nav.child_menu li.active,.nav-sm .nav.side-menu li.active-sm{border-right:5px solid #1ABB9C}.nav-sm ul.nav.child_menu ul,.nav-sm .nav.side-menu li.active-sm ul ul{position:static;width:200px;background:none}.nav-sm>.nav.side-menu>li.active-sm>a{color:#1ABB9C !important}.nav-sm .nav.side-menu li a i.toggle-up{display:none !important}.nav-sm .nav.side-menu li a i{font-size:25px !important;text-align:center;width:100% !important;margin-bottom:5px}.nav-sm ul.nav.child_menu{left:100%;position:absolute;top:0;width:210px;z-index:4000;background:#3E5367;display:none}.nav-sm ul.nav.child_menu li{padding:0 10px}.nav-sm ul.nav.child_menu li a{text-align:left !important}.nav-sm .profile{display:none}.menu_section{margin-bottom:35px}.menu_section h3{padding-left:23px;color:#fff;text-transform:uppercase;letter-spacing:.5px;font-weight:bold;font-size:11px;margin-bottom:0;margin-top:0;text-shadow:1px 1px #000}.menu_section>ul{margin-top:10px;display:block}.profile_pic{width:35%;float:left}.img-circle.profile_img{width:70%;background:#fff;margin-left:15%;z-index:1000;position:inherit;margin-top:20px;border:1px solid rgba(52,73,94,0.44);padding:4px}.profile_info{padding:25px 10px 10px;width:65%;float:left}.profile_info span{font-size:13px;line-height:30px;color:#BAB8B8}.profile_info h2{font-size:14px;color:#ECF0F1;margin:0;font-weight:300}.profile.img_2{text-align:center}.profile.img_2 .profile_pic{width:100%}.profile.img_2 .profile_pic .img-circle.profile_img{width:50%;margin:10px 0 0}.profile.img_2 .profile_info{padding:15px 10px 0;width:100%;margin-bottom:10px;float:left}.main_menu span.fa{float:right;text-align:center;margin-top:5px;font-size:10px;min-width:inherit;color:#C4CFDA}.active a span.fa{text-align:right !important;margin-right:4px}.nav-sm .menu_section{margin:0}.nav-sm span.fa,.nav-sm .menu_section h3{display:none}.nav-sm li li span.fa{display:inline-block}.nav_menu{float:left;background:#EDEDED;border-bottom:1px solid #D9DEE4;margin-bottom:10px;width:100%;position:relative}.info-number .badge{font-size:10px;font-weight:normal;line-height:13px;padding:2px 6px;position:absolute;right:-2px;top:-8px}@media (min-width: 480px){.nav_menu{position:static}.item{display:block}}.nav-md .container.body .col-md-3.left_col{min-height:100%;width:230px;padding:0;position:absolute;display:-webkit-box;display:-ms-flexbox;display:flex;z-index:1}.nav-md .container.body .col-md-3.left_col.menu_fixed{height:100%;position:fixed}body .container.body .right_col{background:#F7F7F7}.nav-md .container.body .right_col{padding:10px 20px 0;margin-left:230px}.nav_title{width:230px;float:left;background:#2A3F54;border-radius:0;height:57px;padding:0px}@media (max-width: 991px){.nav-md .container.body .right_col,.nav-md .container.body .top_nav{width:100%;margin:0}.nav-md .container.body .col-md-3.left_col{display:none}.nav-md .container.body .right_col{width:100%;padding-right:0}.right_col{padding:10px !important}.item{display:block}}@media (max-width: 1200px){.x_title h2{width:62%;font-size:17px}.tile,.graph{zoom:76%;height:inherit}.item{display:block}}@media (max-width: 1270px) and (min-width: 192px){.x_title h2 small{display:none}}.left_col .mCSB_scrollTools{width:6px}.left_col .mCSB_dragger{max-height:400px !important}.blue{color:#3498DB}.purple{color:#9B59B6}.green{color:#1ABB9C}.aero{color:#9CC2CB}.red{color:#E74C3C}.dark{color:#34495E}.border-blue{border-color:#3498DB !important}.border-purple{border-color:#9B59B6 !important}.border-green{border-color:#1ABB9C !important}.border-aero{border-color:#9CC2CB !important}.border-red{border-color:#E74C3C !important}.border-dark{border-color:#34495E !important}.bg-white{background:#fff !important;border:1px solid #fff !important;color:#73879C}.bg-green{background:#1ABB9C !important;border:1px solid #1ABB9C !important;color:#fff}.bg-red{background:#E74C3C !important;border:1px solid #E74C3C !important;color:#fff}.bg-blue{background:#3498DB !important;border:1px solid #3498DB !important;color:#fff}.bg-orange{background:#F39C12 !important;border:1px solid #F39C12 !important;color:#fff}.bg-purple{background:#9B59B6 !important;border:1px solid #9B59B6 !important;color:#fff}.bg-blue-sky{background:#50C1CF !important;border:1px solid #50C1CF !important;color:#fff}.container{width:100%;padding:0;max-width:100%}.navbar-nav>li>a,.navbar-brand,.navbar-nav>li>a{color:#fff !important}body{color:#73879C;background:#2A3F54;font-family:"Helvetica Neue", Roboto, Arial, "Droid Sans", sans-serif;font-size:13px;font-weight:400;line-height:1.471}.main_container .top_nav{display:block;margin-left:230px}.no-padding{padding:0 !important}.page-title{width:100%;height:65px;padding:10px 0}.page-title .title_left{width:45%;float:left;display:block}.page-title .title_left h3{margin:9px 0}.page-title .title_right{width:55%;float:left;display:block}.page-title .title_right .pull-right{margin:10px 0;float:right}.fixed_height_320{height:320px}.fixed_height_390{height:390px}.fixed_height_200{height:200px}.overflow_hidden{overflow:hidden}.progress-bar-dark{background-color:#34495E !important}.progress-bar-gray{background-color:#BDC3C7 !important}table.no-margin .progress{margin-bottom:0}.main_content{padding:10px 20px}.col-md-55{width:50%;margin-bottom:10px}@media (min-width: 768px){.col-md-55{width:20%}}@media (min-width: 992px){.col-md-55{width:20%}}@media (min-width: 1200px){.col-md-55{width:20%}}@media (min-width: 192px) and (max-width: 1270px){table.tile_info span.right{margin-right:7px;float:left}}.center-margin{margin:0 auto;float:none !important}.col-md-55,.col-xs-12,.col-sm-1,.col-md-1,.col-lg-1,.col-xs-2,.col-sm-2,.col-md-2,.col-lg-2,.col-xs-3,.col-sm-3,.col-md-3,.col-lg-3,.col-xs-4,.col-sm-4,.col-md-4,.col-lg-4,.col-xs-5,.col-sm-5,.col-md-5,.col-lg-5,.col-xs-6,.col-sm-6,.col-md-6,.col-lg-6,.col-xs-7,.col-sm-7,.col-md-7,.col-lg-7,.col-xs-8,.col-sm-8,.col-md-8,.col-lg-8,.col-xs-9,.col-sm-9,.col-md-9,.col-lg-9,.col-xs-10,.col-sm-10,.col-md-10,.col-lg-10,.col-xs-11,.col-sm-11,.col-md-11,.col-lg-11,.col-sm-12,.col-md-12,.col-lg-12{position:relative;min-height:1px;float:left;padding-right:10px;padding-left:10px}.row{margin-right:-10px;margin-left:-10px}.grid_slider .col-md-6{padding:0 40px}h1,.h1,h2,.h2,h3,.h3{margin-top:10px;margin-bottom:10px}a{color:#5A738E;text-decoration:none}a,a:visited,a:focus,a:active,:visited,:focus,:active,.btn:focus,.btn:active:focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn.active.focus{outline:0}a:hover,a:focus{text-decoration:none}.navbar{margin-bottom:0}.navbar-header{background:#34495E}.navbar-right{margin-right:0}.top_nav .navbar-right{margin:13px;width:auto;float:right}.top_nav .navbar-right li{display:inline-block;float:right;position:static}@media (min-width: 480px){.top_nav .navbar-right li{position:relative}.item{display:block}}.top_nav .dropdown-menu li{width:100%}.dropdown-item{width:100%;padding:12px 20px}.top_nav li a i{font-size:15px}.navbar-static-top{position:fixed;top:0;width:100%}.sidebar-header{border-bottom:0;margin-top:46px}.sidebar-header:first-of-type{margin-top:0}.nav>li{position:relative;display:block}.nav.side-menu>li{position:relative;display:block;cursor:pointer}.nav.side-menu>li>a{margin-bottom:6px}.nav.side-menu>li>a:hover{color:#F2F5F7 !important}.nav.side-menu>li>a:hover,.nav>li>a:focus{text-decoration:none;background:transparent}.nav.child_menu{display:none}.nav.child_menu li:hover,.nav.child_menu li.active{background-color:rgba(255,255,255,0.06)}.nav.child_menu li{padding-left:36px}.nav-md ul.nav.child_menu li:before{background:#425668;bottom:auto;content:"";height:8px;left:23px;margin-top:15px;position:absolute;right:auto;width:8px;z-index:1;border-radius:50%}.nav-md ul.nav.child_menu li:after{border-left:1px solid #425668;bottom:0;content:"";left:27px;position:absolute;top:0}.nav-md ul.nav.child_menu li:last-child::after{bottom:50%}.nav.side-menu>li>a,.nav.child_menu>li>a{color:#E7E7E7;font-weight:500}.nav.child_menu li li:hover,.nav.child_menu li li.active{background:none}.nav.child_menu li li a:hover,.nav.child_menu li li a.active{color:#fff}.nav>li>a{position:relative;display:block;padding:13px 15px 12px}.nav.side-menu>li.current-page,.nav.side-menu>li.active{border-right:5px solid #1ABB9C}.nav li.current-page{background:rgba(255,255,255,0.05)}.nav li li li.current-page{background:none}.nav li li.current-page a{color:#fff}.nav.side-menu>li.active>a{text-shadow:rgba(0,0,0,0.25) 0 -1px 0;background:-webkit-gradient(linear, left top, left bottom, from(#334556), to(#2C4257)),#2A3F54;background:linear-gradient(#334556, #2C4257),#2A3F54;-webkit-box-shadow:rgba(0,0,0,0.25) 0 1px 0,inset rgba(255,255,255,0.16) 0 1px 0;box-shadow:rgba(0,0,0,0.25) 0 1px 0,inset rgba(255,255,255,0.16) 0 1px 0}.navbar-brand,.navbar-nav>li>a{font-weight:500;color:#ECF0F1 !important;margin-left:0 !important;line-height:32px}.site_title{text-overflow:ellipsis;overflow:hidden;font-weight:400;font-size:22px;width:100%;color:#ECF0F1 !important;margin-left:0 !important;line-height:59px;display:block;height:55px;margin:0;padding-left:10px}.site_title:hover,.site_title:focus{text-decoration:none}.nav.navbar-nav>li>a{color:#515356 !important}.nav.top_menu>li>a{position:relative;display:block;padding:10px 15px;color:#34495E !important}.nav>li>a:hover,.nav>li>a:focus{background-color:transparent}.top_search{padding:0}.top_search .form-control{border-right:0;-webkit-box-shadow:inset 0 1px 0px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0px rgba(0,0,0,0.075);border-radius:25px 0px 0px 25px;padding-left:20px;border:1px solid rgba(221,226,232,0.49)}.top_search .form-control:focus{border:1px solid rgba(221,226,232,0.49);border-right:0}.top_search .input-group-btn button{border-radius:0px 25px 25px 0px;border:1px solid rgba(221,226,232,0.49);border-left:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);color:#93A2B2;margin-bottom:0 !important}.toggle{float:left;margin:0;width:70px}.toggle a{padding:15px 15px 0;margin:0;cursor:pointer}.toggle a i{font-size:26px}.nav.child_menu>li>a{color:rgba(255,255,255,0.75);font-size:12px;padding:9px}.panel_toolbox{float:right;min-width:70px}.panel_toolbox>li{float:left;cursor:pointer}.panel_toolbox>li>a{padding:5px;color:#C5C7CB;font-size:14px}.panel_toolbox>li>a:hover{background:#F5F7FA}.line_30{line-height:30px}.main_menu_side{padding:0}.bs-docs-sidebar .nav>li>a{display:block;padding:4px 6px}footer{background:#fff;padding:10px 20px;display:block}.nav-sm footer{margin-left:70px}.footer_fixed footer{position:fixed;left:0px;bottom:0px;width:100%}@media (min-width: 768px){.footer_fixed footer{margin-left:0}}@media (min-width: 768px){.footer_fixed .nav-sm footer{margin-left:0}}.tile-stats.sparkline{padding:10px;text-align:center}.jqstooltip{background:#34495E !important;width:30px !important;height:22px !important;text-decoration:none}.tooltip{display:block !important}.tiles{border-top:1px solid #ccc;margin-top:15px;padding-top:5px;margin-bottom:0}.tile{overflow:hidden}.top_tiles{margin-bottom:0}.top_tiles .tile h2{font-size:30px;line-height:30px;margin:3px 0 7px;font-weight:bold}article.media{width:100%}*,*:before,*:after{-webkit-box-sizing:border-box;box-sizing:border-box}#integration-list{width:100%;margin:0 auto;display:table}#integration-list ul{padding:0;margin:20px 0;color:#555}#integration-list ul>li{list-style:none;border-top:1px solid #ddd;display:block;padding:15px;overflow:hidden}#integration-list ul:last-child{border-bottom:1px solid #ddd}#integration-list ul>li:hover{background:#efefef}.expand{display:block;text-decoration:none;color:#555;cursor:pointer}.expand h2{width:85%;float:left}h2{font-size:18px;font-weight:400}#left,#right{display:table}#sup{display:table-cell;vertical-align:middle;width:80%}.detail a{text-decoration:none;color:#C0392B;border:1px solid #C0392B;padding:6px 10px 5px;font-size:13px;margin-right:7px}.detail{margin:10px 0 10px 0px;display:none;line-height:22px;height:150px}.detail span{margin:0}.right-arrow{width:10px;float:right;font-weight:bold;font-size:20px}.accordion .panel{margin-bottom:5px;border-radius:0;border-bottom:1px solid #efefef}.accordion .panel-heading{background:#F2F5F7;padding:13px;width:100%;display:block}.accordion .panel:hover{background:#F2F5F7}.x_panel{position:relative;width:100%;margin-bottom:10px;padding:10px 17px;display:inline-block;background:#fff;border:1px solid #E6E9ED;-webkit-column-break-inside:avoid;-moz-column-break-inside:avoid;column-break-inside:avoid;opacity:1;-webkit-transition:all .2s ease;transition:all .2s ease}.x_title{border-bottom:2px solid #E6E9ED;padding:1px 5px 6px;margin-bottom:10px}.x_title .filter{width:40%;float:right}.x_title h2{margin:5px 0 6px;float:left;display:block;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.x_title h2 small{margin-left:10px}.x_title span{color:#BDBDBD}.x_content{padding:0 3px 6px;position:relative;width:100%;float:left;clear:both;margin-top:5px}.x_content h4{font-size:16px;font-weight:500}legend{padding-bottom:7px}.demo-placeholder{height:280px}.profile_details:nth-child(3n){clear:both}.profile_details .profile_view{display:inline-block;padding:10px 0 0;background:#fff}.profile_details .profile_view .divider{border-top:1px solid #e5e5e5;padding-top:5px;margin-top:5px}.profile_details .profile_view .ratings{margin-bottom:0}.profile_details .profile_view .left{margin-top:20px}.profile_details .profile_view .left p{margin-bottom:3px}.profile_details .profile_view .right{margin-top:0px;padding:10px}.profile_details .profile_view .img-circle{border:1px solid #E6E9ED;padding:2px}.profile_details .profile_view h2{margin:5px 0}.profile_details .profile_view .ratings{text-align:left;font-size:16px}.brief{margin:0;font-weight:300}.profile_details .profile_left{background:white}.pagination.pagination-split li{display:inline-block;margin-right:3px}.pagination.pagination-split li a{border-radius:4px;color:#768399;-moz-border-radius:4px;-webkit-border-radius:4px}table.tile h3,table.tile h4,table.tile span{font-weight:bold;vertical-align:middle !important}table.tile th,table.tile td{text-align:center}table.tile th{border-bottom:1px solid #E6ECEE}table.tile td{padding:5px 0}table.tile td ul{text-align:left;padding-left:0}table.tile td ul li{list-style:none;width:100%}table.tile td ul li a{width:100%}table.tile td ul li a big{right:0;float:right;margin-right:13px}table.tile_info{width:100%}table.tile_info td{text-align:left;padding:1px;font-size:15px}table.tile_info td p{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;margin:0;line-height:28px}table.tile_info td i{margin-right:8px;font-size:17px;float:left;width:18px;line-height:28px}table.tile_info td:first-child{width:83%}td span{line-height:28px}.sidebar-widget{overflow:hidden}.error-number{font-size:90px;line-height:90px;margin:20px 0}.col-middle{margin-top:5%}.mid_center{width:370px;margin:0 auto;text-align:center;padding:10px 20px}h3.degrees{font-size:22px;font-weight:400;text-align:center}.degrees:after{content:"o";position:relative;top:-12px;font-size:13px;font-weight:300}.daily-weather .day{font-size:14px;border-top:2px solid rgba(115,135,156,0.36);text-align:center;border-bottom:2px solid rgba(115,135,156,0.36);padding:5px 0}.weather-days .col-sm-2{overflow:hidden;width:16.66666667%}.weather .row{margin-bottom:0}.bulk-actions{display:none}table.countries_list{width:100%}table.countries_list td{padding:0 10px;line-height:30px;border-top:1px solid #eeeeee}.dataTables_paginate a{padding:6px 9px !important;background:#ddd !important;border-color:#ddd !important}.paging_full_numbers a.paginate_active{background-color:rgba(38,185,154,0.59) !important;border-color:rgba(38,185,154,0.59) !important}button.DTTT_button,div.DTTT_button,a.DTTT_button{border:1px solid #E7E7E7 !important;background:#E7E7E7 !important;-webkit-box-shadow:none !important;box-shadow:none !important}table.jambo_table{border:1px solid rgba(221,221,221,0.78)}table.jambo_table thead{background:rgba(52,73,94,0.94);color:#ECF0F1}table.jambo_table tbody tr:hover td{background:rgba(38,185,154,0.07);border-top:1px solid rgba(38,185,154,0.11);border-bottom:1px solid rgba(38,185,154,0.11)}table.jambo_table tbody tr.selected{background:rgba(38,185,154,0.16)}table.jambo_table tbody tr.selected td{border-top:1px solid rgba(38,185,154,0.4);border-bottom:1px solid rgba(38,185,154,0.4)}.dataTables_paginate a{background:#ff0000}.dataTables_wrapper{position:relative;clear:both;zoom:1}.dataTables_processing{position:absolute;top:50%;left:50%;width:250px;height:30px;margin-left:-125px;margin-top:-15px;padding:14px 0 2px 0;border:1px solid #ddd;text-align:center;color:#999;font-size:14px;background-color:white}.dataTables_info{width:60%;float:left}.dataTables_paginate{float:right;text-align:right}table.dataTable th.focus,table.dataTable td.focus{outline:2px solid #1ABB9C !important;outline-offset:-1px}table.display{margin:0 auto;clear:both;width:100%}table.display thead th{padding:8px 18px 8px 10px;border-bottom:1px solid black;font-weight:bold;cursor:pointer}table.display tfoot th{padding:3px 18px 3px 10px;border-top:1px solid black;font-weight:bold}table.display tr.heading2 td{border-bottom:1px solid #aaa}table.display td{padding:3px 10px}table.display td.center{text-align:center}table.display thead th:active,table.display thead td:active{outline:none}.dataTables_scroll{clear:both}.dataTables_scrollBody{*margin-top:-1px;-webkit-overflow-scrolling:touch}.top .dataTables_info{float:none}.clear{clear:both}.dataTables_empty{text-align:center}tfoot input{margin:0.5em 0;width:100%;color:#444}tfoot input.search_init{color:#999}td.group{background-color:#d1cfd0;border-bottom:2px solid #A19B9E;border-top:2px solid #A19B9E}td.details{background-color:#d1cfd0;border:2px solid #A19B9E}.example_alt_pagination div.dataTables_info{width:40%}.paging_full_numbers{width:400px;height:22px;line-height:22px}.paging_full_numbers a:active{outline:none}.paging_full_numbers a:hover{text-decoration:none}.paging_full_numbers a.paginate_button,.paging_full_numbers a.paginate_active{border:1px solid #aaa;-webkit-border-radius:5px;-moz-border-radius:5px;padding:2px 5px;margin:0 3px;cursor:pointer}.paging_full_numbers a.paginate_button{background-color:#ddd}.paging_full_numbers a.paginate_button:hover{background-color:#ccc;text-decoration:none !important}.paging_full_numbers a.paginate_active{background-color:#99B3FF}table.display tr.even.row_selected td{background-color:#B0BED9}table.display tr.odd.row_selected td{background-color:#9FAFD1}div.box{height:100px;padding:10px;overflow:auto;border:1px solid #8080FF;background-color:#E5E5FF}ul.msg_list li{background:#f7f7f7;padding:5px;display:-webkit-box;display:-ms-flexbox;display:flex;margin:6px 6px 0;width:96% !important}ul.msg_list li:last-child{margin-bottom:6px;padding:10px}ul.msg_list li a{padding:3px 5px !important}ul.msg_list li a .image img{border-radius:2px 2px 2px 2px;-webkit-border-radius:2px 2px 2px 2px;float:left;margin-right:10px;width:11%}ul.msg_list li a .time{font-size:11px;font-style:italic;font-weight:bold;position:absolute;right:35px}ul.msg_list li a .message{display:block !important;font-size:11px}.dropdown-menu.msg_list span{white-space:normal}.dropdown-menu{border:medium none;-webkit-box-shadow:none;box-shadow:none;display:none;float:left;font-size:12px;left:0;list-style:none outside none;padding:0;position:absolute;text-shadow:none;top:100%;z-index:9998;border:1px solid #D9DEE4;border-top-left-radius:0;border-top-right-radius:0}.dropdown-menu>li>a{color:#5A738E}.navbar-nav .open .dropdown-menu{position:absolute;background:#fff;margin-top:0;border:1px solid #D9DEE4;-webkit-box-shadow:none;right:0;left:auto;width:220px}.navbar-nav .open .dropdown-menu.msg_list{width:300px !important}ul.to_do{padding:0}ul.to_do li{background:#f3f3f3;border-radius:3px;position:relative;padding:7px;margin-bottom:5px;list-style:none}ul.to_do p{margin:0}.dashboard-widget{background:#f6f6f6;border-top:5px solid #79C3DF;border-radius:3px;padding:5px 10px 10px}.dashboard-widget .dashboard-widget-title{font-weight:normal;border-bottom:1px solid #c1cdcd;margin:0 0 10px 0;padding-bottom:5px;padding-left:40px;line-height:30px}.dashboard-widget .dashboard-widget-title i{font-size:100%;margin-left:-35px;margin-right:10px;color:#33a1c9;padding:3px 6px;border:1px solid #abd9ea;border-radius:5px;background:#fff}ul.quick-list{width:45%;padding-left:0;display:inline-block}ul.quick-list li{padding-left:10px;list-style:none;margin:0;padding-bottom:6px;padding-top:4px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}ul.quick-list li i{padding-right:10px;color:#757679}.dashboard-widget-content{padding-top:9px}.dashboard-widget-content .sidebar-widget{width:50%;display:inline-block;vertical-align:top;background:#fff;border:1px solid #abd9ea;border-radius:5px;text-align:center;float:right;padding:2px;margin-top:10px}.widget_summary{width:100%;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex}.widget_summary .w_left{float:left;text-align:left}.widget_summary .w_center{float:left}.widget_summary .w_right{float:left;text-align:right}.widget_summary .w_right span{font-size:20px}.w_20{width:20%}.w_25{width:25%}.w_55{width:55%}h5.graph_title{text-align:left;margin-left:10px}h5.graph_title i{margin-right:10px;font-size:17px}span.right{float:right;font-size:14px !important}.tile_info a{text-overflow:ellipsis}.sidebar-footer{bottom:0px;clear:both;display:block;padding:5px 0 0 0;position:fixed;width:230px;background:#2A3F54}.sidebar-footer a{padding:7px 0 3px;text-align:center;width:25%;font-size:17px;display:block;float:left;background:#172D44}.sidebar-footer a:hover{background:#425567}.tile_count{margin-bottom:20px;margin-top:20px}.tile_count .tile_stats_count{border-bottom:1px solid #D9DEE4;padding:0 10px 0 20px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;position:relative}@media (min-width: 992px){footer{margin-left:230px}}@media (min-width: 992px){.tile_count .tile_stats_count{margin-bottom:10px;border-bottom:0;padding-bottom:10px}}.tile_count .tile_stats_count:before{content:"";position:absolute;left:0;height:65px;border-left:2px solid #ADB2B5;margin-top:10px}@media (min-width: 992px){.tile_count .tile_stats_count:first-child:before{border-left:0}}.tile_count .tile_stats_count .count{font-size:30px;line-height:47px;font-weight:600}@media (min-width: 768px){.tile_count .tile_stats_count .count{font-size:40px}}@media (min-width: 992px) and (max-width: 1100px){.tile_count .tile_stats_count .count{font-size:30px}}.tile_count .tile_stats_count span{font-size:12px}@media (min-width: 768px){.tile_count .tile_stats_count span{font-size:13px}}.tile_count .tile_stats_count .count_bottom i{width:12px}.dashboard_graph{background:#fff;padding:7px 10px}.dashboard_graph .col-md-9,.dashboard_graph .col-md-3{padding:0}a.user-profile{color:#5E6974 !important}.user-profile img{width:29px;height:29px;border-radius:50%;margin-right:10px}ul.top_profiles{width:100%}ul.top_profiles li{margin:0;padding:3px 5px}ul.top_profiles li:nth-child(odd){background-color:#eee}.media .profile_thumb{border:1px solid;width:50px;height:50px;margin:5px 10px 5px 0;border-radius:50%;padding:9px 12px}.media .profile_thumb i{font-size:30px}.media .date{background:#ccc;width:52px;margin-right:10px;border-radius:10px;padding:5px}.media .date .month{margin:0;text-align:center;color:#fff}.media .date .day{text-align:center;color:#fff;font-size:27px;margin:0;line-height:27px;font-weight:bold}.event .media-body a.title{font-weight:bold}.event .media-body p{margin-bottom:0}h4.graph_title{margin:7px;text-align:center}.fontawesome-icon-list .fa-hover a:hover{background-color:#ddd;color:#fff;text-decoration:none}.fontawesome-icon-list .fa-hover a{display:block;line-height:32px;height:32px;padding-left:10px;border-radius:4px}.fontawesome-icon-list .fa-hover a:hover .fa{font-size:28px;vertical-align:-6px}.fontawesome-icon-list .fa-hover a .fa{width:32px;font-size:16px;display:inline-block;text-align:right;margin-right:10px}.main_menu .fa{width:26px;opacity:.99;display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;font-size:18px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.tile-stats{position:relative;display:block;margin-bottom:12px;border:1px solid #E4E4E4;-webkit-border-radius:5px;overflow:hidden;padding-bottom:5px;-webkit-background-clip:padding-box;-moz-border-radius:5px;-moz-background-clip:padding;border-radius:5px;background-clip:padding-box;background:#FFF;-webkit-transition:all 300ms ease-in-out;transition:all 300ms ease-in-out}.tile-stats:hover .icon i{animation-name:tansformAnimation;animation-duration:.5s;animation-iteration-count:1;color:rgba(58,58,58,0.41);animation-timing-function:ease;animation-fill-mode:forwards;-webkit-animation-name:tansformAnimation;-webkit-animation-duration:.5s;-webkit-animation-iteration-count:1;-webkit-animation-timing-function:ease;-webkit-animation-fill-mode:forwards;-moz-animation-name:tansformAnimation;-moz-animation-duration:.5s;-moz-animation-iteration-count:1;-moz-animation-timing-function:ease;-moz-animation-fill-mode:forwards}.tile-stats .icon{width:20px;height:20px;color:#BAB8B8;position:absolute;right:53px;top:22px;z-index:1}.tile-stats .icon i{margin:0;font-size:60px;line-height:0;vertical-align:bottom;padding:0}.tile-stats .count{font-size:38px;font-weight:bold;line-height:1.65857143}.tile-stats .count,.tile-stats h3,.tile-stats p{position:relative;margin:0;margin-left:10px;z-index:5;padding:0}.tile-stats h3{color:#BAB8B8}.tile-stats p{margin-top:5px;font-size:12px}.tile-stats>.dash-box-footer{position:relative;text-align:center;margin-top:5px;padding:3px 0;color:#fff;color:rgba(255,255,255,0.8);display:block;z-index:10;background:rgba(0,0,0,0.1);text-decoration:none}.tile-stats>.dash-box-footer:hover{color:#fff;background:rgba(0,0,0,0.15)}.tile-stats>.dash-box-footer:hover{color:#fff;background:rgba(0,0,0,0.15)}table.tile_info{padding:10px 15px}table.tile_info span.right{margin-right:0;float:right;position:absolute;right:4%}.tile:hover{text-decoration:none}.tile_header{border-bottom:transparent;padding:7px 15px;margin-bottom:15px;background:#E7E7E7}.tile_head h4{margin-top:0;margin-bottom:5px}.tiles-bottom{padding:5px 10px;margin-top:10px;background:rgba(194,194,194,0.3);text-align:left}a.star{color:#428bca !important}.mail_content{background:none repeat scroll 0 0 #FFFFFF;border-radius:4px;margin-top:20px;min-height:500px;padding:10px 11px;width:100%}.list-btn-mail{margin-bottom:15px}.list-btn-mail.active{border-bottom:1px solid #39B3D7;padding:0 0 14px}.list-btn-mail>i{float:left;font-size:18px;font-style:normal;width:33px}.list-btn-mail>.cn{background:none repeat scroll 0 0 #39B3D7;border-radius:12px;color:#FFFFFF;float:right;font-style:normal;padding:0 5px}.button-mail{margin:0 0 15px !important;text-align:left;width:100%}button,.buttons,.btn,.modal-footer .btn+.btn{margin-bottom:5px;margin-right:5px}.btn-group-vertical .btn,.btn-group .btn{margin-bottom:0;margin-right:0}.mail_list_column{border-left:1px solid #DBDBDB}.mail_view{border-left:1px solid #DBDBDB}.mail_list{width:100%;border-bottom:1px solid #DBDBDB;margin-bottom:2px;display:inline-block}.mail_list .left{width:5%;float:left;margin-right:3%}.mail_list .right{width:90%;float:left}.mail_list h3{font-size:15px;font-weight:bold;margin:0px 0 6px}.mail_list h3 small{float:right;color:#ADABAB;font-size:11px;line-height:20px}.mail_list .badge{padding:3px 6px;font-size:8px;background:#BAB7B7}@media (max-width: 767px){.mail_list{margin-bottom:5px;display:inline-block}}.mail_heading h4{font-size:18px;border-bottom:1px solid #ddd;padding-bottom:10px;margin-top:20px}.attachment{margin-top:30px}.attachment ul{width:100%;list-style:none;padding-left:0;display:inline-block;margin-bottom:30px}.attachment ul li{float:left;width:150px;margin-right:10px;margin-bottom:10px}.attachment ul li img{height:150px;border:1px solid #ddd;padding:5px;margin-bottom:10px}.attachment ul li span{float:right}.attachment .file-name{float:left}.attachment .links{width:100%;display:inline-block}.compose{padding:0;position:fixed;bottom:0;right:0;background:#fff;border:1px solid #D9DEE4;border-right:0;border-bottom:0;border-top-left-radius:5px;z-index:9999;display:none}.compose .compose-header{padding:5px;background:#169F85;color:#fff;border-top-left-radius:5px}.compose .compose-header .close{text-shadow:0 1px 0 #ffffff;line-height:.8}.compose .compose-body .editor.btn-toolbar{margin:0}.compose .compose-body .editor-wrapper{height:100%;min-height:50px;max-height:180px;border-radius:0;border-left:none;border-right:none;overflow:auto}.compose .compose-footer{padding:10px}.editor.btn-toolbar{zoom:1;background:#F7F7F7;margin:5px 2px;padding:3px 0;border:1px solid #EFEFEF}.input-group{margin-bottom:10px}.ln_solid{border-top:1px solid #e5e5e5;color:#ffffff;background-color:#ffffff;height:1px;margin:20px 0}span.section{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}.form-control{border-radius:0;width:100%}.form-horizontal .control-label{padding-top:8px}.form-control:focus{border-color:#CCD0D7;-webkit-box-shadow:none !important;box-shadow:none !important}legend{font-size:18px;color:inherit}.form-horizontal .form-group{margin-right:0;margin-left:0}.form-control-feedback{position:absolute;margin-top:8px;height:23px;color:#bbb;line-height:24px;font-size:15px;top:0px;width:34px;text-align:center}.form-control-feedback.left{border-right:1px solid #ccc;left:13px}.form-control-feedback.right{border-left:1px solid #ccc;right:13px}.form-control.has-feedback-left{padding-left:45px}.form-control.has-feedback-right{padding-right:45px}.form-group{margin-bottom:10px}.validate{margin-top:10px}.invalid-form-error-message{margin-top:10px;padding:5px}.invalid-form-error-message.filled{border-left:2px solid #E74C3C}p.parsley-success{color:#468847;background-color:#DFF0D8;border:1px solid #D6E9C6}p.parsley-error{color:#B94A48;background-color:#F2DEDE;border:1px solid #EED3D7}ul.parsley-errors-list{list-style:none;color:#E74C3C;padding-left:0}input.parsley-error,textarea.parsley-error,select.parsley-error{background:#FAEDEC;border:1px solid #E85445}.btn-group .parsley-errors-list{display:none}.bad input,.bad select,.bad textarea{border:1px solid #CE5454;-webkit-box-shadow:0 0 4px -2px #CE5454;box-shadow:0 0 4px -2px #CE5454;position:relative;left:0;-moz-animation:.7s 1 shake linear;-webkit-animation:0.7s 1 shake linear}.item{display:-webkit-box;display:-ms-flexbox;display:flex}.item input,.item textarea{-webkit-transition:0.42s;transition:0.42s}.item .alert{float:left;margin:0 0 0 20px;padding:3px 10px;color:#FFF;border-radius:3px 4px 4px 3px;background-color:#CE5454;max-width:170px;white-space:pre;position:relative;left:-15px;opacity:0;z-index:1;-webkit-transition:0.15s ease-out;transition:0.15s ease-out}.item .alert::after{content:'';display:block;height:0;width:0;border-color:transparent #CE5454 transparent transparent;border-style:solid;border-width:11px 7px;position:absolute;left:-13px;top:1px}.item.bad .alert{left:0;opacity:1}.inl-bl{display:inline-block}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well .markup{background:#fff;color:#777;position:relative;padding:45px 15px 15px;margin:15px 0 0 0;background-color:#fff;border-radius:0 0 4px 4px;-webkit-box-shadow:none;box-shadow:none}.well .markup::after{content:"Example";position:absolute;top:15px;left:15px;font-size:12px;font-weight:bold;color:#bbb;text-transform:uppercase;letter-spacing:1px}.autocomplete-suggestions{border:1px solid #e4e4e4;background:#F4F4F4;cursor:default;overflow:auto}.autocomplete-suggestion{padding:2px 5px;font-size:1.2em;white-space:nowrap;overflow:hidden}.autocomplete-selected{background:#f0f0f0}.autocomplete-suggestions strong{font-weight:normal;color:#3399ff;font-weight:bolder}.btn{border-radius:3px}a.btn-success,a.btn-primary,a.btn-warning,a.btn-danger{color:#fff}.btn-success{background:#26B99A;border:1px solid #169F85}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background:#169F85}.btn-dark{color:#E9EDEF;background-color:#4B5F71;border-color:#364B5F}.btn-dark:hover,.btn-dark:focus,.btn-dark:active,.btn-dark.active,.open .dropdown-toggle.btn-dark{color:#FFFFFF;background-color:#394D5F;border-color:#394D5F}.btn-round{border-radius:30px}.btn.btn-app{position:relative;padding:15px 5px;margin:0 0 10px 10px;min-width:80px;height:60px;-webkit-box-shadow:none;box-shadow:none;border-radius:0;text-align:center;color:#666;border:1px solid #ddd;background-color:#fafafa;font-size:12px}.btn.btn-app>.fa,.btn.btn-app>.glyphicon,.btn.btn-app>.ion{font-size:20px;display:block}.btn.btn-app:hover{background:#f4f4f4;color:#444;border-color:#aaa}.btn.btn-app:active,.btn.btn-app:focus{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.btn-app>.badge{position:absolute;top:-3px;right:-10px;font-size:10px;font-weight:400}textarea{padding:10px;vertical-align:top;width:200px}textarea:focus{outline-style:solid;outline-width:2px}.btn_{display:inline-block;padding:3px 9px;margin-bottom:0;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f5f5f5;background-image:-webkit-gradient(linear, left top, left bottom, from(#fff), to(#e6e6e6));background-image:linear-gradient(to bottom, #fff, #e6e6e6);background-repeat:repeat-x;filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0)";border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:"progid:DXImageTransform.Microsoft.gradient(enabled=false)";border:1px solid #cccccc;border-bottom-color:#b3b3b3;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.bs-glyphicons{margin:0 -10px 20px;overflow:hidden}.bs-glyphicons-list{padding-left:0;list-style:none}.bs-glyphicons li{float:left;width:25%;height:115px;padding:10px;font-size:10px;line-height:1.4;text-align:center;background-color:#f9f9f9;border:1px solid #fff}.bs-glyphicons .glyphicon{margin-top:5px;margin-bottom:10px;font-size:24px}.bs-glyphicons .glyphicon-class{display:block;text-align:center;word-wrap:break-word}.bs-glyphicons li:hover{color:#fff;background-color:#1ABB9C}@media (min-width: 768px){.bs-glyphicons{margin-right:0;margin-left:0}.bs-glyphicons li{width:12.5%;font-size:12px}}.tagsinput{border:1px solid #CCC;background:#FFF;padding:6px 6px 0;width:300px;overflow-y:auto}span.tag{-moz-border-radius:2px;-webkit-border-radius:2px;display:block;float:left;padding:5px 9px;text-decoration:none;background:#1ABB9C;color:#F1F6F7;margin-right:5px;font-weight:500;margin-bottom:5px;font-family:helvetica}span.tag a{color:#F1F6F7 !important}.tagsinput span.tag a{font-weight:bold;color:#82ad2b;text-decoration:none;font-size:11px}.tagsinput input{width:80px;margin:0px;font-family:helvetica;font-size:13px;border:1px solid transparent;padding:3px;background:transparent;color:#000;outline:0px}.tagsinput div{display:block;float:left}.tags_clear{clear:both;width:100%;height:0px}.not_valid{background:#FBD8DB !important;color:#90111A !important}ul.bar_tabs{overflow:visible;background:#F5F7FA;height:25px;margin:21px 0 14px;padding-left:14px;position:relative;z-index:1;width:100%;border-bottom:1px solid #E6E9ED}ul.bar_tabs>li{border:1px solid #E6E9ED;color:#333 !important;margin-top:-17px;margin-left:8px;background:#fff;border-bottom:none;border-radius:4px 4px 0 0}ul.bar_tabs>li.active{border-right:6px solid #D3D6DA;border-top:0;margin-top:-15px}ul.bar_tabs>li a{padding:10px 17px;background:#F5F7FA;margin:0;border-top-right-radius:0}ul.bar_tabs>li a:hover{border:1px solid transparent}ul.bar_tabs>li.active a{border-bottom:none}ul.bar_tabs.right{padding-right:14px}ul.bar_tabs.right li{float:right}a:focus{outline:none}ul.timeline li{position:relative;border-bottom:1px solid #e8e8e8;clear:both}.timeline .block{margin:0;border-left:3px solid #e8e8e8;overflow:visible;padding:10px 15px;margin-left:105px}.timeline.widget{min-width:0;max-width:inherit}.timeline.widget .block{margin-left:5px}.timeline .tags{position:absolute;top:15px;left:0;width:84px}.timeline .tag{display:block;height:30px;font-size:13px;padding:8px}.timeline .tag span{display:block;overflow:hidden;width:100%;white-space:nowrap;text-overflow:ellipsis}.tag{line-height:1;background:#1ABB9C;color:#fff !important}.tag:after{content:" ";height:30px;width:0;position:absolute;left:100%;top:0;margin:0;pointer-events:none;border-top:14px solid transparent;border-bottom:14px solid transparent;border-left:11px solid #1ABB9C}.timeline h2.title{position:relative;font-size:16px;margin:0}.timeline h2.title:before{content:"";position:absolute;left:-23px;top:3px;display:block;width:14px;height:14px;border:3px solid #d2d3d2;border-radius:14px;background:#f9f9f9}.timeline .byline{padding:.25em 0}.byline{-webkit-font-smoothing:antialiased;font-style:italic;font-size:.9375em;line-height:1.3;color:#aab6aa}ul.social li{border:0}.social-sidebar,.social-body{float:right}.social-sidebar{background:#EDEDED;width:22%}.social-body{border:1px solid #ccc;width:78%}.thumb img{width:50px;height:50px;border-radius:50%}.chat .thumb img{width:27px;height:27px;border-radius:50%}.chat .status{float:left;margin:16px 0 0 -16px;font-size:14px;font-weight:bold;width:12px;height:12px;display:block;border:2px solid #FFF;z-index:12312;border-radius:50%}.chat .status.online{background:#1ABB9C}.chat .status.away{background:#F39C12}.chat .status.offline{background:#ccc}.chat .media-body{padding-top:5px}.dashboard_graph .x_title{padding:5px 5px 7px}.dashboard_graph .x_title h3{margin:0;font-weight:normal}.chart{position:relative;display:inline-block;width:110px;height:110px;margin-top:5px;margin-bottom:5px;text-align:center}.chart canvas{position:absolute;top:0;left:0}.percent{display:inline-block;line-height:110px;z-index:2;font-size:18px}.percent:after{content:'%';margin-left:0.1em;font-size:.8em}.angular{margin-top:100px}.angular .chart{margin-top:0}.widget{min-width:250px;max-width:310px}.widget_tally_box .btn-group button{text-align:center}.widget_tally_box .btn-group button{color:inherit;font-weight:500;background-color:#f5f5f5;border:1px solid #e7e7e7}ul.widget_tally,ul.widget_tally li{width:100%}ul.widget_tally li{padding:2px 10px;border-bottom:1px solid #ECECEC;padding-bottom:4px}ul.widget_tally .month{width:70%;float:left}ul.widget_tally .count{width:30%;float:left;text-align:right}.pie_bg{border-bottom:1px solid rgba(101,204,182,0.16);padding-bottom:15px;border-radius:4px;filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0)";filter:"progid:DXImageTransform.Microsoft.gradient(enabled=false)";padding-bottom:10px;-webkit-box-shadow:0 4px 6px -6px #222;box-shadow:0 4px 6px -6px #222}.widget_tally_box .flex{display:-webkit-box;display:-ms-flexbox;display:flex}ul.widget_profile_box{width:100%;height:42px;padding:3px;background:#ececec;margin-top:40px;margin-left:1px}ul.widget_profile_box li:first-child{width:25%;float:left}ul.widget_profile_box li:first-child a{float:left}ul.widget_profile_box li:last-child{width:25%;float:right}ul.widget_profile_box li:last-child a{float:right}ul.widget_profile_box li a{font-size:22px;text-align:center;width:35px;height:35px;border:1px solid rgba(52,73,94,0.44);display:block;border-radius:50%;padding:0px}ul.widget_profile_box li a:hover{color:#1ABB9C !important;border:1px solid #26b99a}ul.widget_profile_box li .profile_img{width:85px;height:85px;margin:0;margin-top:-28px}.widget_tally_box p,.widget_tally_box span{text-align:center}.widget_tally_box .name{text-align:center;margin:25px}.widget_tally_box .name_title{text-align:center;margin:5px}.widget_tally_box ul.legend{margin:0}.widget_tally_box ul.legend p,.widget_tally_box ul.legend span{text-align:left}.widget_tally_box ul.legend li .icon{font-size:20px;float:left;width:14px}.widget_tally_box ul.legend li .name{font-size:14px;margin:5px 0 0 14px;text-overflow:ellipsis;float:left}.widget_tally_box ul.legend p{display:inline-block;margin:0}.widget_tally_box ul.verticle_bars li{height:140px;width:23%}.widget .verticle_bars li .progress.vertical.progress_wide{width:65%}ul.count2{width:100%;margin-left:1px;border:1px solid #ddd;border-left:0;border-right:0;padding:10px 0;display:inherit}ul.count2 li{width:30%;text-align:center}ul.count2 li h3{font-weight:400;margin:0}ul.count2 li span{font-weight:300}.divider{border-bottom:1px solid #ddd;margin:10px}.divider-dashed{border-top:1px dashed #e7eaec;background-color:#ffffff;height:1px;margin:10px 0}ul.messages{padding:0;list-style:none}ul.messages li,.tasks li{border-bottom:1px dotted #e6e6e6;padding:8px 0}ul.messages li img.avatar,img.avatar{height:32px;width:32px;float:left;display:inline-block;border-radius:2px;padding:2px;background:#f7f7f7;border:1px solid #e6e6e6}ul.messages li .message_date{float:right;text-align:right}ul.messages li .message_wrapper{margin-left:50px;margin-right:40px}ul.messages li .message_wrapper h4.heading{font-weight:600;margin:0;cursor:pointer;margin-bottom:10px;line-height:100%}ul.messages li .message_wrapper blockquote{padding:0px 10px;margin:0;border-left:5px solid #eee}ul.user_data li{margin-bottom:6px}ul.user_data li p{margin-bottom:0}ul.user_data li .progress{width:90%}.project_progress .progress{margin-bottom:3px !important;margin-top:5px}.projects .list-inline{margin:0}.profile_title{background:#F5F7FA;border:0;padding:7px 0;display:-webkit-box;display:-ms-flexbox;display:flex}ul.stats-overview{border-bottom:1px solid #e8e8e8;padding-bottom:10px;margin-bottom:10px}ul.stats-overview li{display:inline-block;text-align:center;padding:0 15px;width:30%;font-size:14px;border-right:1px solid #e8e8e8}ul.stats-overview li:last-child{border-right:0}ul.stats-overview li .name{font-size:12px}ul.stats-overview li .value{font-size:14px;font-weight:bold;display:block}ul.stats-overview li:first-child{padding-left:0}ul.project_files li{margin-bottom:5px}ul.project_files li a i{width:20px}.project_detail p{margin-bottom:10px}.project_detail p.title{font-weight:bold;margin-bottom:0}.avatar img{border-radius:50%;max-width:45px}.pricing{background:#fff}.pricing .title{background:#1ABB9C;height:110px;color:#fff;padding:15px 0 0;text-align:center}.pricing .title h2{text-transform:capitalize;font-size:18px;border-radius:5px 5px 0 0;margin:0;font-weight:400}.pricing .title h1{font-size:25px;margin:12px}.pricing .title span{background:rgba(51,51,51,0.28);padding:2px 5px}.pricing_features{background:#FAFAFA;padding:20px 15px;min-height:230px;font-size:13.5px}.pricing_features ul li{margin-top:10px}.pricing_footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;text-align:center;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.pricing_footer p{font-size:13px;padding:10px 0 2px;display:block}.ui-ribbon-container{position:relative}.ui-ribbon-container .ui-ribbon-wrapper{position:absolute;overflow:hidden;width:85px;height:88px;top:-3px;right:-3px}.ui-ribbon-container.ui-ribbon-primary .ui-ribbon{background-color:#5b90bf}.ui-ribbon-container .ui-ribbon{position:relative;display:block;text-align:center;font-size:15px;font-weight:700;color:#fff;-webkit-transform:rotate(45deg);transform:rotate(45deg);padding:7px 0;left:-5px;top:15px;width:120px;line-height:20px;background-color:#555;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.3);box-shadow:0 0 3px rgba(0,0,0,0.3)}.ui-ribbon-container.ui-ribbon-primary .ui-ribbon:after,.ui-ribbon-container.ui-ribbon-primary .ui-ribbon:before{border-top:2px solid #5b90bf}.ui-ribbon-container .ui-ribbon:before{left:0;bottom:-1px}.ui-ribbon-container .ui-ribbon:before{right:0}.ui-ribbon-container .ui-ribbon:after,.ui-ribbon-container .ui-ribbon:before{position:absolute;content:" ";line-height:0;border-top:2px solid #555;border-left:2px solid transparent;border-right:2px solid transparent}.thumbnail .image{height:120px;overflow:hidden}.caption{padding:9px 5px;background:#F7F7F7}.caption p{margin-bottom:5px}.thumbnail{height:190px;overflow:hidden}.view{overflow:hidden;position:relative;text-align:center;-webkit-box-shadow:1px 1px 2px #e6e6e6;box-shadow:1px 1px 2px #e6e6e6;cursor:default}.view .mask,.view .content{position:absolute;width:100%;overflow:hidden;top:0;left:0}.view img{display:block;position:relative}.view .tools{text-transform:uppercase;color:#fff;text-align:center;position:relative;font-size:17px;padding:3px;background:rgba(0,0,0,0.35);margin:43px 0 0 0}.mask.no-caption .tools{margin:90px 0 0 0}.view .tools a{display:inline-block;color:#FFF;font-size:18px;font-weight:400;padding:0 4px}.view p{font-family:Georgia, serif;font-style:italic;font-size:12px;position:relative;color:#fff;padding:10px 20px 20px;text-align:center}.view a.info{display:inline-block;text-decoration:none;padding:7px 14px;background:#000;color:#fff;text-transform:uppercase;-webkit-box-shadow:0 0 1px #000;box-shadow:0 0 1px #000}.view-first img{-webkit-transition:all 0.2s linear;transition:all 0.2s linear}.view-first .mask{opacity:0;background-color:rgba(0,0,0,0.5);-webkit-transition:all 0.4s ease-in-out;transition:all 0.4s ease-in-out}.view-first .tools{-webkit-transform:translateY(-100px);transform:translateY(-100px);opacity:0;-webkit-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out}.view-first p{-webkit-transform:translateY(100px);transform:translateY(100px);opacity:0;-webkit-transition:all 0.2s linear;transition:all 0.2s linear}.view-first:hover img{-webkit-transform:scale(1.1);transform:scale(1.1)}.view-first:hover .mask{opacity:1}.view-first:hover .tools,.view-first:hover p{opacity:1;-webkit-transform:translateY(0px);transform:translateY(0px)}.view-first:hover p{-webkit-transition-delay:0.1s;transition-delay:0.1s}/*!
+@font-face{font-family:'Glyphicons Halflings';src:url("https://netdna.bootstrapcdn.com/bootstrap/3.0.0/fonts/glyphicons-halflings-regular.eot");src:url("https://netdna.bootstrapcdn.com/bootstrap/3.0.0/fonts/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"),url("https://netdna.bootstrapcdn.com/bootstrap/3.0.0/fonts/glyphicons-halflings-regular.woff") format("woff"),url("https://netdna.bootstrapcdn.com/bootstrap/3.0.0/fonts/glyphicons-halflings-regular.ttf") format("truetype"),url("https://netdna.bootstrapcdn.com/bootstrap/3.0.0/fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular") format("svg")}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-euro:before,.glyphicon-eur:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}.left_col{background:#2A3F54}.container{width:100%;padding:0;max-width:100%}.nav-sm .container.body .col-md-3.left_col{min-height:100%;width:70px;padding:0;z-index:9999;position:absolute}.nav-sm .container.body .col-md-3.left_col.menu_fixed{position:fixed;height:100%}.nav-sm .container.body .col-md-3.left_col .mCSB_container,.nav-sm .container.body .col-md-3.left_col .mCustomScrollBox{overflow:visible}.nav-sm .hidden-small{visibility:hidden}.nav-sm .container.body .right_col{padding:10px 20px;margin-left:70px;z-index:2}.nav-sm .navbar.nav_title{width:70px}.nav-sm .navbar.nav_title a span{display:none}.nav-sm .navbar.nav_title a i{font-size:27px;margin:13px 0 0 3px}.site_title i{border:1px solid #EAEAEA;padding:5px 6px;border-radius:50%}.nav-sm .main_container .top_nav{display:block;margin-left:70px;z-index:2}.nav-sm .nav.side-menu li a{text-align:center !important;font-weight:400;font-size:10px;padding:10px 5px}.nav-sm .nav.child_menu li.active,.nav-sm .nav.side-menu li.active-sm{border-right:5px solid #1ABB9C}.nav-sm ul.nav.child_menu ul,.nav-sm .nav.side-menu li.active-sm ul ul{position:static;width:200px;background:none}.nav-sm>.nav.side-menu>li.active-sm>a{color:#1ABB9C !important}.nav-sm .nav.side-menu li a i.toggle-up{display:none !important}.nav-sm .nav.side-menu li a i{font-size:25px !important;text-align:center;width:100% !important;margin-bottom:5px}.nav-sm ul.nav.child_menu{left:100%;position:absolute;top:0;width:210px;z-index:4000;background:#3E5367;display:none}.nav-sm ul.nav.child_menu li{padding:0 10px}.nav-sm ul.nav.child_menu li a{text-align:left !important}.nav-sm .profile{display:none}.menu_section{margin-bottom:35px}.menu_section h3{padding-left:23px;color:#fff;text-transform:uppercase;letter-spacing:.5px;font-weight:bold;font-size:11px;margin-bottom:0;margin-top:0;text-shadow:1px 1px #000}.menu_section>ul{margin-top:10px;display:block}.profile_pic{width:35%;float:left}.img-circle.profile_img{width:65px;height:65px;background:#fff;margin-left:15%;z-index:1000;position:inherit;margin-top:20px;border:1px solid rgba(52,73,94,0.44);padding:4px}.profile_info{padding:25px 10px 10px;width:65%;float:left}.profile_info span{font-size:13px;line-height:30px;color:#BAB8B8}.profile_info h2{font-size:14px;color:#ECF0F1;margin:0;font-weight:300}.profile.img_2{text-align:center}.profile.img_2 .profile_pic{width:100%}.profile.img_2 .profile_pic .img-circle.profile_img{width:50%;margin:10px 0 0}.profile.img_2 .profile_info{padding:15px 10px 0;width:100%;margin-bottom:10px;float:left}.main_menu span.fa{float:right;text-align:center;margin-top:5px;font-size:10px;min-width:inherit;color:#C4CFDA}.active a span.fa{text-align:right !important;margin-right:4px}.nav-sm .menu_section{margin:0}.nav-sm span.fa,.nav-sm .menu_section h3{display:none}.nav-sm li li span.fa{display:inline-block}.nav_menu{float:left;background:#EDEDED;border-bottom:1px solid #D9DEE4;margin-bottom:10px;width:100%;position:relative}.info-number .badge{font-size:10px;font-weight:normal;line-height:13px;padding:2px 6px;position:absolute;right:-2px;top:-8px}@media (min-width: 480px){.nav_menu{position:static}.item{display:block}}.nav-md .container.body .col-md-3.left_col{min-height:100%;width:230px;padding:0;position:absolute;display:-webkit-box;display:-ms-flexbox;display:flex;z-index:1}.nav-md .container.body .col-md-3.left_col.menu_fixed{height:100%;position:fixed}body .container.body .right_col{background:#F7F7F7}.nav-md .container.body .right_col{padding:10px 20px 0;margin-left:230px}.nav_title{width:230px;float:left;background:#2A3F54;border-radius:0;height:57px;padding:0px}@media (max-width: 991px){.nav-md .container.body .right_col,.nav-md .container.body .top_nav{width:100%;margin:0}.nav-md .container.body .col-md-3.left_col{display:none}.nav-md .container.body .right_col{width:100%;padding-right:0}.right_col{padding:10px !important}.item{display:block}}@media (max-width: 1200px){.x_title h2{width:62%;font-size:17px}.tile,.graph{zoom:76%;height:inherit}.item{display:block}}@media (max-width: 1270px) and (min-width: 192px){.x_title h2 small{display:none}}.left_col .mCSB_scrollTools{width:6px}.left_col .mCSB_dragger{max-height:400px !important}.blue{color:#3498DB}.purple{color:#9B59B6}.green{color:#1ABB9C}.aero{color:#9CC2CB}.red{color:#E74C3C}.dark{color:#34495E}.border-blue{border-color:#3498DB !important}.border-purple{border-color:#9B59B6 !important}.border-green{border-color:#1ABB9C !important}.border-aero{border-color:#9CC2CB !important}.border-red{border-color:#E74C3C !important}.border-dark{border-color:#34495E !important}.bg-white{background:#fff !important;border:1px solid #fff !important;color:#73879C}.bg-green{background:#1ABB9C !important;border:1px solid #1ABB9C !important;color:#fff}.bg-red{background:#E74C3C !important;border:1px solid #E74C3C !important;color:#fff}.bg-blue{background:#3498DB !important;border:1px solid #3498DB !important;color:#fff}.bg-orange{background:#F39C12 !important;border:1px solid #F39C12 !important;color:#fff}.bg-purple{background:#9B59B6 !important;border:1px solid #9B59B6 !important;color:#fff}.bg-blue-sky{background:#50C1CF !important;border:1px solid #50C1CF !important;color:#fff}.container{width:100%;padding:0;max-width:100%}.navbar-nav>li>a,.navbar-brand,.navbar-nav>li>a{color:#fff !important}body{color:#73879C;background:#2A3F54;font-family:"Helvetica Neue", Roboto, Arial, "Droid Sans", sans-serif;font-size:13px;font-weight:400;line-height:1.471}.main_container .top_nav{display:block;margin-left:230px}.no-padding{padding:0 !important}.page-title{width:100%;height:65px;padding:10px 0}.page-title .title_left{width:45%;float:left;display:block}.page-title .title_left h3{margin:9px 0}.page-title .title_right{width:55%;float:left;display:block}.page-title .title_right .pull-right{margin:10px 0;float:right}.fixed_height_320{height:320px}.fixed_height_390{height:390px}.fixed_height_200{height:200px}.overflow_hidden{overflow:hidden}.progress-bar-dark{background-color:#34495E !important}.progress-bar-gray{background-color:#BDC3C7 !important}table.no-margin .progress{margin-bottom:0}.main_content{padding:10px 20px}.col-md-55{width:50%;margin-bottom:10px}@media (min-width: 768px){.col-md-55{width:20%}}@media (min-width: 992px){.col-md-55{width:20%}}@media (min-width: 1200px){.col-md-55{width:20%}}@media (min-width: 192px) and (max-width: 1270px){table.tile_info span.right{margin-right:7px;float:left}}.center-margin{margin:0 auto;float:none !important}.col-md-55,.col-xs-12,.col-sm-1,.col-md-1,.col-lg-1,.col-xs-2,.col-sm-2,.col-md-2,.col-lg-2,.col-xs-3,.col-sm-3,.col-md-3,.col-lg-3,.col-xs-4,.col-sm-4,.col-md-4,.col-lg-4,.col-xs-5,.col-sm-5,.col-md-5,.col-lg-5,.col-xs-6,.col-sm-6,.col-md-6,.col-lg-6,.col-xs-7,.col-sm-7,.col-md-7,.col-lg-7,.col-xs-8,.col-sm-8,.col-md-8,.col-lg-8,.col-xs-9,.col-sm-9,.col-md-9,.col-lg-9,.col-xs-10,.col-sm-10,.col-md-10,.col-lg-10,.col-xs-11,.col-sm-11,.col-md-11,.col-lg-11,.col-sm-12,.col-md-12,.col-lg-12{position:relative;min-height:1px;float:left;padding-right:10px;padding-left:10px}.row{margin-right:-10px;margin-left:-10px}.grid_slider .col-md-6{padding:0 40px}h1,.h1,h2,.h2,h3,.h3{margin-top:10px;margin-bottom:10px}a{color:#5A738E;text-decoration:none}a,a:visited,a:focus,a:active,:visited,:focus,:active,.btn:focus,.btn:active:focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn.active.focus{outline:0}a:hover,a:focus{text-decoration:none}.navbar{margin-bottom:0}.navbar-header{background:#34495E}.navbar-right{margin-right:0}.top_nav .navbar-right{margin:13px;width:auto;float:right}.top_nav .navbar-right li{display:inline-block;float:right;position:static}@media (min-width: 480px){.top_nav .navbar-right li{position:relative}.item{display:block}}.top_nav .dropdown-menu li{width:100%}.dropdown-item{width:100%;padding:12px 20px}.top_nav li a i{font-size:15px}.navbar-static-top{position:fixed;top:0;width:100%}.sidebar-header{border-bottom:0;margin-top:46px}.sidebar-header:first-of-type{margin-top:0}.nav>li{position:relative;display:block}.nav.side-menu>li{position:relative;display:block;cursor:pointer}.nav.side-menu>li>a{margin-bottom:6px}.nav.side-menu>li>a:hover{color:#F2F5F7 !important}.nav.side-menu>li>a:hover,.nav>li>a:focus{text-decoration:none;background:transparent}.nav.child_menu{display:none}.nav.child_menu li:hover,.nav.child_menu li.active{background-color:rgba(255,255,255,0.06)}.nav.child_menu li{padding-left:36px}.nav-md ul.nav.child_menu li:before{background:#425668;bottom:auto;content:"";height:8px;left:23px;margin-top:15px;position:absolute;right:auto;width:8px;z-index:1;border-radius:50%}.nav-md ul.nav.child_menu li:after{border-left:1px solid #425668;bottom:0;content:"";left:27px;position:absolute;top:0}.nav-md ul.nav.child_menu li:last-child::after{bottom:50%}.nav.side-menu>li>a,.nav.child_menu>li>a{color:#E7E7E7;font-weight:500}.nav.child_menu li li:hover,.nav.child_menu li li.active{background:none}.nav.child_menu li li a:hover,.nav.child_menu li li a.active{color:#fff}.nav>li>a{position:relative;display:block;padding:13px 15px 12px}.nav.side-menu>li.current-page,.nav.side-menu>li.active{border-right:5px solid #1ABB9C}.nav li.current-page{background:rgba(255,255,255,0.05)}.nav li li li.current-page{background:none}.nav li li.current-page a{color:#fff}.nav.side-menu>li.active>a{text-shadow:rgba(0,0,0,0.25) 0 -1px 0;background:-webkit-gradient(linear, left top, left bottom, from(#334556), to(#2C4257)),#2A3F54;background:linear-gradient(#334556, #2C4257),#2A3F54;-webkit-box-shadow:rgba(0,0,0,0.25) 0 1px 0,inset rgba(255,255,255,0.16) 0 1px 0;box-shadow:rgba(0,0,0,0.25) 0 1px 0,inset rgba(255,255,255,0.16) 0 1px 0}.navbar-brand,.navbar-nav>li>a{font-weight:500;color:#ECF0F1 !important;margin-left:0 !important;line-height:32px}.site_title{text-overflow:ellipsis;overflow:hidden;font-weight:400;font-size:22px;width:100%;color:#ECF0F1 !important;margin-left:0 !important;line-height:59px;display:block;height:55px;margin:0;padding-left:10px}.site_title:hover,.site_title:focus{text-decoration:none}.nav.navbar-nav>li>a{color:#515356 !important}.nav.top_menu>li>a{position:relative;display:block;padding:10px 15px;color:#34495E !important}.nav>li>a:hover,.nav>li>a:focus{background-color:transparent}.top_search{padding:0}.top_search .form-control{border-right:0;-webkit-box-shadow:inset 0 1px 0px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0px rgba(0,0,0,0.075);border-radius:25px 0px 0px 25px;padding-left:20px;border:1px solid rgba(221,226,232,0.49)}.top_search .form-control:focus{border:1px solid rgba(221,226,232,0.49);border-right:0}.top_search .input-group-btn button{border-radius:0px 25px 25px 0px;border:1px solid rgba(221,226,232,0.49);border-left:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);color:#93A2B2;margin-bottom:0 !important}.toggle{float:left;margin:0;width:70px}.toggle a{padding:15px 15px 0;margin:0;cursor:pointer}.toggle a i{font-size:26px}.nav.child_menu>li>a{color:rgba(255,255,255,0.75);font-size:12px;padding:9px}.panel_toolbox{float:right;min-width:70px}.panel_toolbox>li{float:left;cursor:pointer}.panel_toolbox>li>a{padding:5px;color:#C5C7CB;font-size:14px}.panel_toolbox>li>a:hover{background:#F5F7FA}.line_30{line-height:30px}.main_menu_side{padding:0}.bs-docs-sidebar .nav>li>a{display:block;padding:4px 6px}footer{background:#fff;padding:10px 20px;display:block}.nav-sm footer{margin-left:70px}.footer_fixed footer{position:fixed;left:0px;bottom:0px;width:100%}@media (min-width: 768px){.footer_fixed footer{margin-left:0}}@media (min-width: 768px){.footer_fixed .nav-sm footer{margin-left:0}}.tile-stats.sparkline{padding:10px;text-align:center}.jqstooltip{background:#34495E !important;width:30px !important;height:22px !important;text-decoration:none}.tooltip{display:block !important}.tiles{border-top:1px solid #ccc;margin-top:15px;padding-top:5px;margin-bottom:0}.tile{overflow:hidden}.top_tiles{margin-bottom:0}.top_tiles .tile h2{font-size:30px;line-height:30px;margin:3px 0 7px;font-weight:bold}article.media{width:100%}*,*:before,*:after{-webkit-box-sizing:border-box;box-sizing:border-box}#integration-list{width:100%;margin:0 auto;display:table}#integration-list ul{padding:0;margin:20px 0;color:#555}#integration-list ul>li{list-style:none;border-top:1px solid #ddd;display:block;padding:15px;overflow:hidden}#integration-list ul:last-child{border-bottom:1px solid #ddd}#integration-list ul>li:hover{background:#efefef}.expand{display:block;text-decoration:none;color:#555;cursor:pointer}.expand h2{width:85%;float:left}h2{font-size:18px;font-weight:400}#left,#right{display:table}#sup{display:table-cell;vertical-align:middle;width:80%}.detail a{text-decoration:none;color:#C0392B;border:1px solid #C0392B;padding:6px 10px 5px;font-size:13px;margin-right:7px}.detail{margin:10px 0 10px 0px;display:none;line-height:22px;height:150px}.detail span{margin:0}.right-arrow{width:10px;float:right;font-weight:bold;font-size:20px}.accordion .panel{margin-bottom:5px;border-radius:0;border-bottom:1px solid #efefef}.accordion .panel-heading{background:#F2F5F7;padding:13px;width:100%;display:block}.accordion .panel:hover{background:#F2F5F7}.x_panel{position:relative;width:100%;margin-bottom:10px;padding:10px 17px;display:inline-block;background:#fff;border:1px solid #E6E9ED;-webkit-column-break-inside:avoid;-moz-column-break-inside:avoid;column-break-inside:avoid;opacity:1;-webkit-transition:all .2s ease;transition:all .2s ease}.x_title{border-bottom:2px solid #E6E9ED;padding:1px 5px 6px;margin-bottom:10px}.x_title .filter{width:40%;float:right}.x_title h2{margin:5px 0 6px;float:left;display:block;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.x_title h2 small{margin-left:10px}.x_title span{color:#BDBDBD}.x_content{padding:0 3px 6px;position:relative;width:100%;float:left;clear:both;margin-top:5px}.x_content h4{font-size:16px;font-weight:500}legend{padding-bottom:7px}.demo-placeholder{height:280px}.profile_details:nth-child(3n){clear:both}.profile_details .profile_view{display:inline-block;padding:10px 0 0;background:#fff}.profile_details .profile_view .divider{border-top:1px solid #e5e5e5;padding-top:5px;margin-top:5px}.profile_details .profile_view .ratings{margin-bottom:0}.profile_details .profile_view .left{margin-top:20px}.profile_details .profile_view .left p{margin-bottom:3px}.profile_details .profile_view .right{margin-top:0px;padding:10px}.profile_details .profile_view .img-circle{border:1px solid #E6E9ED;padding:2px}.profile_details .profile_view h2{margin:5px 0}.profile_details .profile_view .ratings{text-align:left;font-size:16px}.brief{margin:0;font-weight:300}.profile_details .profile_left{background:white}.pagination.pagination-split li{display:inline-block;margin-right:3px}.pagination.pagination-split li a{border-radius:4px;color:#768399;-moz-border-radius:4px;-webkit-border-radius:4px}table.tile h3,table.tile h4,table.tile span{font-weight:bold;vertical-align:middle !important}table.tile th,table.tile td{text-align:center}table.tile th{border-bottom:1px solid #E6ECEE}table.tile td{padding:5px 0}table.tile td ul{text-align:left;padding-left:0}table.tile td ul li{list-style:none;width:100%}table.tile td ul li a{width:100%}table.tile td ul li a big{right:0;float:right;margin-right:13px}table.tile_info{width:100%}table.tile_info td{text-align:left;padding:1px;font-size:15px}table.tile_info td p{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;margin:0;line-height:28px}table.tile_info td i{margin-right:8px;font-size:17px;float:left;width:18px;line-height:28px}table.tile_info td:first-child{width:83%}td span{line-height:28px}.sidebar-widget{overflow:hidden}.error-number{font-size:90px;line-height:90px;margin:20px 0}.col-middle{margin-top:5%}.mid_center{width:370px;margin:0 auto;text-align:center;padding:10px 20px}h3.degrees{font-size:22px;font-weight:400;text-align:center}.degrees:after{content:"o";position:relative;top:-12px;font-size:13px;font-weight:300}.daily-weather .day{font-size:14px;border-top:2px solid rgba(115,135,156,0.36);text-align:center;border-bottom:2px solid rgba(115,135,156,0.36);padding:5px 0}.weather-days .col-sm-2{overflow:hidden;width:16.66666667%}.weather .row{margin-bottom:0}.bulk-actions{display:none}table.countries_list{width:100%}table.countries_list td{padding:0 10px;line-height:30px;border-top:1px solid #eeeeee}.dataTables_paginate a{padding:6px 9px !important;background:#ddd !important;border-color:#ddd !important}.paging_full_numbers a.paginate_active{background-color:rgba(38,185,154,0.59) !important;border-color:rgba(38,185,154,0.59) !important}button.DTTT_button,div.DTTT_button,a.DTTT_button{border:1px solid #E7E7E7 !important;background:#E7E7E7 !important;-webkit-box-shadow:none !important;box-shadow:none !important}table.jambo_table{border:1px solid rgba(221,221,221,0.78)}table.jambo_table thead{background:rgba(52,73,94,0.94);color:#ECF0F1}table.jambo_table tbody tr:hover td{background:rgba(38,185,154,0.07);border-top:1px solid rgba(38,185,154,0.11);border-bottom:1px solid rgba(38,185,154,0.11)}table.jambo_table tbody tr.selected{background:rgba(38,185,154,0.16)}table.jambo_table tbody tr.selected td{border-top:1px solid rgba(38,185,154,0.4);border-bottom:1px solid rgba(38,185,154,0.4)}.dataTables_paginate a{background:#ff0000}.dataTables_wrapper{position:relative;clear:both;zoom:1}.dataTables_processing{position:absolute;top:50%;left:50%;width:250px;height:30px;margin-left:-125px;margin-top:-15px;padding:14px 0 2px 0;border:1px solid #ddd;text-align:center;color:#999;font-size:14px;background-color:white}.dataTables_info{width:60%;float:left}.dataTables_paginate{float:right;text-align:right}table.dataTable th.focus,table.dataTable td.focus{outline:2px solid #1ABB9C !important;outline-offset:-1px}table.display{margin:0 auto;clear:both;width:100%}table.display thead th{padding:8px 18px 8px 10px;border-bottom:1px solid black;font-weight:bold;cursor:pointer}table.display tfoot th{padding:3px 18px 3px 10px;border-top:1px solid black;font-weight:bold}table.display tr.heading2 td{border-bottom:1px solid #aaa}table.display td{padding:3px 10px}table.display td.center{text-align:center}table.display thead th:active,table.display thead td:active{outline:none}.dataTables_scroll{clear:both}.dataTables_scrollBody{*margin-top:-1px;-webkit-overflow-scrolling:touch}.top .dataTables_info{float:none}.clear{clear:both}.dataTables_empty{text-align:center}tfoot input{margin:0.5em 0;width:100%;color:#444}tfoot input.search_init{color:#999}td.group{background-color:#d1cfd0;border-bottom:2px solid #A19B9E;border-top:2px solid #A19B9E}td.details{background-color:#d1cfd0;border:2px solid #A19B9E}.example_alt_pagination div.dataTables_info{width:40%}.paging_full_numbers{width:400px;height:22px;line-height:22px}.paging_full_numbers a:active{outline:none}.paging_full_numbers a:hover{text-decoration:none}.paging_full_numbers a.paginate_button,.paging_full_numbers a.paginate_active{border:1px solid #aaa;-webkit-border-radius:5px;-moz-border-radius:5px;padding:2px 5px;margin:0 3px;cursor:pointer}.paging_full_numbers a.paginate_button{background-color:#ddd}.paging_full_numbers a.paginate_button:hover{background-color:#ccc;text-decoration:none !important}.paging_full_numbers a.paginate_active{background-color:#99B3FF}table.display tr.even.row_selected td{background-color:#B0BED9}table.display tr.odd.row_selected td{background-color:#9FAFD1}div.box{height:100px;padding:10px;overflow:auto;border:1px solid #8080FF;background-color:#E5E5FF}ul.msg_list li{background:#f7f7f7;padding:5px;display:-webkit-box;display:-ms-flexbox;display:flex;margin:6px 6px 0;width:96% !important}ul.msg_list li:last-child{margin-bottom:6px;padding:10px}ul.msg_list li a{padding:3px 5px !important}ul.msg_list li a .image img{border-radius:2px 2px 2px 2px;-webkit-border-radius:2px 2px 2px 2px;float:left;margin-right:10px;width:11%}ul.msg_list li a .time{font-size:11px;font-style:italic;font-weight:bold;position:absolute;right:35px}ul.msg_list li a .message{display:block !important;font-size:11px}.dropdown-menu.msg_list span{white-space:normal}.dropdown-menu{border:medium none;-webkit-box-shadow:none;box-shadow:none;display:none;float:left;font-size:12px;left:0;list-style:none outside none;padding:0;position:absolute;text-shadow:none;top:100%;z-index:9998;border:1px solid #D9DEE4;border-top-left-radius:0;border-top-right-radius:0}.dropdown-menu>li>a{color:#5A738E}.navbar-nav .open .dropdown-menu{position:absolute;background:#fff;margin-top:0;border:1px solid #D9DEE4;-webkit-box-shadow:none;right:0;left:auto;width:220px}.navbar-nav .open .dropdown-menu.msg_list{width:300px !important}ul.to_do{padding:0}ul.to_do li{background:#f3f3f3;border-radius:3px;position:relative;padding:7px;margin-bottom:5px;list-style:none}ul.to_do p{margin:0}.dashboard-widget{background:#f6f6f6;border-top:5px solid #79C3DF;border-radius:3px;padding:5px 10px 10px}.dashboard-widget .dashboard-widget-title{font-weight:normal;border-bottom:1px solid #c1cdcd;margin:0 0 10px 0;padding-bottom:5px;padding-left:40px;line-height:30px}.dashboard-widget .dashboard-widget-title i{font-size:100%;margin-left:-35px;margin-right:10px;color:#33a1c9;padding:3px 6px;border:1px solid #abd9ea;border-radius:5px;background:#fff}ul.quick-list{width:45%;padding-left:0;display:inline-block}ul.quick-list li{padding-left:10px;list-style:none;margin:0;padding-bottom:6px;padding-top:4px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}ul.quick-list li i{padding-right:10px;color:#757679}.dashboard-widget-content{padding-top:9px}.dashboard-widget-content .sidebar-widget{width:50%;display:inline-block;vertical-align:top;background:#fff;border:1px solid #abd9ea;border-radius:5px;text-align:center;float:right;padding:2px;margin-top:10px}.widget_summary{width:100%;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex}.widget_summary .w_left{float:left;text-align:left}.widget_summary .w_center{float:left}.widget_summary .w_right{float:left;text-align:right}.widget_summary .w_right span{font-size:20px}.w_20{width:20%}.w_25{width:25%}.w_55{width:55%}h5.graph_title{text-align:left;margin-left:10px}h5.graph_title i{margin-right:10px;font-size:17px}span.right{float:right;font-size:14px !important}.tile_info a{text-overflow:ellipsis}.sidebar-footer{bottom:0px;clear:both;display:block;padding:5px 0 0 0;position:fixed;width:230px;background:#2A3F54}.sidebar-footer a{padding:7px 0 3px;text-align:center;width:25%;font-size:17px;display:block;float:left;background:#172D44}.sidebar-footer a:hover{background:#425567}.tile_count{margin-bottom:20px;margin-top:20px}.tile_count .tile_stats_count{border-bottom:1px solid #D9DEE4;padding:0 10px 0 20px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;position:relative}@media (min-width: 992px){footer{margin-left:230px}}@media (min-width: 992px){.tile_count .tile_stats_count{margin-bottom:10px;border-bottom:0;padding-bottom:10px}}.tile_count .tile_stats_count:before{content:"";position:absolute;left:0;height:65px;border-left:2px solid #ADB2B5;margin-top:10px}@media (min-width: 992px){.tile_count .tile_stats_count:first-child:before{border-left:0}}.tile_count .tile_stats_count .count{font-size:30px;line-height:47px;font-weight:600}@media (min-width: 768px){.tile_count .tile_stats_count .count{font-size:40px}}@media (min-width: 992px) and (max-width: 1100px){.tile_count .tile_stats_count .count{font-size:30px}}.tile_count .tile_stats_count span{font-size:12px}@media (min-width: 768px){.tile_count .tile_stats_count span{font-size:13px}}.tile_count .tile_stats_count .count_bottom i{width:12px}.dashboard_graph{background:#fff;padding:7px 10px}.dashboard_graph .col-md-9,.dashboard_graph .col-md-3{padding:0}a.user-profile{color:#5E6974 !important}.user-profile img{width:29px;height:29px;border-radius:50%;margin-right:10px}ul.top_profiles{width:100%}ul.top_profiles li{margin:0;padding:3px 5px}ul.top_profiles li:nth-child(odd){background-color:#eee}.media .profile_thumb{border:1px solid;width:50px;height:50px;margin:5px 10px 5px 0;border-radius:50%;padding:9px 12px}.media .profile_thumb i{font-size:30px}.media .date{background:#ccc;width:52px;margin-right:10px;border-radius:10px;padding:5px}.media .date .month{margin:0;text-align:center;color:#fff}.media .date .day{text-align:center;color:#fff;font-size:27px;margin:0;line-height:27px;font-weight:bold}.event .media-body a.title{font-weight:bold}.event .media-body p{margin-bottom:0}h4.graph_title{margin:7px;text-align:center}.fontawesome-icon-list .fa-hover a:hover{background-color:#ddd;color:#fff;text-decoration:none}.fontawesome-icon-list .fa-hover a{display:block;line-height:32px;height:32px;padding-left:10px;border-radius:4px}.fontawesome-icon-list .fa-hover a:hover .fa{font-size:28px;vertical-align:-6px}.fontawesome-icon-list .fa-hover a .fa{width:32px;font-size:16px;display:inline-block;text-align:right;margin-right:10px}.main_menu .fa{width:26px;opacity:.99;display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;font-size:18px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.tile-stats{position:relative;display:block;margin-bottom:12px;border:1px solid #E4E4E4;-webkit-border-radius:5px;overflow:hidden;padding-bottom:5px;-webkit-background-clip:padding-box;-moz-border-radius:5px;-moz-background-clip:padding;border-radius:5px;background-clip:padding-box;background:#FFF;-webkit-transition:all 300ms ease-in-out;transition:all 300ms ease-in-out}.tile-stats:hover .icon i{animation-name:tansformAnimation;animation-duration:.5s;animation-iteration-count:1;color:rgba(58,58,58,0.41);animation-timing-function:ease;animation-fill-mode:forwards;-webkit-animation-name:tansformAnimation;-webkit-animation-duration:.5s;-webkit-animation-iteration-count:1;-webkit-animation-timing-function:ease;-webkit-animation-fill-mode:forwards;-moz-animation-name:tansformAnimation;-moz-animation-duration:.5s;-moz-animation-iteration-count:1;-moz-animation-timing-function:ease;-moz-animation-fill-mode:forwards}.tile-stats .icon{width:20px;height:20px;color:#BAB8B8;position:absolute;right:53px;top:22px;z-index:1}.tile-stats .icon i{margin:0;font-size:60px;line-height:0;vertical-align:bottom;padding:0}.tile-stats .count{font-size:38px;font-weight:bold;line-height:1.65857143}.tile-stats .count,.tile-stats h3,.tile-stats p{position:relative;margin:0;margin-left:10px;z-index:5;padding:0}.tile-stats h3{color:#BAB8B8}.tile-stats p{margin-top:5px;font-size:12px}.tile-stats>.dash-box-footer{position:relative;text-align:center;margin-top:5px;padding:3px 0;color:#fff;color:rgba(255,255,255,0.8);display:block;z-index:10;background:rgba(0,0,0,0.1);text-decoration:none}.tile-stats>.dash-box-footer:hover{color:#fff;background:rgba(0,0,0,0.15)}.tile-stats>.dash-box-footer:hover{color:#fff;background:rgba(0,0,0,0.15)}table.tile_info{padding:10px 15px}table.tile_info span.right{margin-right:0;float:right;position:absolute;right:4%}.tile:hover{text-decoration:none}.tile_header{border-bottom:transparent;padding:7px 15px;margin-bottom:15px;background:#E7E7E7}.tile_head h4{margin-top:0;margin-bottom:5px}.tiles-bottom{padding:5px 10px;margin-top:10px;background:rgba(194,194,194,0.3);text-align:left}a.star{color:#428bca !important}.mail_content{background:none repeat scroll 0 0 #FFFFFF;border-radius:4px;margin-top:20px;min-height:500px;padding:10px 11px;width:100%}.list-btn-mail{margin-bottom:15px}.list-btn-mail.active{border-bottom:1px solid #39B3D7;padding:0 0 14px}.list-btn-mail>i{float:left;font-size:18px;font-style:normal;width:33px}.list-btn-mail>.cn{background:none repeat scroll 0 0 #39B3D7;border-radius:12px;color:#FFFFFF;float:right;font-style:normal;padding:0 5px}.button-mail{margin:0 0 15px !important;text-align:left;width:100%}button,.buttons,.btn,.modal-footer .btn+.btn{margin-bottom:5px;margin-right:5px}.btn-group-vertical .btn,.btn-group .btn{margin-bottom:0;margin-right:0}.mail_list_column{border-left:1px solid #DBDBDB}.mail_view{border-left:1px solid #DBDBDB}.mail_list{width:100%;border-bottom:1px solid #DBDBDB;margin-bottom:2px;display:inline-block}.mail_list .left{width:5%;float:left;margin-right:3%}.mail_list .right{width:90%;float:left}.mail_list h3{font-size:15px;font-weight:bold;margin:0px 0 6px}.mail_list h3 small{float:right;color:#ADABAB;font-size:11px;line-height:20px}.mail_list .badge{padding:3px 6px;font-size:8px;background:#BAB7B7}@media (max-width: 767px){.mail_list{margin-bottom:5px;display:inline-block}}.mail_heading h4{font-size:18px;border-bottom:1px solid #ddd;padding-bottom:10px;margin-top:20px}.attachment{margin-top:30px}.attachment ul{width:100%;list-style:none;padding-left:0;display:inline-block;margin-bottom:30px}.attachment ul li{float:left;width:150px;margin-right:10px;margin-bottom:10px}.attachment ul li img{height:150px;border:1px solid #ddd;padding:5px;margin-bottom:10px}.attachment ul li span{float:right}.attachment .file-name{float:left}.attachment .links{width:100%;display:inline-block}.compose{padding:0;position:fixed;bottom:0;right:0;background:#fff;border:1px solid #D9DEE4;border-right:0;border-bottom:0;border-top-left-radius:5px;z-index:9999;display:none}.compose .compose-header{padding:5px;background:#169F85;color:#fff;border-top-left-radius:5px}.compose .compose-header .close{text-shadow:0 1px 0 #ffffff;line-height:.8}.compose .compose-body .editor.btn-toolbar{margin:0}.compose .compose-body .editor-wrapper{height:100%;min-height:50px;max-height:180px;border-radius:0;border-left:none;border-right:none;overflow:auto}.compose .compose-footer{padding:10px}.editor.btn-toolbar{zoom:1;background:#F7F7F7;margin:5px 2px;padding:3px 0;border:1px solid #EFEFEF}.input-group{margin-bottom:10px}.ln_solid{border-top:1px solid #e5e5e5;color:#ffffff;background-color:#ffffff;height:1px;margin:20px 0}span.section{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}.form-control{border-radius:0;width:100%}.form-horizontal .control-label{padding-top:8px}.form-control:focus{border-color:#CCD0D7;-webkit-box-shadow:none !important;box-shadow:none !important}legend{font-size:18px;color:inherit}.form-horizontal .form-group{margin-right:0;margin-left:0}.form-control-feedback{position:absolute;margin-top:8px;height:23px;color:#bbb;line-height:24px;font-size:15px;top:0px;width:34px;text-align:center}.form-control-feedback.left{border-right:1px solid #ccc;left:13px}.form-control-feedback.right{border-left:1px solid #ccc;right:13px}.form-control.has-feedback-left{padding-left:45px}.form-control.has-feedback-right{padding-right:45px}.form-group{margin-bottom:10px}.validate{margin-top:10px}.invalid-form-error-message{margin-top:10px;padding:5px}.invalid-form-error-message.filled{border-left:2px solid #E74C3C}p.parsley-success{color:#468847;background-color:#DFF0D8;border:1px solid #D6E9C6}p.parsley-error{color:#B94A48;background-color:#F2DEDE;border:1px solid #EED3D7}ul.parsley-errors-list{list-style:none;color:#E74C3C;padding-left:0}input.parsley-error,textarea.parsley-error,select.parsley-error{background:#FAEDEC;border:1px solid #E85445}.btn-group .parsley-errors-list{display:none}.bad input,.bad select,.bad textarea{border:1px solid #CE5454;-webkit-box-shadow:0 0 4px -2px #CE5454;box-shadow:0 0 4px -2px #CE5454;position:relative;left:0;-moz-animation:.7s 1 shake linear;-webkit-animation:0.7s 1 shake linear}.item{display:-webkit-box;display:-ms-flexbox;display:flex}.item input,.item textarea{-webkit-transition:0.42s;transition:0.42s}.item .alert{float:left;margin:0 0 0 20px;padding:3px 10px;color:#FFF;border-radius:3px 4px 4px 3px;background-color:#CE5454;max-width:170px;white-space:pre;position:relative;left:-15px;opacity:0;z-index:1;-webkit-transition:0.15s ease-out;transition:0.15s ease-out}.item .alert::after{content:'';display:block;height:0;width:0;border-color:transparent #CE5454 transparent transparent;border-style:solid;border-width:11px 7px;position:absolute;left:-13px;top:1px}.item.bad .alert{left:0;opacity:1}.inl-bl{display:inline-block}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well .markup{background:#fff;color:#777;position:relative;padding:45px 15px 15px;margin:15px 0 0 0;background-color:#fff;border-radius:0 0 4px 4px;-webkit-box-shadow:none;box-shadow:none}.well .markup::after{content:"Example";position:absolute;top:15px;left:15px;font-size:12px;font-weight:bold;color:#bbb;text-transform:uppercase;letter-spacing:1px}.autocomplete-suggestions{border:1px solid #e4e4e4;background:#F4F4F4;cursor:default;overflow:auto}.autocomplete-suggestion{padding:2px 5px;font-size:1.2em;white-space:nowrap;overflow:hidden}.autocomplete-selected{background:#f0f0f0}.autocomplete-suggestions strong{font-weight:normal;color:#3399ff;font-weight:bolder}.btn{border-radius:3px}a.btn-success,a.btn-primary,a.btn-warning,a.btn-danger{color:#fff}.btn-success{background:#26B99A;border:1px solid #169F85}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background:#169F85}.btn-dark{color:#E9EDEF;background-color:#4B5F71;border-color:#364B5F}.btn-dark:hover,.btn-dark:focus,.btn-dark:active,.btn-dark.active,.open .dropdown-toggle.btn-dark{color:#FFFFFF;background-color:#394D5F;border-color:#394D5F}.btn-round{border-radius:30px}.btn.btn-app{position:relative;padding:15px 5px;margin:0 0 10px 10px;min-width:80px;height:60px;-webkit-box-shadow:none;box-shadow:none;border-radius:0;text-align:center;color:#666;border:1px solid #ddd;background-color:#fafafa;font-size:12px}.btn.btn-app>.fa,.btn.btn-app>.glyphicon,.btn.btn-app>.ion{font-size:20px;display:block}.btn.btn-app:hover{background:#f4f4f4;color:#444;border-color:#aaa}.btn.btn-app:active,.btn.btn-app:focus{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.btn-app>.badge{position:absolute;top:-3px;right:-10px;font-size:10px;font-weight:400}textarea{padding:10px;vertical-align:top;width:200px}textarea:focus{outline-style:solid;outline-width:2px}.btn_{display:inline-block;padding:3px 9px;margin-bottom:0;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f5f5f5;background-image:-webkit-gradient(linear, left top, left bottom, from(#fff), to(#e6e6e6));background-image:linear-gradient(to bottom, #fff, #e6e6e6);background-repeat:repeat-x;filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0)";border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:"progid:DXImageTransform.Microsoft.gradient(enabled=false)";border:1px solid #cccccc;border-bottom-color:#b3b3b3;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.bs-glyphicons{margin:0 -10px 20px;overflow:hidden}.bs-glyphicons-list{padding-left:0;list-style:none}.bs-glyphicons li{float:left;width:25%;height:115px;padding:10px;font-size:10px;line-height:1.4;text-align:center;background-color:#f9f9f9;border:1px solid #fff}.bs-glyphicons .glyphicon{margin-top:5px;margin-bottom:10px;font-size:24px}.bs-glyphicons .glyphicon-class{display:block;text-align:center;word-wrap:break-word}.bs-glyphicons li:hover{color:#fff;background-color:#1ABB9C}@media (min-width: 768px){.bs-glyphicons{margin-right:0;margin-left:0}.bs-glyphicons li{width:12.5%;font-size:12px}}.tagsinput{border:1px solid #CCC;background:#FFF;padding:6px 6px 0;width:300px;overflow-y:auto}span.tag{-moz-border-radius:2px;-webkit-border-radius:2px;display:block;float:left;padding:5px 9px;text-decoration:none;background:#1ABB9C;color:#F1F6F7;margin-right:5px;font-weight:500;margin-bottom:5px;font-family:helvetica}span.tag a{color:#F1F6F7 !important}.tagsinput span.tag a{font-weight:bold;color:#82ad2b;text-decoration:none;font-size:11px}.tagsinput input{width:80px;margin:0px;font-family:helvetica;font-size:13px;border:1px solid transparent;padding:3px;background:transparent;color:#000;outline:0px}.tagsinput div{display:block;float:left}.tags_clear{clear:both;width:100%;height:0px}.not_valid{background:#FBD8DB !important;color:#90111A !important}ul.bar_tabs{overflow:visible;background:#F5F7FA;height:25px;margin:21px 0 14px;padding-left:14px;position:relative;z-index:1;width:100%;border-bottom:1px solid #E6E9ED}ul.bar_tabs>li{border:1px solid #E6E9ED;color:#333 !important;margin-top:-17px;margin-left:8px;background:#fff;border-bottom:none;border-radius:4px 4px 0 0}ul.bar_tabs>li.active{border-right:6px solid #D3D6DA;border-top:0;margin-top:-15px}ul.bar_tabs>li a{padding:10px 17px;background:#F5F7FA;margin:0;border-top-right-radius:0}ul.bar_tabs>li a:hover{border:1px solid transparent}ul.bar_tabs>li.active a{border-bottom:none}ul.bar_tabs.right{padding-right:14px}ul.bar_tabs.right li{float:right}a:focus{outline:none}ul.timeline li{position:relative;border-bottom:1px solid #e8e8e8;clear:both}.timeline .block{margin:0;border-left:3px solid #e8e8e8;overflow:visible;padding:10px 15px;margin-left:105px}.timeline.widget{min-width:0;max-width:inherit}.timeline.widget .block{margin-left:5px}.timeline .tags{position:absolute;top:15px;left:0;width:84px}.timeline .tag{display:block;height:30px;font-size:13px;padding:8px}.timeline .tag span{display:block;overflow:hidden;width:100%;white-space:nowrap;text-overflow:ellipsis}.tag{line-height:1;background:#1ABB9C;color:#fff !important}.tag:after{content:" ";height:30px;width:0;position:absolute;left:100%;top:0;margin:0;pointer-events:none;border-top:14px solid transparent;border-bottom:14px solid transparent;border-left:11px solid #1ABB9C}.timeline h2.title{position:relative;font-size:16px;margin:0}.timeline h2.title:before{content:"";position:absolute;left:-23px;top:3px;display:block;width:14px;height:14px;border:3px solid #d2d3d2;border-radius:14px;background:#f9f9f9}.timeline .byline{padding:.25em 0}.byline{-webkit-font-smoothing:antialiased;font-style:italic;font-size:.9375em;line-height:1.3;color:#aab6aa}ul.social li{border:0}.social-sidebar,.social-body{float:right}.social-sidebar{background:#EDEDED;width:22%}.social-body{border:1px solid #ccc;width:78%}.thumb img{width:50px;height:50px;border-radius:50%}.chat .thumb img{width:27px;height:27px;border-radius:50%}.chat .status{float:left;margin:16px 0 0 -16px;font-size:14px;font-weight:bold;width:12px;height:12px;display:block;border:2px solid #FFF;z-index:12312;border-radius:50%}.chat .status.online{background:#1ABB9C}.chat .status.away{background:#F39C12}.chat .status.offline{background:#ccc}.chat .media-body{padding-top:5px}.dashboard_graph .x_title{padding:5px 5px 7px}.dashboard_graph .x_title h3{margin:0;font-weight:normal}.chart{position:relative;display:inline-block;width:110px;height:110px;margin-top:5px;margin-bottom:5px;text-align:center}.chart canvas{position:absolute;top:0;left:0}.percent{display:inline-block;line-height:110px;z-index:2;font-size:18px}.percent:after{content:'%';margin-left:0.1em;font-size:.8em}.angular{margin-top:100px}.angular .chart{margin-top:0}.widget{min-width:250px;max-width:310px}.widget_tally_box .btn-group button{text-align:center}.widget_tally_box .btn-group button{color:inherit;font-weight:500;background-color:#f5f5f5;border:1px solid #e7e7e7}ul.widget_tally,ul.widget_tally li{width:100%}ul.widget_tally li{padding:2px 10px;border-bottom:1px solid #ECECEC;padding-bottom:4px}ul.widget_tally .month{width:70%;float:left}ul.widget_tally .count{width:30%;float:left;text-align:right}.pie_bg{border-bottom:1px solid rgba(101,204,182,0.16);padding-bottom:15px;border-radius:4px;filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0)";filter:"progid:DXImageTransform.Microsoft.gradient(enabled=false)";padding-bottom:10px;-webkit-box-shadow:0 4px 6px -6px #222;box-shadow:0 4px 6px -6px #222}.widget_tally_box .flex{display:-webkit-box;display:-ms-flexbox;display:flex}ul.widget_profile_box{width:100%;height:42px;padding:3px;background:#ececec;margin-top:40px;margin-left:1px}ul.widget_profile_box li:first-child{width:25%;float:left}ul.widget_profile_box li:first-child a{float:left}ul.widget_profile_box li:last-child{width:25%;float:right}ul.widget_profile_box li:last-child a{float:right}ul.widget_profile_box li a{font-size:22px;text-align:center;width:35px;height:35px;border:1px solid rgba(52,73,94,0.44);display:block;border-radius:50%;padding:0px}ul.widget_profile_box li a:hover{color:#1ABB9C !important;border:1px solid #26b99a}ul.widget_profile_box li .profile_img{width:85px;height:85px;margin:0;margin-top:-28px}.widget_tally_box p,.widget_tally_box span{text-align:center}.widget_tally_box .name{text-align:center;margin:25px}.widget_tally_box .name_title{text-align:center;margin:5px}.widget_tally_box ul.legend{margin:0}.widget_tally_box ul.legend p,.widget_tally_box ul.legend span{text-align:left}.widget_tally_box ul.legend li .icon{font-size:20px;float:left;width:14px}.widget_tally_box ul.legend li .name{font-size:14px;margin:5px 0 0 14px;text-overflow:ellipsis;float:left}.widget_tally_box ul.legend p{display:inline-block;margin:0}.widget_tally_box ul.verticle_bars li{height:140px;width:23%}.widget .verticle_bars li .progress.vertical.progress_wide{width:65%}ul.count2{width:100%;margin-left:1px;border:1px solid #ddd;border-left:0;border-right:0;padding:10px 0;display:inherit}ul.count2 li{width:30%;text-align:center}ul.count2 li h3{font-weight:400;margin:0}ul.count2 li span{font-weight:300}.divider{border-bottom:1px solid #ddd;margin:10px}.divider-dashed{border-top:1px dashed #e7eaec;background-color:#ffffff;height:1px;margin:10px 0}ul.messages{padding:0;list-style:none}ul.messages li,.tasks li{border-bottom:1px dotted #e6e6e6;padding:8px 0}ul.messages li img.avatar,img.avatar{height:32px;width:32px;float:left;display:inline-block;border-radius:2px;padding:2px;background:#f7f7f7;border:1px solid #e6e6e6}ul.messages li .message_date{float:right;text-align:right}ul.messages li .message_wrapper{margin-left:50px;margin-right:40px}ul.messages li .message_wrapper h4.heading{font-weight:600;margin:0;cursor:pointer;margin-bottom:10px;line-height:100%}ul.messages li .message_wrapper blockquote{padding:0px 10px;margin:0;border-left:5px solid #eee}ul.user_data li{margin-bottom:6px}ul.user_data li p{margin-bottom:0}ul.user_data li .progress{width:90%}.project_progress .progress{margin-bottom:3px !important;margin-top:5px}.projects .list-inline{margin:0}.profile_title{background:#F5F7FA;border:0;padding:7px 0;display:-webkit-box;display:-ms-flexbox;display:flex}ul.stats-overview{border-bottom:1px solid #e8e8e8;padding-bottom:10px;margin-bottom:10px}ul.stats-overview li{display:inline-block;text-align:center;padding:0 15px;width:30%;font-size:14px;border-right:1px solid #e8e8e8}ul.stats-overview li:last-child{border-right:0}ul.stats-overview li .name{font-size:12px}ul.stats-overview li .value{font-size:14px;font-weight:bold;display:block}ul.stats-overview li:first-child{padding-left:0}ul.project_files li{margin-bottom:5px}ul.project_files li a i{width:20px}.project_detail p{margin-bottom:10px}.project_detail p.title{font-weight:bold;margin-bottom:0}.avatar img{border-radius:50%;max-width:45px}.pricing{background:#fff}.pricing .title{background:#1ABB9C;height:110px;color:#fff;padding:15px 0 0;text-align:center}.pricing .title h2{text-transform:capitalize;font-size:18px;border-radius:5px 5px 0 0;margin:0;font-weight:400}.pricing .title h1{font-size:25px;margin:12px}.pricing .title span{background:rgba(51,51,51,0.28);padding:2px 5px}.pricing_features{background:#FAFAFA;padding:20px 15px;min-height:230px;font-size:13.5px}.pricing_features ul li{margin-top:10px}.pricing_footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;text-align:center;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.pricing_footer p{font-size:13px;padding:10px 0 2px;display:block}.ui-ribbon-container{position:relative}.ui-ribbon-container .ui-ribbon-wrapper{position:absolute;overflow:hidden;width:85px;height:88px;top:-3px;right:-3px}.ui-ribbon-container.ui-ribbon-primary .ui-ribbon{background-color:#5b90bf}.ui-ribbon-container .ui-ribbon{position:relative;display:block;text-align:center;font-size:15px;font-weight:700;color:#fff;-webkit-transform:rotate(45deg);transform:rotate(45deg);padding:7px 0;left:-5px;top:15px;width:120px;line-height:20px;background-color:#555;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.3);box-shadow:0 0 3px rgba(0,0,0,0.3)}.ui-ribbon-container.ui-ribbon-primary .ui-ribbon:after,.ui-ribbon-container.ui-ribbon-primary .ui-ribbon:before{border-top:2px solid #5b90bf}.ui-ribbon-container .ui-ribbon:before{left:0;bottom:-1px}.ui-ribbon-container .ui-ribbon:before{right:0}.ui-ribbon-container .ui-ribbon:after,.ui-ribbon-container .ui-ribbon:before{position:absolute;content:" ";line-height:0;border-top:2px solid #555;border-left:2px solid transparent;border-right:2px solid transparent}.thumbnail .image{height:120px;overflow:hidden}.caption{padding:9px 5px;background:#F7F7F7}.caption p{margin-bottom:5px}.thumbnail{height:190px;overflow:hidden}.view{overflow:hidden;position:relative;text-align:center;-webkit-box-shadow:1px 1px 2px #e6e6e6;box-shadow:1px 1px 2px #e6e6e6;cursor:default}.view .mask,.view .content{position:absolute;width:100%;overflow:hidden;top:0;left:0}.view img{display:block;position:relative}.view .tools{text-transform:uppercase;color:#fff;text-align:center;position:relative;font-size:17px;padding:3px;background:rgba(0,0,0,0.35);margin:43px 0 0 0}.mask.no-caption .tools{margin:90px 0 0 0}.view .tools a{display:inline-block;color:#FFF;font-size:18px;font-weight:400;padding:0 4px}.view p{font-family:Georgia, serif;font-style:italic;font-size:12px;position:relative;color:#fff;padding:10px 20px 20px;text-align:center}.view a.info{display:inline-block;text-decoration:none;padding:7px 14px;background:#000;color:#fff;text-transform:uppercase;-webkit-box-shadow:0 0 1px #000;box-shadow:0 0 1px #000}.view-first img{-webkit-transition:all 0.2s linear;transition:all 0.2s linear}.view-first .mask{opacity:0;background-color:rgba(0,0,0,0.5);-webkit-transition:all 0.4s ease-in-out;transition:all 0.4s ease-in-out}.view-first .tools{-webkit-transform:translateY(-100px);transform:translateY(-100px);opacity:0;-webkit-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out}.view-first p{-webkit-transform:translateY(100px);transform:translateY(100px);opacity:0;-webkit-transition:all 0.2s linear;transition:all 0.2s linear}.view-first:hover img{-webkit-transform:scale(1.1);transform:scale(1.1)}.view-first:hover .mask{opacity:1}.view-first:hover .tools,.view-first:hover p{opacity:1;-webkit-transform:translateY(0px);transform:translateY(0px)}.view-first:hover p{-webkit-transition-delay:0.1s;transition-delay:0.1s}/*!
  * bootstrap-vertical-tabs - v1.2.1
  * https://dbtek.github.io/bootstrap-vertical-tabs
  * 2014-11-07
diff --git a/assets/default/customize/ajax.js b/assets/default/customize/ajax.js
index f6ea160..0f280a9 100644
--- a/assets/default/customize/ajax.js
+++ b/assets/default/customize/ajax.js
@@ -14,7 +14,7 @@ $(document).on('click','.test',function(){
     var url = baseUrl+"/";
  
     $.ajax({
-        url:url+"asset/getAssetDetails/"+id,
+        url:url+"Asset/getAssetDetails/"+id,
         type:"GET",
         success:function(data){
 			
@@ -32,7 +32,7 @@ $(document).on('click','.asset_value',function(){
     var url = baseUrl+"/";
  
     $.ajax({
-        url:url+"asset/getAssetValueForm/"+id,
+        url:url+"Asset/getAssetValueForm/"+id,
         type:"GET",
         success:function(data){
 		
@@ -51,7 +51,7 @@ $(document).on('click','.asset_usage',function(){
     var url = baseUrl+"/";
  
     $.ajax({
-        url:url+"asset/getAssetUsageForm/"+id,
+        url:url+"Asset/getAssetUsageForm/"+id,
         type:"GET",
         success:function(data){
 		
@@ -69,7 +69,7 @@ $(document).on('click','.asset_amc',function(){
     var url = baseUrl+"/";
  
     $.ajax({
-        url:url+"asset/getAssetAMCForm/"+id,
+        url:url+"Asset/getAssetAMCForm/"+id,
         type:"GET",
         success:function(data){
 		
@@ -87,7 +87,7 @@ $(document).on('click','.asset_insurance',function(){
     var url = baseUrl+"/";
  
     $.ajax({
-        url:url+"asset/getAssetInsuranceForm/"+id,
+        url:url+"Asset/getAssetInsuranceForm/"+id,
         type:"GET",
         success:function(data){
 	
@@ -105,7 +105,7 @@ $(document).on('click','.asset_image',function(){
     var url = baseUrl+"/";
  
     $.ajax({
-        url:url+"asset/getAssetImageForm/"+id,
+        url:url+"Asset/getAssetImageForm/"+id,
         type:"GET",
         success:function(data){
 	
@@ -125,17 +125,17 @@ $(document).on('click','#close-form',function(){
 });
 
 
-$( document ).ready(function() {
+// $( document ).ready(function() {
 	
 
-	var tab_value =  $("#current_tab").val();
+// 	var tab_value =  $("#current_tab").val();
 	
-	if(tab_value == 1)
-	{
-		 $("#asset_usage-tab").tab('show');
-	}
+// 	if(tab_value == 1)
+// 	{
+// 		 $("#asset_usage-tab").tab('show');
+// 	}
    
-});
+// });
 
 
 //fetch history start
@@ -149,7 +149,7 @@ $(document).on('click','.asset_value_history',function(){
 	
     $.ajax({ 
       type: "post",
-	  url:url+"asset/get_history",
+	    url:url+"Asset/get_history",
       data: data,
       json: true,
       success: function(response) {
diff --git a/assets/default/customize/style.css b/assets/default/customize/style.css
index 810d646..0ad1f22 100644
--- a/assets/default/customize/style.css
+++ b/assets/default/customize/style.css
@@ -26,12 +26,13 @@ body {
 }
 
 .profilepic {
-  position: relative;
-  /* width: 125px;
-  height: 125px; */
-  /* border-radius: 50%; */
-  overflow: hidden;
-  background-color: #fffff7;
+    position: relative;
+    border-radius: 100% !important;
+    overflow: hidden;
+    background-color: #fffff7;
+    width: 125px !important;
+    height: 125px !important;
+    border: 3px solid seagreen !important;
 }
 
 .profilepic:hover .profilepic__content {
diff --git a/assets/uploads/07156b4680962b650af1c6927c7019d5.jpg b/assets/uploads/07156b4680962b650af1c6927c7019d5.jpg
new file mode 100644
index 0000000..c67d300
Binary files /dev/null and b/assets/uploads/07156b4680962b650af1c6927c7019d5.jpg differ
diff --git a/assets/uploads/1.png b/assets/uploads/1.png
new file mode 100644
index 0000000..e45ca8d
Binary files /dev/null and b/assets/uploads/1.png differ
diff --git a/assets/uploads/600px-Instagram_icon.png b/assets/uploads/600px-Instagram_icon.png
new file mode 100644
index 0000000..f48dab1
Binary files /dev/null and b/assets/uploads/600px-Instagram_icon.png differ
diff --git a/assets/uploads/600px-Instagram_icon1.png b/assets/uploads/600px-Instagram_icon1.png
new file mode 100644
index 0000000..f48dab1
Binary files /dev/null and b/assets/uploads/600px-Instagram_icon1.png differ
diff --git a/assets/uploads/600px-Instagram_icon2.png b/assets/uploads/600px-Instagram_icon2.png
new file mode 100644
index 0000000..f48dab1
Binary files /dev/null and b/assets/uploads/600px-Instagram_icon2.png differ
diff --git a/assets/uploads/Expence_Bill/07156b4680962b650af1c6927c7019d5.jpg b/assets/uploads/Expence_Bill/07156b4680962b650af1c6927c7019d5.jpg
new file mode 100644
index 0000000..c67d300
Binary files /dev/null and b/assets/uploads/Expence_Bill/07156b4680962b650af1c6927c7019d5.jpg differ
diff --git a/assets/uploads/Expence_Bill/07156b4680962b650af1c6927c7019d51.jpg b/assets/uploads/Expence_Bill/07156b4680962b650af1c6927c7019d51.jpg
new file mode 100644
index 0000000..c67d300
Binary files /dev/null and b/assets/uploads/Expence_Bill/07156b4680962b650af1c6927c7019d51.jpg differ
diff --git a/assets/uploads/Expence_Bill/1686929223.jpg b/assets/uploads/Expence_Bill/1686929223.jpg
new file mode 100644
index 0000000..55facf2
Binary files /dev/null and b/assets/uploads/Expence_Bill/1686929223.jpg differ
diff --git a/assets/uploads/Expence_Bill/16869292231.jpg b/assets/uploads/Expence_Bill/16869292231.jpg
new file mode 100644
index 0000000..55facf2
Binary files /dev/null and b/assets/uploads/Expence_Bill/16869292231.jpg differ
diff --git a/assets/uploads/Expence_Bill/1686929550.jpg b/assets/uploads/Expence_Bill/1686929550.jpg
new file mode 100644
index 0000000..e05f3f4
Binary files /dev/null and b/assets/uploads/Expence_Bill/1686929550.jpg differ
diff --git a/assets/uploads/Expence_Bill/16869295501.jpg b/assets/uploads/Expence_Bill/16869295501.jpg
new file mode 100644
index 0000000..e05f3f4
Binary files /dev/null and b/assets/uploads/Expence_Bill/16869295501.jpg differ
diff --git a/assets/uploads/Expence_Bill/1686929799.jpg b/assets/uploads/Expence_Bill/1686929799.jpg
new file mode 100644
index 0000000..55facf2
Binary files /dev/null and b/assets/uploads/Expence_Bill/1686929799.jpg differ
diff --git a/assets/uploads/Expence_Bill/16869297991.jpg b/assets/uploads/Expence_Bill/16869297991.jpg
new file mode 100644
index 0000000..55facf2
Binary files /dev/null and b/assets/uploads/Expence_Bill/16869297991.jpg differ
diff --git a/assets/uploads/Expence_Bill/1686929915.pdf b/assets/uploads/Expence_Bill/1686929915.pdf
new file mode 100644
index 0000000..5ab8bab
Binary files /dev/null and b/assets/uploads/Expence_Bill/1686929915.pdf differ
diff --git a/assets/uploads/Expence_Bill/16869299151.pdf b/assets/uploads/Expence_Bill/16869299151.pdf
new file mode 100644
index 0000000..5ab8bab
Binary files /dev/null and b/assets/uploads/Expence_Bill/16869299151.pdf differ
diff --git a/assets/uploads/Expence_Bill/1686983442.png b/assets/uploads/Expence_Bill/1686983442.png
new file mode 100644
index 0000000..0ff7d37
Binary files /dev/null and b/assets/uploads/Expence_Bill/1686983442.png differ
diff --git a/assets/uploads/Expence_Bill/16869834421.png b/assets/uploads/Expence_Bill/16869834421.png
new file mode 100644
index 0000000..0ff7d37
Binary files /dev/null and b/assets/uploads/Expence_Bill/16869834421.png differ
diff --git a/assets/uploads/Expence_Bill/1686998240.png b/assets/uploads/Expence_Bill/1686998240.png
new file mode 100644
index 0000000..f48dab1
Binary files /dev/null and b/assets/uploads/Expence_Bill/1686998240.png differ
diff --git a/assets/uploads/Expence_Bill/16869982401.png b/assets/uploads/Expence_Bill/16869982401.png
new file mode 100644
index 0000000..f48dab1
Binary files /dev/null and b/assets/uploads/Expence_Bill/16869982401.png differ
diff --git a/assets/uploads/Expence_Bill/1686998311.png b/assets/uploads/Expence_Bill/1686998311.png
new file mode 100644
index 0000000..f48dab1
Binary files /dev/null and b/assets/uploads/Expence_Bill/1686998311.png differ
diff --git a/assets/uploads/Expence_Bill/16869983111.png b/assets/uploads/Expence_Bill/16869983111.png
new file mode 100644
index 0000000..f48dab1
Binary files /dev/null and b/assets/uploads/Expence_Bill/16869983111.png differ
diff --git a/assets/uploads/Expence_Bill/1687158686.jpg b/assets/uploads/Expence_Bill/1687158686.jpg
new file mode 100644
index 0000000..7470bc0
Binary files /dev/null and b/assets/uploads/Expence_Bill/1687158686.jpg differ
diff --git a/assets/uploads/Expence_Bill/16871586861.jpg b/assets/uploads/Expence_Bill/16871586861.jpg
new file mode 100644
index 0000000..7470bc0
Binary files /dev/null and b/assets/uploads/Expence_Bill/16871586861.jpg differ
diff --git a/assets/uploads/Expence_Bill/1687158720.jpg b/assets/uploads/Expence_Bill/1687158720.jpg
new file mode 100644
index 0000000..7470bc0
Binary files /dev/null and b/assets/uploads/Expence_Bill/1687158720.jpg differ
diff --git a/assets/uploads/Expence_Bill/16871587201.jpg b/assets/uploads/Expence_Bill/16871587201.jpg
new file mode 100644
index 0000000..7470bc0
Binary files /dev/null and b/assets/uploads/Expence_Bill/16871587201.jpg differ
diff --git a/assets/uploads/Expence_Bill/1687158768.jpg b/assets/uploads/Expence_Bill/1687158768.jpg
new file mode 100644
index 0000000..7470bc0
Binary files /dev/null and b/assets/uploads/Expence_Bill/1687158768.jpg differ
diff --git a/assets/uploads/Expence_Bill/16871587681.jpg b/assets/uploads/Expence_Bill/16871587681.jpg
new file mode 100644
index 0000000..7470bc0
Binary files /dev/null and b/assets/uploads/Expence_Bill/16871587681.jpg differ
diff --git a/assets/uploads/Expence_Bill/1687158885.jpg b/assets/uploads/Expence_Bill/1687158885.jpg
new file mode 100644
index 0000000..7470bc0
Binary files /dev/null and b/assets/uploads/Expence_Bill/1687158885.jpg differ
diff --git a/assets/uploads/Expence_Bill/16871588851.jpg b/assets/uploads/Expence_Bill/16871588851.jpg
new file mode 100644
index 0000000..7470bc0
Binary files /dev/null and b/assets/uploads/Expence_Bill/16871588851.jpg differ
diff --git a/assets/uploads/Expence_Bill/1687165099.png b/assets/uploads/Expence_Bill/1687165099.png
new file mode 100644
index 0000000..e45ca8d
Binary files /dev/null and b/assets/uploads/Expence_Bill/1687165099.png differ
diff --git a/assets/uploads/Expence_Bill/16871650991.png b/assets/uploads/Expence_Bill/16871650991.png
new file mode 100644
index 0000000..e45ca8d
Binary files /dev/null and b/assets/uploads/Expence_Bill/16871650991.png differ
diff --git a/assets/uploads/Expence_Bill/1687167623.jpg b/assets/uploads/Expence_Bill/1687167623.jpg
new file mode 100644
index 0000000..40dfc58
Binary files /dev/null and b/assets/uploads/Expence_Bill/1687167623.jpg differ
diff --git a/assets/uploads/Expence_Bill/16871676231.jpg b/assets/uploads/Expence_Bill/16871676231.jpg
new file mode 100644
index 0000000..40dfc58
Binary files /dev/null and b/assets/uploads/Expence_Bill/16871676231.jpg differ
diff --git a/assets/uploads/Expence_Bill/1687168022.jpg b/assets/uploads/Expence_Bill/1687168022.jpg
new file mode 100644
index 0000000..40dfc58
Binary files /dev/null and b/assets/uploads/Expence_Bill/1687168022.jpg differ
diff --git a/assets/uploads/Expence_Bill/16871680221.jpg b/assets/uploads/Expence_Bill/16871680221.jpg
new file mode 100644
index 0000000..40dfc58
Binary files /dev/null and b/assets/uploads/Expence_Bill/16871680221.jpg differ
diff --git a/assets/uploads/Expence_Bill/1687173262.jpg b/assets/uploads/Expence_Bill/1687173262.jpg
new file mode 100644
index 0000000..7470bc0
Binary files /dev/null and b/assets/uploads/Expence_Bill/1687173262.jpg differ
diff --git a/assets/uploads/Expence_Bill/16871732621.jpg b/assets/uploads/Expence_Bill/16871732621.jpg
new file mode 100644
index 0000000..7470bc0
Binary files /dev/null and b/assets/uploads/Expence_Bill/16871732621.jpg differ
diff --git a/assets/uploads/Expence_Bill/1687181919.jpg b/assets/uploads/Expence_Bill/1687181919.jpg
new file mode 100644
index 0000000..40dfc58
Binary files /dev/null and b/assets/uploads/Expence_Bill/1687181919.jpg differ
diff --git a/assets/uploads/Expence_Bill/16871819191.jpg b/assets/uploads/Expence_Bill/16871819191.jpg
new file mode 100644
index 0000000..40dfc58
Binary files /dev/null and b/assets/uploads/Expence_Bill/16871819191.jpg differ
diff --git a/assets/uploads/Expence_Bill/Bachelors_button,_Basket_flower,_Boutonniere_flower,_Cornflower_-_3.jpg b/assets/uploads/Expence_Bill/Bachelors_button,_Basket_flower,_Boutonniere_flower,_Cornflower_-_3.jpg
new file mode 100644
index 0000000..cc68276
Binary files /dev/null and b/assets/uploads/Expence_Bill/Bachelors_button,_Basket_flower,_Boutonniere_flower,_Cornflower_-_3.jpg differ
diff --git a/assets/uploads/Expence_Bill/Bachelors_button,_Basket_flower,_Boutonniere_flower,_Cornflower_-_31.jpg b/assets/uploads/Expence_Bill/Bachelors_button,_Basket_flower,_Boutonniere_flower,_Cornflower_-_31.jpg
new file mode 100644
index 0000000..cc68276
Binary files /dev/null and b/assets/uploads/Expence_Bill/Bachelors_button,_Basket_flower,_Boutonniere_flower,_Cornflower_-_31.jpg differ
diff --git a/assets/uploads/Expence_Bill/GST Invoice Format 3.jpg b/assets/uploads/Expence_Bill/GST Invoice Format 3.jpg
new file mode 100644
index 0000000..55facf2
Binary files /dev/null and b/assets/uploads/Expence_Bill/GST Invoice Format 3.jpg differ
diff --git a/assets/uploads/Expence_Bill/GST_Invoice_Format_3.jpg b/assets/uploads/Expence_Bill/GST_Invoice_Format_3.jpg
new file mode 100644
index 0000000..55facf2
Binary files /dev/null and b/assets/uploads/Expence_Bill/GST_Invoice_Format_3.jpg differ
diff --git a/assets/uploads/Expence_Bill/GST_Invoice_Format_31.jpg b/assets/uploads/Expence_Bill/GST_Invoice_Format_31.jpg
new file mode 100644
index 0000000..55facf2
Binary files /dev/null and b/assets/uploads/Expence_Bill/GST_Invoice_Format_31.jpg differ
diff --git a/assets/uploads/Expence_Bill/employee-woman-vector-23342236.jpg b/assets/uploads/Expence_Bill/employee-woman-vector-23342236.jpg
new file mode 100644
index 0000000..7470bc0
Binary files /dev/null and b/assets/uploads/Expence_Bill/employee-woman-vector-23342236.jpg differ
diff --git a/assets/uploads/Expence_Bill/rose-165819_640.jpg b/assets/uploads/Expence_Bill/rose-165819_640.jpg
new file mode 100644
index 0000000..e05f3f4
Binary files /dev/null and b/assets/uploads/Expence_Bill/rose-165819_640.jpg differ
diff --git a/assets/uploads/Expence_Bill/rose-165819_6401.jpg b/assets/uploads/Expence_Bill/rose-165819_6401.jpg
new file mode 100644
index 0000000..e05f3f4
Binary files /dev/null and b/assets/uploads/Expence_Bill/rose-165819_6401.jpg differ
diff --git a/assets/uploads/Expence_Bill/rose-165819_6402.jpg b/assets/uploads/Expence_Bill/rose-165819_6402.jpg
new file mode 100644
index 0000000..e05f3f4
Binary files /dev/null and b/assets/uploads/Expence_Bill/rose-165819_6402.jpg differ
diff --git a/assets/uploads/Expence_Bill/rose-165819_6403.jpg b/assets/uploads/Expence_Bill/rose-165819_6403.jpg
new file mode 100644
index 0000000..e05f3f4
Binary files /dev/null and b/assets/uploads/Expence_Bill/rose-165819_6403.jpg differ
diff --git a/assets/uploads/Expence_Bill/user-original.png b/assets/uploads/Expence_Bill/user-original.png
new file mode 100644
index 0000000..abba3bd
Binary files /dev/null and b/assets/uploads/Expence_Bill/user-original.png differ
diff --git a/assets/uploads/NoImage.jpg b/assets/uploads/NoImage.jpg
new file mode 100644
index 0000000..0c56895
Binary files /dev/null and b/assets/uploads/NoImage.jpg differ
diff --git a/assets/uploads/Screenshot_(224).png b/assets/uploads/Screenshot_(224).png
new file mode 100644
index 0000000..a2fb1dd
Binary files /dev/null and b/assets/uploads/Screenshot_(224).png differ
diff --git a/assets/uploads/Screenshot_from_2023-05-26_15-20-50.png b/assets/uploads/Screenshot_from_2023-05-26_15-20-50.png
new file mode 100644
index 0000000..e16dcb8
Binary files /dev/null and b/assets/uploads/Screenshot_from_2023-05-26_15-20-50.png differ
diff --git a/assets/uploads/Screenshot_from_2023-05-31_17-09-54.png b/assets/uploads/Screenshot_from_2023-05-31_17-09-54.png
new file mode 100644
index 0000000..0f3fc85
Binary files /dev/null and b/assets/uploads/Screenshot_from_2023-05-31_17-09-54.png differ
diff --git a/assets/uploads/dummy.pdf b/assets/uploads/dummy.pdf
new file mode 100644
index 0000000..774c2ea
Binary files /dev/null and b/assets/uploads/dummy.pdf differ
diff --git a/assets/uploads/dummy1.pdf b/assets/uploads/dummy1.pdf
new file mode 100644
index 0000000..774c2ea
Binary files /dev/null and b/assets/uploads/dummy1.pdf differ
diff --git a/assets/uploads/dummy2.pdf b/assets/uploads/dummy2.pdf
new file mode 100644
index 0000000..774c2ea
Binary files /dev/null and b/assets/uploads/dummy2.pdf differ
diff --git a/assets/uploads/dummy3.pdf b/assets/uploads/dummy3.pdf
new file mode 100644
index 0000000..774c2ea
Binary files /dev/null and b/assets/uploads/dummy3.pdf differ
diff --git a/assets/uploads/istockphoto-1322913815-612x6121.jpg b/assets/uploads/istockphoto-1322913815-612x6121.jpg
deleted file mode 100644
index b305021..0000000
Binary files a/assets/uploads/istockphoto-1322913815-612x6121.jpg and /dev/null differ
diff --git a/assets/uploads/logo__1.png b/assets/uploads/logo__1.png
new file mode 100644
index 0000000..db7f7d2
Binary files /dev/null and b/assets/uploads/logo__1.png differ
diff --git a/assets/uploads/photo.jpg b/assets/uploads/photo.jpg
new file mode 100644
index 0000000..40dfc58
Binary files /dev/null and b/assets/uploads/photo.jpg differ
diff --git a/assets/uploads/profile_picture/07156b4680962b650af1c6927c7019d5.jpg b/assets/uploads/profile_picture/07156b4680962b650af1c6927c7019d5.jpg
new file mode 100644
index 0000000..c67d300
Binary files /dev/null and b/assets/uploads/profile_picture/07156b4680962b650af1c6927c7019d5.jpg differ
diff --git a/assets/uploads/profile_picture/07156b4680962b650af1c6927c7019d51.jpg b/assets/uploads/profile_picture/07156b4680962b650af1c6927c7019d51.jpg
new file mode 100644
index 0000000..c67d300
Binary files /dev/null and b/assets/uploads/profile_picture/07156b4680962b650af1c6927c7019d51.jpg differ
diff --git a/assets/uploads/profile_picture/600px-Instagram_icon.png b/assets/uploads/profile_picture/600px-Instagram_icon.png
new file mode 100644
index 0000000..f48dab1
Binary files /dev/null and b/assets/uploads/profile_picture/600px-Instagram_icon.png differ
diff --git a/assets/uploads/profile_picture/Bachelors_button,_Basket_flower,_Boutonniere_flower,_Cornflower_-_3.jpg b/assets/uploads/profile_picture/Bachelors_button,_Basket_flower,_Boutonniere_flower,_Cornflower_-_3.jpg
new file mode 100644
index 0000000..cc68276
Binary files /dev/null and b/assets/uploads/profile_picture/Bachelors_button,_Basket_flower,_Boutonniere_flower,_Cornflower_-_3.jpg differ
diff --git a/assets/uploads/profile_picture/employee-woman-vector-23342236.jpg b/assets/uploads/profile_picture/employee-woman-vector-23342236.jpg
new file mode 100644
index 0000000..7470bc0
Binary files /dev/null and b/assets/uploads/profile_picture/employee-woman-vector-23342236.jpg differ
diff --git a/assets/uploads/profile_picture/photo1.jpg b/assets/uploads/profile_picture/photo1.jpg
new file mode 100644
index 0000000..40dfc58
Binary files /dev/null and b/assets/uploads/profile_picture/photo1.jpg differ
diff --git a/assets/uploads/profile_picture/plants-with-big-flowers-4138211-hero-b10becb169064cc4b3c7967adc1b22e1.jpg b/assets/uploads/profile_picture/plants-with-big-flowers-4138211-hero-b10becb169064cc4b3c7967adc1b22e1.jpg
new file mode 100644
index 0000000..bf89c73
Binary files /dev/null and b/assets/uploads/profile_picture/plants-with-big-flowers-4138211-hero-b10becb169064cc4b3c7967adc1b22e1.jpg differ
diff --git a/assets/uploads/profile_picture/plants-with-big-flowers-4138211-hero-b10becb169064cc4b3c7967adc1b22e11.jpg b/assets/uploads/profile_picture/plants-with-big-flowers-4138211-hero-b10becb169064cc4b3c7967adc1b22e11.jpg
new file mode 100644
index 0000000..bf89c73
Binary files /dev/null and b/assets/uploads/profile_picture/plants-with-big-flowers-4138211-hero-b10becb169064cc4b3c7967adc1b22e11.jpg differ
diff --git a/assets/uploads/profile_picture/rose-165819_640.jpg b/assets/uploads/profile_picture/rose-165819_640.jpg
new file mode 100644
index 0000000..e05f3f4
Binary files /dev/null and b/assets/uploads/profile_picture/rose-165819_640.jpg differ
diff --git a/assets/uploads/profile_picture/user-original.png b/assets/uploads/profile_picture/user-original.png
new file mode 100644
index 0000000..abba3bd
Binary files /dev/null and b/assets/uploads/profile_picture/user-original.png differ
diff --git a/assets/uploads/profile_picture/user-original_(1).png b/assets/uploads/profile_picture/user-original_(1).png
new file mode 100644
index 0000000..11fc38d
Binary files /dev/null and b/assets/uploads/profile_picture/user-original_(1).png differ
diff --git a/assets/uploads/profile_picture/user-original_(1)1.png b/assets/uploads/profile_picture/user-original_(1)1.png
new file mode 100644
index 0000000..11fc38d
Binary files /dev/null and b/assets/uploads/profile_picture/user-original_(1)1.png differ
diff --git a/assets/uploads/test.jpeg b/assets/uploads/test.jpeg
new file mode 100644
index 0000000..1eeb163
Binary files /dev/null and b/assets/uploads/test.jpeg differ
diff --git a/assets/uploads/test1.jpeg b/assets/uploads/test1.jpeg
new file mode 100644
index 0000000..1eeb163
Binary files /dev/null and b/assets/uploads/test1.jpeg differ
diff --git a/assets/uploads/test2.jpeg b/assets/uploads/test2.jpeg
new file mode 100644
index 0000000..1eeb163
Binary files /dev/null and b/assets/uploads/test2.jpeg differ
diff --git a/assets/uploads/test3.jpeg b/assets/uploads/test3.jpeg
new file mode 100644
index 0000000..1eeb163
Binary files /dev/null and b/assets/uploads/test3.jpeg differ
diff --git a/assets/uploads/test4.jpeg b/assets/uploads/test4.jpeg
new file mode 100644
index 0000000..1eeb163
Binary files /dev/null and b/assets/uploads/test4.jpeg differ
diff --git a/assets/uploads/test5.jpeg b/assets/uploads/test5.jpeg
new file mode 100644
index 0000000..1eeb163
Binary files /dev/null and b/assets/uploads/test5.jpeg differ
diff --git a/assets/uploads/test6.jpeg b/assets/uploads/test6.jpeg
new file mode 100644
index 0000000..1eeb163
Binary files /dev/null and b/assets/uploads/test6.jpeg differ
diff --git a/assets/uploads/test7.jpeg b/assets/uploads/test7.jpeg
new file mode 100644
index 0000000..1eeb163
Binary files /dev/null and b/assets/uploads/test7.jpeg differ