diff --git a/application/config/constants.php b/application/config/constants.php
index 2bf8ea01..55016a5d 100755
--- a/application/config/constants.php
+++ b/application/config/constants.php
@@ -145,7 +145,7 @@ define('REVENUE',                            		'REVENUE');
 define('SERVICE',                            		'SERVICE');
 define('IMPORT',                            		'IMPORT');
 define('CAPITAL',                            		'CAPITAL');
-
+define('SYSTEM_ADMIN',                            	'1');
 // Tax Type
 define('PERCENTAGE',                            		'PERCENTAGE');
 define('LUMPSUM',                            		'LUMP SUM');
diff --git a/application/controllers/CostCenter.php b/application/controllers/CostCenter.php
index 55cea728..f6317b5f 100755
--- a/application/controllers/CostCenter.php
+++ b/application/controllers/CostCenter.php
@@ -46,17 +46,10 @@ class CostCenter extends BaseController
 			       
             $this->global['pageTitle'] = 'Siddharth : Cost List';
 
-             if($this->DEPCode == FINANCE )
-		   {
+           
             
             $this->loadViews("costListing", $this->global, $data, NULL);
-           }
-
-           else
-           {
-            $this->loadViews("access", $this->global, $data, NULL);
-
-           }
+          
     }
 	
 	/**
@@ -186,16 +179,10 @@ class CostCenter extends BaseController
             
             $this->global['pageTitle'] = 'Siddharth : Edit Cost';
 
-           if($this->DEPCode == FINANCE )
-		   {
+          
             
             $this->loadViews("editOldcost", $this->global, $data,NULL);
-           }
-
-           else
-           {
-           	 $this->loadViews("access", $this->global, $data,NULL);
-           }
+           
     }
 	
 	function GetBudgetForYear()
diff --git a/application/controllers/MRIRcontroller.php b/application/controllers/MRIRcontroller.php
index 2ddfaaa5..0c3a4ffb 100755
--- a/application/controllers/MRIRcontroller.php
+++ b/application/controllers/MRIRcontroller.php
@@ -92,18 +92,14 @@ class MRIRcontroller extends BaseController
         $this->global['pageTitle'] = 'Siddharth : Billing ';
 		  $data['Billing'] = $this->mrir_model->view_mrir_Billing(); 
 		
-        if($this->DEPCode == FINANCE)
-        {
+        
      
         $this->loadViews("viewmrirforbilling", $this->global,$data , NULL);
-        }
-
-        else
-        {
-         $this->loadViews("access", $this->global,$data , NULL);
-        }   
+           
 
     }
+
+
 public function viewmMaterialDistributionList()
     {
         $this->global['pageTitle'] = 'Siddharth : Distribution list ';
@@ -111,16 +107,10 @@ public function viewmMaterialDistributionList()
 	    $data['Distribution'] = $this->mrir_model->ViewDistributionList(); 
 		$data['status']   = $this->mrir_model->getStatus(); 
 
-        if($this->DEPCode == STORE)
-        {
+        
      
         $this->loadViews("MaterialIssueList", $this->global,$data , NULL);
-        }
-
-        else
-        {
-            $this->loadViews("access", $this->global,$data , NULL);
-        }
+        
     }
 
     
@@ -146,17 +136,10 @@ public function viewmMaterialDistributionList()
 
 
 
-       if($this->DEPCode == STORE || $this->DEPCode == QUALITY)
-       {
+       
 		
 		$this->loadViews("viewinwardgateregister",$this->global,$data,NULL);
-	   }
-
-       else
-       {
-        $this->loadViews("access",$this->global,$data,NULL);
-
-       }
+	   
 
 
     }
@@ -173,16 +156,11 @@ public function viewmMaterialDistributionList()
             $this->global['pageTitle'] = 'Siddharth : View Material Inspection Report';
             //print_r( $data);
 
-             if($this->DEPCode == STORE || $this->DEPCode == QUALITY)
-        { 
+           
+
             $this->loadViews("viewmaterialinspectionreport", $this->global,$data,NULL);
 
-        }
-
-        else
-        {
-            $this->loadViews("access", $this->global,$data,NULL);
-        }
+       
     
     }
 
diff --git a/application/controllers/emergencypurchaseorder.php b/application/controllers/emergencypurchaseorder.php
index ac33b11d..466be65c 100755
--- a/application/controllers/emergencypurchaseorder.php
+++ b/application/controllers/emergencypurchaseorder.php
@@ -72,16 +72,10 @@ class emergencypurchaseorder extends BaseController
           $data['PoTypeOptions'] = $this->purchaseorder_model->getConfigValue('C026');
 
 
-      if($this->DEPCode == PURCHASE )
-      {
+      
         $this->loadViews("alterpurchaseorder", $this->global, $data,  Null);
 
-      }
-
-      else
-      {
-         $this->loadViews("access", $this->global, $data,  Null);
-      } 
+      
     
     }
     /**
@@ -870,19 +864,12 @@ $RequestedBy = $this->input->post('drpDepartment');
 
         $this->global['pageTitle'] = 'Siddharth : Purchase Orders';
 
-        if($this->DEPCode == PURCHASE )
-        {
+       
 
         $this->loadViews("POlist", $this->global, $data, NULL);
 
-        }
-
-         else
-        {
-          $this->loadViews("access", $this->global, $data, NULL);
- 
-        }
     }
+    
     function  Req_validate($selectValue)
     {
         //echo 'select_validate  method called';
diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php
index c65a319b..bbe77473 100755
--- a/application/controllers/employeedetails.php
+++ b/application/controllers/employeedetails.php
@@ -44,17 +44,9 @@ class employeedetails extends BaseController
 
             $this->global['pageTitle'] = 'Siddharth : Employee Listing';
 
-            if($this->role == ROLE_ADMIN || $this->DEPCode == HR)
-            {
-            
             $this->loadViews("employeeListing", $this->global, $data, NULL);
 
-          }
-
-          else
-         {
-          $this->loadViews("access", $this->global, $data, NULL);
-         }
+         
         
     }
   /*
diff --git a/application/controllers/inwardgateregister.php b/application/controllers/inwardgateregister.php
index b721f090..b8d28204 100755
--- a/application/controllers/inwardgateregister.php
+++ b/application/controllers/inwardgateregister.php
@@ -41,18 +41,10 @@ class inwardgateregister extends BaseController
 		$this->global['pageTitle'] = 'Siddharth : Inward Gate Register Details';
 		$data['IGR']= $this->inwardgateregister_model->igrListing();
 
-		if($this->Designation == SECURITY) 
-	  {
 		
 		$this->loadViews("viewIGRDetails",$this->global,$data,NULL);
 
-	   }
-	   
-	   else
-	   {
-	   	$this->loadViews("access",$this->global,$data,NULL);
-
-	   }	
+	  	
 	}
 	
 	 function addinwardgateregister()
@@ -65,16 +57,9 @@ class inwardgateregister extends BaseController
 		$data['PO_NO'] = $this->inwardgateregister_model->getpurchaseorder();
 		//print_r($data['PO_NO']);
 
-		if($this->Designation == SECURITY) 
-		 {
 			 
         $this->loadViews("inwardgateregister", $this->global, $data, NULL);
-         }
-
-         else
-         {
-         	$this->loadViews("access", $this->global, $data, NULL);
-         }
+         
     }
 	
 	function getDateformat($Val)
diff --git a/application/controllers/login.php b/application/controllers/login.php
index d4155eb0..c7d57bc4 100755
--- a/application/controllers/login.php
+++ b/application/controllers/login.php
@@ -70,6 +70,11 @@ class Login extends CI_Controller
           
             if(count($result) > 0)
             {
+
+               // $det= $this->login_model->Accessdep($res->EmpID);
+               // print_r($det);
+               // die();
+
                 foreach ($result as $res)
                 {
                     $sessionArray = array('userId'=>$res->userId,                    
@@ -79,6 +84,7 @@ class Login extends CI_Controller
 											'Designation'=>$res->Designation,
 											'DEPCode'=>$res->DEPCode,
 											'HeadDept'=>$res->HeadDept,
+                                            'depaccess'=>$this->login_model->Accessdep($res->EmpID),
 											'DepartmentName'=>$res->DepartmentName,
 						'EmpID' => $res->EmpID,
                                             'isLoggedIn' => TRUE
diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index 7674f375..0bb76034 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -51,16 +51,12 @@ class purchaseorder extends BaseController
        //print_r($data['PONO']);   
        
 
-       if($this->DEPCode == PURCHASE)
-      {
+      
        $this->loadViews("advancerequest", $this->global, $data, NULL);
-      }
-
-      else
-      {
-        $this->loadViews("access", $this->global, $data, NULL);
-      }
+     
    }
+
+
 	function requisition()
 	 {
 		     $data['DeptList'] = $this->purchaseorder_model->getDepartmentListForAllReq();
@@ -74,17 +70,12 @@ class purchaseorder extends BaseController
 			 /* End Here */
 		    $this->global['pageTitle'] = 'Siddharth : Create PO from Requisition List';
 
-        if($this->DEPCode== PURCHASE)
-       {
+
             
             $this->loadViews("createPOfromRequistion", $this->global,  $data,Null);
 
-       }
+      
 
-       else
-       {
-           $this->loadViews("access", $this->global,  $data,Null);
-       }
 	 }
 	
 	
@@ -106,16 +97,12 @@ class purchaseorder extends BaseController
             
             $this->global['pageTitle'] = 'Siddharth : Purchase Orders';
 
-        if($this->DEPCode == PURCHASE )
-        {
+       
+
             
             $this->loadViews("POlist", $this->global, $data, NULL);
-         }
-
-         else
-         {
-          $this->loadViews("access", $this->global, $data, NULL);
-         }
+         
+         
     }
 
 
diff --git a/application/controllers/requisitionform.php b/application/controllers/requisitionform.php
index 0007d51d..f7460039 100755
--- a/application/controllers/requisitionform.php
+++ b/application/controllers/requisitionform.php
@@ -39,18 +39,10 @@ class requisitionform extends BaseController
           $data['TotNoOfLine'] =$this->requistion_model->getRequistionList($userID);
 
 
-        if (($this->role == ROLE_MANAGER || $this->role == ROLE_EMPLOYEE || $this->role == ROLE_ADMIN  ) && $this->Designation != SECURITY)
-		{	
-
+        
          $this->loadViews("requisitionlisting", $this->global, $data, NULL);
 
-        }
-
-        else
-        { 
-        	$this->loadViews("access", $this->global, $data, NULL);
-
-        }
+       
 
      }
     /**
@@ -87,16 +79,10 @@ class requisitionform extends BaseController
 		 
 		   $data['AppList'] = $this->requistion_model->getApproverRequistList($userID);  	  
 		
-		if($this->role == ROLE_MANAGER )
-		{
+		
            
          $this->loadViews("requisitionlistapproval", $this->global, $data, NULL);
-        }
-
-        else
-        {
-        	$this->loadViews("access", $this->global, $data, NULL);
-        }
+        
 
      }
 	 
diff --git a/application/controllers/servicepurchaseorder.php b/application/controllers/servicepurchaseorder.php
index 39418fef..8832a235 100755
--- a/application/controllers/servicepurchaseorder.php
+++ b/application/controllers/servicepurchaseorder.php
@@ -36,18 +36,9 @@ class servicepurchaseorder extends BaseController
 
 			//print_r($data["Billing"]);
 
-			if($this->DEPCode == FINANCE)
-        { 
-            
             $this->loadViews("serviceporeport", $this->global,$data,null);
 
-        }
-
-        else
-        {
-        	  $this->loadViews("access", $this->global,$data,null);
-
-        }
+       
 	 
 	 }
 	 
diff --git a/application/controllers/storerequisitionlist.php b/application/controllers/storerequisitionlist.php
index f321e53e..8507da99 100755
--- a/application/controllers/storerequisitionlist.php
+++ b/application/controllers/storerequisitionlist.php
@@ -51,17 +51,11 @@ class storerequisitionlist extends BaseController
         $this->global['pageTitle'] = 'Siddharth : StoreRequisition Listing';     
      	$userId= $this->session->userdata ('userId');
      	$data['Store'] = $this->storerequistion_model->Storeall($userId);
-     	if ($this->Designation != SECURITY  && $this->DEPCode != HR )
-	   {
+     	
      	
         $this->loadViews("storerequisition", $this->global,$data,null);	
 
-      }
-
-      else
-      {
-      	 $this->loadViews("access", $this->global,$data,null);	
-      }
+     
     }  
 
       /**
@@ -85,8 +79,6 @@ class storerequisitionlist extends BaseController
      function EditStoreRequistion()
      {
 
-     	if ($this->Designation != SECURITY  && $this->DEPCode != HR )
-	   {
      	$StoreReqNo = $_GET['StoreReqNo'];
 
      	//$StoreReqNo=  $this->input->post('id');
@@ -102,12 +94,7 @@ class storerequisitionlist extends BaseController
         $data['LineItem']=$this ->storerequistion_model->editstorerequistions($StoreReqNo);
      
         $this->loadViews("editstorerequisition", $this->global,$data,null);  	
-       }
-
-       else
-       {
-       	$this->load->view('access');
-       } 
+       
     }
 
 
@@ -215,15 +202,9 @@ class storerequisitionlist extends BaseController
 		$data['Status']= $this->storerequistion_model->getStatus();
 		$data['TotNoOfLine']=$this->storerequistion_model->getRequistionList();
 		//print_r($data['TotNoOfLine']);
-        if ( $this->Designation != SECURITY  &&  $this->DEPCode != HR )
-	    {
+        
          $this->loadViews("storerequisitionlisting", $this->global,$data,null);	
-        }
-
-      else
-      {
-        $this->loadViews("access", $this->global,$data,null);
-      } 
+        
 
     } 
 	
@@ -240,15 +221,11 @@ class storerequisitionlist extends BaseController
 		 $data['ReqListDetails'] = $this->storerequistion_model->getRequistDetails($StoreReqNo);
 		//print_r($data['ReqItem']);
 
-		if($this->DEPCode == STORE)
-		{
-        $this->loadViews("issueStoreRequistion", $this->global,$data,null);	
-		}
+		
 
-		else
-		{
-			$this->loadViews("access", $this->global,$data,null);	
-		}
+        $this->loadViews("issueStoreRequistion", $this->global,$data,null);	
+		
+		
     } 
 	
 		function UpdateIssueRequistion()
diff --git a/application/controllers/storestatus.php b/application/controllers/storestatus.php
index 70b1a210..9cf80181 100755
--- a/application/controllers/storestatus.php
+++ b/application/controllers/storestatus.php
@@ -52,15 +52,9 @@ class storestatus extends BaseController
 			 $data['MaterialList'] =  $this->store_model->GetAllMaterialList();
 			 $data['StockStatus'] = $this->store_model->GetConfigValue('C021');
 
-			 if($this->DEPCode == STORE)
-		    {
+			 
             $this->loadViews("storestatus", $this->global, $data,null);
-            }
-
-            else
-            {
-            	$this->loadViews("access", $this->global, $data,null);
-            }
+            
     }
  
  /**
diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php
index 457e35da..8ccfbce7 100755
--- a/application/controllers/supplier.php
+++ b/application/controllers/supplier.php
@@ -45,21 +45,11 @@ class supplier extends BaseController
             
             $this->global['pageTitle'] = 'Siddharth Industries : Supplier Listing';
 
-            if($this->role == ROLE_ADMIN || $this->DEPCode == SALES || $this->DEPCode == FINANCE ||$this->DEPCode == HR)
-            {
-
-              if($this->DEPCode != FINANCE && $this->DEPCode != HR)
-            {
+           
             
             $this->loadViews("supplierListing", $this->global, $data, NULL);
 
-           }
-          }
-
-         else
-         {
-            $this->loadViews("access", $this->global, $data, NULL);
-         }        
+                 
     }
     /**
      * This function is used to load the add new supplier    */
@@ -73,20 +63,10 @@ class supplier extends BaseController
             $this->global['pageTitle'] = 'siddharth : Add New Supplier';
 
 
-            if($this->role == ROLE_ADMIN || $this->DEPCode == SALES || $this->DEPCode == FINANCE ||$this->DEPCode == HR)
-            {
-
-              if($this->DEPCode != FINANCE && $this->DEPCode != HR)
-            {
+            
             $this->loadViews("addsupplier", $this->global,$data,  NULL);
         
-            }
-            }
-
-            else
-            {
-              $this->loadViews("access", $this->global,$data,  NULL);
-            }
+            
     }
     /**
      * This function is used to check whether PAN already exist or not
diff --git a/application/controllers/user.php b/application/controllers/user.php
index a9b5a8e6..53cbabd7 100755
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -20,6 +20,7 @@ class user extends BaseController
         $this->load->model('user_model');
         $this->load->model('dahsboard_Model');
 		 $this->load->library('form_validation');
+     $this->load->model('costcenter_model');
 		 
         $this->isLoggedIn();   
     }
@@ -1019,6 +1020,8 @@ function attendanceyear($empID ='')
 			$data['EmpList'] = $this->user_model->getAllEmployees();
             
 			$data['roles'] = $this->user_model->getUserRoles();
+
+      $data['Department'] = $this->costcenter_model->getDepartment(); 
             
             $this->global['pageTitle'] = 'Siddharth : Add New User';
 
@@ -1080,15 +1083,15 @@ function attendanceyear($empID ='')
      */
     function addNewUser()
     {
-        if($this->isAdmin() == TRUE)
-        {
-            $this->loadThis();
-        }
-        else
-        {
+        // if($this->isAdmin() == TRUE)
+        // {
+        //     $this->loadThis();
+        // }
+        // else
+        // {
            
              $this->form_validation->set_rules('EmpList','EmpList','trim|callback_Employee_validateS');
-			  $this->form_validation->set_rules('role','role','trim|callback_Role_validate');        
+        $this->form_validation->set_rules('role','role','trim|callback_Role_validate');        
             $this->form_validation->set_rules('password','Password','required|max_length[20]');
             $this->form_validation->set_rules('cpassword','Confirm Password','trim|required|matches[password]|max_length[20]');
            
@@ -1099,37 +1102,87 @@ function attendanceyear($empID ='')
             }
             else
             {
-				$EmpID = $this->input->post('EmpList');
-				$roleId = $this->input->post('role');
-				$password = $this->input->post('password');
-				 $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
-				$Createddt =  $dt->format('Y-m-d H:i:s');
+        $EmpID = $this->input->post('EmpList');
+        $roleId = $this->input->post('role');
+        $password = $this->input->post('password');
+        $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));        
+        $Createddt =  $dt->format('Y-m-d H:i:s');
            
                 $email = $this->input->post('MailID');
+
+                $SelectedDepartment =  $this->input->post('txtSelectedDepartment'); 
+
+
+                $comma_separated = explode(':', $SelectedDepartment);
               
              
-				$userInfo = array('email'=>$email,'EmpID'=>$EmpID,'password'=>getHashedPassword($password),'roleId'=>$roleId,'createdBy'=>$this->vendorId,'createdDtm'=>$Createddt);
-				
+        $userInfo = array('email'=>$email,'EmpID'=>$EmpID,'password'=>getHashedPassword($password),'roleId'=>$roleId,'createdBy'=>$this->vendorId,'createdDtm'=>$Createddt);
+        
                 $result = $this->user_model->addNewUser($userInfo);
+
+                for ($j = 0; $j < count($comma_separated); $j++)
+                 {  
+                       $DeptCode = $comma_separated[$j];
+
+                       $userdept=array('EmpID'=>$EmpID,'Departmentcode'=>$DeptCode);
+
+                       $access= $this->user_model->addAccess($userdept);
+
+                       //echo $access;
+                 }
                 
                 if($result > 0)
                 {
-					 
-					redirect('userListing','refresh');
-					echo "<script>alert('New User Created successfully!');</script>";
+           
+          redirect('userListing','refresh');
+          echo "<script>alert('New User Created successfully!');</script>";
                
- }
+                }
+
                 else
                 {
-					
+          
                     redirect('userListing','refresh');
-		echo "<script>alert('Failiure User Creation!');</script>";			 
+    echo "<script>alert('Failiure User Creation!');</script>";       
                 }               
                 
             }
+        //}
+    }
+
+
+
+
+
+function Adduserdepartment()
+    {
+        $empid= $this->input->post('Eid');
+        $Depcode= $this->input->post('Department');
+        $userdept=array('EmpID'=>$empid,'Departmentcode'=>$Depcode);
+
+        $access= $this->user_model->addAccess($userdept);
+        if($access>0)
+        {
+        echo "Successfully Added";
         }
     }
 
+
+    function Deleteuserdepartment()
+    {
+        $empid= $this->input->post('Eid');
+        $Depcode= $this->input->post('Department');
+        $userdept=array('EmpID'=>$empid,'Departmentcode'=>$Depcode);
+
+        $access= $this->user_model->DeleteAccess($empid,$Depcode);
+
+        if($access>0)
+        {
+        echo "Successfully Deleted";
+        }
+        
+    }
+
     
     /**
      * This function is used load user edit information
@@ -1149,7 +1202,7 @@ function attendanceyear($empID ='')
             }
 			
             $Uid =  $_GET['UID'];
-			
+			      $Empid = $_GET['EMPID']; 
 		
 			
             $data['roles'] = $this->user_model->getUserRoles();
@@ -1158,7 +1211,9 @@ function attendanceyear($empID ='')
 			
 		    $data['EmpList'] = $this->user_model->GetEmployeeDetails($Uid);
 			//print_r($data);
+        $data['Departmentlist'] = $this->costcenter_model->getDepartmentnotadded($Empid); 
 			$data['EmpRole'] =   $this->user_model->GetRoleNameByUserID($Uid); 
+      $data['AccessDept'] = $this->costcenter_model ->getaccessDept($Empid);
 			 
            // $data['userInfo'] = $this->user_model->getUserInfo($userId);
             
diff --git a/application/libraries/BaseController.php b/application/libraries/BaseController.php
index cff31c77..dd9bdcec 100755
--- a/application/libraries/BaseController.php
+++ b/application/libraries/BaseController.php
@@ -49,11 +49,13 @@ class BaseController extends CI_Controller {
 			$this->HeadDept = $this->session->userdata ( 'HeadDept' );
 			$this->DepartmentName = $this->session->userdata ( 'DepartmentName' );
 			$this->EmpID = $this->session->userdata ( 'EmpID' );
+			$this->depaccess = $this->session->userdata ('depaccess');
 			$this->global ['name'] = $this->name;
 			$this->global ['role'] = $this->role;
 			$this->global ['role_text'] = $this->roleText;
 			$this->global ['DEPCode'] = $this->DEPCode;
 			$this->global ['Designation'] = $this->Designation;
+			$this->global ['DepAccesslist'] = $this->depaccess;
 		}
 	}
 	
diff --git a/application/models/costcenter_model.php b/application/models/costcenter_model.php
index 7ca4e2ce..38c48c1e 100755
--- a/application/models/costcenter_model.php
+++ b/application/models/costcenter_model.php
@@ -217,6 +217,36 @@ function addNewcost($Cost)
        
         return $query->result();
     }
+
+
+
+    function getDepartmentnotadded($Empid)
+    {
+
+        $subQuery = 'select Dept.DEPCode,Dept.DepartmentName from T_DepartmentDetails Dept
+left join T_AccessDepartments Ass on Ass.Departmentcode= Dept.DEPCode
+where Dept.DEPCode not in 
+(select Ass.Departmentcode from T_AccessDepartments Ass where EmpID=?) group by Dept.DEPCode';
+    
+        $query = $this->db->query($subQuery, array($Empid));
+     
+       
+        return $query->result();
+    }
+
+
+      function getaccessDept($Empid)
+    {
+
+        $this->db->select('Ass.Departmentcode as AssDep,Dep.DepartmentName');
+        $this->db->from('T_AccessDepartments Ass');
+         $this->db->join('T_DepartmentDetails Dep', 'Dep.DEPCode = Ass.Departmentcode','left');
+         $this->db->where('EmpID ',$Empid);
+
+        $query = $this->db->get();
+        
+        return $query->result();
+    }
 	
 	
 	/**
diff --git a/application/models/login_model.php b/application/models/login_model.php
index 9d18a501..05c80345 100755
--- a/application/models/login_model.php
+++ b/application/models/login_model.php
@@ -33,6 +33,19 @@ class Login_model extends CI_Model
             return array();
         }
     }
+
+    function Accessdep($EmpID)
+    {
+
+        $this->db->select('EmpID, Departmentcode as AssDep');
+        $this->db->from('T_AccessDepartments');
+        $this->db->where('EmpID', $EmpID);
+        
+        
+        $query = $this->db->get();
+    // print_r( $this->db->last_query());
+        return $query->result();
+    }
 }
 
 ?>
diff --git a/application/views/addNew.php b/application/views/addNew.php
index 74803ae3..f6090c8c 100755
--- a/application/views/addNew.php
+++ b/application/views/addNew.php
@@ -1,3 +1,10 @@
+<?php ?>
+
+
+
+
+
+
 <div class="content-wrapper" style="min-height: 537px;">
     <!-- Content Header (Page header) -->
     <section class="content-header">
@@ -85,21 +92,23 @@
                                 </div>
 								 </div>
 								
-								 <div class="row">
+
+<div class="row">
                                
 								
-								 <div class="col-md-3">
-                                    <div class="form-group">
-                                        <label for="email">Email address</label>
-                                        <input type="text" class="form-control required " readonly id="MailID"  name="MailID" maxlength="128">
-                                    </div>
-                                </div>
-								<div class="col-md-3">
-                                    <div class="form-group">
-                                        <label for="mobile">Contact Number</label>
-                                        <input type="text" class="form-control required digits" readonly id="ContactNo" name="ContactNo" minlength="10"maxlength="10">
-                                    </div>
-                                </div>
+	<div class="col-md-3">
+        <div class="form-group">
+            <label for="email">Email address</label>
+                <input type="text" class="form-control required " readonly id="MailID"  name="MailID" maxlength="128">
+        </div>
+    </div>
+	
+    <div class="col-md-3">
+        <div class="form-group">
+            <label for="mobile">Contact Number</label>
+                <input type="text" class="form-control required digits" readonly id="ContactNo" name="ContactNo" minlength="10"maxlength="10">
+        </div>
+    </div>
 								<div class="col-md-2">
                                     <div class="form-group">
                                         <label for="role">Role</label>
@@ -118,20 +127,78 @@
                                             ?>
                                         </select>
                                     </div>
-                                </div>   
-								  <div class="col-md-2">
-                                    <div class="form-group">
-                                        <label for="password">Password</label>
-                                        <input type="password" class="form-control required" id="password" required  name="password" maxlength="10">
-                                    </div>
-                                </div>
-                                <div class="col-md-2">
-                                    <div class="form-group">
-                                        <label for="cpassword">Confirm Password</label>
-                                        <input type="password" class="form-control required equalTo"  required id="cpassword" name="cpassword" maxlength="10">
-                                    </div>
-                                </div>
-								 </div>
+                                </div> 
+	<div class="col-md-2">
+        <div class="form-group">
+            <label for="password">Password</label>
+                <input type="password" class="form-control required" id="password" required  name="password" maxlength="10">
+        </div>
+    </div>
+        
+    <div class="col-md-2">
+        <div class="form-group">
+            <label for="cpassword">Confirm Password</label>
+                <input type="password" class="form-control required equalTo"  required id="cpassword" name="cpassword" maxlength="10">
+        </div>
+    </div>
+
+
+
+
+    <div class="row">
+        <div class="col-md-12">
+            <div class="col-md-6">
+                <div class="col-md-4">       
+                    <label>Department</label>
+                        <div>
+                            <?php
+                                  
+                                $options = array("0"=>'Select Department',
+                                                  "1"=>'System Administrator');
+                                        //print_r(  $Department);
+                                        
+                                        if(!empty($Department))
+                                        {
+                                        foreach ($Department as $SID):
+                                          
+                                       
+                                          $options[$SID->DEPCode] =  $SID->DEPCode.' '.' - '.' '.$SID->DepartmentName;
+
+                                        endforeach;
+                                        }           
+                        echo form_multiselect('distriList', $options,set_value('distriList'),'id="distriList"' ,'class="form-control required"','required="true"');
+
+                            ?>                       
+                        </div>
+                </div> 
+            
+            <div class="col-md-4"> 
+                <center>
+                    <a style="color:white" href="javascript:void(0);" id="addPop"><button type="button" style="margin: 30px 0px 0px 15px;" class="btn btn-primary">Add</button></a><br>
+                   <!--  <a style="color:white" href="javascript:void(0);" id="removePop"><button type="button" style="margin: 10px 0px 0px 15px;" class="btn btn-primary">Remove</button></a> --><br>
+
+                </center>
+            </div>
+
+            <div class="col-md-4"> 
+                 <b>&nbsp;</b>          
+                 
+                 <?php
+                        $option["0"] =  'Selected Department';                                                                                      
+                        echo form_multiselect('selectDistriList[]', $option,set_value('selectDistriList[]'),'id="selectDistriList"','size="10"');
+
+                                        ?>   
+            </div> 
+            </div>
+        
+        </div> 
+             
+    </div>
+
+
+</div>
+
+<input type="hidden" name="txtSelectedDepartment" id="txtSelectedDepartment" />
 								 
 							
                             <div class="row">
@@ -177,6 +244,8 @@
                         <?php echo validation_errors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>'); ?>
                     </div>
                 </div>
+
+                
             </div>
         </div>    
     </section>
@@ -226,4 +295,63 @@ else
 }	
   
 });
+
+
+
+
+   $('#addPop').click(function () 
+           {
+             if ($('#distriList option:selected').val() != null) 
+             {
+            
+                if($('#distriList option:selected').val()==0 )
+                {
+                  alert('please select Department');
+                }
+             
+                else
+                {
+
+                   var tempSelect = $('#distriList option:selected').val();
+                   var tempText = $('#distriList option:selected').text();
+            
+                   var o = new Option(tempText,tempSelect);
+                   var hidval = tempSelect;
+                   var orgVal = $('#txtSelectedDepartment').val();
+                   var Selectedval = ''
+            
+                   if(orgVal != '')
+                   {
+                      Selectedval =  orgVal + ':' + hidval;
+                   }
+                   else
+                   {
+                      Selectedval = hidval
+                    }
+                   $('#txtSelectedDepartment').val(Selectedval);
+              
+                   $(o).html(tempText);
+                   $("#selectDistriList").append(o);
+              
+            
+                   $('#distriList option:selected').remove();
+                   $("#distriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
+                   $("#selectDistriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
+        
+                   tempSelect = '';
+                   tempText = '';
+                   Selectedval = '';
+                }
+          } 
+
+          else 
+          {
+              alert("Before add please select any position.");
+          }
+      });
+
+
+ 
+
+
 </script>
\ No newline at end of file
diff --git a/application/views/editOld.php b/application/views/editOld.php
index adfe1f7e..f0dc0bda 100755
--- a/application/views/editOld.php
+++ b/application/views/editOld.php
@@ -59,7 +59,7 @@ if(!empty($EmpList))
               <!-- general form elements -->
                 
                 
-                
+                <div id="content"></div>
                 <div class="box box-primary">
                      
                     <!-- form start -->
@@ -146,6 +146,86 @@ if(!empty($EmpList))
                                         <input type="password" class="form-control equalTo"   id="cpassword" name="cpassword" maxlength="10">
                                     </div>
                                 </div>
+
+
+
+                               <div class="row">
+        <div class="col-md-12">
+            <div class="col-md-6">
+                <div class="col-md-4">       
+                    <label>Department</label>
+                        <div>
+                            <?php
+                                  
+                                $options = array("0"=>'Select Department',
+                                                 "1"=>'System Administrator');
+                                        // print_r($Departmentlist);
+                                        
+                                        if(!empty($Departmentlist))
+                                        {
+                                        foreach ($Departmentlist as $SID):
+                                          
+                                       
+                                          $options[$SID->DEPCode] =  $SID->DEPCode.' '.' - '.' '.$SID->DepartmentName;
+
+                                        endforeach;
+                                        }           
+                        echo form_multiselect('distriList', $options,set_value('distriList'),'id="distriList"' ,'class="form-control required"','required="true"');
+
+                            ?>                       
+                        </div>
+                </div> 
+            
+            <div class="col-md-4"> 
+                <center>
+                    <a style="color:white" href="javascript:void(0);" id="addPop"><button type="button" style="margin: 30px 0px 0px 15px;" class="btn btn-primary">Add</button></a><br>
+               <a style="color:white" href="javascript:void(0);" id="removePop"><button type="button" style="margin: 10px 0px 0px 15px;" class="btn btn-primary">Remove</button></a><br>
+
+                </center>
+            </div>
+
+            <div class="col-md-4"> 
+                 <b>&nbsp;</b>          
+                 
+                 <?php
+                        $option["0"] =  'Selected Department';  
+                              //print_r($AccessDept);
+                              
+                                    if(!empty($AccessDept))
+                                        {
+                                        foreach ($AccessDept as $SID):                                          
+                                          if($SID->AssDep == '1')
+                                          {
+                                            $option[$SID->AssDep] = "01-System Administrator";
+                                          }
+
+                                          else
+                                          {
+                                          $option[$SID->AssDep] =  $SID->AssDep.' '.' - '.' '.$SID->DepartmentName;
+                                         }
+                                        endforeach;
+                                        }                                                       
+
+
+
+
+
+                        echo form_multiselect('selectDistriList[]', $option,set_value('selectDistriList[]'),'id="selectDistriList"','size="10"');
+
+                                        ?>   
+            </div> 
+            </div>
+        
+        </div> 
+             
+    </div>
+ 
+
+
+
+
+
+
 								 
 								 </div>
 							 
@@ -153,6 +233,11 @@ if(!empty($EmpList))
                         </div><!-- /.box-body -->
     
                         <div class="box-footer" style="text-align:right">
+                        <input type="hidden" name="txtSelectedDepartment" id="txtSelectedDepartment" />
+
+                        <input type="hidden" name="txtEmpid" id="txtEmpid" value="<?php echo $EmpId?>" />
+
+
                             <input type="submit" class="btn btn-primary" value="Submit" />
                             <input type="reset" class="btn btn-primary" value="Cancel" />
                         </div>
@@ -194,3 +279,151 @@ if(!empty($EmpList))
 </div>
 
 <script src="<?php echo base_url(); ?>assets/js/editUser.js" type="text/javascript"></script>
+
+<script type="text/javascript">
+    
+
+
+
+      $('#addPop').click(function () {
+          if ($('#distriList option:selected').val() != null) {
+            if($('#distriList option:selected').val()==0 ){
+            alert('please select Department');
+            }
+            else{
+              var tempSelect = $('#distriList option:selected').val();
+              var Eid= $('#txtEmpid').val();
+               var tempText = $('#distriList option:selected').text();
+          
+              var o = new Option(tempText,tempSelect);
+              var hidval = tempSelect;
+              var orgVal = $('#txtSelectedDepartment').val();
+              //salert(orgVal);
+              var Selectedval = ''
+            
+              if(orgVal != '')
+              {
+                  Selectedval =  orgVal + ':' + hidval;
+              }
+              else
+              {
+                  Selectedval = hidval
+              }
+              $('#txtSelectedDepartment').val(Selectedval);
+
+              var Department= $('#txtSelectedDepartment').val();
+              
+              
+              $(o).html(tempText);
+              $("#selectDistriList").append(o);
+              
+            
+              $('#distriList option:selected').remove();
+              $("#distriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
+            $("#selectDistriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
+
+
+             
+                $('#content').loader('show');
+                $.ajax({ 
+                data:{Eid:Eid,Department:Department},    
+                
+                type:"POST",
+                url:"<?php echo base_url() ?>user/Adduserdepartment", 
+                success:function(data) {
+                if(data)
+                {
+                $('#content').loader('hide'); 
+                alert(data);
+                $('#txtSelectedDepartment').val('');
+                $('#txtRowCount').val('');
+                
+                //window.location = baseurl + 'CostCenter/CostListing';
+                }               
+            
+        }
+        });
+        //$('#content').loader('hide'); 
+       
+           
+        
+              tempSelect = '';
+              tempText = '';
+              Selectedval = '';
+
+              
+
+
+
+          } 
+     }
+          else {
+              alert("Before add please select any position.");
+          }
+      });
+
+
+
+
+      $('#removePop').click(function () {
+          if ($('#selectDistriList option:selected').val() != null) {
+            if($('#selectDistriList option:selected').val() == 0){
+              //alert('cannot removed');
+             }
+            else{
+              var tempSelect = $('#selectDistriList option:selected').val();
+
+              var Eid= $('#txtEmpid').val();
+
+
+              $('#selectDistriList option:selected').remove().appendTo('#distriList');
+              $("#selectDistriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
+              $("#distriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
+            
+              $("#distriList").val(tempSelect);
+              $('#txtSelectedDepartment').val(tempSelect);
+              tempSelect = '';
+
+              var Department= $('#txtSelectedDepartment').val();
+              
+             
+                $('#content').loader('show');
+                $.ajax({ 
+                data:{Eid:Eid,Department:Department},  
+                type:"POST",
+                url:"<?php echo base_url() ?>user/Deleteuserdepartment", 
+                success:function(data) {
+                if(data)
+                {
+                $('#content').loader('hide'); 
+                alert(data);
+                $('#txtSelectedDepartment').val('');
+                $('#txtRowCount').val('');
+                
+                //window.location = baseurl + 'CostCenter/CostListing';
+                }               
+            
+        }
+        });
+        //$('#content').loader('hide'); 
+    
+               
+              
+
+        }
+
+          } 
+
+          else 
+          {
+              alert("Before remove please select any position.");
+          }
+      });
+
+
+
+
+
+
+
+</script>>
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index c0e28ef6..7bcc29dd 100755
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -79,13 +79,13 @@
 	<!-- fullCalendar 2.2.5-->
 	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.min.css">
 	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.print.css" media="print">
-<!--	<script type="text/javascript">
+	<!-- <script type="text/javascript">
 $(function() {
     $(this).bind("contextmenu", function(e) {
         e.preventDefault();
     });
 }); 
-</script>-->
+</script> -->
     <style>
     	.error{
     		color:red;
@@ -153,46 +153,126 @@ $(function() {
 	  
     </div>
           <div class="navbar-custom-menu collapse navbar-collapse" id="myNavbar">
-            <ul class="nav navbar-nav">
+            <ul class="nav navbar-nav" style="font-size: 13px;">
               <!-- User Account: style can be found in dropdown.less -->
-			  <?php if($Designation != SECURITY  ){ ?>
-			  <li class="treeview">
+			 <!--  <?php print_r($DepAccesslist);?> -->
+             <li class="treeview">
               <a href="<?php echo base_url(); ?>dashboard">
                 <i class="fa fa-dashboard"></i> <span>Dashboard</span> 
               </a>
             </li>
-				<?php 
-			  }
-			  if($role == ROLE_ADMIN || $DEPCode == SALES || $DEPCode == FINANCE || $DEPCode == HR)
-						{ 
-						?>
-				
-			<li class="treeview">		      
-				<span id="menu" data-toggle="dropdown"><i class="fa fa-database" aria-hidden="true"></i>  Master Details<span class="caret"></span></span> 
-				<ul class="dropdown-menu" role="menu" aria-labelledby="menu1">
-				  
-						<?php //echo $DEPCode;
-						if($role == ROLE_ADMIN || $DEPCode == SALES || $DEPCode == FINANCE || $DEPCode == HR)
-						{
-						?>
-						<?php
-						if($DEPCode != FINANCE && $DEPCode != HR)
-						{
-						?>
+
+ <!-- <?php print_r($DepAccesslist);?> -->
+
+             <li class="treeview">
+					  <span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> Requisition<span class="caret"></span></span> 
+						<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
+
+                          <li class="treeview">
+								  <a href="<?php echo base_url(); ?>Requisition">
+									<i class="fa fa-arrow-circle-up"></i>
+									<span>Raise Requisition </span>
+								  </a>
+						 </li>   
+
+						 <li class="treeview">
+								  <a href="<?php echo base_url(); ?>UpdatePOStatus">
+									<i class="fa fa-arrow-circle-up"></i>
+									<span>Update Service PO Status </span>
+								  </a>
+						</li>
+
 						<li class="treeview">
+								  <a href="<?php echo base_url(); ?>ApproveRequisition">
+									<i class="fa fa-thumbs-o-up"></i>
+									<span>Approve Requisition </span>
+								  </a>
+						</li>
+
+                         <!-- <?php print_r($DepAccesslist);?> -->
+						<?php foreach($DepAccesslist as $dep){?>
+
+						<?php $assd=$dep->AssDep; 
+
+						if($assd == PURCHASE || $DEPCode == PURCHASE){?>
+
+
+                                  <li class="treeview">
+								  <a href="<?php echo base_url(); ?>CreatePO">
+									<i class="fa fa-empire"></i>
+									<span>Purchase Order From Requisition</span>
+								  </a>
+								</li>
+                    <?}}?>
+                    
+						</ul>
+			</li>
+
+
+          <li class="treeview">
+                      <span id="menu" data-toggle="dropdown" ><i class="fa fa-check-square-o"></i> Store Requisition<span class="caret"></span></span> 
+                        <ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
+
+                        <li class="treeview">
+							  <a href="<?php echo base_url(); ?>storerequisition">
+								<i class="fa fa-upload"></i>
+								<span>Store Requisition</span>
+							  </a>
+							</li>
+
+
+							<li class="treeview">   
+							  <a href="<?php echo base_url(); ?>approvalstorerequisitionslip">
+								<i class="fa fa-eye"></i>
+								<span>Approve Store Requisition</span>
+							  </a>
+							</li>
+
+						<!-- 	<li class="treeview">
+						  <a href="<?php echo base_url(); ?>userListing">
+							<i class="fa fa-users"></i>
+							<span>Users</span>
+						  </a>
+						</li> -->
+
+                        </ul>
+           </li>
+
+
+
+          <?php $check=0; ?>
+		   <?php foreach($DepAccesslist as $dep){
+		   	$assd= $dep->AssDep;
+
+		   	if($assd == FINANCE || $assd == HR || $assd == SALES || $assd == SYSTEM_ADMIN || $DEPCode == FINANCE || $DEPCode == HR || $DEPCode ==SALES){ $check= $check+1;?>
+
+		   
+            <li class="treeview">	
+
+               
+				<span id="menu" data-toggle="dropdown"><i class="fa fa-database" aria-hidden="true"></i>  Master Details<span class="caret"></span></span> 
+				<ul class="dropdown-menu" role="menu" aria-labelledby="menu1"> 
+			
+            
+				
+                 <?php foreach($DepAccesslist as $dep){
+                 	$assd= $dep->AssDep;?>
+                       
+					<?php if($assd == SALES || $assd == SYSTEM_ADMIN ||$DEPCode ==SALES){ ?>
+
+				     <li class="treeview">
 						  <a href="<?php echo  base_url(); ?>supplierListing" >
 							<i class="fa fa-user-secret"></i>
 							<span class="nav-label">Supplier Details</span>
 						  </a>
 						</li>
-						<?php
-						}
-						?>
-						<?php
-						if($DEPCode == FINANCE )
-						{
-						?>
-						<li class="treeview">
+		
+					<?php }?>
+
+
+					<?php if($assd == FINANCE || $DEPCode == FINANCE){ ?>
+
+				    <li class="treeview">
 						 <a href="<?php echo base_url(); ?>costListing" >
 							<i class="fa fa-cart-plus"></i>
 							<span class="nav-label">Cost Details</span>
@@ -205,35 +285,33 @@ $(function() {
 							<span class="nav-label">Asset Details</span>
 						  </a>
 						</li>
-						<?php
-						}
-						?>
-						<?php
-						if($role == ROLE_ADMIN || $DEPCode == HR)
-						{
-						?>
-						<?php
-						if($DEPCode != HR)
-						{
-						?>
-						<li class="treeview">
+		
+					<?php }?>
+
+
+				   <?php if($assd == HR || $assd == SYSTEM_ADMIN || $DEPCode == HR){ ?>
+
+				   <li class="treeview">
 						  <a href="<?php echo base_url(); ?>companyview" >
 							<i class="fa fa-industry"></i>
 							<span class="nav-label">Company Master</span>
 						  </a>
 						</li> 
-						<?php } ?>
+						
 						<li class="treeview">
 						  <a href="<?php echo base_url(); ?>employeeListing" >
 							<i class="fa fa-user-circle"></i>
 							<span class="nav-label">Employee Details</span>
 						  </a>
 						</li>
-						<?php
-						if($DEPCode != HR)
-						{
-						?>
-						<li class="treeview">
+		
+					<?php }?>
+
+
+
+					 <?php if($assd == SYSTEM_ADMIN){ ?>
+
+				   <li class="treeview">
 						  <a href="<?php echo base_url(); ?>configlisting" >
 							<i class="fa fa-file-text"></i>
 							<span class="nav-label">Config Master</span>
@@ -245,348 +323,77 @@ $(function() {
 							<span class="nav-label">Department Master</span>
 						  </a>
 						</li>
-						<?php } ?>
-						<?php
-						}
-						?>	
-						<?php
-						if($role == ROLE_ADMIN && $DEPCode != HR )
-						{
-						?>
+
 						<li class="treeview">
 						  <a href="<?php echo base_url();?>rawmaterialListing" >
 							<i class="fa fa-files-o"></i>
 							<span>Material Master</span>
 						  </a>
 						</li>
-						<?php
-						}
-						?>
-						<?php
-						}
-						if($role == ROLE_ADMIN && $DEPCode != HR )
-						{
-						?>
-						
+
 						<li class="treeview">
 						  <a href="<?php echo base_url(); ?>userListing">
 							<i class="fa fa-users"></i>
 							<span>Users</span>
 						  </a>
 						</li>
-						 <?php
-							}
-										
-							?>
-				</ul>  
-			</li>	
- <?php
-							}
-										
-							?>			
-           <?php
-					if (( $role == ROLE_MANAGER|| $role == ROLE_EMPLOYEE || $role == ROLE_ADMIN || $DEPCode == MANAGEMENT ) && $Designation != SECURITY && $DEPCode != HR )
-				{
-				?>
-					<li class="treeview">
-					  <span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> Requisition<span class="caret"></span></span> 
-						<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
-						<?php  if (($role == ROLE_MANAGER || $role == ROLE_EMPLOYEE || $role == ROLE_ADMIN  ) && $Designation != SECURITY)
-								{									
-								?>
-							<li class="treeview">
-								  <a href="<?php echo base_url(); ?>Requisition">
-									<i class="fa fa-arrow-circle-up"></i>
-									<span>Raise Requisition </span>
-								  </a>
-								</li>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>UpdatePOStatus">
-									<i class="fa fa-arrow-circle-up"></i>
-									<span>Update Service PO Status </span>
-								  </a>
-								</li>
-								<?Php 
-								} 
-								?>
-								<?php  if($role == ROLE_MANAGER )
-								{									
-								?>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>ApproveRequisition">
-									<i class="fa fa-thumbs-o-up"></i>
-									<span>Approve Requisition </span>
-								  </a>
-								</li>
-								
-								<?Php 
-								} ?>
-								<?Php  
-								 if( $DEPCode == PURCHASE)
-								 {
-								?>
-								
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>CreatePO">
-									<i class="fa fa-empire"></i>
-									<span>Purchase Order From Requisition</span>
-								  </a>
-								</li>
-								<?Php } ?>
-								
-						</ul> 
-					</li>
-				<?php
-					}			
-					?>
-					
-			<?php
-						//if(($DEPCode == FINANCE && $role == ROLE_MANAGER)|| ($(DEPCode == PURCHASE && $role == ROLE_EMPLOYEE)))
-						if($DEPCode == FINANCE || $DEPCode == PURCHASE || $DEPCode == MANAGEMENT)
-						//if($Designation != SECURITY )
-						{
-						?>
-						 
-						<li class="treeview">
-              <span id="menu" data-toggle="dropdown"><i class="fa fa-first-order"></i> Purchase order<span class="caret"></span></span> 
-			  	<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
-						<!-- All User can create Emergency po except Security -->
-						 <?php if($DEPCode == PURCHASE ){ ?>
-						<li class="treeview">
-						  <a href="<?php echo base_url(); ?>EmergencyPO">
-							<i class="fa fa-ambulance"></i>
-							<span>Emergency Purchase Order  </span>
-						  </a>
-						</li>
-						<li class="treeview">
-								  <a href="<?php echo base_url(); ?>purchaseorderListing">
-									<i class="fa fa-list"></i>
-									<span>Purchase Order List  </span>
-								  </a>
-								</li>
-								
-						<li class="treeview">
-						  <a href="<?php echo base_url(); ?>amendmentpurchaseorder">
-							<i class="fa fa-ambulance"></i>
-							<span>Amendment Purchase Order  </span>
-						  </a>
-						</li>
-						
-						
-						<?php
-						}
-						?>
-						<!-- For Finance Team for PO approval list-->
-						<?php
-						 
-						if($DEPCode == FINANCE  && $role == ROLE_MANAGER)
-						{
-						?>
-						<li class="treeview">
-								  <a href="<?php echo base_url(); ?>POApproval">
-									<i class="fa fa-users"></i>
-									<span>Approve Purchase Order</span>
-								  </a>
-								</li>
-						<?php
-						}
-						?>
-						<!-- this page is for gate keeper for view the full po list-->
-						
-						
-						<!--FOR Relese PO Management Team -->
-						<?php
-						//if($DEPCode != FINANCE && $DEPCode == PURCHASE)
-							if( $DEPCode == MANAGEMENT)
-						{
-						?>
-                        <li class="treeview">
-                          <a href="<?php echo base_url(); ?>PORelease">
-                            <i class="fa fa-history"></i>
-                            <span>Release Purchase Order</span>
-                          </a>
-                        </li>
-						 <?php
-						}
-						?>
-						<!--END Relese PO Management Team -->
-				</ul> 
+		
+					<?php }?> 
+
+                   <?php }?>
+
+                
+
+
+               </ul>
             </li>
-						<?php
-						} 
-							if ($Designation != SECURITY  && $DEPCode != HR )
-				{
-							
-						?>
-						<li class="treeview">
-                      <span id="menu" data-toggle="dropdown" ><i class="fa fa-check-square-o"></i> Store Requisition<span class="caret"></span></span> 
-                        <ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
-						
-							<li class="treeview">
-							  <a href="<?php echo base_url(); ?>storerequisition">
-								<i class="fa fa-upload"></i>
-								<span>Store Requisition</span>
-							  </a>
-							</li>
-							<li class="treeview">
-							  <a href="<?php echo base_url(); ?>batchcard/HourlyListing">
-								<i class="fa fa-upload"></i>
-								<span>Batchcard - HourlyListing</span>
-							  </a>
-							</li>
-							
-							<li class="treeview">
-							  <a href="<?php echo base_url(); ?>batchcard/dailyListing">
-								<i class="fa fa-upload"></i>
-								<span>Batchcard - DailyListing</span>
-							  </a>
-							</li>
-							
-							<li class="treeview">
-							  <a href="<?php echo base_url(); ?>batchcard/getStockDetails">
-								<i class="fa fa-upload"></i>
-								<span>Batchcard - StockDetails</span>
-							  </a>
-							</li>
-								<?php  
-								if($role == ROLE_MANAGER ) {
-									
-								?>
-							<li class="treeview">   
-							  <a href="<?php echo base_url(); ?>approvalstorerequisitionslip">
-								<i class="fa fa-eye"></i>
-								<span>Approve Store Requisition</span>
-							  </a>
-							</li>
-								<?php }
-								if( $DEPCode == STORE)
-								 {							
-							 ?>
-							<li class="treeview">
-							  <a href="<?php echo base_url(); ?>storerequisitionlisting">
-								<i class="fa fa-eye"></i>
-								<span>Store Requisition Listing</span>
-							  </a>
-							</li>
-							
-								 <?php } ?>
-						</ul>
-                    </li>
-					<?php
-								 
-						} ?>
-						
-						<?php		//echo $DEPCode;						 
-						
-			if( $role == ROLE_ADMIN && $DEPCode != HR) { ?> 
-					<li class="treeview">
-                        <span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> Attendance<span class="caret"></span></span> 
-						
-						<?php	if($role == ROLE_ADMIN) { ?>
-                        <ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
-						
-							<li class="treeview">
-								  <a href="<?php echo base_url(); ?>attendance">
-									<i class="fa fa-refresh fa-spin "></i>
-									<span>Monthly Attendance</span>
-								  </a>
-								</li>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>permissionlist">
-									<i class="fa fa-user-circle "></i>
-									<span>Permission Slip</span>
-								  </a>
-								</li>
-						</ul>
-						<?php } ?>
-                    </li>
-			<?php	}							 
-						
-			if($DEPCode == HR )
-				{
-				?>
-					<li class="treeview">
-					  <span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> PaySlip <span class="caret"></span></span> 
-						<ul class="dropdown-menu" role="menu" aria-labelledby="menu3">
-						
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>monthlypay">
-									<i class="fa fa-keyboard-o"></i>
-									<span>Monthly Pay Information</span>
-								  </a>
-								</li>
-							<!--	<li class="treeview">
-								  <a href="<?php echo base_url(); ?>ExcelUpload2">
-									<i class="fa fa-upload"></i>
-									<span>Monthly Pay Upload</span>
-								  </a>
-								</li>-->
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>ViewPay">
-									<i class="fa fa-money"></i>
-									<span>PaySlip Generator</span>
-								  </a>
-								</li>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>PaysilpListing" >
-									<i class="fa fa-credit-card-alt"></i> <span>Edit Payslip</span> 
-								  </a>
-								</li>
-								<li class="treeview">
-                                  <a href="<?php echo base_url(); ?>emppayListings" >
-                                    <i class="fa fa-credit-card"></i> <span>Employee Salary Details</span> 
-                                  </a>
-                                </li>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>BankReport" >
-									<i class="fa fa-table"></i> <span>Bank Report</span> 
-								  </a>
-								</li>
-								
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>publicholidays" >
-									<i class="fa fa-calendar"></i> <span>Public Holidays</span> 
-								  </a>
-								</li>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>loanreports" >
-									<i class="fa fa-list-alt"></i> <span>Loan Reports</span> 
-								  </a>
-								</li>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>bonusreports">
-									<i class="fa fa-list-alt"></i> <span>Incentives And Bonus Reports</span>
-								  </a>
-								</li>
-								
-						</ul> 
-					</li>
-				<?php
-					}
-								
-					?>
-					 <?php if($Designation == SECURITY  || $DEPCode == STORE || $DEPCode == QUALITY){ ?>
-					<li class="treeview">
-					  <span id="menu" data-toggle="dropdown" ><i class="fa fa-check-square-o"></i> Inspection<span class="caret"></span></span> 
-						<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
-						<?php if($Designation == SECURITY) {?>
-							<li class="treeview">
+		   	<? if($check ==1){break;} }
+
+		   	}?>
+
+
+
+
+
+
+
+		   	          <?php $check=0; ?>
+		   <?php foreach($DepAccesslist as $dep){
+		   	$assd= $dep->AssDep;
+
+		   	if($assd == QUALITY || $assd == STORE || $assd == ADMIN || $DEPCode == QUALITY || $DEPCode == STORE || $DEPCode == ADMIN){ $check= $check+1;?>
+
+		   
+            <li class="treeview">	
+
+               
+				<span id="menu" data-toggle="dropdown" ><i class="fa fa-check-square-o"></i> Inspection<span class="caret"></span></span> 
+				<ul class="dropdown-menu" role="menu" aria-labelledby="menu1"> 
+
+		   <?php foreach($DepAccesslist as $dep){
+		   	$assd= $dep->AssDep;?>	
+
+
+		     <?php if($assd == ADMIN || $DEPCode == ADMIN){?>	
+			
+                <li class="treeview">
 							  <a href="<?php echo base_url(); ?>Addigr">
 								<i class="fa fa-upload"></i>
 								<span>Inward Gate Register Entry</span>
 							  </a>
-							</li>
-							<li class="treeview">
+				</li>
+				<li class="treeview">
 							  <a href="<?php echo base_url(); ?>ViewigrDetails">
 								<i class="fa fa-upload"></i>
 								<span>View Inward Gate Register</span>
 							  </a>
-							</li>
-						<?php } 
-						  if($DEPCode == STORE || $DEPCode == QUALITY)
-						  { 
-						?>	
-							<li class="treeview">
+				</li>
+			 <?php }?>
+
+             <?php if($assd == STORE || $assd == QUALITY || $DEPCode == STORE || $DEPCode ==QUALITY){?>
+
+
+                    <li class="treeview">
 							  <a href="<?php echo base_url(); ?>Viewigr">
 								<i class="fa fa-eye"></i>
 								<span>View Inward Gate Register</span>
@@ -619,37 +426,130 @@ $(function() {
 								<span>Inward Material Test Report</span>
 							  </a>
 							</li>
-						  <?php 
-							
-						  }
-						  if($DEPCode == STORE)
-						  {?>
-							  <li class="treeview">
-							  <a href="<?php echo base_url(); ?>Distribution">
-								<i class="fa fa-eye"></i>
-								<span>Material Distribution List</span>
-							  </a>
-							</li>
-							  
-						<?php   }
-						  ?>	
-							</ul>
-					</li>
-					 <?php   
-					 if($DEPCode == STORE)
-						  { ?>
-						<li class="treeview">
+
+
+		  
+               <?}?> 
+                 
+               <?}?>
+               </ul>
+            </li>
+		   	<? if($check ==1){break;} }}?>
+
+
+
+
+		   	   <?php foreach($DepAccesslist as $dep){
+							$assd= $dep->AssDep;?>
+							<?php if($assd == STORE || $DEPCode == STORE){?>
+                        <li class="treeview">
 							  <a href="<?php echo base_url(); ?>Stock">
 								<i class="fa fa-dashboard"></i> <span>Stock Details</span> 
 							  </a>
 						</li>
-				 <?php } 
-					 }?>
-					<?php   
-                     if($DEPCode == FINANCE)
-                          { ?>
-					  
-					  <li class="treeview">
+
+							<?php }?>
+
+						<?php }?>
+
+
+
+
+		  
+				  
+
+
+               
+             <?php $check =0;?>
+			<?php foreach($DepAccesslist as $dep){
+			$assd= $dep->AssDep;
+
+			if($assd == PURCHASE || $assd == FINANCE || $assd ==  MANAGEMENT || $DEPCode == PURCHASE || $DEPCode == FINANCE || $DEPCode == MANAGEMENT) {  $check= $check+1;?>
+
+			<li class="treeview">
+               <span id="menu" data-toggle="dropdown"><i class="fa fa-first-order"></i> Purchase order<span class="caret"></span></span> 
+			  	<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
+
+                <?php foreach($DepAccesslist as $dep){
+                 	$assd= $dep->AssDep;?>
+
+                 	<?php if($assd == FINANCE || $DEPCode == FINANCE){?>
+
+				     <li class="treeview">
+								  <a href="<?php echo base_url(); ?>POApproval">
+									<i class="fa fa-users"></i>
+									<span>Approve Purchase Order</span>
+								  </a>
+					</li>
+		
+					<?php }?>
+
+
+					<?php if($assd == MANAGEMENT || $DEPCode == MANAGEMENT){?>
+
+				     <li class="treeview">
+                          <a href="<?php echo base_url(); ?>PORelease">
+                            <i class="fa fa-history"></i>
+                            <span>Release Purchase Order</span>
+                          </a>
+                        </li>
+		
+					<?php }?>
+                
+
+
+                    <?php if($assd == PURCHASE || $DEPCode == PURCHASE){?>
+						<li class="treeview">
+						  <a href="<?php echo base_url(); ?>EmergencyPO">
+							<i class="fa fa-ambulance"></i>
+							<span>Emergency Purchase Order  </span>
+						  </a>
+						</li>
+
+						<li class="treeview">
+								  <a href="<?php echo base_url(); ?>purchaseorderListing">
+									<i class="fa fa-list"></i>
+									<span>Purchase Order List  </span>
+								  </a>
+								</li>
+								
+						<li class="treeview">
+						  <a href="<?php echo base_url(); ?>amendmentpurchaseorder">
+							<i class="fa fa-ambulance"></i>
+							<span>Amendment Purchase Order  </span>
+						  </a>
+						</li>
+		
+					<?php }?>
+                                
+                  <?php }?>
+
+			  	</ul>
+            </li>
+
+
+           
+            <?php if($check ==1){break;} }}?>
+
+
+            <?php foreach($DepAccesslist as $dep){
+							$assd= $dep->AssDep;?>
+							<?php if($assd == PURCHASE || $DEPCode == PURCHASE){?>
+                         <li class="treeview">
+                              <a href="<?php echo base_url(); ?>AdvanceRequest">
+                                <i class="fa fa-dashboard"></i> <span>Advance Request</span> 
+                              </a>
+                        </li>
+
+							<?php }?>
+
+						<?php }?>
+
+
+                      <?php foreach($DepAccesslist as $dep){
+							$assd= $dep->AssDep;?>
+							<?php if($assd == FINANCE || $DEPCode == FINANCE){?>
+                         <li class="treeview">
 					  <span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> Billing <span class="caret"></span></span> 
 						<ul class="dropdown-menu" role="menu" aria-labelledby="menu3">
 						 <li class="treeview">
@@ -667,6 +567,9 @@ $(function() {
 								
 						</ul> 
 					</li>
+
+
+
 					<li class="treeview">
 					  <span id="menu" data-toggle="dropdown" ><i class="fa fa-money"></i> Cash Book <span class="caret"></span></span> 
 						<ul class="dropdown-menu" role="menu" aria-labelledby="menu3">
@@ -685,29 +588,67 @@ $(function() {
 								
 						</ul> 
 					</li>
-                       
-                 <?php } ?> 
-				 <?php   
-                     if($DEPCode == PURCHASE)
-                          { ?>
-                        <li class="treeview">
-                              <a href="<?php echo base_url(); ?>AdvanceRequest">
-                                <i class="fa fa-dashboard"></i> <span>Advance Request</span> 
-                              </a>
-                        </li>
-                 <?php } ?>
-					<?php   
-                     if($DEPCode == MANAGEMENT)
-                          { ?>
-					  
-					  <li class="treeview">
-              <a href="<?php echo base_url(); ?>reports">
-                <i class="fa fa-dashboard"></i> <span>ReportList</span> 
-              </a>
-            </li>
-                       
-                 <?php } ?> 		  
-              <li class="dropdown user user-menu">
+
+							<?php }?>
+
+						<?php }?>
+
+
+                    	<?php foreach($DepAccesslist as $dep){
+							$assd= $dep->AssDep;?>
+							<?php if($assd == MANAGEMENT || $DEPCode == MANAGEMENT){?>
+                              <li class="treeview">
+                   				<a href="<?php echo base_url(); ?>reports">
+                				<i class="fa fa-dashboard"></i> <span>ReportList</span> 
+              					</a>
+            				  </li>
+
+							<?php }?>
+
+						 <?php }?>
+
+
+
+
+
+						<?php foreach($DepAccesslist as $dep){
+							$assd= $dep->AssDep;?>
+							<?php if($assd == SYSTEM_ADMIN){?>
+                              <li class="treeview">
+                   				<span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> Attendance<span class="caret"></span></span> <ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
+                                
+                                 <li class="treeview">
+								  <a href="<?php echo base_url(); ?>attendance">
+									<i class="fa fa-refresh fa-spin "></i>
+									<span>Monthly Attendance</span>
+								  </a>
+								</li>
+								<li class="treeview">
+								  <a href="<?php echo base_url(); ?>permissionlist">
+									<i class="fa fa-user-circle "></i>
+									<span>Permission Slip</span>
+								  </a>
+								</li>
+
+              				  </ul>	 
+            				  </li>
+
+							<?php }?>
+
+						<?php }?>
+
+
+
+
+
+     
+
+
+
+
+
+
+            <li class="dropdown user user-menu">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                   <img src="<?php echo base_url(); ?>assets/dist/img/avatar.png" class="user-image" alt="User Image"/>
                   <span class="hidden-xs"><?php echo  $name; ?></span>
@@ -732,6 +673,7 @@ $(function() {
                   </li>
                 </ul>
               </li>
+
             </ul>
           </div>
         </nav>
diff --git a/application/views/users.php b/application/views/users.php
index 815e1e2d..5923c041 100755
--- a/application/views/users.php
+++ b/application/views/users.php
@@ -47,7 +47,8 @@
 					  	  <td><?php echo $record->DepartmentName ?></td>
 					  <td><?php echo $record->role ?></td>
                       <td>
-                          <a href="<?php echo base_url().'user/editOld?UID='.$record->userId;?>"><i class="fa fa-pencil"></i>&nbsp;&nbsp;&nbsp;</a>
+                          <a href="<?php echo base_url().'user/editOld?UID='.$record->userId.'&EMPID='.$record->EmpID;?>"><i class="fa fa-pencil"></i>&nbsp;&nbsp;&nbsp;</a>
+
                           <a  onclick="deleteUser(<?php echo $record->userId;?>)"><i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a>
                       </td>
                     </tr>