masroor/radfusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refator

Browse Source
This commit is contained in:
Masroor Ehsan 2025-01-07 16:52:40 +06:00
parent e85799b635
commit 6162b47a65
16 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/DAL/Studies/WorklistFactory.php
View File

@ -2,7 +2,7 @@
namespace App\DAL\Studies; namespace App\DAL\Studies;
use App\Models\Enums\Role; use App\Domain\ACL\Role;
use Exception; use Exception;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;

2
app/Models/Enums/Permission.php → app/Domain/ACL/Permission.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Models\Enums; namespace App\Domain\ACL;
enum Permission: string enum Permission: string
{ {

2
app/Models/Enums/Role.php → app/Domain/ACL/Role.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Models\Enums; namespace App\Domain\ACL;
enum Role: string enum Role: string
{ {

2
app/Http/Controllers/Staff/AttachmentController.php
View File

@ -2,8 +2,8 @@
namespace App\Http\Controllers\Staff; namespace App\Http\Controllers\Staff;
use App\Domain\ACL\Permission;
use App\Http\Controllers\HashidControllerBase; use App\Http\Controllers\HashidControllerBase;
use App\Models\Enums\Permission;
use App\Models\Study; use App\Models\Study;
use App\Services\AuditTrail\Activity; use App\Services\AuditTrail\Activity;
use Illuminate\Http\Request; use Illuminate\Http\Request;

2
app/Http/Controllers/Staff/StudiesController.php
View File

@ -2,8 +2,8 @@
namespace App\Http\Controllers\Staff; namespace App\Http\Controllers\Staff;
use App\Domain\ACL\Permission;
use App\Http\Controllers\HashidControllerBase; use App\Http\Controllers\HashidControllerBase;
use App\Models\Enums\Permission;
use App\Models\Study; use App\Models\Study;
use App\Services\AuditTrail\Activity; use App\Services\AuditTrail\Activity;

4
app/Http/Controllers/Staff/StudyAssignmentController.php
View File

@ -3,11 +3,11 @@
namespace App\Http\Controllers\Staff; namespace App\Http\Controllers\Staff;
use App\DAL\Radiologists; use App\DAL\Radiologists;
use App\Domain\ACL\Permission;
use App\Domain\ACL\Role;
use App\Http\Controllers\HashidControllerBase; use App\Http\Controllers\HashidControllerBase;
use App\Http\Requests\AssignPhysicianRequest; use App\Http\Requests\AssignPhysicianRequest;
use App\Models\Enums\Permission;
use App\Models\Enums\ReportStatus; use App\Models\Enums\ReportStatus;
use App\Models\Enums\Role;
use App\Models\Study; use App\Models\Study;
use App\Models\User; use App\Models\User;
use App\Services\AuditTrail\Activity; use App\Services\AuditTrail\Activity;

2
app/Http/Controllers/Staff/StudyHistoryController.php
View File

@ -2,9 +2,9 @@
namespace App\Http\Controllers\Staff; namespace App\Http\Controllers\Staff;
use App\Domain\ACL\Permission;
use App\Http\Controllers\HashidControllerBase; use App\Http\Controllers\HashidControllerBase;
use App\Http\Requests\StudyHistoryRequest; use App\Http\Requests\StudyHistoryRequest;
use App\Models\Enums\Permission;
use App\Models\Study; use App\Models\Study;
use App\Models\StudyDetails; use App\Models\StudyDetails;
use App\Services\AuditTrail\Activity; use App\Services\AuditTrail\Activity;

2
app/Http/Controllers/StudyMetadataController.php
View File

@ -2,8 +2,8 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Domain\ACL\Permission;
use App\Http\Requests\StudyMetadataUpdateRequest; use App\Http\Requests\StudyMetadataUpdateRequest;
use App\Models\Enums\Permission;
use App\Models\Study; use App\Models\Study;
class StudyMetadataController extends HashidControllerBase class StudyMetadataController extends HashidControllerBase

2
app/Models/Study.php
View File

@ -2,7 +2,7 @@
namespace App\Models; namespace App\Models;
use App\Models\Enums\Permission; use App\Domain\ACL\Permission;
use App\Models\Enums\Priority; use App\Models\Enums\Priority;
use App\Models\Enums\ReportStatus; use App\Models\Enums\ReportStatus;
use App\Models\Enums\StudyLevelStatus; use App\Models\Enums\StudyLevelStatus;

4
app/Models/User.php
View File

@ -2,8 +2,8 @@
namespace App\Models; namespace App\Models;
use App\Models\Enums\Permission; use App\Domain\ACL\Permission;
use App\Models\Enums\Role; use App\Domain\ACL\Role;
use App\Models\Traits\HashableId; use App\Models\Traits\HashableId;
use App\Services\UserService; use App\Services\UserService;
use Carbon\Carbon; use Carbon\Carbon;

2
app/Services/Workflow/Manager.php
View File

@ -2,7 +2,7 @@
namespace App\Services\Workflow; namespace App\Services\Workflow;
use App\Models\Enums\Permission; use App\Domain\ACL\Permission;
use App\Models\Enums\ReportStatus; use App\Models\Enums\ReportStatus;
use App\Models\Study; use App\Models\Study;
use App\Models\User; use App\Models\User;

4
database/seeders/RoleSeeder.php
View File

@ -2,8 +2,8 @@
namespace Database\Seeders; namespace Database\Seeders;
use App\Models\Enums\Permission; use App\Domain\ACL\Permission;
use App\Models\Enums\Role; use App\Domain\ACL\Role;
use Illuminate\Database\Seeder; use Illuminate\Database\Seeder;
use Spatie\Permission\Models\Permission as SpatiePermission; use Spatie\Permission\Models\Permission as SpatiePermission;
use Spatie\Permission\Models\Role as SpatieRole; use Spatie\Permission\Models\Role as SpatieRole;

2
database/seeders/UserSeeder.php
View File

@ -2,7 +2,7 @@
namespace Database\Seeders; namespace Database\Seeders;
use App\Models\Enums\Role; use App\Domain\ACL\Role;
use App\Models\Institute; use App\Models\Institute;
use App\Models\User; use App\Models\User;
use Illuminate\Database\Seeder; use Illuminate\Database\Seeder;

2
resources/views/staff/meta/edit.blade.php
View File

@ -17,7 +17,7 @@
</div> </div>
<x-section-border/> <x-section-border/>
@if (may(\App\Models\Enums\Permission::StudyMetadataEdit)) @if (may(\App\Domain\ACL\Permission::StudyMetadataEdit))
<a class="btn btn-sm" href="{{ route('staff.meta.edit', $study->hash) }}">Edit</a> <a class="btn btn-sm" href="{{ route('staff.meta.edit', $study->hash) }}">Edit</a>
@endif @endif

2
resources/views/staff/meta/view.blade.php
View File

@ -17,7 +17,7 @@
</div> </div>
<x-section-border/> <x-section-border/>
@if (may(\App\Models\Enums\Permission::StudyMetadataEdit)) @if (may(\App\Domain\ACL\Permission::StudyMetadataEdit))
<a class="btn btn-sm" href="{{ route('staff.meta.edit', $study->hash) }}">Edit</a> <a class="btn btn-sm" href="{{ route('staff.meta.edit', $study->hash) }}">Edit</a>
@endif @endif

18
resources/views/staff/studies/index.blade.php
View File

@ -27,7 +27,7 @@
<div class="row gy-4 gy-sm-1"> <div class="row gy-4 gy-sm-1">
<div class="col-sm-6 col-lg-3"> <div class="col-sm-6 col-lg-3">
<div <div
class="d-flex justify-content-between align-items-start card-widget-1 border-end pb-4 pb-sm-0"> class="d-flex justify-content-between align-items-start card-widget-1 border-end pb-4 pb-sm-0">
<div> <div>
<h4 class="mb-0">24</h4> <h4 class="mb-0">24</h4>
<p class="mb-0">Clients</p> <p class="mb-0">Clients</p>
@ -42,7 +42,7 @@ class="d-flex justify-content-between align-items-start card-widget-1 border-end
</div> </div>
<div class="col-sm-6 col-lg-3"> <div class="col-sm-6 col-lg-3">
<div <div
class="d-flex justify-content-between align-items-start card-widget-2 border-end pb-4 pb-sm-0"> class="d-flex justify-content-between align-items-start card-widget-2 border-end pb-4 pb-sm-0">
<div> <div>
<h4 class="mb-0">165</h4> <h4 class="mb-0">165</h4>
<p class="mb-0">Invoices</p> <p class="mb-0">Invoices</p>
@ -57,7 +57,7 @@ class="d-flex justify-content-between align-items-start card-widget-2 border-end
</div> </div>
<div class="col-sm-6 col-lg-3"> <div class="col-sm-6 col-lg-3">
<div <div
class="d-flex justify-content-between align-items-start border-end pb-4 pb-sm-0 card-widget-3"> class="d-flex justify-content-between align-items-start border-end pb-4 pb-sm-0 card-widget-3">
<div> <div>
<h4 class="mb-0">$2.46k</h4> <h4 class="mb-0">$2.46k</h4>
<p class="mb-0">Paid</p> <p class="mb-0">Paid</p>
@ -130,21 +130,21 @@ class="d-flex justify-content-between align-items-start border-end pb-4 pb-sm-0
<a target="_blank" href="{{ $study->links()['stone'] }}">St</a> | <a target="_blank" href="{{ $study->links()['stone'] }}">St</a> |
@endif @endif
@if ($study->allowed()['ohif']) @if ($study->allowed()['ohif'])
<a target="_blank" href="{{ $study->links()['ohif'] }}">O</a> | <a target="_blank" href="{{ $study->links()['ohif'] }}">O</a> |
@endif @endif
@if ($study->allowed()['ohif.mpr']) @if ($study->allowed()['ohif.mpr'])
<a target="_blank" href="{{ $study->links()['ohif.mpr'] }}">OM</a> | <a target="_blank" href="{{ $study->links()['ohif.mpr'] }}">OM</a> |
@endif @endif
@if ($study->allowed()['ohif.seg']) @if ($study->allowed()['ohif.seg'])
<a target="_blank" href="{{ $study->links()['ohif.seg'] }}">OS</a> | <a target="_blank" href="{{ $study->links()['ohif.seg'] }}">OS</a> |
@endif @endif
@if ($study->allowed()['zip']) @if ($study->allowed()['zip'])
<a target="_blank" href="{{ $study->links()['zip'] }}">Z</a> | <a target="_blank" href="{{ $study->links()['zip'] }}">Z</a> |
@endif @endif
<span class="badge bg-success">Reported</span> <span class="badge bg-success">Reported</span>
@can(\App\Models\Enums\Permission::ReportCreate) @can(\App\Domain\ACL\Permission::ReportCreate)
<a target="_blank" class="btn" <a target="_blank" class="btn"
href="{{ route('radiologist.report-write', $study->id) }}">TXT</a> href="{{ route('radiologist.report-write', $study->id) }}">TXT</a>
@endcan @endcan