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

fix some problems

Browse Source
This commit is contained in:
mahdi purHosseini
2024-02-28 16:42:23 +03:30
parent b7d2c0b920
commit 618841cb74
4 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TransferItemController.php
+11 -6
View File
@@ -15,22 +15,25 @@ class TransferItemController extends Controller
{ {
public function getSuspendedTransfer() public function getSuspendedTransfer()
{ {
$data = Transfer::where( "transferable_type" , "App\\Item" ) $data = Transfer::query()
->whereHasMorph( 'transferable' , [ Item::class ] )
->where( "status" , StatusTypeEnum::SUSPENDED ) ->where( "status" , StatusTypeEnum::SUSPENDED )
->with( [ "user" , "transferable" , "transferable.user" ] ); ->with( [ "user" , "transferable" , "transferable.user" ] );
$user = auth( 'api' )->user(); $user = auth( 'api' )->user();
if ( $user->hasRole( 'User' ) ) { if ( $user->hasRole( 'User' ) ) {
$data = $data->where( "user_id" , $user->id ); $data = $data->where( "user_id" , $user->id );
} elseif ( $user->hasRole( 'Supervisor' ) ) { } elseif ( $user->hasRole( 'Supervisor' ) ) {
$data = $data->whereHas( 'transferable.user' , function ( $query ) use ( $user ) { $data = $data->whereHasMorph( 'transferable' , [ Item::class ] , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id ); $query->whereHas( 'user' , function ( $query1 ) use ( $user ) {
$query1->where( 'medical_center_id' , $user->medical_center_id );
} );
} ); } );
} }
$data = $data->get(); $data = $data->get();
return TransferResource::collection($data); return TransferResource::collection( $data );
} }
public function changeStatus( ChangeStatusRequest $request , Transfer $Transfer ) public function changeStatus( ChangeStatusRequest $request , Transfer $Transfer )
@@ -62,8 +65,10 @@ class TransferItemController extends Controller
$Item->transfers()->create( [ $Item->transfers()->create( [
"user_id" => $request->user_id , "user_id" => $request->user_id ,
"from_date" => Carbon::now() , "from_date" => Carbon::now() ,
"status" => StatusTypeEnum::SUSPENDED "status" => StatusTypeEnum::APPROVED
] ); ] );
if ( $Item->transferActive ) $Item->transferActive()->update( [ "to_date" => Carbon::now() ] );
$Item->update( [ "user_id" => $request->user_id ] );
} else { } else {
return MessageResponse::error( trans( 'messages.user_denied_transfer' ) ); return MessageResponse::error( trans( 'messages.user_denied_transfer' ) );
} }
app/Http/Controllers/TransferPackageController.php
+11 -6
View File
@@ -15,22 +15,25 @@ class TransferPackageController extends Controller
{ {
public function getSuspendedTransfer() public function getSuspendedTransfer()
{ {
$data = Transfer::where( "transferable_type" , "App\\Package" ) $data = Transfer::query()
->whereHasMorph( 'transferable' , [ Package::class ] )
->where( "status" , StatusTypeEnum::SUSPENDED ) ->where( "status" , StatusTypeEnum::SUSPENDED )
->with( [ "user" , "transferable" , "transferable.user" ] ); ->with( [ "user" , "transferable" , "transferable.user" ] );
$user = auth( 'api' )->user(); $user = auth( 'api' )->user();
if ( $user->hasRole( 'User' ) ) { if ( $user->hasRole( 'User' ) ) {
$data = $data->where( "user_id" , $user->id ); $data = $data->where( "user_id" , $user->id );
} elseif ( $user->hasRole( 'Supervisor' ) ) { } elseif ( $user->hasRole( 'Supervisor' ) ) {
$data = $data->whereHas( 'transferable.user' , function ( $query ) use ( $user ) { $data = $data->whereHasMorph( 'transferable' , [ Package::class ] , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id ); $query->whereHas( 'user' , function ( $query1 ) use ( $user ) {
$query1->where( 'medical_center_id' , $user->medical_center_id );
} );
} ); } );
} }
$data = $data->get(); $data = $data->get();
return TransferResource::collection($data); return TransferResource::collection( $data );
} }
public function changeStatus( ChangeStatusRequest $request , Transfer $Transfer ) public function changeStatus( ChangeStatusRequest $request , Transfer $Transfer )
@@ -65,8 +68,10 @@ class TransferPackageController extends Controller
$Package->transfers()->create( [ $Package->transfers()->create( [
"user_id" => $request->user_id , "user_id" => $request->user_id ,
"from_date" => Carbon::now() , "from_date" => Carbon::now() ,
"status" => StatusTypeEnum::SUSPENDED "status" => StatusTypeEnum::APPROVED
] ); ] );
if ( $Package->transferActive ) $Package->transferActive()->update( [ "to_date" => Carbon::now() ] );
$Package->update( [ "user_id" => $request->user_id ] );
} else { } else {
return MessageResponse::error( trans( 'messages.user_denied_transfer' ) ); return MessageResponse::error( trans( 'messages.user_denied_transfer' ) );
} }
app/Http/Controllers/UserController.php
+2 -4
View File
@@ -16,17 +16,15 @@ class UserController extends Controller
public function index( Request $request ) public function index( Request $request )
{ {
$user = auth( 'api' )->user(); $user = auth( 'api' )->user();
if ( $user->cant( 'list' , User::class ) ) {
return MessageResponse::error( trans( 'messages.access_denied' ) );
}
if ( $user->hasRole( 'Supervisor' ) ) { if ( $user->hasRole( 'User' ) or $user->hasRole( 'Supervisor' ) ) {
$medical_center_id = $user->medical_center_id; $medical_center_id = $user->medical_center_id;
} elseif ( $request->has( 'medical_center_id' ) && $request->medical_center_id ) { } elseif ( $request->has( 'medical_center_id' ) && $request->medical_center_id ) {
$medical_center_id = $request->medical_center_id; $medical_center_id = $request->medical_center_id;
} else { } else {
$medical_center_id = null; $medical_center_id = null;
} }
$Users = User::when( $request->has( 'name' ) && $request->name , function ( $query ) use ( $request ) { $Users = User::when( $request->has( 'name' ) && $request->name , function ( $query ) use ( $request ) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' ); $query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
} ) } )
app/Policies/UserPolicy.php
-1
View File
@@ -3,7 +3,6 @@
namespace App\Policies; namespace App\Policies;
use App\User; use App\User;
use Doctrine\Tests\Common\Inflector\InflectorTest;
class UserPolicy class UserPolicy
{ {