From 8fc9541063f34e7c8175de2bbeaf5fd929def120 Mon Sep 17 00:00:00 2001
From: mahdahar <89adham@gmail.com>
Date: Wed, 15 Oct 2025 13:40:21 +0700
Subject: [PATCH] fix table name ValueSet to valueset

---
 app/Models/Specimen/ContainerDefModel.php | 4 ++--
 app/Models/ValueSet/ValueSetDefModel.php  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Models/Specimen/ContainerDefModel.php b/app/Models/Specimen/ContainerDefModel.php
index 336afe4..c9ad570 100644
--- a/app/Models/Specimen/ContainerDefModel.php
+++ b/app/Models/Specimen/ContainerDefModel.php
@@ -21,8 +21,8 @@ class ContainerDefModel extends BaseModel {
   protected $afterUpdate = ['convertDatesToUTCISO'];
 
   public function getContainer($ConDefID) {
-    $rows = $this->select('containerdef.*, ValueSet.VValue as ColorTxt')
-      ->join('ValueSet', 'ValueSet.VID=containerdef.Color', 'left')
+    $rows = $this->select('containerdef.*, valueset.VValue as ColorTxt')
+      ->join('valueset', 'valueset.VID=containerdef.Color', 'left')
       ->where('ConDefID', $ConDefID)->get()->getResultArray();
     return $rows;
   }
diff --git a/app/Models/ValueSet/ValueSetDefModel.php b/app/Models/ValueSet/ValueSetDefModel.php
index 5b0d6b1..65c84bd 100644
--- a/app/Models/ValueSet/ValueSetDefModel.php
+++ b/app/Models/ValueSet/ValueSetDefModel.php
@@ -2,7 +2,7 @@
 
 namespace App\Models\ValueSet;
 
-use App\Models\BaseUtcModel;
+use App\Models\BaseModel;
 
 class ValueSetDefModel extends BaseModel {
   protected $table      = 'valuesetdef';
@@ -14,13 +14,13 @@ class ValueSetDefModel extends BaseModel {
   protected $updatedField = '';
 	protected $useSoftDeletes = true;
 	protected $deletedField = 'EndDate';
-
+/*
   protected $beforeInsert = ['normalizeDatesToUTC'];
   protected $beforeUpdate = ['normalizeDatesToUTC'];
   protected $afterFind = ['convertDatesToUTCISO'];
   protected $afterInsert = ['convertDatesToUTCISO'];
   protected $afterUpdate = ['convertDatesToUTCISO'];
-
+*/
   public function getValueSetDefs($param = null) {
     if ($param !== null) { 
       $builder = $this->builder();