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

Merge pull request 'fix user index' (#15) from feauter/show-admin into master

Browse Source 
Reviewed-on: https://git.willaspace.com/external-projects/cssd-back/pulls/15
This commit is contained in:
mahdi.pourhoseini
2024-06-15 04:46:20 +00:00
parent d91097d0d0 3f3baf2850
commit 00695c7f66
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/UserController.php
+23 -19
View File
@@ -26,26 +26,30 @@ class UserController extends Controller
$medical_center_id = null;
}
$Users = User::when( $request->has( 'name' ) && $request->name , function ( $query ) use ( $request ) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
} )
->when( ( $request->has( 'fromPicker' ) && $request->fromPicker ) || ( $request->has( 'upToPicker' ) && $request->upToPicker ) , function ( $query ) use ( $request ) {
$from = ( $request->fromPicker ) ? date( $request->fromPicker . ' 00:00:00' ) : date( '2010-01-01' . ' 00:00:00' );
$upTo = ( $request->upToPicker ) ? date( $request->upToPicker . ' 23:59:59' ) : date( 'Y-m-d' . ' 23:59:59' );
return $query->whereBetween( 'created_at' , [ $from , $upTo ] );
} )
->when( $request->has( 'cell_number' ) && $request->cell_number , function ( $query ) use ( $request ) {
$query->where( 'cell_number' , 'LIKE' , '%' . $request->cell_number . '%' );
} )
->when( $request->has( 'role' ) && $request->role , function ( $query ) use ( $request ) {
$query->role( $request->role );
} )
->when( $medical_center_id , function ( $query ) use ( $medical_center_id ) {
$query->where( 'medical_center_id' , $medical_center_id );
} )
->with( [ 'medical_center' , 'roles' ] )->paginate( 10 );
$Users = User::when($request->has('name') && $request->name, function ($query) use ($request) {
$query->where('name', 'LIKE', '%' . $request->name . '%');
})
->when(($request->has('fromPicker') && $request->fromPicker) || ($request->has('upToPicker') && $request->upToPicker), function ($query) use ($request) {
$from = ($request->fromPicker) ? date($request->fromPicker . ' 00:00:00') : date('2010-01-01' . ' 00:00:00');
$upTo = ($request->upToPicker) ? date($request->upToPicker . ' 23:59:59') : date('Y-m-d' . ' 23:59:59');
return $query->whereBetween('created_at', [$from, $upTo]);
})
->when($request->has('cell_number') && $request->cell_number, function ($query) use ($request) {
$query->where('cell_number', 'LIKE', '%' . $request->cell_number . '%');
})
->when($request->has('role') && $request->role, function ($query) use ($request) {
$query->role($request->role);
})
->when($medical_center_id, function ($query) use ($medical_center_id) {
$query->where('medical_center_id', $medical_center_id);
})
->whereDoesntHave('roles', function ($roleQuery) {
$roleQuery->where('name', 'Admin');
})
->with(['medical_center', 'roles'])->paginate(10);
return MessageResponse::data($Users);
return MessageResponse::data( $Users );
}
public function store( StoreUserRequest $request )