From 604bf54846c338d6a9fb1d72887ba2587c86a93b Mon Sep 17 00:00:00 2001
From: aadhavan valli <aadhavanvalli@gmail.com>
Date: Tue, 23 Apr 2024 16:19:48 +0530
Subject: [PATCH] CHANGE_VIEW_USER : AADHAVAN

---
 app/Controllers/Users.php       |  2 +-
 app/Views/edit_account_form.php | 35 ++-----------------
 app/Views/user_form.php         | 62 ++++++++++++++++-----------------
 3 files changed, 34 insertions(+), 65 deletions(-)

diff --git a/app/Controllers/Users.php b/app/Controllers/Users.php
index 7d418db..8b719c4 100644
--- a/app/Controllers/Users.php
+++ b/app/Controllers/Users.php
@@ -64,7 +64,7 @@ class Users extends BaseController
             $business=$BusinessModel->findAll();
             $business_select = $BusinessModel->where('business_id',session()->get('logged_user_business_id'))->findAll();
 
-            $branch_list = $BranchModel->where('business_id',session()->get('logged_user_business_id'))->findAll();
+            $branch_list = $BranchModel->where('branch_id',session()->get('logged_user_branch_id'))->findAll();
             // print_r($business);die;
             $rolemodel = new RoleModel();
         
diff --git a/app/Views/edit_account_form.php b/app/Views/edit_account_form.php
index b50555d..b0ff460 100644
--- a/app/Views/edit_account_form.php
+++ b/app/Views/edit_account_form.php
@@ -45,36 +45,7 @@
                     </div>
 
                     <input type="hidden" id="user_id" name="user_id" value="<?= isset($users['user_id']) ? $users['user_id'] : '' ?>">
-                    <div class="form-row">
-                        <div class="form-group col-md-6">
-                            <label for="inputState" class="col-form-label">Role</label>
-                            <select id="inputState" class="form-control" name="role" readonly required >
-                                <option value="">Select Role</option>
-                                <?php foreach ($roles as $role): ?>
-                                    <option value="<?= $role['role_id'] ?>" <?= isset($users['role']) && $users['role'] == $role['role_id'] ? 'selected' : '' ?>><?= $role['roles'] ?></option>
-                                <?php endforeach; ?>
-                            </select>
-                        </div>
-                        
-    <div class="form-group col-md-6">
-        <label for="inputState" class="col-form-label">Business</label>
-        <select id="business" class="form-control" name="business" readonly required>
-            <option value="">Select Business</option>
-            <?php foreach ($business as $busin): ?>
-                <option value="<?= $busin['business_id'] ?>" <?= isset($users['business_id']) && $users['business_id'] == $busin['business_id'] ? 'selected' : '' ?>><?= $busin['business_name'] ?></option>
-            <?php endforeach; ?>
-        </select>
-    </div>
-    <div class="form-group col-md-6">
-        <label for="inputState" class="col-form-label">Branch</label>
-        <select id="branch" class="form-control" name="branch" readonly required>
-            <option value="">Select Branch</option>
-            <?php foreach ($branches as $branch): ?>
-                <option value="<?= $branch['branch_id'] ?>" <?= isset($users['branch_id']) && $users['branch_id'] == $branch['branch_id'] ? 'selected' : '' ?>><?= $branch['branch_name'] ?></option>
-            <?php endforeach; ?>
-        </select>
-    </div>
-            </div>
+  
 
                 
                 </div>
@@ -112,7 +83,7 @@
                                     </div>
                                     <div class="col-md-6">
                                         <div class="form-group" style="margin-top: 28px;">
-                                            <button type="button" class="btn btn-primary" onclick="submitPersonalInfo()">Submit</button>
+                                            <button type="button" class="btn btn-primary" style="float: inline-end;" onclick="submitPersonalInfo()">Update</button>
                                         </div>
                                     </div>
                                 </div>
@@ -176,7 +147,7 @@
                                 </div>
 
                                 <div class="col-md-6" style="margin-top: 27px;">
-                                    <button type="submit" class="btn btn-primary" id="submit_password" onclick="changePassword(this)">Submit</button>
+                                    <button type="submit" class="btn btn-primary" id="submit_password" style="float: inline-end;" onclick="changePassword(this)">Submit</button>
                                 </div>
                             </div>
                     </div>
diff --git a/app/Views/user_form.php b/app/Views/user_form.php
index ab834a2..2f32d03 100644
--- a/app/Views/user_form.php
+++ b/app/Views/user_form.php
@@ -21,6 +21,35 @@
                 
                 <form action="<?= base_url() . "add_user"; ?>" method="post">
                     <div class="form-row">
+                        <div class="form-group col-md-4">
+                            <label for="inputState" class="col-form-label">Business</label>
+                            <select id="business" class="form-control" name="business" required>
+                                <!-- <option value="">Select Business</option> -->
+                                <?php foreach ($business as $busin): ?>
+                                    <option value="<?= $busin['business_id'] ?>" <?= isset($users['business_id']) && $users['business_id'] == $busin['business_id'] ? 'selected' : '' ?>><?= $busin['business_name'] ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
+                        <div class="form-group col-md-4">
+                            <label for="inputState" class="col-form-label">Branch</label>
+                            <select id="branch" class="form-control" name="branch" required>
+                                <!-- <option value="">Select Branch</option> -->
+                                <?php if (isset($branch) && (is_array($branch) || is_object($branch))) {
+                                         foreach ($branch as $branch): ?>
+                                    <option value="<?= $branch['business_id'] ?>" <?= isset($users['branch_id']) && $users['branch_id'] == $branch['branch_id'] ? 'selected' : '' ?> ><?= $branch['branch_name'] ?></option>
+                                <?php  endforeach; } ?>
+                                <!-- Branch options will be populated dynamically using JavaScript -->
+                            </select>
+                        </div>
+                        <div class="form-group col-md-4">
+                            <label for="inputState" class="col-form-label">Role</label>
+                            <select id="inputState" class="form-control" name="role" required>
+                                <option value="">Select Role</option>
+                                <?php foreach ($roles as $role): ?>
+                                    <option value="<?= $role['role_id'] ?>" <?= isset($users['role']) && $users['role'] == $role['role_id'] ? 'selected' : '' ?>><?= $role['roles'] ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
                         <div class="form-group col-md-6">
                             <label for="inputEmail4" class="col-form-label">Name</label>
                             <input type="text" class="form-control" name="name" placeholder="Name" value="<?= isset($users['name']) ? $users['name'] : '' ?>" required>
@@ -39,38 +68,7 @@
                         </div>
                     </div>
                     <input type="hidden" id="user_id" name="user_id" value="<?= isset($users['user_id']) ? $users['user_id'] : '' ?>">
-                    <div class="form-row">
-                        <div class="form-group col-md-6">
-                            <label for="inputState" class="col-form-label">Role</label>
-                            <select id="inputState" class="form-control" name="role" required>
-                                <option value="">Select Role</option>
-                                <?php foreach ($roles as $role): ?>
-                                    <option value="<?= $role['role_id'] ?>" <?= isset($users['role']) && $users['role'] == $role['role_id'] ? 'selected' : '' ?>><?= $role['roles'] ?></option>
-                                <?php endforeach; ?>
-                            </select>
-                        </div>
-                        
-                        <div class="form-group col-md-6">
-                            <label for="inputState" class="col-form-label">Business</label>
-                            <select id="business" class="form-control" name="business" required>
-                                <!-- <option value="">Select Business</option> -->
-                                <?php foreach ($business as $busin): ?>
-                                    <option value="<?= $busin['business_id'] ?>" <?= isset($users['business_id']) && $users['business_id'] == $busin['business_id'] ? 'selected' : '' ?>><?= $busin['business_name'] ?></option>
-                                <?php endforeach; ?>
-                            </select>
-                        </div>
-                        <div class="form-group col-md-6">
-                            <label for="inputState" class="col-form-label">Branch</label>
-                            <select id="branch" class="form-control" name="branch" required>
-                                <option value="">Select Branch</option>
-                                <?php if (isset($branch) && (is_array($branch) || is_object($branch))) {
-                                         foreach ($branch as $branch): ?>
-                                    <option value="<?= $branch['business_id'] ?>" <?= isset($users['branch_id']) && $users['branch_id'] == $branch['branch_id'] ? 'selected' : '' ?> ><?= $branch['branch_name'] ?></option>
-                                <?php  endforeach; } ?>
-                                <!-- Branch options will be populated dynamically using JavaScript -->
-                            </select>
-                        </div>
-                    </div>
+                    
 
 
                     <button type="submit" class="btn btn-primary">Submit</button>