changes to management

.gitignore

@@ -15,7 +15,6 @@
 /node_modules
 /public/build
 /public/hot
-/public/storage
 /storage/*.key
 /storage/pail
 /vendor

app/Console/Commands/DisableLabAccess.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Models\Laboratory;
+use App\Models\Organization;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -41,7 +41,7 @@ class DisableLabAccess extends Command
     public function handle()
     {
         try{
-            $labs = Laboratory::query()->where('record_status_id', 1)
+            $labs = Organization::query()->where('record_status_id', 1)
                 ->whereRaw("DATEDIFF(end_date, CURDATE())<=-7")
                 ->update(['record_status_id' => 0]);
             Log::channel('jobs')->info($labs);

app/Console/Commands/NotifyExpireLab.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Models\Laboratory;
+use App\Models\Organization;
 use App\Models\Publication;
 use App\Models\PublicationReceiver;
 use Illuminate\Console\Command;
@@ -43,10 +43,10 @@ class NotifyExpireLab extends Command
     public function handle()
     {
         try{
-           $labs = Laboratory::query()->where('record_status_id', 1)
+           $labs = Organization::query()->where('record_status_id', 1)
                 ->whereNotNull('end_date')
                 ->whereRaw("DATEDIFF(end_date, CURDATE())=7")->get();
-                
+
                 Log::channel('jobs')->info($labs);
 
             foreach ($labs as $lab){
@@ -65,7 +65,7 @@ class NotifyExpireLab extends Command
 
                 PublicationReceiver::query()->create([
                     'publication_id' => $publication->id,
-                    'lab_id' => $lab->id,
+                    'organization_id' => $lab->id,
                     'created_by' => 1
                 ]);
             }

app/Helpers/Helpers.php

@@ -56,7 +56,7 @@ class Helpers
             str_pad(substr($hexTimestamp, 11, 3),3,'0',STR_PAD_LEFT).
             str_pad(mt_rand(1,99),2,'0',STR_PAD_LEFT);
     }
-    
+
     public static function generateUuIdForManual($prefixClass, $manual_code){
         return $prefixClass . '-'.date('ymd').'-'.$manual_code;
     }
@@ -87,7 +87,7 @@ class Helpers
         if($sex == 1) return __('sample.sex_m');
         return __('sample.sex_f');
     }
-	
+
 	public static function getGenderfull($sex){
         if($sex == 1) return __('sample.sex_male');
         return __('sample.sex_female');
@@ -145,10 +145,10 @@ class Helpers
         INNER JOIN publication_receivers pr
         ON pr.publication_id = p.id
         WHERE DATE(NOW()) BETWEEN start_date AND end_date AND p.record_status_id = 1
-        AND pr.lab_id = " . Session::get('base_lab_id'));
+        AND pr.organization_id = " . Session::get('base_organization_id'));
         return $publication;
     }
-    
+
     public static function generatePatientBotLink($individual_type = 'patient',$labId, $patientId)
     {
         $botUsername = env('TELEGRAM_BOT_NAME'); // e.g. "MyLabBot"

app/Http/Controllers/AntibioticController.php

@@ -1,101 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-use App\Enums\RecordStatusEnum;
-use App\Http\Controllers\Helper\GlobalController;
-use App\Http\Requests\TestSampleCreateRequest;
-use App\Http\Resources\AntibioticResource;
-use App\Models\Antibiotic;
-use App\Models\BaseModel;
-use App\Models\Organism;
-use App\Models\PatientType;
-use App\Models\SampleType;
-use App\Models\Test;
-use App\Models\TestNormalValue;
-use App\Models\TestSample;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Session;
-
-class AntibioticController extends Controller
-{
-
-    protected $model;
-    protected $baseLabId;
-    protected $labs;
-    protected $departments;
-
-    public function __construct(Antibiotic $antibioticModel){
-        $this->model = $antibioticModel;
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
-    }
-
-    public function index(Request $request){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['view_antibiotic'])) return redirect(url('my-profile'));
-        $antibiotics = $this->model::with(['lab'])->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
-            ->when(!empty($request->kword), function ($antibiotics) use($request){
-                $antibiotics->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
-            })->orderBy(BaseModel::CREATED_AT_FIELD,'desc')->paginate(config('labis.pagination.perpage', 10));
-        return view('antibiotic', ['antibiotics' => AntibioticResource::collection($antibiotics)]);
-    }
-
-    public function save(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['create_antibiotic'])) return false;
-            $validator = \Validator::make($request->all(), ['name_en' => 'required']);
-            if ($validator->fails()) return response()->json(['success' => false, 'message' => __('antibiotic.create_fail'), 'errors' => $validator->errors()->all()]);
-            $antibiotic  = $this->model::query()->create([ 'name_en' => $request->name_en, 'weight' => $request->weight]);
-            return response()->json(['success' => true, 'message' => __('antibiotic.create_success'), 'data' => [$antibiotic]]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('antibiotic.create_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function update(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['update_antibiotic'])) return false;
-            $validator = \Validator::make($request->all(), ['name_en' => 'required']);
-            if ($validator->fails()) return response()->json(['success' => false, 'message' => __('antibiotic.update_fail'), 'errors' => $e->getMessage()]);
-            $data = array(
-                'name_en' => $request->name_en,
-                'weight' => $request->weight
-            );
-            $this->model::query()->where('id', $request->uid)->update($data);
-            return response()->json(['success' => true, 'message' => __('antibiotic.update_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('antibiotic.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function get(Request $request){
-        try{
-            $antibiotic = $this->model::query()->find($request->uid);
-            return response()->json(['success' => true, 'message' => __('antibiotic.get_success'), 'data' => new AntibioticResource($antibiotic)]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('antibiotic.get_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function delete(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['delete_antibiotic'])) return false;
-            $this->model::query()->where('id', $request->uid)->update(array('record_status_id'=> RecordStatusEnum::DELETE));
-            return response()->json(['success' => true, 'message' => __('antibiotic.delete_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('antibiotic.delete_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function restore(Request $request){
-        try{
-            $this->model::query()->where('id', $request->uid)->update(array('record_status_id'=> RecordStatusEnum::ACTIVE));
-            return response()->json(['success' => true, 'message' => __('antibiotic.restore_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('antibiotic.restore_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-
-}

app/Http/Controllers/Api/SampleResultController.php

@@ -41,7 +41,7 @@ class SampleResultController extends Controller
                     }
                 }
             }
-            return response()->json(['success' => true, 'message' => __('Laboratory result already pushed!')]);
+            return response()->json(['success' => true, 'message' => __('Organization result already pushed!')]);
         } catch (\Exception $e){
             return response()->json(['success' => false, 'message' => __('Failed while pushing laboratory result!'), 'errors' => $e->getMessage()]);
         }

app/Http/Controllers/AppointmentController.php

@@ -1,117 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-use App\Enums\RecordStatusEnum;
-use App\Http\Controllers\Helper\GlobalController;
-use App\Models\Appointment;
-use App\Models\BaseModel;
-use App\Models\ConceptCode;
-use App\Models\Patient;
-use App\Models\Physician;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Session;
-use Carbon\Carbon;
-
-class AppointmentController extends Controller
-{
-
-    protected $model;
-    protected $patientModel;
-    protected $baseLabId;
-
-    protected $physicianModel;
-
-    public function __construct(){
-        $this->model = new Appointment();
-        $this->patientModel = new Patient();
-        $this->physicianModel = new Physician();
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
-    }
-
-    public function index(Request $request){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['view_appointment'])) return redirect(url('my-profile'));
-        $conceptCodes = $this->model::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->groupBy('appointment_type')->get('appointment_type');
-        $patients = $this->patientModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => BaseModel::RECORD_STATUS_ACTIVE])->limit(20)->get();
-        $physicians = $this->physicianModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId])->orderBy('name_en', 'ASC')->get();
-        $appointments = $this->model::with(['patient', 'doctor'])->where(BaseModel::RECORD_STATUS_FIELD, BaseModel::RECORD_STATUS_ACTIVE)
-            ->where('lab_id', $this->baseLabId)
-            ->when(!empty($request->appointment_type), function ($query) use($request){
-                $query->where('appointment_type', $request->appointment_type);
-            })->when(!empty($request->appointment_date), function ($query) use($request) {
-                $query->whereDate('appointment_date', date('Y-m-d', strtotime($request->appointment_date)));
-            })->orderBy('appointment_date','desc')->paginate(config('labis.pagination.perpage', 10));
-        return view('appointment', ['appointments' => $appointments, 'conceptCodes' => $conceptCodes, 'patients' => $patients, 'patient_id' => 0, 'physicians' => $physicians]);
-    }
-
-    public function store(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['create_appointment'])) return false;
-            $validator = \Validator::make($request->all(), ['patient_id' => 'required', 'appointment_date' => 'required', 'appointment_type' => 'required']);
-            if ($validator->fails()) return response()->json(['success' => false, 'message' => __('appointment.create_fail'), 'errors' => $validator->errors()->all()]);
-
-            $app=new Appointment();
-            $app->patient_id=$request->patient_id;
-            $app->appointment_date=date('Y-m-d H:i:s', strtotime($request->appointment_date));
-            $app->appointment_type=$request->appointment_type;
-            $app->description=$request->description;
-            $app->doctor_id=$request->doctor_id;
-            $app->lab_id=$this->baseLabId;
-            $app->save();
-            return response()->json(['success' => true, 'message' => __('appointment.create_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('appointment.create_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function update(Request $request){
-        try {
-            if(!GlobalController::user_can(Auth::user()->role_id, ['update_appointment'])) return false;
-            $validator = \Validator::make($request->all(), ['patient_id' => 'required', 'appointment_date' => 'required', 'appointment_type' => 'required']);
-            if ($validator->fails()) return response()->json(['success' => false, 'message' => __('appointment.update_fail'), 'errors' => $validator->errors()->all()]);
-            $app=Appointment::find($request->uid);
-            $app->appointment_date=date('Y-m-d H:i:s', strtotime($request->appointment_date));
-            $app->appointment_type=$request->appointment_type;
-            $app->description=$request->description;
-            $app->doctor_id=$request->doctor_id;
-            $app->lab_id=$this->baseLabId;
-            $app->save();
-            return response()->json(['success' => true, 'message' => __('appointment.update_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('appointment.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function get(Request $request){
-        try{
-            $test = $this->model::query()->where(['lab_id' => $this->baseLabId, 'id' => $request->uid])->get()->first();
-            return response()->json(['success' => true, 'message' => __('appointment.get_success'), 'data' => $test]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('appointment.get_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function delete(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['delete_appointment'])) return false;
-            $this->model::query()->where(['id' => $request->uid, 'lab_id' => $this->baseLabId])->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE));
-            return response()->json(['success' => true, 'message' => __('appointment.delete_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('appointment.delete_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function getAlertNofication(){
-        try{
-            $appointments = $this->model::with(['patient:id,name_en,phone_number', 'doctor:id,name_en'])->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
-                ->where('lab_id', $this->baseLabId)
-                ->whereBetween('appointment_date', [Carbon::today(), Carbon::today()->addDays(2)])->orderBy('appointment_date','desc')->get();
-            $count = $appointments->count();
-            return response()->json(['success' => true, 'message' => __('appointment.get_success'), 'data' => $appointments, 'count' => $count]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('appointment.get_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-}

app/Http/Controllers/Auth/AuthenticatedSessionController.php

@@ -39,7 +39,7 @@ class AuthenticatedSessionController extends Controller
         ->log('User Login');
 
         $request->session()->regenerate();
-        if (!$request->session()->has('base_lab_id')) {
+        if (!$request->session()->has('base_organization_id')) {
             return redirect()->route('base');
         }
         return redirect()->intended(RouteServiceProvider::HOME);
@@ -61,7 +61,7 @@ class AuthenticatedSessionController extends Controller
         ])
         ->log('User Logout');
         Auth::guard('web')->logout();
-       
+
 
         $request->session()->invalidate();
 

app/Http/Controllers/BaseController.php

@@ -3,16 +3,12 @@
 namespace App\Http\Controllers;
 use App\Enums\RecordStatusEnum;
 use App\Enums\UtilEnum;
-use App\Models\AgeGroup;
-use App\Models\Department;
-use App\Models\PatientType;
 use App\Models\Role;
 use App\Models\User;
-use App\Models\UserLabCover;
-use App\Models\WardTransaction;
+use App\Models\UserOrganization;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
-use App\Models\Laboratory;
+use App\Models\Organization;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Redis;
@@ -20,52 +16,55 @@ use Illuminate\Support\Facades\Redis;
 class BaseController extends Controller
 {
 
+    public function __construct()
+    {
+    }
+
     function getLabs(){
         return parent::getAccessAbleLabs();
     }
 
     public function index(Request $request){
-        $labs = Laboratory::query()->where('record_status_id', RecordStatusEnum::ACTIVE)
+        $organizations = Organization::query()->where('record_status_id', RecordStatusEnum::ACTIVE)
             ->whereIn('id', $this->getLabs()->pluck('id')->toArray())
             ->orderBy('created_at','desc')->get();
 
-        $request->session()->put('base_lab_coverages', $labs->pluck('name_en')->toArray());
+        $request->session()->put('base_organization_coverages', $organizations->pluck('name_en')->toArray());
 
         // check it only one base default assign base session, else redirect to base view
-        if(count($labs)==1){
-            $request->session()->put('base_lab_id', $labs->first()->id);
-            $request->session()->put('base_lab_name', $labs->first()->name_en);
-            $request->session()->put('base_lab', $labs[0]->toArray());
-            if ($request->session()->has('base_lab_id')) {
+        if(count($organizations)==1){
+            $request->session()->put('base_organization_id', $organizations->first()->id);
+            $request->session()->put('base_organization_name', $organizations->first()->name_en);
+            $request->session()->put('base_organization', $organizations[0]->toArray());
+            if ($request->session()->has('base_organization_id')) {
                 return redirect('/dashboard');
             }
         }
-        return view('base', ['labs' => $labs]);
+        return view('base', ['organizations' => $organizations]);
     }
 
     public function forget(Request $request){
-        if ($request->session()->has('base_lab_id')) {
-            $request->session()->forget('base_lab_id');
-            $request->session()->forget('base_lab_name');
-            $request->session()->forget('base_lab');
-            $request->session()->forget('base_lab');
-            $request->session()->forget('base_lab_coverages');
+        if ($request->session()->has('base_organization_id')) {
+            $request->session()->forget('base_organization_id');
+            $request->session()->forget('base_organization_name');
+            $request->session()->forget('base_organization');
+            $request->session()->forget('base_organization_coverages');
             return redirect()->route('base');
         }
     }
 
     public function store(Request $request){
-        $validator = \Validator::make($request->all(), [ 'lab_id' => 'required']);
+        $validator = \Validator::make($request->all(), [ 'organization_id' => 'required']);
         if ($validator->fails())
         {
             session()->flash('error', 'Invalid credentials');
             return redirect()->route('base');
         }
-        $lab = Laboratory::query()->find($request->lab_id);
-        $request->session()->put('base_lab_id', $request->lab_id);
-        $request->session()->put('base_lab_name', $lab->name_en);
-        $request->session()->put('base_lab', $lab->toArray());
-        if (!$request->session()->has('base_lab_id')) {
+        $organization = Organization::query()->find($request->organization_id);
+        $request->session()->put('base_organization_id', $request->organization_id);
+        $request->session()->put('base_organization_name', $organization->name_en);
+        $request->session()->put('base_organization', $organization->toArray());
+        if (!$request->session()->has('base_organization_id')) {
             return redirect()->route('base');
         }
         return redirect('/dashboard');

app/Http/Controllers/BoxController.php

@@ -0,0 +1,156 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Enums\RecordStatusEnum;
+use App\Models\BaseModel;
+use App\Models\Box;
+use App\Models\Rack;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Session;
+
+class BoxController extends Controller
+{
+    protected $model;
+    protected $rackModel;
+    protected $baseOrganizationId;
+    protected $base;
+
+    public function __construct()
+    {
+        $this->baseOrganizationId = Session::get('base_organization_id');
+        $this->base = Session::get('base_organization');
+        $this->model = new Box();
+        $this->rackModel = new Rack();
+    }
+
+    public function index(Request $request)
+    {
+        $recordStatusCondition = Auth::id() == 1 ? [RecordStatusEnum::DELETE, RecordStatusEnum::ACTIVE] : [RecordStatusEnum::ACTIVE];
+        $racks = $this->rackModel::with(['equipment.room.building'])
+            ->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->whereHas('equipment', function ($query) {
+                $query->where('organization_id', $this->baseOrganizationId);
+            })
+            ->get();
+
+        $boxes = $this->model::with(['rack.equipment.room.building'])
+            ->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusCondition)
+            ->whereIn('rack_id', $racks->pluck('id')->toArray())
+            ->when(!empty($request->kword), function ($query) use ($request) {
+                $keyword = str_replace(' ', '', $request->kword);
+                $query->where(function ($query) use ($keyword) {
+                    $query->whereRaw("replace(name, ' ','') like ?", ['%' . $keyword . '%'])
+                        ->orWhereRaw("replace(code, ' ','') like ?", ['%' . $keyword . '%']);
+                });
+            })
+            ->when(!empty(trim($request->rack_id)), function ($query) use ($request) {
+                $query->where('rack_id', $request->rack_id);
+            })
+            ->orderBy(BaseModel::CREATED_AT_FIELD, 'desc')
+            ->paginate(config('nrml.pagination.perpage', 10));
+
+        return view('box', ['boxes' => $boxes, 'racks' => $racks]);
+    }
+
+    public function save(Request $request)
+    {
+        try {
+            $validator = \Validator::make($request->all(), [
+                'rack_id' => 'required',
+                'code' => 'required',
+                'name' => 'required',
+                'rows' => 'required|integer|min:1',
+                'columns' => 'required|integer|min:1',
+            ]);
+
+            if ($validator->fails()) {
+                return response()->json(['success' => false, 'message' => 'Unable to create box.', 'errors' => $validator->errors()->all()]);
+            }
+
+            $this->model::query()->insert([
+                'rack_id' => $request->rack_id,
+                'code' => $request->code,
+                'name' => $request->name,
+                'rows' => $request->rows,
+                'columns' => $request->columns,
+                'capacity' => $request->capacity ?: ((int) $request->rows * (int) $request->columns),
+                BaseModel::CREATED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::CREATED_BY_FIELD => Auth::id(),
+            ]);
+
+            return response()->json(['success' => true, 'message' => 'Box has been created.']);
+        } catch (\Exception $e) {
+            return response()->json(['success' => false, 'message' => 'Unable to create box.', 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function update(Request $request)
+    {
+        try {
+            $validator = \Validator::make($request->all(), [
+                'box_id' => 'required',
+                'rack_id' => 'required',
+                'code' => 'required',
+                'name' => 'required',
+                'rows' => 'required|integer|min:1',
+                'columns' => 'required|integer|min:1',
+            ]);
+
+            if ($validator->fails()) {
+                return response()->json(['success' => false, 'message' => 'Unable to update box.', 'errors' => $validator->errors()->all()]);
+            }
+
+            $this->model::query()->where('id', $request->box_id)->update([
+                'rack_id' => $request->rack_id,
+                'code' => $request->code,
+                'name' => $request->name,
+                'rows' => $request->rows,
+                'columns' => $request->columns,
+                'capacity' => $request->capacity ?: ((int) $request->rows * (int) $request->columns),
+                BaseModel::UPDATED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::UPDATED_BY_FIELD => Auth::id(),
+            ]);
+
+            return response()->json(['success' => true, 'message' => 'Box has been updated.']);
+        } catch (\Exception $e) {
+            return response()->json(['success' => false, 'message' => 'Unable to update box.', 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function get(Request $request)
+    {
+        try {
+            $box = $this->model::query()->where('id', $request->box_id)->first();
+            return response()->json(['success' => true, 'message' => 'Box has been retrieved.', 'data' => $box]);
+        } catch (\Exception $e) {
+            return response()->json(['success' => false, 'message' => 'Unable to retrieve box.', 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function delete(Request $request)
+    {
+        try {
+            $this->model::query()->where('id', $request->box_id)->update([
+                BaseModel::DELETED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::DELETED_BY_FIELD => Auth::id(),
+                BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE,
+            ]);
+
+            return response()->json(['success' => true, 'message' => 'Box has been deleted.']);
+        } catch (\Exception $e) {
+            return response()->json(['success' => false, 'message' => 'Unable to delete box.', 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function restore(Request $request)
+    {
+        try {
+            $this->model::query()->where('id', $request->box_id)->update([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE]);
+            return response()->json(['success' => true, 'message' => 'Box has been restored.']);
+        } catch (\Exception $e) {
+            return response()->json(['success' => false, 'message' => 'Unable to restore box.', 'errors' => $e->getMessage()]);
+        }
+    }
+}

app/Http/Controllers/BuildingController.php

@@ -0,0 +1,122 @@
+<?php
+
+namespace App\Http\Controllers;
+use App\Enums\RecordStatusEnum;
+use App\Http\Controllers\Helper\GlobalController;
+use App\Models\BaseModel;
+use Illuminate\Http\Request;
+use App\Models\Building;
+use Illuminate\Support\Facades\Auth;
+
+use Illuminate\Support\Facades\Session;
+
+
+class BuildingController extends Controller
+{
+    protected $model;
+    protected $baseOrganizationId;
+
+    public function __construct(){
+        $this->baseOrganizationId = Session::get('base_organization_id');
+        $this->base = Session::get('base_organization');
+        $this->model = new Building();
+    }
+
+    public function index(Request $request){
+        $buildings = $this->model::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->where('organization_id', $this->baseOrganizationId)
+            ->when(!empty($request->kword), function ($labs) use($request){
+                $labs->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
+                    ->orWhereRaw("replace(name_kh, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
+            })->orderBy(BaseModel::CREATED_AT,'desc')->paginate(config('nrml.pagination.perpage', 10));
+        return view('building', ['buildings' => $buildings]);
+    }
+
+    public function save(Request $request){
+        try {
+
+            $validator = \Validator::make($request->all(), [
+                'name_en' => 'required',
+                'name_kh' => 'required',
+            ]);
+            if ($validator->fails()) {
+                return response()->json(['success' => false, 'message' => __('building.create_fail'), 'errors' => $validator->errors()->all()]);
+            }
+            $data = array(
+                'name_en' => $request->name_en,
+                'name_kh' => $request->name_kh,
+                'code' => $request->code,
+                'description' => $request->description,
+                'organization_id' => $this->baseOrganizationId,
+                'created_at' => date('Y-m-d H:i:s'),
+                'created_by' => Auth::id()
+            );
+            $this->model::query()->insert($data);
+            return response()->json(['success' => true, 'message' => __('laboratory.create_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.create_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+
+    public function update(Request $request){
+        try {
+
+            $validator = \Validator::make($request->all(), [
+                'name_en' => 'required',
+                'name_kh' => 'required',
+            ]);
+            if ($validator->fails()) return response()->json(['errors' => $validator->errors()->all()]);
+            $data = array(
+                'name_en' => $request->name_en,
+                'name_kh' => $request->name_kh,
+                'code' => $request->code,
+                'description' => $request->description,
+                'updated_at' => date('Y-m-d H:i:s'),
+                'updated_by' => Auth::id()
+            );
+            $this->model::query()->where('id', $request->building_id)->update($data);
+            return response()->json(['success' => true, 'message' => __('laboratory.update_success')]);
+        } catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function get(Request $request){
+        try{
+            $lab = $this->model::query()->where('id', $request->building_id)->get()->first();
+            return response()->json(['success' => true, 'message' => __('laboratory.get_success'), 'data' => $lab]);
+        } catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.get_fail'), 'errors' => $e->getMessage()]);
+        }
+
+    }
+
+    public function delete(Request $request){
+        try{
+            $this->model::query()->where('id', $request->building_id)->update(array(
+                BaseModel::DELETED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::DELETED_BY_FIELD => Auth::id(),
+                BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE
+            ));
+            return response()->json(['success' => true, 'message' => __('laboratory.delete_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.delete_fail'), 'errors' => $e->getMessage()]);
+        }
+
+    }
+
+    public function restore(Request $request){
+        try{
+            $this->model::query()->where('id', $request->building_id)->update(array(BaseModel::RECORD_STATUS_FIELD=> RecordStatusEnum::ACTIVE));
+            return response()->json(['success' => true, 'message' => __('laboratory.restore_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.restore_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+
+}

app/Http/Controllers/CommentController.php

@@ -1,112 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-use App\Enums\RecordStatusEnum;
-use App\Http\Controllers\Helper\GlobalController;
-use App\Http\Requests\TestSampleCreateRequest;
-use App\Models\BaseModel;
-use App\Models\Comment;
-use App\Models\Department;
-use App\Models\Organism;
-use App\Models\PatientType;
-use App\Models\Quantity;
-use App\Models\SampleType;
-use App\Models\Test;
-use App\Models\TestNormalValue;
-use App\Models\TestSample;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Session;
-
-class CommentController extends Controller
-{
-
-    protected $model;
-    protected $baseLabId;
-    protected $labs;
-    protected $department;
-
-    public function __construct(Comment $comment, Department $department){
-        $this->model = $comment;
-        $this->department = $department;
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
-    }
-
-    public function index(Request $request){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['view_comment'])) return redirect(url('my-profile'));
-        $departments = $this->department::query()->where(['lab_id' => Session::get('base_lab_id'), BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->orderBy('name_en','asc')->get();
-        $recordStatusCondition = Auth::id()==1 ? [RecordStatusEnum::DELETE, RecordStatusEnum::ACTIVE] : [RecordStatusEnum::ACTIVE];
-        $comments = $this->model::with(['sample_type','sample_type.department'])->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusCondition)
-            ->where('lab_id', $this->baseLabId)
-            ->when(!empty($request->kword), function ($comments) use($request){
-                $comments->whereRaw("replace(comment_desc, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
-            })->orderBy(BaseModel::CREATED_AT_FIELD,'desc')->paginate(config('labis.pagination.perpage', 10));
-        return view('comment', ['comments' => $comments, 'departments' => $departments]);
-    }
-
-    public function save(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['create_comment'])) return false;
-            $validator = \Validator::make($request->all(), ['comment_desc' => 'required', 'sample_type_id' => 'required']);
-            if ($validator->fails()) return response()->json(['success' => false, 'message' => __('comment.create_fail'), 'errors' => $validator->errors()->all()]);
-            foreach ($request->sample_type_id as $sample_type) {
-                $comment = $this->model::query()->create([
-                    'comment_desc' => $request->comment_desc,
-                    'sample_type_id' => $sample_type,
-                    'lab_id' => $this->baseLabId
-                ]);
-            }
-            return response()->json(['success' => true, 'message' => __('comment.create_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('comment.create_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function update(Request $request){
-        try {
-            if(!GlobalController::user_can(Auth::user()->role_id, ['update_comment'])) return false;
-            $validator = \Validator::make($request->all(), ['comment_desc' => 'required', 'sample_type_id' => 'required']);
-            if ($validator->fails()) return response()->json(['success' => false, 'message' => __('comment.update_fail'), 'errors' => $validator->errors()->all()]);
-            $data = array(
-                'comment_desc' => $request->comment_desc,
-                'sample_type_id' => $request->sample_type_id
-            );
-            $this->model::query()->where('id', $request->uid)->update($data);
-            return response()->json(['success' => true, 'message' => __('comment.update_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('comment.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function get(Request $request){
-        try{
-            $test = $this->model::with('sample_type')->find($request->uid);
-            return response()->json(['success' => true, 'message' => __('comment.get_success'), 'data' => $test]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('comment.get_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function delete(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['delete_comment'])) return false;
-            $this->model::query()->where('id', $request->uid)->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE));
-            return response()->json(['success' => true, 'message' => __('comment.delete_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('comment.delete_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function restore(Request $request){
-        try{
-            $this->model::query()->where('id', $request->uid)->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE));
-            return response()->json(['success' => true, 'message' => __('comment.restore_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('comment.restore_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-
-}

app/Http/Controllers/ConceptController.php

@@ -0,0 +1,130 @@
+<?php
+
+namespace App\Http\Controllers;
+use App\Enums\RecordStatusEnum;
+use App\Http\Controllers\Helper\GlobalController;
+use App\Models\BaseModel;
+use App\Models\Concept;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+use Illuminate\Support\Facades\Session;
+
+
+class ConceptController extends Controller
+{
+    protected $model;
+    protected $baseOrganizationId;
+
+    public function __construct(){
+        //$this->baseOrganizationId = Session::get('base_organization_id');
+        $this->base = Session::get('base_organization');
+        $this->model = new Concept();
+    }
+
+    public function index(Request $request){
+        $conceptCategories = $this->model::query()->groupBy('concept_category_code')->get('concept_category_code');
+        $concepts = $this->model::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->when(!empty($request->kword), function ($query) use($request){
+                $query->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
+                    ->orWhereRaw("replace(name_kh, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
+                    ->orWhereRaw("replace(code, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
+            })->when(!empty(trim($request->concept_category_code)) && $request->concept_category_code != 'all', function ($query) use($request){
+                $query->where('concept_category_code', $request->concept_category_code);
+            })->orderBy(BaseModel::CREATED_AT, 'desc')->paginate(config('nrml.pagination.perpage', 10));
+        return view('concept', ['concepts' => $concepts, 'concept_categories' => $conceptCategories]);
+    }
+
+    public function save(Request $request){
+        try {
+
+            $validator = \Validator::make($request->all(), [
+                'name_en' => 'required',
+                'code' => 'required',
+                'concept_category_code' => 'required',
+                'name_kh' => 'required',
+            ]);
+            if ($validator->fails()) {
+                return response()->json(['success' => false, 'message' => __('building.create_fail'), 'errors' => $validator->errors()->all()]);
+            }
+            $data = array(
+                'name_en' => $request->name_en,
+                'name_kh' => $request->name_kh,
+                'code' => $request->code,
+                'description' => $request->description,
+                'concept_category_code' => $request->concept_category_code,
+                'created_at' => date('Y-m-d H:i:s'),
+                'created_by' => Auth::id()
+            );
+            $this->model::query()->insert($data);
+            return response()->json(['success' => true, 'message' => __('laboratory.create_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.create_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+
+    public function update(Request $request){
+        try {
+
+            $validator = \Validator::make($request->all(), [
+                'name_en' => 'required',
+                'code' => 'required',
+                'concept_category_code' => 'required',
+                'name_kh' => 'required',
+            ]);
+            if ($validator->fails()) return response()->json(['errors' => $validator->errors()->all()]);
+            $data = array(
+                'name_en' => $request->name_en,
+                'name_kh' => $request->name_kh,
+                'code' => $request->code,
+                'description' => $request->description,
+                'concept_category_code' => $request->concept_category_code,
+                'updated_at' => date('Y-m-d H:i:s'),
+                'updated_by' => Auth::id()
+            );
+            $this->model::query()->where('id', $request->concept_id)->update($data);
+            return response()->json(['success' => true, 'message' => __('laboratory.update_success')]);
+        } catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function get(Request $request){
+        try{
+            $lab = $this->model::query()->where('id', $request->concept_id)->get()->first();
+            return response()->json(['success' => true, 'message' => __('laboratory.get_success'), 'data' => $lab]);
+        } catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.get_fail'), 'errors' => $e->getMessage()]);
+        }
+
+    }
+
+    public function delete(Request $request){
+        try{
+            $this->model::query()->where('id', $request->concept_id)->update(array(
+                BaseModel::DELETED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::DELETED_BY_FIELD => Auth::id(),
+                BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE
+            ));
+            return response()->json(['success' => true, 'message' => __('laboratory.delete_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.delete_fail'), 'errors' => $e->getMessage()]);
+        }
+
+    }
+
+    public function restore(Request $request){
+        try{
+            $this->model::query()->where('id', $request->concept_id)->update(array(BaseModel::RECORD_STATUS_FIELD=> RecordStatusEnum::ACTIVE));
+            return response()->json(['success' => true, 'message' => __('laboratory.restore_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.restore_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+
+}

app/Http/Controllers/ContainerTypeController.php

@@ -0,0 +1,133 @@
+<?php
+
+namespace App\Http\Controllers;
+use App\Enums\RecordStatusEnum;
+use App\Http\Controllers\Helper\GlobalController;
+use App\Models\BaseModel;
+use App\Models\Concept;
+use App\Models\ContainerType;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+use Illuminate\Support\Facades\Session;
+
+
+class ContainerTypeController extends Controller
+{
+    protected $model;
+    protected $baseOrganizationId;
+    protected $conceptModel;
+
+    public function __construct(){
+        $this->baseOrganizationId = Session::get('base_organization_id');
+        $this->base = Session::get('base_organization');
+        $this->model = new ContainerType();
+        $this->conceptModel = new Concept();
+    }
+
+    public function index(Request $request){
+        $concepts = $this->conceptModel::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)->get();
+        $containerTypes = $this->model::with(['containerName', 'sampleType'])->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->when(!empty($request->kword), function ($query) use($request){
+                $query->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
+                    ->orWhereRaw("replace(name_kh, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
+            })->orderBy(BaseModel::CREATED_AT,'desc')->paginate(config('nrml.pagination.perpage', 10));
+        return view('sample_container', ['containerTypes' => $containerTypes, 'concepts' => $concepts]);
+    }
+
+    public function save(Request $request){
+        try {
+
+            $validator = \Validator::make($request->all(), [
+                'cap_color' => 'required',
+                'container_type_concept_id' => 'required',
+                'sample_type_concept_id' => 'required',
+                'volume_ml' => 'integer|required'
+            ]);
+            if ($validator->fails()) {
+                return response()->json(['success' => false, 'message' => __('building.create_fail'), 'errors' => $validator->errors()->all()]);
+            }
+            $data = array(
+                'container_type_concept_id' => $request->container_type_concept_id,
+                'sample_type_concept_id' => $request->sample_type_concept_id,
+                'additive' => $request->additive,
+                'cap_color' => $request->cap_color,
+                'volume_ml' => $request->volume_ml,
+                'storage_temp' => $request->storage_temp,
+                'sterile' => $request->sterile,
+                'created_at' => date('Y-m-d H:i:s'),
+                'created_by' => Auth::id()
+            );
+            $this->model::query()->insert($data);
+            return response()->json(['success' => true, 'message' => __('laboratory.create_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.create_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+
+    public function update(Request $request){
+        try {
+            $validator = \Validator::make($request->all(), [
+                'cap_color' => 'required',
+                'container_type_concept_id' => 'required',
+                'sample_type_concept_id' => 'required',
+                'volume_ml' => 'integer|required'
+            ]);
+            if ($validator->fails()) return response()->json(['errors' => $validator->errors()->all()]);
+            $data = array(
+                'container_type_concept_id' => $request->container_type_concept_id,
+                'sample_type_concept_id' => $request->sample_type_concept_id,
+                'additive' => $request->additive,
+                'cap_color' => $request->cap_color,
+                'volume_ml' => $request->volume_ml,
+                'storage_temp' => $request->storage_temp,
+                'sterile' => $request->sterile,
+                'updated_at' => date('Y-m-d H:i:s'),
+                'updated_by' => Auth::id()
+            );
+            $this->model::query()->where('id', $request->container_type_id)->update($data);
+            return response()->json(['success' => true, 'message' => __('laboratory.update_success')]);
+        } catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function get(Request $request){
+        try{
+            $lab = $this->model::query()->where('id', $request->container_type_id)->get()->first();
+            return response()->json(['success' => true, 'message' => __('laboratory.get_success'), 'data' => $lab]);
+        } catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.get_fail'), 'errors' => $e->getMessage()]);
+        }
+
+    }
+
+    public function delete(Request $request){
+        try{
+            $this->model::query()->where('id', $request->container_type_id)->update(array(
+                BaseModel::DELETED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::DELETED_BY_FIELD => Auth::id(),
+                BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE
+            ));
+            return response()->json(['success' => true, 'message' => __('laboratory.delete_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.delete_fail'), 'errors' => $e->getMessage()]);
+        }
+
+    }
+
+    public function restore(Request $request){
+        try{
+            $this->model::query()->where('id', $request->container_type_id)->update(array(BaseModel::RECORD_STATUS_FIELD=> RecordStatusEnum::ACTIVE));
+            return response()->json(['success' => true, 'message' => __('laboratory.restore_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.restore_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+
+}

app/Http/Controllers/Controller.php

@@ -6,9 +6,9 @@ use App\Enums\RecordStatusEnum;
 use App\Models\BaseModel;
 use App\Models\Commune;
 use App\Models\District;
-use App\Models\Laboratory;
+use App\Models\Organization;
 use App\Models\Province;
-use App\Models\UserLabCover;
+use App\Models\UserOrganization;
 use App\Models\Village;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
@@ -18,12 +18,12 @@ abstract class Controller
 {
     function getAccessAbleLabs(){
         $recordStatusCondition = Auth::id()==1 ? [RecordStatusEnum::DELETE, RecordStatusEnum::ACTIVE] : [RecordStatusEnum::ACTIVE];
-        $labs = Laboratory::query()->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusCondition)->get();
+        $organizations = Organization::query()->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusCondition)->get();
         if(Auth::id()!=1){
-            $labIds = UserLabCover::query()->where('user_id', Auth::id())->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)->pluck('lab_id')->toArray();
-            $labs = $labs->whereIn('id', $labIds);
+            $organizationId = UserOrganization::query()->where('user_id', Auth::id())->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)->pluck('organization_id')->toArray();
+            $organizations = $organizations->whereIn('id', $organizationId);
         }
-        return $labs;
+        return $organizations;
     }
 
     function province(){
@@ -52,33 +52,10 @@ abstract class Controller
     }
 
     public function location(){
-        // discount_type = [1 => '%', 2 => 'USD']
-        return Laboratory::query()->find(Session::get('base_lab_id'))->only([
+        return Organization::query()->find(Session::get('base_organization_id'))->only([
+            'id',
             'name_en',
-            'name_kh',
-            'short_name',
-            'sample_number',
-            'patient_code',
-            'verify_label',
-            'technician_label',
-            'discount_type',
-            'logo',
-            'address_kh',
-            'address_en',
-            'phone_number',
-            'email',
-            'shareable_lab_result',
-            'result_header_id',
-            'show_result_footer',
-            'abnormal_result_font_weight',
-            'abnormal_text_color',
-            'exchange_rate',
-            'lab_category_id',
-            'currency',
-            'is_hide_inv_discount',
-            'is_hide_comission_percentage',
-            'invoice_template_id',
-            'alternative_logo'
+            'name_kh'
         ]);
     }
 

app/Http/Controllers/DashboardController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 use App\Enums\RecordStatusEnum;
 use App\Models\BaseModel;
-use App\Models\Invoice;
 use App\Models\Sample;
 
 use App\Http\Controllers\Helper\GlobalController;
@@ -16,14 +15,13 @@ class DashboardController extends Controller
 {
     protected $sampleModel;
     protected $invoiceModel;
-    private $baseLabId;
+    private $baseOrganizationId;
     protected $base;
 
-    public function __construct(Sample $sampleModel, Invoice $invoiceModel){
+    public function __construct(Sample $sampleModel){
         $this->sampleModel = $sampleModel;
-        $this->invoiceModel = $invoiceModel;
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
+        $this->baseOrganizationId = Session::get('base_organization_id');
+        $this->base = Session::get('base_organization');
 
     }
 
@@ -53,7 +51,7 @@ class DashboardController extends Controller
          //income
         $todayIncome = $this->getTodayIncome();
         $todayIncome+=$this->getDailyReportV2(date('Y-m-d'), date('Y-m-d'));
-        $yesterdayIncome = $this->invoiceModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+        $yesterdayIncome = $this->invoiceModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
             ->whereDate('invoice_date', date('Y-m-d', strtotime('-1 day')))->sum('gross_total');
         $yesterdayIncome+=$this->getDailyReportV2(date('Y-m-d', strtotime('-1 day')), date('Y-m-d', strtotime('-1 day')));
         if($yesterdayIncome>0){
@@ -114,9 +112,9 @@ class DashboardController extends Controller
             $displaySampleResult = $monlthlySample;
 
         } elseif ($q->dt == 'this_year'){
-            $yearSamples = $this->sampleModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+            $yearSamples = $this->sampleModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
                 ->whereYear('admission_date', date('Y'))->count();
-            $last_yearSample = $this->sampleModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+            $last_yearSample = $this->sampleModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
                 ->whereYear('admission_date', (date('Y')-1))->count();
             if($last_yearSample>0){
                 $growthSample = (($yearSamples - $last_yearSample) / $last_yearSample);
@@ -167,7 +165,7 @@ class DashboardController extends Controller
             else{
                     $todayIncome = $this->getTodayIncome();
                     $todayIncome+=$this->getDailyReportV2(date('Y-m-d'), date('Y-m-d'));
-                    $yesterdayIncome = $this->invoiceModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+                    $yesterdayIncome = $this->invoiceModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
                         ->whereDate('invoice_date', date('Y-m-d', strtotime('-1 day')))->sum('gross_total');
                     $yesterdayIncome+=$this->getDailyReportV2(date('Y-m-d', strtotime('-1 day')), date('Y-m-d', strtotime('-1 day')));
                     if($yesterdayIncome>0){
@@ -261,36 +259,36 @@ class DashboardController extends Controller
     //get total sample count for dashboard by lab id
 
     function getTotalRejectedSampleCount(){
-        return $this->sampleModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('sample_condition', 0)->count();
+        return $this->sampleModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('sample_condition', 0)->count();
     }
 
     function getTodayRejectedSamples(){
-        return $this->sampleModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('sample_condition', 0)
+        return $this->sampleModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('sample_condition', 0)
                 ->whereDate('admission_date', date('Y-m-d'))->get();
     }
 
     function getYesterdayRejectedSamples(){
-        return $this->sampleModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('sample_condition', 0)
+        return $this->sampleModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('sample_condition', 0)
                 ->whereDate('admission_date', date('Y-m-d', strtotime('-1 day')))->get();
     }
 
     function getThisMonthRejectedSamples(){
-        return $this->sampleModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('sample_condition', 0)
+        return $this->sampleModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('sample_condition', 0)
             ->whereBetween('admission_date', [date('Y-m-01 00:00:00'), date('Y-m-t 23:59:59')])->get();
     }
 
     function getPreviousMonthRejectedSamples(){
-        return $this->sampleModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('sample_condition', 0)
+        return $this->sampleModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('sample_condition', 0)
             ->whereBetween('admission_date', [date("Y-m-d 00:00:00", strtotime("first day of previous month")), date("Y-m-d 23:59:59", strtotime("last day of previous month"))])->get();
     }
 
     function getThisYearRejectedSamples(){
-        return $this->sampleModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('sample_condition', 0)
+        return $this->sampleModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('sample_condition', 0)
             ->whereYear('admission_date', date('Y'))->get();
     }
 
     function getLastYearRejectedSamples(){
-        return $this->sampleModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('sample_condition', 0)
+        return $this->sampleModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('sample_condition', 0)
             ->whereYear('admission_date', (date('Y')-1))->get();
     }
 
@@ -299,109 +297,109 @@ class DashboardController extends Controller
 
 
     function getTotalSampleCount(){
-        return $this->sampleModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->count();
+        return $this->sampleModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->count();
     }
 
     //get yesterday sample count for dashboard by lab id
 
     function getYesterdaySampleCount(){
-        return $this->sampleModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+        return $this->sampleModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
                 ->whereDate('admission_date', date('Y-m-d', strtotime('-1 day')))->count();
     }
 
     function getTodaySamples(){
-        return $this->sampleModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+        return $this->sampleModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
                 ->whereDate('admission_date', date('Y-m-d'))->get();
     }
 
     function getThisMonthSamples(){
-        return $this->sampleModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+        return $this->sampleModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
             ->whereBetween('admission_date', [date('Y-m-01 00:00:00'), date('Y-m-t 23:59:59')])->get();
     }
 
     function getPreviousMonthSamples(){
-        return $this->sampleModel::with(['patient'])->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+        return $this->sampleModel::with(['patient'])->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
             ->whereBetween('admission_date', [date("Y-m-d 00:00:00", strtotime("first day of previous month")), date("Y-m-d 23:59:59", strtotime("last day of previous month"))])->get();
     }
 
     function getLastYearAverage(){
-        return $this->sampleModel::with(['patient'])->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+        return $this->sampleModel::with(['patient'])->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
             ->whereBetween('admission_date', [date('Y-01-01 00:00:00', strtotime('-1 year')), date('Y-12-31 23:59:59', strtotime('-1 year'))])->count();
     }
 
     function getTodayIncome(){
-        return $this->invoiceModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+        return $this->invoiceModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
             ->whereDate('invoice_date', date('Y-m-d'))->sum('gross_total');
     }
 
     function getThisMonthIncome(){
-        return $this->invoiceModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+        return $this->invoiceModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
             ->whereBetween('invoice_date', [date('Y-m-01 00:00:00'), date('Y-m-t 23:59:59')])->sum('gross_total');
     }
 
     function getPreviousMonthIncome(){
-        return $this->invoiceModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+        return $this->invoiceModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
             ->whereBetween('invoice_date', [date("Y-m-d 00:00:00", strtotime("first day of previous month")), date("Y-m-d 23:59:59", strtotime("last day of previous month"))])->sum('gross_total');
     }
 
     function getLastYearIncome(){
-        return $this->invoiceModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+        return $this->invoiceModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
             ->whereBetween('invoice_date', [date('Y-01-01 00:00:00', strtotime('-1 year')), date('Y-12-31 23:59:59', strtotime('-1 year'))])->sum('gross_total');
     }
 
     function getTotalIncome(){
-        return $this->invoiceModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->sum('gross_total');
+        return $this->invoiceModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->sum('gross_total');
     }
 
     function getTotalPatient(){
-        return $this->sampleModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->distinct('patient_id')->count('patient_id');
+        return $this->sampleModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->distinct('patient_id')->count('patient_id');
     }
 
     function getTodayPatient(){
-        return $this->sampleModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+        return $this->sampleModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
                 ->whereDate('admission_date', date('Y-m-d'))->distinct('patient_id')->count('patient_id');
     }
 
     function getYesterdayPatient(){
-        return $this->sampleModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+        return $this->sampleModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
                 ->whereDate('admission_date', date('Y-m-d', strtotime('-1 day')))->distinct('patient_id')->count('patient_id');
     }
 
     function getThisMonthPatient(){
-        return $this->sampleModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+        return $this->sampleModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
             ->whereBetween('admission_date', [date('Y-m-01 00:00:00'), date('Y-m-t 23:59:59')])->distinct('patient_id')->count('patient_id');
     }
 
     function getPreviousMonthPatient(){
-        return $this->sampleModel::with(['patient'])->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+        return $this->sampleModel::with(['patient'])->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
             ->whereBetween('admission_date', [date("Y-m-d 00:00:00", strtotime("first day of previous month")), date("Y-m-d 23:59:59", strtotime("last day of previous month"))])->distinct('patient_id')->count('patient_id');
     }
 
     function getLastYearPatient(){
-        return $this->sampleModel::with(['patient'])->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+        return $this->sampleModel::with(['patient'])->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
             ->whereBetween('admission_date', [date('Y-01-01 00:00:00', strtotime('-1 year')), date('Y-12-31 23:59:59', strtotime('-1 year'))])->distinct('patient_id')->count('patient_id');
     }
 
     function getThisYearPatient(){
-        return $this->sampleModel::with(['patient'])->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+        return $this->sampleModel::with(['patient'])->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
             ->whereBetween('admission_date', [date('Y-01-01 00:00:00'), date('Y-12-31 23:59:59')])->distinct('patient_id')->count('patient_id');
     }
 
     function getTotalInvoice(){
-        return $this->invoiceModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->count();
+        return $this->invoiceModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->count();
     }
 
     function getTotalPaidInvoice(){
-        return $this->invoiceModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('balance', 0)->count();
+        return $this->invoiceModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('balance', 0)->count();
     }
 
     function getTotalUnpaidInvoice(){
-        return $this->invoiceModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('balance', '>', 0)->count();
+        return $this->invoiceModel::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->where('balance', '>', 0)->count();
     }
 
 
     function getSampleSourceChart($period = 2){
-        $samplePeriodCondition = " and s.lab_id = ".$this->baseLabId;
+        $samplePeriodCondition = " and s.organization_id = ".$this->baseOrganizationId;
         if($period == 1) $samplePeriodCondition.= " and date(s.admission_date)='".date('Y-m-d')."'"; // today
         if($period == 2) $samplePeriodCondition.= " and s.admission_date BETWEEN '".date('Y-m-01 00:00:00')."' AND '".date('Y-m-t 23:59:59')."'"; // this month
         if($period == 3) $samplePeriodCondition.= " and s.admission_date BETWEEN '".date('Y-01-01 23:59:59')."' AND '".date('Y-12-31 23:59:59')."'"; // this year
@@ -422,7 +420,7 @@ class DashboardController extends Controller
                                         ) sample
                                         ON sample.sample_source_id = ss.`id`
                                         WHERE ss.`record_status_id` = 1
-                                        AND ss.`lab_id` = ".$this->baseLabId."
+                                        AND ss.`organization_id` = ".$this->baseOrganizationId."
         ");
         $sampleSourceDataArray = [];
         foreach ($sampleSourceData as $data){
@@ -458,7 +456,7 @@ class DashboardController extends Controller
                 FROM samples s
                 WHERE YEAR(s.`admission_date`) between ".$fromYear." and ".$toYear."
                 AND s.`record_status_id` = 1
-                AND s.`lab_id` = ".$this->baseLabId."
+                AND s.`organization_id` = ".$this->baseOrganizationId."
                 GROUP BY MONTH(s.`admission_date`), YEAR(s.`admission_date`) ");
         return $sampleByYear;
     }
@@ -482,14 +480,14 @@ class DashboardController extends Controller
             	   sum(r.bank_repayment_amount) as total_bank_paid,
             	   0 as total_owe
             from repayments r
-            inner join invoices inv on inv.id = r.invoice_id and r.lab_id = inv.lab_id and inv.record_status_id = 1
-            inner join samples s on s.`id` = inv.`sample_id` and s.`lab_id` = inv.`lab_id` and s.`record_status_id` = 1
-            inner join patients p on p.`id` = s.`patient_id` and p.`lab_id` = s.`lab_id`
-            INNER JOIN sample_sources ss ON ss.id = s.`sample_source_id` AND ss.`lab_id` = s.`lab_id`
+            inner join invoices inv on inv.id = r.invoice_id and r.organization_id = inv.organization_id and inv.record_status_id = 1
+            inner join samples s on s.`id` = inv.`sample_id` and s.`organization_id` = inv.`organization_id` and s.`record_status_id` = 1
+            inner join patients p on p.`id` = s.`patient_id` and p.`organization_id` = s.`organization_id`
+            INNER JOIN sample_sources ss ON ss.id = s.`sample_source_id` AND ss.`organization_id` = s.`organization_id`
             INNER JOIN physicians ps ON ps.`id` = s.`physician_id`
             where r.`record_status_id` = 1
             AND DATE(r.repayment_date) BETWEEN '".date('Y-m-d', strtotime($startDate))."' AND '".date('Y-m-d', strtotime($endDate))."'
-            and r.lab_id= ".$this->baseLabId."
+            and r.organization_id= ".$this->baseOrganizationId."
             group by r.`repayment_date`,
             	ss.`name_en`,
             	p.`name_en`,
@@ -515,14 +513,14 @@ class DashboardController extends Controller
         $current = DB::table('samples')
             ->selectRaw('MONTH(admission_date) as month, COUNT(*) as total')
             ->whereYear('admission_date', $thisYear)
-            ->where('lab_id', $this->baseLabId)
+            ->where('organization_id', $this->baseOrganizationId)
             ->groupBy('month')
             ->pluck('total', 'month');
 
         $previous = DB::table('samples')
             ->selectRaw('MONTH(admission_date) as month, COUNT(*) as total')
             ->whereYear('admission_date', $lastYear)
-            ->where('lab_id', $this->baseLabId)
+            ->where('organization_id', $this->baseOrganizationId)
             ->groupBy('month')
             ->pluck('total', 'month');
 
@@ -547,14 +545,14 @@ class DashboardController extends Controller
         $current = DB::table('invoices')
             ->selectRaw('MONTH(invoice_date) as month, SUM(gross_total) as total')
             ->whereYear('invoice_date', $thisYear)
-            ->where('lab_id', $this->baseLabId)
+            ->where('organization_id', $this->baseOrganizationId)
             ->groupBy('month')
             ->pluck('total', 'month');
 
         $previous = DB::table('invoices')
             ->selectRaw('MONTH(invoice_date) as month, SUM(gross_total) as total')
             ->whereYear('invoice_date', $lastYear)
-            ->where('lab_id', $this->baseLabId)
+            ->where('organization_id', $this->baseOrganizationId)
             ->groupBy('month')
             ->pluck('total', 'month');
 
@@ -585,13 +583,13 @@ class DashboardController extends Controller
                 FROM samples s
                 WHERE s.`record_status_id` = 1
                 and year(s.admission_date) = ".$thisYear."
-                AND s.lab_id = ".$this->baseLabId."
+                AND s.organization_id = ".$this->baseOrganizationId."
                 GROUP BY s.`sample_source_id`
 
             ) sample
             ON sample.sample_source_id = ss.`id`
             WHERE ss.`record_status_id` = 1
-            AND ss.`lab_id` = ".$this->baseLabId."
+            AND ss.`organization_id` = ".$this->baseOrganizationId."
             ORDER BY total_samples DESC
             LIMIT 10
         ");
@@ -615,13 +613,13 @@ class DashboardController extends Controller
                         INNER JOIN departments sd ON sd.id = st.`department_id`
                         WHERE s.`record_status_id` = 1
                         and year(s.admission_date) = ".$thisYear."
-                        AND s.lab_id = ".$this->baseLabId."
+                        AND s.organization_id = ".$this->baseOrganizationId."
                         GROUP BY st.`department_id`
 
                         ) sample
                         ON sample.department_id = d.`id`
                         WHERE d.`record_status_id` = 1
-                        AND d.`lab_id` = ".$this->baseLabId."
+                        AND d.`organization_id` = ".$this->baseOrganizationId."
                         ORDER BY d.`name_en`
         ");
         return response()->json($samplePanelData);

app/Http/Controllers/DepartmentController.php

@@ -1,108 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-use App\Enums\RecordStatusEnum;
-use App\Http\Controllers\Helper\GlobalController;
-use App\Models\BaseModel;
-use App\Models\Department;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Session;
-
-class DepartmentController extends Controller
-{
-    protected $model;
-    protected $baseLabId;
-    protected $labs;
-
-    public function __construct(Department $department){
-        $this->model = $department;
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
-    }
-
-    public function index(Request $request){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['view_department'])) return redirect(url('my-profile'));
-        $standardDepartments = $this->model::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'is_standard' => 1])->get(['id','name_en'])->unique('name_en');
-        $recordStatusCondition = Auth::id()==1 ? [RecordStatusEnum::DELETE, RecordStatusEnum::ACTIVE] : [RecordStatusEnum::ACTIVE];
-        $departments = $this->model::query()->with(['samples'])->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusCondition)
-            ->where('lab_id', $this->baseLabId)
-            ->when(!empty($request->kword), function ($departments) use($request){
-                $departments->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
-            })->orderBy('weight','asc')->paginate(config('labis.pagination.perpage', 10));
-        return view('department', ['departments' => $departments, 'labs' => $this->labs, 'standardDepartments' => $standardDepartments]);
-    }
-
-    public function save(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['create_department'])) return false;
-            $validator = \Validator::make($request->all(), ['name_en' => 'required']);
-            if ($validator->fails()){
-                return response()->json(['success' => false, 'message' => __('department.create_fail'), 'errors' => $validator->errors()->all()]);
-            }
-
-            $new  = $this->model::query()->firstOrNew(['name_en' => $request->name_en, 'lab_id' => $this->baseLabId]);
-            $new->name_en = $request->name_en;
-            $new->weight = $request->weight;
-            $new->lab_id = $this->baseLabId;
-            $new->created_at = date('Y-m-d H:i:s');
-            $new->created_by = Auth::user()->id;
-            $new->record_status_id = RecordStatusEnum::ACTIVE;
-            $new->save();
-
-            return response()->json(['success' => true, 'message' => __('department.create_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('department.create_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function update(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['update_department'])) return false;
-            $validator = \Validator::make($request->all(), [
-                'name_en' => 'required',
-                'weight' => 'nullable'
-            ]);
-            if ($validator->fails()) return response()->json(['success' => false, 'message' => __('department.update_fail'), 'errors' => $validator->errors()->all()]);
-            $data = array(
-                'name_en' => $request->name_en,
-                'updated_at' => date('Y-m-d H:i:s'),
-                'updated_by' => Auth::id()
-            );
-            $this->model::query()->where('id', $request->uid)->update($data);
-            return response()->json(['success' => true, 'message' => __('department.update_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('department.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function get(Request $request){
-        try{
-            $department = $this->model::query()->find($request->uid);
-            return response()->json(['success' => true, 'message' => __('department.get_success'), 'data' => $department]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('department.get_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function delete(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['delete_department'])) return false;
-            $this->model::query()->where('id', $request->uid)->update(array('record_status_id'=> RecordStatusEnum::DELETE));
-            return response()->json(['success' => true, 'message' => __('department.delete_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('department.delete_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function restore(Request $request){
-        try{
-            $this->model::query()->where('id', $request->uid)->update(array('record_status_id'=> RecordStatusEnum::ACTIVE));
-            return response()->json(['success' => true, 'message' => __('department.restore_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('department.restore_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-
-}

app/Http/Controllers/EquipmentController.php

@@ -0,0 +1,154 @@
+<?php
+
+namespace App\Http\Controllers;
+use App\Enums\RecordStatusEnum;
+use App\Http\Controllers\Helper\GlobalController;
+use App\Models\BaseModel;
+use App\Models\Concept;
+use App\Models\Equipment;
+use App\Models\Room;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+use Illuminate\Support\Facades\Session;
+
+
+class EquipmentController extends Controller
+{
+    protected $model;
+    protected $baseOrganizationId;
+    protected $roomModel;
+    protected $conceptModel;
+
+    public function __construct(){
+        $this->baseOrganizationId = Session::get('base_organization_id');
+        $this->base = Session::get('base_organization');
+        $this->model = new Equipment();
+        $this->roomModel = new Room();
+        $this->conceptModel = new Concept();
+    }
+
+    public function index(Request $request){
+        $recordStatusCondition = Auth::id()==1 ? [RecordStatusEnum::DELETE, RecordStatusEnum::ACTIVE] : [RecordStatusEnum::ACTIVE];
+        $rooms = $this->roomModel::with(['building'])->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->where('organization_id', $this->baseOrganizationId)->get();
+        $concepts = $this->conceptModel::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)->get();
+
+        $equipments = $this->model::with(['room'])->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusCondition)
+            ->where('organization_id', $this->baseOrganizationId)
+            ->when(!empty($request->kword), function ($query) use($request){
+                $query->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
+                    ->orWhereRaw("replace(code, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
+            })->when(!empty(trim($request->room_id)), function ($query) use($request){
+                $query->where('room_id', $request->room_id);
+            })->orderBy(BaseModel::CREATED_AT,'desc')->paginate(config('nrml.pagination.perpage', 10));
+        return view('equipment', ['equipments' => $equipments, 'rooms' => $rooms, 'concepts' => $concepts]);
+    }
+
+    public function save(Request $request){
+        try {
+            $validator = \Validator::make($request->all(), [
+                'name_en' => 'required',
+                'capacity' => 'required',
+                'room_id' => 'required',
+                'code' => 'required',
+                'equipment_type_concept_id' => 'required',
+                'installed_date' => 'required'
+            ]);
+            if ($validator->fails()) {
+                return response()->json(['success' => false, 'message' => __('building.create_fail'), 'errors' => $validator->errors()->all()]);
+            }
+            $data = array(
+                'name_en' => $request->name_en,
+                'capacity' => $request->capacity,
+                'code' => $request->code,
+                'equipment_type_concept_id' => $request->equipment_type_concept_id,
+                'room_id' => $request->room_id,
+                'model' => $request->model,
+                'serial_number' => $request->serial_number,
+                'min_temperature' => $request->min_temperature,
+                'max_temperature' => $request->max_temperature,
+                'status' => BaseModel::RECORD_STATUS_ACTIVE,
+                'installed_date' => date('Y-m-d', strtotime($request->installed_date)),
+                'organization_id' => $this->baseOrganizationId,
+                'created_at' => date('Y-m-d H:i:s'),
+                'created_by' => Auth::id()
+            );
+            $this->model::query()->insert($data);
+            return response()->json(['success' => true, 'message' => __('laboratory.create_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.create_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+
+    public function update(Request $request){
+        try {
+            $validator = \Validator::make($request->all(), [
+                'name_en' => 'required',
+                'capacity' => 'required',
+                'room_id' => 'required',
+                'code' => 'required',
+                'equipment_type_concept_id' => 'required',
+                'installed_date' => 'required'
+            ]);
+            if ($validator->fails()) return response()->json(['errors' => $validator->errors()->all()]);
+            $data = array(
+                'name_en' => $request->name_en,
+                'capacity' => $request->capacity,
+                'code' => $request->code,
+                'equipment_type_concept_id' => $request->equipment_type_concept_id,
+                'room_id' => $request->room_id,
+                'model' => $request->model,
+                'serial_number' => $request->serial_number,
+                'min_temperature' => $request->min_temperature,
+                'max_temperature' => $request->max_temperature,
+                'installed_date' => date('Y-m-d', strtotime($request->installed_date)),
+                'updated_at' => date('Y-m-d H:i:s'),
+                'updated_by' => Auth::id()
+            );
+            $this->model::query()->where('id', $request->equipment_id)->update($data);
+            return response()->json(['success' => true, 'message' => __('laboratory.update_success')]);
+        } catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function get(Request $request){
+        try{
+            $lab = $this->model::query()->where('id', $request->equipment_id)->get()->first();
+            return response()->json(['success' => true, 'message' => __('laboratory.get_success'), 'data' => $lab]);
+        } catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.get_fail'), 'errors' => $e->getMessage()]);
+        }
+
+    }
+
+    public function delete(Request $request){
+        try{
+            $this->model::query()->where('id', $request->equipment_id)->update(array(
+                BaseModel::DELETED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::DELETED_BY_FIELD => Auth::id(),
+                BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE
+            ));
+            return response()->json(['success' => true, 'message' => __('laboratory.delete_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.delete_fail'), 'errors' => $e->getMessage()]);
+        }
+
+    }
+
+    public function restore(Request $request){
+        try{
+            $this->model::query()->where('id', $request->equipment_id)->update(array(BaseModel::RECORD_STATUS_FIELD=> RecordStatusEnum::ACTIVE));
+            return response()->json(['success' => true, 'message' => __('laboratory.restore_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.restore_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+
+}

app/Http/Controllers/IncidentTypeController.php

@@ -0,0 +1,122 @@
+<?php
+
+namespace App\Http\Controllers;
+use App\Enums\RecordStatusEnum;
+use App\Http\Controllers\Helper\GlobalController;
+use App\Models\BaseModel;
+use App\Models\IncidentType;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+use Illuminate\Support\Facades\Session;
+
+
+class IncidentTypeController extends Controller
+{
+    protected $model;
+    protected $baseOrganizationId;
+
+    public function __construct(){
+        $this->base = Session::get('base_organization');
+        $this->model = new IncidentType();
+    }
+
+    public function index(Request $request){
+        $incidentTypes = $this->model::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->when(!empty($request->kword), function ($query) use($request){
+                $query->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
+                    ->orWhereRaw("replace(name_kh, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
+                    ->orWhereRaw("replace(code, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
+            })->orderBy(BaseModel::CREATED_AT,'desc')->paginate(config('nrml.pagination.perpage', 10));
+        return view('incident_type', ['incidentTypes' => $incidentTypes]);
+    }
+
+    public function save(Request $request){
+        try {
+
+            $validator = \Validator::make($request->all(), [
+                'name_en' => 'required',
+                'name_kh' => 'required',
+                'code' => 'required',
+            ]);
+            if ($validator->fails()) {
+                return response()->json(['success' => false, 'message' => __('building.create_fail'), 'errors' => $validator->errors()->all()]);
+            }
+            $data = array(
+                'name_en' => $request->name_en,
+                'name_kh' => $request->name_kh,
+                'code' => $request->code,
+                'description' => $request->description,
+                'created_at' => date('Y-m-d H:i:s'),
+                'created_by' => Auth::id()
+            );
+            $this->model::query()->insert($data);
+            return response()->json(['success' => true, 'message' => __('laboratory.create_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.create_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+
+    public function update(Request $request){
+        try {
+
+            $validator = \Validator::make($request->all(), [
+                'name_en' => 'required',
+                'name_kh' => 'required',
+                'code' => 'required',
+            ]);
+            if ($validator->fails()) return response()->json(['errors' => $validator->errors()->all()]);
+            $data = array(
+                'name_en' => $request->name_en,
+                'name_kh' => $request->name_kh,
+                'code' => $request->code,
+                'description' => $request->description,
+                'updated_at' => date('Y-m-d H:i:s'),
+                'updated_by' => Auth::id()
+            );
+            $this->model::query()->where('id', $request->incident_type_id)->update($data);
+            return response()->json(['success' => true, 'message' => __('laboratory.update_success')]);
+        } catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function get(Request $request){
+        try{
+            $lab = $this->model::query()->where('id', $request->incident_type_id)->get()->first();
+            return response()->json(['success' => true, 'message' => __('laboratory.get_success'), 'data' => $lab]);
+        } catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.get_fail'), 'errors' => $e->getMessage()]);
+        }
+
+    }
+
+    public function delete(Request $request){
+        try{
+            $this->model::query()->where('id', $request->incident_type_id)->update(array(
+                BaseModel::DELETED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::DELETED_BY_FIELD => Auth::id(),
+                BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE
+            ));
+            return response()->json(['success' => true, 'message' => __('laboratory.delete_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.delete_fail'), 'errors' => $e->getMessage()]);
+        }
+
+    }
+
+    public function restore(Request $request){
+        try{
+            $this->model::query()->where('id', $request->incident_type_id)->update(array(BaseModel::RECORD_STATUS_FIELD=> RecordStatusEnum::ACTIVE));
+            return response()->json(['success' => true, 'message' => __('laboratory.restore_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.restore_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+
+}

app/Http/Controllers/InvoiceController.php

@@ -1,327 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-use App\Enums\RecordStatusEnum;
-use App\Http\Controllers\Helper\GlobalController;
-use App\Http\Requests\SampleCreateRequest;
-use App\Http\Requests\UpdateRequests\SampleUpdateRequest;
-use App\Http\Resources\SampleResource;
-use App\Models\BaseModel;
-use App\Models\Invoice;
-use App\Models\InvoiceDetail;
-use App\Models\Patient;
-use App\Models\Sample;
-use App\Models\LabConfigure;
-use App\Models\Physician;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Session;
-
-class InvoiceController extends Controller
-{
-    protected $model;
-    protected $sampleModel;
-    protected $patientModel;
-    protected $invoiceDetailModel;
-    protected $baseLabId;
-    protected $labs;
-    protected $base;
-    protected $laboratoryConfigures;
-    protected $physicianModel;
-
-
-    public function __construct(Invoice $invoiceModel, InvoiceDetail $invoiceDetailModel, Sample $sampleModel, Patient $patientModel, Physician $physicianModel){
-        $this->model = $invoiceModel;
-        $this->sampleModel = $sampleModel;
-        $this->invoiceDetailModel = $invoiceDetailModel;
-        $this->patientModel = $patientModel;
-        $this->laboratoryConfigures = new LabConfigure();
-        $this->physicianModel = $physicianModel;
-
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
-        $this->labs = parent::getAccessAbleLabs();
-    }
-
-    public function index(Request $request){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['view_invoice'])) return redirect(url('my-profile'));
-        $recordStatusConditions = Auth::id()==1 ? [RecordStatusEnum::ACTIVE , RecordStatusEnum::DELETE] : [RecordStatusEnum::ACTIVE];
-
-         $oweInvoices = $this->model::with(['sample.patient'])->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
-            ->where('balance','>', 0)->get();
-        $physicians = $this->physicianModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->get();
-
-        $invoices = $this->model::with(['sample','repayments'])
-            ->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusConditions)
-            ->where('lab_id', $this->baseLabId)
-            ->when(!empty($request->from_date) && !empty($request->to_date), function ($inv) use ($request){
-                $inv->whereBetween('invoice_date',[date('Y-m-d',strtotime($request->from_date)), date('Y-m-d',strtotime($request->to_date))]);
-            })
-            ->when(isset($request->physician) && !empty($request->physician), function($inv) use ($request){
-                $inv->whereIn('sample_id', $this->sampleModel::query()->where('physician_id', $request->physician)->pluck('id'));
-            })
-            ->when(!empty(trim($request->kword)), function ($inv) use($request, $recordStatusConditions){
-                $inv->whereRaw("replace(invoice_code, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
-                    ->orWhereIn('sample_id', $this->sampleModel::query()
-                        ->whereIn('patient_id', $this->patientModel::query()
-                            ->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
-                            ->orWhereRaw("replace(phone_number, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
-                            ->orWhere('patient_uuid','like','%'.$request->kword.'%')->pluck('id')->toArray()
-                        )->orwhereRaw("replace(sample_number, ' ','') like '%".str_replace(" ","",$request->kword)."%'")->pluck('id')->toArray()
-                    )->where('lab_id', $this->baseLabId)->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusConditions);
-            })->orderBy('invoice_code','desc')->paginate(20);
-            if(Auth::id()==1){
-                //dd($invoices->pluck('repayments'));
-            }
-        return view('v_invoice.invoice', ['invoices' => $invoices, 'labSettings' => (object) $this->location(), 'oweInvoices' => $oweInvoices, 'physicians' => $physicians]);
-    }
-
-    public function create($sample_id = null){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['create_invoice'])) return redirect(url('my-profile'));
-        $samples = $this->sampleModel::query()->with('invoice')
-            ->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
-            ->whereDoesntHave('invoice')->get();
-        return view('v_invoice.new_invoice', [
-            'samples' => $samples,
-            'sample_id' => $sample_id
-        ]);
-    }
-
-    public function store(Request $request){
-        DB::beginTransaction();
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['create_invoice'])) return redirect(url('my-profile'));
-            $invoiceNumber = $this->generateAutoId($request->invoice_date);
-            $is_hide_discount = isset($request->is_hide_discount) ? 1: 0;
-            $requests = collect($request)->merge(['lab_id'=>$this->baseLabId, 'invoice_code' => $invoiceNumber, 'is_hide_discount' => $is_hide_discount, 'exchange_rate' => ((object) $this->location())->exchange_rate])->except(['first_paid_date']);
-            $invoice = $this->model::query()->create($requests->all());
-            $invoiceDetailRequest = collect($request->test_sample_id);
-            $items = $invoiceDetailRequest->map(function ($row, $key) use($request, $invoice) {
-                $invoiceDetailRow = $this->invoiceDetailModel::query()->create([
-                    'invoice_id' => $invoice->id,
-                    'test_sample_id' => $request->test_sample_id[$key],
-                    'discount_type' => $request->item_discount_type[$key],
-                    'discount' => $request->item_discount[$key],
-                    'test_name' => $request->test_name[$key],
-                    'qty' => 1,
-                    'unit_price' =>  $request->unit_price[$key],
-                ]);
-                return [];
-            });
-            DB::commit();
-            $request->session()->flash('message','invoice-success');
-            if(isset($request->save_print_invoice) && $request->save_print_invoice=='save_preview_invoice'){
-                return redirect('invoice/edit/'.$invoice->id.'?print');
-            }
-            return redirect()->back();
-        } catch (\Exception $e){
-            DB::rollBack();
-            $request->session()->flash('message','invoice-error');
-            return redirect()->back();
-        }
-    }
-
-    public function edit($id){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['view_invoice', 'update_invoice'])) return redirect(url('my-profile'));
-        $invoice = $this->model::query()->with('invoiceDetail.testSample.sample.department','creator','modifier')->where(['lab_id' => $this->baseLabId, 'id' => $id])->first();
-
-        $samples = $this->sampleModel::query()->where('id', $invoice->sample_id)->first();
-
-        $refreshItemItem = $this->refreshItemItem($invoice->sample_id);
-
-
-        $labConfigures = $this->laboratoryConfigures::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->get()->toArray();
-
-        return view('v_invoice.edit_invoice', [
-            'samples' => [$samples],
-            'invoice' => $invoice,
-            'invoice_id' => $id,
-            'sample_id' => $invoice->sample_id,
-            'labSettings' => (object) $this->location(),
-            'refreshItemItem' => $refreshItemItem,
-            'labConfigures' => $labConfigures,
-            'is_need_refresh_invoice' => (count($refreshItemItem) == count($invoice->invoiceDetail)) ? 0 : 1
-        ]);
-    }
-
-    public function update(Request $invoiceUpdateRequest){
-        DB::beginTransaction();
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['update_invoice'])) return redirect(url('my-profile'));
-            $is_hide_discount = isset($invoiceUpdateRequest->is_hide_discount) ? 1: 0;
-            $requests = collect($invoiceUpdateRequest)->only(['invoice_note','total','discount','gross_total','deposit' ,'bank_deposit', 'balance','invoice_date','exchange_rate'])->merge(['is_hide_discount' => $is_hide_discount, 'updated_by' => Auth::id(), 'updated_at' => date('Y-m-d H:i:s')]);
-            $invoice = $this->model::query()->where(['id' => $invoiceUpdateRequest->uid, 'lab_id' => $this->baseLabId])->update($requests->all());
-            $invoiceDetailRequest = collect($invoiceUpdateRequest->test_sample_id);
-            $items = $invoiceDetailRequest->map(function ($row, $key) use($invoiceUpdateRequest) {
-                $invDetail = $this->invoiceDetailModel::query()->where(['invoice_id' => $invoiceUpdateRequest->uid, 'test_sample_id' => $invoiceUpdateRequest->test_sample_id[$key]])->first();
-                if (empty($invDetail)) {
-                    $invoiceDetailRow = $this->invoiceDetailModel::query()->create([
-                        'invoice_id' => $invoiceUpdateRequest->uid,
-                        'test_sample_id' => $invoiceUpdateRequest->test_sample_id[$key],
-                        'discount_type' => $invoiceUpdateRequest->item_discount_type[$key],
-                        'discount' => $invoiceUpdateRequest->item_discount[$key],
-                        'test_name' => $invoiceUpdateRequest->test_name[$key],
-                        'weight' => $invoiceUpdateRequest->weight[$key],
-                        'qty' => 1,
-                        'unit_price' => $invoiceUpdateRequest->unit_price[$key],
-                    ]);
-                }
-                else{
-                    $invoiceDetailRow = $this->invoiceDetailModel::query()->where([
-                            'invoice_id' => $invoiceUpdateRequest->uid,
-                            'test_sample_id' => $invoiceUpdateRequest->test_sample_id[$key]
-                        ])->update([
-                        'weight' => $invoiceUpdateRequest->weight[$key]
-                    ]);
-                }
-                return [];
-            });
-            $this->invoiceDetailModel::query()->where('invoice_id', $invoiceUpdateRequest->uid)
-                ->whereNotIn('test_sample_id', $invoiceUpdateRequest->test_sample_id)->delete();
-            DB::commit();
-            $invoiceUpdateRequest->session()->flash('message','invoice-success');
-            return redirect()->back();
-        } catch (\Exception $e){
-            DB::rollBack();
-            $invoiceUpdateRequest->session()->flash('message','invoice-error');
-            return redirect()->back();
-        }
-    }
-
-    /** Perform by ajax function
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-
-    public function delete(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['delete_invoice'])) return false;
-            $invoice = $this->model::query()->where(['id' => $request->uid, 'lab_id' => $this->baseLabId])->first();
-            $invoice->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE));
-            return response()->json(['success' => true, 'message' => __('invoice.delete_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('invoice.delete_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function restore(Request $request){
-        try{
-            $this->model::query()->where('id', $request->uid)->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE));
-            return response()->json(['success' => true, 'message' => __('invoice.restore_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('invoice.restore_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function getSampleTest($sampleId){
-        try{
-            $patientTypes = $this->sampleModel::query()->with([])->where([
-                BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE,
-                'lab_id' => $this->baseLabId
-            ])->get();
-            return response()->json(['success'=> true , 'data' => $patientTypes]);
-        } catch (\Exception $e)
-        {
-            return response()->json(['success'=> false , 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function generateAutoId($invoiceDate){
-        $prefix = date('y',strtotime($invoiceDate));
-        $invoiceCount = $this->model::query()->where('lab_id', $this->baseLabId)->whereRaw('year(invoice_date) ="'. date('Y',strtotime($invoiceDate)).'"')->count();
-        return 'I-'.$this->base['short_name'].'-'.$prefix.'-'.(str_pad(($invoiceCount+1),5,'0',STR_PAD_LEFT));
-    }
-
-    public function paid($id){
-        DB::beginTransaction();
-        try{
-            $invoice = $this->model::query()->find($id);
-            $invoice->balance = 0;
-            $invoice->deposit = $invoice->gross_total;
-            $invoice->first_paid_date = date('Y-m-d');
-            $invoice->save();
-            DB::commit();
-            return response()->json(['success' => true, 'message' => __('This invoice already paid')]);
-        } catch (\Exception $e){
-            DB::rollBack();
-            return response()->json(['success' => false, 'message' => __('Failed while trying to paid on invoice'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    function refreshItemItem($sampleId){
-        try{
-            $resultItems = DB::select('
-                                            SELECT
-                                                d.`id` AS department_id,
-                                                d.`name_en` AS department_name,
-                                                d.weight as dweight,
-                                                st.`id` AS sample_type_id,
-                                                st.weight as sweight,
-                                                st.`name_en` AS sample_type,
-                                                ts.`id` AS test_sample_id,
-                                                ts.`heading_id` AS parent_id,
-                                                ts.`field_type`,
-                                                ts.`usd_price`,
-                                                ts.group_result,
-                                                ts.description,
-                                                t.`id` AS test_id,
-                                                t.`name_en` AS test_name,
-						                        tr.id as test_result_id,
-						                        pct.`commission_type`,
-						                        ifnull(pct.`commission_rate`, 0.00) as commission_rate,
-						                        ifnull(pct.`partner_price`, 0.00) as partner_price,
-						                        ts.weight
-                                            FROM samples s
-                                            INNER JOIN test_results tr
-                                            ON tr.`sample_id` = s.`id`
-                                            AND s.`lab_id` = tr.`lab_id`
-                                            INNER JOIN test_samples ts
-                                            ON ts.id = tr.`test_sample_id`
-                                            and ts.lab_id = tr.lab_id
-                                            INNER JOIN tests t
-                                            ON t.`id` = ts.`test_id`
-                                            INNER JOIN sample_types st
-                                            ON st.`id` = ts.`sample_type_id`
-                                            INNER JOIN departments d
-                                            ON d.`id` = st.`department_id`
-                                            LEFT JOIN `physician_commisssion` AS pct
-                                            ON pct.`test_sample_id` =  ts.`id`
-                                            AND pct.`physician_id` = s.`physician_id`
-                                            WHERE s.`id` = '.$sampleId.'
-                                            AND s.`lab_id`= '.$this->baseLabId.'
-                                            AND tr.`record_status_id` = '.BaseModel::RECORD_STATUS_ACTIVE.'
-                                            AND LENGTH(ts.group_result)>0
-                                            AND ts.usd_price>0
-                                            ORDER BY
-                                            d.`weight`,
-                                            st.`weight`,
-                                            ts.`weight`');
-            $departmentArray = array();
-            foreach ($resultItems as $row){
-                $net_amount = number_format((((!empty($row->commission_type) ? $row->commission_type : ((object) $this->location())->discount_type)) ==2 ? (($row->usd_price - $row->partner_price) - $row->commission_rate) :
-                    (($row->usd_price - $row->partner_price) * (1-$row->commission_rate/100))),2);
-                $testItemArray = array(
-                    'test_sample_id' => (string)$row->test_sample_id,
-                    'test_id' => $row->test_id,
-                    'test_name' => $row->test_name,
-                    'closed_parent_id' => (string) (int)$row->parent_id,
-                    'field_type' => (string) $row->field_type,
-                    'usd_price' => $row->usd_price,
-                    'group_result' => (string) $row->group_result,
-                    'item_discount_type' => (!empty($row->commission_type) ? $row->commission_type : ((object) $this->location())->discount_type),
-                    'item_discount_rate' => $row->commission_rate,
-                    'item_discount' => $net_amount,
-                    'discount_price' => ($row->usd_price - $net_amount)
-                );
-                $departmentArray[] = $testItemArray;
-            }
-            return $departmentArray;
-        } catch (\Exception $e){
-            return $e->getMessage();
-        }
-    }
-
-}

app/Http/Controllers/LabController.php

@@ -1,486 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-use App\Enums\RecordStatusEnum;
-use App\Http\Controllers\Helper\GlobalController;
-use App\Models\BaseModel;
-use App\Models\Department;
-use App\Models\SampleType;
-use App\Models\TestNormalValue;
-use App\Models\TestSample;
-use App\Models\TestSampleOrganism;
-use Illuminate\Http\Request;
-use App\Models\Laboratory;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Session;
-use App\Models\LabConfigure;
-
-
-class LabController extends Controller
-{
-    protected $model;
-    protected $baseLabId;
-    protected $testSampleModel;
-    protected $labs;
-
-    public function __construct(Laboratory $model, TestSample $testSampleModel){
-        $this->model = $model;
-        $this->testSampleModel = $testSampleModel;
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
-    }
-
-    public function index(Request $request){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['system_settings'])) return redirect(url('my-profile'));
-        $lab = $this->model::query()->find($this->baseLabId);
-        return view('laboratory', ['info' => $lab]);
-    }
-
-    public function save(Request $request){
-        try {
-
-            $validator = \Validator::make($request->all(), [
-                'lab_name_en' => 'required',
-                'lab_code' => 'required|max:5',
-                'sample_number' => 'required',
-                'patient_code' => 'required',
-                'start_date' => 'required',
-                'end_date' => 'nullable'
-            ]);
-            if ($validator->fails()) {
-                return response()->json(['success' => false, 'message' => __('laboratory.create_fail'), 'errors' => $validator->errors()->all()]);
-            }
-            $data = array(
-                'name_en' => $request->lab_name_en,
-                'name_kh' => $request->lab_name_kh,
-                'short_name' => $request->lab_code,
-                'sample_number' => $request->sample_number,
-                'patient_code' => $request->patient_code,
-                'phone_number' => $request->phone_number,
-                'lab_category_id' => $request->lab_category_id,
-                'is_auto_make_invoice' => $request->is_auto_make_invoice,
-                'email' => $request->email,
-                'shareable_lab_result' => isset($request->shareable_lab_result) ? 1 : 0,
-                'allow_external_request' => isset($request->allow_external_request) ? 1 : 0,
-                'is_hide_comission_percentage' => isset($request->is_hide_comission_percentage) ? $request->is_hide_comission_percentage : 0,
-                'is_hide_inv_discount' => 0,
-                'address_en' => $request->address_en,
-                'address_kh' => $request->address_kh,
-                'start_date' => ($request->start_date ? date('Y-m-d H:i:s', strtotime($request->start_date)) : null),
-                'end_date' => ($request->end_date ? date('Y-m-d H:i:s', strtotime($request->end_date)) : null),
-                'created_at' => date('Y-m-d H:i:s'),
-                'created_by' => Auth::id()
-            );
-            $this->model::query()->insert($data);
-            return response()->json(['success' => true, 'message' => __('laboratory.create_success')]);
-        }
-        catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('laboratory.create_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function updateInfo(Request $request){
-        try {
-            $validator = \Validator::make($request->all(), [
-                'name_en' => 'required',
-                'name_kh' => 'required',
-                'short_name' => 'required|max:3'
-            ]);
-            if ($validator->fails()) return response()->json(['errors' => $validator->errors()->all()]);
-            $data = array(
-                'name_en' => $request->name_en,
-                'name_kh' => $request->name_kh,
-                'short_name' => $request->short_name,
-                'email' => $request->email,
-                'phone_number' => $request->phone_number,
-                'address_en' => $request->address_en,
-                'address_kh' => $request->address_kh,
-                'updated_at' => date('Y-m-d H:i:s'),
-                'updated_by' => Auth::id()
-            );
-            $this->model::query()->where('id', $this->baseLabId)->update($data);
-            return redirect()->back();
-            //return response()->json(['success' => true, 'message' => __('laboratory.update_success')]);
-        } catch (\Exception $e){
-            dd($e);
-            //return redirect()->back();
-            return response()->json(['success' => false, 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function update(Request $request){
-        try {
-
-            $validator = \Validator::make($request->all(), [
-                'lab_name_en' => 'required',
-                'lab_code' => 'required|max:5',
-                'sample_number' => 'required',
-                'patient_code' => 'required',
-                'start_date' => 'required',
-                'end_date' => 'nullable'
-            ]);
-            if ($validator->fails()) return response()->json(['errors' => $validator->errors()->all()]);
-            $data = array(
-                'name_en' => $request->lab_name_en,
-                'name_kh' => $request->lab_name_kh,
-                'short_name' => $request->lab_code,
-                'sample_number' => $request->sample_number,
-                'patient_code' => $request->patient_code,
-                'phone_number' => $request->phone_number,
-                'lab_category_id' => $request->lab_category_id,
-                'is_auto_make_invoice' => $request->is_auto_make_invoice,
-                'email' => $request->email,
-                'shareable_lab_result' => isset($request->shareable_lab_result) ? 1 : 0,
-                'allow_external_request' => isset($request->allow_external_request) ? 1 : 0,
-                'is_hide_comission_percentage' => isset($request->is_hide_comission_percentage) ? $request->is_hide_comission_percentage : 0,
-                'address_en' => $request->address_en,
-                'address_kh' => $request->address_kh,
-                'start_date' => ($request->start_date ? date('Y-m-d H:i:s', strtotime($request->start_date)) : null),
-                'end_date' => ($request->end_date ? date('Y-m-d H:i:s', strtotime($request->end_date)) : null),
-                'updated_at' => date('Y-m-d H:i:s'),
-                'updated_by' => Auth::id()
-            );
-            $this->model::query()->where('id', $request->lab_id)->update($data);
-            return response()->json(['success' => true, 'message' => __('laboratory.update_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function get(Request $request){
-        try{
-            $lab_id = $request->lab_id;
-            $lab = $this->model::query()->where('id', $lab_id)->get()->first();
-            return response()->json(['success' => true, 'message' => __('laboratory.get_success'), 'data' => $lab]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('laboratory.get_fail'), 'errors' => $e->getMessage()]);
-        }
-
-    }
-
-    public function delete(Request $request){
-        try{
-            $this->model::query()->where('id', $request->lab_id)->update(array(BaseModel::RECORD_STATUS_FIELD=> RecordStatusEnum::DELETE));
-            return response()->json(['success' => true, 'message' => __('laboratory.delete_success')]);
-        }
-        catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('laboratory.delete_fail'), 'errors' => $e->getMessage()]);
-        }
-
-    }
-
-    public function restore(Request $request){
-        try{
-            $this->model::query()->where('id', $request->lab_id)->update(array(BaseModel::RECORD_STATUS_FIELD=> RecordStatusEnum::ACTIVE));
-            return response()->json(['success' => true, 'message' => __('laboratory.restore_success')]);
-        }
-        catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('laboratory.restore_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function profile(){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['update_laboratory_information'])) return redirect(url('my-profile'));
-        $lab = $this->model::query()->find($this->baseLabId);
-        return view('lab_profile', ['info' => $lab]);
-    }
-
-    public function labSettingSetters(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['system_settings'])) return redirect(url('my-profile'));
-            $validator = \Validator::make($request->all(), [
-                'sample_number' => 'required|integer',
-                'patient_code' => 'required|integer',
-                'technician_label' => 'nullable',
-                'discount_type' => 'required|integer'
-                ]);
-            if ($validator->fails()){ return response()->json(['errors'=>$validator->errors()->all()]);}
-            $lab = $this->model::query()->where('id', $this->baseLabId)->first();
-            $lab->update(array(
-                'sample_number' => $request->sample_number,
-                'currency' => $request->currency,
-                'patient_code' => $request->patient_code,
-                'technician_label' => $request->technician_label,
-                'discount_type' => $request->discount_type,
-                'phone_number' => $request->phone_number,
-                'email' => $request->email,
-                'exchange_rate' => $request->exchange_rate,
-                //'is_hide_inv_discount' => $request->is_hide_inv_discount,
-                'abnormal_text_color' => $request->abnormal_text_color,
-                'show_result_footer' => $request->show_result_footer,
-                'abnormal_result_font_weight' => $request->abnormal_result_font_weight,
-                'result_header_id' => $request->result_header_id,
-                'is_auto_make_invoice' => $request->is_auto_make_invoice,
-                'invoice_template_id' => $request->invoice_template_id
-            ));
-            return response()->json(['success' => true, 'message' => __('laboratory.update_success'), 'data' => $lab]);
-        } catch (\Exception $e)
-        {
-            return response()->json(['success'=> false , 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function uploadImage(Request $request){
-        try {
-            $image = $request->file('image');
-            $imageName = 'avatar_'.$this->baseLabId.'.' . $image->getClientOriginalExtension();
-            $lab = $this->model::query()->where('id', $this->baseLabId)->first();
-            $lab->update(array('logo' => $imageName));
-            $image->move(public_path('storage/images/avatars/labs'), $imageName);
-            return response()->json(['success' => true, 'message' => __('laboratory.update_success'), 'data' => $lab]);
-        }catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function removeLabLogo(Request $request){
-        try {
-            $lab = $this->model::query()->find($this->baseLabId);
-            if(!empty($lab->logo)) {
-                if (file_exists(public_path('storage/images/avatars/labs/' . $lab->logo))) {
-                    unlink(public_path('storage/images/avatars/labs/' . $lab->logo));
-                    $lab->logo = null;
-                }
-            }
-            $lab->save();
-            return response()->json(['success' => true, 'message' => __('laboratory.update_success'), 'data' => $lab]);
-        }catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function saveLabConfigure(Request $request){
-        try{
-            $validator = \Validator::make($request->all(), [
-                'attribute_code' => 'required|string',
-                'attribute_value' => 'required|string'
-            ]);
-            if ($validator->fails()){ return response()->json(['errors'=>$validator->errors()->all()]);}
-            $labSetting = $this->labConfigureModel::query()->firstOrNew(['atrribute_code' => $request->attribute_code, 'lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD=> RecordStatusEnum::ACTIVE]);
-            $labSetting->assigned_attribute_value = $request->attribute_value;
-            $labSetting->save();
-            return response()->json(['success' => true, 'message' => __('laboratory.update_success'), 'data' => $labSetting]);
-        } catch (\Exception $e)
-        {
-            return response()->json(['success'=> false , 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function initLabData(){
-        return view('clone_lab',['labs' => $this->labs]);
-    }
-
-    function getLabData($labId){
-        try{
-            $department = Department::query()->with([
-                'samples',
-                'samples.testSamples',
-                'samples.testSamples.testValues',
-                'samples.testSamples.organisms',
-                'samples.testSamples.organisms.antibiotics'
-            ])->where(['lab_id' => $labId, BaseModel::RECORD_STATUS_FIELD => 1])->get()->toArray();
-            return response()->json(['success' => true, 'data' => $department]);
-        }
-        catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => 'Error while retrieving lab data.']);
-        }
-    }
-
-    /** Verify Image */
-
-    public function uploadVerifyImage(Request $request){
-        try {
-            $image = $request->file('image');
-            $imageName = 'verify_label_'.$this->baseLabId.'.' . $image->getClientOriginalExtension();
-            $lab = $this->model::query()->where('id', $this->baseLabId)->first();
-            $lab->update(array('verify_label' => $imageName));
-            $image->move(public_path('storage/images/avatars/labs'), $imageName);
-            return response()->json(['success' => true, 'message' => __('laboratory.update_success'), 'data' => $lab]);
-        }catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function removeVerifyImage(Request $request){
-        try {
-            $lab = $this->model::query()->find($this->baseLabId);
-            if(!empty($lab->verify_label)) {
-                if (file_exists(public_path('storage/images/avatars/labs/' . $lab->verify_label))) {
-                    unlink(public_path('storage/images/avatars/labs/' . $lab->verify_label));
-                    $lab->verify_label = null;
-                }
-            }
-            $lab->save();
-            return response()->json(['success' => true, 'message' => __('laboratory.update_success'), 'data' => $lab]);
-        }catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    function updateHeading(){
-         $targetLabTestSample = TestSample::query()->where(['lab_id' =>  18,'sample_type_id'=>397, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
-                ->where('heading_id','>',0)->get();
-           foreach ($targetLabTestSample as $targetTestSample){
-               dd($targetTestSample);
-                $source = TestSample::query()->where(['id' => $targetTestSample->heading_id, 'lab_id' => 29])->get();//->first();
-              dd($source);
-               $target = TestSample::query()->where(['lab_id' => 18, 'test_id' => $source->test_id , 'sample_type_id' => $targetTestSample->sample_type_id ])->get()->first();
-
-                //TestSample::query()->where(['id' => $targetTestSample->id])->update([ 'heading_id' => $target->id]);
-            }
-    }
-
-
-    public function uploadAlternativeLogo(Request $request){
-        try {
-            $image = $request->file('image');
-            $imageName = 'alternative_logo_'.$this->baseLabId.'.' . $image->getClientOriginalExtension();
-            $lab = $this->model::query()->where('id', $this->baseLabId)->first();
-            $lab->update(array('alternative_logo' => $imageName));
-            $image->move(public_path('storage/images/avatars/labs/alternative_logo'), $imageName);
-            return response()->json(['success' => true, 'message' => __('laboratory.update_success'), 'data' => $lab]);
-        }catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function removeAlternativeLogo(Request $request){
-        try {
-            $lab = $this->model::query()->find($this->baseLabId);
-            if(!empty($lab->alternative_logo)) {
-                if (file_exists(public_path('storage/images/avatars/labs/alternative_logo/' . $lab->alternative_logo))) {
-                    unlink(public_path('storage/images/avatars/labs/alternative_logo/' . $lab->alternative_logo));
-                    $lab->alternative_logo = null;
-                }
-            }
-            $lab->save();
-            return response()->json(['success' => true, 'message' => __('laboratory.update_success'), 'data' => $lab]);
-        }catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-// Alternative Verify Signature
-    public function uploadAlterVerifySignature(Request $request){
-        try {
-            $image = $request->file('image');
-            $imageName = 'alter_verify_sign_'.$this->baseLabId.'.' . $image->getClientOriginalExtension();
-            $lab = $this->model::query()->where('id', $this->baseLabId)->first();
-            $lab->update(array('alter_verify_sign' => $imageName));
-            $image->move(public_path('storage/images/avatars/labs'), $imageName);
-            return response()->json(['success' => true, 'message' => __('laboratory.update_success'), 'data' => $lab]);
-        }catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function removeAlterVerifySignature(Request $request){
-        try {
-            $lab = $this->model::query()->find($this->baseLabId);
-            if(!empty($lab->alter_verify_sign)) {
-                if (file_exists(public_path('storage/images/avatars/labs/' . $lab->alter_verify_sign))) {
-                    unlink(public_path('storage/images/avatars/labs/' . $lab->alter_verify_sign));
-                    $lab->alter_verify_sign = null;
-                }
-            }
-            $lab->save();
-            return response()->json(['success' => true, 'message' => __('laboratory.update_success'), 'data' => $lab]);
-        }catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-// Alternative Labtech Signature
-    public function uploadAlterLabtechSignature(Request $request){
-        try {
-            $image = $request->file('image');
-            $imageName = 'alter_labtech_sign_'.$this->baseLabId.'.' . $image->getClientOriginalExtension();
-            $lab = $this->model::query()->where('id', $this->baseLabId)->first();
-            $lab->update(array('alter_labtech_sign' => $imageName));
-            $image->move(public_path('storage/images/avatars/labs'), $imageName);
-            return response()->json(['success' => true, 'message' => __('laboratory.update_success'), 'data' => $lab]);
-        }catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function removeAlterLabtechSignature(Request $request){
-        try {
-            $lab = $this->model::query()->find($this->baseLabId);
-            if(!empty($lab->alter_labtech_sign)) {
-                if (file_exists(public_path('storage/images/avatars/labs/' . $lab->alter_labtech_sign))) {
-                    unlink(public_path('storage/images/avatars/labs/' . $lab->alter_labtech_sign));
-                    $lab->alter_labtech_sign = null;
-                }
-            }
-            $lab->save();
-            return response()->json(['success' => true, 'message' => __('laboratory.update_success'), 'data' => $lab]);
-        }catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    /** default footer */
-    public function uploadDefaultFooter(Request $request){
-        try {
-            $image = $request->file('image');
-            $imageName = 'default_footer_'.$this->baseLabId.'.' . $image->getClientOriginalExtension();
-            $lab = $this->model::query()->where('id', $this->baseLabId)->first();
-            $lab->update(array('footer' => $imageName));
-            $image->move(public_path('storage/images/avatars/labs/default_footer'), $imageName);
-            return response()->json(['success' => true, 'message' => __('laboratory.update_success'), 'data' => $lab]);
-        }catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function removeDefaultFooter(Request $request){
-        try {
-            $lab = $this->model::query()->find($this->baseLabId);
-            if(!empty($lab->footer)) {
-                if (file_exists(public_path('storage/images/avatars/labs/default_footer/' . $lab->footer))) {
-                    unlink(public_path('storage/images/avatars/labs/default_footer/' . $lab->footer));
-                    $lab->footer = null;
-                }
-            }
-            $lab->save();
-            return response()->json(['success' => true, 'message' => __('laboratory.update_success'), 'data' => $lab]);
-        }catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-    /* default footer end */
-
-    /** alternative footer */
-    public function uploadAlternativeFooter(Request $request){
-        try {
-            $image = $request->file('image');
-            $imageName = 'alternative_footer_'.$this->baseLabId.'.' . $image->getClientOriginalExtension();
-            $lab = $this->model::query()->where('id', $this->baseLabId)->first();
-            $lab->update(array('alternative_footer' => $imageName));
-            $image->move(public_path('storage/images/avatars/labs/alternative_footer'), $imageName);
-            return response()->json(['success' => true, 'message' => __('laboratory.update_success'), 'data' => $lab]);
-        }catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function removeAlternativeFooter(Request $request){
-        try {
-            $lab = $this->model::query()->find($this->baseLabId);
-            if(!empty($lab->alternative_footer)) {
-                if (file_exists(public_path('storage/images/avatars/labs/alternative_footer/' . $lab->alternative_footer))) {
-                    unlink(public_path('storage/images/avatars/labs/alternative_footer/' . $lab->alternative_footer));
-                    $lab->alternative_footer = null;
-                }
-            }
-            $lab->save();
-            return response()->json(['success' => true, 'message' => __('laboratory.update_success'), 'data' => $lab]);
-        }catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-    /* alternative footer end */
-
-}

app/Http/Controllers/OrganismController.php

@@ -1,110 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-use App\Enums\RecordStatusEnum;
-use App\Http\Controllers\Helper\GlobalController;
-use App\Http\Requests\TestSampleCreateRequest;
-use App\Models\BaseModel;
-use App\Models\Organism;
-use App\Models\PatientType;
-use App\Models\SampleType;
-use App\Models\Test;
-use App\Models\TestNormalValue;
-use App\Models\TestSample;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Session;
-
-class OrganismController extends Controller
-{
-
-    protected $model;
-    protected $baseLabId;
-    protected $labs;
-
-    public function __construct(Organism $organism){
-        $this->model = $organism;
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
-    }
-
-    public function index(Request $request){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['view_organism'])) return redirect(url('my-profile'));
-        $organisms = $this->model::with(['lab'])->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
-            //->where('lab_id', $this->baseLabId)
-            ->when(!empty($request->kword), function ($organisms) use($request){
-                $organisms->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
-            })->orderBy(BaseModel::CREATED_AT_FIELD,'desc')->paginate(config('labis.pagination.perpage', 10));
-        return view('organism', ['organisms' => $organisms]);
-    }
-
-    public function save(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['create_organism'])) return false;
-            $validator = \Validator::make($request->all(), ['name_en' => 'required']);
-            if ($validator->fails()) return response()->json(['success' => false, 'message' => __('organism.create_fail'), 'errors' => $validator->errors()->all()]);
-            $new  = $this->model::query()->firstOrNew(['name_en' => $request->name_en]);
-            $new->name_en = $request->name_en;
-            $new->weight = $request->weight;
-            $new->is_bold = $request->is_bold;
-            $new->lab_id =  $this->baseLabId;
-            $new->created_at = date('Y-m-d H:i:s');
-            $new->created_by = Auth::id();
-            $new->record_status_id = RecordStatusEnum::ACTIVE;
-            $new->save();
-            return response()->json(['success' => true, 'message' => __('organism.create_success'), 'data' => [$new]]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('organism.create_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function update(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['update_organism'])) return false;
-            $validator = \Validator::make($request->all(), ['name_en' => 'required']);
-            if ($validator->fails()) return response()->json(['success' => false, 'message' => __('organism.update_fail'), 'errors' => $validator->errors()->all()]);
-            $data = array(
-                'name_en' => $request->name_en,
-                'name_kh' => $request->name_kh,
-                'is_bold' => $request->is_bold,
-                'updated_at' => date('Y-m-d H:i:s'),
-                'updated_by' => Auth::id()
-            );
-            $this->model::query()->where('id', $request->uid)->update($data);
-            return response()->json(['success' => true, 'message' => __('organism.update_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('organism.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function get(Request $request){
-        try{
-            $organism = $this->model::query()->find($request->uid);
-            return response()->json(['success' => true, 'message' => __('organism.get_success'), 'data' => $organism]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('organism.get_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function delete(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['delete_organism'])) return false;
-            $this->model::query()->where('id', $request->uid)->update(array( BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE));
-            return response()->json(['success' => true, 'message' => __('organism.delete_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('organism.delete_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function restore(Request $request){
-        try{
-            $this->model::query()->where('id', $request->uid)->update(array( BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE));
-            return response()->json(['success' => true, 'message' => __('organism.restore_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('organism.restore_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-
-}

app/Http/Controllers/OrganizationController.php

@@ -0,0 +1,168 @@
+<?php
+
+namespace App\Http\Controllers;
+use App\Enums\RecordStatusEnum;
+use App\Http\Controllers\Helper\GlobalController;
+use App\Models\BaseModel;
+use App\Models\SampleType;
+use Illuminate\Http\Request;
+use App\Models\Organization;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Session;
+use function Yajra\DataTables\Html\data;
+
+
+class OrganizationController extends Controller
+{
+    protected $model;
+    protected $baseOrganizationId;
+    protected $labs;
+
+    public function __construct(Organization $model){
+        $this->model = $model;
+        $this->baseOrganizationId = Session::get('base_organization_id');
+        $this->base = Session::get('base_organization');
+    }
+
+    public function index(Request $request){
+        $labs = $this->model::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->when(Auth::id()!=1, function ($labs){
+                $labs->whereIn('id', $this->labs->pluck('id'));
+            })->when(!empty($request->kword), function ($labs) use($request){
+                $labs->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
+                    ->orWhereRaw("replace(name_kh, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
+                    ->orWhere('address_en','like','%'.$request->kword.'%')
+                    ->orWhere('address_kh','like','%'.$request->kword.'%');
+            })->orderBy(BaseModel::CREATED_AT,'desc')->paginate(config('nrml.pagination.perpage', 10));
+        return view('laboratory', ['laboratories' => $labs]);
+    }
+
+    public function save(Request $request){
+        try {
+
+            $validator = \Validator::make($request->all(), [
+                'name_en' => 'required',
+                'name_kh' => 'required',
+                'code' => 'required|max:10'
+            ]);
+            if ($validator->fails()) {
+                return response()->json(['success' => false, 'message' => __('laboratory.create_fail'), 'errors' => $validator->errors()->all()]);
+            }
+            $data = array(
+                'name_en' => $request->name_en,
+                'name_kh' => $request->name_kh,
+                'code' => $request->code,
+                'phone' => $request->phone,
+                'email' => $request->email,
+                'address_en' => $request->address_en,
+                'address_kh' => $request->address_kh,
+                'created_at' => date('Y-m-d H:i:s'),
+                'created_by' => Auth::id()
+            );
+            $this->model::query()->insert($data);
+            return response()->json(['success' => true, 'message' => __('laboratory.create_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.create_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function updateInfo(Request $request){
+        try {
+            $validator = \Validator::make($request->all(), [
+                'name_en' => 'required',
+                'name_kh' => 'required',
+                'code' => 'required|max:10'
+            ]);
+            if ($validator->fails()) return response()->json(['errors' => $validator->errors()->all()]);
+            $data = array(
+                'name_en' => $request->name_en,
+                'name_kh' => $request->name_kh,
+                'code' => $request->code,
+                'email' => $request->email,
+                'phone' => $request->phone,
+                'address_en' => $request->address_en,
+                'address_kh' => $request->address_kh,
+                'updated_at' => date('Y-m-d H:i:s'),
+                'updated_by' => Auth::id()
+            );
+            $this->model::query()->where('id', $this->baseOrganizationId)->update($data);
+            return redirect()->back();
+        } catch (\Exception $e){
+            dd($e);
+            return response()->json(['success' => false, 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function update(Request $request){
+        try {
+
+            $validator = \Validator::make($request->all(), [
+                'name_en' => 'required',
+                'name_kh' => 'required',
+                'code' => 'required|max:10'
+            ]);
+            if ($validator->fails()) return response()->json(['errors' => $validator->errors()->all()]);
+            $data = array(
+                'name_en' => $request->name_en,
+                'name_kh' => $request->name_kh,
+                'code' => $request->code,
+                'email' => $request->email,
+                'phone' => $request->phone,
+                'address_en' => $request->address_en,
+                'address_kh' => $request->address_kh,
+                'updated_at' => date('Y-m-d H:i:s'),
+                'updated_by' => Auth::id()
+            );
+            $this->model::query()->where('id', $request->organization_id)->update($data);
+            return response()->json(['success' => true, 'message' => __('laboratory.update_success')]);
+        } catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function get(Request $request){
+        try{
+            $organization_id = $request->organization_id;
+            $lab = $this->model::query()->where('id', $organization_id)->get()->first();
+            return response()->json(['success' => true, 'message' => __('laboratory.get_success'), 'data' => $lab]);
+        } catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.get_fail'), 'errors' => $e->getMessage()]);
+        }
+
+    }
+
+    public function delete(Request $request){
+        try{
+            $this->model::query()->where('id', $request->organization_id)->update(array(
+                BaseModel::DELETED_AT_FIELD => data('Y-m-d H:i:s'),
+                BaseModel::DELETED_BY_FIELD => Auth::id(),
+                BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE
+            ));
+            return response()->json(['success' => true, 'message' => __('laboratory.delete_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.delete_fail'), 'errors' => $e->getMessage()]);
+        }
+
+    }
+
+    public function restore(Request $request){
+        try{
+            $this->model::query()->where('id', $request->organization_id)->update(array(BaseModel::RECORD_STATUS_FIELD=> RecordStatusEnum::ACTIVE));
+            return response()->json(['success' => true, 'message' => __('laboratory.restore_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.restore_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function profile(){
+        if(!GlobalController::user_can(Auth::user()->role_id, ['update_laboratory_information'])) return redirect(url('my-profile'));
+        $organization = $this->model::query()->find($this->baseOrganizationId);
+        return view('organization_profile', ['info' => $organization]);
+    }
+
+
+}

app/Http/Controllers/PathogenController.php

@@ -0,0 +1,142 @@
+<?php
+
+namespace App\Http\Controllers;
+use App\Enums\RecordStatusEnum;
+use App\Http\Controllers\Helper\GlobalController;
+use App\Models\BaseModel;
+use App\Models\Concept;
+use App\Models\Pathogen;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+use Illuminate\Support\Facades\Session;
+
+
+class PathogenController extends Controller
+{
+    protected $model;
+    protected $baseOrganizationId;
+    protected $conceptModel;
+
+    public function __construct(){
+        $this->baseOrganizationId = Session::get('base_organization_id');
+        $this->base = Session::get('base_organization');
+        $this->model = new Pathogen();
+        $this->conceptModel = new Concept();
+    }
+
+    public function index(Request $request){
+        $concepts = $this->conceptModel::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)->get();
+        $pathogens = $this->model::with(['riskGroup', 'bsl', 'pathogenType'])->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->when(!empty($request->kword), function ($query) use($request){
+                $query->whereRaw("replace(scientific_name, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
+                    ->orWhereRaw("replace(common_name, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
+                    ->orWhereRaw("replace(strain, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
+            })->orderBy(BaseModel::CREATED_AT,'desc')->paginate(config('nrml.pagination.perpage', 10));
+        return view('pathogen', ['pathogens' => $pathogens, 'concepts' => $concepts]);
+    }
+
+    public function save(Request $request){
+        try {
+
+            $validator = \Validator::make($request->all(), [
+                'pathogen_category_concept_id' => 'required',
+                'scientific_name' => 'required',
+                'common_name' => 'required',
+                'risk_group_concept_id' => 'required',
+                'biosafety_level_concept_id' => 'required',
+            ]);
+            if ($validator->fails()) {
+                return response()->json(['success' => false, 'message' => __('building.create_fail'), 'errors' => $validator->errors()->all()]);
+            }
+            $data = array(
+                'pathogen_category_concept_id' => $request->pathogen_category_concept_id,
+                'scientific_name' => $request->scientific_name,
+                'common_name' => $request->common_name,
+                'risk_group_concept_id' => $request->risk_group_concept_id,
+                'biosafety_level_concept_id' => $request->biosafety_level_concept_id,
+                'infectious_dose' => $request->infectious_dose,
+                'transmission_mode' => $request->transmission_mode,
+                'storage_requirement' => $request->storage_requirement,
+                'min_temp' => $request->min_temp,
+                'max_temp' => $request->max_temp,
+                'created_at' => date('Y-m-d H:i:s'),
+                'created_by' => Auth::id()
+            );
+            $this->model::query()->insert($data);
+            return response()->json(['success' => true, 'message' => __('laboratory.create_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.create_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+
+    public function update(Request $request){
+        try {
+            $validator = \Validator::make($request->all(), [
+                'pathogen_category_concept_id' => 'required',
+                'scientific_name' => 'required',
+                'common_name' => 'required',
+                'risk_group_concept_id' => 'required',
+                'biosafety_level_concept_id' => 'required',
+            ]);
+            if ($validator->fails()) return response()->json(['errors' => $validator->errors()->all()]);
+            $data = array(
+                'pathogen_category_concept_id' => $request->pathogen_category_concept_id,
+                'scientific_name' => $request->scientific_name,
+                'common_name' => $request->common_name,
+                'risk_group_concept_id' => $request->risk_group_concept_id,
+                'biosafety_level_concept_id' => $request->biosafety_level_concept_id,
+                'infectious_dose' => $request->infectious_dose,
+                'transmission_mode' => $request->transmission_mode,
+                'storage_requirement' => $request->storage_requirement,
+                'min_temp' => $request->min_temp,
+                'max_temp' => $request->max_temp,
+                'updated_at' => date('Y-m-d H:i:s'),
+                'updated_by' => Auth::id()
+            );
+            $this->model::query()->where('id', $request->pathogen_id)->update($data);
+            return response()->json(['success' => true, 'message' => __('laboratory.update_success')]);
+        } catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function get(Request $request){
+        try{
+            $lab = $this->model::query()->where('id', $request->pathogen_id)->get()->first();
+            return response()->json(['success' => true, 'message' => __('laboratory.get_success'), 'data' => $lab]);
+        } catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.get_fail'), 'errors' => $e->getMessage()]);
+        }
+
+    }
+
+    public function delete(Request $request){
+        try{
+            $this->model::query()->where('id', $request->pathogen_id)->update(array(
+                BaseModel::DELETED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::DELETED_BY_FIELD => Auth::id(),
+                BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE
+            ));
+            return response()->json(['success' => true, 'message' => __('laboratory.delete_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.delete_fail'), 'errors' => $e->getMessage()]);
+        }
+
+    }
+
+    public function restore(Request $request){
+        try{
+            $this->model::query()->where('id', $request->pathogen_id)->update(array(BaseModel::RECORD_STATUS_FIELD=> RecordStatusEnum::ACTIVE));
+            return response()->json(['success' => true, 'message' => __('laboratory.restore_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.restore_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+
+}

app/Http/Controllers/PatientController.php

@@ -1,239 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-use App\Enums\RecordStatusEnum;
-use App\Helpers\Helpers;
-use App\Http\Controllers\Helper\GlobalController;
-use App\Http\Requests\PatientCreateRequest;
-use App\Http\Requests\PatientUpdateRequest;
-use App\Models\BaseModel;
-use App\Models\Laboratory;
-use App\Models\Patient;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Session;
-
-class PatientController extends Controller
-{
-
-    protected $model;
-    protected $baseLabId;
-    protected $base;
-    protected $departments;
-
-    public function __construct(Patient $patientModel){
-        $this->model = $patientModel;
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
-
-    }
-
-    function province(){
-        return parent::province();
-    }
-
-    public function index(Request $request){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['view_patient'])) return redirect(url('my-profile'));
-        $provinces = $this->province();
-        $patients = $this->model::with(['samples'])->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
-            ->where('lab_id', $this->baseLabId)
-            ->when(!empty(trim($request->kword)), function ($patients) use($request){
-                $patients->whereRaw(
-                    "(replace(name_en, ' ', '') LIKE ? OR replace(phone_number, ' ', '') LIKE ? OR replace(patient_uuid, ' ', '') LIKE ? OR replace(khid_number, ' ', '') LIKE ?) and lab_id = ?",
-                    [
-                        '%' . str_replace(' ', '', $request->kword) . '%',
-                        '%' . str_replace(' ', '', $request->kword) . '%',
-                        '%' . str_replace(' ', '', $request->kword) . '%',
-                        '%' . str_replace(' ', '', $request->kword) . '%',
-                        $this->baseLabId
-                    ]
-                );
-            })->orderBy(BaseModel::CREATED_AT_FIELD,'desc')->paginate(config('labis.pagination.perpage', 10));
-        return view('patient', ['provinces' => $provinces, 'patients' => $patients, 'labSettings' => (object) $this->base]);
-    }
-
-    public function save(PatientCreateRequest $patientCreateRequest){
-        DB::beginTransaction();
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['create_patient'])) return false;
-            $dob = $patientCreateRequest->dob;
-            $datePart = explode("-",$dob);
-            if($datePart[1]>12){
-            	$dob =  $datePart[1].'-'.$datePart[0].'-'.$datePart[2];
-            }
-            $requests = collect($patientCreateRequest)->merge([
-                'lab_id' => $this->baseLabId,
-                BaseModel::CREATED_AT_FIELD => date('Y-m-d H:i:s'),
-                BaseModel::CREATED_BY_FIELD => Auth::id(),
-                BaseModel::UPDATED_AT_FIELD => NULL,
-                BaseModel::UPDATED_BY_FIELD => NULL,
-                BaseModel::RECORD_STATUS_FIELD => BaseModel::RECORD_STATUS_ACTIVE
-            ])->replace(
-                [
-                    'dob' => date('Y-m-d', strtotime($dob)),
-                    'phone_number' => $patientCreateRequest->phone_number // preg_replace('/ /i', '', trim($patientCreateRequest->phone_number))
-                ]);
-
-            if(empty($patientCreateRequest->patient_uuid)) {
-                $patientNumber = $this->generateAutoId(date('Y-m-d'));
-                $requests = $requests->merge(['patient_uuid' => $patientNumber]);
-            }
-
-            $patient = $this->model::query()->create($requests->all());
-            DB::commit();
-            return response()->json(['success'=> true , 'message' => __('patient.create_success') , 'data' => $patient]);
-        } catch (\Exception $e){
-            DB::rollBack();
-            Log::error($e);
-            return response()->json(['success'=> false , 'message' => __('patient.create_fail') , 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function update(PatientUpdateRequest $patientUpdateRequest){
-        DB::beginTransaction();
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['update_patient'])) return false;
-            $dob = $patientUpdateRequest->dob;
-            $datePart = explode("-",$dob);
-            if($datePart[1]>12){
-            	$dob =  $datePart[1].'-'.$datePart[0].'-'.$datePart[2];
-            }
-
-            $requests = collect($patientUpdateRequest)->merge([
-                BaseModel::UPDATED_AT_FIELD => date('Y-m-d H:i:s'),
-                BaseModel::UPDATED_BY_FIELD => Auth::id()
-            ])->replace([
-                        'dob' => date('Y-m-d', strtotime($dob)),
-                        'phone_number' => $patientUpdateRequest->phone_number // preg_replace('/ /i', '', trim($patientUpdateRequest->phone_number))
-                    ])->except(['patient_uuid','uid']);
-            $patient = $this->model::query()->find($patientUpdateRequest->uid)->update($requests->all());
-            DB::commit();
-            return response()->json(['success'=> true , 'message' => __('patient.update_success'), 'data' => array('id' => $patientUpdateRequest->uid) ]);
-        } catch (\Exception $e){
-            DB::rollBack();
-            Log::error($e);
-            return response()->json(['success'=> false , 'message' => __('patient.update_fail'), 'errors' => [$e->getMessage()]]);
-        }
-    }
-
-    public function get(Request $request){
-        try{
-            $patient = $this->model::query()->find($request->uid);
-            return response()->json(['success'=> true , 'message' => __('patient.get_success') , 'data' => $patient]);
-        }
-        catch (\Exception $e){
-            return response()->json(['success'=> false , __('patient.get_fail'), 'errors' => $e->getMessage()]);
-        }
-
-    }
-
-    public function delete(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['delete_patient'])) return false;
-            $patient = $this->model::query()->find($request->uid);
-            $patient->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE));
-            return response()->json(['success'=> true, 'message' => __('patient.delete_success'), 'data' => $patient]);
-        }
-        catch (\Exception $e){
-            return response()->json(['success'=> false, 'message' => __('patient.delete_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function restore(Request $request){
-        try{
-            $patient = $this->model::query()->find($request->uid);
-            $patient->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE));
-            return response()->json(['success'=> true, 'message' => __('patient.restore_success'), 'data' => $patient]);
-        }
-        catch (\Exception $e){
-            return response()->json(['success'=> false, 'message' => __('patient.restore_success'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function search(Request $request)
-    {
-        try{
-            $patients = $this->model::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId])
-                ->when($request->kword!='', function($patients) use ($request) {
-                    $patients->whereRaw(
-                    "(replace(name_en, ' ', '') LIKE ? OR replace(phone_number, ' ', '') LIKE ? OR replace(patient_uuid, ' ', '') LIKE ? OR replace(khid_number, ' ', '') LIKE ?) and lab_id = ?",
-                    [
-                        '%' . str_replace(' ', '', $request->kword) . '%',
-                        '%' . str_replace(' ', '', $request->kword) . '%',
-                        '%' . str_replace(' ', '', $request->kword) . '%',
-                        '%' . str_replace(' ', '', $request->kword) . '%',
-                        $this->baseLabId
-                    ]
-                );
-                })->orderBy('name_en','asc')->limit(config('labis.pagination.perpage', 10))->get();
-		return response()->json(['success'=> true, __('patient.get_success'), 'data' => $patients]);
-        }
-        catch (\Exception $e){
-            return response()->json(['success'=> false, __('patient.get_fail'), 'errors' => [$e->getMessage()]]);
-        }
-    }
-
-    public function patientSearchAjax(Request $request)
-    {
-        try{
-            $provinces = $this->province();
-            $patients = $this->model::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId])
-                ->when($request->kword!='', function($patients) use ($request) {
-                    $patients->whereRaw(
-                    "(replace(name_en, ' ', '') LIKE ? OR replace(phone_number, ' ', '') LIKE ? OR replace(patient_uuid, ' ', '') LIKE ? OR replace(khid_number, ' ', '') LIKE ?) and lab_id = ?",
-                    [
-                        '%' . str_replace(' ', '', $request->kword) . '%',
-                        '%' . str_replace(' ', '', $request->kword) . '%',
-                        '%' . str_replace(' ', '', $request->kword) . '%',
-                        '%' . str_replace(' ', '', $request->kword) . '%',
-                        $this->baseLabId
-                    ]
-                );
-                })->orderBy('name_en','asc')->paginate(config('labis.pagination.perpage', 10));
-            return view('partials.patient_list', ['provinces' => $provinces, 'patients' => $patients, 'labSettings' => (object) $this->base]);
-        }
-        catch (\Exception $e){
-            return response()->json(['success'=> false, __('patient.get_fail'), 'errors' => [$e->getMessage()]]);
-        }
-    }
-
-    public function generateAutoId($admissionDate){
-        $prefix = date('y',strtotime($admissionDate));
-        $patientCount = $this->model::query()->where('lab_id', $this->baseLabId)->whereRaw('year(created_at) ="'. date('Y',strtotime($admissionDate)).'"')->count();
-        if($this->baseLabId==34) $patientCount = $patientCount+5; // solve problem when delete patient
-        return 'P-'.$this->base['short_name'].'-'.$prefix.'-'.(str_pad(($patientCount+1),5,'0',STR_PAD_LEFT));
-    }
-
-
-    public function searchPatientToSelect2(Request $request){
-        $patients = [];
-        if(!empty(trim($request->term))){
-        $patients = $this->model::query()
-            ->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId])
-            ->when(!empty(trim($request->term)), function ($patients) use($request){
-                $patients->whereRaw(
-                    "(replace(name_en, ' ', '') LIKE ? OR replace(phone_number, ' ', '') LIKE ? OR replace(patient_uuid, ' ', '') LIKE ? OR replace(khid_number, ' ', '') LIKE ?) and lab_id = ?",
-                    [
-                        '%' . str_replace(' ', '', $request->term) . '%',
-                        '%' . str_replace(' ', '', $request->term) . '%',
-                        '%' . str_replace(' ', '', $request->term) . '%',
-                        '%' . str_replace(' ', '', $request->term) . '%',
-                        $this->baseLabId
-                    ]
-                );
-            })->limit(20)->orderBy('name_en', 'asc')->get();
-        }
-        $items = [];
-        if(!empty($patients)){
-            $items = $patients->map(function ($item){
-                return array('id'=>$item->id, 'text' => $item->patient_uuid . ' - '.$item->name_en . ((!empty($item->phone_number) ? ' - '.$item->phone_number: '')));
-            });
-        }
-        return response()->json(['results' => $items]);
-    }
-
-
-
-}

app/Http/Controllers/PatientTypeController.php

@@ -1,115 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-use App\Enums\RecordStatusEnum;
-use App\Http\Controllers\Helper\GlobalController;
-use App\Http\Requests\PatientTypeCreateRequest;
-use App\Models\BaseModel;
-use App\Models\PatientType;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Session;
-
-class PatientTypeController extends Controller
-{
-
-    protected $model;
-    protected $baseLabId;
-    protected $labs;
-
-    public function __construct(PatientType $patientType){
-        $this->model = $patientType;
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
-    }
-
-    public function index(Request $request){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['view_patient_type'])) return redirect(url('my-profile'));
-        $standardPatientTypes = $this->model::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'is_standard' => 1])->get(['id','name_en'])->unique('name_en');
-        $patientTypes = $this->model::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
-                    //->where('lab_id', $this->baseLabId)
-                    ->when(!empty($request->kword), function ($patientTypes) use ($request){
-                        $patientTypes->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
-                    })->orderBy(BaseModel::CREATED_AT_FIELD,'desc')->paginate(config('labis.pagination.perpage', 10));
-        return view('patient-type', ['patientTypes' => $patientTypes, 'standardPatientTypes' => $standardPatientTypes]);
-    }
-
-    public function save(PatientTypeCreateRequest $request){
-        DB::beginTransaction();
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['create_patient_type'])) return false;
-            $new = $this->model::query()->firstOrNew(['name_en' => $request->name_en, 'gender' => $request->gender]);
-            $new->name_en = $request->name_en;
-            $new->gender = $request->gender;
-            $new->range_start = $request->age_from;
-            $new->range_start_unit = $request->age_from_unit;
-            $new->range_start_sign = $request->age_from_sign;
-            $new->range_end = $request->age_to;
-            $new->range_end_unit = $request->age_to_unit;
-            $new->range_end_sign = $request->age_to_sign;
-            //$new->lab_id = $this->baseLabId;
-            $new->save();
-            DB::commit();
-            return response()->json(['success' => true, 'message' => __('patient_type.create_success')]);
-        } catch (\Exception $e){
-            DB::rollBack();
-            return response()->json(['success' => false, 'message' => __('patient_type.create_fail'), 'errors' => $e->getMessage()]);
-        }
-
-    }
-
-    public function update(PatientTypeCreateRequest $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['update_patient_type'])) return false;
-            $data = array(
-                'name_en' => $request->name_en,
-                'range_start' => $request->age_from,
-                'range_start_unit' => $request->age_from_unit,
-                'gender' => $request->gender,
-                'range_end' => $request->age_to,
-                'range_end_unit' => $request->age_to_unit,
-                //'lab_id' => $this->baseLabId,
-                'updated_at' => date('Y-m-d H:i:s'),
-                'updated_by' => Auth::id()
-            );
-            $this->model::query()->where('id', $request->uid)->update($data);
-            DB::commit();
-            return response()->json(['success' => true, 'message' => __('patient_type.update_success')]);
-        } catch (\Exception $e){
-            DB::rollBack();
-            return response()->json(['success' => false, 'message' => __('patient_type.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function get(Request $request){
-        try{
-            $patientType = $this->model::query()->find($request->uid);
-            return response()->json(['success' => true, 'message' => __('patient_type.get_success'), 'data' => $patientType]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('patient_type.get_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function delete(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['delete_patient_type'])) return false;
-            $this->model::query()->where('id', $request->uid)->update(array( BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE));
-            return response()->json(['success' => true, 'message' => __('patient_type.delete_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('patient_type.delete_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function restore(Request $request){
-        try{
-            $this->model::query()->where('id', $request->uid)->update(array( BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE));
-            return response()->json(['success' => true, 'message' => __('patient_type.restore_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('patient_type.restore_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-
-
-}

app/Http/Controllers/PhysicianController.php

@@ -1,170 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-use App\Enums\RecordStatusEnum;;
-
-use App\Http\Controllers\Helper\GlobalController;
-use App\Models\BaseModel;
-use App\Models\Physician;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Session;
-
-class PhysicianController extends Controller
-{
-
-    protected $baseLabId;
-    protected $labs;
-    private $physician;
-
-    public function __construct(Physician $physician){
-        $this->physician = $physician;
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
-    }
-
-    public function index(Request $request){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['view_physician'])) return redirect(url('my-profile'));
-        $physicians = $this->physician::with(['lab'])->where('record_status_id', RecordStatusEnum::ACTIVE)
-            ->where('lab_id', Session::get('base_lab_id'))
-            ->when(!empty($request->kword), function ($physicians) use ($request){
-                $physicians->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
-            })
-            ->orderBy(BaseModel::CREATED_AT,'desc')->paginate(config('labis.pagination.perpage', 10));
-        return view('physician', ['physicians' => $physicians, 'labs' => parent::getAccessAbleLabs()]);
-    }
-
-    public function save(Request $request){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['create_physician'])) return redirect(url('my-profile'));
-        $validator = \Validator::make($request->all(), ['name_en' => 'required']);
-        if ($validator->fails()) return response()->json(['errors'=>$validator->errors()->all()]);
-        $imageName = NULL;
-        $footerName = NULL;
-        if($request->image)
-        {
-            request()->validate(['image' => 'image|mimes:jpeg,png,jpg,gif,svg|max:2048']);
-            $imageName = time().'.'.request()->image->getClientOriginalExtension();
-            request()->image->move(public_path('storage/images/physician'), $imageName);
-        }
-        if($request->imageFooter)
-        {
-            request()->validate(['imageFooter' => 'image|mimes:jpeg,png,jpg,gif,svg|max:2048']);
-            $footerName = time().'_footer.'.request()->imageFooter->getClientOriginalExtension();
-            request()->imageFooter->move(public_path('storage/images/physician'), $footerName);
-        }
-
-        $new = $this->physician::query()->firstOrNew(['name_en' => $request->name_en, 'lab_id' => $this->baseLabId]);
-        $new->name_en = $request->name_en;
-        $new->phone = $request->phone;
-        $new->lab_id = $this->baseLabId;
-        $new->logo = $imageName;
-        $new->footer = $footerName;
-        $new->is_default = isset($request->is_default) ? 1 : 0;
-        $new->created_at = date('Y-m-d H:i:s');
-        $new->created_by = Auth::user()->id;
-        $new->record_status_id = RecordStatusEnum::ACTIVE;
-        $new->save();
-
-        $request->session()->flash('msg','Physician has been inserted!');
-        return redirect()->back();
-    }
-
-    public function update(Request $request){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['update_physician'])) return redirect(url('my-profile'));
-        $validator = \Validator::make($request->all(), [
-            'name_en' => 'required'
-        ]);
-        if ($validator->fails()) return response()->json(['errors'=>$validator->errors()->all()]);
-        $imageName = NULL;
-        $footerName = NULL;
-        if($request->image)
-        {
-            request()->validate(['image' => 'image|mimes:jpeg,png,jpg,gif,svg|max:2048']);
-            $imageName = time().'.'.request()->image->getClientOriginalExtension();
-            request()->image->move(public_path('storage/images/physician'), $imageName);
-        }
-        if($request->imageFooter)
-        {
-            request()->validate(['imageFooter' => 'image|mimes:jpeg,png,jpg,gif,svg|max:2048']);
-            $footerName = time().'_footer.'.request()->imageFooter->getClientOriginalExtension();
-            request()->imageFooter->move(public_path('storage/images/physician'), $footerName);
-        }
-        $data = array(
-            'name_en' => $request->name_en,
-            'name_kh' => $request->name_kh,
-			'phone' => $request->phone,
-            'is_default' => isset($request->is_default) ? 1: 0,
-            'updated_at' => date('Y-m-d H:i:s'),
-            'updated_by' => Auth::id()
-        );
-        if(!empty($imageName)){$data = array_merge($data, ['logo' => $imageName]);}
-        if(!empty($footerName)){$data = array_merge($data, ['footer' => $footerName]);}
-        $status = $this->physician::query()->where('id', $request->uid)->update($data);
-        $request->session()->flash('msg','Physician has been updated!');
-        return redirect()->back();
-    }
-
-    public function deletePhysicianLogo(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['update_physician'])) return false;
-            $physician = $this->physician::query()->find($request->uid);
-            if(file_exists(public_path('storage/images/physician/'.$physician->logo))){
-                unlink(public_path('storage/images/physician/'.$physician->logo));
-                $physician->logo = null;
-            }
-            $physician->save();
-            return response()->json(['success'=> true , 'message' => __('physician.delete_photo_success')]);
-        }
-        catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('physician.delete_photo_failed')]);
-        }
-    }
-
-    public function deletePhysicianFooter(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['update_physician'])) return false;
-            $physician = $this->physician::query()->find($request->uid);
-            if(file_exists(public_path('storage/images/physician/'.$physician->footer))){
-                unlink(public_path('storage/images/physician/'.$physician->footer));
-                $physician->footer = null;
-            }
-            $physician->save();
-            return response()->json(['success'=> true , 'message' => __('physician.delete_photo_success')]);
-        }
-        catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('physician.delete_photo_failed')]);
-        }
-    }
-
-    public function get(Request $request){
-        try {
-            $physician = $this->physician::query()->find($request->uid);
-            return response()->json(['success'=> true , 'message' => __('physician.get_success'), 'data' => $physician]);
-        } catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('physician.get_fail')]);
-        }
-    }
-
-    public function delete(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['delete_physician'])) return false;
-            $this->physician::query()->where('id', $request->uid)->update(array( BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE));
-            return response()->json(['success'=> true , 'message' => __('physician.delete_success')]);
-        }
-        catch (\Exception $e){
-            return response()->json(['success'=> false , 'message' => __('physician.delete_fail')]);
-        }
-
-    }
-
-    public function restore(Request $request){
-        try {
-            $this->physician::query()->where('id', $request->uid)->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE));
-            return response()->json(['success' => true, 'message' => __('physician.restore_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('physician.restore_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-
-}

app/Http/Controllers/PublicationController.php

@@ -20,8 +20,8 @@ class PublicationController extends Controller
     public function __construct(Publication $publication){
         $this->model = $publication;
         $this->publicationReceiverModel = new PublicationReceiver();
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
+        $this->baseOrganizationId = Session::get('base_organization_id');
+        $this->base = Session::get('base_organization');
     }
 
     public function index(Request $request){
@@ -29,13 +29,13 @@ class PublicationController extends Controller
             ->when(!empty($request->kword), function ($publications) use($request){
                 $publications->whereRaw("replace(title_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
                 ->orWhereRaw("replace(title_kh, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
-            })->orderBy(BaseModel::CREATED_AT_FIELD,'desc')->paginate(config('labis.pagination.perpage', 10));
+            })->orderBy(BaseModel::CREATED_AT_FIELD,'desc')->paginate(config('nrml.pagination.perpage', 10));
         return view('publication', ['publications' => $publications, 'labs' => $this->labs]);
     }
 
     public function save(Request $request){
         try{
-            $validator = \Validator::make($request->all(), ['start_date' => 'required', 'title_en' => 'required','lab_ids' => 'required']);
+            $validator = \Validator::make($request->all(), ['start_date' => 'required', 'title_en' => 'required','organization_ids' => 'required']);
             if ($validator->fails()) return response()->json(['success' => false, 'message' => __('comment.create_fail'), 'errors' => $validator->errors()->all()]);
 
             $publication = $this->model::query()->create([
@@ -46,10 +46,10 @@ class PublicationController extends Controller
                 'description' => $request->description
             ]);
 
-            foreach ($request->lab_ids as $lab_id){
+            foreach ($request->organization_ids as $organization_id){
                 $this->publicationReceiverModel::query()->create([
                     'publication_id' => $publication->id,
-                    'lab_id' => $lab_id,
+                    'organization_id' => $organization_id,
                     'created_by' => Auth::id()
                 ]);
             }
@@ -62,7 +62,7 @@ class PublicationController extends Controller
 
     public function update(Request $request){
         try {
-            $validator = \Validator::make($request->all(), ['start_date' => 'required', 'title_en' => 'required', 'lab_ids' => 'required']);
+            $validator = \Validator::make($request->all(), ['start_date' => 'required', 'title_en' => 'required', 'organization_ids' => 'required']);
             if ($validator->fails()) return response()->json(['success' => false, 'message' => __('comment.update_fail'), 'errors' => $validator->errors()->all()]);
             $data = array(
                 'title_en' => $request->title_en,
@@ -73,10 +73,10 @@ class PublicationController extends Controller
             );
             $this->model::query()->where('id', $request->uid)->update($data);
             $this->publicationReceiverModel::query()->where('publication_id', $request->uid)->delete();
-            foreach ($request->lab_ids as $lab_id){
+            foreach ($request->organization_ids as $organization_id){
                 $this->publicationReceiverModel::query()->create([
                     'publication_id' => $request->uid,
-                    'lab_id' => $lab_id,
+                    'organization_id' => $organization_id,
                     'created_by' => Auth::id()
                 ]);
             }

app/Http/Controllers/QuantityController.php

@@ -1,100 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-use App\Enums\RecordStatusEnum;
-use App\Http\Controllers\Helper\GlobalController;
-use App\Http\Requests\TestSampleCreateRequest;
-use App\Models\BaseModel;
-use App\Models\Organism;
-use App\Models\PatientType;
-use App\Models\Quantity;
-use App\Models\SampleType;
-use App\Models\Test;
-use App\Models\TestNormalValue;
-use App\Models\TestSample;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Session;
-
-class QuantityController extends Controller
-{
-
-    protected $model;
-    protected $baseLabId;
-    protected $labs;
-    protected $departments;
-
-    public function __construct(Quantity $quantity){
-        $this->model = $quantity;
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
-    }
-
-    public function index(Request $request){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['view_quantity'])) return redirect(url('my-profile'));
-        $quantities = $this->model::with(['lab'])->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
-            ->where('lab_id', $this->baseLabId)
-            ->when(!empty($request->kword), function ($quantities) use($request){
-                $quantities->whereRaw("replace(quantity_name, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
-            })->orderBy(BaseModel::CREATED_AT_FIELD,'desc')->paginate(config('labis.pagination.perpage', 10));
-        return view('quantity', ['quantities' => $quantities]);
-    }
-
-    public function save(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['create_quantity'])) return false;
-            $validator = \Validator::make($request->all(), ['quantity_name' => 'required']);
-            if ($validator->fails()) return response()->json(['success' => false, 'message' => __('organism.create_fail'), 'errors' =>$validator->errors()->all()]);
-            $new  = $this->model::query()->firstOrNew(['quantity_name' => $request->quantity_name]);
-            $new->quantity_name = $request->quantity_name;
-            //$new->lab_id = $this->baseLabId;
-            $new->save();
-            return response()->json(['success' => true, 'message' => __('quantity.create_success'), 'data' => [$new]]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('quantity.create_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function update(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['update_quantity'])) return false;
-            $validator = \Validator::make($request->all(), ['quantity_name' => 'required']);
-            if ($validator->fails()) return response()->json(['success' => false, 'message' => __('organism.update_fail'), 'errors' => $validator->errors()->all()]);
-            $this->model::query()->where('id', $request->uid)->update(array('quantity_name' => $request->quantity_name));
-            return response()->json(['success' => true, 'message' => __('quantity.update_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('quantity.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function get(Request $request){
-        try{
-            $quantity = $this->model::query()->find($request->uid);
-            return response()->json(['success' => true, 'message' => __('quantity.get_success'), 'data' => $quantity]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('quantity.get_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function delete(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['delete_quantity'])) return false;
-            $this->model::query()->where('id', $request->uid)->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE));
-            return response()->json(['success' => true, 'message' => __('quantity.delete_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('quantity.delete_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function restore(Request $request){
-        try{
-            $this->model::query()->where('id', $request->uid)->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE));
-            return response()->json(['success' => true, 'message' => __('quantity.restore_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('quantity.restore_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-
-}

app/Http/Controllers/RackController.php

@@ -0,0 +1,146 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Enums\RecordStatusEnum;
+use App\Models\BaseModel;
+use App\Models\Equipment;
+use App\Models\Rack;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Session;
+
+class RackController extends Controller
+{
+    protected $model;
+    protected $equipmentModel;
+    protected $baseOrganizationId;
+    protected $base;
+
+    public function __construct()
+    {
+        $this->baseOrganizationId = Session::get('base_organization_id');
+        $this->base = Session::get('base_organization');
+        $this->model = new Rack();
+        $this->equipmentModel = new Equipment();
+    }
+
+    public function index(Request $request)
+    {
+        $recordStatusCondition = Auth::id() == 1 ? [RecordStatusEnum::DELETE, RecordStatusEnum::ACTIVE] : [RecordStatusEnum::ACTIVE];
+        $equipments = $this->equipmentModel::with(['room.building'])
+            ->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->where('organization_id', $this->baseOrganizationId)
+            ->get();
+
+        $racks = $this->model::with(['equipment.room.building'])
+            ->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusCondition)
+            ->whereIn('equipment_id', $equipments->pluck('id')->toArray())
+            ->when(!empty($request->kword), function ($query) use ($request) {
+                $keyword = str_replace(' ', '', $request->kword);
+                $query->where(function ($query) use ($keyword) {
+                    $query->whereRaw("replace(name, ' ','') like ?", ['%' . $keyword . '%'])
+                        ->orWhereRaw("replace(code, ' ','') like ?", ['%' . $keyword . '%']);
+                });
+            })
+            ->when(!empty(trim($request->equipment_id)), function ($query) use ($request) {
+                $query->where('equipment_id', $request->equipment_id);
+            })
+            ->orderBy(BaseModel::CREATED_AT_FIELD, 'desc')
+            ->paginate(config('nrml.pagination.perpage', 10));
+
+        return view('rack', ['racks' => $racks, 'equipments' => $equipments]);
+    }
+
+    public function save(Request $request)
+    {
+        try {
+            $validator = \Validator::make($request->all(), [
+                'equipment_id' => 'required',
+                'code' => 'required',
+                'name' => 'required',
+            ]);
+
+            if ($validator->fails()) {
+                return response()->json(['success' => false, 'message' => 'Unable to create rack.', 'errors' => $validator->errors()->all()]);
+            }
+
+            $this->model::query()->insert([
+                'equipment_id' => $request->equipment_id,
+                'code' => $request->code,
+                'name' => $request->name,
+                'description' => $request->description,
+                BaseModel::CREATED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::CREATED_BY_FIELD => Auth::id(),
+            ]);
+
+            return response()->json(['success' => true, 'message' => 'Rack has been created.']);
+        } catch (\Exception $e) {
+            return response()->json(['success' => false, 'message' => 'Unable to create rack.', 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function update(Request $request)
+    {
+        try {
+            $validator = \Validator::make($request->all(), [
+                'rack_id' => 'required',
+                'equipment_id' => 'required',
+                'code' => 'required',
+                'name' => 'required',
+            ]);
+
+            if ($validator->fails()) {
+                return response()->json(['success' => false, 'message' => 'Unable to update rack.', 'errors' => $validator->errors()->all()]);
+            }
+
+            $this->model::query()->where('id', $request->rack_id)->update([
+                'equipment_id' => $request->equipment_id,
+                'code' => $request->code,
+                'name' => $request->name,
+                'description' => $request->description,
+                BaseModel::UPDATED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::UPDATED_BY_FIELD => Auth::id(),
+            ]);
+
+            return response()->json(['success' => true, 'message' => 'Rack has been updated.']);
+        } catch (\Exception $e) {
+            return response()->json(['success' => false, 'message' => 'Unable to update rack.', 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function get(Request $request)
+    {
+        try {
+            $rack = $this->model::query()->where('id', $request->rack_id)->first();
+            return response()->json(['success' => true, 'message' => 'Rack has been retrieved.', 'data' => $rack]);
+        } catch (\Exception $e) {
+            return response()->json(['success' => false, 'message' => 'Unable to retrieve rack.', 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function delete(Request $request)
+    {
+        try {
+            $this->model::query()->where('id', $request->rack_id)->update([
+                BaseModel::DELETED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::DELETED_BY_FIELD => Auth::id(),
+                BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE,
+            ]);
+
+            return response()->json(['success' => true, 'message' => 'Rack has been deleted.']);
+        } catch (\Exception $e) {
+            return response()->json(['success' => false, 'message' => 'Unable to delete rack.', 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function restore(Request $request)
+    {
+        try {
+            $this->model::query()->where('id', $request->rack_id)->update([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE]);
+            return response()->json(['success' => true, 'message' => 'Rack has been restored.']);
+        } catch (\Exception $e) {
+            return response()->json(['success' => false, 'message' => 'Unable to restore rack.', 'errors' => $e->getMessage()]);
+        }
+    }
+}

app/Http/Controllers/RepaymentController.php

@@ -1,165 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-use App\Enums\RecordStatusEnum;
-use App\Http\Controllers\Helper\GlobalController;
-use App\Models\BaseModel;
-use App\Models\Invoice;
-use App\Models\Repayment;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Session;
-
-class RepaymentController extends Controller
-{
-    protected $model;
-    protected $baseLabId;
-    protected $base;
-    protected $invoiceModel;
-
-
-    public function __construct(){
-        $this->model = new Repayment();
-        $this->invoiceModel = new Invoice();
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
-    }
-
-    public function index(Request $request){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['view_repayment'])) return redirect(url('my-profile'));
-        $recordStatusConditions = Auth::id()==1 ? [RecordStatusEnum::ACTIVE , RecordStatusEnum::DELETE] : [RecordStatusEnum::ACTIVE];
-        $invoices = $this->invoiceModel::with(['sample.patient'])->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
-            ->where('balance','>', 0)->get();
-        $repayments = $this->model::query()
-            ->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
-            ->where('lab_id', $this->baseLabId)
-            ->when(!empty($request->from_date) && !empty($request->to_date), function ($inv) use ($request){
-                $inv->whereBetween('repayment_date',[date('Y-m-d',strtotime($request->from_date)), date('Y-m-d',strtotime($request->to_date))]);
-            })->when(!empty(trim($request->kword)), function ($inv) use($request, $recordStatusConditions){
-                $inv->whereIn('invoice_id', $this->invoiceModel::query()
-                    ->whereRaw("replace(invoice_code, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
-                    ->orWhere('patient_uuid','like','%'.$request->kword.'%')->pluck('id')->toArray()
-                )->where('lab_id', $this->baseLabId)->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusConditions);
-            })->orderBy('repayment_date','desc')->paginate(20);
-        return view('repayment', ['oweInvoices' => $invoices, 'repayments' => $repayments, 'labSettings' => (object) $this->location()]);
-    }
-
-    public function store(Request $request){
-        DB::beginTransaction();
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['create_repayment'])) return false;
-            $data = array(
-                'invoice_id' => $request->invoice_id,
-                'amount_to_pay' => $request->amount_to_pay,
-                'discount' => $request->discount,
-                'amount_after_discount' => $request->amount_after_discount,
-                'discount_type' => $request->discount_type,
-                'cash_repayment_amount' => $request->cash_repayment_amount,
-                'bank_repayment_amount' => $request->bank_repayment_amount,
-                'repayment_date' => date('Y-m-d', strtotime($request->repayment_date)),
-                'payment_method' => $request->payment_method,
-                'bank_name' => $request->bank_name,
-                'transaction_ref' => $request->transaction_ref,
-                'exchange_rate' => $request->exchange_rate,
-                'lab_id' => $this->baseLabId,
-                BaseModel::CREATED_AT => date('Y-m-d H:i:s'),
-                BaseModel::CREATED_BY_FIELD => Auth::id()
-            );
-            $repayment = $this->model::query()->create($data);
-            if($repayment){
-                $invoice = $this->invoiceModel::query()->find($request->invoice_id);
-                $totalRepayment = ($invoice->balance - ($request->cash_repayment_amount + $request->bank_repayment_amount));
-                $invoice->deposit = ($invoice->deposit + $request->cash_repayment_amount);
-                $invoice->bank_deposit = ($invoice->bank_deposit+$request->bank_repayment_amount);
-                $invoice->balance = ($totalRepayment);
-                $invoice->discount = $request->discount;
-                $invoice->save();
-            }
-            else DB::rollBack();
-            DB::commit();
-            return response()->json(['success' => true, 'message' => __('invoice.create_success'), 'data' => $repayment]);
-        } catch (\Exception $e){
-            DB::rollBack();
-            return response()->json(['success' => false, 'message' => $e]);
-        }
-    }
-
-
-    public function update(Request $request){
-        DB::beginTransaction();
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['update_repayment'])) return false;
-            $data = array(
-                'cash_repayment_amount' => $request->cash_repayment_amount,
-                'bank_repayment_amount' => $request->bank_repayment_amount,
-                'repayment_date' => date('Y-m-d', strtotime($request->repayment_date)),
-                'payment_method' => $request->payment_method,
-                'bank_name' => $request->bank_name,
-                'transaction_ref' => $request->transaction_ref,
-                'exchange_rate' => $request->exchange_rate
-            );
-
-            $prevRepayment = $this->model::query()->find($request->uid);
-
-            $repayment = $this->model::query()->where(['id' => $request->uid, 'lab_id' => $this->baseLabId])->update($data);
-            if($repayment){
-
-                $reviseInvoice = $this->invoiceModel::query()->find($request->invoice_id);
-                $totalRepayment = ($reviseInvoice->balance + $prevRepayment->cash_repayment_amount + $prevRepayment->bank_repayment_amount);
-                $reviseInvoice->deposit = (($reviseInvoice->deposit + $prevRepayment->cash_repayment_amount) - $request->cash_repayment_amount);
-                $reviseInvoice->bank_deposit = (($reviseInvoice->bank_deposit + $prevRepayment->bank_repayment_amount) - $request->bank_repayment_amount);
-                $reviseInvoice->balance = $totalRepayment - ($request->cash_repayment_amount + $request->bank_repayment_amount);
-                $reviseInvoice->save();
-            }
-            else DB::rollBack();
-            DB::commit();
-            return response()->json(['success' => true, 'message' => __('invoice.create_success'), 'data' => $repayment]);
-        } catch (\Exception $e){
-            DB::rollBack();
-            return response()->json(['success' => false, 'message' => $e->getMessage()]);
-        }
-    }
-
-    /** Perform by ajax function
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-
-    public function delete(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['delete_repayment'])) return redirect(url('my-profile'));
-            $repayment = $this->model::query()->where(['id' => $request->uid, 'lab_id' => $this->baseLabId])->get()->first();
-            $reviseInvoice = $this->invoiceModel::query()->find($repayment->invoice_id);
-            $totalRepayment = ($reviseInvoice->balance + $repayment->cash_repayment_amount + $repayment->bank_repayment_amount);
-            $reviseInvoice->deposit = ($reviseInvoice->deposit - $repayment->cash_repayment_amount);
-            $reviseInvoice->bank_deposit = ($reviseInvoice->bank_deposit - $repayment->bank_repayment_amount);
-            $reviseInvoice->balance = $totalRepayment;
-            $reviseInvoice->save();
-            $repayment->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE));
-            return response()->json(['success' => true, 'message' => __('invoice.delete_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('invoice.delete_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function get(Request $request){
-        try{
-            $data = $this->model::with(['invoice.sample.patient'])->find($request->uid);
-            return response()->json(['success' => true, 'message' => __('invoice.get_success'), 'data' => $data]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('invoice.get_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function getInvoice(Request $request){
-        try{
-            $data = $this->invoiceModel::query()->find($request->uid);
-            return response()->json(['success' => true, 'message' => __('invoice.get_success'), 'data' => $data]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('invoice.get_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-
-}

app/Http/Controllers/RoleController.php

@@ -19,25 +19,23 @@ class RoleController extends Controller
 
     protected $roleModel;
     protected $roleHasPermission;
-    protected $baseLabId;
+    protected $baseOrganizationId;
     protected $labs;
 
     public function __construct(RoleHasPermission $roleHasPermission, Role $roleModel){
         $this->roleModel = $roleModel;
         $this->roleHasPermission = $roleHasPermission;
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
+        $this->baseOrganizationId = Session::get('base_organization_id');
+        $this->base = Session::get('base_organization');
     }
 
     public function index(Request $request){
         if(!GlobalController::user_can(Auth::user()->role_id, ['view_user_role'])) return redirect(url('my-profile'));
-        $recordStatusCondition = Auth::id()==1 ? [RecordStatusEnum::DELETE, RecordStatusEnum::ACTIVE] : [RecordStatusEnum::ACTIVE];
-        $roles = $this->roleModel::with('lab')->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusCondition)
-            ->where('lab_id', $this->baseLabId)
+        $roles = $this->roleModel::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
             ->whereNotIn('id', [UtilEnum::ADMINISTRATOR_ROLE])
             ->when(!empty($request->kword), function ($roles) use($request){
                 $roles->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
-            })->orderBy(BaseModel::CREATED_AT,'desc')->paginate(config('labis.pagination.perpage', 10));
+            })->orderBy(BaseModel::CREATED_AT,'desc')->paginate(config('nrml.pagination.perpage', 10));
         return view('role', ['roles' => $roles]);
     }
 
@@ -46,7 +44,7 @@ class RoleController extends Controller
             if(!GlobalController::user_can(Auth::user()->role_id, ['create_user_role'])) return false;
             $validator = \Validator::make($request->all(), ['name_en' => 'required']);
             if ($validator->fails()) return response()->json(['success' => false, 'message' => __('system_role.create_fail'), 'errors'=>$validator->errors()->all()]);
-                $new = $this->roleModel::query()->create(['name_en' => $request->name_en, 'lab_id' => $this->baseLabId]);
+                $new = $this->roleModel::query()->create(['name_en' => $request->name_en, 'organization_id' => $this->baseOrganizationId]);
             return response()->json(['success' => true, 'message' => __('system_role.create_success')]);
         } catch (\Exception $e){
             return response()->json(['success' => false, 'message' => __('system_role.create_fail'), 'errors' => $e->getMessage()]);

app/Http/Controllers/RoomController.php

@@ -0,0 +1,146 @@
+<?php
+
+namespace App\Http\Controllers;
+use App\Enums\RecordStatusEnum;
+use App\Http\Controllers\Helper\GlobalController;
+use App\Models\BaseModel;
+use App\Models\Building;
+use App\Models\Concept;
+use App\Models\Room;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+use Illuminate\Support\Facades\Session;
+
+
+class RoomController extends Controller
+{
+    protected $model;
+    protected $baseOrganizationId;
+    protected $buildingModel;
+    protected $conceptModel;
+
+    public function __construct(){
+        $this->baseOrganizationId = Session::get('base_organization_id');
+        $this->base = Session::get('base_organization');
+        $this->model = new Room();
+        $this->buildingModel = new Building();
+        $this->conceptModel = new Concept();
+    }
+
+    public function index(Request $request){
+        $buildings = $this->buildingModel::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->where('organization_id', $this->baseOrganizationId)->get();
+        $concepts = $this->conceptModel::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)->get();
+        $rooms = $this->model::with(['building', 'bsl'])->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->where('organization_id', $this->baseOrganizationId)
+            ->when(!empty($request->kword), function ($query) use($request){
+                $query->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
+                    ->orWhereRaw("replace(name_kh, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
+                    ->orWhereRaw("replace(code, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
+            })->when(!empty(trim($request->building_id)), function ($query) use($request){
+                $query->where('building_id', $request->building_id);
+            })->orderBy(BaseModel::CREATED_AT,'desc')->paginate(config('nrml.pagination.perpage', 10));
+        return view('room', ['rooms' => $rooms, 'buildings' => $buildings, 'concepts' => $concepts]);
+    }
+
+    public function save(Request $request){
+        try {
+
+            $validator = \Validator::make($request->all(), [
+                'name_en' => 'required',
+                'name_kh' => 'required',
+                'building_id' => 'required',
+                'code' => 'required',
+                'biosafety_level_concept_id' => 'required'
+            ]);
+            if ($validator->fails()) {
+                return response()->json(['success' => false, 'message' => __('building.create_fail'), 'errors' => $validator->errors()->all()]);
+            }
+            $data = array(
+                'name_en' => $request->name_en,
+                'name_kh' => $request->name_kh,
+                'code' => $request->code,
+                'description' => $request->description,
+                'building_id' => $request->building_id,
+                'biosafety_level_concept_id' => $request->biosafety_level_concept_id,
+                'temperature_range' => $request->temperature_range,
+                'organization_id' => $this->baseOrganizationId,
+                'created_at' => date('Y-m-d H:i:s'),
+                'created_by' => Auth::id()
+            );
+            $this->model::query()->insert($data);
+            return response()->json(['success' => true, 'message' => __('laboratory.create_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.create_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+
+    public function update(Request $request){
+        try {
+
+            $validator = \Validator::make($request->all(), [
+                'name_en' => 'required',
+                'name_kh' => 'required',
+                'building_id' => 'required',
+                'code' => 'required',
+                'biosafety_level_concept_id' => 'required'
+            ]);
+            if ($validator->fails()) return response()->json(['errors' => $validator->errors()->all()]);
+            $data = array(
+                'name_en' => $request->name_en,
+                'name_kh' => $request->name_kh,
+                'code' => $request->code,
+                'description' => $request->description,
+                'building_id' => $request->building_id,
+                'biosafety_level_concept_id' => $request->biosafety_level_concept_id,
+                'temperature_range' => $request->temperature_range,
+                'updated_at' => date('Y-m-d H:i:s'),
+                'updated_by' => Auth::id()
+            );
+            $this->model::query()->where('id', $request->room_id)->update($data);
+            return response()->json(['success' => true, 'message' => __('laboratory.update_success')]);
+        } catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.update_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function get(Request $request){
+        try{
+            $lab = $this->model::query()->where('id', $request->room_id)->get()->first();
+            return response()->json(['success' => true, 'message' => __('laboratory.get_success'), 'data' => $lab]);
+        } catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.get_fail'), 'errors' => $e->getMessage()]);
+        }
+
+    }
+
+    public function delete(Request $request){
+        try{
+            $this->model::query()->where('id', $request->room_id)->update(array(
+                BaseModel::DELETED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::DELETED_BY_FIELD => Auth::id(),
+                BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE
+            ));
+            return response()->json(['success' => true, 'message' => __('laboratory.delete_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.delete_fail'), 'errors' => $e->getMessage()]);
+        }
+
+    }
+
+    public function restore(Request $request){
+        try{
+            $this->model::query()->where('id', $request->room_id)->update(array(BaseModel::RECORD_STATUS_FIELD=> RecordStatusEnum::ACTIVE));
+            return response()->json(['success' => true, 'message' => __('laboratory.restore_success')]);
+        }
+        catch (\Exception $e){
+            return response()->json(['success' => false, 'message' => __('laboratory.restore_fail'), 'errors' => $e->getMessage()]);
+        }
+    }
+
+
+}

app/Http/Controllers/SampleController.php

@@ -48,7 +48,7 @@ class SampleController extends Controller
     protected $organismResultModel;
     protected $antibioticResultModel;
 
-    protected $baseLabId;
+    protected $baseOrganizationId;
     protected $base;
 
     protected $invoiceModel;
@@ -74,8 +74,8 @@ class SampleController extends Controller
         $this->invoiceDetailModel = $invoiceDetailModel;
         $this->laboratoryConfigures = $laboratoryConfigures;
 
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
+        $this->baseOrganizationId = Session::get('base_organization_id');
+        $this->base = Session::get('base_organization');
     }
 
     public function index(Request $request){
@@ -83,7 +83,7 @@ class SampleController extends Controller
         $recordStatusConditions = Auth::id()==1 ? [RecordStatusEnum::ACTIVE, RecordStatusEnum::DELETE] : [RecordStatusEnum::ACTIVE];
         $samples = $this->model::with(['patient','sample_source'])
             ->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusConditions)
-            ->where('lab_id', $this->baseLabId)
+            ->where('organization_id', $this->baseOrganizationId)
             ->when(Auth::user()->role_id == UtilEnum::PHYSICIAN_ROLE, function($sample){
                 $sample->where('sample_source_id', Auth::user()->sample_source_id);
             })->when(!empty(trim($request->kword)), function ($samples) use($request, $recordStatusConditions){
@@ -92,12 +92,12 @@ class SampleController extends Controller
                     ->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
                     ->orWhereRaw("replace(phone_number, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
                     ->orWhere('patient_uuid','like','%'.$request->kword.'%')->pluck('id')->toArray()
-                )->where('lab_id', $this->baseLabId)->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusConditions);
+                )->where('organization_id', $this->baseOrganizationId)->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusConditions);
             })->when(!empty(trim($request->sample_status)), function ($samples) use($request){
                 $samples->whereIn('id', $this->filterSampleStatus($request->sample_status));
             })->when(!empty($request->sample_date) && empty($request->kword) , function ($samples) use($request){
                 $samples->whereDate('admission_date', date('Y-m-d',strtotime($request->sample_date)));
-            })->orderBy(BaseModel::CREATED_AT_FIELD,'desc')->paginate(config('labis.pagination.perpage', 10));
+            })->orderBy(BaseModel::CREATED_AT_FIELD,'desc')->paginate(config('nrml.pagination.perpage', 10));
         return view('sample', ['samples' => $samples]);
     }
 
@@ -131,10 +131,10 @@ class SampleController extends Controller
                                                 FROM samples s
                                                 LEFT JOIN test_results tr
                                                 ON tr.`sample_id` = s.`id`
-                                                AND s.`lab_id` = tr.`lab_id`
+                                                AND s.`organization_id` = tr.`organization_id`
                                                 LEFT JOIN test_samples ts
                                                 ON ts.id = tr.`test_sample_id`
-                                                AND ts.lab_id = tr.lab_id
+                                                AND ts.organization_id = tr.organization_id
                                                 LEFT JOIN sample_types st
                                                 ON st.id = ts.`sample_type_id`
                                                 LEFT JOIN(
@@ -144,16 +144,16 @@ class SampleController extends Controller
                                                 FROM samples s
                                                 INNER JOIN test_results tr
                                                 ON tr.`sample_id` = s.`id`
-                                                AND s.`lab_id` = tr.`lab_id`
+                                                AND s.`organization_id` = tr.`organization_id`
                                                 INNER JOIN organism_results orgr
                                                 ON orgr.`test_result_id` = tr.`id`
-                                                WHERE s.lab_id = '.$this->baseLabId.'
+                                                WHERE s.organization_id = '.$this->baseOrganizationId.'
                                                 AND tr.`record_status_id` = 1
                                                 AND orgr.`record_status_id` = 1
                                                 GROUP BY tr.id
                                                 ) AS org_result
                                                 ON org_result.id = tr.`id`
-                                                WHERE s.`lab_id` = '.$this->baseLabId.'
+                                                WHERE s.`organization_id` = '.$this->baseOrganizationId.'
                                                 AND s.`record_status_id` = 1
                                                 AND (tr.`record_status_id` = 1 OR tr.`record_status_id` IS NULL)
                                                 AND (st.`record_status_id` = 1 OR st.`record_status_id` IS NULL)
@@ -172,13 +172,13 @@ class SampleController extends Controller
     public function create($patient_id = null){
         if(!GlobalController::user_can(Auth::user()->role_id, ['create_sample'])) return redirect(url('my-profile'));
         $rejectComments = $this->rejectCommentModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->orderBy('reject_comment', 'ASC')->get();
-        $physicians = $this->physicianModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId])->orderBy('name_en', 'ASC')->get();
-        $sampleSources = $this->sampleSourceModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId])->orderBy('name_en','ASC')->get();
-        $patients = $this->patientModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId])
+        $physicians = $this->physicianModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'organization_id' => $this->baseOrganizationId])->orderBy('name_en', 'ASC')->get();
+        $sampleSources = $this->sampleSourceModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'organization_id' => $this->baseOrganizationId])->orderBy('name_en','ASC')->get();
+        $patients = $this->patientModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'organization_id' => $this->baseOrganizationId])
             ->when(!empty($patient_id), function ($patients) use ($patient_id){
-                $patients->where(['id' => $patient_id, 'lab_id' => $this->baseLabId ]);
+                $patients->where(['id' => $patient_id, 'organization_id' => $this->baseOrganizationId ]);
             })->orderBy(BaseModel::CREATED_AT_FIELD, 'DESC')->limit(30)->get();
-        $testGroups = $this->testGroupModel::with(['testGroupDetails'])->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->orderBy('created_at')->get();
+        $testGroups = $this->testGroupModel::with(['testGroupDetails'])->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->orderBy('created_at')->get();
         return view('new_sample', [
             'labSettings' => (object) $this->base,
             'physicians' => $physicians,
@@ -194,7 +194,7 @@ class SampleController extends Controller
     public function generateAutoId($admissionDate){
         $prefix = date('ymd',strtotime($admissionDate));
         $sample = Sample::query();
-        $sampleCount = $sample->where('lab_id', $this->baseLabId)->whereRaw('date(admission_date) ="'. date('Y-m-d',strtotime($admissionDate)).'"')->count();
+        $sampleCount = $sample->where('organization_id', $this->baseOrganizationId)->whereRaw('date(admission_date) ="'. date('Y-m-d',strtotime($admissionDate)).'"')->count();
         return 'S-'.$this->base['short_name'].'-'.$prefix.'-'.(str_pad(($sampleCount+1),3,'0',STR_PAD_LEFT));
     }
 
@@ -202,7 +202,7 @@ class SampleController extends Controller
         DB::beginTransaction();
         try{
             if(!GlobalController::user_can(Auth::user()->role_id, ['create_sample'])) return false;
-            $request = collect($sampleCreateRequest)->merge(['lab_id'=>$this->baseLabId]);
+            $request = collect($sampleCreateRequest)->merge(['organization_id'=>$this->baseOrganizationId]);
             if(empty($sampleCreateRequest->sample_number)) {
                 $sampleNumber = $this->generateAutoId($sampleCreateRequest->admission_date);
                 $request = $request->merge(['sample_number' => $sampleNumber]);
@@ -242,7 +242,7 @@ class SampleController extends Controller
     public function store1(SampleCreateRequest $sampleCreateRequest){
         DB::beginTransaction();
         try{
-            $request = collect($sampleCreateRequest)->merge(['lab_id'=>$this->baseLabId]);
+            $request = collect($sampleCreateRequest)->merge(['organization_id'=>$this->baseOrganizationId]);
             if(empty($sampleCreateRequest->sample_number)) {
 				$sampleNumber = $this->generateAutoId($sampleCreateRequest->admission_date);
                 $request = $request->merge(['sample_number' => $sampleNumber]);
@@ -259,12 +259,12 @@ class SampleController extends Controller
 
     public function edit(Request $request, $id){ // url: base_url/sample/edit/[sample-id]
         if(!GlobalController::user_can(Auth::user()->role_id, ['update_sample'])) return redirect(url('my-profile'));
-        $sample = $this->model::with(['patient'/*'patient.telegramChatId'*/,'invoice'])->where(['lab_id' => $this->baseLabId,'id' => $id])->first();
+        $sample = $this->model::with(['patient'/*'patient.telegramChatId'*/,'invoice'])->where(['organization_id' => $this->baseOrganizationId,'id' => $id])->first();
         $rejectComments = $this->rejectCommentModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->orderBy('reject_comment', 'ASC')->get();
-        $physicians = $this->physicianModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId])->orderBy('name_en', 'ASC')->get();
+        $physicians = $this->physicianModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'organization_id' => $this->baseOrganizationId])->orderBy('name_en', 'ASC')->get();
         $samplePhysician = $this->physicianModel::query()->where('id', $sample->physician_id)->first();
-        $sampleSources = $this->sampleSourceModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId])->orderBy('name_en','ASC')->get();
-        $testGroups = $this->testGroupModel::with(['testGroupDetails'])->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->orderBy('created_at')->get();
+        $sampleSources = $this->sampleSourceModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'organization_id' => $this->baseOrganizationId])->orderBy('name_en','ASC')->get();
+        $testGroups = $this->testGroupModel::with(['testGroupDetails'])->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->orderBy('created_at')->get();
 
         $now = strtotime($sample->admission_date); // or your date as well
         $your_date = strtotime($sample->patient->dob);
@@ -277,10 +277,10 @@ class SampleController extends Controller
 
         $prevSample = [];
         if(isset($_GET['previous_sample'])){
-            $prevSample = $this->model::with(['patient','invoice'])->where(['lab_id' => $this->baseLabId, 'id' => $_GET['previous_sample']])->get();
+            $prevSample = $this->model::with(['patient','invoice'])->where(['organization_id' => $this->baseOrganizationId, 'id' => $_GET['previous_sample']])->get();
         }
 
-        $labConfigures = $this->laboratoryConfigures::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->get()->toArray();
+        $labConfigures = $this->laboratoryConfigures::query()->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->get()->toArray();
 
         $resultTemplateId = (collect($labConfigures)->where('atrribute_code', 'RESULT_TEMPLATE')->pluck('assigned_attribute_value')->first());
         if(!empty($resultTemplateId)){
@@ -314,7 +314,7 @@ class SampleController extends Controller
     }
 
     function getPreviousSample($patientId, $curSampleId){
-        return $this->model::query()->where(['patient_id' => $patientId, 'lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+        return $this->model::query()->where(['patient_id' => $patientId, 'organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
             ->where('id','<', $curSampleId)->orderBy('id', 'desc')->get(['id','admission_date', 'sample_number']);
     }
 
@@ -328,7 +328,7 @@ class SampleController extends Controller
         try{
             if(!GlobalController::user_can(Auth::user()->role_id, ['update_sample'])) return redirect(url('my-profile'));
             $request = collect($sampleUpdateRequest)->except(['id','sample_number','patient_id','_token']);
-            $patientSample = $this->model::query()->where(['id' => $sampleUpdateRequest->id, 'lab_id' => $this->baseLabId])->first();
+            $patientSample = $this->model::query()->where(['id' => $sampleUpdateRequest->id, 'organization_id' => $this->baseOrganizationId])->first();
             $patientSample->update($request->all());
             DB::commit();
             $sampleUpdateRequest->session()->flash('message','Update success.');
@@ -348,7 +348,7 @@ class SampleController extends Controller
     public function delete(Request $request){
         try{
             if(!GlobalController::user_can(Auth::user()->role_id, ['delete_sample'])) return false;
-            $patientSample = $this->model::query()->where(['id' => $request->uid, 'lab_id' => $this->baseLabId])->first();
+            $patientSample = $this->model::query()->where(['id' => $request->uid, 'organization_id' => $this->baseOrganizationId])->first();
             $patientSample->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE));
             return response()->json(['success' => true, 'message' => __('sample.delete_success')]);
         }
@@ -359,7 +359,7 @@ class SampleController extends Controller
 
     public function restore(Request $request){
         try{
-            $patientSample = $this->model::query()->where(['id' => $request->uid, 'lab_id' => $this->baseLabId])->first();
+            $patientSample = $this->model::query()->where(['id' => $request->uid, 'organization_id' => $this->baseOrganizationId])->first();
             $patientSample->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE));
             return response()->json(['success' => true, 'message' => __('sample.restore_success')]);
         }
@@ -371,7 +371,7 @@ class SampleController extends Controller
     public function approve(Request $request){
         try{
             if(!GlobalController::user_can(Auth::user()->role_id, ['approve_result'])) return false;
-            $patientSample = $this->model::query()->where(['id' => $request->uid, 'lab_id' => $this->baseLabId])->first();
+            $patientSample = $this->model::query()->where(['id' => $request->uid, 'organization_id' => $this->baseOrganizationId])->first();
             $patientSample->update(array('approved_by' => Auth::id(), 'approved_date' => date('Y-m-d H:i:s')));
             return response()->json(['success' => true, 'message' => __('sample.approve_success')]);
         }
@@ -388,7 +388,7 @@ class SampleController extends Controller
         DB::beginTransaction();
         try{
             if(!GlobalController::user_can(Auth::user()->role_id, ['create_sample', 'update_sample'])) return false;
-            $this->sampleDetailModel::query()->where(['sample_id' => $sampleCreateRequest->sample_id, 'lab_id' => $this->baseLabId])->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE));
+            $this->sampleDetailModel::query()->where(['sample_id' => $sampleCreateRequest->sample_id, 'organization_id' => $this->baseOrganizationId])->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE));
             $sampleDetails = collect($sampleCreateRequest->sample_details);
             $sampleDetails->map(function ($item){
                 if(!empty($item['sample_description'])){
@@ -398,31 +398,31 @@ class SampleController extends Controller
                         'test_date' => date('Y-m-d'),
                         'lab_technician_id' => Auth::id(),
                         'sample_descr' => $item['sample_description'],
-                        'lab_id' => $this->baseLabId
+                        'organization_id' => $this->baseOrganizationId
                     ]);
                 }
             });
             //dd($sampleCreateRequest->sample_tests);
             if(!empty($sampleCreateRequest->sample_tests)){
-                $this->testResultModel::query()->where(['sample_id' => $sampleCreateRequest->sample_id, 'lab_id' => $this->baseLabId])
+                $this->testResultModel::query()->where(['sample_id' => $sampleCreateRequest->sample_id, 'organization_id' => $this->baseOrganizationId])
                     ->whereNotIn('test_sample_id', $sampleCreateRequest->sample_tests)
                     ->delete();
                 foreach ($sampleCreateRequest->sample_tests as $test){
                     $existingTestResult = $this->testResultModel::query()->where([
                         'test_sample_id' => $test,
-                        'lab_id' => $this->baseLabId,
+                        'organization_id' => $this->baseOrganizationId,
                         'sample_id' =>  $sampleCreateRequest->sample_id
                     ])->get()->toArray();
                     if(empty($existingTestResult)) {
                         $testResult = $this->testResultModel::query()->create([
                             'sample_id' => $sampleCreateRequest->sample_id,
                             'test_sample_id' => $test,
-                            'lab_id' => $this->baseLabId
+                            'organization_id' => $this->baseOrganizationId
                         ]);
                     }
                 }
             }else{
-                $this->testResultModel::query()->where(['sample_id' => $sampleCreateRequest->sample_id, 'lab_id' => $this->baseLabId])->delete();
+                $this->testResultModel::query()->where(['sample_id' => $sampleCreateRequest->sample_id, 'organization_id' => $this->baseOrganizationId])->delete();
             }
 
 
@@ -456,7 +456,7 @@ class SampleController extends Controller
                         'bank_deposit' => 0,
                         'balance' => number_format($grossTotal * ($labSettings->currency==1 ? $labSettings->exchange_rate : 1),2,  '.', ''),
                         'invoice_date' => date('Y-m-d', strtotime($sample->admission_date)),
-                        'lab_id'=>$this->baseLabId,
+                        'organization_id'=>$this->baseOrganizationId,
                         'exchange_rate' => $labSettings->exchange_rate
                     ]);
                     $invoice = $this->invoiceModel::query()->create($invoiceRequest->all());
@@ -524,7 +524,7 @@ class SampleController extends Controller
                 $ref_performed_by = collect($request->ref_test_sample_performer);
                 $ref_test_sample_comment = collect($request->ref_test_sample_comment);
                 $vars = $data->map(function ($val, $key) use($request, $ref_test_sample_id_value, $ref_test_date, $ref_performed_by, $ref_test_sample_comment){
-                    $this->testResultModel::query()->where(['lab_id' => $this->baseLabId, 'sample_id' => $request->sample_id, 'test_sample_id' => $val])->update([
+                    $this->testResultModel::query()->where(['organization_id' => $this->baseOrganizationId, 'sample_id' => $request->sample_id, 'test_sample_id' => $val])->update([
                         'test_result' => @$ref_test_sample_id_value[$key],
                         'test_date' => @$ref_test_date[$key],
                         'performed_by' => @$ref_performed_by[$key],
@@ -540,7 +540,7 @@ class SampleController extends Controller
                 //$ref_performed_by = collect($request->ref_test_sample_performer);
                 $ref_test_sample_comment_ = collect($request->ref_test_sample_comment___);
                 $vars = $datas->map(function ($val_, $key_) use($request, $ref_test_sample_comment_){
-                    $this->testResultModel::query()->where(['lab_id' => $this->baseLabId, 'sample_id' => $request->sample_id, 'test_sample_id' => $val_])->update([
+                    $this->testResultModel::query()->where(['organization_id' => $this->baseOrganizationId, 'sample_id' => $request->sample_id, 'test_sample_id' => $val_])->update([
                         //'test_date' => @$ref_test_date[$key],
                         //'performed_by' => @$ref_performed_by[$key],
                         'comment' => $ref_test_sample_comment_[$key_],
@@ -551,16 +551,16 @@ class SampleController extends Controller
             // set hide test
 
             if(isset($request->test_samples_to_hide)){
-                $this->testResultModel::query()->where(['lab_id' => $this->baseLabId, 'sample_id' => $request->sample_id])
+                $this->testResultModel::query()->where(['organization_id' => $this->baseOrganizationId, 'sample_id' => $request->sample_id])
                     ->whereNotIn('test_sample_id', $request->test_samples_to_hide)->update(['is_show' => 1]);
 
                 foreach ($request->test_samples_to_hide as $val){
-                    $this->testResultModel::query()->where(['lab_id' => $this->baseLabId, 'sample_id' => $request->sample_id, 'test_sample_id' => $val])->update([
+                    $this->testResultModel::query()->where(['organization_id' => $this->baseOrganizationId, 'sample_id' => $request->sample_id, 'test_sample_id' => $val])->update([
                         'is_show' => 0
                     ]);
                 }
             } else{
-                $this->testResultModel::query()->where(['lab_id' => $this->baseLabId, 'sample_id' => $request->sample_id])->update(['is_show' => 1]);
+                $this->testResultModel::query()->where(['organization_id' => $this->baseOrganizationId, 'sample_id' => $request->sample_id])->update(['is_show' => 1]);
             }
 
             // organism result
@@ -575,13 +575,13 @@ class SampleController extends Controller
 
                     // change on 08/Sep/2023 to fixed issue save result success but no data affect
                     //$testResult = $this->testResultModel::query()->where(['test_sample_id' => $org->test_sample_id, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->orderByDesc('id')->limit(1)->first();
-                    $testResult = $this->testResultModel::query()->where(['test_sample_id' => $org->test_sample_id, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId, 'sample_id' => $request->sample_id])->orderByDesc('id')->limit(1)->first();
+                    $testResult = $this->testResultModel::query()->where(['test_sample_id' => $org->test_sample_id, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'organization_id' => $this->baseOrganizationId, 'sample_id' => $request->sample_id])->orderByDesc('id')->limit(1)->first();
 
                     if(count($organismIds)>0){
-                        $this->organismResultModel::query()->where(['test_result_id' => $testResult->id, 'lab_id' => $this->baseLabId])->whereNotIn('organism_id', $organismIds)->update(['record_status_id' => 0]);
+                        $this->organismResultModel::query()->where(['test_result_id' => $testResult->id, 'organization_id' => $this->baseOrganizationId])->whereNotIn('organism_id', $organismIds)->update(['record_status_id' => 0]);
                     }
 
-                    $organismResult = $this->organismResultModel::query()->where(['test_result_id' => $testResult->id, 'organism_id' => $org->organism_id, BaseModel::RECORD_STATUS_FIELD =>RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId])->first();
+                    $organismResult = $this->organismResultModel::query()->where(['test_result_id' => $testResult->id, 'organism_id' => $org->organism_id, BaseModel::RECORD_STATUS_FIELD =>RecordStatusEnum::ACTIVE, 'organization_id' => $this->baseOrganizationId])->first();
                     //$organismResultId = 0;
 
                     if(!empty($organismResult)){
@@ -597,7 +597,7 @@ class SampleController extends Controller
                             'organism_id' => $org->organism_id,
                             'quantity_id' => (int)$org->quantity_id,
                             'contaminant' => $org->contaminant,
-                            'lab_id' => $this->baseLabId,
+                            'organization_id' => $this->baseOrganizationId,
                             BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE,
                             BaseModel::CREATED_AT => date('Y-m-d H:i:s')
                         ]);
@@ -678,10 +678,10 @@ class SampleController extends Controller
                                             FROM samples s
                                             INNER JOIN test_results tr
                                             ON tr.`sample_id` = s.`id`
-                                            AND s.`lab_id` = tr.`lab_id`
+                                            AND s.`organization_id` = tr.`organization_id`
                                             INNER JOIN test_samples ts
                                             ON ts.id = tr.`test_sample_id`
-                                            and ts.lab_id = tr.lab_id
+                                            and ts.organization_id = tr.organization_id
                                             INNER JOIN tests t
                                             ON t.`id` = ts.`test_id`
                                             INNER JOIN sample_types st
@@ -692,7 +692,7 @@ class SampleController extends Controller
                                             ON pct.`test_sample_id` =  ts.`id`
                                             AND pct.`physician_id` = s.`physician_id`
                                             WHERE s.`id` = '.$sampleId.'
-                                            AND s.`lab_id`= '.$this->baseLabId.'
+                                            AND s.`organization_id`= '.$this->baseOrganizationId.'
                                             AND tr.`record_status_id` = '.BaseModel::RECORD_STATUS_ACTIVE.'
                                             AND LENGTH(ts.group_result)>0
                                             AND ts.usd_price>0
@@ -728,7 +728,7 @@ class SampleController extends Controller
     function printRecorder(Request $request){
         DB::beginTransaction();
         try{
-            $patientSample = $this->model::query()->where(['id' => $request->uid, 'lab_id' => $this->baseLabId])->first();
+            $patientSample = $this->model::query()->where(['id' => $request->uid, 'organization_id' => $this->baseOrganizationId])->first();
             if($patientSample->is_printed==0) {
                 $patientSample->update(
                     [
@@ -748,7 +748,7 @@ class SampleController extends Controller
 
     public function generateInvoiceId($invoiceDate){
         $prefix = date('y',strtotime($invoiceDate));
-        $invoiceCount = $this->invoiceModel::query()->where('lab_id', $this->baseLabId)->whereRaw('year(invoice_date) ="'. date('Y',strtotime($invoiceDate)).'"')->count();
+        $invoiceCount = $this->invoiceModel::query()->where('organization_id', $this->baseOrganizationId)->whereRaw('year(invoice_date) ="'. date('Y',strtotime($invoiceDate)).'"')->count();
         return 'I-'.$this->base['short_name'].'-'.$prefix.'-'.(str_pad(($invoiceCount+1),5,'0',STR_PAD_LEFT));
     }
 
@@ -758,8 +758,8 @@ class SampleController extends Controller
         // if(Auth::user()->id==1){
             DB::beginTransaction();
             try{
-                $testResult = $this->testResultModel::query()->where(['test_sample_id' => $testSampleId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId, 'sample_id' => $sampleId])->orderByDesc('id')->limit(1)->first();
-                $organismResult = $this->organismResultModel::query()->where(['test_result_id' => $testResult->id, 'organism_id' => $organismId, BaseModel::RECORD_STATUS_FIELD =>RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId])->first();
+                $testResult = $this->testResultModel::query()->where(['test_sample_id' => $testSampleId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'organization_id' => $this->baseOrganizationId, 'sample_id' => $sampleId])->orderByDesc('id')->limit(1)->first();
+                $organismResult = $this->organismResultModel::query()->where(['test_result_id' => $testResult->id, 'organism_id' => $organismId, BaseModel::RECORD_STATUS_FIELD =>RecordStatusEnum::ACTIVE, 'organization_id' => $this->baseOrganizationId])->first();
                 if(empty($organismResult)){
 
                     $savedOrg = $this->organismResultModel::query()->create([
@@ -767,7 +767,7 @@ class SampleController extends Controller
                     'organism_id' => $organismId,
                     'quantity_id' => 0,
                     'contaminant' => 0,
-                    'lab_id' => $this->baseLabId,
+                    'organization_id' => $this->baseOrganizationId,
                     BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE,
                     BaseModel::CREATED_AT => date('Y-m-d H:i:s')
                     ]);
@@ -787,10 +787,10 @@ class SampleController extends Controller
          //if(Auth::user()->id==1){
             DB::beginTransaction();
             try{
-                $testResult = $this->testResultModel::query()->where(['test_sample_id' => $testSampleId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId, 'sample_id' => $sampleId])->orderByDesc('id')->limit(1)->first();
-                $organismResult = $this->organismResultModel::query()->where(['test_result_id' => $testResult->id, 'organism_id' => $organismId, BaseModel::RECORD_STATUS_FIELD =>RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId])->first();
+                $testResult = $this->testResultModel::query()->where(['test_sample_id' => $testSampleId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'organization_id' => $this->baseOrganizationId, 'sample_id' => $sampleId])->orderByDesc('id')->limit(1)->first();
+                $organismResult = $this->organismResultModel::query()->where(['test_result_id' => $testResult->id, 'organism_id' => $organismId, BaseModel::RECORD_STATUS_FIELD =>RecordStatusEnum::ACTIVE, 'organization_id' => $this->baseOrganizationId])->first();
                 if(!empty($organismResult)){
-                    $savedOrg = $this->organismResultModel::query()->where(['test_result_id' => $testResult->id, 'organism_id' => $organismId,  BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId])
+                    $savedOrg = $this->organismResultModel::query()->where(['test_result_id' => $testResult->id, 'organism_id' => $organismId,  BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'organization_id' => $this->baseOrganizationId])
                     ->update([
                         'quantity_id' => $qtyId
                     ]);
@@ -865,7 +865,7 @@ class SampleController extends Controller
 
     public function updateSampleResultTemplate(Request $request){
         try{
-            $patientSample = $this->model::query()->where(['id' => $request->uid, 'lab_id' => $this->baseLabId])->first();
+            $patientSample = $this->model::query()->where(['id' => $request->uid, 'organization_id' => $this->baseOrganizationId])->first();
             $patientSample->update(['result_template_id' => $request->result_template_id]);
             return response()->json(['success'=> true , 'message' => 'Sample result template already saved!']);
         } catch (\Exception $e){

app/Http/Controllers/SampleSourceController.php

@@ -1,106 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-use App\Enums\RecordStatusEnum;
-use App\Http\Controllers\Helper\GlobalController;
-use App\Models\BaseModel;
-use App\Models\SampleSource;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Session;
-
-class SampleSourceController extends Controller
-{
-
-    protected $sampleSourceModel;
-    protected $baseLabId;
-    protected $base;
-    public function __construct(SampleSource $sampleSourceModel){
-        $this->sampleSourceModel = $sampleSourceModel;
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
-    }
-
-    public function index(Request $request){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['view_sample_source'])) return redirect(url('my-profile'));
-        $sampleSources = $this->sampleSourceModel::with(['lab'])->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
-            ->where('lab_id', $this->baseLabId)
-            ->when(!empty($request->kword), function ($sampleSources) use($request){
-                $sampleSources->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
-            })->orderBy(BaseModel::CREATED_AT,'desc')->paginate(config('labis.pagination.perpage', 10));
-        return view('sample_source', ['sampleSources' => $sampleSources, 'labs' => parent::getAccessAbleLabs()]);
-    }
-
-    public function save(Request $request){
-        try {
-            if(!GlobalController::user_can(Auth::user()->role_id, ['create_sample_source'])) return false;
-            $validator = \Validator::make($request->all(), [
-                'name_en' => 'required',
-                'name_kh' => 'nullable'
-            ]);
-            if ($validator->fails()) return response()->json(['success' => false, 'message' => __('sample_source.create_fail'), 'errors' => $validator->errors()->all()]);
-
-            $new = $this->sampleSourceModel::query()->firstOrNew(['name_en' => $request->name_en, 'lab_id' => $this->baseLabId]);
-            $new->name_en = $request->name_en;
-            $new->is_default = $request->is_default;
-            $new->lab_id = $this->baseLabId;
-            $new->created_at = date('Y-m-d H:i:s');
-            $new->created_by = Auth::id();
-            $new->record_status_id = RecordStatusEnum::ACTIVE;
-            $new->save();
-
-            return response()->json(['success' => true, 'message' => __('sample_source.create_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('sample_source.create_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function update(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['update_sample_source'])) return false;
-            $validator = \Validator::make($request->all(), [ 'name_en' => 'required']);
-            if ($validator->fails()) return response()->json(['success' => false, 'message' => __('sample_source.update_fail'), 'errors' => $validator->errors()->all()]);
-            $data = array(
-                'name_en' => $request->name_en,
-                'name_kh' => $request->name_kh,
-                'is_default' =>$request->is_default,
-                'updated_at' => date('Y-m-d H:i:s'),
-                'updated_by' => Auth::id()
-            );
-            $this->sampleSourceModel::query()->where('id', $request->uid)->update($data);
-            return response()->json(['success' => true, 'message' => __('sample_source.update_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('sample_source.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function get(Request $request){
-        try{
-            $sampleSource = $this->sampleSourceModel::query()->find($request->uid);
-            return response()->json(['success' => true, 'message' => __('sample_source.get_success'), 'data' => $sampleSource]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('sample_source.get_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function delete(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['delete_sample_source'])) return false;
-            $this->sampleSourceModel::query()->where('id', $request->uid)->update(array( BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE));
-            return response()->json(['success' => true, 'message' => __('sample_source.delete_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('sample_source.delete_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function restore(Request $request){
-        try{
-            $this->sampleSourceModel::query()->where('id', $request->uid)->update(array( BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE));
-            return response()->json(['success' => true, 'message' => __('sample_source.restore_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('sample_source.restore_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-
-}

app/Http/Controllers/SampleTypeController.php

@@ -1,133 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-use App\Enums\RecordStatusEnum;
-use App\Http\Controllers\Helper\GlobalController;
-use App\Models\BaseModel;
-use App\Models\Department;
-use App\Models\SampleType;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Session;
-
-class SampleTypeController extends Controller
-{
-
-    protected $model;
-    protected $departmentModel;
-    protected $sampleTypeModel;
-
-    protected $baseLabId;
-    protected $labs;
-
-    public function __construct(Department $departmentModel,SampleType $sampleTypeModel){
-        $this->departmentModel = $departmentModel;
-        $this->sampleTypeModel = $sampleTypeModel;
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
-    }
-
-    public function index(Request $request){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['view_sample_type'])) return redirect(url('my-profile'));
-        $standardSampleTypes = $this->sampleTypeModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'is_standard' => 1])->get(['id','name_en'])->unique('name_en');
-        $departments = $this->departmentModel::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)->where('lab_id', $this->baseLabId)->get();
-        $recordStatusCondition = Auth::id()==1 ? [RecordStatusEnum::DELETE, RecordStatusEnum::ACTIVE] : [RecordStatusEnum::ACTIVE];
-        $sampleTypes = $this->sampleTypeModel::with(['department'=>function($query) {return $query->orderBy('id','ASC');}])->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusCondition)
-            ->where('lab_id', $this->baseLabId)
-            ->when(!empty($request->kword), function ($sampleTypes) use($request, $recordStatusCondition){
-                $sampleTypes->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
-                    ->orWhereIn('department_id', $this->departmentModel::query()
-                        ->where('lab_id', $this->baseLabId)
-                        ->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'")->pluck('id')->toArray()
-                    )->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusCondition);;
-            })->orderBy('weight','ASC')->paginate(config('labis.pagination.perpage', 10));
-        return view('sample-type', ['sampleTypes' => $sampleTypes, 'departments' => $departments, 'standardSampleTypes' => $standardSampleTypes]);
-    }
-
-    public function save(Request $request){
-        try {
-            if(!GlobalController::user_can(Auth::user()->role_id, ['create_sample_type'])) return false;
-            $validator = \Validator::make($request->all(), ['name_en' => 'required', 'department_id' => 'required']);
-            if ($validator->fails()) return response()->json(['success' => false, 'message' => __('sample_type.create_fail'), 'errors' => $validator->errors()->all()]);
-            $new = $this->sampleTypeModel::query()->firstOrNew(['name_en' => $request->name_en, 'department_id' => $request->department_id]);
-            $new->name_en = $request->name_en;
-            $new->weight = $request->weight;
-            $new->tube = $request->tube;
-            $new->bg_color = $request->bg_color;
-            $new->color = $request->color;
-            $new->lab_id = $this->baseLabId;
-            $new->department_id = $request->department_id;
-            $new->enter_form_id = $request->enter_form_id;
-            $new->preview_form_id = $request->preview_form_id;
-            $new->description = is_array($request->description) ? json_encode($request->description) : NULL;
-            $new->save();
-
-            return response()->json(['success' => true, 'message' => __('sample_type.create_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('sample_type.create_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function update(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['update_sample_type'])) return false;
-            $validator = \Validator::make($request->all(), ['uid' => 'required', 'name_en' => 'required' /*,'department_ids' => 'required'*/]);
-            if ($validator->fails()) return response()->json(['success' => false, 'message' => __('sample_type.update_fail'), 'errors' => $validator->errors()->all()]);
-            $data = array(
-                'name_en' => $request->name_en,
-                'weight' => $request->weight,
-                'tube' => $request->tube,
-                'bg_color' => $request->bg_color,
-                'color' => $request->color,
-                'department_id' =>$request->department_id,
-                'enter_form_id' => $request->enter_form_id,
-                'preview_form_id' => $request->preview_form_id,
-                'description' => is_array($request->description) ? json_encode($request->description) : NULL
-            );
-            $this->sampleTypeModel::query()->where('id', $request->uid)->update($data);
-            return response()->json(['success' => true, 'message' => __('sample_type.update_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('sample_type.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function get(Request $request){
-        try{
-            $sampleType = $this->sampleTypeModel::query()->find($request->uid);
-            return response()->json(['success' => true, 'message' => __('sample_type.get_success'), 'data' => $sampleType]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('sample_type.get_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function delete(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['delete_sample_type'])) return false;
-            $this->sampleTypeModel::query()->where('id', $request->uid)->update(array('record_status_id'=> RecordStatusEnum::DELETE));
-            return response()->json(['success' => true, 'message' => __('sample_type.delete_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('sample_type.delete_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function restore(Request $request){
-        try{
-            $this->sampleTypeModel::query()->where('id', $request->uid)->update(array('record_status_id'=> RecordStatusEnum::ACTIVE));
-            return response()->json(['success' => true, 'message' => __('sample_type.restore_success')]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('sample_type.restore_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function getById($id){
-        try{
-            $sampleType = $this->sampleTypeModel::query()->find($id);
-            return response()->json(['success' => true, 'message' => __('sample_type.get_success'), 'data' => $sampleType]);
-        } catch (\Exception $e){
-            return response()->json(['success' => false, 'message' => __('sample_type.get_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-
-
-}

app/Http/Controllers/ShareController.php

@@ -7,7 +7,7 @@ use App\Models\BaseModel;
 use App\Models\Comment;
 use App\Models\Department;
 use App\Models\LabConfigure;
-use App\Models\Laboratory;
+use App\Models\Organization;
 use App\Models\Patient;
 use App\Models\Physician;
 use App\Models\SampleSource;
@@ -50,9 +50,9 @@ class ShareController extends Controller
 
     public function index($id){
         $sample = Sample::with(['patient','invoice'])->where(['id' => $id])->first();
-        $labSettings = Laboratory::query()->find($sample->lab_id);
+        $labSettings = Organization::query()->find($sample->organization_id);
         $samplePhysician = Physician::query()->where('id', $sample->physician_id)->first();
-        $labConfigures = $this->laboratoryConfigures::query()->where(['lab_id' => $sample->lab_id, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->get()->toArray();
+        $labConfigures = $this->laboratoryConfigures::query()->where(['organization_id' => $sample->organization_id, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->get()->toArray();
 
 
         $preview_form_id = ($labSettings->lab_category_id==0? 1:2);
@@ -126,23 +126,23 @@ class ShareController extends Controller
 						                        ifnull(pct.`partner_price`, 0.00) as partner_price,
 						                        ts.weight,
 						                        ts.is_bold,
-						                        ts.lab_id,
+						                        ts.organization_id,
 						                        tr.test_date,
 						                        tr.comment,
 						                        sd.sample_descr
 
                                             FROM samples s
                                             INNER JOIN patients p
-                                            ON p.id = s.patient_id AND p.lab_id = s.lab_id
+                                            ON p.id = s.patient_id AND p.organization_id = s.organization_id
                                             INNER JOIN test_results tr
                                             ON tr.`sample_id` = s.`id`
-                                            AND s.`lab_id` = tr.`lab_id`
+                                            AND s.`organization_id` = tr.`organization_id`
                                             INNER JOIN test_samples ts
                                             ON ts.id = tr.`test_sample_id`
-                                            and ts.lab_id = tr.lab_id
+                                            and ts.organization_id = tr.organization_id
                                             INNER JOIN tests t
                                             ON t.`id` = ts.`test_id`
-                                            /*AND t.`lab_id` = ts.`lab_id`*/
+                                            /*AND t.`organization_id` = ts.`organization_id`*/
                                             INNER JOIN sample_types st
                                             ON st.`id` = ts.`sample_type_id`
                                             INNER JOIN departments d
@@ -226,7 +226,7 @@ class ShareController extends Controller
                     'str_comment' => (string) $row->comment,
                     'is_bold' => (int) $row->is_bold,
                     'ts' => $row->test_result,
-                    'lab_id' => $row->lab_id,
+                    'organization_id' => $row->organization_id,
                     'format' => (int)$row->format
                 );
                 //dd($testItemArray);
@@ -375,7 +375,7 @@ class ShareController extends Controller
      */
 
     public function startAnonymousSession($hashLabId){
-        $this->base = Laboratory::query()->where(BaseModel::RECORD_STATUS_FIELD, BaseModel::RECORD_STATUS_ACTIVE)
+        $this->base = Organization::query()->where(BaseModel::RECORD_STATUS_FIELD, BaseModel::RECORD_STATUS_ACTIVE)
             ->where('allow_external_request', 1)
             ->whereRaw('MD5(id)="'.$hashLabId.'"')->first();
           $provinces = Province::where('id','<>', 25)->orderBy('name_kh')->get();
@@ -387,8 +387,8 @@ class ShareController extends Controller
         $patients = [];
         if(!empty(trim($request->term))){
         $patients = $this->patientModel::query()
-            ->where(['record_status_id' => 1, 'lab_id' => $labId])
-            //->whereRaw('MD5(lab_id)="'.$hashLabId.'"')
+            ->where(['record_status_id' => 1, 'organization_id' => $labId])
+            //->whereRaw('MD5(organization_id)="'.$hashLabId.'"')
             ->when(!empty(trim($request->term)), function ($patients) use($request){
                 $patients->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->term)."%'");
                 //->orWhereRaw("replace(phone_number, ' ','') like '%".str_replace(" ","",$request->term)."%'");
@@ -404,7 +404,7 @@ class ShareController extends Controller
         $patients = [];
         if(!empty(trim($request->term))){
         $patients = $this->patientModel::query()
-            ->where(['record_status_id' => 1, 'lab_id' => $labId])
+            ->where(['record_status_id' => 1, 'organization_id' => $labId])
             ->when(!empty(trim($request->term)), function ($patients) use($request){
                 $patients->whereRaw("replace(phone_number, ' ','') like '%".str_replace(" ","",$request->term)."%'");
             })->limit(3)->orderBy('phone_number', 'asc')->get();
@@ -438,13 +438,13 @@ class ShareController extends Controller
 					'name_en'=> $patient_name
                 ]);
 
-            $patientNumber = $this->generateAutoId(date('Y-m-d'), $request->short_name, $request->lab_id);
+            $patientNumber = $this->generateAutoId(date('Y-m-d'), $request->short_name, $request->organization_id);
             $requests = $requests->merge(['patient_uuid' => $patientNumber]);
             $patient = $this->patientModel::query()->create($requests->all());
             DB::commit();
 
             $request->session()->put('anonymous_id', $patient->id);
-            $request->session()->put('base_lab_id', $patient->lab_id);
+            $request->session()->put('base_organization_id', $patient->organization_id);
             if ($request->session()->has('anonymous_id')) {
                 return redirect(url('customer/'.$hashLabId.'?request-test'));
             }
@@ -459,7 +459,7 @@ class ShareController extends Controller
 
     public function generateAutoId($admissionDate, $labShortName, $labId){
         $prefix = date('y',strtotime($admissionDate));
-        $patientCount = $this->patientModel::query()->where('lab_id', $labId)->whereRaw('year(created_at) ="'. date('Y',strtotime($admissionDate)).'"')->count();
+        $patientCount = $this->patientModel::query()->where('organization_id', $labId)->whereRaw('year(created_at) ="'. date('Y',strtotime($admissionDate)).'"')->count();
         if($labId==34) $patientCount = $patientCount+5; // solve problem when delete patient
         return 'P-'.$labShortName.'-'.$prefix.'-'.(str_pad(($patientCount+1),5,'0',STR_PAD_LEFT));
     }
@@ -472,7 +472,7 @@ class ShareController extends Controller
         $pattern = '/ /i';
         $phoneNumber = $request->phone_number;// preg_replace($pattern, '', trim($request->phone_number));
         $patient = $this->patientModel::query()->where(BaseModel::RECORD_STATUS_FIELD, BaseModel::RECORD_STATUS_ACTIVE)
-            ->whereRaw('MD5(lab_id)="'.$hashLabId.'"')
+            ->whereRaw('MD5(organization_id)="'.$hashLabId.'"')
             ->when(!empty($request->phone_number) && empty($request->patient_id), function($patient) use($request){
                  $patient->whereRaw("replace(phone_number, ' ','') = '".str_replace(" ","",$request->phone_number)."'");
             })->when(!empty($request->patient_id), function($patient) use($request){
@@ -485,7 +485,7 @@ class ShareController extends Controller
         }
         else{
             $request->session()->put('anonymous_id', $patient->id);
-            $request->session()->put('base_lab_id', $patient->lab_id);
+            $request->session()->put('base_organization_id', $patient->organization_id);
             if ($request->session()->has('anonymous_id')) {
                 return redirect(url('customer/'.$hashLabId));
             }
@@ -495,7 +495,7 @@ class ShareController extends Controller
     public function anonymousLogOut(Request $request, $hashLabId){
         if ($request->session()->has('anonymous_id')) {
             $request->session()->forget('anonymous_id');
-            $request->session()->forget('base_lab_id');
+            $request->session()->forget('base_organization_id');
             return redirect(url('anonymous/'.$hashLabId));
         }
     }
@@ -507,16 +507,16 @@ class ShareController extends Controller
         }
         $patient = $this->patientModel::query()
             ->where(['id' => $request->session()->get('anonymous_id'), BaseModel::RECORD_STATUS_FIELD => BaseModel::RECORD_STATUS_ACTIVE])
-            ->whereRaw('MD5(lab_id)="'.$hashLabId.'"')->first();
-        $this->base = Laboratory::query()->where(BaseModel::RECORD_STATUS_FIELD, BaseModel::RECORD_STATUS_ACTIVE)
+            ->whereRaw('MD5(organization_id)="'.$hashLabId.'"')->first();
+        $this->base = Organization::query()->where(BaseModel::RECORD_STATUS_FIELD, BaseModel::RECORD_STATUS_ACTIVE)
             ->whereRaw('MD5(id)="'.$hashLabId.'"')->first();
         $samples = $this->sampleModel::query()->where(BaseModel::RECORD_STATUS_FIELD, BaseModel::RECORD_STATUS_ACTIVE)
             ->where('patient_id', $request->session()->get('anonymous_id'))
-            ->whereRaw('MD5(lab_id)="'.$hashLabId.'"')->orderBy(BaseModel::CREATED_AT_FIELD,'desc')->paginate(5);
+            ->whereRaw('MD5(organization_id)="'.$hashLabId.'"')->orderBy(BaseModel::CREATED_AT_FIELD,'desc')->paginate(5);
         $testGroups = $this->testGroupModel::with(['testGroupDetails'])->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
-            ->whereRaw('MD5(lab_id)="'.$hashLabId.'"')->orderBy('created_at')->get();
+            ->whereRaw('MD5(organization_id)="'.$hashLabId.'"')->orderBy('created_at')->get();
         $physicians = $this->physicianModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
-            ->whereRaw('MD5(lab_id)="'.$hashLabId.'"')->orderBy('name_en')->get();
+            ->whereRaw('MD5(organization_id)="'.$hashLabId.'"')->orderBy('name_en')->get();
         return view('shared.patient_profile',
             [
                 'patient' => $patient,
@@ -537,8 +537,8 @@ class ShareController extends Controller
             return redirect(url('anonymous/'.$hashLabId));
         }
         $sample = $this->sampleModel::with(['patient','invoice'])->where(BaseModel::RECORD_STATUS_FIELD, BaseModel::RECORD_STATUS_ACTIVE)
-        ->whereRaw('MD5(lab_id)="'.$hashLabId.'" AND MD5(id)="'.$hashSampleId.'"')->first();
-        $this->base = Laboratory::query()->where(BaseModel::RECORD_STATUS_FIELD, BaseModel::RECORD_STATUS_ACTIVE)
+        ->whereRaw('MD5(organization_id)="'.$hashLabId.'" AND MD5(id)="'.$hashSampleId.'"')->first();
+        $this->base = Organization::query()->where(BaseModel::RECORD_STATUS_FIELD, BaseModel::RECORD_STATUS_ACTIVE)
             ->whereRaw('MD5(id)="'.$hashLabId.'"')->first();
         $labConfigures = $this->laboratoryConfigures::query()
             ->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
@@ -564,20 +564,20 @@ class ShareController extends Controller
         DB::beginTransaction();
         try{
             $sample = $this->sampleModel::query()->where(BaseModel::RECORD_STATUS_FIELD, BaseModel::RECORD_STATUS_ACTIVE)
-                ->whereRaw('MD5(lab_id)="'.$hashLabId.'" AND MD5(id)="'.$hashSampleId.'"')->first();
+                ->whereRaw('MD5(organization_id)="'.$hashLabId.'" AND MD5(id)="'.$hashSampleId.'"')->first();
 
             $requestedSample = [];
             if(!empty($sample)){
                 $reSampleArray = array(
                     'patient_id' => $sample->patient_id,
-                    'sample_number' => $this->generateSampleNumber($sample->lab_id, date('Y-m-d H:i:s')),
+                    'sample_number' => $this->generateSampleNumber($sample->organization_id, date('Y-m-d H:i:s')),
                     'admission_date' => date('Y-m-d H:i:s'),
                     'sample_source_id' => $sample->sample_source_id,
                     'physician_id' => $sample->physician_id,
                     'requested_date' => date('Y-m-d H:i:s'),
                     'collected_date' => date('Y-m-d H:i:s'),
                     'is_accept_request' => 0,
-                    'lab_id' => $sample->lab_id,
+                    'organization_id' => $sample->organization_id,
                     'created_at' => date('Y-m-d H:i:s'),
                     'created_by' => $sample->patient_id,
                 );
@@ -586,7 +586,7 @@ class ShareController extends Controller
                 $previousTests = $this->testResultModel::query()->where([
                     BaseModel::RECORD_STATUS_FIELD => BaseModel::RECORD_STATUS_ACTIVE,
                     'sample_id' => $sample->id,
-                    'lab_id' => $sample->lab_id
+                    'organization_id' => $sample->organization_id
                 ])->get();
                 if(!empty($requestedSample) && !empty($previousTests)){
                     $items = [];
@@ -597,7 +597,7 @@ class ShareController extends Controller
                             'test_result' => NULL,
                             'created_at' => date('Y-m-d H:i:s'),
                             'created_by' => $sample->patient_id,
-                            'lab_id' => $previousItem->lab_id
+                            'organization_id' => $previousItem->organization_id
                         );
                     }
                     $this->testResultModel::query()->insert($items);
@@ -612,11 +612,11 @@ class ShareController extends Controller
     }
 
     public function generateSampleNumber($labId, $admissionDate){
-        $this->base = Laboratory::query()->where(BaseModel::RECORD_STATUS_FIELD, BaseModel::RECORD_STATUS_ACTIVE)
+        $this->base = Organization::query()->where(BaseModel::RECORD_STATUS_FIELD, BaseModel::RECORD_STATUS_ACTIVE)
             ->where('id', $labId)->first();
         $prefix = date('ymd',strtotime($admissionDate));
         $sample = Sample::query();
-        $sampleCount = $sample->where('lab_id', $labId)->whereRaw('date(admission_date) ="'. date('Y-m-d',strtotime($admissionDate)).'"')->count();
+        $sampleCount = $sample->where('organization_id', $labId)->whereRaw('date(admission_date) ="'. date('Y-m-d',strtotime($admissionDate)).'"')->count();
         return 'S-'.$this->base['short_name'].'-'.$prefix.'-'.(str_pad(($sampleCount+1),3,'0',STR_PAD_LEFT));
     }
 
@@ -624,7 +624,7 @@ class ShareController extends Controller
     function getTestItem(Request $request){
         try{
             $departments = $this->departmentModel::with(['samples','samples.testSamples.test','samples.testSamples.childTest'])
-                ->where(['lab_id' => $request->session()->get('base_lab_id'), BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+                ->where(['organization_id' => $request->session()->get('base_organization_id'), BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
                 ->orderBy('weight', 'asc')->get();
             return response()->json(['success'=> true , 'data' => SampleTestResource::collection($departments)]);
         } catch (\Exception $e){
@@ -641,11 +641,11 @@ class ShareController extends Controller
         DB::beginTransaction();
         try{
 
-            $labId = $sampleCreateRequest->session()->get('base_lab_id');
+            $labId = $sampleCreateRequest->session()->get('base_organization_id');
             $patientId = $sampleCreateRequest->session()->get('anonymous_id');
 
-            $sampleSourceId = SampleSource::where(['lab_id' => $labId, 'is_default' => 1, 'record_status_id' => 1])->get()->first();
-            //$physicianId = Physician::where(['lab_id' => $labId, 'is_default' => 1, 'record_status_id' => 1])->get()->first();
+            $sampleSourceId = SampleSource::where(['organization_id' => $labId, 'is_default' => 1, 'record_status_id' => 1])->get()->first();
+            //$physicianId = Physician::where(['organization_id' => $labId, 'is_default' => 1, 'record_status_id' => 1])->get()->first();
 
             // create sample first
             $sampleRequest = array(
@@ -658,17 +658,17 @@ class ShareController extends Controller
                 'received_date' => date('Y-m-d H:i:s'),
                 'collected_date' => date('Y-m-d H:i:s'),
                 'is_accept_request' => 0,
-                'lab_id' => $labId,
+                'organization_id' => $labId,
                 'created_at' => date('Y-m-d H:i:s'),
                 'created_by' => $patientId,
             );
 
             $requestedSample = $this->sampleModel::query()->create($sampleRequest);
 
-            //$this->sampleDetailModel::query()->where(['sample_id' => $requestedSample->id, 'lab_id' => $labId])->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE));
+            //$this->sampleDetailModel::query()->where(['sample_id' => $requestedSample->id, 'organization_id' => $labId])->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE));
             if(!empty($requestedSample)) {
                 if (!empty($sampleCreateRequest->sample_tests)) {
-                    /*$this->testResultModel::query()->where(['sample_id' => $requestedSample->id, 'lab_id' => $labId])
+                    /*$this->testResultModel::query()->where(['sample_id' => $requestedSample->id, 'organization_id' => $labId])
                         ->whereNotIn('test_sample_id', $sampleCreateRequest->sample_tests)
                         ->delete();*/
                     foreach ($sampleCreateRequest->sample_tests as $test) {
@@ -677,12 +677,12 @@ class ShareController extends Controller
                             'test_sample_id' => $test,
                             'created_at' => date('Y-m-d H:i:s'),
                             'created_by' => $patientId,
-                            'lab_id' => $labId,
+                            'organization_id' => $labId,
                         ]);
                     }
                 }
                 /*else {
-                    $this->testResultModel::query()->where(['sample_id' => $sampleCreateRequest->sample_id, 'lab_id' => $this->baseLabId])->delete();
+                    $this->testResultModel::query()->where(['sample_id' => $sampleCreateRequest->sample_id, 'organization_id' => $this->baseOrganizationId])->delete();
                 }*/
             }
 
@@ -697,7 +697,7 @@ class ShareController extends Controller
 
     public function getTestGroup($id, $labId){
         try{
-            $testGroupItems = $this->testGroupDetailModel::query()->where(['test_group_id' => $id, 'lab_id' => $labId, 'record_status_id'=> 1])->get()->pluck('test_sample_id')->toArray();
+            $testGroupItems = $this->testGroupDetailModel::query()->where(['test_group_id' => $id, 'organization_id' => $labId, 'record_status_id'=> 1])->get()->pluck('test_sample_id')->toArray();
             return response()->json(['success' => true, 'data' => $testGroupItems]);
         } catch (\Exception $e)
         {

app/Http/Controllers/StoragePositionController.php

@@ -0,0 +1,472 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Enums\RecordStatusEnum;
+use App\Models\AliqoutMovement;
+use App\Models\Aliquot;
+use App\Models\AliquotTransaction;
+use App\Models\BaseModel;
+use App\Models\Box;
+use App\Models\ContainerType;
+use App\Models\Pathogen;
+use App\Models\PathogenInventorySample;
+use App\Models\Position;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Session;
+
+class StoragePositionController extends Controller
+{
+    protected $baseOrganizationId;
+    protected $base;
+
+    public function __construct()
+    {
+        $this->baseOrganizationId = Session::get('base_organization_id');
+        $this->base = Session::get('base_organization');
+    }
+
+    public function index(Box $box)
+    {
+        $box->load(['rack.equipment.room.building']);
+
+        $positions = Position::with(['aliquot.sample.pathogen', 'aliquot.containerType.containerName'])
+            ->where('box_id', $box->id)
+            ->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->orderBy('row_label')
+            ->orderByRaw('CAST(column_label AS UNSIGNED)')
+            ->get();
+
+        $samples = PathogenInventorySample::with(['pathogen'])
+            ->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->where('organization_id', $this->baseOrganizationId)
+            ->orderBy(BaseModel::CREATED_AT_FIELD, 'desc')
+            ->limit(200)
+            ->get();
+
+        $pathogens = Pathogen::with(['riskGroup', 'bsl'])
+            ->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->orderBy('scientific_name')
+            ->get();
+
+        $containerTypes = ContainerType::with(['containerName'])
+            ->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->get();
+
+        $emptyPositions = Position::with(['box.rack.equipment.room.building'])
+            ->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->where('occupied', 0)
+            ->orderByRaw('box_id = ? DESC', [$box->id])
+            ->orderBy('box_id')
+            ->orderBy('row_label')
+            ->orderByRaw('CAST(column_label AS UNSIGNED)')
+            ->get();
+
+        $recentMovements = AliqoutMovement::with([
+                'aliquot.sample.pathogen',
+                'fromPosition.box.rack.equipment.room.building',
+                'toPosition.box.rack.equipment.room.building',
+            ])
+            ->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->where(function ($query) use ($box) {
+                $query->whereHas('fromPosition', function ($query) use ($box) {
+                    $query->where('box_id', $box->id);
+                })->orWhereHas('toPosition', function ($query) use ($box) {
+                    $query->where('box_id', $box->id);
+                });
+            })
+            ->orderBy(BaseModel::CREATED_AT_FIELD, 'desc')
+            ->limit(10)
+            ->get();
+
+        return view('box_positions', [
+            'box' => $box,
+            'positions' => $positions,
+            'samples' => $samples,
+            'pathogens' => $pathogens,
+            'containerTypes' => $containerTypes,
+            'emptyPositions' => $emptyPositions,
+            'recentMovements' => $recentMovements,
+        ]);
+    }
+
+    public function generate(Request $request)
+    {
+        $request->validate(['box_id' => 'required']);
+
+        try {
+            $box = Box::query()->findOrFail($request->box_id);
+
+            if ($box->rows < 1 || $box->columns < 1) {
+                return response()->json(['success' => false, 'message' => 'Box rows and columns must be configured before generating positions.']);
+            }
+
+            DB::beginTransaction();
+
+            for ($row = 1; $row <= $box->rows; $row++) {
+                $rowLabel = $this->rowLabel($row);
+
+                for ($column = 1; $column <= $box->columns; $column++) {
+                    Position::query()->firstOrCreate(
+                        [
+                            'box_id' => $box->id,
+                            'row_label' => $rowLabel,
+                            'column_label' => (string) $column,
+                        ],
+                        [
+                            'code' => $rowLabel . $column,
+                            'occupied' => 0,
+                            BaseModel::CREATED_AT_FIELD => date('Y-m-d H:i:s'),
+                            BaseModel::CREATED_BY_FIELD => Auth::id(),
+                            BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE,
+                        ]
+                    );
+                }
+            }
+
+            DB::commit();
+
+            return response()->json(['success' => true, 'message' => 'Box positions generated successfully.']);
+        } catch (\Exception $e) {
+            DB::rollBack();
+            return response()->json(['success' => false, 'message' => 'Unable to generate box positions.', 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function storeAliquot(Request $request)
+    {
+        try {
+            $validator = \Validator::make($request->all(), [
+                'storage_position_id' => 'required',
+                'aliquot_number' => 'required',
+                'initial_volume' => 'required|numeric|min:0',
+                'remaining_volume' => 'required|numeric|min:0',
+                'volume_unit' => 'required',
+                'status' => 'required',
+            ]);
+
+            if ($validator->fails()) {
+                return response()->json(['success' => false, 'message' => 'Unable to save aliquot.', 'errors' => $validator->errors()->all()]);
+            }
+
+            $position = Position::with(['aliquot'])->findOrFail($request->storage_position_id);
+            if (!empty($position->aliquot)) {
+                return response()->json(['success' => false, 'message' => 'This position is already occupied. Remove or transfer the current aliquot first.']);
+            }
+
+            DB::beginTransaction();
+
+            $sampleId = $request->sample_id;
+            if (empty($sampleId) && !empty($request->pathogen_id)) {
+                $sampleId = PathogenInventorySample::query()->insertGetId([
+                    'organization_id' => $this->baseOrganizationId,
+                    'pathogen_id' => $request->pathogen_id,
+                    'sample_code' => $request->sample_code ?: $request->aliquot_number,
+                    'initial_volume' => $request->initial_volume,
+                    'remaining_volume' => $request->remaining_volume,
+                    'volume_unit' => $request->volume_unit,
+                    'status' => 'Stored',
+                    BaseModel::CREATED_AT_FIELD => date('Y-m-d H:i:s'),
+                    BaseModel::CREATED_BY_FIELD => Auth::id(),
+                    BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE,
+                ]);
+            }
+
+            $aliquotId = Aliquot::query()->insertGetId([
+                'sample_id' => $sampleId,
+                'container_type_id' => $request->container_type_id,
+                'aliquot_number' => $request->aliquot_number,
+                'initial_volume' => $request->initial_volume,
+                'remaining_volume' => $request->remaining_volume,
+                'volume_unit' => $request->volume_unit,
+                'concentration' => $request->concentration,
+                'storage_position_id' => $request->storage_position_id,
+                'expiry_date' => !empty($request->expiry_date) ? date('Y-m-d H:i:s', strtotime($request->expiry_date)) : null,
+                'status' => $request->status,
+                'last_accessed_at' => date('Y-m-d H:i:s'),
+                'description' => $request->description,
+                BaseModel::CREATED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::CREATED_BY_FIELD => Auth::id(),
+                BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE,
+            ]);
+
+            $position->update([
+                'occupied' => 1,
+                BaseModel::UPDATED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::UPDATED_BY_FIELD => Auth::id(),
+            ]);
+
+            AliqoutMovement::query()->insert([
+                'aliquot_id' => $aliquotId,
+                'from_position_id' => null,
+                'to_position_id' => $request->storage_position_id,
+                'movement_reason' => 'Initial storage placement',
+                'moved_by' => optional(Auth::user())->name ?? optional(Auth::user())->email ?? (string) Auth::id(),
+                BaseModel::CREATED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::CREATED_BY_FIELD => Auth::id(),
+                BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE,
+            ]);
+
+            DB::commit();
+
+            return response()->json(['success' => true, 'message' => 'Aliquot placed in storage position.']);
+        } catch (\Exception $e) {
+            DB::rollBack();
+            return response()->json(['success' => false, 'message' => 'Unable to save aliquot.', 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function removeAliquot(Request $request)
+    {
+        try {
+            $validator = \Validator::make($request->all(), [
+                'aliquot_id' => 'required',
+            ]);
+
+            if ($validator->fails()) {
+                return response()->json(['success' => false, 'message' => 'Unable to remove aliquot.', 'errors' => $validator->errors()->all()]);
+            }
+
+            $aliquot = Aliquot::query()->findOrFail($request->aliquot_id);
+
+            DB::beginTransaction();
+
+            $positionId = $aliquot->storage_position_id;
+            $aliquot->update([
+                'status' => 'Removed',
+                BaseModel::DELETED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::DELETED_BY_FIELD => Auth::id(),
+                BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE,
+            ]);
+
+            Position::query()->where('id', $positionId)->update([
+                'occupied' => 0,
+                BaseModel::UPDATED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::UPDATED_BY_FIELD => Auth::id(),
+            ]);
+
+            AliqoutMovement::query()->insert([
+                'aliquot_id' => $aliquot->id,
+                'from_position_id' => $positionId,
+                'to_position_id' => null,
+                'movement_reason' => $request->movement_reason ?: 'Removed from storage',
+                'moved_by' => optional(Auth::user())->name ?? optional(Auth::user())->email ?? (string) Auth::id(),
+                BaseModel::CREATED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::CREATED_BY_FIELD => Auth::id(),
+                BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE,
+            ]);
+
+            DB::commit();
+
+            return response()->json(['success' => true, 'message' => 'Aliquot removed from this position.']);
+        } catch (\Exception $e) {
+            DB::rollBack();
+            return response()->json(['success' => false, 'message' => 'Unable to remove aliquot.', 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function moveAliquot(Request $request)
+    {
+        try {
+            $validator = \Validator::make($request->all(), [
+                'aliquot_id' => 'required',
+                'to_position_id' => 'required',
+                'movement_reason' => 'required',
+            ]);
+
+            if ($validator->fails()) {
+                return response()->json(['success' => false, 'message' => 'Unable to move aliquot.', 'errors' => $validator->errors()->all()]);
+            }
+
+            $aliquot = Aliquot::query()
+                ->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+                ->findOrFail($request->aliquot_id);
+
+            $fromPositionId = $aliquot->storage_position_id;
+            $toPosition = Position::with(['aliquot'])->findOrFail($request->to_position_id);
+
+            if ((int) $fromPositionId === (int) $toPosition->id) {
+                return response()->json(['success' => false, 'message' => 'The aliquot is already in that position.']);
+            }
+
+            if (!empty($toPosition->aliquot) || (int) $toPosition->occupied === 1) {
+                return response()->json(['success' => false, 'message' => 'Target position is occupied. Choose an empty position.']);
+            }
+
+            DB::beginTransaction();
+
+            Position::query()->where('id', $fromPositionId)->update([
+                'occupied' => 0,
+                BaseModel::UPDATED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::UPDATED_BY_FIELD => Auth::id(),
+            ]);
+
+            Position::query()->where('id', $toPosition->id)->update([
+                'occupied' => 1,
+                BaseModel::UPDATED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::UPDATED_BY_FIELD => Auth::id(),
+            ]);
+
+            $aliquot->update([
+                'storage_position_id' => $toPosition->id,
+                'last_accessed_at' => date('Y-m-d H:i:s'),
+                BaseModel::UPDATED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::UPDATED_BY_FIELD => Auth::id(),
+            ]);
+
+            AliqoutMovement::query()->insert([
+                'aliquot_id' => $aliquot->id,
+                'from_position_id' => $fromPositionId,
+                'to_position_id' => $toPosition->id,
+                'movement_reason' => $request->movement_reason,
+                'moved_by' => optional(Auth::user())->name ?? optional(Auth::user())->email ?? (string) Auth::id(),
+                BaseModel::CREATED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::CREATED_BY_FIELD => Auth::id(),
+                BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE,
+            ]);
+
+            DB::commit();
+
+            return response()->json(['success' => true, 'message' => 'Aliquot moved successfully.']);
+        } catch (\Exception $e) {
+            DB::rollBack();
+            return response()->json(['success' => false, 'message' => 'Unable to move aliquot.', 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function movementHistory(Request $request)
+    {
+        try {
+            $validator = \Validator::make($request->all(), [
+                'aliquot_id' => 'required',
+            ]);
+
+            if ($validator->fails()) {
+                return response()->json(['success' => false, 'message' => 'Unable to retrieve movement history.', 'errors' => $validator->errors()->all()]);
+            }
+
+            $movements = AliqoutMovement::with([
+                    'fromPosition.box.rack.equipment.room.building',
+                    'toPosition.box.rack.equipment.room.building',
+                ])
+                ->where('aliquot_id', $request->aliquot_id)
+                ->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+                ->orderBy(BaseModel::CREATED_AT_FIELD, 'desc')
+                ->get()
+                ->map(function ($movement) {
+                    return [
+                        'from' => $this->positionLabel($movement->fromPosition),
+                        'to' => $this->positionLabel($movement->toPosition),
+                        'reason' => $movement->movement_reason,
+                        'moved_by' => $movement->moved_by,
+                        'moved_at' => $movement->created_at,
+                    ];
+                });
+
+            return response()->json(['success' => true, 'message' => 'Movement history retrieved.', 'data' => $movements]);
+        } catch (\Exception $e) {
+            return response()->json(['success' => false, 'message' => 'Unable to retrieve movement history.', 'errors' => $e->getMessage()]);
+        }
+    }
+
+    public function useVolume(Request $request)
+    {
+        try {
+            $validator = \Validator::make($request->all(), [
+                'aliquot_id' => 'required',
+                'used_volume' => 'required|numeric|min:0.01',
+                'use_reason' => 'required',
+            ]);
+
+            if ($validator->fails()) {
+                return response()->json(['success' => false, 'message' => 'Unable to record aliquot use.', 'errors' => $validator->errors()->all()]);
+            }
+
+            $aliquot = Aliquot::query()
+                ->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+                ->findOrFail($request->aliquot_id);
+
+            $sourceVolume = (float) $aliquot->remaining_volume;
+            $usedVolume = (float) $request->used_volume;
+
+            if ($usedVolume > $sourceVolume) {
+                return response()->json(['success' => false, 'message' => 'Used volume cannot be greater than remaining volume.']);
+            }
+
+            $remainingVolume = $sourceVolume - $usedVolume;
+
+            DB::beginTransaction();
+
+            $aliquot->update([
+                'remaining_volume' => $remainingVolume,
+                'status' => $remainingVolume <= 0 ? 'Consumed' : $aliquot->status,
+                'last_accessed_at' => date('Y-m-d H:i:s'),
+                BaseModel::UPDATED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::UPDATED_BY_FIELD => Auth::id(),
+            ]);
+
+            AliquotTransaction::query()->insert([
+                'aliquot_id' => $aliquot->id,
+                'transaction_at' => date('Y-m-d H:i:s'),
+                'performed_by' => optional(Auth::user())->name ?? optional(Auth::user())->email ?? (string) Auth::id(),
+                'source_volumn' => $sourceVolume,
+                'affected_volume' => $usedVolume,
+                'remaining_volume' => $remainingVolume,
+                'volume_unit' => $aliquot->volume_unit,
+                'storage_position_id' => $aliquot->storage_position_id,
+                'reference_number' => $request->reference_number,
+                'description' => $request->use_reason,
+                'state' => 'approved',
+                BaseModel::CREATED_AT_FIELD => date('Y-m-d H:i:s'),
+                BaseModel::CREATED_BY_FIELD => Auth::id(),
+                BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE,
+            ]);
+
+            DB::commit();
+
+            return response()->json(['success' => true, 'message' => 'Aliquot use recorded. Remaining volume: ' . $remainingVolume . ' ' . $aliquot->volume_unit]);
+        } catch (\Exception $e) {
+            DB::rollBack();
+            return response()->json(['success' => false, 'message' => 'Unable to record aliquot use.', 'errors' => $e->getMessage()]);
+        }
+    }
+
+    private function rowLabel(int $row): string
+    {
+        $label = '';
+
+        while ($row > 0) {
+            $row--;
+            $label = chr(65 + ($row % 26)) . $label;
+            $row = intdiv($row, 26);
+        }
+
+        return $label;
+    }
+
+    private function positionLabel($position): string
+    {
+        if (empty($position)) {
+            return 'Outside storage';
+        }
+
+        $box = $position->box;
+        $rack = optional($box)->rack;
+        $equipment = optional($rack)->equipment;
+        $room = optional($equipment)->room;
+        $building = optional($room)->building;
+
+        return trim(
+            collect([
+                optional($building)->name,
+                optional($room)->name,
+                optional($equipment)->name,
+                optional($rack)->name,
+                optional($box)->name,
+                $position->code,
+            ])->filter()->implode(' / ')
+        );
+    }
+}

app/Http/Controllers/TelegramController.php

@@ -1,88 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-use Telegram\Bot\Api;
-use Telegram\Bot\Laravel\Facades\Telegram;
-
-class TelegramController extends Controller
-{
-
-public function handle(Request $request)
-{
-    try{
-        $telegram = new Api(env('TELEGRAM_BOT_TOKEN'));
-        $update = $telegram->getWebhookUpdate();
-    
-        if ($update->getMessage()) {
-            $chatId = $update->getMessage()->getChat()->getId();
-            $text   = $update->getMessage()->getText();
-            $patientId = null;
-            $sampleSourceId = null;
-            if ($text && str_starts_with($text, "/start")) {
-                $parts = explode(" ", $text);
-                $individualType = 'patient';
-                if (count($parts) > 1) {
-                    $fullText = explode("_", $parts[1]);
-                    if(count($fullText) > 1){
-                        $sampleSourceId = trim($fullText[1]);
-                    }
-                    else{
-                        $patientId = trim($parts[1]);
-                    }
-                }
-    
-                if ($patientId) {
-                    // Check if patient already registered
-                    $exists = DB::table('patient_telegram')
-                        ->where('patient_id', $patientId)
-                        ->exists();
-    
-                    if (!$exists) {
-                        DB::table('patient_telegram')->updateOrInsert(
-                            ['patient_id' => $patientId],
-                            ['chat_id' => $chatId]
-                        );
-    
-                        $telegram->sendMessage([
-                            'chat_id' => $chatId,
-                            'text' => "✅ Thank you for joining our bot. You will receive future laboratory results here."
-                        ]);
-                    }
-                }
-                // for sample source
-                if ($sampleSourceId)
-                {
-                    // Check if patient already registered
-                    $exist_sample_source = DB::table('sample_source_telegram')
-                        ->where('sample_source_id', $sampleSourceId)
-                        ->exists();
-    
-                    if (!$exist_sample_source) {
-                        DB::table('sample_source_telegram')->updateOrInsert(
-                            ['sample_source_id' => $sampleSourceId],
-                            ['chat_id' => $chatId]
-                        );
-    
-                        $telegram->sendMessage([
-                            'chat_id' => $chatId,
-                            'text' => "✅ Thank you for joining our bot. You will receive future laboratory results here."
-                        ]);
-                    }
-                }
-            }
-        }
-    
-        return response()->json(['status' => 'ok'], 200);
-    }
-    catch(\Exception $e){
-        
-    }
-}
-
-}
-
-

app/Http/Controllers/TestController.php

@@ -1,487 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-use App\Enums\RecordStatusEnum;
-use App\Http\Controllers\Helper\GlobalController;
-use App\Http\Requests\TestSampleCreateRequest;
-use App\Http\Requests\UpdateRequests\TestSampleUpdateRequest;
-use App\Http\Resources\TestSampleResource;
-use App\Models\Antibiotic;
-use App\Models\BaseModel;
-use App\Models\Department;
-use App\Models\Organism;
-use App\Models\PatientType;
-use App\Models\Physician;
-use App\Models\PhysicianCommission;
-use App\Models\SampleType;
-use App\Models\Test;
-use App\Models\TestCategory;
-use App\Models\TestNormalValue;
-use App\Models\TestSample;
-use App\Models\TestSampleOrganism;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Session;
-
-use App\Models\Laboratory;
-
-class TestController extends Controller
-{
-
-    protected $model;
-    protected $departmentModel;
-    protected $sampleTypeModel;
-    protected $patientTypeModel;
-    protected $testModel;
-    protected $organismModel;
-    protected $antibioticModel;
-    protected $testSampleOrganismModel;
-    protected $testSampleOrganismAntibioticModel;
-    protected $testNormalValueModel;
-    protected $physicianModel;
-    protected $physicianCommissionModel;
-    protected $labModel;
-
-    protected $baseLabId;
-    protected $labs;
-    protected $base;
-    protected $testCategoryModel;
-
-    public function __construct(TestSample $testSample, Department $departmentModel, PhysicianCommission $physicianCommissionModel,
-                                TestSampleOrganism $testSampleOrganismModel,SampleType $sampleTypeModel,
-                                PatientType $patientTypeModel,Test $testModel, Organism $organismModel,
-                                Antibiotic $antibioticModel,
-                                TestNormalValue $testNormalValueModel, Physician $physicianModel, Laboratory $labModel
-    ){
-        $this->model = $testSample;
-        $this->departmentModel = $departmentModel;
-        $this->sampleTypeModel = $sampleTypeModel;
-        $this->patientTypeModel = $patientTypeModel;
-        $this->testModel = $testModel;
-        $this->organismModel = $organismModel;
-        $this->antibioticModel = $antibioticModel;
-        $this->testSampleOrganismModel = $testSampleOrganismModel;
-        $this->testNormalValueModel = $testNormalValueModel;
-        $this->physicianModel = $physicianModel;
-        $this->physicianCommissionModel = $physicianCommissionModel;
-        $this->labModel = $labModel;
-        $this->testCategoryModel = new TestCategory();
-
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
-    }
-
-    public function index(Request $request){
-        return null;
-    }
-
-    public function save(Request $request){
-        try{
-            $validator = \Validator::make($request->all(), ['name_en' => 'required']);
-            if ($validator->fails()){ return response()->json(['errors'=>$validator->errors()->all()]);}
-            $test  = $this->testModel::query()->create([
-                'name_en' => $request->name_en,
-                'lab_id' => $this->baseLabId,
-            ]);
-            return response()->json(['success'=> true , 'data' => [$test]]);
-        } catch (\Exception $e)
-        {
-            return response()->json(['success'=> false , 'errors' => [$e->getMessage()]]);
-        }
-    }
-
-    public function update(Request $request){
-        try{
-            $validator = \Validator::make($request->all(), ['uid' => 'required', 'name_en' => 'required']);
-            if ($validator->fails()){ return response()->json(['errors'=>$validator->errors()->all()]);}
-            $test = $this->testModel::query()->where(['id' => $request->uid])->first();
-            $test->update(array('name_en' => $request->name_en));
-            return response()->json(['success'=> true , 'data' => [$test]]);
-        } catch (\Exception $e)
-        {
-            return response()->json(['success'=> false , 'errors' => [$e->getMessage()]]);
-        }
-    }
-
-    public function get(Request $request){
-        try{
-            $test = Test::query()->find($request->uid);
-            return response()->json(['data' => $test]);
-        } catch (\Exception $e)
-        {
-            return response()->json(['success'=> false , 'errors' => [$e->getMessage()]]);
-        }
-    }
-
-    public function delete(Request $request){
-        $status = $this->testModel::query()->where('id', $request->uid)->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE));
-        return response()->json(['status'=> $status , 'msg' => 'Delete successful']);
-    }
-
-    public function restore(Request $request){
-        $status = $this->testModel::query()->where('id', $request->uid)->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE));
-        return response()->json(['status'=> $status , 'msg' => 'Activate successful']);
-    }
-
-    /** TEST SAMPLES
-     * @param Request $request
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
-     */
-
-    public function testSamples(Request $request){
-        if(!GlobalController::user_can(Auth::user()->role_id, ['view_test_sample'])) return redirect(url('my-profile'));
-        $physicians = $this->physicianModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->get();
-        $department = $this->departmentModel::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->orderBy('weight','asc')->get();
-        $patientTypes = $this->patientTypeModel::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)->get();
-        $testItems = $this->testModel::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)->get();
-        $testSampleTable = $this->model::getTableNameByScheme();
-        $sampleTypeTable = $this->sampleTypeModel::getTableNameByScheme();
-        $departmentTable = $this->departmentModel::getTableNameByScheme();
-        $testTable = $this->testModel::getTableNameByScheme();
-        $testSamples = $this->model::query()->select([
-            $departmentTable.'.name_en as department_name',
-                $sampleTypeTable.'.name_en as sample_type_name',
-                $testTable.'.name_en as test_name',
-                $testSampleTable.'.*'
-            ])
-            ->join($sampleTypeTable, $testSampleTable.'.sample_type_id', '=', $sampleTypeTable.'.id')
-            ->join($departmentTable, $sampleTypeTable.'.department_id', '=', $departmentTable.'.id')
-            ->join($testTable, $testSampleTable.'.test_id', '=', $testTable.'.id')
-            ->where($testSampleTable.'.'.BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
-            ->where($testSampleTable.'.lab_id', $this->baseLabId)
-            ->where($sampleTypeTable.'.'.BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
-            ->when(!empty($request->sample_type), function ($query) use($sampleTypeTable, $request){
-                $query->where($sampleTypeTable.'.id', $request->sample_type);
-            })->when(!empty($request->department), function ($query) use($departmentTable, $request) {
-                $query->where($departmentTable.'.id', $request->department);
-            })->when(!empty($request->kword), function ($query) use($testTable, $testSampleTable, $request){
-                $query->whereRaw( $testTable.".name_en like '%".addslashes($request->kword)."%'")
-                    ->orWhereRaw($testSampleTable.".code like '%".addslashes($request->kword)."%'");
-            })->when(Auth::id()==1, function ($query) use ($testSampleTable){
-                $query->whereIn($testSampleTable.'.'.BaseModel::RECORD_STATUS_FIELD , [RecordStatusEnum::DELETE, RecordStatusEnum::ACTIVE]);
-            })->orderBy($departmentTable.'.weight')
-            ->orderBy($sampleTypeTable.'.weight')
-            ->orderBy($testSampleTable.'.weight')
-            ->paginate(20);
-        return view('test', ['testSamples' => $testSamples, 'departments' => $department,
-             'testItems' => $testItems, 'patientTypes' => $patientTypes, 'labSetting' => (object) $this->base,
-            'physicians' => $physicians
-        ]);
-    }
-
-    public function saveTestSample(TestSampleCreateRequest $request){
-        set_time_limit(6000);
-        ini_set('memory_limit', '10240M');
-        DB::beginTransaction();
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['create_test_sample'])) return false;
-            $testSample = $this->model::query()->create([
-                'sample_type_id' => $request->sample_type_id,
-                'test_id' => $request->test_id,
-                'group_result' => $request->group_result,
-                'category' => NULL,
-                'unit_sign' => $request->unit_sign,
-                'code' => $request->code,
-                'heading_id' => $request->heading_id,
-                'usd_price' => $request->usd_price,
-                'weight' => $request->weight,
-                'field_type' => $request->filed_type_id,
-                'formula' => $request->formula,
-                'format' => $request->format_value,
-                'description' => $request->description,
-                'lab_id' => $this->baseLabId,
-                'is_bold' => $request->is_bold,
-                'autocomplete_bind' => $request->autocomplete_bind
-            ]);
-            // reference range
-            if(in_array($request->filed_type_id,[1,4,6])){
-                $data = collect($request->patient_type_ids);
-                $items = $data->map(function ($row, $key) use ($request, $testSample) {
-                    if(!empty($request->patient_type_ids[$key]['value'])) {
-                        $testNormalValue = $this->testNormalValueModel::query()->create([
-                            'test_sample_id' => $testSample->id,
-                            'patient_type_id' => $request->patient_type_ids[$key]['value'],
-                            'sign' => $request->signs[$key]['value'],
-                            'minimum' => is_numeric($request->min_values[$key]['value']) ? $request->min_values[$key]['value'] : null,
-                            'maximum' => is_numeric($request->max_values[$key]['value']) ? $request->max_values[$key]['value'] : null,
-                        ]);
-                    }
-                    return [];
-                });
-            }
-            // organism and antibiotics
-            if(in_array($request->filed_type_id,[2,3]) ){
-                $organismsCollection = collect($request->organisms);
-                foreach ($organismsCollection as $org){
-                    $this->testSampleOrganismModel::query()->create([
-                        'test_sample_id' => $testSample->id,
-                        'is_default' => $org['is_default'],
-                        'organism_id' => $org['id'],
-                        'lab_id' => $this->baseLabId
-                    ]);
-                }
-            }
-            DB::commit();
-            return response()->json(['success' => true, 'message' => __('test_sample.create_success'), 'data' => [$testSample]]);
-        } catch (\Exception $e){
-            DB::rollBack();
-            return response()->json(['success'=> false, 'message' => __('test_sample.create_fail'), 'errors' => [$e->getMessage()]]);
-        }
-    }
-
-    public function getTestSample(Request $request){
-        $testSample = $this->model::with([
-            'sample',
-            'organisms.organism',
-            'testValues'
-        ])->find($request->uid);
-        return response()->json(['success'=> true , 'message' => __('test_sample.get_success'), 'data' => new TestSampleResource($testSample)]);
-    }
-
-    public function updateTestSample(TestSampleUpdateRequest $request){
-
-        set_time_limit(6000);
-        ini_set('memory_limit', '10240M');
-        DB::beginTransaction();
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['update_test_sample'])) return false;
-            $testSample = $this->model::query()->where('id',$request->uid)->first();
-            $testSample->update([
-                'sample_type_id' => $request->sample_type_id,
-                'test_id' => $request->test_id,
-                'group_result' => $request->group_result,
-                'category' => @$request->category,
-                'unit_sign' => $request->unit_sign,
-                'code' => $request->code,
-                'heading_id' => $request->heading_id,
-                'usd_price' => $request->usd_price,
-                'weight' => $request->weight,
-                'field_type' => $request->filed_type_id,
-                'formula' => $request->formula,
-                'format' => $request->format_value,
-                'description' => $request->description,
-                'is_bold' => $request->is_bold,
-                'autocomplete_bind' => $request->autocomplete_bind
-            ]);
-
-            $this->testNormalValueModel::query()->where('test_sample_id', $testSample->id)->update([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE]);
-            $this->testSampleOrganismModel::query()->where('test_sample_id', $testSample->id)->update([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE]);
-
-            // reference range
-            if(in_array($request->filed_type_id,[1,4,6])){
-                $data = collect($request->patient_type_ids);
-                $items = $data->map(function ($row, $key) use ($request, $testSample) {
-                    if(!empty($request->patient_type_ids[$key]['value'])) {
-                        $testNormalValue = $this->testNormalValueModel::query()->create([
-                            'test_sample_id' => $testSample->id,
-                            'patient_type_id' => $request->patient_type_ids[$key]['value'],
-                            'sign' => $request->signs[$key]['value'],
-                            'minimum' => is_numeric($request->min_values[$key]['value']) ? $request->min_values[$key]['value'] : null,
-                            'maximum' => is_numeric($request->max_values[$key]['value']) ? $request->max_values[$key]['value'] : null,
-                        ]);
-                    }
-                    return [];
-                });
-            }
-            // organism and antibiotics
-            if(in_array($request->filed_type_id,[2,3]) ){
-                $organismsCollection = collect($request->organisms);
-                $organisms = $organismsCollection->pluck('id')->unique()->toArray();
-                $this->testSampleOrganismModel::query()->where(['test_sample_id' => $testSample->id])
-                    ->whereNotIn('organism_id', $organisms)
-                    ->update([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE]);
-
-                foreach ($organismsCollection as $org){
-                    $testSampleOrganism = $this->testSampleOrganismModel::query()->create([
-                        'test_sample_id' => $testSample->id,
-                        'is_default' => $org['is_default'],
-                        'organism_id' => $org['id'],
-                        'lab_id' => $this->baseLabId
-                    ]);
-                }
-
-            }
-            DB::commit();
-            return response()->json(['success' => true, 'message' => __('test_sample.update_success'), 'data' => [$testSample]]);
-        } catch (\Exception $e){
-            DB::rollBack();
-            return response()->json(['success' => false, 'message' => __('test_sample.update_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-    public function editTestSampleOrder(Request $request){
-        DB::beginTransaction();
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['update_test_sample'])) return false;
-            $validator = \Validator::make($request->all(), ['id' => 'required', 'order_number' => 'required']);
-            if ($validator->fails()){ return response()->json(['errors'=>$validator->errors()->all()]);}
-
-            $testSample = $this->model::query()->where([
-                'id' => $request->id,
-                'lab_id' => $this->baseLabId
-            ])->first();
-            $testSample->update(['weight' => $request->order_number]);
-            $batchUpdates = $this->model::query()->where([
-                'sample_type_id' => $testSample->sample_type_id,
-                'lab_id' => $this->baseLabId,
-            ])->where('weight','>=', $request->order_number)->where('id','<>', $request->id)->update([
-                'weight' => DB::raw('weight + 1')
-            ]);
-            DB::commit();
-            return redirect()->back();
-        } catch (\Exception $e){
-            DB::rollBack();
-            return redirect()->back();
-        }
-    }
-
-    public function deleteTestSample(Request $request){
-        DB::beginTransaction();
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['delete_test_sample'])) return false;
-            $this->model::query()->where('id', $request->uid)->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE));
-            $this->testNormalValueModel::query()->where('test_sample_id', $request->uid)->update([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE]);
-            $this->testSampleOrganismModel::query()->where('test_sample_id', $request->uid)->update([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE]);
-            DB::commit();
-            return response()->json(['success' => true, 'message' => __('test_sample.delete_success')]);
-        }
-        catch (\Exception $e){
-            DB::rollBack();
-            return response()->json(['success' => false, 'message' => __('test_sample.delete_fail')]);
-        }
-
-    }
-
-    public function restoreTestSample(Request $request){
-        DB::beginTransaction();
-        try{
-            $this->model::query()->where('id', $request->uid)->update(array(BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE));
-            $this->testNormalValueModel::query()->where('test_sample_id', $request->uid)->update([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE]);
-            $this->testSampleOrganismModel::query()->where('test_sample_id', $request->uid)->update([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE]);
-            DB::commit();
-            return response()->json(['success' => true, 'message' => __('test_sample.restore_success')]);
-        }
-        catch (\Exception $e){
-            DB::rollBack();
-            return response()->json(['success' => false, 'message' => __('test_sample.restore_fail')]);
-        }
-    }
-
-    public function storePhysicianCommission(Request $request){
-        DB::beginTransaction();
-        try{
-            foreach ($request->physician as $k=>$val){
-                $this->physicianCommissionModel::query()->updateOrCreate([
-                    'physician_id' => $request->physician[$k],
-                    'test_sample_id' => $request->test_sample_id
-                ],[
-                    'physician_id' => $request->physician[$k],
-                    'test_sample_id' => $request->test_sample_id,
-                    'commission_rate' => $request->commission_rate[$k],
-                    'partner_price' => $request->pc_price[$k],
-                    'commission_type' => $request->commission_type[$k],
-                    'lab_id' => $this->baseLabId,
-                    BaseModel::CREATED_AT_FIELD => date('Y-m-d H:i:s'),
-                    BaseModel::CREATED_BY_FIELD => Auth::id(),
-                    BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE
-                ]);
-            }
-            DB::commit();
-            return redirect()->back();
-        }
-        catch (\Exception $e){
-            DB::rollBack();
-            return redirect()->back();
-        }
-    }
-
-    public function setCommissionToAllTest(Request $request){
-        DB::beginTransaction();
-        try{
-            $testSamples = $this->model::query()->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->get();
-            foreach ($testSamples as $testSample){
-                $this->physicianCommissionModel::query()->updateOrCreate([
-                    'physician_id' => $request->physician_id,
-                    'test_sample_id' => $testSample->id
-                ],[
-                    'physician_id' => $request->physician_id,
-                    'test_sample_id' => $testSample->id,
-                    'commission_rate' => $request->commission_rate,
-                    'commission_type' => $request->commission_type,
-                    'lab_id' => $this->baseLabId,
-                    BaseModel::CREATED_AT_FIELD => date('Y-m-d H:i:s'),
-                    BaseModel::CREATED_BY_FIELD => Auth::id(),
-                    BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE
-                ]);
-            }
-            DB::commit();
-            return response()->json(['success'=> true , 'message' => __('test_sample.add_commission_success')]);
-        }
-        catch (\Exception $e){
-            DB::rollBack();
-            return response()->json(['success'=> false , 'message' => __('test_sample.add_commission_fail'), 'errors' => $e->getMessage()]);
-        }
-    }
-
-
-    /*public function cloneTestSampleProperties(Request $request){
-        try {
-
-            $test_sample_id = $request->test_sample_id;
-            $target_lab_id = $request->target_lab_id;
-            $target_sample_type_id = $request->target_sample_type_id;
-            $target_test_sample_id = $request->target_test_sample_id;
-
-            $testSamples = $this->model::with(['testValues','organisms','organisms.antibiotics'])->where('id', $test_sample_id)->get();
-
-            $this->testNormalValueModel::query()->where(['test_sample_id' => $target_test_sample_id])->update([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE]);
-            $this->testSampleOrganismModel::query()->where(['test_sample_id' => $target_test_sample_id, 'lab_id' => $target_lab_id])->update([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE]);
-
-            foreach ($testSamples as $testSample) {
-                $testValues = isset($testSample->testValues) ? $testSample->testValues : [];
-
-                foreach ($testValues as $testValue) {
-                    $testValueData = [
-                        'test_sample_id' => $target_test_sample_id,
-                        'patient_type_id' => $testValue->patient_type_id,
-                        'sign' => $testValue->sign,
-                        'minimum' => $testValue->minimum,
-                        'maximum' => $testValue->maximum,
-                        'created_at' => date('Y-m-d H:i:s'),
-                        'created_by' => 1
-                    ];
-                    $insertTestValue = $this->testNormalValueModel::query()->create($testValueData);
-                }
-                $testOrganisms = isset($testSample->organisms) ? $testSample->organisms : [];
-                foreach ($testOrganisms as $testOrganism) {
-                    $testOrganismData = [
-                        'test_sample_id' => $target_test_sample_id,
-                        'organism_id' => $testOrganism->organism_id,
-                        'lab_id' => $target_lab_id,
-                        'created_at' => date('Y-m-d H:i:s'),
-                        'created_by' => 1
-                    ];
-                    $insertTestSampleOrganism = $this->testSampleOrganismModel::query()->create($testOrganismData);
-                    $antibiotics = isset($testOrganism->antibiotics) ? $testOrganism->antibiotics : [];
-                    foreach ($antibiotics as $antibiotic) {
-                        $testOrganismAntibioticData = [
-                            'test_sample_organism_id' => $insertTestSampleOrganism->id,
-                            'antibiotic_id' => $antibiotic->antibiotic_id,
-                            'created_at' => date('Y-m-d H:i:s'),
-                            'created_by' => 1
-                        ];
-                        $insertTestOrganismAntibiotic = $this->testSampleOrganismAntibioticModel::query()->create($testOrganismAntibioticData);
-                    }
-                }
-            }
-        }
-        catch (\Exception $e){
-            Log::error($e->getMessage());
-        }
-        return redirect()->back();
-    }*/
-
-
-}

app/Http/Controllers/TestGroupController.php

@@ -1,81 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-use App\Enums\RecordStatusEnum;
-use App\Http\Controllers\Helper\GlobalController;
-use App\Models\BaseModel;
-use App\Models\TestGroup;
-use App\Models\TestGroupDetail;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Session;
-
-class TestGroupController extends Controller
-{
-
-    protected $model;
-    protected $testGroupDetailModel;
-
-    protected $baseLabId;
-    protected $labs;
-    protected $base;
-
-    public function __construct(TestGroup $model,  TestGroupDetail $testGroupDetailModel)
-    {
-        $this->model = $model;
-        $this->testGroupDetailModel = $testGroupDetailModel;
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
-    }
-
-    public function index(Request $request){
-        return null;
-    }
-
-    public function save(Request $request){
-        DB::beginTransaction();
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['create_test_group'])) return false;
-            $validator = \Validator::make($request->all(), ['name_en' => 'required','test_sample_ids' => 'required']);
-            if ($validator->fails()){ return response()->json(['errors'=>$validator->errors()->all()]);}
-            $testGroup  = $this->model::query()->create(['group_name' => $request->name_en, 'lab_id' => $this->baseLabId]);
-            foreach ($request->test_sample_ids as $v){
-                $this->testGroupDetailModel::query()->create([
-                    'test_group_id' => $testGroup->id,
-                    'test_sample_id' => $v,
-                    'lab_id' => $this->baseLabId
-                ]);
-            }
-            DB::commit();
-            return response()->json(['success'=> true , 'data' => [$testGroup]]);
-        } catch (\Exception $e)
-        {
-            DB::rollBack();
-            return response()->json(['success'=> false , 'errors' => [$e->getMessage()]]);
-        }
-    }
-
-    public function get($id){
-        try{
-            $testGroupItems = $this->testGroupDetailModel::query()->where(['test_group_id' => $id, 'lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD=>RecordStatusEnum::ACTIVE])->get()->pluck('test_sample_id')->toArray();
-            return response()->json(['success' => true, 'data' => $testGroupItems]);
-        } catch (\Exception $e)
-        {
-            return response()->json(['success'=> false , 'errors' => [$e->getMessage()]]);
-        }
-    }
-
-    public function delete(Request $request){
-        try{
-            if(!GlobalController::user_can(Auth::user()->role_id, ['delete_test_group'])) return false;
-            $this->model::query()->where(['id' => $request->id, 'lab_id' => $this->baseLabId])->update([BaseModel::RECORD_STATUS_FIELD=>RecordStatusEnum::DELETE]);
-            return response()->json(['success' => true, 'message' => 'Test group successfully deleted']);
-        } catch (\Exception $e)
-        {
-            return response()->json(['success'=> false , 'message' => 'Failed while deleting test group. Please try again.', 'errors' => [$e->getMessage()]]);
-        }
-    }
-
-
-}

app/Http/Controllers/UserController.php

@@ -4,21 +4,13 @@ namespace App\Http\Controllers;
 use App\Enums\RecordStatusEnum;
 use App\Enums\UtilEnum;
 use App\Http\Controllers\Helper\GlobalController;
-use App\Models\AgeGroup;
 use App\Models\BaseModel;
-use App\Models\Department;
-use App\Models\PatientType;
 use App\Models\Role;
-use App\Models\SampleSource;
 use App\Models\User;
-use App\Models\UserLabCover;
-use App\Models\WardTransaction;
-use Carbon\Carbon;
+use App\Models\UserOrganization;
 use Illuminate\Http\Request;
-use App\Models\Laboratory;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Log;
 
@@ -27,39 +19,33 @@ class UserController extends Controller
 
     protected $userModel;
     protected $roleModel;
-    protected $userLabCover;
-    protected $sampleSourceModel;
-    protected $baseLabId;
-    protected $labs;
+    protected $userOrganizations;
+    protected $baseOrganizationId;
+    protected $organizations;
     protected $base;
 
-    public function __construct(User $userModel, Role $roleModel, UserLabCover $userLabCover, SampleSource $sampleSourceModel){
+    public function __construct(User $userModel, Role $roleModel, UserOrganization $userOrganizations){
         $this->userModel = $userModel;
         $this->roleModel = $roleModel;
-        $this->userLabCover = $userLabCover;
-        $this->sampleSourceModel = $sampleSourceModel;
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
+        $this->userOrganizations = $userOrganizations;
+        $this->baseOrganizationId = Session::get('base_organization_id');
+        $this->base = Session::get('base_organization');
     }
 
     public function index(Request $request){
         if(!GlobalController::user_can(Auth::user()->role_id, ['view_user_account'])) return redirect(url('my-profile'));
-        $this->labs = parent::getAccessAbleLabs();
+        $this->organizations = parent::getAccessAbleLabs();
         $recordStatusCondition = Auth::id()==1 ? [RecordStatusEnum::DELETE, RecordStatusEnum::ACTIVE] : [RecordStatusEnum::ACTIVE];
         $roles = $this->roleModel::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
             ->when(Auth::user()->role_id != UtilEnum::ADMINISTRATOR_ROLE , function ($roles){
                 $roles->whereNotIn('id', [UtilEnum::ADMINISTRATOR_ROLE]);
             })->get();
 
-        $sample_sources = $this->sampleSourceModel::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
-            ->when(Auth::user()->role_id != UtilEnum::PHYSICIAN_ROLE && Auth::id()!=1 , function ($sampleSource){
-                $sampleSource->where('lab_id', Session::get('base_lab_id'));
-            })->get();
 
-        $users = $this->userModel::with(['role','lab_covers'])->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusCondition)
+        $users = $this->userModel::with(['role','userOrganizations'])->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusCondition)
             ->when(Auth::id()!=1, function ($users){
                 $users->whereNotIn('id', [UtilEnum::ADMINISTRATOR_USER])
-                    ->whereIn('id', $this->labs->pluck('userLabCovers')->flatten()->pluck('user_id')->toArray());
+                    ->whereIn('id', $this->organizations->pluck('organizations')->flatten()->pluck('user_id')->toArray());
             })->when(!empty($request->kword), function($users) use ($request) {
                 $keyword = '%' . str_replace(' ', '', $request->kword) . '%';
                 $users->where(function ($q) use ($keyword) {
@@ -67,8 +53,8 @@ class UserController extends Controller
                         ->orWhereRaw("REPLACE(email,' ','') LIKE ?", [$keyword]);
                 })->where('id', '!=', UtilEnum::ADMINISTRATOR_USER);
             })
-            ->orderBy(BaseModel::CREATED_AT,'desc')->paginate(config('labis.pagination.perpage', 10));
-        return view('user_account', ['users' => $users, 'roles' => $roles, 'labs' => $this->labs, 'sample_sources' => $sample_sources]);
+            ->orderBy(BaseModel::CREATED_AT,'desc')->paginate(config('nrml.pagination.perpage', 10));
+        return view('user_account', ['users' => $users, 'roles' => $roles, 'organizations' => $this->organizations]);
     }
 
     public function labUsers(Request $request){
@@ -76,17 +62,15 @@ class UserController extends Controller
         $this->labs = parent::getAccessAbleLabs();
         $roles = $this->roleModel::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
             ->whereNotIn('id', [UtilEnum::ADMINISTRATOR_ROLE])->get();
-        $sample_sources = $this->sampleSourceModel::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
-                                ->where('lab_id', Session::get('base_lab_id'))->get();
 
-        $users = $this->userModel::with(['role','lab_covers'])->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
-            ->whereIn('id', $this->labs->pluck('labUsers')->flatten()->pluck('user_id')->toArray())
+        $users = $this->userModel::with(['role','userOrganizations'])->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)
+            ->whereIn('id', $this->labs->pluck('userOrganizations')->flatten()->pluck('user_id')->toArray())
             ->whereNotIn('role_id', [UtilEnum::ADMINISTRATOR_ROLE])
             ->when(!empty($request->kword), function($users) use ($request) {
                 $users->whereRaw("replace(name, ' ','') like '%".str_replace(" ","",$request->kword)."%'")
                     ->orWhereRaw("replace(email, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
-            })->orderBy(BaseModel::CREATED_AT,'desc')->paginate(config('labis.pagination.perpage', 10));
-        return view('user_account', ['users' => $users, 'roles' => $roles, 'labs' => $this->labs, 'sample_sources' => $sample_sources]);
+            })->orderBy(BaseModel::CREATED_AT,'desc')->paginate(config('nrml.pagination.perpage', 10));
+        return view('user_account', ['users' => $users, 'roles' => $roles, 'labs' => $this->labs]);
     }
 
     public function save(Request $request){
@@ -96,23 +80,20 @@ class UserController extends Controller
                 'name' => 'required',
                 'email' => 'required|email|unique:users',
                 'password' => 'required',
-                'role_id' => 'required',
-                'sample_source_id' => 'nullable'
+                'role_id' => 'required'
             ]);
             if ($validator->fails()) return response()->json(['success' => false, 'message' => __('user_account.create_fail'), 'errors' => $validator->errors()->all()]);
             $data = array(
                 'name' => $request->name,
                 'email' => $request->email,
                 'password' => Hash::make($request->password),
-                'is_manager' => ($request->role_id==3 ? 1: 0),
-                'sample_source_id' => $request->sample_source_id,
                 'role_id' => $request->role_id,
                 'created_at' => date('Y-m-d H:i:s'),
                 'created_by' => Auth::id(),
             );
             $user = $this->userModel::query()->create($data);
             Log::channel('account_creation')->info(array('action' => 'create', 'raw' => $request->all(), 'prepared' => $data));
-            $requests = new Request(array('uid' => $user->id, 'lab_ids' => [Session::get('base_lab_id')]));
+            $requests = new Request(array('uid' => $user->id, 'organization_ids' => [Session::get('base_organization_id')]));
             $this->assignLabs($requests);
             return response()->json(['success' => true, 'message' => __('user_account.create_success')]);
         } catch (\Exception $e){
@@ -134,8 +115,6 @@ class UserController extends Controller
                 'name' => $request->name,
                 'email' => $request->email,
                 'role_id' => $request->role_id,
-                'is_manager' => ($request->role_id==3 ? 1: 0),
-                'sample_source_id' => $request->sample_source_id,
                 'updated_at' => date('Y-m-d H:i:s'),
                 'updated_by' => Auth::id()
             );
@@ -169,7 +148,7 @@ class UserController extends Controller
 
     public function get(Request $request){
         try{
-            $user = $this->userModel::with(['lab_covers'])->find($request->uid);
+            $user = $this->userModel::with(['userOrganizations'])->find($request->uid);
             return response()->json(['success' => true, 'message' => __('user_account.get_success'), 'data' => $user]);
         } catch (\Exception $e){
             return response()->json(['success' => false, 'message' => __('user_account.get_fail'), 'errors' => $e->getMessage()]);
@@ -200,19 +179,19 @@ class UserController extends Controller
             if(!GlobalController::user_can(Auth::user()->role_id, ['assign_lab'])) return false;
             $validator = \Validator::make($request->all(), [ 'uid' => 'required']);
             if ($validator->fails()) return response()->json(['success' => false, 'message' => __('user_account.assign_lab_fail'), 'errors'=>$validator->errors()->all()]);
-            $this->userLabCover::query()->where('user_id', $request->uid)
+            $this->userOrganizations::query()->where('user_id', $request->uid)
                 ->update(['end_date' => date('Y-m-d'), BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE, BaseModel::UPDATED_AT_FIELD => date('Y-m-d H:i:s'), BaseModel::UPDATED_BY_FIELD =>Auth::id()]);
             $data = array();
-            foreach ($request->lab_ids as $lab_id){
+            foreach ($request->organization_ids as $organization_id){
                 $data[] = array(
                     'user_id' => $request->uid,
-                    'lab_id' => $lab_id,
+                    'organization_id' => $organization_id,
                     'start_date' => date('Y-m-d'),
                     'created_at' => date('Y-m-d H:i:s'),
                     'created_by' => Auth::id()
                 );
             }
-            $this->userLabCover::query()->insert($data);
+            $this->userOrganizations::query()->insert($data);
             return response()->json(['success' => true, 'message' => __('user_account.assign_lab_success')]);
         } catch (\Exception $e){
             return response()->json(['success' => false, 'message' => __('user_account.assign_lab_fail'), 'errors' => $e->getMessage()]);
@@ -252,64 +231,47 @@ class UserController extends Controller
 
     public function changePassword(Request $request)
     {
-    try {
+        try {
 
-        $request->validate([
-            'current_password' => 'required|string',
-            'new_password' => 'required|confirmed|min:8|string'
-        ]);
+            $request->validate([
+                'current_password' => 'required|string',
+                'new_password' => 'required|confirmed|min:8|string'
+            ]);
 
-        $auth = Auth::user();
+            $auth = Auth::user();
+
+            // Check current password
+            if (!Hash::check($request->current_password, $auth->password)) {
+                return redirect()->back()->withErrors(['current_password' => __('user_account.invalid_current_password')]);
+            }
+
+            // Check new password not same as old
+            if ($request->current_password === $request->new_password) {
+                return redirect()->back()->withErrors(['new_password' => __('user_account.new_password_same_old_password')]);
+            }
+
+            // Update password
+            $user = User::where('id', $auth->id)->update([
+                'password' => Hash::make($request->new_password)
+            ]);
+
+            Log::channel('account_creation')->info([
+                'action' => 'change-password',
+                'user_id' => $auth->id
+            ]);
+
+            return redirect()->back()->with('success', __('user_account.change_password_success'));
 
-        // Check current password
-        if (!Hash::check($request->current_password, $auth->password)) {
-            // return response()->json([
-            //     'success' => false,
-            //     'message' => __('user_account.invalid_current_password')
-            // ]);
-            return redirect()->back()->withErrors(['current_password' => __('user_account.invalid_current_password')]);
         }
-
-        // Check new password not same as old
-        if ($request->current_password === $request->new_password) {
-            return redirect()->back()->withErrors(['new_password' => __('user_account.new_password_same_old_password')]);
+        catch (\Exception $e) {
+            return redirect()->back()->withErrors(['error' => __('user_account.change_password_fail') . ': ' . $e->getMessage()]);
         }
-
-        // Update password
-        $user = User::where('id', $auth->id)->update([
-            'password' => Hash::make($request->new_password)
-        ]);
-
-        Log::channel('account_creation')->info([
-            'action' => 'change-password',
-            'user_id' => $auth->id
-        ]);
-
-        // return response()->json([
-        //     'success' => true,
-        //     'message' => __('user_account.change_password_success')
-        //     //'data' => $user
-        // ]);
-        return redirect()->back()->with('success', __('user_account.change_password_success'));
-
-    } catch (\Exception $e) {
-
-        // return response()->json([
-        //     'success' => false,
-        //     'message' => __('user_account.change_password_fail'),
-        //     'errors' => $e->getMessage()
-        // ]);
-        return redirect()->back()->withErrors(['error' => __('user_account.change_password_fail') . ': ' . $e->getMessage()]);
-
-    }
     }
 
     function my_profile()
     {
-        $user = $this->userModel::query()->with(['role','lab_covers'])->find(Auth::id());
-        //return response()->json(['success' => true, 'message' => __('user_account.get_success'), 'data' => $user]);
+        $user = $this->userModel::query()->with(['role','userOrganizations'])->find(Auth::id());
         return view('my_profiles',[
-            // 'labSettings' => (object) $this->base,
             'users' => $user
         ]);
 

app/Http/Controllers/UtilController.php

@@ -20,7 +20,7 @@ use App\Models\Sample;
 use App\Models\SampleType;
 use App\Models\TestSample;
 use App\Models\TestSampleOrganism;
-use App\Models\UserLabCover;
+use App\Models\UserOrganization;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Http\Request;
@@ -41,11 +41,11 @@ class UtilController extends Controller
 
     protected $testSampleOrganismModel;
 
-    private $baseLabId;
+    private $baseOrganizationId;
     protected $base;
 
     public function __construct(
-        Organism $organismModel, Antibiotic $antibioticModel, RejectComment $rejectCommentModel, UserLabCover $labUserModel,
+        Organism $organismModel, Antibiotic $antibioticModel, RejectComment $rejectCommentModel, UserOrganization $labUserModel,
         SampleType $sampleTypeModel, Department $departmentModel, TestSample $testSampleModel, Sample $sampleModel,
         PatientType $patientTypeModel, TestSampleOrganism $testSampleOrganism
     ){
@@ -61,8 +61,8 @@ class UtilController extends Controller
 
         $this->testSampleOrganismModel = $testSampleOrganism;
 
-        $this->baseLabId = Session::get('base_lab_id');
-        $this->base = Session::get('base_lab');
+        $this->baseOrganizationId = Session::get('base_organization_id');
+        $this->base = Session::get('base_organization');
     }
 
     function province($responseType = 'object')
@@ -118,7 +118,7 @@ class UtilController extends Controller
 
     public function getDepartment(){
         try{
-            $department = $this->departmentModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId])->orderBy('weight','asc')->get();
+            $department = $this->departmentModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'organization_id' => $this->baseOrganizationId])->orderBy('weight','asc')->get();
             return response()->json(['success'=> true , 'data' => $department]);
         } catch (\Exception $e)
         {
@@ -128,7 +128,7 @@ class UtilController extends Controller
 
      public function getDepartmentByLabId($labId){
         try{
-            $department = $this->departmentModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $labId])->orderBy('weight','asc')->get();
+            $department = $this->departmentModel::query()->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'organization_id' => $labId])->orderBy('weight','asc')->get();
             return response()->json(['success'=> true , 'data' => $department]);
         } catch (\Exception $e)
         {
@@ -172,7 +172,7 @@ class UtilController extends Controller
             $rejectComment = $this->rejectCommentModel::query()->create([
                 'sample_condition_id' => 3,
                 'reject_comment' => $request->name_en,
-                'lab_id' => $this->baseLabId
+                'organization_id' => $this->baseOrganizationId
             ]);
             return response()->json(['success'=> true , 'data' => [$rejectComment]]);
         } catch (\Exception $e)
@@ -184,7 +184,7 @@ class UtilController extends Controller
     function getTestItem(){
         try{
             $departments = $this->departmentModel::with(['samples','samples.testSamples.test','samples.testSamples.childTest'])
-                ->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
+                ->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
                 ->orderBy('weight', 'asc')->get();
             return response()->json(['success'=> true , 'data' => SampleTestResource::collection($departments)]);
         } catch (\Exception $e){
@@ -193,13 +193,13 @@ class UtilController extends Controller
     }
 
     function getLabUsers(){
-        return $this->labUserModel::with('user')->where(['lab_id' => $this->baseLabId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->get();
+        return $this->labUserModel::with('user')->where(['organization_id' => $this->baseOrganizationId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])->get();
     }
 
 
     function getTestItemBySampleId($sampleId, $previousId = 0){
         try{
-            $data = $this->sampleModel::with(['entryBy','modifiedBy','sample_tests', 'physician', 'patient','sample_source'])->where(['id' => $sampleId, 'lab_id' => $this->baseLabId])->get()->first();
+            $data = $this->sampleModel::with(['entryBy','modifiedBy','sample_tests', 'physician', 'patient','sample_source'])->where(['id' => $sampleId, 'organization_id' => $this->baseOrganizationId])->get()->first();
             $arrData = array();
             $arrData['result_comment'] = [];
             $arrData['sample'] = array(
@@ -251,17 +251,17 @@ class UtilController extends Controller
 						                        ifnull(prev_r.test_result,"") as prev_result,
 						                        ts.is_bold,
 						                        ts.autocomplete_bind,
-						                        ts.lab_id,
+						                        ts.organization_id,
 						                        sd.sample_descr
                                             FROM samples s
                                             INNER JOIN patients p
-                                            ON p.id = s.patient_id AND p.lab_id = s.lab_id
+                                            ON p.id = s.patient_id AND p.organization_id = s.organization_id
                                             INNER JOIN test_results tr
                                             ON tr.`sample_id` = s.`id`
-                                            AND s.`lab_id` = tr.`lab_id`
+                                            AND s.`organization_id` = tr.`organization_id`
                                             INNER JOIN test_samples ts
                                             ON ts.id = tr.`test_sample_id`
-                                            and ts.lab_id = tr.lab_id
+                                            and ts.organization_id = tr.organization_id
                                             INNER JOIN tests t
                                             ON t.`id` = ts.`test_id`
                                             INNER JOIN sample_types st
@@ -282,14 +282,14 @@ class UtilController extends Controller
                                                 INNER JOIN test_results tr
                                                 ON tr.`sample_id` = s.`id`
                                                 WHERE s.id = '.$previousId.'
-                                                AND s.`lab_id` = '.$this->baseLabId.'
+                                                AND s.`organization_id` = '.$this->baseOrganizationId.'
                                                 AND tr.record_status_id = 1
                                             ) prev_r
                                             ON prev_r.test_sample_id = tr.`test_sample_id`
 
                                             WHERE s.`id` = '.$sampleId.'
-                                            AND s.`lab_id`= '.$this->baseLabId.'
-                                            and ts.lab_id = '.$this->baseLabId.'
+                                            AND s.`organization_id`= '.$this->baseOrganizationId.'
+                                            and ts.organization_id = '.$this->baseOrganizationId.'
                                             AND tr.`record_status_id` = '.BaseModel::RECORD_STATUS_ACTIVE.'
 
                                             ORDER BY
@@ -381,7 +381,7 @@ class UtilController extends Controller
                     'is_bold' => (int) $row->is_bold,
                     'autocomplete_bind' => (int) $row->autocomplete_bind,
                     'ts' => $row->test_result,
-                    'lab_id' => $row->lab_id,
+                    'organization_id' => $row->organization_id,
                     'format' => (int)$row->format
                 );
                 $departmentArray[$row->dweight]['samples'][$row->sweight]['tests'][] = $testItemArray;
@@ -400,7 +400,7 @@ class UtilController extends Controller
         return Comment::query()->select('sample_type_id', 'comment_desc as name')->where(
             [
                 BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE,
-                'lab_id' => $this->baseLabId
+                'organization_id' => $this->baseOrganizationId
             ])->whereIn('sample_type_id', $sampleTypeIds)->get()->toArray();
     }
 
@@ -438,7 +438,7 @@ class UtilController extends Controller
                                             ogr.id
                                         FROM `organism_results` AS ogr
                                         INNER JOIN test_results trs
-                                        ON trs.id = ogr.test_result_id and ogr.lab_id = trs.lab_id
+                                        ON trs.id = ogr.test_result_id and ogr.organization_id = trs.organization_id
                                         INNER JOIN `test_sample_organisms` tsr
                                         ON tsr.test_sample_id = trs.test_sample_id
                                         AND tsr.`organism_id` = ogr.`organism_id`
@@ -468,7 +468,7 @@ class UtilController extends Controller
                                             ogr.id
                                         FROM `organism_results` AS ogr
                                         INNER JOIN test_results trs
-                                        ON trs.id = ogr.test_result_id and ogr.lab_id = trs.lab_id
+                                        ON trs.id = ogr.test_result_id and ogr.organization_id = trs.organization_id
                                         INNER JOIN samples s
                                         ON s.id = trs.sample_id
                                         INNER JOIN `test_sample_organisms` tsr
@@ -479,7 +479,7 @@ class UtilController extends Controller
                                         LEFT JOIN `quantities` qt
                                         ON qt.id = ogr.`quantity_id`
                                         WHERE s.id = '.$previousSampleId.'
-                                        AND s.`lab_id` = '.$this->baseLabId.'
+                                        AND s.`organization_id` = '.$this->baseOrganizationId.'
                                         AND ogr.record_status_id = 1
                                         AND trs.record_status_id = 1
                                         AND tsr.record_status_id = 1');
@@ -490,7 +490,7 @@ class UtilController extends Controller
         return Comment::query()->select('comment_desc as name')->where(
             [
                 BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE,
-                'lab_id' => $this->baseLabId,
+                'organization_id' => $this->baseOrganizationId,
                 'sample_type_id' => $sampleTypeId
             ])->get();
     }
@@ -586,7 +586,7 @@ class UtilController extends Controller
                                             ogr.id
                                         FROM `organism_results` AS ogr
                                         INNER JOIN test_results trs
-                                        ON trs.id = ogr.test_result_id and ogr.lab_id = trs.lab_id
+                                        ON trs.id = ogr.test_result_id and ogr.organization_id = trs.organization_id
                                         INNER JOIN `test_sample_organisms` tsr
                                         ON tsr.test_sample_id = trs.test_sample_id
                                         AND tsr.`organism_id` = ogr.`organism_id`
@@ -637,7 +637,7 @@ class UtilController extends Controller
         try{
             $headingItems = $this->testSampleModel::with(['test'])
                 ->where([
-                    'lab_id' => $this->baseLabId,
+                    'organization_id' => $this->baseOrganizationId,
                     BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE
                 ])->when(!empty($sampleTypeId), function ($headingItems) use($sampleTypeId) {
                     $headingItems->where('sample_type_id', $sampleTypeId);
@@ -694,13 +694,13 @@ class UtilController extends Controller
                             FROM `physician_commisssion` pc
                             INNER JOIN physicians p
                             ON p.`id` = pc.`physician_id`
-                            WHERE p.`lab_id` = '.$this->baseLabId.'
+                            WHERE p.`organization_id` = '.$this->baseOrganizationId.'
                             AND p.`record_status_id` = 1
                             AND pc.test_sample_id = '.$testSampleId.'
                             AND pc.`record_status_id` = 1
                         ) comm
                         ON comm.physician_id = p.`id`
-                        WHERE p.`lab_id` = '.$this->baseLabId.'
+                        WHERE p.`organization_id` = '.$this->baseOrganizationId.'
                         AND p.`record_status_id` = 1
             ');
             $data = array('test_name' => $test->test->name_en, 'physicians' => $testCommissions);
@@ -794,7 +794,7 @@ class UtilController extends Controller
         $test = $this->testSampleModel::with('test')->find($testSampleId);
         $defVal = count($this->getSelectedOrganismResult($sampleId, $testSampleId)) ==0 ? [-1] : $this->getSelectedOrganismResult($sampleId, $testSampleId);
         $testSampleOrganisms = $this->testSampleOrganismModel::with(['organism'])
-            ->where(['test_sample_id' => $testSampleId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId])
+            ->where(['test_sample_id' => $testSampleId, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'organization_id' => $this->baseOrganizationId])
             ->limit(10)->get()->map(function ($data) use ($defVal) {
                 $data['selected'] = in_array($data['id'], $defVal) ? 1: 0;
                     return $data;
@@ -810,7 +810,7 @@ class UtilController extends Controller
                 'id' => $item['id'],
                 'test_sample_id' => $item['test_sample_id'],
                 'organism_id' => $item['organism_id'],
-                'lab_id' => $item['lab_id'],
+                'organization_id' => $item['organization_id'],
                 'record_status_id' => $item['record_status_id'],
                 'selected' => $item['selected'],
                 'organism' => $item['organism'],
@@ -842,14 +842,14 @@ class UtilController extends Controller
         $test = $this->testSampleModel::with('test')->find($request->test_sample_id);
         $defVal = count($this->getSelectedOrganismResult($request->sample_id, $request->test_sample_id)) ==0 ? [-1] : $this->getSelectedOrganismResult($request->sample_id, $request->test_sample_id);
         $selectedOrganisms = $this->testSampleOrganismModel::with(['organism','antibiotics.antibioticResult','antibiotics.antibioticItem'])
-            ->where(['test_sample_id' => $request->test_sample_id, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId])
+            ->where(['test_sample_id' => $request->test_sample_id, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'organization_id' => $this->baseOrganizationId])
             ->whereIn('id', $defVal)->get()->map(function ($data) {
                 $data['selected'] = 1;
                     return $data;
                 })->toArray();
 
         $testSampleOrganisms = $this->testSampleOrganismModel::with(['organism','antibiotics.antibioticResult','antibiotics.antibioticItem'])
-            ->where(['test_sample_id' => $request->test_sample_id, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => $this->baseLabId])
+            ->where(['test_sample_id' => $request->test_sample_id, BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'organization_id' => $this->baseOrganizationId])
             ->when(!empty(trim($request->name)), function ($testSampleOrganisms) use($request){
                 $testSampleOrganisms->whereIn('organism_id', $this->organismModel::query()->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->name)."%'")->pluck('id')->toArray());
             })->whereNotIn('id', $defVal)

app/Http/Middleware/VerifyBaseLab.php

@@ -21,7 +21,7 @@ class VerifyBaseLab
     public function handle(Request $request, Closure $next)
     {
         try{
-            if (!$request->session()->exists('base_lab_id')) {
+            if (!$request->session()->exists('base_organization_id')) {
                 return redirect('/base');
             }
         } catch (\Exception $e){

app/Http/Resources/AntibioticResource.php

@@ -18,7 +18,7 @@ class AntibioticResource extends JsonResource
             'id' => $this->id,
             'name_en' => $this->name_en,
             'weight' => $this->weight,
-            'lab_id' => $this->lab_id,
+            'organization_id' => $this->organization_id,
            // 'lab' => LaboratoryResource::collection($this->lab),
             'record_status_id' => $this->record_status_id
         ];

app/Http/Resources/TestSampleResource.php

@@ -50,7 +50,7 @@ class TestSampleResource extends JsonResource
             'format' => $this->format,
             'formula' => $this->formula,
             'description' => $this->description,
-            'lab_id' => $this->lab_id,
+            'organization_id' => $this->organization_id,
             'code' => $this->code,
             'is_bold' => (int) $this->is_bold,
             'autocomplete_bind' => (int) $this->autocomplete_bind

app/Models/AliqoutMovement.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Models;
+
+use App\Traits\AuditLogTrait;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class AliqoutMovement extends BaseModel
+{
+    public $timestamps = false;
+
+    use HasFactory;
+    use AuditLogTrait;
+
+    /**
+     * The database schema currently uses the legacy misspelling "aliqout".
+     */
+    protected $table = 'aliqout_movements';
+
+    protected $primaryKey = 'id';
+
+    protected $fillable = [
+        'aliquot_id',
+        'from_position_id',
+        'to_position_id',
+        'movement_reason',
+        'moved_by',
+        BaseModel::CREATED_AT_FIELD,
+        BaseModel::CREATED_BY_FIELD,
+        BaseModel::UPDATED_AT_FIELD,
+        BaseModel::UPDATED_BY_FIELD,
+        BaseModel::DELETED_AT_FIELD,
+        BaseModel::DELETED_BY_FIELD,
+        BaseModel::RECORD_STATUS_FIELD,
+    ];
+
+    public static function boot()
+    {
+        parent::boot();
+    }
+
+    public function aliquot()
+    {
+        return $this->belongsTo(Aliquot::class, 'aliquot_id', 'id');
+    }
+
+    public function fromPosition()
+    {
+        return $this->belongsTo(Position::class, 'from_position_id', 'id');
+    }
+
+    public function toPosition()
+    {
+        return $this->belongsTo(Position::class, 'to_position_id', 'id');
+    }
+}

app/Models/Aliquot.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Models;
+
+use App\Traits\AuditLogTrait;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class Aliquot extends BaseModel
+{
+    public $timestamps = false;
+
+    use HasFactory;
+    use AuditLogTrait;
+
+    protected $table = 'aliquots';
+
+    protected $primaryKey = 'id';
+
+    protected $fillable = [
+        'sample_id',
+        'container_type_id',
+        'aliquot_type_concept_id',
+        'parent_aliquot_id',
+        'aliquot_number',
+        'initial_volume',
+        'remaining_volume',
+        'volume_unit',
+        'concentration',
+        'storage_position_id',
+        'expiry_date',
+        'status',
+        'last_accessed_at',
+        'description',
+        BaseModel::CREATED_AT_FIELD,
+        BaseModel::CREATED_BY_FIELD,
+        BaseModel::UPDATED_AT_FIELD,
+        BaseModel::UPDATED_BY_FIELD,
+        BaseModel::DELETED_AT_FIELD,
+        BaseModel::DELETED_BY_FIELD,
+        BaseModel::RECORD_STATUS_FIELD,
+    ];
+
+    public static function boot()
+    {
+        parent::boot();
+    }
+
+    public function position()
+    {
+        return $this->belongsTo(Position::class, 'storage_position_id', 'id');
+    }
+
+    public function sample()
+    {
+        return $this->belongsTo(PathogenInventorySample::class, 'sample_id', 'id');
+    }
+
+    public function containerType()
+    {
+        return $this->belongsTo(ContainerType::class, 'container_type_id', 'id');
+    }
+
+    public function movements()
+    {
+        return $this->hasMany(AliqoutMovement::class, 'aliquot_id', 'id');
+    }
+
+    public function transactions()
+    {
+        return $this->hasMany(AliquotTransaction::class, 'aliquot_id', 'id');
+    }
+}

app/Models/AliquotTransaction.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Models;
+
+use App\Traits\AuditLogTrait;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class AliquotTransaction extends BaseModel
+{
+    public $timestamps = false;
+
+    use HasFactory;
+    use AuditLogTrait;
+
+    protected $table = 'aliquot_transactions';
+
+    protected $primaryKey = 'id';
+
+    protected $fillable = [
+        'aliquot_id',
+        'transaction_type_concept_id',
+        'transaction_at',
+        'performed_by',
+        'source_volumn',
+        'affected_volume',
+        'remaining_volume',
+        'volume_unit',
+        'storage_position_id',
+        'reference_number',
+        'description',
+        'state',
+        BaseModel::CREATED_AT_FIELD,
+        BaseModel::CREATED_BY_FIELD,
+        BaseModel::UPDATED_AT_FIELD,
+        BaseModel::UPDATED_BY_FIELD,
+        BaseModel::DELETED_AT_FIELD,
+        BaseModel::DELETED_BY_FIELD,
+        BaseModel::RECORD_STATUS_FIELD,
+    ];
+
+    public static function boot()
+    {
+        parent::boot();
+    }
+
+    public function aliquot()
+    {
+        return $this->belongsTo(Aliquot::class, 'aliquot_id', 'id');
+    }
+
+    public function position()
+    {
+        return $this->belongsTo(Position::class, 'storage_position_id', 'id');
+    }
+}

app/Models/Antibiotic.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Traits\AuditLogTrait;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class Antibiotic extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory, AuditLogTrait;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $fillable = ['name_en','weight', 'lab_id'];
-
-    protected $hidden = ['created_at', 'created_by', 'updated_at', 'updated_by', 'record_status_id'];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    public function lab(){
-        return $this->belongsTo('App\Models\Laboratory', 'lab_id','id');
-    }
-
-}

app/Models/AntibioticResult.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Traits\AuditLogTrait;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class AntibioticResult extends BaseModel
-{
-    protected $table = "antibiogram_results";
-    public $timestamps = false;
-    use HasFactory, AuditLogTrait;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $fillable = ['organism_result_id','antibiotic_id','disk_diffusion','mic','sensitive','is_hide','created_at','created_by','updated_at','updated_by','record_status_id'];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-
-}

app/Models/Appointment.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Models;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use MongoDB\Driver\Session;
-use App\Traits\AuditLogTrait;
-
-class Appointment extends BaseModel
-{
-    protected $table = "appointments";
-    public $timestamps = false;
-    use HasFactory;
-    use AuditLogTrait;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $fillable = ['patient_id','appointment_date','appointment_type','doctor_id','description','lab_id','created_at','created_by','updated_at','updated_by','record_status_id'];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    public function patient(){
-        return $this->belongsTo(Patient::class, 'patient_id', 'id');
-    }
-
-    public function doctor(){
-        return $this->belongsTo(Physician::class, 'doctor_id','id');
-    }
-
-
-}

app/Models/BaseModel.php

@@ -23,6 +23,8 @@ class BaseModel extends Model
     const CREATED_BY_FIELD      = 'created_by';
     const UPDATED_AT_FIELD      = 'updated_at';
     const UPDATED_BY_FIELD      = 'updated_by';
+    const DELETED_AT_FIELD      = 'deleted_at';
+    const DELETED_BY_FIELD      = 'deleted_by';
 
     protected static function boot(){
         parent::boot();

app/Models/Box.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Models;
+
+use App\Traits\AuditLogTrait;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class Box extends BaseModel
+{
+    public $timestamps = false;
+
+    use HasFactory;
+    use AuditLogTrait;
+
+    /**
+     * The table associated with the model.
+     *
+     * Note: the current database schema uses the legacy table name "boxs".
+     *
+     * @var string
+     */
+    protected $table = 'boxs';
+
+    protected $primaryKey = 'id';
+
+    protected $fillable = [
+        'rack_id',
+        'code',
+        'name',
+        'rows',
+        'columns',
+        'capacity',
+        BaseModel::CREATED_AT_FIELD,
+        BaseModel::CREATED_BY_FIELD,
+        BaseModel::UPDATED_AT_FIELD,
+        BaseModel::UPDATED_BY_FIELD,
+        BaseModel::DELETED_AT_FIELD,
+        BaseModel::DELETED_BY_FIELD,
+        BaseModel::RECORD_STATUS_FIELD,
+    ];
+
+    public static function boot()
+    {
+        parent::boot();
+    }
+
+    public function rack()
+    {
+        return $this->belongsTo(Rack::class, 'rack_id', 'id');
+    }
+
+    public function positions()
+    {
+        return $this->hasMany(Position::class, 'box_id', 'id');
+    }
+}

app/Models/Building.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Models;
+use App\Enums\RecordStatusEnum;
+use App\Models\Traits\HasLocalizedName;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Facades\Session;
+use App\Traits\AuditLogTrait;
+
+class Building extends BaseModel
+{
+    public $timestamps = false;
+    use HasFactory;
+    use HasLocalizedName;
+    use AuditLogTrait;
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+
+    protected $appends = ['name'];
+
+    protected $primaryKey = 'id';
+
+
+
+    protected $fillable = [
+        'code', 'name_en','name_kh', 'description', 'organization_id',
+        BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD,
+        BaseModel::DELETED_AT_FIELD, BaseModel::DELETED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD
+    ];
+
+    public static function boot()
+    {
+        parent::boot();
+    }
+
+    public function organization(){
+        return $this->belongsTo(Organization::class, 'organization_id', 'id');
+    }
+
+    public function rooms(){
+        return $this->hasMany(Room::class, 'building_id', 'id');
+    }
+
+}

app/Models/Comment.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Models;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class Comment extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $fillable = ['comment_desc','sample_type_id','lab_id', BaseModel::CREATED_AT_FIELD, BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    public function sample_type(){
-        return $this->belongsTo('App\Models\SampleType','sample_type_id', 'id');
-    }
-
-}

app/Models/Concept.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Models;
+use App\Enums\RecordStatusEnum;
+use App\Models\Traits\HasLocalizedName;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Facades\Session;
+use App\Traits\AuditLogTrait;
+
+class Concept extends BaseModel
+{
+    public $timestamps = false;
+    use HasFactory;
+    use HasLocalizedName;
+    use AuditLogTrait;
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+
+    protected $appends = ['name'];
+
+    protected $primaryKey = 'id';
+
+
+
+    protected $fillable = [
+        'code', 'name_en','name_kh', 'description', 'concept_category_code',
+        BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD,
+        BaseModel::DELETED_AT_FIELD, BaseModel::DELETED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD
+    ];
+
+    public static function boot()
+    {
+        parent::boot();
+    }
+
+
+}

app/Models/ContainerType.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Models;
+use App\Enums\RecordStatusEnum;
+use App\Models\Traits\HasLocalizedName;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Facades\Session;
+use App\Traits\AuditLogTrait;
+
+class ContainerType extends BaseModel
+{
+    public $timestamps = false;
+    use HasFactory;
+    use HasLocalizedName;
+    use AuditLogTrait;
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+
+    protected $appends = ['name'];
+
+    protected $primaryKey = 'id';
+
+
+
+    protected $fillable = [
+        'container_type_concept_id','sample_type_concept_id', 'additive', 'cap_color', 'volume_ml', 'storage_temp', 'sterile',
+        BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD,
+        BaseModel::DELETED_AT_FIELD, BaseModel::DELETED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD
+    ];
+
+    public static function boot()
+    {
+        parent::boot();
+    }
+
+    public function sampleType(){
+        return $this->belongsTo(Concept::class, 'sample_type_concept_id', 'id');
+    }
+
+    public function containerName(){
+        return $this->belongsTo(Concept::class, 'container_type_concept_id', 'id');
+    }
+
+
+}

app/Models/Department.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Enums\RecordStatusEnum;
-use App\Models\Traits\HasLocalizedName;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Support\Facades\Session;
-
-class Department extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-
-
-    use HasLocalizedName;
-
-
-    protected $table='departments';
-
-    protected $fillable = ['name_en', 'weight', 'lab_id'];
-
-    protected $appends = ['name'];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    public function lab(){
-        return $this->belongsTo('App\Models\Laboratory', 'lab_id','id');
-    }
-
-    public function samples(){
-        return $this->hasMany(SampleType::class, 'department_id')->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE)->where('lab_id', Session::get('base_lab_id'))
-            ->orderBy('weight');
-    }
-
-}

app/Models/Equipment.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Models;
+use App\Enums\RecordStatusEnum;
+use App\Models\Traits\HasLocalizedName;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Facades\Session;
+use App\Traits\AuditLogTrait;
+
+class Equipment extends BaseModel
+{
+    public $timestamps = false;
+    use HasFactory;
+    use HasLocalizedName;
+    use AuditLogTrait;
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'equipments';
+
+    protected $appends = ['name'];
+
+    protected $primaryKey = 'id';
+
+
+
+    protected $fillable = [
+        'code', 'room_id', 'name_en','capacity', 'model', 'serial_number', 'organization_id',
+        'equipment_type_concept_id', 'min_temperature', 'max_temperature', 'status', 'installed_date',
+        BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD,
+        BaseModel::DELETED_AT_FIELD, BaseModel::DELETED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD
+    ];
+
+    public static function boot()
+    {
+        parent::boot();
+    }
+
+    public function type(){
+        return $this->belongsTo(Concept::class, 'equipment_type_concept_id', 'id');
+    }
+
+    public function room(){
+        return $this->belongsTo(Room::class, 'room_id', 'id');
+    }
+
+    public function racks(){
+        return $this->hasMany(Rack::class, 'equipment_id', 'id');
+    }
+
+}

app/Models/IncidentType.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Models;
+use App\Enums\RecordStatusEnum;
+use App\Models\Traits\HasLocalizedName;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Facades\Session;
+use App\Traits\AuditLogTrait;
+
+class IncidentType extends BaseModel
+{
+    public $timestamps = false;
+    use HasFactory;
+    use HasLocalizedName;
+    use AuditLogTrait;
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+
+    protected $appends = ['name'];
+
+    protected $primaryKey = 'id';
+
+
+
+    protected $fillable = [
+        'code', 'name_en','name_kh', 'description',
+        BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD,
+        BaseModel::DELETED_AT_FIELD, BaseModel::DELETED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD
+    ];
+
+    public static function boot()
+    {
+        parent::boot();
+    }
+
+
+}

app/Models/Invoice.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Enums\RecordStatusEnum;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class Invoice extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $table = 'invoices';
-
-    protected $fillable = ['invoice_code', 'sample_id', 'total', 'discount','discount_type', 'gross_total', 'deposit', 'bank_deposit', 'balance',
-        'pay_type', 'invoice_date', 'invoice_note', 'bank_name', 'transaction_ref', 'lab_id', 'is_hide_discount', 'first_paid_date','exchange_rate', BaseModel::CREATED_AT_FIELD, BaseModel::CREATED_BY_FIELD,
-        BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD
-    ];
-
-    protected $hidden = [BaseModel::CREATED_AT_FIELD, BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    public function lab(){
-        return $this->belongsTo(Laboratory::class, 'lab_id','id');
-    }
-
-    public function sample(){
-        return $this->belongsTo(Sample::class, 'sample_id','id');
-    }
-
-    public function invoiceDetail(){
-        return $this->hasMany(InvoiceDetail::class, 'invoice_id', 'id')->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE);
-    }
-    
-    public function repayments(){
-        return $this->hasMany(Repayment::class, 'invoice_id', 'id')->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE);
-    }
-    
-    public function creator()
-    {
-        return $this->belongsTo(User::class, 'created_by');
-    }
-    
-    public function modifier()
-    {
-        return $this->belongsTo(User::class, 'updated_by');
-    }
-    
-
-}

app/Models/InvoiceDetail.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Models;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class InvoiceDetail extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $table = 'invoice_details';
-
-    protected $fillable = ['invoice_id', 'test_sample_id', 'test_name', 'weight', 'qty', 'unit_price', 'discount_type', 'discount', BaseModel::CREATED_AT_FIELD, BaseModel::CREATED_BY_FIELD,
-        BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD
-    ];
-
-    protected $hidden = [BaseModel::CREATED_AT_FIELD, BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-    
-    public function testSample(){
-        return $this->belongsTo(TestSample::class, 'test_sample_id', 'id');
-    }
-
-
-}

app/Models/Laboratory.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Enums\RecordStatusEnum;
-use App\Models\Traits\HasLocalizedName;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Support\Facades\Session;
-use App\Traits\AuditLogTrait;
-
-class Laboratory extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    use HasLocalizedName;
-    use AuditLogTrait;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-
-    protected $appends = ['name'];
-
-    protected $primaryKey = 'id';
-
-
-
-    protected $fillable = [
-        'name_en', 'name_kh', 'short_name', 'address_en', 'address_kh', 'sample_number', 'patient_code', 'is_hide_inv_discount',
-        'verify_label', 'technician_label', 'logo', 'discount_type','currency', BaseModel::CREATED_AT_FIELD, 'start_date', 'end_date',
-        'phone_number', 'email', 'shareable_lab_result','allow_external_request','telegrambot','exchange_rate','result_header_id','show_result_footer',
-        'abnormal_result_font_weight','abnormal_text_color','is_hide_comission_percentage','invoice_template_id','alternative_logo','alter_verify_sign','alter_labtech_sign',
-        'alternative_footer', 'footer', 'is_auto_make_invoice',
-        BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD
-    ];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    public function userLabCovers(){
-        return $this->hasMany('App\Models\UserLabCover', 'lab_id','id')->where('record_status_id', RecordStatusEnum::ACTIVE);
-    }
-
-    public function labUsers(){
-        return $this->hasMany('App\Models\UserLabCover', 'lab_id','id')->where('record_status_id', RecordStatusEnum::ACTIVE)->where('lab_id', Session::get('base_lab_id'));
-    }
-
-}

app/Models/Organism.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Enums\RecordStatusEnum;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class Organism extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $fillable = ['name_en', 'weight', 'is_bold', 'lab_id'];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    public function lab(){
-        return $this->belongsTo('App\Models\Laboratory', 'lab_id','id');
-    }
-
-}

app/Models/OrganismResult.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Enums\RecordStatusEnum;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class OrganismResult extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $fillable = ['organism_id','test_result_id','quantity_id','contaminant','lab_id','created_at','created_by','updated_at','updated_by','record_status_id'];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-
-}

app/Models/Organization.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Models;
+use App\Enums\RecordStatusEnum;
+use App\Models\Traits\HasLocalizedName;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Facades\Session;
+use App\Traits\AuditLogTrait;
+
+class Organization extends BaseModel
+{
+    public $timestamps = false;
+    use HasFactory;
+    use HasLocalizedName;
+    use AuditLogTrait;
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+
+    protected $appends = ['name'];
+
+    protected $primaryKey = 'id';
+
+
+
+    protected $fillable = [
+        'code', 'name_en','name_kh', 'latitude', 'longtitude', 'registered_at', 'village_id',
+        BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD,
+        BaseModel::DELETED_AT_FIELD, BaseModel::DELETED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD
+    ];
+
+    public static function boot()
+    {
+        parent::boot();
+    }
+
+//    public function userLabCovers(){
+//        return $this->hasMany('App\Models\UserOrganization', 'organization_id','id')->where('record_status_id', RecordStatusEnum::ACTIVE);
+//    }
+//
+//    public function labUsers(){
+//        return $this->hasMany('App\Models\UserOrganization', 'organization_id','id')->where('record_status_id', RecordStatusEnum::ACTIVE)->where('organization_id', Session::get('base_organization_id'));
+//    }
+
+    public function buildings(){
+        return $this->hasMany(Building::class, 'organization_id', 'id');
+    }
+
+}

app/Models/Pathogen.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Models;
+use App\Enums\RecordStatusEnum;
+use App\Models\Traits\HasLocalizedName;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Facades\Session;
+use App\Traits\AuditLogTrait;
+
+class Pathogen extends BaseModel
+{
+    public $timestamps = false;
+    use HasFactory;
+    use HasLocalizedName;
+    use AuditLogTrait;
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+
+    protected $appends = ['name'];
+
+    protected $primaryKey = 'id';
+
+    protected $fillable = [
+        'pathogen_category_concept_id','scientific_name', 'common_name', 'risk_group_concept_id',
+        'biosafety_level_concept_id', 'infectious_dose', 'transmission_mode', 'storage_requirement', 'min_temp', 'max_temp',
+        BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD,
+        BaseModel::DELETED_AT_FIELD, BaseModel::DELETED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD
+    ];
+
+    public static function boot()
+    {
+        parent::boot();
+    }
+
+    public function pathogenType(){
+        return $this->belongsTo(Concept::class, 'pathogen_category_concept_id', 'id');
+    }
+
+    public function riskGroup(){
+        return $this->belongsTo(Concept::class, 'risk_group_concept_id', 'id');
+    }
+
+    public function bsl(){
+        return $this->belongsTo(Concept::class, 'biosafety_level_concept_id', 'id');
+    }
+
+
+}

app/Models/PathogenInventorySample.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Models;
+
+use App\Traits\AuditLogTrait;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class PathogenInventorySample extends BaseModel
+{
+    public $timestamps = false;
+
+    use HasFactory;
+    use AuditLogTrait;
+
+    protected $table = 'samples';
+
+    protected $primaryKey = 'id';
+
+    protected $fillable = [
+        'organization_id',
+        'pathogen_id',
+        'sample_type_concept_id',
+        'container_type_id',
+        'risk_group_concept_id',
+        'biosafety_level_concept_id',
+        'sample_code',
+        'accession_number',
+        'soc_concept_id',
+        'collected_at',
+        'collected_by',
+        'received_date',
+        'received_by',
+        'initial_volume',
+        'volume_unit',
+        'remaining_volume',
+        'is_own',
+        'owner_organization_id',
+        'status',
+        BaseModel::CREATED_AT_FIELD,
+        BaseModel::CREATED_BY_FIELD,
+        BaseModel::UPDATED_AT_FIELD,
+        BaseModel::UPDATED_BY_FIELD,
+        BaseModel::DELETED_AT_FIELD,
+        BaseModel::DELETED_BY_FIELD,
+        BaseModel::RECORD_STATUS_FIELD,
+    ];
+
+    public static function boot()
+    {
+        parent::boot();
+    }
+
+    public function pathogen()
+    {
+        return $this->belongsTo(Pathogen::class, 'pathogen_id', 'id');
+    }
+
+    public function aliquots()
+    {
+        return $this->hasMany(Aliquot::class, 'sample_id', 'id');
+    }
+}

app/Models/Patient.php

@@ -1,74 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Enums\RecordStatusEnum;
-use DateTime;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Session;
-use App\Traits\AuditLogTrait;
-
-class Patient extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    use AuditLogTrait;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-
-    protected $fillable =
-        [
-            'name_en',
-            'dob',
-            'patient_uuid',
-            'gender',
-            'marital_status',
-            'phone_number',
-            'khid_number',
-            'house_number',
-            'street_number',
-            'province_id',
-            'district_id',
-            'commune_id',
-            'village_id',
-            'lab_id',
-            self::CREATED_AT_FIELD,
-            self::CREATED_BY_FIELD,
-            self::UPDATED_BY_FIELD,
-            BaseModel::RECORD_STATUS_FIELD
-        ];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    public function  province(){
-        return $this->belongsTo(Province::class,'province_id','id');
-    }
-
-    public function  district(){
-        return $this->belongsTo(District::class,'district_id','id');
-    }
-
-    public function  commune(){
-        return $this->belongsTo(Commune::class,'commune_id','id');
-    }
-
-    public function  village(){
-        return $this->belongsTo(Village::class,'village_id','id');
-    }
-
-    public function samples(){
-        return $this->hasMany(Sample::class,'patient_id','id')
-            ->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => Session::get('base_lab_id')]);
-    }
-    
-    public function telegramChatId(){
-        return $this->belongsTo(PatientTelegram::class,'id', 'patient_id');
-    }
-
-}

app/Models/PatientTelegram.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Enums\RecordStatusEnum;
-use DateTime;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Session;
-
-class PatientTelegram extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    
-    protected $table = 'patient_telegram';
-
-    protected $fillable =
-        [
-            'patient_id',
-            'chat_id',
-            self::CREATED_AT_FIELD,
-            self::CREATED_BY_FIELD,
-            self::UPDATED_BY_FIELD,
-            BaseModel::RECORD_STATUS_FIELD
-        ];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-}

app/Models/PatientType.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Models;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class PatientType extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-
-    protected $fillable = ['name_en', 'range_start', 'range_start_unit','range_en','range_end_unit','lab_id'];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-}

app/Models/Physician.php

@@ -12,7 +12,7 @@ class Physician extends BaseModel
      *
      * @var string
      */
-    protected $fillable = ['name_en', 'name_kh','phone','logo','footer','lab_id','is_default'];
+    protected $fillable = ['name_en', 'name_kh','phone','logo','footer','organization_id','is_default'];
 
     protected $hidden = ['created_at', 'created_by', 'updated_at', 'updated_by','record_status_id'];
 
@@ -22,7 +22,7 @@ class Physician extends BaseModel
     }
 
     public function lab(){
-        return $this->belongsTo('App\Models\Laboratory', 'lab_id','id');
+        return $this->belongsTo('App\Models\Organization', 'organization_id','id');
     }
 
 }

app/Models/PhysicianCommission.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Models;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class PhysicianCommission extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $table = 'physician_commisssion';
-
-    protected $primaryKey = 'id';
-
-    protected $fillable = ['physician_id', 'test_sample_id','commission_rate','partner_price','commission_type', 'lab_id', 'created_at', 'created_by', 'updated_at', 'updated_by','record_status_id'];
-
-    protected $hidden = ['created_at', 'created_by', 'updated_at', 'updated_by','record_status_id'];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    public function lab(){
-        return $this->belongsTo('App\Models\Laboratory', 'lab_id','id');
-    }
-
-}

app/Models/Position.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Models;
+
+use App\Traits\AuditLogTrait;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class Position extends BaseModel
+{
+    public $timestamps = false;
+
+    use HasFactory;
+    use AuditLogTrait;
+
+    protected $table = 'positions';
+
+    protected $primaryKey = 'id';
+
+    protected $fillable = [
+        'box_id',
+        'code',
+        'row_label',
+        'column_label',
+        'occupied',
+        BaseModel::CREATED_AT_FIELD,
+        BaseModel::CREATED_BY_FIELD,
+        BaseModel::UPDATED_AT_FIELD,
+        BaseModel::UPDATED_BY_FIELD,
+        BaseModel::DELETED_AT_FIELD,
+        BaseModel::DELETED_BY_FIELD,
+        BaseModel::RECORD_STATUS_FIELD,
+    ];
+
+    public static function boot()
+    {
+        parent::boot();
+    }
+
+    public function box()
+    {
+        return $this->belongsTo(Box::class, 'box_id', 'id');
+    }
+
+    public function aliquot()
+    {
+        return $this->hasOne(Aliquot::class, 'storage_position_id', 'id')
+            ->where(BaseModel::RECORD_STATUS_FIELD, BaseModel::RECORD_STATUS_ACTIVE);
+    }
+}

app/Models/PublicationReceiver.php

@@ -14,7 +14,7 @@ class PublicationReceiver extends BaseModel
      */
     protected $table = 'publication_receivers';
     protected $primaryKey = 'id';
-    protected $fillable = ['lab_id','publication_id', BaseModel::CREATED_AT_FIELD, BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD];
+    protected $fillable = ['organization_id','publication_id', BaseModel::CREATED_AT_FIELD, BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD];
 
     public static function boot()
     {

app/Models/Quantity.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Models;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class Quantity extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $fillable = ['quantity_name','lab_id', BaseModel::CREATED_AT_FIELD, BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    public function lab(){
-        return $this->belongsTo('App\Models\Laboratory', 'lab_id','id');
-    }
-
-}

app/Models/Rack.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Models;
+
+use App\Traits\AuditLogTrait;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class Rack extends BaseModel
+{
+    public $timestamps = false;
+
+    use HasFactory;
+    use AuditLogTrait;
+
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'racks';
+
+    protected $primaryKey = 'id';
+
+    protected $fillable = [
+        'equipment_id',
+        'code',
+        'name',
+        'description',
+        BaseModel::CREATED_AT_FIELD,
+        BaseModel::CREATED_BY_FIELD,
+        BaseModel::UPDATED_AT_FIELD,
+        BaseModel::UPDATED_BY_FIELD,
+        BaseModel::DELETED_AT_FIELD,
+        BaseModel::DELETED_BY_FIELD,
+        BaseModel::RECORD_STATUS_FIELD,
+    ];
+
+    public static function boot()
+    {
+        parent::boot();
+    }
+
+    public function equipment()
+    {
+        return $this->belongsTo(Equipment::class, 'equipment_id', 'id');
+    }
+
+    public function boxes()
+    {
+        return $this->hasMany(Box::class, 'rack_id', 'id');
+    }
+}

app/Models/RejectComment.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Models;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class RejectComment extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-
-    protected $fillable = [
-        'sample_condition_id',
-        'reject_comment',
-        'lab_id',
-        BaseModel::CREATED_AT_FIELD,
-        BaseModel::CREATED_BY_FIELD
-    ];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-}

app/Models/Repayment.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Enums\RecordStatusEnum;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class Repayment extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $table = 'repayments';
-    protected $primaryKey='id';
-
-    protected $fillable = [
-        'invoice_id',
-        'amount_to_pay',
-        'discount',
-        'amount_after_discount',
-        'discount_type',
-        'cash_repayment_amount',
-        'bank_repayment_amount',
-        'repayment_date',
-        'payment_method',
-        'bank_name',
-        'transaction_ref',
-        'notes',
-        'lab_id',
-        'exchange_rate',
-        BaseModel::CREATED_AT_FIELD,
-        BaseModel::CREATED_BY_FIELD,
-        BaseModel::UPDATED_AT_FIELD,
-        BaseModel::UPDATED_BY_FIELD,
-        BaseModel::RECORD_STATUS_FIELD
-    ];
-
-    protected $hidden = [
-        'lab_id',
-        BaseModel::CREATED_AT_FIELD,
-        BaseModel::CREATED_BY_FIELD,
-        BaseModel::UPDATED_AT_FIELD,
-        BaseModel::UPDATED_BY_FIELD,
-        BaseModel::RECORD_STATUS_FIELD
-    ];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    public function invoice(){
-        return $this->belongsTo(Invoice::class, 'invoice_id','id');
-    }
-
-}

app/Models/Role.php

@@ -18,10 +18,10 @@ class Role extends BaseModel
         parent::boot();
     }
 
-    protected $fillable = ['name_en', 'lab_id'];
+    protected $fillable = ['name_en', 'organization_id'];
 
     public function lab(){
-        return $this->belongsTo(Laboratory::class, 'lab_id');
+        return $this->belongsTo(Organization::class, 'organization_id');
     }
 
 }

app/Models/Room.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Models;
+use App\Enums\RecordStatusEnum;
+use App\Models\Traits\HasLocalizedName;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Facades\Session;
+use App\Traits\AuditLogTrait;
+
+class Room extends BaseModel
+{
+    public $timestamps = false;
+    use HasFactory;
+    use HasLocalizedName;
+    use AuditLogTrait;
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+
+    protected $appends = ['name'];
+
+    protected $primaryKey = 'id';
+
+
+
+    protected $fillable = [
+        'code', 'name_en','name_kh', 'description', 'biosafety_level_concept_id', 'building_id', 'temperature_range', 'organization_id',
+        BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD,
+        BaseModel::DELETED_AT_FIELD, BaseModel::DELETED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD
+    ];
+
+    public static function boot()
+    {
+        parent::boot();
+    }
+
+    public function building(){
+        return $this->belongsTo(Building::class, 'building_id', 'id');
+    }
+
+    public function bsl(){
+        return $this->belongsTo(Concept::class, 'biosafety_level_concept_id', 'id');
+    }
+
+    public function equipments(){
+        return $this->hasMany(Equipment::class, 'room_id', 'id');
+    }
+
+}

app/Models/Sample.php

@@ -19,7 +19,7 @@ class Sample extends BaseModel
 
     protected $fillable = ['patient_id','admission_date','sample_number','sample_source_id','physician_id',
         'sample_condition','reject_comment_id','collected_date','received_date','diagnosis','is_urgent', 'is_printed', 'printed_by','printed_at',
-        'approved_by','approved_date', 'requested_date','is_accept_request','lab_id', BaseModel::CREATED_AT_FIELD, BaseModel::CREATED_BY_FIELD,
+        'approved_by','approved_date', 'requested_date','is_accept_request','organization_id', BaseModel::CREATED_AT_FIELD, BaseModel::CREATED_BY_FIELD,
         BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD,
         'result_template_id'
     ];
@@ -33,27 +33,13 @@ class Sample extends BaseModel
     }
 
     public function lab(){
-        return $this->belongsTo(Laboratory::class, 'lab_id','id');
+        return $this->belongsTo(Organization::class, 'organization_id','id');
     }
 
     public function patient(){
         return $this->belongsTo(Patient::class, 'patient_id','id');
     }
 
-    public function sample_source(){
-        return $this->belongsTo(SampleSource::class, 'sample_source_id','id');
-    }
-
-    public function sample_details(){
-        return $this->hasMany(SampleDetail::class, 'sample_id', 'id')
-            ->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => Session::get('base_lab_id')]);
-    }
-
-    public function sample_tests(){
-        return $this->hasMany(TestResult::class, 'sample_id', 'id')
-            ->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => Session::get('base_lab_id')]);
-    }
-
     public function entryBy(){
         return $this->belongsTo(User::class, 'created_by', 'id');
     }
@@ -66,149 +52,5 @@ class Sample extends BaseModel
         return $this->belongsTo(Physician::class, 'physician_id', 'id');
     }
 
-    public function invoice(){
-        return $this->belongsTo(Invoice::class, 'id', 'sample_id')->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE, 'lab_id' => Session::get('base_lab_id')]);
-    }
-
-    function getStateAttribute(){
-        $state = '#FF0000';
-        $sampleCondition = $this->sample_condition;
-        $samplePrinted = $this->is_printed;
-        $sampleId = $this->id;
-
-        $resultItemsData = DB::select('
-                                    SELECT
-                                        s.id,
-                                        s.`sample_number`,
-                                        SUM(IF(ts.`field_type`>0, 1,0)) AS non_heading_tests,
-                                        SUM(IF(ts.`field_type` IN(1,4) AND tr.test_result IS NOT NULL, 1, 0)) AS done_numeric_tests,
-                                        SUM(IF(ts.`field_type` IN(2,3) AND org_result.total_org_result>0, 1, 0)) AS done_org_test
-                                    FROM samples s
-                                    LEFT JOIN test_results tr
-                                    ON tr.`sample_id` = s.`id`
-                                    AND s.`lab_id` = tr.`lab_id`
-                                    LEFT JOIN test_samples ts
-                                    ON ts.id = tr.`test_sample_id`
-                                    AND ts.lab_id = tr.lab_id
-                                    LEFT JOIN sample_types st
-                                    ON st.id = ts.`sample_type_id`
-                                    LEFT JOIN(
-                                        SELECT
-                                            tr.`id`,
-                                            COUNT(*) AS total_org_result
-                                        FROM samples s
-                                        INNER JOIN test_results tr
-                                        ON tr.`sample_id` = s.`id`
-                                        AND s.`lab_id` = tr.`lab_id`
-                                        INNER JOIN organism_results orgr
-                                        ON orgr.`test_result_id` = tr.`id`
-                                        WHERE s.id = '.$sampleId.'
-                                        AND tr.`record_status_id` = 1
-                                        AND orgr.`record_status_id` = 1
-                                        group by tr.id
-                                    ) AS org_result
-                                    ON org_result.id = tr.`id`
-                                    WHERE s.`id` = '.$sampleId.'
-                                    AND (tr.`record_status_id` = 1 OR tr.`record_status_id` IS NULL)
-	                                AND (st.`record_status_id` = 1 OR st.`record_status_id` IS NULL)
-                                    GROUP BY s.`sample_number`, s.id');
-
-        $non_heading_tests = 0;
-        $done_numeric_tests = 0;
-        $done_org_test = 0;
-        foreach ($resultItemsData as $v){
-            $non_heading_tests = $v->non_heading_tests;
-            $done_numeric_tests = $v->done_numeric_tests;
-            $done_org_test = $v->done_org_test;
-        }
-
-        if(!is_null($sampleCondition) && $sampleCondition==0) $state = '#FFA500'; // orange for rejected
-        elseif(($sampleCondition!=0 || is_null($sampleCondition)) && $samplePrinted) $state = '#3b86d1'; // blue for printed
-        else {
-            if($non_heading_tests==0) $state = '#FF0000';
-            else if($non_heading_tests>0 && $non_heading_tests == ($done_numeric_tests+$done_org_test)){
-                $state = '#008000'; // Green for fully completed
-            }
-            elseif($non_heading_tests>0 && ($done_numeric_tests+$done_org_test)==0){
-                $state = '#FF0000'; // Red for No result at all
-            }
-            elseif(($done_numeric_tests+$done_org_test)>0 && $non_heading_tests >($done_numeric_tests+$done_org_test)){
-                $state = '#FFFF00'; // Yellow for complete some
-            }
-            else $state = '#FF0000'; //Silver for known state
-        }
-        return $state;
-    }
-
-    function getProgressAttribute(){
-        $state = '#FF0000';
-        $sampleCondition = $this->sample_condition;
-        $samplePrinted = $this->is_printed;
-        $sampleId = $this->id;
-
-        $resultItemsData = DB::select('
-                                    SELECT
-                                        s.id,
-                                        s.`sample_number`,
-                                        SUM(IF(ts.`field_type`>0, 1,0)) AS non_heading_tests,
-                                        SUM(IF(ts.`field_type` IN(1,4) AND tr.test_result IS NOT NULL, 1, 0)) AS done_numeric_tests,
-                                        SUM(IF(ts.`field_type` IN(2,3) AND org_result.total_org_result>0, 1, 0)) AS done_org_test
-                                    FROM samples s
-                                    LEFT JOIN test_results tr
-                                    ON tr.`sample_id` = s.`id`
-                                    AND s.`lab_id` = tr.`lab_id`
-                                    LEFT JOIN test_samples ts
-                                    ON ts.id = tr.`test_sample_id`
-                                    AND ts.lab_id = tr.lab_id
-                                    LEFT JOIN sample_types st
-                                    ON st.id = ts.`sample_type_id`
-                                    LEFT JOIN(
-                                        SELECT
-                                            tr.`id`,
-                                            COUNT(*) AS total_org_result
-                                        FROM samples s
-                                        INNER JOIN test_results tr
-                                        ON tr.`sample_id` = s.`id`
-                                        AND s.`lab_id` = tr.`lab_id`
-                                        INNER JOIN organism_results orgr
-                                        ON orgr.`test_result_id` = tr.`id`
-                                        WHERE s.id = '.$sampleId.'
-                                        AND tr.`record_status_id` = 1
-                                        AND orgr.`record_status_id` = 1
-                                        group by tr.id
-                                    ) AS org_result
-                                    ON org_result.id = tr.`id`
-                                    WHERE s.`id` = '.$sampleId.'
-                                    AND (tr.`record_status_id` = 1 OR tr.`record_status_id` IS NULL)
-	                                AND (st.`record_status_id` = 1 OR st.`record_status_id` IS NULL)
-                                    GROUP BY s.`sample_number`, s.id');
-
-        $non_heading_tests = 0;
-        $done_numeric_tests = 0;
-        $done_org_test = 0;
-        foreach ($resultItemsData as $v){
-            $non_heading_tests = $v->non_heading_tests;
-            $done_numeric_tests = $v->done_numeric_tests;
-            $done_org_test = $v->done_org_test;
-        }
-
-        if(!is_null($sampleCondition) && $sampleCondition==0) $state = __('sample.filter_rejected'); // '#FFA500'; // orange for rejected
-        elseif(($sampleCondition!=0 || is_null($sampleCondition)) && $samplePrinted) $state = __('sample.filter_printed'); // '#3b86d1'; // blue for printed
-        else {
-            if($non_heading_tests==0) $state = __('sample.filter_pending');
-            else if($non_heading_tests>0 && $non_heading_tests == ($done_numeric_tests+$done_org_test)){
-                $state = __('sample.filter_completed'); // '#008000'; // Green for fully completed
-            }
-            elseif($non_heading_tests>0 && ($done_numeric_tests+$done_org_test)==0){
-                $state = __('sample.filter_pending'); //'#FF0000'; // Red for No result at all
-            }
-            elseif(($done_numeric_tests+$done_org_test)>0 && $non_heading_tests >($done_numeric_tests+$done_org_test)){
-                $state = __('sample.filter_processing'); // '#FFFF00'; // Yellow for complete some
-            }
-            else $state =  __('sample.filter_pending'); //Silver for known state
-        }
-        return $state;
-    }
-
 
 }

app/Models/SampleDetail.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Models;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class SampleDetail extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $fillable = [
-        'sample_id',
-        'sample_type_id',
-        'test_date',
-        'lab_technician_id',
-        'sample_comment',
-        'sample_descr',
-        'sample_volume_1',
-        'sample_volume_2',
-        'printed_date',
-        'printed_by',
-        'lab_id'
-    ];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-
-}

app/Models/SampleSource.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Models;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class SampleSource extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $fillable = ['name_en', 'name_kh', 'lab_id','is_default'];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    public function lab(){
-        return $this->belongsTo('App\Models\Laboratory', 'lab_id','id');
-    }
-
-    public function telegramChatId(){
-        return $this->belongsTo(SampleSourceTelegram::class,'id', 'sample_source_id');
-    }
-
-}

app/Models/SampleSourceTelegram.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Enums\RecordStatusEnum;
-use DateTime;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Session;
-
-class SampleSourceTelegram extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    
-    protected $table = 'sample_source_telegram';
-
-    protected $fillable =
-        [
-            'sample_source_id',
-            'chat_id',
-            self::CREATED_AT_FIELD,
-            self::CREATED_BY_FIELD,
-            self::UPDATED_BY_FIELD,
-            BaseModel::RECORD_STATUS_FIELD
-        ];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-}

app/Models/SampleType.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Enums\RecordStatusEnum;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Support\Facades\Session;
-
-class SampleType extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-
-    protected $table='sample_types';
-
-    protected $fillable = ['name_en', 'weight', 'department_id','tube','description','lab_id','bg_color','color', 'enter_form_id', 'preview_form_id'];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    public function department(){
-        return $this->belongsTo(Department::class, 'department_id');
-    }
-
-    public function testSamples(){
-        return $this->hasMany(TestSample::class, 'sample_type_id')
-            ->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE])
-            //->where('lab_id', Session::get('base_lab_id'))
-            ->orderBy('weight');
-    }
-
-}

app/Models/Supplier.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Models;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class Supplier extends BaseModel
-{
-    public $timestamps = true;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-
-    protected $table = 'suppliers';
-    protected $primaryKey = 'id';
-
-    protected $fillable = [
-        'name_en',
-        'name_kh',
-        'contact_name',
-        'position',
-        'phone_number',
-        'email',
-        'address',
-        'website',
-        'vat_number',
-        'description',
-        'lab_id',
-        'created_at',
-        'created_by',
-        'updated_at',
-        'updated_by',
-        'record_status_id'
-    ];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-}

app/Models/Test.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Models;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class Test extends BaseModel
-{
-    public $timestamps = true;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-
-    protected $table = 'tests';
-
-    protected $fillable = ['name_en','lab_id','created_at','created_by','record_status_id'];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    public function lab(){
-        return $this->belongsTo('App\Models\Laboratory', 'lab_id','id');
-    }
-
-}

app/Models/TestCategory.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Enums\RecordStatusEnum;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class TestCategory extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-
-    protected $table='test_categories';
-
-    protected $fillable = ['name_en', BaseModel::CREATED_AT_FIELD, BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-
-}

app/Models/TestGroup.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Enums\RecordStatusEnum;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class TestGroup extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-
-    protected $table='test_groups';
-
-    protected $fillable = ['group_name', 'lab_id', BaseModel::CREATED_AT_FIELD, BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    public function testGroupDetails(){
-        return $this->hasMany(TestGroupDetail::class, 'test_group_id', 'id')->where([BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE]);
-    }
-
-}

app/Models/TestGroupDetail.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Enums\RecordStatusEnum;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class TestGroupDetail extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-
-    protected $table='test_group_details';
-
-    protected $fillable = ['test_group_id','test_sample_id', 'lab_id', BaseModel::CREATED_AT_FIELD, BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD, BaseModel::UPDATED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-}

app/Models/TestNormalValue.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Models;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class TestNormalValue extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $fillable = ['test_sample_id','patient_type_id','sign','minimum','maximum',
-        BaseModel::CREATED_AT_FIELD, BaseModel::CREATED_BY_FIELD, BaseModel::UPDATED_AT_FIELD,
-        BaseModel::UPDATED_BY_FIELD, BaseModel::RECORD_STATUS_FIELD
-    ];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-}

app/Models/TestResult.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Enums\RecordStatusEnum;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class TestResult extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-
-    //protected $appends = ['usd_price'];
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    protected $fillable = ['sample_id', 'test_sample_id','test_result', 'is_show', 'test_date', 'performed_by', 'lab_id', BaseModel::CREATED_AT_FIELD, BaseModel::CREATED_BY_FIELD];
-
-    function testSample(){
-        return $this->belongsTo(TestSample::class,'test_sample_id','id')->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE);
-    }
-
-//    function organismResults(){
-//        return $this->hasMany(OrganismResult::class,'test_result_id','id')->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE);
-//    }
-
-//    function getUsdPriceAttribute(){
-//        return TestSample::query()->find($this->test_sample_id)->first()->usd_price;
-//    }
-
-
-}

app/Models/TestSample.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Enums\RecordStatusEnum;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Support\Facades\Session;
-
-class TestSample extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-
-    protected $table='test_samples';
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    protected $fillable = ['sample_type_id', 'test_id','heading_id', 'group_result','category', 'code',
-        'unit_sign','usd_price', 'weight', 'lab_id','field_type', 'formula', 'format',
-        'description','is_bold','autocomplete_bind', BaseModel::CREATED_AT_FIELD, BaseModel::CREATED_BY_FIELD];
-
-    public function test(){
-        return $this->belongsTo(Test::class, 'test_id','id');
-    }
-
-    public function sample(){
-        return $this->belongsTo(SampleType::class, 'sample_type_id','id');
-    }
-
-    public function lab(){
-        return $this->belongsTo(Laboratory::class, 'lab_id','id');
-    }
-
-    public function organisms(){
-        return $this->hasMany(TestSampleOrganism::class, 'test_sample_id', 'id')->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE);
-    }
-
-    public function tests(){
-        return $this->hasMany(self::class, 'heading_id','id')->where([
-            BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE,
-            'lab_id' => Session::get('base_lab_id')
-        ]);
-    }
-
-    public function childTest(){
-        return $this->hasMany(self::class, 'heading_id','id')->where([
-            BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::ACTIVE,
-            'lab_id' => Session::get('base_lab_id')
-        ]);
-    }
-
-    public function testValues(){
-        return $this->hasMany(TestNormalValue::class, 'test_sample_id', 'id')->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE);
-    }
-
-}

app/Models/TestSampleOrganism.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Enums\RecordStatusEnum;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class TestSampleOrganism extends BaseModel
-{
-    public $timestamps = false;
-    use HasFactory;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-
-    public static function boot()
-    {
-        parent::boot();
-    }
-
-    protected $fillable = ['test_sample_id','organism_id','is_default', 'lab_id', 'created_at', 'created_by', 'updated_at', 'updated_by', 'record_status_id'];
-
-    protected $hidden = ['created_at', 'created_by', 'updated_at', 'updated_by'];
-
-    public function organism(){
-        return $this->belongsTo('App\Models\Organism', 'organism_id', 'id')->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE);
-    }
-
-
-}

app/Models/User.php

@@ -47,8 +47,8 @@ class User extends Authenticatable
         return $this->belongsTo('App\Models\Role', 'role_id','id');
     }
 
-    public function lab_covers(){
-        return $this->hasMany('App\Models\UserLabCover', 'user_id','id')->where('record_status_id', RecordStatusEnum::ACTIVE );
+    public function userOrganizations(){
+        return $this->hasMany('App\Models\UserOrganization', 'user_id','id')->where('record_status_id', RecordStatusEnum::ACTIVE );
     }
 
 }

app/Models/UserOrganization.php

@@ -7,11 +7,12 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 
-class UserLabCover extends Authenticatable
+class UserOrganization extends Authenticatable
 {
+    protected $table = 'user_organizations';
 
-    public function lab(){
-        return $this->belongsTo('App\Models\Laboratory', 'lab_id','id');
+    public function organization(){
+        return $this->belongsTo('App\Models\Organization', 'organization_id','id');
     }
 
     public function user(){

config/labis.php

@@ -1,51 +0,0 @@
-<?php
-
-return [
-
-    'pagination' => [
-        'perpage' => 20,
-    ],
-
-    'auto_complete_items' => [
-        'Positive ',
-        'Negative ',
-		'Normal ',
-		'Abnormal',
-		'POSITIVE ',
-        'NEGATIVE ',
-		'Trace',
-		'(1+)',
-		'(2+)',
-		'(3+)',
-    ],
-    'baseManagerMenus' =>[
-        'department',
-        'sample-type',
-        'test',
-        'comment',
-        'organism',
-        'antibiotic',
-        'quantity',
-        'ward',
-        'hospital-service',
-        'patient-type',
-        'physician',
-        'lab-users'
-    ],
-
-    'administrator' => [
-        'concept-code',
-        'publication',
-        'hospital',
-        'user',
-        'role',
-        'clone-hospital'
-    ],
-
-    'sample' => [
-        'sample',
-        'requested'
-    ],
-
-
-];