Add DepartmentID filter to tests index endpoint
- Adds DepartmentID query parameter filter to /api/tests - Filters by COALESCE(testdefsite.DepartmentID, cal.DepartmentID) for calculated tests - Updates TestDefSiteModel::getTestsWithRelations() for backend filtering
This commit is contained in:
parent
66e9be2a04
commit
83278d332a
@ -50,6 +50,7 @@ class TestsController extends BaseController
|
||||
'isVisibleRpt' => $this->request->getGet('isVisibleRpt'),
|
||||
'TestSiteName' => $this->request->getGet('TestSiteName'),
|
||||
'TestSiteCode' => $this->request->getGet('TestSiteCode'),
|
||||
'DepartmentID' => $this->request->getGet('DepartmentID'),
|
||||
'search' => $search,
|
||||
];
|
||||
|
||||
|
||||
@ -120,6 +120,10 @@ class TestDefSiteModel extends BaseModel {
|
||||
$builder->like('testdefsite.TestSiteCode', $filters['TestSiteCode']);
|
||||
}
|
||||
|
||||
if (!empty($filters['DepartmentID'])) {
|
||||
$builder->where('COALESCE(testdefsite.DepartmentID, cal.DepartmentID)', $filters['DepartmentID']);
|
||||
}
|
||||
|
||||
if (!empty($filters['search'])) {
|
||||
$builder->groupStart()
|
||||
->like('testdefsite.TestSiteCode', $filters['search'])
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user