diff --git a/app/DAL/Studies.php b/app/DAL/Studies.php index 6db1ca5..0b8cc6a 100644 --- a/app/DAL/Studies.php +++ b/app/DAL/Studies.php @@ -2,8 +2,8 @@ namespace App\DAL; -use Cache; -use DB; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; final readonly class Studies { diff --git a/app/DAL/Studies/WorklistBase.php b/app/DAL/Studies/WorklistBase.php index 7fd0ea1..37894cc 100644 --- a/app/DAL/Studies/WorklistBase.php +++ b/app/DAL/Studies/WorklistBase.php @@ -39,6 +39,11 @@ abstract class WorklistBase implements IUserStudyLister private ?string $reportDateTo = null; + protected static function reportCompleteQuery(Builder $query): Builder + { + return $query->where('report_status', '=', ReportStatus::Authorized->value); + } + public function setRadiologist(int $radiologist_id): self { $this->radiologist_id = $radiologist_id; @@ -53,46 +58,6 @@ public function setStudyStatus(StudyLevelStatus $status): self return $this; } - private function applyRadiologist(Builder $query): Builder - { - if ($this->radiologist_id != null) { - $rad = $this->radiologist_id; - $query = $query->where(function ($query) use ($rad) { - $query->Where('assigned_physician_id', '=', $rad); - $query->orWhere('reporting_physician_id', '=', $rad); - }); - } - - return $query; - } - - protected function getStudiesQuery(): Builder - { - if ($this->archived === null) { - return Study::active(); - } - - return Study::query(); - } - - private function applyStudyStatus(Builder $query): Builder - { - if ($this->studyStatus != null) { - $query = $query->where('study_status', '=', $this->studyStatus->value); - } - - return $query; - } - - private function applyReportStatus(Builder $query): Builder - { - if ($this->reportStatus != null) { - $query = $query->where('report_status', '=', $this->reportStatus->value); - } - - return $query; - } - public function setReportStatus(ReportStatus $status): self { $this->reportStatus = $status; @@ -100,28 +65,6 @@ public function setReportStatus(ReportStatus $status): self return $this; } - protected static function reportCompleteQuery(Builder $query): Builder - { - return $query->where('report_status', '=', ReportStatus::Authorized->value); - } - - protected function applySort(Builder $query): Builder - { - if (! empty($this->sortColumns)) { - foreach ($this->sortColumns as $column => $dir) { - $query = $query->orderBy($column, $dir); - } - - return $query; - } - - return $query - ->orderByDesc('priority') - ->orderByDesc('received_at'); - } - - abstract protected function buildQuery(?int $user_id = null): Builder; - public function query(?int $user_id = null): Builder { $query = $this->buildQuery($user_id); @@ -189,6 +132,87 @@ public function setSearchTerm(string $search): self return $this; } + public function setStudyDate(string $from, ?string $to = null): self + { + $this->studyDateFrom = $from; + $this->studyDateTo = $to; + + return $this; + } + + public function setReceiveDate(string $from, ?string $to = null): self + { + $this->receiveDateFrom = $from; + $this->receiveDateTo = $to; + + return $this; + } + + public function setReportDate(string $from, ?string $to = null): self + { + $this->reportDateFrom = $from; + $this->reportDateTo = $to; + + return $this; + } + + protected function getStudiesQuery(): Builder + { + if ($this->archived === null) { + return Study::active(); + } + + return Study::query(); + } + + protected function applySort(Builder $query): Builder + { + if (! empty($this->sortColumns)) { + foreach ($this->sortColumns as $column => $dir) { + $query = $query->orderBy($column, $dir); + } + + return $query; + } + + return $query + ->orderByDesc('priority') + ->orderByDesc('received_at'); + } + + abstract protected function buildQuery(?int $user_id = null): Builder; + + private function applyRadiologist(Builder $query): Builder + { + if ($this->radiologist_id != null) { + $rad = $this->radiologist_id; + $query = $query->where(function ($query) use ($rad) { + $query->Where('assigned_physician_id', '=', $rad); + $query->orWhere('reporting_physician_id', '=', $rad); + }); + } + + return $query; + } + + private function applyStudyStatus(Builder $query): Builder + { + if ($this->studyStatus != null) { + $query = $query->where('study_status', '=', $this->studyStatus->value); + } + + return $query; + } + + private function applyReportStatus(Builder $query): Builder + { + if ($this->reportStatus != null) { + $query = $query->where('report_status', '=', $this->reportStatus->value); + } + + return $query; + } + private function getPageSize(?int $user_id = null): int { return $this->perPage ?? user_per_page($user_id); @@ -260,28 +284,4 @@ private function applyDateFilters(Builder $query): Builder return $query; } - - public function setStudyDate(string $from, ?string $to = null): self - { - $this->studyDateFrom = $from; - $this->studyDateTo = $to; - - return $this; - } - - public function setReceiveDate(string $from, ?string $to = null): self - { - $this->receiveDateFrom = $from; - $this->receiveDateTo = $to; - - return $this; - } - - public function setReportDate(string $from, ?string $to = null): self - { - $this->reportDateFrom = $from; - $this->reportDateTo = $to; - - return $this; - } } diff --git a/app/Http/Controllers/SocialLoginController.php b/app/Http/Controllers/SocialLoginController.php index e16cd62..fb84a7a 100644 --- a/app/Http/Controllers/SocialLoginController.php +++ b/app/Http/Controllers/SocialLoginController.php @@ -3,7 +3,7 @@ namespace App\Http\Controllers; use App\Models\User; -use Auth; +use Illuminate\Support\Facades\Auth; use Laravel\Socialite\Facades\Socialite; class SocialLoginController extends Controller diff --git a/app/Http/Controllers/Staff/StudyViewerController.php b/app/Http/Controllers/Staff/StudyViewerController.php index eacb680..5cd6051 100644 --- a/app/Http/Controllers/Staff/StudyViewerController.php +++ b/app/Http/Controllers/Staff/StudyViewerController.php @@ -8,6 +8,16 @@ class StudyViewerController extends HashidControllerBase { + public function stone() + { + return $this->loadViewer(fn (Study $study) => $study->getStoneLink()); + } + + public function ohif() + { + return $this->loadViewer(fn (Study $study) => $study->getOhifLink()); + } + private function loadViewer(\Closure $callback) { $this->decodeKeys(); @@ -18,14 +28,4 @@ private function loadViewer(\Closure $callback) return view('staff.studies.viewer', compact('url', 'title')); } - - public function stone() - { - return $this->loadViewer(fn (Study $study) => $study->getStoneLink()); - } - - public function ohif() - { - return $this->loadViewer(fn (Study $study) => $study->getOhifLink()); - } } diff --git a/app/Models/CustomPersonalAccessToken.php b/app/Models/CustomPersonalAccessToken.php index a08073e..47edc66 100644 --- a/app/Models/CustomPersonalAccessToken.php +++ b/app/Models/CustomPersonalAccessToken.php @@ -23,14 +23,6 @@ function () use ($token) { return $token; } - public function getTokenableAttribute() - { - return Cache::remember("PersonalAccessToken::{$this->id}::tokenable", 600, - function () { - return parent::tokenable()->first(); - }); - } - public static function boot() { parent::boot(); @@ -50,4 +42,12 @@ public static function boot() return false; }); } + + public function getTokenableAttribute() + { + return Cache::remember("PersonalAccessToken::{$this->id}::tokenable", 600, + function () { + return parent::tokenable()->first(); + }); + } } diff --git a/app/Models/SharedStudy.php b/app/Models/SharedStudy.php index 51f0179..2e788aa 100644 --- a/app/Models/SharedStudy.php +++ b/app/Models/SharedStudy.php @@ -22,14 +22,6 @@ public function sender(): BelongsTo return $this->belongsTo(User::class, 'sender_id'); } - protected function casts(): array - { - return [ - 'expires_at' => 'datetime', - 'access_flags' => StudyAccessFlags::class, - ]; - } - public function isPasswordProtected(): bool { return ! blank($this->access_password); @@ -52,4 +44,12 @@ public function hasExpired(): bool return $this->expires_at->isPast(); } + + protected function casts(): array + { + return [ + 'expires_at' => 'datetime', + 'access_flags' => StudyAccessFlags::class, + ]; + } } diff --git a/app/Models/Study.php b/app/Models/Study.php index ae0bbf3..2d49178 100644 --- a/app/Models/Study.php +++ b/app/Models/Study.php @@ -18,21 +18,6 @@ class Study extends BaseModel { use HashableId; - protected function casts(): array - { - return [ - 'is_locked' => 'boolean', - 'is_archived' => 'boolean', - 'study_status' => StudyLevelStatus::class, - 'report_status' => ReportStatus::class, - 'priority' => Priority::class, - 'received_at' => 'immutable_datetime', - 'reported_at' => 'immutable_datetime', - 'assigned_at' => 'immutable_datetime', - 'study_date' => 'immutable_datetime', - ]; - } - public function details(): HasOne { return $this->hasOne(StudyDetails::class); @@ -268,4 +253,19 @@ public function getPriorityIcon(): string default => '', }; } + + protected function casts(): array + { + return [ + 'is_locked' => 'boolean', + 'is_archived' => 'boolean', + 'study_status' => StudyLevelStatus::class, + 'report_status' => ReportStatus::class, + 'priority' => Priority::class, + 'received_at' => 'immutable_datetime', + 'reported_at' => 'immutable_datetime', + 'assigned_at' => 'immutable_datetime', + 'study_date' => 'immutable_datetime', + ]; + } } diff --git a/app/Models/StudyDetails.php b/app/Models/StudyDetails.php index 3060351..c50a444 100644 --- a/app/Models/StudyDetails.php +++ b/app/Models/StudyDetails.php @@ -7,15 +7,30 @@ class StudyDetails extends BaseModel { + use HashableId; + protected $table = 'study_details'; - use HashableId; + public static function historyOnly(int $studyId): self + { + return self::where('study_id', $studyId)->select(['id', 'study_id', 'clinical_history', 'surgical_history', 'lab_results', 'clinical_diagnosis'])->firstOrFail(); + } + + public static function seriesOnly(int $studyId): self + { + return self::where('study_id', $studyId)->select(['id', 'study_id', 'series'])->firstOrFail(); + } public function study(): BelongsTo { return $this->belongsTo(Study::class); } + public function historyIcon(): string + { + return sprintf('', blank($this->clinical_history) ? 'text-muted' : 'text-success'); + } + /** * @return array */ @@ -27,19 +42,4 @@ protected function casts(): array 'assignment_log' => 'array', ]; } - - public static function historyOnly(int $studyId): self - { - return self::where('study_id', $studyId)->select(['id', 'study_id', 'clinical_history', 'surgical_history', 'lab_results', 'clinical_diagnosis'])->firstOrFail(); - } - - public static function seriesOnly(int $studyId): self - { - return self::where('study_id', $studyId)->select(['id', 'study_id', 'series'])->firstOrFail(); - } - - public function historyIcon(): string - { - return sprintf('', blank($this->clinical_history) ? 'text-muted' : 'text-success'); - } } diff --git a/app/Models/Traits/BitmaskFunctionality.php b/app/Models/Traits/BitmaskFunctionality.php index 9588529..cd875d1 100644 --- a/app/Models/Traits/BitmaskFunctionality.php +++ b/app/Models/Traits/BitmaskFunctionality.php @@ -113,14 +113,14 @@ public static function on(int $value, self $bit): bool return ($value & $bit->value) === $bit->value; } - public function toString(): string - { - return self::valueToString($this->value); - } - /** @param Int32BitMask $value */ public static function valueToString(int $value): string { return '0b' . substr(chunk_split(sprintf('%\'032b', $value), 4, '_'), 0, -1); } + + public function toString(): string + { + return self::valueToString($this->value); + } } diff --git a/app/Models/Traits/HashableId.php b/app/Models/Traits/HashableId.php index 07e6aa9..c1bc1e1 100644 --- a/app/Models/Traits/HashableId.php +++ b/app/Models/Traits/HashableId.php @@ -18,6 +18,16 @@ public static function hashToId(string $hash): int return unhash_it($hash); } + public static function byHashOrFail($hash): self + { + return self::query()->byHash($hash)->firstOrFail(); + } + + public static function byHash($hash): ?self + { + return self::query()->byHash($hash)->first(); + } + /** * Get HashId column name. */ @@ -48,14 +58,4 @@ public function resolveRouteBinding($value, $field = null) return $this->byHash($value); } - - public static function byHashOrFail($hash): self - { - return self::query()->byHash($hash)->firstOrFail(); - } - - public static function byHash($hash): ?self - { - return self::query()->byHash($hash)->first(); - } } diff --git a/app/Models/User.php b/app/Models/User.php index f57ea82..01ae8df 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -75,21 +75,6 @@ class User extends Authenticatable 'last_seen', ]; - /** - * Get the attributes that should be cast. - * - * @return array - */ - protected function casts(): array - { - return [ - 'is_active' => 'bool', - 'email_verified_at' => 'datetime', - 'last_seen_at' => 'datetime', - 'password' => 'hashed', - ]; - } - public function scopeActive($query) { return $query->where('is_active', true); @@ -151,4 +136,19 @@ public function avatar(bool $gravatar = false): string return (new Avatar)->create($this->full_name)->toBase64(); } + + /** + * Get the attributes that should be cast. + * + * @return array + */ + protected function casts(): array + { + return [ + 'is_active' => 'bool', + 'email_verified_at' => 'datetime', + 'last_seen_at' => 'datetime', + 'password' => 'hashed', + ]; + } } diff --git a/app/Services/AuditTrail/ActivityLogger.php b/app/Services/AuditTrail/ActivityLogger.php index 636388e..7ef210a 100644 --- a/app/Services/AuditTrail/ActivityLogger.php +++ b/app/Services/AuditTrail/ActivityLogger.php @@ -3,8 +3,8 @@ namespace App\Services\AuditTrail; use App\Models\Study; -use DB; use Illuminate\Contracts\Auth\Authenticatable; +use Illuminate\Support\Facades\DB; class ActivityLogger { diff --git a/app/Services/Pacs/InstituteMapper.php b/app/Services/Pacs/InstituteMapper.php index 7fc63df..add57b6 100644 --- a/app/Services/Pacs/InstituteMapper.php +++ b/app/Services/Pacs/InstituteMapper.php @@ -4,8 +4,8 @@ use App\Models\Enums\NameMatchModes; use App\Services\InputMatcher; -use Cache; -use DB; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; final class InstituteMapper { diff --git a/app/Services/Pacs/Sync/StudiesSync.php b/app/Services/Pacs/Sync/StudiesSync.php index d04496f..c29167c 100644 --- a/app/Services/Pacs/Sync/StudiesSync.php +++ b/app/Services/Pacs/Sync/StudiesSync.php @@ -23,6 +23,13 @@ class StudiesSync private OrthancRestClient $client; + public function __construct(?OrthancRestClient $client = null) + { + $this->study_ids = collect(); + $this->client = $client ?? new OrthancRestClient; + $this->resetQueues(); + } + public function execute(): void { app(Pipeline::class) @@ -37,13 +44,6 @@ public function execute(): void ->thenReturn(); } - public function __construct(?OrthancRestClient $client = null) - { - $this->study_ids = collect(); - $this->client = $client ?? new OrthancRestClient; - $this->resetQueues(); - } - public function getClient(): OrthancRestClient { return $this->client; diff --git a/app/Services/UserService.php b/app/Services/UserService.php index f02091b..5a44367 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -7,11 +7,6 @@ final readonly class UserService { - private static function lastSeenKey(int $userId): string - { - return sprintf('last_seen:%d', $userId); - } - public static function setLastSeen(int $userId, ?Carbon $seenAt = null): void { Redis::connection()->set(self::lastSeenKey($userId), ($seenAt ?? Carbon::now())->toISOString()); @@ -23,4 +18,9 @@ public static function getLastSeen(int $userId): ?Carbon return $lastSeen ? Carbon::parse($lastSeen) : null; } + + private static function lastSeenKey(int $userId): string + { + return sprintf('last_seen:%d', $userId); + } } diff --git a/database/migrations/0001_01_01_000000_create_users_table.php b/database/migrations/0001_01_01_000000_create_users_table.php index ef498a3..0f5f584 100644 --- a/database/migrations/0001_01_01_000000_create_users_table.php +++ b/database/migrations/0001_01_01_000000_create_users_table.php @@ -8,9 +8,6 @@ return new class extends Migration { - /** - * Run the migrations. - */ public function up(): void { Schema::create('users', function (Blueprint $table) { @@ -50,9 +47,6 @@ public function up(): void }); } - /** - * Reverse the migrations. - */ public function down(): void { Schema::dropIfExists('users'); diff --git a/database/migrations/0001_01_01_000001_create_cache_table.php b/database/migrations/0001_01_01_000001_create_cache_table.php index b9c106b..b8cabb3 100644 --- a/database/migrations/0001_01_01_000001_create_cache_table.php +++ b/database/migrations/0001_01_01_000001_create_cache_table.php @@ -6,9 +6,6 @@ return new class extends Migration { - /** - * Run the migrations. - */ public function up(): void { Schema::create('cache', function (Blueprint $table) { @@ -24,9 +21,6 @@ public function up(): void }); } - /** - * Reverse the migrations. - */ public function down(): void { Schema::dropIfExists('cache'); diff --git a/database/migrations/0001_01_01_000002_create_jobs_table.php b/database/migrations/0001_01_01_000002_create_jobs_table.php index 425e705..a892371 100644 --- a/database/migrations/0001_01_01_000002_create_jobs_table.php +++ b/database/migrations/0001_01_01_000002_create_jobs_table.php @@ -6,9 +6,6 @@ return new class extends Migration { - /** - * Run the migrations. - */ public function up(): void { Schema::create('jobs', function (Blueprint $table) { @@ -45,9 +42,6 @@ public function up(): void }); } - /** - * Reverse the migrations. - */ public function down(): void { Schema::dropIfExists('jobs'); diff --git a/database/migrations/2024_12_26_165205_add_two_factor_columns_to_users_table.php b/database/migrations/2024_12_26_165205_add_two_factor_columns_to_users_table.php index b490e24..c356727 100644 --- a/database/migrations/2024_12_26_165205_add_two_factor_columns_to_users_table.php +++ b/database/migrations/2024_12_26_165205_add_two_factor_columns_to_users_table.php @@ -7,9 +7,6 @@ return new class extends Migration { - /** - * Run the migrations. - */ public function up(): void { Schema::table('users', function (Blueprint $table) { @@ -29,9 +26,6 @@ public function up(): void }); } - /** - * Reverse the migrations. - */ public function down(): void { Schema::table('users', function (Blueprint $table) { diff --git a/database/migrations/2024_12_26_165215_create_personal_access_tokens_table.php b/database/migrations/2024_12_26_165215_create_personal_access_tokens_table.php index e828ad8..b30c323 100644 --- a/database/migrations/2024_12_26_165215_create_personal_access_tokens_table.php +++ b/database/migrations/2024_12_26_165215_create_personal_access_tokens_table.php @@ -6,9 +6,6 @@ return new class extends Migration { - /** - * Run the migrations. - */ public function up(): void { Schema::create('personal_access_tokens', function (Blueprint $table) { @@ -23,9 +20,6 @@ public function up(): void }); } - /** - * Reverse the migrations. - */ public function down(): void { Schema::dropIfExists('personal_access_tokens'); diff --git a/database/migrations/2024_12_26_171058_create_permission_tables.php b/database/migrations/2024_12_26_171058_create_permission_tables.php index 69e39ed..6751566 100644 --- a/database/migrations/2024_12_26_171058_create_permission_tables.php +++ b/database/migrations/2024_12_26_171058_create_permission_tables.php @@ -6,9 +6,6 @@ return new class extends Migration { - /** - * Run the migrations. - */ public function up(): void { $teams = config('permission.teams'); @@ -120,9 +117,6 @@ public function up(): void ->forget(config('permission.cache.key')); } - /** - * Reverse the migrations. - */ public function down(): void { $tableNames = config('permission.table_names'); diff --git a/resources/views/auth/confirm-password.blade.php b/resources/views/auth/confirm-password.blade.php index 5d2399c..28b4e5d 100644 --- a/resources/views/auth/confirm-password.blade.php +++ b/resources/views/auth/confirm-password.blade.php @@ -17,20 +17,20 @@ @section('content')
- + - {{config('variables.templateName')}} + {{ config('variables.templateName') }}
- auth-illustration - mask diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php index 575f8f6..a7ee4e6 100644 --- a/resources/views/auth/forgot-password.blade.php +++ b/resources/views/auth/forgot-password.blade.php @@ -17,20 +17,20 @@ @section('content')
- + - {{config('variables.templateName')}} + {{ config('variables.templateName') }}
- auth-illustration - mask diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index e614c5d..dcea515 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -16,20 +16,20 @@ @section('content')
- + - {{config('variables.templateName')}} + {{ config('variables.templateName') }}
- auth-illustration - mask @@ -40,7 +40,7 @@ class="authentication-image" alt="mask"
-

Welcome to {{config('variables.templateName')}}! 👋

+

Welcome to {{ config('variables.templateName') }}! 👋

Please sign-in to your account and start the adventure

@if (session('status')) diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index efe99ad..fa03481 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -17,20 +17,20 @@ @section('content')
- + - {{config('variables.templateName')}} + {{ config('variables.templateName') }}
- auth-illustration - mask diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php index 9a29c13..9422d47 100644 --- a/resources/views/auth/reset-password.blade.php +++ b/resources/views/auth/reset-password.blade.php @@ -18,20 +18,20 @@
- + - {{config('variables.templateName')}} + {{ config('variables.templateName') }}
- auth-illustration - mask @@ -50,7 +50,7 @@ class="authentication-image" alt="mask"
@error('email') diff --git a/resources/views/auth/two-factor-challenge.blade.php b/resources/views/auth/two-factor-challenge.blade.php index 9d1df75..257da3b 100644 --- a/resources/views/auth/two-factor-challenge.blade.php +++ b/resources/views/auth/two-factor-challenge.blade.php @@ -17,20 +17,20 @@ @section('content')
- + - {{config('variables.templateName')}} + {{ config('variables.templateName') }}
- auth-illustration - mask diff --git a/resources/views/auth/verify-email.blade.php b/resources/views/auth/verify-email.blade.php index b6f9550..334b0f6 100644 --- a/resources/views/auth/verify-email.blade.php +++ b/resources/views/auth/verify-email.blade.php @@ -18,10 +18,10 @@ @section('content')
- + - {{config('variables.templateName')}} + {{ config('variables.templateName') }}
@@ -29,11 +29,11 @@ class="app-brand-logo demo">@include('_partials.macros',["width"=>25,"withbg"=>'
auth-illustration - mask @@ -56,7 +56,7 @@ class="d-flex col-12 col-lg-5 col-xl-4 align-items-center authentication-bg posi @endif

Account activation link sent to your email address: {{Auth::user()->email}} Please follow the link inside to continue. + class="h6">{{ Auth::user()->email }} Please follow the link inside to continue.

@@ -65,7 +65,7 @@ class="h6">{{Auth::user()->email}} Please follow the link inside to conti
-
+ @csrf
diff --git a/resources/views/components/modal.blade.php b/resources/views/components/modal.blade.php index c8a7477..eccbf21 100644 --- a/resources/views/components/modal.blade.php +++ b/resources/views/components/modal.blade.php @@ -24,7 +24,7 @@ @endphp -
- + - {{config('variables.templateName')}} + {{ config('variables.templateName') }}
-

Welcome to {{config('variables.templateName')}}! 👋

+

Welcome to {{ config('variables.templateName') }}! 👋

Please sign-in to your account and start the adventure

-
+
@@ -81,7 +81,7 @@ class="ri-eye-off-line"> Remember Me
- + Forgot Password?
@@ -92,7 +92,7 @@ class="ri-eye-off-line">

New on our platform? - + Create an account

@@ -122,7 +122,7 @@ class="ri-eye-off-line">
mask diff --git a/resources/views/content/authentications/auth-register-basic.blade.php b/resources/views/content/authentications/auth-register-basic.blade.php index 921cc9e..f5f0b96 100644 --- a/resources/views/content/authentications/auth-register-basic.blade.php +++ b/resources/views/content/authentications/auth-register-basic.blade.php @@ -43,9 +43,9 @@
- + - {{config('variables.templateName')}} + {{ config('variables.templateName') }}
@@ -53,7 +53,7 @@

Adventure starts here 🚀

Make your app management easy and fun!

- +
@@ -92,7 +92,7 @@

Already have an account? - + Sign in instead

@@ -122,7 +122,7 @@
mask diff --git a/resources/views/content/pages/pages-misc-error.blade.php b/resources/views/content/pages/pages-misc-error.blade.php index eabf235..966e5ea 100644 --- a/resources/views/content/pages/pages-misc-error.blade.php +++ b/resources/views/content/pages/pages-misc-error.blade.php @@ -20,12 +20,12 @@

Page Not Found ⚠️

we couldn't find the page you are looking for

- misc-error + misc-error misc-error
- misc-error + misc-error
diff --git a/resources/views/layouts/commonMaster.blade.php b/resources/views/layouts/commonMaster.blade.php index 29da3fd..4434962 100644 --- a/resources/views/layouts/commonMaster.blade.php +++ b/resources/views/layouts/commonMaster.blade.php @@ -6,7 +6,7 @@ $contentLayout = (isset($container) ? (($container === 'container-xxl') ? "layout-compact" : "layout-wide") : ""); @endphp - + diff --git a/resources/views/layouts/contentNavbarLayout.blade.php b/resources/views/layouts/contentNavbarLayout.blade.php index 6cda3df..5d47e39 100644 --- a/resources/views/layouts/contentNavbarLayout.blade.php +++ b/resources/views/layouts/contentNavbarLayout.blade.php @@ -59,9 +59,9 @@ @if ($isFlex) -
+
@else -
+
@endif @yield('content') diff --git a/resources/views/layouts/horizontalLayout.blade.php b/resources/views/layouts/horizontalLayout.blade.php index 8279c01..6aca786 100644 --- a/resources/views/layouts/horizontalLayout.blade.php +++ b/resources/views/layouts/horizontalLayout.blade.php @@ -57,9 +57,9 @@ @if ($isFlex) -
+
@else -
+
@endif @yield('content') diff --git a/resources/views/layouts/sections/footer/footer-front.blade.php b/resources/views/layouts/sections/footer/footer-front.blade.php index 2d02c9a..fb64cb3 100644 --- a/resources/views/layouts/sections/footer/footer-front.blade.php +++ b/resources/views/layouts/sections/footer/footer-front.blade.php @@ -1,7 +1,7 @@
diff --git a/resources/views/layouts/sections/menu/horizontalMenu.blade.php b/resources/views/layouts/sections/menu/horizontalMenu.blade.php index 36e328f..7030a41 100644 --- a/resources/views/layouts/sections/menu/horizontalMenu.blade.php +++ b/resources/views/layouts/sections/menu/horizontalMenu.blade.php @@ -5,7 +5,7 @@ @endphp
diff --git a/resources/views/staff/meta/edit.blade.php b/resources/views/staff/meta/edit.blade.php index 3431abe..f007e31 100644 --- a/resources/views/staff/meta/edit.blade.php +++ b/resources/views/staff/meta/edit.blade.php @@ -17,7 +17,7 @@
- @if(may(\App\Models\Enums\Permission::StudyMetadataEdit)) + @if (may(\App\Models\Enums\Permission::StudyMetadataEdit)) Edit @endif diff --git a/resources/views/staff/meta/view.blade.php b/resources/views/staff/meta/view.blade.php index 3431abe..f007e31 100644 --- a/resources/views/staff/meta/view.blade.php +++ b/resources/views/staff/meta/view.blade.php @@ -17,7 +17,7 @@
- @if(may(\App\Models\Enums\Permission::StudyMetadataEdit)) + @if (may(\App\Models\Enums\Permission::StudyMetadataEdit)) Edit @endif diff --git a/resources/views/staff/studies/index.blade.php b/resources/views/staff/studies/index.blade.php index 1e901ff..87bcd8f 100644 --- a/resources/views/staff/studies/index.blade.php +++ b/resources/views/staff/studies/index.blade.php @@ -106,7 +106,7 @@ class="d-flex justify-content-between align-items-start border-end pb-4 pb-sm-0 - @foreach($studies as $study) + @foreach ($studies as $study) {{ $study->accession_number }} diff --git a/resources/views/staff/worklist/index.blade.php b/resources/views/staff/worklist/index.blade.php index 0c840d6..b26362f 100644 --- a/resources/views/staff/worklist/index.blade.php +++ b/resources/views/staff/worklist/index.blade.php @@ -106,7 +106,7 @@ class="d-flex justify-content-between align-items-start border-end pb-4 pb-sm-0 - @foreach($studies as $study) + @foreach ($studies as $study) {{ $study->accession_number }} diff --git a/resources/views/terms.blade.php b/resources/views/terms.blade.php index ad50762..e2f927f 100644 --- a/resources/views/terms.blade.php +++ b/resources/views/terms.blade.php @@ -19,15 +19,15 @@
- + - {{config('variables.templateName')}} + {{ config('variables.templateName') }}
{!! $terms !!}
- mask + mask
diff --git a/routes/api.php b/routes/api.php index ccc387f..4847282 100644 --- a/routes/api.php +++ b/routes/api.php @@ -3,6 +3,6 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Route; -Route::get('/user', function (Request $request) { +Route::get('user', function (Request $request) { return $request->user(); })->middleware('auth:sanctum'); diff --git a/routes/web.php b/routes/web.php index f187172..89708b8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -27,7 +27,7 @@ config('jetstream.auth_session'), 'verified', ])->group(function () { - Route::get('/dashboard', function () { + Route::get('dashboard', function () { return view('dashboard'); })->name('dashboard'); @@ -36,7 +36,7 @@ }); Route::group(['prefix' => 'radiologist', 'as' => 'radiologist.'], function () { - Route::get('/report-write/{id}', ReportWriteController::class)->name('report-write'); + Route::get('report-write/{id}', ReportWriteController::class)->name('report-write'); }); Route::group(['prefix' => 'viewer', 'as' => 'viewer.'], function () { @@ -76,7 +76,7 @@ Route::post('auth/{hashid}', [ViewSharedStudyController::class, 'auth'])->name('auth'); }); -Route::view('/ck', 'ck'); +Route::view('ck', 'ck'); Route::group(['prefix' => 'social', 'as' => 'social.'], function () { Route::get('{driver}', [SocialLoginController::class, 'redirect'])->name('login');