diff --git a/application/config/constants.php b/application/config/constants.php index 55016a5d..2d334a29 100755 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -49,7 +49,7 @@ define('ROLE_ACCOUNTS', '8');*/ /***** USER DESIGNATION ******/ -define('SECURITY', 'SECURITY'); +//define('SECURITY', 'SECURITY'); define('SEGMENT', 2); @@ -140,6 +140,7 @@ define('FINANCE', 'DEP10'); define('PURCHASE', 'DEP11'); define('MANAGEMENT', 'DEP12'); define('HR', 'DEP13'); +define('SECURITY', 'DEP15'); /* PO Type */ define('REVENUE', 'REVENUE'); define('SERVICE', 'SERVICE'); diff --git a/application/controllers/login.php b/application/controllers/login.php index c7d57bc4..3ea42637 100755 --- a/application/controllers/login.php +++ b/application/controllers/login.php @@ -78,10 +78,10 @@ class Login extends CI_Controller foreach ($result as $res) { $sessionArray = array('userId'=>$res->userId, - 'role'=>$res->roleId, + // 'role'=>$res->roleId, 'roleText'=>$res->role, 'name'=>$res->FirstName, - 'Designation'=>$res->Designation, + //'Designation'=>$res->Designation, 'DEPCode'=>$res->DEPCode, 'HeadDept'=>$res->HeadDept, 'depaccess'=>$this->login_model->Accessdep($res->EmpID), @@ -92,13 +92,14 @@ class Login extends CI_Controller $this->session->set_userdata($sessionArray); - $role=$res->roleId; - $designation=$res->Designation; + //$role=$res->roleId; + //$designation=$res->Designation; + $DEPCode=$res->DEPCode; } - if ($role == ROLE_EMPLOYEE && $designation == SECURITY) + if ($DEPCode == SECURITY) { redirect('/Addigr'); } diff --git a/application/libraries/BaseController.php b/application/libraries/BaseController.php index dd9bdcec..b2f09c0e 100755 --- a/application/libraries/BaseController.php +++ b/application/libraries/BaseController.php @@ -40,11 +40,11 @@ class BaseController extends CI_Controller { if (! isset ( $isLoggedIn ) || $isLoggedIn != TRUE) { redirect ( 'login' ); } else { - $this->role = $this->session->userdata ( 'role' ); + //$this->role = $this->session->userdata ( 'role' ); $this->vendorId = $this->session->userdata ( 'userId' ); $this->name = $this->session->userdata ( 'name' ); $this->roleText = $this->session->userdata ( 'roleText' ); - $this->Designation = $this->session->userdata ( 'Designation' ); + //$this->Designation = $this->session->userdata ( 'Designation' ); $this->DEPCode = $this->session->userdata ( 'DEPCode' ); $this->HeadDept = $this->session->userdata ( 'HeadDept' ); $this->DepartmentName = $this->session->userdata ( 'DepartmentName' ); diff --git a/application/views/includes/header.php b/application/views/includes/header.php index 5b366f66..62625934 100755 --- a/application/views/includes/header.php +++ b/application/views/includes/header.php @@ -171,7 +171,7 @@ $(function() { --> - + - +