diff --git a/app/Models/Enums/StudyRequestStatus.php b/app/Models/Enums/StudyRequestStatus.php new file mode 100644 index 0000000..11feda3 --- /dev/null +++ b/app/Models/Enums/StudyRequestStatus.php @@ -0,0 +1,11 @@ +getBody()->getContents(), true); $result = []; foreach ($studies as $study) { - $study['LastUpdate'] = Carbon::parse($study['LastUpdate'], 'UTC')->tz(config('app.timezone'))->toDateTimeString(); - $sdt = $study['MainDicomTags']['StudyDate'].' '.$study['MainDicomTags']['StudyTime']; - $study_date = Carbon::createFromFormat('Ymd His.u', $study['MainDicomTags']['StudyDate'].' '.$study['MainDicomTags']['StudyTime'], 'UTC'); - $study['StudyDateTime'] = $study_date->tz(config('app.timezone'))->toDateTimeString(); - + $study['ReceiveDateTime'] = Carbon::parse($study['LastUpdate'], 'UTC'); + $study['StudyDateTime'] = Carbon::createFromFormat('Ymd His.u', $study['MainDicomTags']['StudyDate'].' '.$study['MainDicomTags']['StudyTime'], 'UTC'); $result[] = $study; } diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 5ceb9f0..9fc5606 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -35,7 +35,7 @@ public function definition(): array 'email' => fake()->unique()->safeEmail(), 'email_verified_at' => now(), 'phone' => fake()->phoneNumber(), - 'role' => static::$role ??= UserRole::Technologist->value, + 'role' => static::$role ??= UserRole::Technician->value, 'password' => static::$password ??= Hash::make('password'), 'two_factor_secret' => null, 'two_factor_recovery_codes' => null, diff --git a/database/migrations/2024_12_28_181346_create_study_delete_requests_table.php b/database/migrations/2024_12_28_181346_create_study_delete_requests_table.php new file mode 100644 index 0000000..bf06d90 --- /dev/null +++ b/database/migrations/2024_12_28_181346_create_study_delete_requests_table.php @@ -0,0 +1,30 @@ +id(); + $table->foreignIdFor(Study::class)->unique()->constrained()->cascadeOnDelete(); + $table->foreignIdFor(User::class, 'requesting_user_id')->index()->constrained()->cascadeOnDelete(); + $table->foreignIdFor(User::class, 'performing_user_id')->index()->nullable()->constrained()->nullOnDelete(); + $table->unsignedTinyInteger('status')->default(StudyRequestStatus::Pending->value); + $table->timestamps(); + + $table->index(['status', 'created_at']); + }); + } + + public function down(): void + { + Schema::dropIfExists('study_delete_requests'); + } +}; diff --git a/database/seeders/UserSeeder.php b/database/seeders/UserSeeder.php index 77a6e9b..a45f00b 100644 --- a/database/seeders/UserSeeder.php +++ b/database/seeders/UserSeeder.php @@ -25,12 +25,12 @@ public function run(): void User::factory(2)->create([ 'institute_id' => $chevron->id, - 'role' => UserRole::Technologist->value, + 'role' => UserRole::Technician->value, ]); User::factory(2)->create([ 'institute_id' => $srini->id, - 'role' => UserRole::Technologist->value, + 'role' => UserRole::Technician->value, ]); } } diff --git a/resources/views/pacs/studies.blade.php b/resources/views/pacs/studies.blade.php index 41517d1..0c5d428 100644 --- a/resources/views/pacs/studies.blade.php +++ b/resources/views/pacs/studies.blade.php @@ -36,7 +36,7 @@ {{ $study['StudyDateTime'] }}