wip - workflow steps

This commit is contained in:
Dr Masroor Ehsan 2025-01-31 00:42:58 +06:00
parent 1f7764481c
commit 049d59d39c
5 changed files with 31 additions and 26 deletions

View File

@ -18,7 +18,7 @@ enum WorkflowLevel: int
case Archived = 200; case Archived = 200;
case Cancelled = 240; case Cancelled = 240;
public function description(): string public function describe(): string
{ {
return match ($this) { return match ($this) {
self::Received => 'Study Received', self::Received => 'Study Received',

View File

@ -44,7 +44,10 @@ public function remove(AssignPhysicianRequest $request)
$study->assignedPhysicians()->detach($rad->id); $study->assignedPhysicians()->detach($rad->id);
if ($study->assignedPhysicians()->count() === 0) { if ($study->assignedPhysicians()->count() === 0) {
$study->update(['assigned_at' => null]); $study->update([
'workflow_level' => WorkflowLevel::Unassigned->value,
'assigned_at' => null,
]);
} }
audit() audit()
@ -64,7 +67,10 @@ public function save(AssignPhysicianRequest $request)
$rad = User::active()->findOrFail($request->input('rad_id')); $rad = User::active()->findOrFail($request->input('rad_id'));
$study->assignedPhysicians()->attach($rad->id); $study->assignedPhysicians()->attach($rad->id);
$study->update(['assigned_at' => now()]); $study->update([
'workflow_level' => WorkflowLevel::Assigned->value,
'assigned_at' => now(),
]);
audit() audit()
->did(Activity::Assign_Physician) ->did(Activity::Assign_Physician)
->on($study) ->on($study)

View File

@ -2,13 +2,13 @@
namespace App\Http\Controllers\Staff; namespace App\Http\Controllers\Staff;
use App\Http\Controllers\HashidControllerBase; use App\Http\Controllers\HashedStudyControllerBase;
use App\Models\Study; use App\Models\Study;
use App\Services\AuditTrail\Activity; use App\Services\AuditTrail\Activity;
use Closure; use Closure;
use Illuminate\Support\Str; use Illuminate\Support\Str;
class DicomViewerController extends HashidControllerBase class DicomViewerController extends HashedStudyControllerBase
{ {
public function stone() public function stone()
{ {
@ -22,8 +22,7 @@ public function ohif()
private function loadViewer(Closure $callback) private function loadViewer(Closure $callback)
{ {
$this->decodeKeys(); $study = $this->getStudy();
$study = Study::findOrFail($this->key);
$url = $callback($study); $url = $callback($study);
abort_if(blank($url), 404); abort_if(blank($url), 404);
$title = Str::limit($study->getPatientDemographic(), 40); $title = Str::limit($study->getPatientDemographic(), 40);

View File

@ -3,7 +3,6 @@
namespace App\Models; namespace App\Models;
use App\Domain\ACL\Permission; use App\Domain\ACL\Permission;
use App\Domain\Report\ReportStatus;
use App\Domain\Study\Priority; use App\Domain\Study\Priority;
use App\Domain\Study\WorkflowLevel; use App\Domain\Study\WorkflowLevel;
use App\Models\Traits\HasDepartment; use App\Models\Traits\HasDepartment;
@ -178,23 +177,24 @@ public function isArchived(): bool
public function getWorkflowLevelLedAttribute(): string public function getWorkflowLevelLedAttribute(): string
{ {
$icon = match ($this->workflow_level) { $icon = match ($this->workflow_level) {
WorkflowLevel::Received, WorkflowLevel::Unassigned => 'folder-arrow-down', WorkflowLevel::Received, WorkflowLevel::Unassigned => 'download-2-line',
WorkflowLevel::Assigned => 'identification', WorkflowLevel::Assigned => 'pass-valid-line',
WorkflowLevel::Dictated => 'speaker-wave', WorkflowLevel::Dictated => 'speak-line',
WorkflowLevel::Transcribed => 'chat-bubble-left-ellipsis', WorkflowLevel::Transcribed => 'message-2-line',
WorkflowLevel::Repetition => 'receipt-refund', WorkflowLevel::Repetition => 'repeat-line',
WorkflowLevel::ReadInProgress => 'wrench-screwdriver', WorkflowLevel::ReadInProgress => 'line-chart-line',
WorkflowLevel::DraftAvailable => 'inbox-arrow-down', WorkflowLevel::DraftAvailable => 'draft-line',
WorkflowLevel::Finalized => 'clipboard-document-check', WorkflowLevel::Finalized => 'git-repository-private-line',
WorkflowLevel::UnderReview => 'eye', WorkflowLevel::UnderReview => 'eye-line',
WorkflowLevel::Published => 'shield-check', WorkflowLevel::Published => 'graduation-cap-line',
WorkflowLevel::Archived => 'archive-box', WorkflowLevel::Archived => 'archive-line',
WorkflowLevel::Cancelled => 'archive-box-x-mark', WorkflowLevel::Cancelled => 'close-circle-line',
default => 'cog-6-tooth', default => 'cog-6-tooth',
}; };
return sprintf('<span class="badge badge-center rounded-pill %s"><i class="fa-solid fa-%s"></i></span>', $color, $icon); $descr = $this->workflow_level->describe();
return sprintf('<span class="text-gray" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-original-title="%s" title="%s"><i class="ri-%s"></i></span>', $descr, $descr, $icon);
} }
public function getArchiveLink(): ?string public function getArchiveLink(): ?string
@ -369,14 +369,14 @@ public function isUnlocked(): bool
return $this->locked_at === null; return $this->locked_at === null;
} }
public function lockStudy(User|int|null $user = null, ?WorkflowLevel $status = null): void public function lockStudy(User|int|null $user = null, ?WorkflowLevel $level = null): void
{ {
$params = [ $params = [
'locking_physician_id' => me($user)->id, 'locking_physician_id' => me($user)->id,
'locked_at' => now(), 'locked_at' => now(),
]; ];
if ($status) { if ($level !== null) {
$params['workflow_level'] = $status->value; $params['workflow_level'] = $level->value;
} }
$this->update($params); $this->update($params);

View File

@ -112,7 +112,7 @@ public function check(): ?View
public function lockStudyIfRequired(): void public function lockStudyIfRequired(): void
{ {
if ($this->study->isUnlocked()) { if ($this->study->isUnlocked()) {
$this->study->lockStudy(); $this->study->lockStudy(level: WorkflowLevel::ReadInProgress);
audit() audit()
->on($this->study) ->on($this->study)
->did(Activity::Study_Lock) ->did(Activity::Study_Lock)