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

fix export problems

Browse Source
This commit is contained in:
mahdi purHosseini
2023-12-11 12:18:05 +03:30
parent 16f40aa4fb
commit 117e34eecd
2 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ExportController.php
+28 -24
View File
@@ -11,23 +11,26 @@ class ExportController extends Controller
{ {
public function items() public function items()
{ {
$user = auth( 'api' )->user(); $Items = Item::with( [ 'user' => function ( $query ) {
$Items = Item::when( $user->cant( 'showAll' , Item::class ) , function ( $query ) use ( $user ) {
if ( $user->hasRole( 'Supervisor' ) or $user->hasRole( 'User' ) ) {
$query->whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id );
} );
}
} )
->with( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'medical_center_id' ); $query->select( 'id' , 'name' , 'medical_center_id' );
} , } ,
'user.medical_center' => function ( $query ) { 'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' ); $query->select( 'id' , 'name' );
} }
] ) ] );
->orderByDesc( 'id' )
->get(); $user = auth( 'api' )->user();
if ( $user->hasRole( 'User' ) ) {
$Items = $Items->whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id );
} )->where( "status" , 1 );
} elseif ( $user->hasRole( 'Supervisor' ) ) {
$Items = $Items->whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id );
} );
}
$Items = $Items->orderByDesc( 'id' )->get();
$Items = $Items->map( function ( $item , $key ) { $Items = $Items->map( function ( $item , $key ) {
@@ -66,22 +69,23 @@ class ExportController extends Controller
public function packages() public function packages()
{ {
$user = auth( 'api' )->user(); $Packages = Package::with( [
$Packages = Package::when( $user->cant( 'showAll' , Package::class ) , function ( $query ) use ( $user ) { 'user' => function ( $query ) {
if ( $user->hasRole( 'Supervisor' ) or $user->hasRole( 'User' ) ) {
$query->whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id );
} );
}
} )
->with( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'medical_center_id' ); $query->select( 'id' , 'name' , 'medical_center_id' );
} , } ,
'user.medical_center' => function ( $query ) { 'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' ); $query->select( 'id' , 'name' );
} ] ) } ] );
->orderByDesc( 'id' )
->get(); $user = auth( 'api' )->user();
if ( $user->hasRole( 'User' ) or $user->hasRole( 'Supervisor' ) ) {
$Packages = $Packages->whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id );
} );
}
$Packages = $Packages->orderByDesc( 'id' )->get();
$Packages = $Packages->map( function ( $item , $key ) { $Packages = $Packages->map( function ( $item , $key ) {
$row[] = $item[ "id" ]; $row[] = $item[ "id" ];
config/medialibrary.php
+1 -1
View File
@@ -129,7 +129,7 @@ return [
* The engine that should perform the image conversions. * The engine that should perform the image conversions.
* Should be either `gd` or `imagick`. * Should be either `gd` or `imagick`.
*/ */
'image_driver' => env('IMAGE_DRIVER', 'gd'), 'image_driver' => env('IMAGE_DRIVER', 'imagick'),
/* /*
* FFMPEG & FFProbe binaries paths, only used if you try to generate video * FFMPEG & FFProbe binaries paths, only used if you try to generate video