SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HR login changes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-10-25 17:42:25 +05:30
parent 66bf4d9a92
commit 6dc0c4e6e0
8 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
application/controllers/employeedetails.php
View File

@ -35,12 +35,7 @@ class employeedetails extends BaseController
*/
function employeeListing()
{
if($this->isAdmin() == TRUE)
{
$this->loadThis();
}
else
{
$this->load->model('employeedetails_model');
@ -50,8 +45,7 @@ class employeedetails extends BaseController
$this->global['pageTitle'] = 'Siddharth : Employee Listing';
$this->loadViews("employeeListing", $this->global, $data, NULL);
}
}
}
/*
Validation for Gender status Dropdown
*/
@ -202,12 +196,7 @@ class employeedetails extends BaseController
function AddNewEmployee()
{
if($this->isAdmin() == TRUE)
{
$this->loadThis();
}
else
{
$this->load->library('form_validation');
$this->form_validation->set_rules('ContactNumber', 'ContactNumber', 'trim|required|min_length[10]|max_length[10]');
@ -347,7 +336,7 @@ echo "<script>alert('New Employee Created successfully!');</script>";redirect('e
echo "<script>alert('Record Not Saved!');</script>";redirect('employeeListing','refresh');
}
}
}
}
@ -378,12 +367,7 @@ echo "<script>alert('Record Not Saved!');</script>";redirect('employeeListing','
* This function is used to load the add new Employee form with dropdown values */
function addemployee()
{
if($this->isAdmin() == TRUE)
{
$this->loadThis();
}
else
{
$this->load->model('employeedetails_model');
$GenderConfigID = 'C013';
$MartialConfigID = 'C012';
@ -400,7 +384,7 @@ echo "<script>alert('Record Not Saved!');</script>";redirect('employeeListing','
$data['Department'] = $this->employeedetails_model->getDepartment();
$this->global['pageTitle'] = 'Siddharth : Add New Employee';
$this->loadViews("addemployee", $this->global, $data, NULL);
}
}
/**
* This function is used to check whether the Employee is existing in the database or not */
@ -518,12 +502,7 @@ echo "<script>alert('Record Not Saved!');</script>";redirect('employeeListing','
function ViewEmployee($EmpNO='')
{
if($this->isAdmin() == TRUE)
{
$this->loadThis();
}
else
{
if($EmpNO == '')
{
$EmpID = $_GET['EmpID'];
@ -552,7 +531,7 @@ echo "<script>alert('Record Not Saved!');</script>";redirect('employeeListing','
$this->loadViews("editEmployee", $this->global, $data, NULL);
}
}
/* To Check the email exists in the database or not for the employee*/
function checkMailEmp()
@ -576,12 +555,7 @@ echo "<script>alert('Record Not Saved!');</script>";redirect('employeeListing','
/* To Update the employee details*/
function UpdateEmployee()
{
if($this->isAdmin() == TRUE)
{
$this->loadThis();
}
else
{
$EmpId = $this->input->post('employeeid');
$this->load->library('form_validation');
//$mail = $this->this->.post('emailid');
@ -758,7 +732,7 @@ echo "<script>alert('Record Not Updated!');</script>"; redirect('employeeListin
}
// redirect('employeeListing');
}
}
}

15
application/logs/log-2017-10-25.php Normal file
View File

@ -0,0 +1,15 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); ?>
ERROR - 2017-10-25 12:02:20 --> Severity: Notice --> Undefined variable: Depcode /opt/lampp/htdocs/25oct/siddharth_application/application/views/includes/header.php 161
ERROR - 2017-10-25 12:27:44 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992
ERROR - 2017-10-25 13:52:52 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992
ERROR - 2017-10-25 13:53:14 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992
ERROR - 2017-10-25 13:56:00 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992
ERROR - 2017-10-25 13:56:30 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992
ERROR - 2017-10-25 14:00:36 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992
ERROR - 2017-10-25 14:01:05 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992
ERROR - 2017-10-25 14:02:20 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992
ERROR - 2017-10-25 14:02:34 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992
ERROR - 2017-10-25 14:02:57 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992
ERROR - 2017-10-25 14:04:49 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992
ERROR - 2017-10-25 14:07:59 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992

0
application/views/EditPurchaseOrder.php Normal file → Executable file
View File

0
application/views/alterpurchaseorder.php Normal file → Executable file
View File

0
application/views/editRevenueAmendPO.php Normal file → Executable file
View File

0
application/views/editRevenuepurchaseorder.php Normal file → Executable file
View File

24
application/views/includes/header.php
View File

@ -158,7 +158,7 @@ $(function() {
</li>
<?php
}
if($role == ROLE_ADMIN || $DEPCode == SALES || $DEPCode == FINANCE )
if($role == ROLE_ADMIN || $DEPCode == SALES || $DEPCode == FINANCE || $DEPCode == HR)
{
?>
@ -167,11 +167,11 @@ $(function() {
<ul class="dropdown-menu" role="menu" aria-labelledby="menu1">
<?php //echo $DEPCode;
if($role == ROLE_ADMIN || $DEPCode == SALES || $DEPCode == FINANCE )
if($role == ROLE_ADMIN || $DEPCode == SALES || $DEPCode == FINANCE || $DEPCode == HR)
{
?>
<?php
if($DEPCode != FINANCE )
if($DEPCode != FINANCE && $DEPCode != HR)
{
?>
<li class="treeview">
@ -204,7 +204,11 @@ $(function() {
}
?>
<?php
if($role == ROLE_ADMIN)
if($role == ROLE_ADMIN || $DEPCode == HR)
{
?>
<?php
if($DEPCode != HR)
{
?>
<li class="treeview">
@ -212,13 +216,18 @@ $(function() {
<i class="fa fa-industry"></i>
<span class="nav-label">Company Master</span>
</a>
</li>
</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">
<a href="<?php echo base_url(); ?>configlisting" >
<i class="fa fa-file-text"></i>
@ -231,11 +240,12 @@ $(function() {
<span class="nav-label">Department Master</span>
</a>
</li>
<?php } ?>
<?php
}
?>
<?php
if($role == ROLE_ADMIN )
if($role == ROLE_ADMIN && $DEPCode != HR )
{
?>
<li class="treeview">
@ -249,7 +259,7 @@ $(function() {
?>
<?php
}
if($role == ROLE_ADMIN )
if($role == ROLE_ADMIN && $DEPCode != HR )
{
?>

0
application/views/purchaseorder.php Normal file → Executable file
View File