From be20a35bdbb2ccaf7788eb2fa1a4a532aee97734 Mon Sep 17 00:00:00 2001
From: Gowtham M <gowtham.m@venbainfotech.com>
Date: Mon, 9 Dec 2024 17:31:09 +0530
Subject: [PATCH] Role related changes : GWm

---
 app/Models/User_model.php         |  3 +-
 app/Views/POlist.php              |  2 +-
 app/Views/addUser.php             | 11 ++-----
 app/Views/includes/new_header.php | 50 +++++++++++++++++++++++--------
 app/Views/porelease_view.php      |  4 +--
 5 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/app/Models/User_model.php b/app/Models/User_model.php
index 46865ad9..2abe7eb9 100755
--- a/app/Models/User_model.php
+++ b/app/Models/User_model.php
@@ -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();
diff --git a/app/Views/POlist.php b/app/Views/POlist.php
index 8fd16db7..680daacf 100755
--- a/app/Views/POlist.php
+++ b/app/Views/POlist.php
@@ -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>
diff --git a/app/Views/addUser.php b/app/Views/addUser.php
index 9bf1ae5f..2a5bcb32 100755
--- a/app/Views/addUser.php
+++ b/app/Views/addUser.php
@@ -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>
                                                     
diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php
index 3c9b27db..5ddc8bb0 100755
--- a/app/Views/includes/new_header.php
+++ b/app/Views/includes/new_header.php
@@ -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"
diff --git a/app/Views/porelease_view.php b/app/Views/porelease_view.php
index a6debfa5..2f9d2c26 100755
--- a/app/Views/porelease_view.php
+++ b/app/Views/porelease_view.php
@@ -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) { ?>