mahdahar/clqms-be
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix table name ValueSet to valueset

Browse Source
This commit is contained in:
mahdahar 2025-10-15 13:40:21 +07:00
parent 11dca70c70
commit 8fc9541063
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Specimen/ContainerDefModel.php
View File

@ -21,8 +21,8 @@ class ContainerDefModel extends BaseModel {
protected $afterUpdate = ['convertDatesToUTCISO']; protected $afterUpdate = ['convertDatesToUTCISO'];
public function getContainer($ConDefID) { public function getContainer($ConDefID) {
$rows = $this->select('containerdef.*, ValueSet.VValue as ColorTxt') $rows = $this->select('containerdef.*, valueset.VValue as ColorTxt')
->join('ValueSet', 'ValueSet.VID=containerdef.Color', 'left') ->join('valueset', 'valueset.VID=containerdef.Color', 'left')
->where('ConDefID', $ConDefID)->get()->getResultArray(); ->where('ConDefID', $ConDefID)->get()->getResultArray();
return $rows; return $rows;
} }

6
app/Models/ValueSet/ValueSetDefModel.php
View File

@ -2,7 +2,7 @@
namespace App\Models\ValueSet; namespace App\Models\ValueSet;
use App\Models\BaseUtcModel; use App\Models\BaseModel;
class ValueSetDefModel extends BaseModel { class ValueSetDefModel extends BaseModel {
protected $table = 'valuesetdef'; protected $table = 'valuesetdef';
@ -14,13 +14,13 @@ class ValueSetDefModel extends BaseModel {
protected $updatedField = ''; protected $updatedField = '';
protected $useSoftDeletes = true; protected $useSoftDeletes = true;
protected $deletedField = 'EndDate'; protected $deletedField = 'EndDate';
/*
protected $beforeInsert = ['normalizeDatesToUTC']; protected $beforeInsert = ['normalizeDatesToUTC'];
protected $beforeUpdate = ['normalizeDatesToUTC']; protected $beforeUpdate = ['normalizeDatesToUTC'];
protected $afterFind = ['convertDatesToUTCISO']; protected $afterFind = ['convertDatesToUTCISO'];
protected $afterInsert = ['convertDatesToUTCISO']; protected $afterInsert = ['convertDatesToUTCISO'];
protected $afterUpdate = ['convertDatesToUTCISO']; protected $afterUpdate = ['convertDatesToUTCISO'];
*/
public function getValueSetDefs($param = null) { public function getValueSetDefs($param = null) {
if ($param !== null) { if ($param !== null) {
$builder = $this->builder(); $builder = $this->builder();