From c6b6a3d3fa5a549443323a542222b0a04512b1e4 Mon Sep 17 00:00:00 2001 From: Isaac Machakata Date: Sun, 7 Apr 2024 03:20:00 +0200 Subject: [PATCH] refactor: show approved requisitions for the accounts team --- app/Controllers/Requisition.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/Controllers/Requisition.php b/app/Controllers/Requisition.php index e52f990..b739c88 100644 --- a/app/Controllers/Requisition.php +++ b/app/Controllers/Requisition.php @@ -186,13 +186,15 @@ public function viewUserReportsIndex() public function authorizeRequisitionsIndex() { + $isSupervisor = $this->account->Department == 'Supervisor'; + $allowedStatus = $isSupervisor ? 'Submitted' : 'Supervisor_Approved'; self::$VIEW_PARAMS['statuses'] = [ - 'Approve' => $this->account->Department == 'Supervisor' ? 'Supervisor_Approved' : 'Finance_Disbursed', - 'CanReject' => $this->account->Department == 'Supervisor' + 'Approve' => $isSupervisor ? 'Supervisor_Approved' : 'Finance_Disbursed', + 'CanReject' => $isSupervisor ]; 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') + ->where('Status', $allowedStatus) ->getRequisitions() ->getOwners() ->paginate(4); @@ -202,6 +204,7 @@ public function authorizeRequisitionsIndex() public function authorizeRequisitions() { $isSupervisor = $this->account->Department == 'Supervisor'; + $allowedStatus = $isSupervisor ? 'Submitted' : 'Supervisor_Approved'; self::$VIEW_PARAMS['statuses'] = [ 'CanReject' => $isSupervisor ]; @@ -228,7 +231,7 @@ public function authorizeRequisitions() 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') + ->where('Status', $allowedStatus) ->getRequisitions() ->getOwners() ->paginate(4); @@ -243,7 +246,7 @@ public function authorizeRequisitions() // get updated requisitions 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') + ->where('Status', $allowedStatus) ->getRequisitions() ->getOwners() ->paginate(4);