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)
53 lines
1.9 KiB
PHP
53 lines
1.9 KiB
PHP
<?php
|
|
namespace App\Models\Organization;
|
|
use App\Models\BaseModel;
|
|
use App\Libraries\ValueSet;
|
|
|
|
class AccountModel extends BaseModel {
|
|
protected $table = 'account';
|
|
protected $primaryKey = 'AccountID';
|
|
protected $allowedFields = ['Parent', 'AccountName', 'Initial', 'Street_1', 'Street_2', 'Street_3',
|
|
'City', 'Province', 'ZIP', 'Country', 'AreaCode', 'EmailAddress1', 'EmailAddress2',
|
|
'Phone', 'Fax', 'CreateDate', 'EndDate'];
|
|
|
|
protected $useTimestamps = true;
|
|
protected $createdField = 'CreateDate';
|
|
protected $updatedField = '';
|
|
protected $useSoftDeletes = true;
|
|
protected $deletedField = 'EndDate';
|
|
|
|
public function getAccounts($filter=[]) {
|
|
$builder = $this->select('account.AccountID, account.AccountName, account.Parent, pa.AccountName as ParentName, account.Initial')
|
|
->join('account pa', 'pa.AccountID=account.Parent', 'left');
|
|
|
|
if (!empty($filter['Parent'])) {
|
|
$builder->where('account.Parent', $filter['Parent']);
|
|
}
|
|
if (!empty($filter['AccountName'])) {
|
|
$builder->like('account.AccountName', $filter['AccountName'], 'both');
|
|
}
|
|
|
|
$rows = $builder->findAll();
|
|
return $rows;
|
|
}
|
|
|
|
public function getAccount($AccountID) {
|
|
$row = $this->select('account.*, pa.AccountName as ParentName, areageo.AreaName, areageo.AreaGeoID,
|
|
city.AreaName as CityName, city.AreaGeoID as City, prov.AreaName as ProvName, prov.AreaGeoID as Prov')
|
|
->join('account pa', 'pa.AccountID=account.Parent', 'left')
|
|
->join('areageo', 'areageo.AreaCode=account.AreaCode', 'left')
|
|
->join('areageo city', 'city.AreaGeoID=account.City', 'left')
|
|
->join('areageo prov', 'prov.AreaGeoID=account.Province', 'left')
|
|
->where('account.AccountID', $AccountID)
|
|
->first();
|
|
|
|
if (!$row) return null;
|
|
|
|
$row = ValueSet::transformLabels([$row], [
|
|
'Country' => 'account_Country',
|
|
])[0];
|
|
|
|
return $row;
|
|
}
|
|
}
|