mahdahar
bb7df6b70c
Complete overhaul of the valueset system to use human-readable names
instead of numeric IDs for improved maintainability and API consistency.
- PatientController: Renamed 'Gender' field to 'Sex' in validation rules
- ValuesetController: Changed API endpoints from ID-based (/:num) to name-based (/:any)
- TestsController: Refactored to use ValueSet library instead of direct valueset queries
- Added ValueSet library (app/Libraries/ValueSet.php) with static lookup methods:
- getOptions() - returns dropdown format [{value, label}]
- getLabel(, ) - returns label for a value
- transformLabels(, ) - batch transform records
- get() and getRaw() for Lookups compatibility
- Added ValueSetApiController for public valueset API endpoints
- Added ValueSet refresh endpoint (POST /api/valueset/refresh)
- Added DemoOrderController for testing order creation without auth
- 2026-01-12-000001: Convert valueset references from VID to VValue
- 2026-01-12-000002: Rename patient.Gender column to Sex
- OrderTestController: Now uses OrderTestModel with proper model pattern
- TestsController: Uses ValueSet library for all lookup operations
- ValueSetController: Simplified to use name-based lookups
- Updated all organization (account/site/workstation) dialogs and index views
- Updated specimen container dialogs and index views
- Updated tests_index.php with ValueSet integration
- Updated patient dialog form and index views
- Removed .factory/config.json and CLAUDE.md (replaced by AGENTS.md)
- Consolidated lookups in Lookups.php (removed inline valueset constants)
- Updated all test files to match new field names
- 32 modified files, 17 new files, 2 deleted files
- Net: +661 insertions, -1443 deletions (significant cleanup)
50 lines
1.4 KiB
PHP
50 lines
1.4 KiB
PHP
<?php
|
|
|
|
namespace App\Models\Test;
|
|
|
|
use App\Models\BaseModel;
|
|
use App\Libraries\ValueSet;
|
|
|
|
class TestDefGrpModel extends BaseModel {
|
|
protected $table = 'testdefgrp';
|
|
protected $primaryKey = 'TestGrpID';
|
|
protected $allowedFields = [
|
|
'TestSiteID',
|
|
'Member',
|
|
'CreateDate',
|
|
'EndDate'
|
|
];
|
|
|
|
protected $useTimestamps = true;
|
|
protected $createdField = 'CreateDate';
|
|
protected $updatedField = '';
|
|
protected $useSoftDeletes = true;
|
|
protected $deletedField = "EndDate";
|
|
|
|
public function getGroupMembers($testSiteID) {
|
|
$db = \Config\Database::connect();
|
|
|
|
$rows = $db->table('testdefgrp')
|
|
->select('testdefgrp.*, t.TestSiteCode, t.TestSiteName, t.TestType')
|
|
->join('testdefsite t', 't.TestSiteID=testdefgrp.Member', 'left')
|
|
->where('testdefgrp.TestSiteID', $testSiteID)
|
|
->where('testdefgrp.EndDate IS NULL')
|
|
->orderBy('testdefgrp.TestGrpID', 'ASC')
|
|
->get()->getResultArray();
|
|
|
|
$rows = ValueSet::transformLabels($rows, [
|
|
'TestType' => 'test_type',
|
|
]);
|
|
|
|
return $rows;
|
|
}
|
|
|
|
public function getGroupsContainingTest($memberTestSiteID) {
|
|
return $this->select('testdefgrp.*, t.TestSiteCode, t.TestSiteName')
|
|
->join('testdefsite t', 't.TestSiteID=testdefgrp.TestSiteID', 'left')
|
|
->where('testdefgrp.Member', $memberTestSiteID)
|
|
->where('testdefgrp.EndDate IS NULL')
|
|
->findAll();
|
|
}
|
|
}
|