From fa0adfb7d509af3a246d239cc320bc6f7facae1b Mon Sep 17 00:00:00 2001
From: aadhavan valli <aadhavanvalli@gmail.com>
Date: Tue, 23 Apr 2024 17:17:43 +0530
Subject: [PATCH] CHANGE_VIEW_JOBCARD : AADHAVAN

---
 app/Controllers/Users.php      |  4 +-
 app/Views/branch_edit_form.php |  2 -
 app/Views/layout/header.php    | 83 ++++++++++++++++++++++++----------
 app/Views/user_form.php        |  2 +-
 4 files changed, 64 insertions(+), 27 deletions(-)

diff --git a/app/Controllers/Users.php b/app/Controllers/Users.php
index 8b719c4..b56687d 100644
--- a/app/Controllers/Users.php
+++ b/app/Controllers/Users.php
@@ -58,6 +58,8 @@ class Users extends BaseController
        
         if ($user_id === '0') {
            
+            $data['page_name'] = "Add User";
+
             $data['users'] = [];
             $BusinessModel=new BusinessModel();
             $BranchModel=new BranchModel();
@@ -75,7 +77,7 @@ class Users extends BaseController
             $data['branch'] = $branch_list;
             $data['roles'] = $roles;
         } else if ($user_id !== '0') {
-            
+            $data['page_name'] = "Edit User";
             $UsersModel = new UsersModel();
         $users=$UsersModel->getUserById($user_id);
         $BusinessModel=new BusinessModel();
diff --git a/app/Views/branch_edit_form.php b/app/Views/branch_edit_form.php
index ab2b1ad..9e04b1d 100644
--- a/app/Views/branch_edit_form.php
+++ b/app/Views/branch_edit_form.php
@@ -31,9 +31,7 @@
                             <input type="text" class="form-control" name="address" placeholder="Address"value="<?= isset($branch['address']) ? $branch['address'] : '' ?>" required>
                         </div>
                        
-                    </div>
                     <input type="hidden" id="business_id" name="business_id" value="<?= isset($branch['business_id']) ? $branch['business_id'] : '' ?>">
-                    <div class="form-row">
                     <div class="form-group col-md-6">
                             <label for="inputPassword4" class="col-form-label">City</label>
                             <input type="text" class="form-control" name="city" placeholder="City"value="<?= isset($branch['city']) ? $branch['city'] : '' ?>" required>
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 337383a..abfb900 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -90,14 +90,14 @@
                         <ul id="side-menu">
 
 
+                        <li class="menu-title">Navigation</li>
 
 
                         <?php if(session()->get('logged_user_role') == 'Floor Manager' || 
-                                session()->get('logged_user_role') == 'Job Card Manager' ||
-                                session()->get('logged_user_role') == 'Store Manager') { 
+                                session()->get('logged_user_role') == 'Administrator' ||
+                                session()->get('logged_user_role') == 'Sales') { 
                         ?>
 
-                            <li class="menu-title">Navigation</li>
 
 
                             <li>
@@ -111,9 +111,6 @@
                                         <li>
                                             <a href="<?php echo base_url('sales_order_index') ?>">Sales Order</a>
                                         </li>
-                                        <!-- <li>
-                                            <a href="<?php echo base_url('job_card_index') ?>">Job Card</a>
-                                        </li> -->
                                         <li>
                                             <a href="<?php echo base_url('vehicle_index') ?>">Vehicles</a>
                                         </li>
@@ -127,7 +124,36 @@
 
 
                         <?php if(session()->get('logged_user_role') == 'Floor Manager' || 
-                                session()->get('logged_user_role') == 'Job Card Manager' ||
+                                session()->get('logged_user_role') == 'Administrator' ||
+                                session()->get('logged_user_role') == 'Job Card Manager') { 
+                        ?>
+
+
+
+                            <li>
+                                <a href="#sidebarLayouts2" data-toggle="collapse">
+                                  <i class="mdi mdi-sale"></i>
+                                    <span> Job Card </span>
+                                    <span class="menu-arrow"></span>
+                                </a>
+                                <div class="collapse" id="sidebarLayouts2">
+                                    <ul class="nav-second-level">
+                                        <li>
+                                            <a href="<?php echo base_url('job_card_index') ?>">Job Card</a>
+                                        </li>
+                                        <li>
+                                            <a href="<?php echo base_url('vehicle_index') ?>">Vehicles</a>
+                                        </li>
+                                        <li>
+                                            <a href="<?php echo base_url('client_index') ?>">Clients</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </li>
+                        <?php } ?>
+
+                        <?php if(session()->get('logged_user_role') == 'Floor Manager' || 
+                                session()->get('logged_user_role') == 'Administrator' ||
                                 session()->get('logged_user_role') == 'Store Manager') { 
                         ?>
                             <li>
@@ -160,7 +186,7 @@
 
 
                         <?php if(session()->get('logged_user_role') == 'Floor Manager' || 
-                                session()->get('logged_user_role') == 'Job Card Manager' ||
+                                session()->get('logged_user_role') == 'Administrator' ||
                                 session()->get('logged_user_role') == 'Store Manager') { 
                         ?>
                             <li>
@@ -207,22 +233,33 @@
 
 
 
+                           <?php if(session()->get('logged_user_role') == 'Administrator' || 
+                                    session()->get('logged_user_role') == 'Floor Manager' || 
+                                    session()->get('logged_user_role') == 'Store Manager' ||
+                                    session()->get('logged_user_role') == 'Sales') { ?>
+                                <li class="menu-title">Masters</li>  
 
-                            <li class="menu-title">Masters</li>  
-
-                            <li>
-                                <a href="<?php echo base_url('spare_manufacturer_index') ?>">
-                                <i class="fas fa-cogs"></i>
-                                    <span> Manufacturer </span>
-                                </a>
-                            </li>
-                            <li>
-                            <a href="<?php echo base_url('make_index') ?>">
-                                <i class="fas fa-bicycle"></i>
-                                    <span> Make & Models</span>
-                                </a>
-                            </li>
-
+                                <?php if(session()->get('logged_user_role') == 'Administrator' || 
+                                        session()->get('logged_user_role') == 'Floor Manager' || 
+                                        session()->get('logged_user_role') == 'Store Manager'  ) { ?>
+                                    <li>
+                                        <a href="<?php echo base_url('spare_manufacturer_index') ?>">
+                                        <i class="fas fa-cogs"></i>
+                                            <span> Manufacturer </span>
+                                        </a>
+                                    </li>
+                                <?php } ?>
+                                <?php if(session()->get('logged_user_role') == 'Administrator' || 
+                                        session()->get('logged_user_role') == 'Floor Manager' || 
+                                        session()->get('logged_user_role') == 'Sales'  ) { ?>
+                                    <li>
+                                    <a href="<?php echo base_url('make_index') ?>">
+                                        <i class="fas fa-bicycle"></i>
+                                            <span> Make & Models</span>
+                                        </a>
+                                    </li>
+                                <?php } ?>
+                            <?php } ?>
                         </ul>
 
                     </div>
diff --git a/app/Views/user_form.php b/app/Views/user_form.php
index 2f32d03..a77c942 100644
--- a/app/Views/user_form.php
+++ b/app/Views/user_form.php
@@ -2,7 +2,7 @@
 <div class="row">
         <div class="col-12">
             <div class="page-title-box page-title-box-alt">
-                <h4 class="page-title">Add User</h4>
+                <h4 class="page-title"><?php echo $page_name; ?></h4>
                 <div class="page-title-right">
                     <ol class="breadcrumb m-0">