Complete overhaul of the valueset system to use human-readable names
instead of numeric IDs for improved maintainability and API consistency.
- PatientController: Renamed 'Gender' field to 'Sex' in validation rules
- ValuesetController: Changed API endpoints from ID-based (/:num) to name-based (/:any)
- TestsController: Refactored to use ValueSet library instead of direct valueset queries
- Added ValueSet library (app/Libraries/ValueSet.php) with static lookup methods:
- getOptions() - returns dropdown format [{value, label}]
- getLabel(, ) - returns label for a value
- transformLabels(, ) - batch transform records
- get() and getRaw() for Lookups compatibility
- Added ValueSetApiController for public valueset API endpoints
- Added ValueSet refresh endpoint (POST /api/valueset/refresh)
- Added DemoOrderController for testing order creation without auth
- 2026-01-12-000001: Convert valueset references from VID to VValue
- 2026-01-12-000002: Rename patient.Gender column to Sex
- OrderTestController: Now uses OrderTestModel with proper model pattern
- TestsController: Uses ValueSet library for all lookup operations
- ValueSetController: Simplified to use name-based lookups
- Updated all organization (account/site/workstation) dialogs and index views
- Updated specimen container dialogs and index views
- Updated tests_index.php with ValueSet integration
- Updated patient dialog form and index views
- Removed .factory/config.json and CLAUDE.md (replaced by AGENTS.md)
- Consolidated lookups in Lookups.php (removed inline valueset constants)
- Updated all test files to match new field names
- 32 modified files, 17 new files, 2 deleted files
- Net: +661 insertions, -1443 deletions (significant cleanup)
144 lines
5.1 KiB
PHP
144 lines
5.1 KiB
PHP
<!-- Container Form Modal -->
|
|
<div
|
|
x-show="showModal"
|
|
x-cloak
|
|
class="modal-overlay"
|
|
@click.self="closeModal()"
|
|
x-transition:enter="transition ease-out duration-200"
|
|
x-transition:enter-start="opacity-0"
|
|
x-transition:enter-end="opacity-100"
|
|
x-transition:leave="transition ease-in duration-150"
|
|
x-transition:leave-start="opacity-100"
|
|
x-transition:leave-end="opacity-0"
|
|
>
|
|
<div
|
|
class="modal-content p-6 max-w-xl w-full max-h-[90vh] overflow-y-auto"
|
|
@click.stop
|
|
x-transition:enter="transition ease-out duration-200"
|
|
x-transition:enter-start="opacity-0 transform scale-95"
|
|
x-transition:enter-end="opacity-100 transform scale-100"
|
|
x-transition:leave="transition ease-in duration-150"
|
|
x-transition:leave-start="opacity-100 transform scale-100"
|
|
x-transition:leave-end="opacity-0 transform scale-95"
|
|
>
|
|
<!-- Header -->
|
|
<div class="flex items-center justify-between mb-6">
|
|
<h3 class="font-bold text-xl flex items-center gap-2" style="color: rgb(var(--color-text));">
|
|
<i class="fa-solid fa-flask-vial" style="color: rgb(var(--color-primary));"></i>
|
|
<span x-text="isEditing ? 'Edit Container' : 'New Container'"></span>
|
|
</h3>
|
|
<button class="btn btn-ghost btn-sm btn-square" @click="closeModal()">
|
|
<i class="fa-solid fa-times"></i>
|
|
</button>
|
|
</div>
|
|
|
|
<!-- Form -->
|
|
<div class="space-y-4">
|
|
|
|
<div>
|
|
<label class="label">
|
|
<span class="label-text font-medium">Container Name <span style="color: rgb(var(--color-error));">*</span></span>
|
|
</label>
|
|
<input
|
|
type="text"
|
|
class="input"
|
|
:class="errors.ConName && 'input-error'"
|
|
x-model="form.ConName"
|
|
placeholder="Gold Top Tube"
|
|
/>
|
|
<label class="label" x-show="errors.ConName">
|
|
<span class="label-text-alt" style="color: rgb(var(--color-error));" x-text="errors.ConName"></span>
|
|
</label>
|
|
</div>
|
|
|
|
<div class="grid grid-cols-2 gap-4">
|
|
<div>
|
|
<label class="label">
|
|
<span class="label-text font-medium">Container Code <span style="color: rgb(var(--color-error));">*</span></span>
|
|
</label>
|
|
<input
|
|
type="text"
|
|
class="input font-mono"
|
|
:class="errors.ConCode && 'input-error'"
|
|
x-model="form.ConCode"
|
|
placeholder="GTT-10"
|
|
/>
|
|
<label class="label" x-show="errors.ConCode">
|
|
<span class="label-text-alt" style="color: rgb(var(--color-error));" x-text="errors.ConCode"></span>
|
|
</label>
|
|
</div>
|
|
<div>
|
|
<label class="label">
|
|
<span class="label-text font-medium">Cap Color</span>
|
|
</label>
|
|
<select class="select" x-model="form.Color">
|
|
<option value="">Select Color</option>
|
|
<template x-for="opt in colorOptions" :key="opt.key">
|
|
<option :value="opt.key" x-text="opt.value"></option>
|
|
</template>
|
|
</select>
|
|
</div>
|
|
</div>
|
|
|
|
<div>
|
|
<label class="label">
|
|
<span class="label-text font-medium">Description</span>
|
|
</label>
|
|
<textarea
|
|
class="input h-20 pt-2"
|
|
x-model="form.ConDesc"
|
|
placeholder="Tube description and usage notes..."
|
|
></textarea>
|
|
</div>
|
|
|
|
<div class="grid grid-cols-2 gap-4">
|
|
<div>
|
|
<label class="label">
|
|
<span class="label-text font-medium">Additive</span>
|
|
</label>
|
|
<select class="select" x-model="form.Additive">
|
|
<option value="">Select Additive</option>
|
|
<template x-for="opt in additiveOptions" :key="opt.key">
|
|
<option :value="opt.key" x-text="opt.value"></option>
|
|
</template>
|
|
</select>
|
|
</div>
|
|
<div>
|
|
<label class="label">
|
|
<span class="label-text font-medium">Class</span>
|
|
</label>
|
|
<select class="select" x-model="form.ConClass">
|
|
<option value="">Select Class</option>
|
|
<template x-for="opt in classOptions" :key="opt.key">
|
|
<option :value="opt.key" x-text="opt.value"></option>
|
|
</template>
|
|
</select>
|
|
</div>
|
|
</div>
|
|
|
|
<div>
|
|
<label class="label">
|
|
<span class="label-text font-medium">Site</span>
|
|
</label>
|
|
<select class="select" x-model="form.SiteID">
|
|
<option value="">Select Site</option>
|
|
<template x-for="s in sitesList" :key="s.SiteID">
|
|
<option :value="s.SiteID" x-text="s.SiteName"></option>
|
|
</template>
|
|
</select>
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<!-- Actions -->
|
|
<div class="flex gap-3 mt-8 pt-6" style="border-top: 1px solid rgb(var(--color-border));">
|
|
<button class="btn btn-ghost flex-1" @click="closeModal()">Cancel</button>
|
|
<button class="btn btn-primary flex-1" @click="save()" :disabled="saving">
|
|
<span x-show="saving" class="spinner spinner-sm"></span>
|
|
<i x-show="!saving" class="fa-solid fa-save mr-2"></i>
|
|
<span x-text="saving ? 'Saving...' : 'Save Container'"></span>
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</div>
|