admin/GSB-Construction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: implement comprehensive dashboard controller and modular administrative and project management interfaces
Some checks failed
Tests / PHP 8.3 (push) Has been cancelled
Details
Tests / PHP 8.4 (push) Has been cancelled
Details
Tests / PHP 8.5 (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Ajjj
2026-08-03 18:28:52 +08:00
parent 42ba980f7a
commit 936ae1c6b2
48 changed files with 1832 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Modules/ApprovalWorkflow/app/Http/Controllers/ApprovalController.php
View File

@@ -23,16 +23,27 @@ class ApprovalController extends Controller
$user = $request->user();
$tab = $request->get('tab', 'pending');
$isAdmin = $user->user_type === 'admin' || $user->hasRole(['Super Admin', 'admin', 'Main Contractor Admin']);
$isApprovingRole = $isAdmin || $user->hasRole(['Project Manager', 'Contractor Admin']);
$query = ApprovalChain::query();
if ($tab === 'history') {
$query->whereHas('steps', function ($q) use ($user) {
$q->where('approver_id', $user->id)->where('status', '!=', 'pending');
});
if ($isApprovingRole) {
$query->whereIn('status', ['approved', 'rejected']);
} else {
$query->whereHas('steps', function ($q) use ($user) {
$q->where('approver_id', $user->id)->where('status', '!=', 'pending');
});
}
} else {
$query->whereHas('steps', function ($q) use ($user) {
$q->where('approver_id', $user->id)->where('status', 'pending');
})->whereIn('status', ['pending', 'in_review']);
if ($isApprovingRole) {
$query->whereIn('status', ['pending', 'in_review']);
} else {
$query->whereHas('steps', function ($q) use ($user) {
$q->where('approver_id', $user->id)->where('status', 'pending');
})->whereIn('status', ['pending', 'in_review']);
}
}
$chains = $query->with(['steps.approver:id,name', 'initiator:id,name'])