refactor: allow rejecting or approval of requisitions by supervisor

im-machakata · Apr 7, 2024 · 0f0e484 · 0f0e484
1 parent 2a51f84
commit 0f0e484
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 6 deletions.
diff --git a/app/Controllers/Requisition.php b/app/Controllers/Requisition.php
@@ -191,14 +191,40 @@ public function authorizeRequisitionsIndex()
  ->where('Status', 'Submitted')
  ->getRequisitions()
  ->getOwners()
- ->paginate(6);
+ ->paginate(4);
  return view('forms/authorize-requisitions', self::$VIEW_PARAMS);
  }
 
  public function authorizeRequisitions()
  {
- return view('forms/authorize-requisitions', [
- ...self::$VIEW_PARAMS,
+ $formIsValid = $this->validate([
+ 'ID' => 'required|is_not_unique[requisitions.ID]',
+ 'Status' => 'required|in_list[Supervisor_Approved,Rejected]'
  ]);
+ if (!$formIsValid) {
+ self::$VIEW_PARAMS['error'] = $this->validator->getErrors();
+ self::$VIEW_PARAMS['requisitions'] = $this->requisitions
+ ->select('requisitions.ID AS ReqID, requisitions.UpdatedAt, requisitions.Amount, requisitions.Reason, CONCAT(Name, " ", Surname) AS Names')
+ ->where('Status', 'Submitted')
+ ->getRequisitions()
+ ->getOwners()
+ ->paginate(4);
+ return view('forms/authorize-requisitions', self::$VIEW_PARAMS);
+ }
+
+ $submittedData = $this->validator->getValidated();
+ $requisition = $this->requisitions->find($submittedData['ID']);
+ $requisition->Status = $submittedData['Status'];
+ $this->requisitions->update($submittedData, $requisition);
+
+ self::$VIEW_PARAMS['requisitions'] = $this->requisitions
+ ->select('requisitions.ID AS ReqID, requisitions.UpdatedAt, requisitions.Amount, requisitions.Reason, CONCAT(Name, " ", Surname) AS Names')
+ ->where('Status', 'Submitted')
+ ->getRequisitions()
+ ->getOwners()
+ ->paginate(4);
+
+ self::$VIEW_PARAMS['success'] = 'Requisition has been updated.';
+ return view('forms/authorize-requisitions', self::$VIEW_PARAMS);
  }
 }
diff --git a/app/Views/forms/authorize-requisitions.php b/app/Views/forms/authorize-requisitions.php
@@ -64,11 +64,11 @@
  <div class="text-white mb-2">
  Approve / Cancel a submitted requisition
  </div>
+ <?= $this->include('_templates/alerts'); ?>
  <form action="/authorize-requisitions" method="post" class="mt-2">
  <input type="hidden" id="ID" name="ID" value="" required>
  <div class="card border-0 mt-4">
  <div class="card-body row">
- <?= $this->include('_templates/alerts'); ?>
  <div class="col-lg-6">
  <div class="mb-4">
  <label for="Amount" class="form-label">Amount</label>
@@ -91,9 +91,9 @@
  <div class="btn-group mb-4" role="group" aria-label="Vertical radio toggle button group">
  <input type="radio" class="btn-check" name="Status" id="StatusSubmitted" value="" autocomplete="off" disabled checked>
  <label class="btn btn-outline-primary" for="StatusSubmitted">Submitted</label>
- <input type="radio" class="btn-check" name="Status" value="Approve" id="StatusApprove" autocomplete="off">
+ <input type="radio" class="btn-check" name="Status" value="Supervisor_Approved" id="StatusApprove" autocomplete="off">
  <label class="btn btn-outline-primary" for="StatusApprove">Approve Requisition</label>
- <input type="radio" class="btn-check" name="Status" id="StatusDismiss" value="Cancel" autocomplete="off">
+ <input type="radio" class="btn-check" name="Status" id="StatusDismiss" value="Rejected" autocomplete="off">
  <label class="btn btn-outline-primary" for="StatusDismiss">Cancel Requisition</label>
  </div>
  </div>