RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

submenu issues fixed

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-03-12 17:03:05 +05:30
parent 48fb603e1c
commit c3233bbd13
2 changed files with 68 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/controllers/user.php
View File

@ -1210,13 +1210,11 @@ function attendanceyear($empID ='')
$password = $this->input->post('password'); $password = $this->input->post('password');
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$updatedDate = $dt->format('Y-m-d H:i:s'); $updatedDate = $dt->format('Y-m-d H:i:s');
$email = $this->input->post('MailID');
// echo $EmpID;
$userInfo = array(); $userInfo = array();
$userInfo = array('email'=>$email,'password'=>getHashedPassword($password),'roleId'=>$role,'EmpId'=>$EmpID,'updatedDtm'=>$updatedDate);
$userInfo = array('password'=>getHashedPassword($password),'roleId'=>$role,'EmpId'=>$EmpID,'updatedDtm'=>$updatedDate);

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

@ -454,6 +454,7 @@
<?php }?> <?php }?>
<!--Requisition Menus starts here --> <!--Requisition Menus starts here -->
<?php if($DEPCode != HR){?> <?php if($DEPCode != HR){?>
<?php if($DEPCode != SECURITY){?> <?php if($DEPCode != SECURITY){?>
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
@ -465,64 +466,59 @@
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li> <li>
<a href="<?php echo base_url(); ?>storerequisition"> <a href="<?php echo base_url(); ?>Requisition">
<i class="fa fa-upload"></i> <i class="fa fa-arrow-circle-up"></i>
<span>Store Requisition</span> <span>Raise Requisition </span>
</a> </a>
</li> </li>
<li> <li>
<a href="<?php echo base_url(); ?>UpdatePOStatus"> <a href="<?php echo base_url(); ?>UpdatePOStatus">
<i class="fa fa-arrow-circle-up"></i> <i class="fa fa-arrow-circle-up"></i>
<span>Update Service PO Status </span> <span>Update Service PO Status </span>
</a> </a>
</li> </li>
<li> <li>
<a href="<?php echo base_url(); ?>approvalstorerequisitionslip"> <a href="<?php echo base_url(); ?>ApproveRequisition">
<i class="fa fa-eye"></i> <i class="fa fa-thumbs-o-up"></i>
<span>Approve Store Requisition</span> <span>Approve Requisition </span>
</a> </a>
</li> </li>
<?php if(empty($DepAccesslist)){?> <?php if(empty($DepAccesslist)){?>
<?php if($DEPCode == STORE || $DEPCode == FINANCE || $DEPCode == MANAGEMENT || $DEPCode == QUALITY || $DEPCode == PRODUCTION){?> <?php if($DEPCode == PURCHASE){?>
<?php if($DEPCode == STORE){?>
<li> <li>
<a href="<?php echo base_url(); ?>storerequisitionlisting"> <a href="<?php echo base_url(); ?>CreatePO">
<i class="fa fa-eye"></i> <i class="fa fa-empire"></i>
<span>Store Requisition Listing</span> <span>Purchase Order From Requisition</span>
</a> </a>
</li> </li>
<?php }?>
<?php }?> <?php }?>
<?php } <?php }
else{ $check = 0;?> else{?>
<?php foreach($DepAccesslist as $dep){?> <?php foreach($DepAccesslist as $dep){?>
<?php $assd=$dep->AssDep; <?php $assd=$dep->AssDep;
if($assd == STORE || $assd == QUALITY || $DEPCode == STORE || $DEPCode == QUALITY || $DEPCode == PRODUCTION || $assd == PRODUCTION){ $check =1;?> if($assd == PURCHASE){?>
<li>
<li class="treeview"> <a href="<?php echo base_url(); ?>CreatePO">
<a href="<?php echo base_url(); ?>storerequisitionlisting"> <i class="fa fa-empire"></i>
<i class="fa fa-eye"></i> <span>Purchase Order From Requisition</span>
<span>Store Requisition Listing</span>
</a> </a>
</li> </li>
<?php }}?>
<?php } if($check == 1){break;} }?>
<?php }?> <?php }?>
</ul> </ul>
</li> </li>
<?php }?> <?php }?>
<?php }?> <?php }?>
<!--Requisition Menus end here --> <!--Requisition Menus end here -->
<!--purchase order menus stats here--> <!--purchase order menus stats here-->
<?php if(empty($DepAccesslist)){?> <?php if(empty($DepAccesslist)){?>