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

fix

Browse Source
This commit is contained in:
mahdi purHosseini
2024-02-13 11:56:00 +03:30
parent a06125d8a2
commit 74f9052df6
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ExportController.php
+11 -4
View File
@@ -16,7 +16,8 @@ class ExportController extends Controller
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
}
} ,
'latestTransfer'
] );
$user = auth( 'api' )->user();
@@ -46,6 +47,7 @@ class ExportController extends Controller
$row[] = $item[ "user" ] != null ? $item[ "user" ][ "name" ] : null;
$row[] = $item[ "medical_center" ] != null ? $item[ "medical_center" ][ "id" ] : null;
$row[] = $item[ "medical_center" ] != null ? $item[ "medical_center" ][ "name" ] : null;
$row[] = $item[ "latestTransfer" ] != null ? $item[ "latestTransfer" ][ "from_date" ] : null;
return $row;
} );
@@ -61,7 +63,8 @@ class ExportController extends Controller
'شناسه کاربر' ,
'نام کاربر' ,
'شناسه بیمارستان' ,
'نام بیمارستان'
'نام بیمارستان',
'اخرین انتقال'
] );
$export = new ExportCollection( $Items );
return Excel::download( $export , 'items.xlsx' , null , [ \Maatwebsite\Excel\Excel::XLSX ] );
@@ -75,7 +78,9 @@ class ExportController extends Controller
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
} ] );
},
"latestTransfer"
] );
$user = auth( 'api' )->user();
if ( $user->hasRole( 'User' ) or $user->hasRole( 'Supervisor' ) ) {
@@ -98,6 +103,7 @@ class ExportController extends Controller
$row[] = $item[ "user" ] != null ? $item[ "user" ][ "name" ] : null;
$row[] = $item[ "medical_center" ] != null ? $item[ "medical_center" ][ "id" ] : null;
$row[] = $item[ "medical_center" ] != null ? $item[ "medical_center" ][ "name" ] : null;
$row[] = $item[ "latestTransfer" ] != null ? $item[ "latestTransfer" ][ "from_date" ] : null;
return $row;
} );
@@ -111,7 +117,8 @@ class ExportController extends Controller
'شناسه کاربر' ,
'نام کاربر' ,
'شناسه بیمارستان' ,
'نام بیمارستان'
'نام بیمارستان',
'اخرین انتقال'
] );
$export = new ExportCollection( $Packages );
return Excel::download( $export , 'packages.xlsx' , null , [ \Maatwebsite\Excel\Excel::XLSX ] );
app/Item.php
+8 -3
View File
@@ -36,17 +36,22 @@ class Item extends Model implements HasMedia
public function transfersAll()
{
return $this->morphMany( 'App\Transfer' , "transferable" );
return $this->morphMany( 'App\Transfer' , "transferable" )->orderBy("id" , "desc");
}
public function transfers()
{
return $this->morphMany( 'App\Transfer' , "transferable" )->where( "status" , StatusTypeEnum::APPROVED );
return $this->morphMany( 'App\Transfer' , "transferable" )->where( "status" , StatusTypeEnum::APPROVED )->orderBy("id" , "desc");
}
public function latestTransfer()
{
return $this->morphOne( 'App\Transfer' , "transferable" )->where( "status" , StatusTypeEnum::APPROVED )->orderBy("id" , "desc")->latest();
}
public function transferActive()
{
return $this->morphMany( 'App\Transfer' , "transferable" )->where( "status" , StatusTypeEnum::APPROVED )->whereNull( "to_date" );
return $this->morphMany( 'App\Transfer' , "transferable" )->where( "status" , StatusTypeEnum::APPROVED )->whereNull( "to_date" )->orderBy("id" , "desc");
}
public function registerMediaCollections(): void