fix issues related to school year

app/Views/staff/edit.php

@@ -21,19 +21,6 @@
             <label>Phone Number</label>
             <input type="tel" name="phone" class="form-control" value="<?= esc($user['phone'] ?? '') ?>" placeholder="Enter phone number">
         </div>
-
-        <!--
-        <div class="mb-3">
-            <label>Role</label>
-            <select name="role_id" class="form-control" required>
-                <?php foreach ($roles as $role): ?>
-                    <option value="<?= $role['id'] ?>" <?= $roleId == $role['id'] ? 'selected' : '' ?>>
-                        <?= esc($role['name']) ?>
-                    </option>
-                <?php endforeach ?>
-            </select>
-        </div>
-        -->
         <button type="submit" class="btn btn-primary">Update</button>
     </form>
 </div>

app/Views/staff/index.php

@@ -32,15 +32,15 @@
             <?php foreach ($staff as $s): ?>
                 <tr class="<?= !empty($s['verification_issue']) ? 'table-warning' : '' ?>">
                     <td style="text-align: center;"><?= esc($order++); ?></td>
-                    <td><?= esc($s['school_id']) ?></td>
-                    <td><?= esc($s['firstname']) ?></td>
-                    <td><?= esc($s['lastname']) ?></td>
-                    <td><?= esc($s['email']) ?></td>
-                    <td><?= esc($s['phone'] ?? '') ?></td>
-                    <td><?= esc($s['active_role']) ?></td>
+                    <td><?= esc($s['school_id'] ?? '') ?></td>
+                    <td><?= esc($s['firstname'] ?? '') ?></td>
+                    <td><?= esc($s['lastname'] ?? '') ?></td>
+                    <td><?= esc($s['work_email'] ?? '') ?></td>
+                    <td><?= esc($s['cellphone'] ?? '') ?></td>
+                    <td><?= esc($s['roles'] ?? ($s['active_role'] ?? '')) ?></td>
                     <td><?= esc($s['class_section']) ?></td>
                     <td>
-                        <a href="<?= site_url('staff/edit/' . $s['id']) ?>" class="btn btn-sm btn-warning">Edit</a>
+                        <a href="<?= site_url('staff/edit/' . (int) ($s['staff_id'] ?? 0)) ?>" class="btn btn-sm btn-warning">Edit</a>
                     </td>
                 </tr>