From ec87a639bdf14c380cfaf5fa02be5098c52fb636 Mon Sep 17 00:00:00 2001 From: saravanakumar_kandasami Date: Fri, 30 Jun 2017 16:29:45 +0530 Subject: [PATCH] changes in header --- application/config/constants.php | 3 + application/controllers/login.php | 15 +++- application/libraries/BaseController.php | 1 + application/logs/log-2017-06-30.php | 3 + application/views/includes/header.php | 89 +++++++++++++----------- 5 files changed, 70 insertions(+), 41 deletions(-) create mode 100644 application/logs/log-2017-06-30.php diff --git a/application/config/constants.php b/application/config/constants.php index cd78c4a9..ae47a904 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -48,6 +48,9 @@ define('ROLE_SALES', '7'); define('ROLE_ACCOUNTS', '8');*/ +/***** USER DESIGNATION ******/ +define('SECURITY', 'SECURITY'); + define('SEGMENT', 2); /************** Requistion Status code */ diff --git a/application/controllers/login.php b/application/controllers/login.php index d9d6d69b..b9d9e9ac 100644 --- a/application/controllers/login.php +++ b/application/controllers/login.php @@ -53,7 +53,9 @@ class Login extends CI_Controller $this->form_validation->set_rules('email', 'Email', 'required|valid_email|max_length[128]|xss_clean|trim'); $this->form_validation->set_rules('password', 'Password', 'required|max_length[32]|'); - + $designation=''; + $role=''; + if($this->form_validation->run() == FALSE) { $this->index(); @@ -83,11 +85,20 @@ class Login extends CI_Controller $this->session->set_userdata($sessionArray); + $role=$res->roleId; + $designation=$res->Designation; } - redirect('dashboard'); + if ($role == ROLE_EMPLOYEE && $designation == SECURITY) + { + redirect('/Addigr'); + } + else + { + redirect('/dashboard'); + } } else { diff --git a/application/libraries/BaseController.php b/application/libraries/BaseController.php index 99b8cce0..cff31c77 100644 --- a/application/libraries/BaseController.php +++ b/application/libraries/BaseController.php @@ -53,6 +53,7 @@ class BaseController extends CI_Controller { $this->global ['role'] = $this->role; $this->global ['role_text'] = $this->roleText; $this->global ['DEPCode'] = $this->DEPCode; + $this->global ['Designation'] = $this->Designation; } } diff --git a/application/logs/log-2017-06-30.php b/application/logs/log-2017-06-30.php new file mode 100644 index 00000000..e5462c45 --- /dev/null +++ b/application/logs/log-2017-06-30.php @@ -0,0 +1,3 @@ + + +ERROR - 2017-06-30 12:34:19 --> Severity: Notice --> Undefined variable: designation C:\xampp\htdocs\sia306\siddharth_application\application\views\includes\header.php 248 diff --git a/application/views/includes/header.php b/application/views/includes/header.php index 12aab97a..5f6cbd26 100644 --- a/application/views/includes/header.php +++ b/application/views/includes/header.php @@ -143,13 +143,15 @@