cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-11 21:31:07 +03:30
Code Issues Packages Projects Releases Wiki Activity

fix some problems

Browse Source
This commit is contained in:
mahdi purHosseini
2023-11-22 11:17:07 +03:30
parent bf5a279d45
commit d3c73e6c93
6 changed files with 153 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ItemController.php
+7 -16
View File
@@ -14,12 +14,8 @@ class ItemController extends Controller
{
$user = auth( 'api' )->user();
if ( $user->hasRole( 'User' ) ) {
return \MessageResponse::error( 'You dont have access to this section!' );
}
$Items = Item::when( $user->cant( 'showAll' , Item::class ) , function ( $query ) use ( $user ) {
if ( $user->hasRole( 'Supervisor' ) ) {
if ( $user->hasRole( 'Supervisor' ) or $user->hasRole( 'User' ) ) {
$query->whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id );
} );
@@ -51,7 +47,7 @@ class ItemController extends Controller
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
}
] )
] )
->orderByDesc( 'id' )
->paginate( 10 );
return \MessageResponse::data( $Items );
@@ -69,13 +65,13 @@ class ItemController extends Controller
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
},
} ,
"transfers" => function ( $query ) {
$query->with( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'cell_number' , 'medical_center_id' );
} ] );
}
] );
] );
$FilesPath = [];
if ( count( $Item->files ) ) {
@@ -154,15 +150,10 @@ class ItemController extends Controller
public function getItems()
{
$user = auth( 'api' )->user();
if ( $user->hasRole( 'User' ) ) {
return \MessageResponse::data( [] );
}
$Items = Item::when( $user->cant( 'showAll' , Item::class ) , function ( $query ) use ( $user ) {
if ( $user->hasRole( 'Supervisor' ) ) {
if ( $user->hasRole( 'Supervisor' ) or $user->hasRole( 'User' ) ) {
$query->whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id );
} );
@@ -173,7 +164,7 @@ class ItemController extends Controller
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
},
} ,
"transfers" => function ( $query ) {
$query->with( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'cell_number' , 'medical_center_id' );
@@ -192,7 +183,7 @@ class ItemController extends Controller
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
},
} ,
"transfers" => function ( $query ) {
$query->with( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'cell_number' , 'medical_center_id' );