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

user access

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-01-31 15:03:18 +05:30
parent c27589d3e2
commit d47cea36b2
3 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
application/controllers/purchaseorder.php
View File

@ -2194,14 +2194,9 @@ function addNewImportPurchaseOrder()
$userID = $this->session->userdata ( 'userId' );
//print_r($data['Status']);echo "CON";
$data['AppList'] = $this->purchaseorder_model->getPOList($q);
if($this->DEPCode == FINANCE)
{
$this->loadViews("poapproval_view", $this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
@ -2257,15 +2252,9 @@ function addNewImportPurchaseOrder()
$userID = $this->session->userdata ( 'userId' );
//print_r($data['Status']);echo "CON";
$data['AppList'] = $this->purchaseorder_model->getPOList($q);
if($this->DEPCode == MANAGEMENT)
{
$this->loadViews("porelease_view", $this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}

22
application/controllers/user.php
View File

@ -1111,9 +1111,12 @@ function attendanceyear($empID ='')
$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);
@ -1122,21 +1125,28 @@ function attendanceyear($empID ='')
//die();
$result = $this->user_model->addNewUser($userInfo);
$result = $this->user_model->addNewUser($userInfo);
if($SelectedDepartment != '')
{
for ($j = 0; $j < count($comma_separated); $j++)
{
$DeptCode = $comma_separated[$j];
//echo $DeptCode;
$userdept=array('EmpID'=>$EmpID,'Departmentcode'=>$DeptCode);
$access= $this->user_model->addAccess($userdept);
//print_r($userdept);
$access= $this->user_model->addAccess($userdept);
//echo $access;
}
}
if($result > 0)
{

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

@ -172,7 +172,11 @@ $(function() {
</li> -->
<!-- <?php echo $Designation;?> -->
<!-- <?php echo $DEPCode;?> -->
<!-- <?php print_r($DepAccesslist)?> -->
<!-- <?php print_r($DepAccesslist); echo $DEPCode?> -->
<!-- <?php if(empty($DepAccesslist)){echo "empty";}
else{echo "non empty";}?> -->
<?php if($DEPCode != HR){?>
@ -608,17 +612,20 @@ $(function() {
</ul>
</li>
<?php }?>
<?php }
<?php if($DEPCode == PURCHASE){?>
if($DEPCode == PURCHASE)
{?>
<li class="treeview">
<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 }
else{ $check =0;?>
<?php foreach($DepAccesslist as $dep){
@ -630,7 +637,7 @@ $(function() {
<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
<?php foreach($DepAccesslist as $dep){$assd= $dep->AssDep; $check1=1;?>
<?php if($assd == FINANCE || $DEPCode == FINANCE){ $check1=2;?>
<?php if($assd == FINANCE || $DEPCode == FINANCE){ $check1=2;?>
<li class="treeview">
<a href="<?php echo base_url(); ?>POApproval">