SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Role issues fixes : ps

Browse Source
This commit is contained in:
sanjeev.p 2021-09-30 19:47:44 +05:30
parent a81c507839
commit c163b81e30
4 changed files with 1344 additions and 1274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/login.php
View File

@ -82,10 +82,10 @@ class Login extends CI_Controller
{ {
log_message('ERROR','#####loggin_name : ' . $res->FirstName); log_message('ERROR','#####loggin_name : ' . $res->FirstName);
$sessionArray = array('userId'=>$res->userId, $sessionArray = array('userId'=>$res->userId,
// 'role'=>$res->roleId, 'role'=>$res->roleId,
'roleText'=>$res->role, 'roleText'=>$res->role,
'name'=>$res->FirstName, 'name'=>$res->FirstName,
//'Designation'=>$res->Designation, // 'Designation'=>$res->Designation,
'DEPCode'=>$res->DEPCode, 'DEPCode'=>$res->DEPCode,
'HeadDept'=>$res->HeadDept, 'HeadDept'=>$res->HeadDept,
'depaccess'=>$this->login_model->Accessdep($res->EmpID), 'depaccess'=>$this->login_model->Accessdep($res->EmpID),

4
application/libraries/BaseController.php
View File

@ -40,14 +40,14 @@ class BaseController extends CI_Controller {
if (! isset ( $isLoggedIn ) || $isLoggedIn != TRUE) { if (! isset ( $isLoggedIn ) || $isLoggedIn != TRUE) {
redirect ( 'login' ); redirect ( 'login' );
} else { } else {
//$this->role = $this->session->userdata ( 'role' ); $this->role = $this->session->userdata ( 'role' );
// session_start(); // session_start();
log_message('ERROR','#####In BaseController - isLoggedIn function ci session : ' . $this->session->userdata ( 'name' )); log_message('ERROR','#####In BaseController - isLoggedIn function ci session : ' . $this->session->userdata ( 'name' ));
// log_message('ERR?OR','#####In BaseController - isLoggedIn function session super global methid : ' . $_SESSION['name']); // log_message('ERR?OR','#####In BaseController - isLoggedIn function session super global methid : ' . $_SESSION['name']);
$this->vendorId = $this->session->userdata ( 'userId' ); $this->vendorId = $this->session->userdata ( 'userId' );
$this->name = $this->session->userdata ( 'name' ); $this->name = $this->session->userdata ( 'name' );
$this->roleText = $this->session->userdata ( 'roleText' ); $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->DEPCode = $this->session->userdata ( 'DEPCode' );
$this->HeadDept = $this->session->userdata ( 'HeadDept' ); $this->HeadDept = $this->session->userdata ( 'HeadDept' );
$this->DepartmentName = $this->session->userdata ( 'DepartmentName' ); $this->DepartmentName = $this->session->userdata ( 'DepartmentName' );

2608
application/views/dashboard.php
View File

File diff suppressed because it is too large Load Diff

2
application/views/inwardgateregister.php
View File

@ -290,7 +290,7 @@ Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
<script> <script>
<!-- script for table , It works under the datatable plugin-->
function validate_Vechicle(){ function validate_Vechicle(){
var reg = /^^[A-Z]{2}\s[0-9]{2}\s[A-Z]{2}\s[0-9]{4}$/; var reg = /^^[A-Z]{2}\s[0-9]{2}\s[A-Z]{2}\s[0-9]{4}$/;