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

Role related changes : GWm

Browse Source
This commit is contained in:
Gowtham M 2024-12-09 17:31:09 +05:30
parent 67407c10a9
commit be20a35bdb
5 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/User_model.php
View File

@ -48,8 +48,7 @@ class User_model extends Model
function getUserRoles()
{
$builder = $this->db->table('tbl_roles')
->select('roleId, role')
->where("roleid <", 4);
->select('roleId, role');
$query = $builder->get();
return $query->getResult();

2
app/Views/POlist.php
View File

@ -211,7 +211,7 @@
?>
<td>
<?php if(session()->get('roleText') != 'Auditor'){ ?>
<?php if(session()->get('roleText') == 'System Administrator'){ ?>
<a data-toggle="tooltip" title="<?php echo $record->PONO; ?> - Click here to Edit Purchase Order details"
href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType. '&CapitalRange=' . $record->CapitalRange; ?>">
<i class="fa fa-pencil-alt" data-toggle="tooltip"> </i>

11
app/Views/addUser.php
View File

@ -67,14 +67,9 @@
<select class="form-control required" id="role" name="role" required>
<option value="0">Select Role</option>
<?php
if (!empty($roles)) {
foreach ($roles as $rl) {
?>
<option value="<?php echo $rl->roleId ?>"><?php echo $rl->role ?></option>
<?php
}
}
?>
if (!empty($roles)) {foreach ($roles as $rl) { ?>
<option value="<?php echo $rl->roleId ?>"><?php echo $rl->role ?></option>
<?php } }?>
</select>
</div>

50
app/Views/includes/new_header.php
View File

@ -608,9 +608,15 @@
<a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>sales_dashboard" role="button"
aria-expanded="false">
<i class="ri-dashboard-line mr-1"></i>Dashboard</a>
</li>
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor'){?>
<!-- Sales module -->
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-hr" role="button"
@ -625,7 +631,13 @@
<?php } ?>
</div>
</li>
<?php } ?>
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor' || session()->get('roleText') == 'Security'){?>
<!-- purchase module -->
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-purchase" role="button"
@ -634,7 +646,7 @@
</a>
<div class="dropdown-menu" aria-labelledby="topnav-purchase">
<?php if(session()->get('roleText') != 'Auditor'){?>
<?php if(session()->get('roleText') == 'System Administrator'){ ?>
<div class="dropdown">
<a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-requisition"
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@ -655,7 +667,7 @@
<div class="dropdown-menu" aria-labelledby="topnav-po">
<a href="<?php echo base_url(); ?>purchaseorderListing" class="dropdown-item">Purchase Order List</a>
<a href="<?php echo base_url(); ?>PORelease" class="dropdown-item">Approve Purchase Order</a>
<?php if(session()->get('roleText') != 'Auditor'){?>
<?php if(session()->get('roleText') == 'System Administrator'){ ?>
<a href="<?php echo base_url(); ?>EmergencyPO" class="dropdown-item">Emergency Purchase Order </a>
<a href="<?php echo base_url(); ?>Report_pending_purchase" class="dropdown-item">Pending Purchase Order </a>
<a href="<?php echo base_url(); ?>amendmentpurchaseorder" class="dropdown-item">Amendment Purchase Order</a>
@ -663,11 +675,16 @@
</div>
</div>
</div>
</li>
<?php } ?>
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor' || session()->get('roleText') == 'Security' || session()->get('roleText') == 'Stock Handler'){?>
<!-- Inward Module -->
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-purchase" role="button"
@ -677,7 +694,7 @@
<div class="dropdown-menu" aria-labelledby="topnav-purchase">
<?php if(session()->get('roleText') != 'Auditor'){?>
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Security'){?>
<div class="">
<a href="<?php echo base_url(); ?>AddIGR" class="dropdown-item"><i class="ri-task-line align-middle mr-1"></i>
Inward Gate Register Entry</a>
@ -688,16 +705,23 @@
<a href="<?php echo base_url(); ?>ViewIGR" class="dropdown-item"><i class="ri-eye-fill mr-1"></i>
View Inward Gate Register</a>
</div>
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Security'){?>
<div class="">
<a href="<?php echo base_url(); ?>ListIGR" class="dropdown-item"><i class="ri-file-list-3-line align-middle mr-1"></i>
Non IGR / Expense</a>
</div>
<?php } ?>
</div>
</li>
</li>
<?php } ?>
<?php if(session()->get('roleText') == 'System Administrator'){ ?>
<!-- HR module -->
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-hr" role="button"
@ -735,10 +759,7 @@
</div>
</li>
<?php if(session()->get('roleText') != 'Auditor'){?>
<!-- supplier module -->
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>supplierlisting" role="button" aria-expanded="false">
@ -774,7 +795,12 @@
<a href="<?php echo base_url(); ?>readFactoryMachineMasterDetails" class="dropdown-item"><i class="ri-file-settings-line align-middle mr-1"></i>Factory Machines Details</a>
</div>
</li>
<?php } ?>
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Stock Handler'){?>
<!-- Stock module -->
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-stock" role="button"

4
app/Views/porelease_view.php
View File

@ -118,7 +118,7 @@ if (empty($Status)) {
<th>Total Order Value</th>
<th>Approved By</th>
<th>Status</th>
<?php if(session()->get('roleText') != 'Auditor'){?>
<?php if(session()->get('roleText') == 'System Administrator'){?>
<th>Action</th>
<?php } ?>
<th>Remarks</th>
@ -180,7 +180,7 @@ if (empty($Status)) {
?>
</td>
<?php if(session()->get('roleText') != 'Auditor'){?>
<?php if(session()->get('roleText') == 'System Administrator'){?>
<td>
<?php if ($record->StatusCode == PO_APPROVER_ONHOLD or $record->StatusCode == PO_CREATED or $record->StatusCode == REQITEM_Emergency_PO_CREATED) { ?>