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

fix some problems

Browse Source
This commit is contained in:
mahdi purHosseini
2023-12-07 10:00:19 +03:30
parent dc019fec75
commit 1ad766d699
62 changed files with 2160 additions and 1244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/FakeModel.php
+16
View File
@@ -0,0 +1,16 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
use Spatie\MediaLibrary\HasMedia\HasMedia;
use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
class FakeModel extends Model implements HasMedia
{
use HasMediaTrait;
public $timestamps = false;
protected $fillable = ['batch_id'];
}
app/Http/Controllers/ItemController.php
+115 -124
View File
@@ -3,27 +3,19 @@
namespace App\Http\Controllers;
use App\Http\Requests\StoreItemRequest;
use App\Http\Resources\ItemResource;
use App\Item;
use App\Media;
use App\Services\Media\MediaHelper;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;
use Packages\Messaging\src\Facades\MessageResponse;
class ItemController extends Controller
{
public function index( Request $request )
{
$user = auth( 'api' )->user();
$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 );
} );
}
$Items = Item::when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
} )
->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
} )
->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
$query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
} )
@@ -41,52 +33,114 @@ class ItemController extends Controller
$query->where( 'medical_center_id' , $request->medical_center_id );
} );
} )
->with( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'medical_center_id' );
} ,
->with( [
'user' ,
'package' ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
}
] )
->orderByDesc( 'id' )
->paginate( 10 );
return \MessageResponse::data( $Items );
$query->select( 'id' , 'name' , 'address' , 'phone_number' );
} ,
] );
$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' )->paginate( 10 );
return ItemResource::collection( $Items );
}
public function create()
public function myItems( Request $request )
{
$Items = Item::when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
} )
->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
$query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
} )
->when( $request->has( 'size' ) && $request->size != '' , function ( $query ) use ( $request ) {
$query->where( 'size' , $request->size );
} )
->when( $request->has( 'item_id' ) && $request->item_id != '' , function ( $query ) use ( $request ) {
$query->where( 'id' , $request->item_id );
} )
->when( $request->has( 'specific' ) && $request->specific != '' , function ( $query ) use ( $request ) {
$query->where( 'specific' , $request->specific );
} )
->with( [
'user' ,
'package' ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' , 'address' , 'phone_number' );
} ,
"transfers" => function ( $query ) {
$query->with( [
'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'cell_number' );
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' , 'address' , 'phone_number' );
}
] );
}
] );
$user = auth( 'api' )->user();
if ( $user->hasRole( 'User' ) ) {
$Items = $Items->where( "user_id" , $user->id );
} 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' )->paginate( 10 );
return ItemResource::collection( $Items );
}
public function getItems()
{
$Items = Item::where( "status" , 1 )
->where( "package_id" , null )
->orderByDesc( 'id' )
->get();
return ItemResource::collection( $Items );
}
public function show( Item $Item )
{
$Item->load( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'medical_center_id' );
} ,
$Item->load( [
'user' ,
'package' ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
$query->select( 'id' , 'name' , 'address' , 'phone_number' );
} ,
"transfers" => function ( $query ) {
$query->with( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'cell_number' , 'medical_center_id' );
} ] );
$query->with( [
'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'cell_number' );
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' , 'address' , 'phone_number' );
}
] );
}
] );
$FilesPath = [];
if ( count( $Item->files ) ) {
foreach ( $Item->files as $Key => $File ) {
$FilesPath[] = $File->path;
}
$Item[ 'filesPath' ] = $FilesPath;
}
return \MessageResponse::data( $Item );
return ItemResource::make( $Item );
}
public function store( StoreItemRequest $request )
{
$ItemData = [
$Item = Item::create( [
'name' => $request->name ,
'size' => $request->size ,
'unique_id' => $request->unique_id ,
@@ -94,122 +148,59 @@ class ItemController extends Controller
'note' => $request->note ,
'udi' => $request->udi ,
'user_id' => auth( 'api' )->user()->id ,
];
$ItemObj = Item::create( $ItemData );
'creator_id' => auth( 'api' )->user()->id
] );
///////////////////////////////////////////////////////////////////////////Images
$Images = Media::whereNull( 'model_id' )->where( 'batch_id' , $request->file_batch_id )->get();
if ( $Images ) {
foreach ( $Images as $Image ) {
$NewPath = 'media' . '/Items' . '/' . $ItemObj->id . '/' . $Image->file_name;
Storage::disk( 'public' )->makeDirectory( 'Items' . '/' . $ItemObj->id );
if ( \File::exists( public_path( $Image->path ) ) ) {
\File::move( public_path( $Image->path ) , public_path( $NewPath ) );
}
$Image->model_id = $ItemObj->id;
$Image->path = $NewPath;
$Image->save();
}
}
///////////////////////////////////////////////////////////////////////////Images
MediaHelper::moveMediaTo( $Item );
return \MessageResponse::success( trans( 'messages.success' ) );
return MessageResponse::success( trans( 'messages.success' ) );
}
public function edit( Item $Item )
{
$FilesPath = [];
if ( count( $Item->files ) ) {
foreach ( $Item->files as $Key => $file ) {
$FilesPath[] = $file;
}
$Item[ 'filesPath' ] = $FilesPath;
} else {
$Item[ 'filesPath' ] = [];
}
return \MessageResponse::data( $Item );
return ItemResource::make( $Item );
}
public function update( StoreItemRequest $request , Item $Item )
{
$Item->update( $request->all() );
return \MessageResponse::success( trans( 'messages.success' ) );
$Item->update( [
'name' => $request->name ,
'size' => $request->size ,
'unique_id' => $request->unique_id ,
'specific' => $request->specific ,
'note' => $request->note ,
'udi' => $request->udi
] );
MediaHelper::moveMediaTo( $Item );
return MessageResponse::success( trans( 'messages.success' ) );
}
public function destroy( Item $Item )
{
if ( ! auth( 'api' )->user()->can( 'delete' , $Item ) ) {
return \MessageResponse::error( trans( 'messages.access_denied' ) );
}
if ( count( $Item->packages ) ) {
$Item->packages()->detach();
return MessageResponse::error( trans( 'messages.access_denied' ) );
}
$Item->delete();
return \MessageResponse::success( trans( 'messages.success' ) );
}
public function getItems()
{
$user = auth( 'api' )->user();
$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' );
} ,
'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' );
} ] );
}
] )
->orderByDesc( 'id' )
->get();
return \MessageResponse::data( $Items );
}
public function showItem( Item $Item )
{
$Item->load( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'medical_center_id' );
} ,
'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' );
} ] );
}
] );
return \MessageResponse::data( $Item );
return MessageResponse::success( trans( 'messages.success' ) );
}
public function changeStatus( Item $Item )
{
if ( auth( 'api' )->user()->cant( 'changeStatus' , Item::class ) ) {
return \MessageResponse::error( trans( 'messages.access_denied' ) );
return MessageResponse::error( trans( 'messages.access_denied' ) );
}
$Item->status = ! $Item->status;
$Item->save();
return \MessageResponse::data( $Item );
return ItemResource::make( $Item );
}
public function changeRepair( Item $Item )
{
if ( auth( 'api' )->user()->cant( 'changeRepair' , Item::class ) ) {
return \MessageResponse::error( trans( 'messages.access_denied' ) );
return MessageResponse::error( trans( 'messages.access_denied' ) );
}
$Item->repair = ! $Item->repair;
$Item->save();
return \MessageResponse::data( $Item );
return ItemResource::make( $Item );
}
}
app/Http/Controllers/Media/DestroyMedia.php
+16
View File
@@ -0,0 +1,16 @@
<?php
namespace App\Http\Controllers\Media;
use App\Http\Controllers\Controller;
use Packages\Messaging\src\Facades\MessageResponse;
use Spatie\MediaLibrary\Models\Media;
class DestroyMedia extends Controller
{
public function __invoke(Media $media)
{
$media->delete();
return MessageResponse::success( null , trans( 'messages.success' ) );
}
}
app/Http/Controllers/Media/StoreMedia.php
+33
View File
@@ -0,0 +1,33 @@
<?php
namespace App\Http\Controllers\Media;
use App\FakeModel;
use App\Http\Controllers\Controller;
use App\Services\Responser;
use Illuminate\Http\Request;
class StoreMedia extends Controller
{
public function __invoke(Request $request)
{
$this->validate($request, [
'batch_id' => 'required|max:40',
'file' => 'required|mimes:jpeg,jpg,bmp,png,pdf'
], [
'required' => trans('validations.required'),
'max' => trans('validations.max', ['number' => 255]),
'mimes' => trans('validations.mimes', ['types' => 'jpeg,jpg,bmp,png']),
]);
$fakeModel = FakeModel::firstOrCreate(['batch_id' => $request->input('batch_id')]);
$media = $fakeModel->addMedia($request->file('file'))->toMediaCollection('temp_medias');
return response()->json(
Responser::success(
'فایل با موفقیت بارگزاری گردید',
null,
['id' => $media->id, 'url' => $media->getUrl()]
)
);
}
}
app/Http/Controllers/PackageController.php
+102 -120
View File
@@ -3,27 +3,19 @@
namespace App\Http\Controllers;
use App\Http\Requests\StorePackageRequest;
use App\Http\Resources\PackageResource;
use App\Item;
use App\Package;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Packages\Messaging\src\Facades\MessageResponse;
class PackageController extends Controller
{
public function index( Request $request )
{
$user = auth( 'api' )->user();
$Packages = Package::when( $user->cant( 'showAll' , Package::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 );
} );
}
$Packages = Package::when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
} )
->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
} )
->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) {
$query->where( 'id' , $request->package_id );
} )
@@ -32,38 +24,94 @@ class PackageController extends Controller
$query->where( 'medical_center_id' , $request->medical_center_id );
} );
} )
->with( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'medical_center_id' );
} ,
->with( [
'user' ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
} ] )
->orderByDesc( 'id' )
->paginate( 10 );
$query->select( 'id' , 'name' , 'address' , 'phone_number' );
} ,
] );
return \MessageResponse::data( $Packages );
$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' )->paginate( 10 );
return PackageResource::collection( $Packages );
}
public function create()
public function myPackages( Request $request )
{
$Packages = Package::when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
} )
->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) {
$query->where( 'id' , $request->package_id );
} )
->when( $request->has( 'medical_center_id' ) && $request->medical_center_id != '' && $request->medical_center_id != 'undefined' , function ( $query ) use ( $request ) {
$query->whereHas( 'user' , function ( $query ) use ( $request ) {
$query->where( 'medical_center_id' , $request->medical_center_id );
} );
} )
->with( [
'user' ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' , 'address' , 'phone_number' );
} ,
"transfers" => function ( $query ) {
$query->with( [
'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'cell_number' );
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' , 'address' , 'phone_number' );
}
] );
}
] );
$user = auth( 'api' )->user();
if ( $user->hasRole( 'User' ) ) {
$Packages = $Packages->where( "user_id" , $user->id );
} elseif ( $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();
return PackageResource::collection( $Packages );
}
public function getPackages()
{
$Packages = Package::orderByDesc( 'id' )->get();
return PackageResource::collection( $Packages );
}
public function show( Package $Package )
{
$Package->load( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'medical_center_id' );
} ,
$Package->load( [
'user' ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
$query->select( 'id' , 'name' , 'address' , 'phone_number' );
} ,
'items' ,
"transfers" => function ( $query ) {
$query->with( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'cell_number' , 'medical_center_id' );
} ] );
$query->with( [
'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'cell_number' );
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' , 'address' , 'phone_number' );
}
] );
}
] );
return \MessageResponse::data( $Package );
return PackageResource::make( $Package );
}
public function store( StorePackageRequest $request )
@@ -71,129 +119,63 @@ class PackageController extends Controller
$PackageData = [
'name' => $request->name ,
'note' => $request->note ,
'user_id' => auth( 'api' )->user()->id ,
'verified' => 'NotVerified' ,
'user_id' => auth( 'api' )->user()->id ,
'creator_id' => auth( 'api' )->user()->id
];
$PackageObj = Package::create( $PackageData );
$Package = Package::create( $PackageData );
foreach ( $request->items as $itemId ) {
$item = Item::where( "id" , $itemId )->first();
if ( $item ) {
$item->packages()->detach();
$PackageObj->items()->attach( $item->id , [ 'count' => 1 ] );
$item->update( [
"package_id" => $Package->id
] );
}
}
return \MessageResponse::success( trans( 'messages.success' ) );
return MessageResponse::success( trans( 'messages.success' ) );
}
public function edit( Package $Package )
{
$Items = [];
$Package->load( 'items' );
foreach ( $Package->items as $item ) {
for ( $i = 0 ; $i < $item->pivot->count ; $i++ ) {
$Items[] = (object) array( 'id' => $item->id , 'name' => $item->name );
}
}
unset( $Package->items );
$Package->items = $Items;
return \MessageResponse::data( $Package );
return PackageResource::make( $Package );
}
public function update( StorePackageRequest $request , Package $Package )
{
$Package->update( $request->except( [ 'items' ] ) );
$Items = [];
$count = 1;
foreach ( $request->items as $key => $item ) {
$itemOld = $Package->items()->where("item_id",$item[ 'id' ])->first();
if ( $itemOld ) {
$Items[ $item[ 'id' ] ] = $itemOld->pivot->count + 1;
} else {
$Items[ $item[ 'id' ] ] = $count;
}
}
$Package->items()->detach();
foreach ( $Items as $Item => $Count ) {
$item = Item::where( "id" , array( $Item ) )->first();
foreach ( $request->items as $itemId ) {
$item = Item::where( "id" , $itemId )->first();
if ( $item ) {
$item->packages()->detach();
$Package->items()->attach( array( $item->id ) , [ 'count' => $Count ] );
$item->update( [
"package_id" => $Package->id
] );
}
}
return \MessageResponse::success( trans( 'messages.success' ) );
return MessageResponse::success( trans( 'messages.success' ) );
}
public function destroy( Package $Package )
{
if ( auth( 'api' )->user()->cant( 'delete' , $Package ) ) {
return \MessageResponse::error( trans( 'messages.access_denied' ) );
return MessageResponse::error( trans( 'messages.access_denied' ) );
}
if ( count( $Package->items ) ) {
$Package->items()->detach();
foreach ( $Package->items as $itemId ) {
$item = Item::where( "id" , $itemId )->first();
if ( $item ) {
$item->update( [
"package_id" => null
] );
}
}
}
if ( count( $Package->labels ) ) {
$Package->labels()->delete();
}
$Package->delete();
return \MessageResponse::success( trans( 'messages.success' ) );
}
public function verifyPackage( Package $Package )
{
if ( auth( 'api' )->user()->cant( 'verifyPackage' , $Package ) ) {
return \MessageResponse::error( trans( 'You dont have permission' ) );
}
if ( $Package->verified == 'Verified' ) {
$Package->verified = 'NotVerified';
} else {
$Package->verified = 'Verified';
}
$Package->save();
$Package = $Package->load( 'user' );
return \MessageResponse::success( trans( 'messages.success' ) , null , $Package );
}
public function getPackages()
{
$user = auth( 'api' )->user();
$Packages = Package::when( $user->cant( 'showAll' , Package::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' );
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
} ] )
->orderByDesc( 'id' )
->get();
return \MessageResponse::data( $Packages );
}
public function showPackage( Package $Package )
{
$Package->load( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'medical_center_id' );
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
} ,
'items' ,
"transfers" => function ( $query ) {
$query->with( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'cell_number' , 'medical_center_id' );
} ] );
}
] );
return \MessageResponse::data( $Package );
return MessageResponse::success( trans( 'messages.success' ) );
}
}
app/Http/Controllers/TestResultController.php
+423 -465
View File
@@ -1,484 +1,442 @@
<?php
namespace App\Http\Controllers;
namespace App\Http\Controllers;
use App\Http\Requests\StoreTestResultRequest;
use App\Input;
use App\InputValue;
use App\Media;
use App\MedicalCenter;
use App\TestResult;
use App\TestType;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;
use App\Http\Requests\StoreTestResultRequest;
use App\Http\Resources\TestResultResource;
use App\Input;
use App\InputValue;
use App\Media;
use App\MedicalCenter;
use App\Services\Media\MediaHelper;
use App\TestResult;
use App\TestType;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Storage;
use Packages\Messaging\src\Facades\MessageResponse;
class TestResultController extends Controller
class TestResultController extends Controller
{
public function index( Request $request )
{
$user = auth( 'api' )->user();
public function index( Request $request )
{
$user = auth( 'api' )->user();
if ( $user->hasRole( 'Supervisor|User' ) ) {
$medical_center_id = $user->medical_center_id;
} elseif ( $request->has( 'medicalCenter_id' ) && $request->medicalCenter_id != '' && $request->medicalCenter_id != 'undefined' ) {
$medical_center_id = $request->medicalCenter_id;
} else {
$medical_center_id = null;
}
if ( $user->hasRole( 'Supervisor|User' ) ) {
$medical_center_id = $user->medical_center_id;
} elseif ( $request->has( 'medicalCenter_id' ) && $request->medicalCenter_id != '' && $request->medicalCenter_id != 'undefined' ) {
$medical_center_id = $request->medicalCenter_id;
} else {
$medical_center_id = null;
}
if ( $user->hasRole( 'User' ) ) {
$user_name = $user->name;
} elseif ( $request->has( 'user_name' ) && $request->user_name ) {
$user_name = $request->user_name;
} else {
$user_name = null;
}
if ( $user->hasRole( 'User' ) ) {
$user_name = $user->name;
} elseif ( $request->has( 'user_name' ) && $request->user_name ) {
$user_name = $request->user_name;
} else {
$user_name = null;
}
$TestResult = TestResult::when( $request->has( 'verified' ) , function ( $query ) use ( $request ) {
return $query->where( 'verified' , $request->verified )->orWhere('verified' , "None" );
$TestResult = TestResult::when( $request->has( 'verified' ) , function ( $query ) use ( $request ) {
return $query->where( 'verified' , $request->verified )->orWhere( 'verified' , "None" );
} )
->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( '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( 'testType_id' ) && $request->testType_id , function ( $query ) use ( $request ) {
$query->where( 'test_type_id' , $request->testType_id );
} )
->when( ($request->has( 'device_id' ) && $request->device_id) && ($request->has( 'device_label' ) && $request->device_label && $request->device_label != "undefined") , function ( $query ) use ( $request ) {
if ( $request->device_label != 'undefined' ) {
$query->whereHas( 'input_values' , function ( $query ) use ( $request ) {
$query->whereHas( 'input' , function ( $query ) use ( $request ) {
$query->where( 'name' , $request->device_label );
} )->where( 'value' , $request->device_id );
} );
} else {
$query->where( function ( $query ) use ( $request ) {
$query->where( 'id' , $request->device_id );
} );
}
} )
->when( ($request->has( 'device_id' ) && $request->device_id) && !($request->has( 'device_label' ) && $request->device_label && $request->device_label != "undefined") , function ( $query ) use ( $request ) {
$query->where( function ( $query ) use ( $request ) {
$query->where( 'id' , $request->device_id );
} );
} )
->when( ($request->has( 'device_label' ) && $request->device_label && $request->device_label != "undefined") && !($request->has( 'device_id' ) && $request->device_id), function ( $query ) use ( $request ) {
->when( $request->has( 'testType_id' ) && $request->testType_id , function ( $query ) use ( $request ) {
$query->where( 'test_type_id' , $request->testType_id );
} )
->when( ( $request->has( 'device_id' ) && $request->device_id ) && ( $request->has( 'device_label' ) && $request->device_label && $request->device_label != "undefined" ) , function ( $query ) use ( $request ) {
if ( $request->device_label != 'undefined' ) {
$query->whereHas( 'input_values' , function ( $query ) use ( $request ) {
$query->whereHas( 'input' , function ( $query ) use ( $request ) {
$query->where( 'name' , $request->device_label );
} );
} )->where( 'value' , $request->device_id );
} );
} )
->when( $user_name , function ( $query ) use ( $user_name ) {
$query->whereHas( 'user' , function ( $query ) use ( $user_name ) {
$query->where( 'name' , 'LIKE' , '%' . $user_name . '%' );
} else {
$query->where( function ( $query ) use ( $request ) {
$query->where( 'id' , $request->device_id );
} );
} )
->when( $medical_center_id , function ( $query ) use ( $medical_center_id ) {
$query->whereHas( 'user' , function ( $query ) use ( $medical_center_id ) {
$query->where( 'medical_center_id' , $medical_center_id );
} );
} )
->with( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'medical_center_id' );
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
} ,
'test_type' => function ( $query ) {
$query->select( 'id' , 'name' );
} ] )
->orderByDesc( 'id' )->paginate( 10 );
return \MessageResponse::data( $TestResult );
}
public function create()
{
//
}
public function store( StoreTestResultRequest $request )
{
try {
$return_value = \DB::transaction( function () use ( $request ) {
$TestResult = [
'user_id' => auth( 'api' )->user()->id ,
'cycle_number' => $request->cycle_number ,
'date' => $request->date ,
'test_type_id' => $request->test_type_id ,
'result' => $request->result ,
'verified' => 'None' ,
];
$TestResultObj = TestResult::create( $TestResult );
$TestResultInfo = $request->all();
$Inputs = Input::with( 'options' , 'children' , 'children.options' )->whereNull( 'parent_id' )->where( 'test_type_id' , $request->test_type_id )->get();
///////////////////////////////////////////////////////////////////////////Inputs
foreach ( $Inputs as $Input ) {
if ( $Input[ 'type' ] != 'Form' ) {
$Value = $TestResultInfo[ $Input->name . '_' . $Input->id ];
if ( $Input[ 'type' ] == 'Checkbox' || $Input[ 'type' ] == 'Select' || $Input[ 'type' ] == 'Radiobutton' ) {
foreach ( $Input->options as $Option ) {//--2
if ( is_array( $Value ) && in_array( $Option->id , $Value ) ) {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $Input->id , 'option_id' => $Option->id ] );
}
if ( $Input[ 'type' ] == 'Radiobutton' && $Option->id == $Value ) {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $Input->id , 'option_id' => $Option->id ] );
}
}
} else {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $Input->id , 'value' => $Value ] );
}
} else {
foreach ( $Input->children as $InputChild ) {
$Value = $TestResultInfo[ $InputChild->name . '_' . $InputChild->id ];
if ( $InputChild[ 'type' ] == 'Checkbox' || $InputChild[ 'type' ] == 'Select' || $InputChild[ 'type' ] == 'Radiobutton' ) {
foreach ( $InputChild->options as $Option ) {//--2
if ( is_array( $Value ) && in_array( $Option->id , $Value ) ) {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $InputChild->id , 'option_id' => $Option->id ] );
}
if ( $InputChild[ 'type' ] == 'Radiobutton' && $Option->id == $Value ) {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $InputChild->id , 'option_id' => $Option->id ] );
}
}
} else {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $InputChild->id , 'value' => $Value ] );
}
}
}
}
///////////////////////////////////////////////////////////////////////////Inputs
///////////////////////////////////////////////////////////////////////////Images
$Images = Media::whereNull( 'model_id' )->where( 'batch_id' , $request->file_batch_id )->get();
if ( $Images ) {
foreach ( $Images as $Image ) {
$NewPath = 'media' . '/TestResults' . '/' . $TestResultObj->id . '/' . $Image->file_name;
Storage::disk( 'public' )->makeDirectory( 'TestResults' . '/' . $TestResultObj->id );
if ( \File::exists( public_path( $Image->path ) ) ) {
\File::move( public_path( $Image->path ) , public_path( $NewPath ) );
}
$Image->model_id = $TestResultObj->id;
$Image->path = $NewPath;
$Image->save();
}
}
///////////////////////////////////////////////////////////////////////////Images
} );
} catch ( \Exception $e ) {
return response()->json( $e->getMessage() , 441 );
}
return \MessageResponse::success( null , trans( 'messages.create' ) );
}
public function show( $id )
{
$TestResult = TestResult::with( 'input_values' , 'user.medical_center' , 'test_type' )->select( 'result' , 'verified' , 'device_id' , 'user_id' , 'id' , 'test_type_id' , 'created_at' )->findOrFail( $id );
$options = [];
foreach ( $TestResult->input_values as $value ) {
$input = $value->input;
if ( $input->parent_id != null && $input->parent[ 'type' ] == 'Form' ) {
//----------------------------------------------------------------------FormType
if ( $input->type == 'Checkbox' || $input->type == 'Select' || $input[ 'type' ] == 'Radiobutton' ) {
$input_options = InputValue::with( 'option' )->where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $input->id )->get();
$options = [];
foreach ( $input_options as $input_option ) {
$options[] = $input_option->option->title;
$input_values[ $input->name ] = $options;
}
$children[ $input->parent->name ] = $input_values;
$TestResult[ 'children' ] = $children;
} else {
$children[ $input->parent->name ][ $input->name ] = $value->value;
$TestResult[ 'children' ] = $children;
}
//-----------------------------------------------------------------------FormType
} else {
//-----------------------------------------------------------------------Anothertype
if ( $input->type == 'Checkbox' || $input->type == 'Select' || $input[ 'type' ] == 'Radiobutton' ) {
$input_options = InputValue::with( 'option' )->where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $input->id )->get();
$options = [];
foreach ( $input_options as $input_option ) {
$options[] = $input_option->option->title;
}
$values[ $input->name ] = $options;
$TestResult[ 'options' ] = $values;
} else {
$inputs[ $input->name ] = $value->value;
$TestResult[ 'inputs' ] = $inputs;
}
//-----------------------------------------------------------------------Anothertype
}
}
$FilesPath = [];
if ( count( $TestResult->files ) ) {
foreach ( $TestResult->files as $Key => $File ) {
$FilesPath[] = $File->path;
}
$TestResult[ 'filesPath' ] = $FilesPath;
}
$TestResult[ 'device_label' ] = $TestResult->test_type->device_label;
return \MessageResponse::data( $TestResult );
}
public function edit( TestResult $TestResult )
{
foreach ( $TestResult->input_values as $key => $value ) {
$input = $value->input;
if ( $input->type == 'Checkbox' || $input->type == 'Select' || $input[ 'type' ] == 'Radiobutton' ) {
$input_options = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $input->id )->get()->pluck( 'option_id' )->toArray();
if ( $input[ 'type' ] == 'Radiobutton' ) {
$TestResult[ $input->name . '_' . $input->id ] = $input_options[ 0 ];
} else {
$TestResult[ $input->name . '_' . $input->id ] = $input_options;
}
} else {
$TestResult[ $input->name . '_' . $input->id ] = $value->value;
}
}
$FilesPath = [];
if ( count( $TestResult->files ) ) {
foreach ( $TestResult->files as $Key => $file ) {
$FilesPath[] = $file;
}
$TestResult[ 'filesPath' ] = $FilesPath;
} else {
$TestResult[ 'filesPath' ] = [];
}
return \MessageResponse::data( $TestResult );
}
public static function storage_path( $path )
{
if ( starts_with( $path , 'media/' ) ) {
$path = substr( $path , 6 );
}
return $path;
}
public function update( StoreTestResultRequest $request , TestResult $TestResult )
{
$TestResultData = [
'cycle_number' => $request->cycle_number ,
'date' => $request->date ,
'test_type_id' => $request->test_type_id ,
'result' => $request->result ,
// 'verified' => 'NotVerified',
];
$TestResult->update( $TestResultData );
$TestResultInfo = $request->all();
$Inputs = Input::with( 'options' , 'children' , 'children.options' )->whereNull( 'parent_id' )->where( 'test_type_id' , $request->test_type_id )->get();
foreach ( $Inputs as $Input ) {
if ( $Input[ 'type' ] != 'Form' ) {
$Value = $TestResultInfo[ $Input->name . '_' . $Input->id ];
if ( $Input[ 'type' ] == 'Checkbox' || $Input[ 'type' ] == 'Select' || $Input[ 'type' ] == 'Radiobutton' ) {
$InputOptions = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $Input->id )->get()->each->delete();
foreach ( $Input->options as $Option ) {//--2
if ( is_array( $Value ) && in_array( $Option->id , $Value ) ) {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResult->id , 'input_id' => $Input->id , 'option_id' => $Option->id ] );
}
if ( $Input[ 'type' ] == 'Radiobutton' && $Option->id == $Value ) {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResult->id , 'input_id' => $Input->id , 'option_id' => $Option->id ] );
}
}
} else {
$InputValueObj = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $Input[ 'id' ] )->update( [ 'value' => $Value ] );
}
} else {
foreach ( $Input->children as $InputChild ) {
$Value = $TestResultInfo[ $InputChild->name . '_' . $InputChild->id ];
if ( $InputChild[ 'type' ] == 'Checkbox' || $InputChild[ 'type' ] == 'Select' || $InputChild[ 'type' ] == 'Radiobutton' ) {
$InputOptions = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $InputChild->id )->get()->each->delete();
foreach ( $InputChild->options as $Option ) {//--2
if ( is_array( $Value ) && in_array( $Option->id , $Value ) ) {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResult->id , 'input_id' => $InputChild->id , 'option_id' => $Option->id ] );
}
if ( $InputChild[ 'type' ] == 'Radiobutton' && $Option->id == $Value ) {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResult->id , 'input_id' => $InputChild->id , 'option_id' => $Option->id ] );
}
}
} else {
$InputValueObj = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $InputChild[ 'id' ] )->update( [ 'value' => $Value ] );
}
}
}
}
/////////////////////////////////////////////////////////////////////Images
return \MessageResponse::success( null , trans( 'messages.update' ) );
}
public function destroy( TestResult $TestResult )
{
if ( ! auth( 'api' )->user()->can( 'delete' , $TestResult ) ) {
return \MessageResponse::error( trans( 'messages.access_denied' ) );
}
if ( count( $TestResult->input_values ) ) {
InputValue::where( 'test_result_id' , $TestResult->id )->get()->each->delete();
}
if ( count( $TestResult->files ) ) {
foreach ( $TestResult->files as $file ) {
Storage::disk( 'public' )->delete( static::storage_path( $file->path ) );
Media::where( 'id' , $file->id )->delete();
}
}
$TestResult->delete();
return \MessageResponse::success( null , trans( 'messages.success' ) );
}
public function verifyTestResult( TestResult $TestResult , $Value )
{
if ( auth( 'api' )->user()->cant( 'verifyTestResult' , $TestResult ) ) {
return \MessageResponse::error( trans( 'You dont have permission or this test result belongs to another medical center' ) );
}
$TestResult->verified = $Value;
$TestResult->save();
$TestResult = $TestResult->load( 'user.medical_center' );
return \MessageResponse::success( trans( 'messages.success' ) , null , $TestResult );
}
public function listFilterItems()
{
$user = auth( 'api' )->user();
$MedicalCenter = MedicalCenter::when( ! $user->hasRole( 'Admin' ) , function ( $query ) use ( $user ) {
$query->where( 'id' , $user->medical_center_id );
} )->select( 'name' , 'id' )->get()->toArray();
$TestType = TestType::select( 'name' , 'id' )->get()->toArray();
return \MessageResponse::data( [
'MedicalCenters' => $MedicalCenter ,
'TestTypes' => $TestType
] );
}
public function chart( Request $request )
{
$user = auth( 'api' )->user();
if ( $user->hasRole( 'User' ) ) {
$userId = $user->id;
} elseif ( $request->has( 'userId' ) && $request->userId ) {
$userId = $request->userId;
} else {
$userId = null;
}
if ( $user->hasRole( 'Admin' ) && $request->has( 'medicalCenterId' ) && $request->medicalCenterId ) {
$medicalCenterId = $request->medicalCenterId;
} else {
$medicalCenterId = $user->medical_center_id;
}
$TestResults = TestResult::
when( $userId , function ( $query ) use ( $userId ) {
$query->where( 'user_id' , $userId );
} )
->when( $medicalCenterId , function ( $query ) use ( $medicalCenterId ) {
$query->whereHas( 'user' , function ( $query ) use ( $medicalCenterId ) {
$query->where( 'medical_center_id' , $medicalCenterId );
->when( ( $request->has( 'device_id' ) && $request->device_id ) && ! ( $request->has( 'device_label' ) && $request->device_label && $request->device_label != "undefined" ) , function ( $query ) use ( $request ) {
$query->where( function ( $query ) use ( $request ) {
$query->where( 'id' , $request->device_id );
} );
} )
->when( ( $request->has( 'device_label' ) && $request->device_label && $request->device_label != "undefined" ) && ! ( $request->has( 'device_id' ) && $request->device_id ) , function ( $query ) use ( $request ) {
$query->whereHas( 'input_values' , function ( $query ) use ( $request ) {
$query->whereHas( 'input' , function ( $query ) use ( $request ) {
$query->where( 'name' , $request->device_label );
} );
} )
->when( $request->has( 'testTypeId' ) && $request->testTypeId , function ( $query ) use ( $request ) {
$query->where( 'test_type_id' , $request->testTypeId );
} )
->when( $request->has( 'result' ) && $request->result , function ( $query ) use ( $request ) {
$query->where( 'result' , $request->result );
} )
->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( 'verify' ) && $request->verify , function ( $query ) use ( $request ) {
$query->where( 'verified' , $request->verify );
} )->select( 'result' )->get()->groupBy( 'result' );
$AcceptCount = ( isset( $TestResults[ 'Accept' ] ) ) ? $TestResults[ 'Accept' ]->count() : 0;
$RejectCount = ( isset( $TestResults[ 'Reject' ] ) ) ? $TestResults[ 'Reject' ]->count() : 0;
return \MessageResponse::data( [ 'labels' => [ 'Number Of Accepted Test Results' , 'Number Of Rejected Test Results' ] , 'data' => [ $AcceptCount , $RejectCount ] ] );
}
public function showTestResult( $id )
{
$TestResult = TestResult::with( 'input_values' , 'user.medical_center' , 'test_type' )->select( 'result' , 'verified' , 'device_id' , 'user_id' , 'id' , 'test_type_id' , 'created_at' )->findOrFail( $id );
$options = [];
foreach ( $TestResult->input_values as $value ) {
$input = $value->input;
if ( $input->parent_id != null && $input->parent[ 'type' ] == 'Form' ) {
//----------------------------------------------------------------------FormType
if ( $input->type == 'Checkbox' || $input->type == 'Select' || $input[ 'type' ] == 'Radiobutton' ) {
$input_options = InputValue::with( 'option' )->where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $input->id )->get();
$options = [];
foreach ( $input_options as $input_option ) {
$options[] = $input_option->option->title;
$input_values[ $input->name ] = $options;
}
$children[ $input->parent->name ] = $input_values;
$TestResult[ 'children' ] = $children;
} else {
$children[ $input->parent->name ][ $input->name ] = $value->value;
$TestResult[ 'children' ] = $children;
}
//-----------------------------------------------------------------------FormType
} else {
//-----------------------------------------------------------------------Anothertype
if ( $input->type == 'Checkbox' || $input->type == 'Select' || $input[ 'type' ] == 'Radiobutton' ) {
$input_options = InputValue::with( 'option' )->where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $input->id )->get();
$options = [];
foreach ( $input_options as $input_option ) {
$options[] = $input_option->option->title;
}
$values[ $input->name ] = $options;
$TestResult[ 'options' ] = $values;
} else {
$inputs[ $input->name ] = $value->value;
$TestResult[ 'inputs' ] = $inputs;
}
//-----------------------------------------------------------------------Anothertype
}
}
$FilesPath = [];
if ( count( $TestResult->files ) ) {
foreach ( $TestResult->files as $Key => $File ) {
$FilesPath[] = $File->path;
}
$TestResult[ 'filesPath' ] = $FilesPath;
}
$TestResult[ 'device_label' ] = $TestResult->test_type->device_label;
return \MessageResponse::data( $TestResult );
}
} );
} )
->when( $user_name , function ( $query ) use ( $user_name ) {
$query->whereHas( 'user' , function ( $query ) use ( $user_name ) {
$query->where( 'name' , 'LIKE' , '%' . $user_name . '%' );
} );
} )
->when( $medical_center_id , function ( $query ) use ( $medical_center_id ) {
$query->whereHas( 'user' , function ( $query ) use ( $medical_center_id ) {
$query->where( 'medical_center_id' , $medical_center_id );
} );
} )
->with( [
'user' ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' , 'address' , 'phone_number' );
} ,
'test_type' => function ( $query ) {
$query->select( 'id' , 'name' );
} ] )
->orderByDesc( 'id' )->paginate( 10 );
return TestResultResource::collection( $TestResult );
}
public function store( StoreTestResultRequest $request )
{
try {
DB::transaction( function () use ( $request ) {
$TestResult = [
'user_id' => auth( 'api' )->user()->id ,
'cycle_number' => $request->cycle_number ,
'date' => $request->date ,
'test_type_id' => $request->test_type_id ,
'result' => $request->result ,
'verified' => 'None' ,
];
$TestResultObj = TestResult::create( $TestResult );
$TestResultInfo = $request->all();
$Inputs = Input::with( 'options' , 'children' , 'children.options' )->whereNull( 'parent_id' )->where( 'test_type_id' , $request->test_type_id )->get();
///////////////////////////////////////////////////////////////////////////Inputs
foreach ( $Inputs as $Input ) {
if ( $Input[ 'type' ] != 'Form' ) {
$Value = $TestResultInfo[ $Input->name . '_' . $Input->id ];
if ( $Input[ 'type' ] == 'Checkbox' || $Input[ 'type' ] == 'Select' || $Input[ 'type' ] == 'Radiobutton' ) {
foreach ( $Input->options as $Option ) {//--2
if ( is_array( $Value ) && in_array( $Option->id , $Value ) ) {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $Input->id , 'option_id' => $Option->id ] );
}
if ( $Input[ 'type' ] == 'Radiobutton' && $Option->id == $Value ) {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $Input->id , 'option_id' => $Option->id ] );
}
}
} else {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $Input->id , 'value' => $Value ] );
}
} else {
foreach ( $Input->children as $InputChild ) {
$Value = $TestResultInfo[ $InputChild->name . '_' . $InputChild->id ];
if ( $InputChild[ 'type' ] == 'Checkbox' || $InputChild[ 'type' ] == 'Select' || $InputChild[ 'type' ] == 'Radiobutton' ) {
foreach ( $InputChild->options as $Option ) {//--2
if ( is_array( $Value ) && in_array( $Option->id , $Value ) ) {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $InputChild->id , 'option_id' => $Option->id ] );
}
if ( $InputChild[ 'type' ] == 'Radiobutton' && $Option->id == $Value ) {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $InputChild->id , 'option_id' => $Option->id ] );
}
}
} else {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $InputChild->id , 'value' => $Value ] );
}
}
}
}
///////////////////////////////////////////////////////////////////////////Inputs
MediaHelper::moveMediaTo( $TestResultObj );
} );
} catch ( \Exception $e ) {
return response()->json( $e->getMessage() , 441 );
}
return MessageResponse::success( null , trans( 'messages.create' ) );
}
public function show( $id )
{
$TestResult = TestResult::with( 'input_values' , 'user.medical_center' , 'test_type' )
->select( 'result' , 'verified' , 'device_id' , 'user_id' , 'id' , 'test_type_id' , 'created_at' )
->findOrFail( $id );
$options = [];
foreach ( $TestResult->input_values as $value ) {
$input = $value->input;
if ( $input->parent_id != null && $input->parent[ 'type' ] == 'Form' ) {
//----------------------------------------------------------------------FormType
if ( $input->type == 'Checkbox' || $input->type == 'Select' || $input[ 'type' ] == 'Radiobutton' ) {
$input_options = InputValue::with( 'option' )->where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $input->id )->get();
$options = [];
foreach ( $input_options as $input_option ) {
$options[] = $input_option->option->title;
$input_values[ $input->name ] = $options;
}
$children[ $input->parent->name ] = $input_values;
$TestResult[ 'children' ] = $children;
} else {
$children[ $input->parent->name ][ $input->name ] = $value->value;
$TestResult[ 'children' ] = $children;
}
//-----------------------------------------------------------------------FormType
} else {
//-----------------------------------------------------------------------Anothertype
if ( $input->type == 'Checkbox' || $input->type == 'Select' || $input[ 'type' ] == 'Radiobutton' ) {
$input_options = InputValue::with( 'option' )->where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $input->id )->get();
$options = [];
foreach ( $input_options as $input_option ) {
$options[] = $input_option->option->title;
}
$values[ $input->name ] = $options;
$TestResult[ 'options' ] = $values;
} else {
$inputs[ $input->name ] = $value->value;
$TestResult[ 'inputs' ] = $inputs;
}
//-----------------------------------------------------------------------Anothertype
}
}
$TestResult[ 'device_label' ] = $TestResult->test_type->device_label;
return TestResultResource::make( $TestResult );
}
public function edit( TestResult $TestResult )
{
foreach ( $TestResult->input_values as $key => $value ) {
$input = $value->input;
if ( $input->type == 'Checkbox' || $input->type == 'Select' || $input[ 'type' ] == 'Radiobutton' ) {
$input_options = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $input->id )->get()->pluck( 'option_id' )->toArray();
if ( $input[ 'type' ] == 'Radiobutton' ) {
$TestResult[ $input->name . '_' . $input->id ] = $input_options[ 0 ];
} else {
$TestResult[ $input->name . '_' . $input->id ] = $input_options;
}
} else {
$TestResult[ $input->name . '_' . $input->id ] = $value->value;
}
}
return TestResultResource::make( $TestResult );
}
public static function storage_path( $path )
{
if ( starts_with( $path , 'media/' ) ) {
$path = substr( $path , 6 );
}
return $path;
}
public function update( StoreTestResultRequest $request , TestResult $TestResult )
{
$TestResultData = [
'cycle_number' => $request->cycle_number ,
'date' => $request->date ,
'test_type_id' => $request->test_type_id ,
'result' => $request->result ,
// 'verified' => 'NotVerified',
];
$TestResult->update( $TestResultData );
$TestResultInfo = $request->all();
$Inputs = Input::with( 'options' , 'children' , 'children.options' )->whereNull( 'parent_id' )->where( 'test_type_id' , $request->test_type_id )->get();
foreach ( $Inputs as $Input ) {
if ( $Input[ 'type' ] != 'Form' ) {
$Value = $TestResultInfo[ $Input->name . '_' . $Input->id ];
if ( $Input[ 'type' ] == 'Checkbox' || $Input[ 'type' ] == 'Select' || $Input[ 'type' ] == 'Radiobutton' ) {
$InputOptions = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $Input->id )->get()->each->delete();
foreach ( $Input->options as $Option ) {//--2
if ( is_array( $Value ) && in_array( $Option->id , $Value ) ) {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResult->id , 'input_id' => $Input->id , 'option_id' => $Option->id ] );
}
if ( $Input[ 'type' ] == 'Radiobutton' && $Option->id == $Value ) {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResult->id , 'input_id' => $Input->id , 'option_id' => $Option->id ] );
}
}
} else {
$InputValueObj = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $Input[ 'id' ] )->update( [ 'value' => $Value ] );
}
} else {
foreach ( $Input->children as $InputChild ) {
$Value = $TestResultInfo[ $InputChild->name . '_' . $InputChild->id ];
if ( $InputChild[ 'type' ] == 'Checkbox' || $InputChild[ 'type' ] == 'Select' || $InputChild[ 'type' ] == 'Radiobutton' ) {
$InputOptions = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $InputChild->id )->get()->each->delete();
foreach ( $InputChild->options as $Option ) {//--2
if ( is_array( $Value ) && in_array( $Option->id , $Value ) ) {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResult->id , 'input_id' => $InputChild->id , 'option_id' => $Option->id ] );
}
if ( $InputChild[ 'type' ] == 'Radiobutton' && $Option->id == $Value ) {
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResult->id , 'input_id' => $InputChild->id , 'option_id' => $Option->id ] );
}
}
} else {
$InputValueObj = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $InputChild[ 'id' ] )->update( [ 'value' => $Value ] );
}
}
}
}
/////////////////////////////////////////////////////////////////////Images
return MessageResponse::success( null , trans( 'messages.update' ) );
}
public function destroy( TestResult $TestResult )
{
if ( ! auth( 'api' )->user()->can( 'delete' , $TestResult ) ) {
return MessageResponse::error( trans( 'messages.access_denied' ) );
}
if ( count( $TestResult->input_values ) ) {
InputValue::where( 'test_result_id' , $TestResult->id )->get()->each->delete();
}
$TestResult->delete();
return MessageResponse::success( null , trans( 'messages.success' ) );
}
public function verifyTestResult( TestResult $TestResult , $Value )
{
if ( auth( 'api' )->user()->cant( 'verifyTestResult' , $TestResult ) ) {
return MessageResponse::error( trans( 'You dont have permission or this test result belongs to another medical center' ) );
}
$TestResult->verified = $Value;
$TestResult->save();
$TestResult = $TestResult->load( 'user.medical_center' );
return MessageResponse::success( trans( 'messages.success' ) , null , $TestResult );
}
public function listFilterItems()
{
$user = auth( 'api' )->user();
$MedicalCenter = MedicalCenter::when( ! $user->hasRole( 'Admin' ) , function ( $query ) use ( $user ) {
$query->where( 'id' , $user->medical_center_id );
} )->select( 'name' , 'id' )->get()->toArray();
$TestType = TestType::select( 'name' , 'id' )->get()->toArray();
return MessageResponse::data( [
'MedicalCenters' => $MedicalCenter ,
'TestTypes' => $TestType
] );
}
public function chart( Request $request )
{
$user = auth( 'api' )->user();
if ( $user->hasRole( 'User' ) ) {
$userId = $user->id;
} elseif ( $request->has( 'userId' ) && $request->userId ) {
$userId = $request->userId;
} else {
$userId = null;
}
if ( $user->hasRole( 'Admin' ) && $request->has( 'medicalCenterId' ) && $request->medicalCenterId ) {
$medicalCenterId = $request->medicalCenterId;
} else {
$medicalCenterId = $user->medical_center_id;
}
$TestResults = TestResult::when( $userId , function ( $query ) use ( $userId ) {
$query->where( 'user_id' , $userId );
} )
->when( $medicalCenterId , function ( $query ) use ( $medicalCenterId ) {
$query->whereHas( 'user' , function ( $query ) use ( $medicalCenterId ) {
$query->where( 'medical_center_id' , $medicalCenterId );
} );
} )
->when( $request->has( 'testTypeId' ) && $request->testTypeId , function ( $query ) use ( $request ) {
$query->where( 'test_type_id' , $request->testTypeId );
} )
->when( $request->has( 'result' ) && $request->result , function ( $query ) use ( $request ) {
$query->where( 'result' , $request->result );
} )
->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( 'verify' ) && $request->verify , function ( $query ) use ( $request ) {
$query->where( 'verified' , $request->verify );
} )->select( 'result' )->get()->groupBy( 'result' );
$AcceptCount = ( isset( $TestResults[ 'Accept' ] ) ) ? $TestResults[ 'Accept' ]->count() : 0;
$RejectCount = ( isset( $TestResults[ 'Reject' ] ) ) ? $TestResults[ 'Reject' ]->count() : 0;
return MessageResponse::data( [ 'labels' => [ 'Number Of Accepted Test Results' , 'Number Of Rejected Test Results' ] , 'data' => [ $AcceptCount , $RejectCount ] ] );
}
public function showTestResult( $id )
{
$TestResult = TestResult::with( 'input_values' , 'user.medical_center' , 'test_type' )->select( 'result' , 'verified' , 'device_id' , 'user_id' , 'id' , 'test_type_id' , 'created_at' )->findOrFail( $id );
$options = [];
foreach ( $TestResult->input_values as $value ) {
$input = $value->input;
if ( $input->parent_id != null && $input->parent[ 'type' ] == 'Form' ) {
//----------------------------------------------------------------------FormType
if ( $input->type == 'Checkbox' || $input->type == 'Select' || $input[ 'type' ] == 'Radiobutton' ) {
$input_options = InputValue::with( 'option' )->where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $input->id )->get();
$options = [];
foreach ( $input_options as $input_option ) {
$options[] = $input_option->option->title;
$input_values[ $input->name ] = $options;
}
$children[ $input->parent->name ] = $input_values;
$TestResult[ 'children' ] = $children;
} else {
$children[ $input->parent->name ][ $input->name ] = $value->value;
$TestResult[ 'children' ] = $children;
}
//-----------------------------------------------------------------------FormType
} else {
//-----------------------------------------------------------------------Anothertype
if ( $input->type == 'Checkbox' || $input->type == 'Select' || $input[ 'type' ] == 'Radiobutton' ) {
$input_options = InputValue::with( 'option' )->where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $input->id )->get();
$options = [];
foreach ( $input_options as $input_option ) {
$options[] = $input_option->option->title;
}
$values[ $input->name ] = $options;
$TestResult[ 'options' ] = $values;
} else {
$inputs[ $input->name ] = $value->value;
$TestResult[ 'inputs' ] = $inputs;
}
//-----------------------------------------------------------------------Anothertype
}
}
$TestResult[ 'device_label' ] = $TestResult->test_type->device_label;
return MessageResponse::data( $TestResult );
}
}
app/Http/Controllers/TransferItemController.php
+28 -99
View File
@@ -4,18 +4,38 @@ namespace App\Http\Controllers;
use App\Http\Requests\StoreTransferChangeStatusRequest;
use App\Http\Requests\StoreTransferRequest;
use App\Http\Resources\TransferResource;
use App\Item;
use App\Policies\TransferItemPolicy;
use App\Transfer;
use Carbon\Carbon;
use Illuminate\Http\Request;
use Packages\Messaging\src\Facades\MessageResponse;
class TransferItemController extends Controller
{
public function getSuspendedTransfer()
{
$data = Transfer::where( "transferable_type" , "App\\Item" )
->where( "status" , "suspended" )
->with( [ "user" , "transferable" , "transferable.user" ] );
$user = auth( 'api' )->user();
if ( $user->hasRole( 'User' ) ) {
$data = $data->where( "user_id" , $user->id );
} elseif ( $user->hasRole( 'Supervisor' ) ) {
$data = $data->whereHas( 'transferable.user' , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id );
} );
}
$data = $data->get();
return TransferResource::collection($data);
}
public function changeStatus( StoreTransferChangeStatusRequest $request , Transfer $Transfer )
{
if ( auth( 'api' )->user()->cant( 'changeStatus' , [ Transfer::class , $Transfer ] ) ) {
return \MessageResponse::error( trans( 'messages.access_denied' ) );
return MessageResponse::error( trans( 'messages.access_denied' ) );
}
if ( $Transfer->status == "suspended" ) {
if ( $request->status == "approved" ) {
@@ -27,15 +47,15 @@ class TransferItemController extends Controller
$Transfer->update( [ "status" => $request->status ] );
}
} else {
return \MessageResponse::error( trans( 'messages.change_status_denied_transfer' ) );
return MessageResponse::error( trans( 'messages.change_status_denied_transfer' ) );
}
return \MessageResponse::success( trans( 'messages.success' ) );
return MessageResponse::success( trans( 'messages.success' ) );
}
public function transfer( StoreTransferRequest $request , Item $Item )
{
if ( auth( 'api' )->user()->cant( 'transferItem' , [ Transfer::class , $Item ] ) ) {
return \MessageResponse::error( trans( 'messages.access_denied' ) );
return MessageResponse::error( trans( 'messages.access_denied' ) );
}
if ( $Item->user_id != $request->user_id ) {
$Item->transfers()->create( [
@@ -44,99 +64,8 @@ class TransferItemController extends Controller
"status" => "suspended"
] );
} else {
return \MessageResponse::error( trans( 'messages.user_denied_transfer' ) );
return MessageResponse::error( trans( 'messages.user_denied_transfer' ) );
}
return \MessageResponse::success( trans( 'messages.success' ) );
}
public function mySuspendedTransfer()
{
$data = Transfer::where( "transferable_type" , "App\\Item" )->where( "user_id" , auth()->id() )->where( "status" , "suspended" )->with( [ "transferable" ] )->get();
return \MessageResponse::data( $data );
}
public function suspendedTransfer()
{
if ( auth( 'api' )->user()->cant( 'suspendedTransfer' , Transfer::class ) ) {
return \MessageResponse::error( trans( 'messages.access_denied' ) );
}
$data = Transfer::where( "transferable_type" , "App\\Item" )->where( "status" , "suspended" )->with( [ "user" , "transferable" ] )->get();
return \MessageResponse::data( $data );
}
public function items( Request $request )
{
if ( auth( 'api' )->user()->cant( 'items' , [Transfer::class] ) ) {
return \MessageResponse::error( trans( 'messages.access_denied' ) );
}
$user = auth()->user();
$data = Item::whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id );
} )
->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
} )
->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
$query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
} )
->when( $request->has( 'size' ) && $request->size != '' , function ( $query ) use ( $request ) {
$query->where( 'size' , $request->size );
} )
->when( $request->has( 'item_id' ) && $request->item_id != '' , function ( $query ) use ( $request ) {
$query->where( 'id' , $request->item_id );
} )
->when( $request->has( 'specific' ) && $request->specific != '' , function ( $query ) use ( $request ) {
$query->where( 'specific' , $request->specific );
} )
->with( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'medical_center_id' );
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
} ,
"transfers" => function ( $query ) {
$query->with( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'medical_center_id' );
} ] );
}
] )
->orderByDesc( 'id' )
->paginate( 10 );
return \MessageResponse::data( $data );
}
public function myItems( Request $request )
{
$data = Item::where( 'user_id' , auth()->id() )
->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
} )
->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
$query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
} )
->when( $request->has( 'size' ) && $request->size != '' , function ( $query ) use ( $request ) {
$query->where( 'size' , $request->size );
} )
->when( $request->has( 'item_id' ) && $request->item_id != '' , function ( $query ) use ( $request ) {
$query->where( 'id' , $request->item_id );
} )
->when( $request->has( 'specific' ) && $request->specific != '' , function ( $query ) use ( $request ) {
$query->where( 'specific' , $request->specific );
} )
->with( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'medical_center_id' );
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
} ,
"transfers" => function ( $query ) {
$query->with( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'medical_center_id' );
} ] );
}
] )
->orderByDesc( 'id' )
->paginate( 10 );
return \MessageResponse::data( $data );
return MessageResponse::success( trans( 'messages.success' ) );
}
}
app/Http/Controllers/TransferPackageController.php
+28 -80
View File
@@ -4,18 +4,38 @@ namespace App\Http\Controllers;
use App\Http\Requests\StoreTransferChangeStatusRequest;
use App\Http\Requests\StoreTransferRequest;
use App\Http\Resources\TransferResource;
use App\Package;
use App\Policies\TransferPackagePolicy;
use App\Transfer;
use Carbon\Carbon;
use Illuminate\Http\Request;
use Packages\Messaging\src\Facades\MessageResponse;
class TransferPackageController extends Controller
{
public function getSuspendedTransfer()
{
$data = Transfer::where( "transferable_type" , "App\\Package" )
->where( "status" , "suspended" )
->with( [ "user" , "transferable" , "transferable.user" ] );
$user = auth( 'api' )->user();
if ( $user->hasRole( 'User' ) ) {
$data = $data->where( "user_id" , $user->id );
} elseif ( $user->hasRole( 'Supervisor' ) ) {
$data = $data->whereHas( 'transferable.user' , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id );
} );
}
$data = $data->get();
return TransferResource::collection($data);
}
public function changeStatus( StoreTransferChangeStatusRequest $request , Transfer $Transfer )
{
if ( auth( 'api' )->user()->cant( 'changeStatus' , [ Transfer::class , $Transfer ] ) ) {
return \MessageResponse::error( trans( 'messages.access_denied' ) );
return MessageResponse::error( trans( 'messages.access_denied' ) );
}
if ( $Transfer->status == "suspended" ) {
if ( $request->status == "approved" ) {
@@ -23,7 +43,6 @@ class TransferPackageController extends Controller
if ( $package->transferActive ) $package->transferActive()->update( [ "to_date" => Carbon::now() ] );
$Transfer->update( [ "status" => $request->status ] );
$package->update( [ "user_id" => $Transfer->user_id ] );
foreach ( $package->items as $item ) {
$item->update( [ "user_id" => $Transfer->user_id ] );
}
@@ -31,15 +50,15 @@ class TransferPackageController extends Controller
$Transfer->update( [ "status" => $request->status ] );
}
} else {
return \MessageResponse::error( trans( 'messages.change_status_denied_transfer' ) );
return MessageResponse::error( trans( 'messages.change_status_denied_transfer' ) );
}
return \MessageResponse::success( trans( 'messages.success' ) );
return MessageResponse::success( trans( 'messages.success' ) );
}
public function transfer( StoreTransferRequest $request , Package $Package )
{
if ( auth( 'api' )->user()->cant( 'transferPackage' , [ Transfer::class , $Package ] ) ) {
return \MessageResponse::error( trans( 'messages.access_denied' ) );
return MessageResponse::error( trans( 'messages.access_denied' ) );
}
if ( $Package->user_id != $request->user_id ) {
$Package->transfers()->create( [
@@ -48,79 +67,8 @@ class TransferPackageController extends Controller
"status" => "suspended"
] );
} else {
return \MessageResponse::error( trans( 'messages.user_denied_transfer' ) );
return MessageResponse::error( trans( 'messages.user_denied_transfer' ) );
}
return \MessageResponse::success( trans( 'messages.success' ) );
}
public function mySuspendedTransfer()
{
$data = Transfer::where( "transferable_type" , "App\\Package" )->where( "user_id" , auth()->id() )->where( "status" , "suspended" )->with( [ "transferable" ] )->get();
return \MessageResponse::data( $data );
}
public function suspendedTransfer()
{
if ( auth( 'api' )->user()->cant( 'suspendedTransfer' , Transfer::class ) ) {
return \MessageResponse::error( trans( 'messages.access_denied' ) );
}
$data = Transfer::where( "transferable_type" , "App\\Package" )->where( "status" , "suspended" )->with( [ "user" , "transferable" ] )->get();
return \MessageResponse::data( $data );
}
public function packages( Request $request )
{
if ( auth( 'api' )->user()->cant( 'packages' , Transfer::class ) ) {
return \MessageResponse::error( trans( 'messages.access_denied' ) );
}
$user = auth()->user();
$data = Package::whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id );
} )
->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
} )
->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) {
$query->where( 'id' , $request->package_id );
} )
->when( $request->has( 'medical_center_id' ) && $request->medical_center_id != '' && $request->medical_center_id != 'undefined' , function ( $query ) use ( $request ) {
$query->whereHas( 'user' , function ( $query ) use ( $request ) {
$query->where( 'medical_center_id' , $request->medical_center_id );
} );
} )
->with( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'medical_center_id' );
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
} ] )
->orderByDesc( 'id' )
->get();
return \MessageResponse::data( $data );
}
public function myPackages( Request $request )
{
$data = Package::where( 'user_id' , auth()->id() )
->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
} )
->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) {
$query->where( 'id' , $request->package_id );
} )
->when( $request->has( 'medical_center_id' ) && $request->medical_center_id != '' && $request->medical_center_id != 'undefined' , function ( $query ) use ( $request ) {
$query->whereHas( 'user' , function ( $query ) use ( $request ) {
$query->where( 'medical_center_id' , $request->medical_center_id );
} );
} )
->with( [ 'user' => function ( $query ) {
$query->select( 'id' , 'name' , 'medical_center_id' );
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
} ] )
->orderByDesc( 'id' )
->get();
return \MessageResponse::data( $data );
return MessageResponse::success( trans( 'messages.success' ) );
}
}
app/Http/Controllers/UploadController.php
-118
View File
@@ -1,118 +0,0 @@
<?php
namespace App\Http\Controllers;
use App\Http\Requests\UploadFileRequest;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
use Intervention\Image\ImageManager;
use Illuminate\Support\Facades\Storage;
use App\Media;
class UploadController extends Controller
{
public function uploadFile(UploadFileRequest $request)
{
$FileType = 'image';
if(substr( $request->file('file')->getMimeType(), 0, 12 ) == 'application/'){
$FileType = 'document';
}
$modelType = Str::ucfirst($request->model_type);
if ($request->model_id !== null && is_numeric($request->model_id)) {
$Model = 'App\\'.$modelType;
$Object = $Model::findOrFail($request->model_id);
if ($Object) {
if($FileType == 'image'){
$Image = $request->file('file');
$Manager = new ImageManager(array('driver' => 'imagick'));
$InterventionImage = $Manager->make($Image);
$Mime = explode('/', $InterventionImage->mime());
$FileName = time().'.'.$Mime[1];
$Path = 'media'.'/TestResults'.'/'.$Object->id .'/'.$FileName;
Storage::disk('public')->makeDirectory('TestResults'.'/'.$Object->id);
$InterventionImage->save(public_path($Path));
}
else if($FileType == 'document'){
$UploadedFile = $request->file('file');
$FileName = time().'_'.$request->file('file')->getClientOriginalName();
$Path = 'media'.'/TestResults'.'/'.$Object->id;
Storage::disk('public')->makeDirectory('TestResults'.'/'.$Object->id);
$UploadedFile->move($Path, $FileName);
$Path = $Path . '/' . $FileName;
}
$MediaData = [
'model_id' => $Object->id,
'batch_id' => $request->batch_id,
'model_type' => 'App\\'.$modelType,
'path' => $Path,
'user_id' => auth('api')->user()->id,
'file_name' => $FileName,
'file_type' => $FileType
];
$Media = Media::create($MediaData);
}
}
else {
if($FileType == 'image'){
$Image = $request->file('file');
$Manager = new ImageManager(array('driver' => 'imagick'));
$InterventionImage = $Manager->make($Image);
$Mime = explode('/', $InterventionImage->mime());
$FileName = time().'.'.$Mime[1];
$Path = 'media'.'/Temp'.'/'.$request->batch_id .'/'.$FileName;
Storage::disk('public')->makeDirectory('Temp'.'/'.$request->batch_id);
$InterventionImage->save(public_path($Path));
}
else if($FileType == 'document'){
$UploadedFile = $request->file('file');
$FileName = time().'_'.$request->file('file')->getClientOriginalName();
$Path = 'media'.'/Temp'.'/'.$request->batch_id;
Storage::disk('public')->makeDirectory('Temp'.'/'.$request->batch_id);
$UploadedFile->move($Path, $FileName);
$Path = $Path . '/' . $FileName;
}
$MediaData = [
'model_id' => null,
'batch_id' => $request->batch_id,
'model_type' => 'App\\'.$modelType,
'path' => $Path,
'user_id' => auth('api')->user()->id,
'file_name' => $FileName,
'file_type' => $FileType
];
$Media = Media::create($MediaData);
}
return \MessageResponse::success(trans('messages.success_message'), null, $Media);
}
public function deleteFile(Request $request)
{
if ($request->model_id != null && is_numeric($request->model_id)) {
$Media = Media::findOrFail($request->media_id);
if($Media){
if (\File::exists(public_path($Media->path))) {
\File::delete(public_path($Media->path));
}
$Media->delete();
}
}
else {
$Media = Media::findOrFail($request->media_id);
if($Media){
if(\File::exists(public_path($Media->path))){
\File::delete(public_path($Media->path));
}
$Media->delete();
}
}
return \MessageResponse::success(trans('messages.success_message'));
}
}
app/Http/Resources/ItemResource.php
+39
View File
@@ -0,0 +1,39 @@
<?php
namespace App\Http\Resources;
use App\Services\Media\Resources\MediaResource;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
class ItemResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param Request $request
* @return array
*/
public function toArray($request)
{
return [
'id' => $this->id,
'name' => $this->name,
'udi' => $this->udi,
'size' => $this->size,
'specific' => $this->specific,
'repair' => $this->repair,
'status' => $this->status,
'creator_id' => $this->creator_id,
'creator' => UserResource::make($this->whenLoaded('creator')),
'user_id' => $this->user_id,
'user' => UserResource::make($this->whenLoaded('user')),
'package' => PackageResource::make($this->whenLoaded('package')),
'transfers' => TransferResource::collection($this->whenLoaded('transfers')),
'files' => MediaResource::collection($this->media),
'thumbnail' => $this->getFirstMediaUrl('main_images', 'thumbnail'),
'created_at' => $this->created_at,
'updated_at' => $this->updated_at
];
}
}
app/Http/Resources/MedicalCenterResource.php
+29
View File
@@ -0,0 +1,29 @@
<?php
namespace App\Http\Resources;
use App\Services\Media\Resources\MediaResource;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
class MedicalCenterResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param Request $request
* @return array
*/
public function toArray( $request )
{
return [
'id' => $this->id ,
'name' => $this->name ,
'address' => $this->address ,
'phone_number' => $this->phone_number ,
'city' => $this->when( $this->city , $this->city ),
'created_at' => $this->created_at,
'updated_at' => $this->updated_at
];
}
}
app/Http/Resources/PackageResource.php
+34
View File
@@ -0,0 +1,34 @@
<?php
namespace App\Http\Resources;
use App\Services\Media\Resources\MediaResource;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
class PackageResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param Request $request
* @return array
*/
public function toArray($request)
{
return [
'id' => $this->id,
'name' => $this->name,
'note' => $this->note,
'verified' => $this->verified,
'creator_id' => $this->creator_id,
'creator' => UserResource::make($this->whenLoaded('creator')),
'user_id' => $this->user_id,
'user' => UserResource::make($this->whenLoaded('user')),
'items' => ItemResource::collection($this->whenLoaded('items')),
'transfers' => TransferResource::collection($this->whenLoaded('transfers')),
'created_at' => $this->created_at,
'updated_at' => $this->updated_at
];
}
}
app/Http/Resources/TestResultResource.php
+42
View File
@@ -0,0 +1,42 @@
<?php
namespace App\Http\Resources;
use App\Services\Media\Resources\MediaResource;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
class TestResultResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param Request $request
* @return array
*/
public function toArray( $request )
{
return [
'id' => $this->id ,
'info' => $this->info ,
'cycle_number' => $this->cycle_number ,
'date' => $this->date ,
'result' => $this->result ,
'description' => $this->description ,
'verified' => $this->verified ,
'device_id' => $this->device_id ,
'user_id' => $this->user_id ,
'test_type_id' => $this->test_type_id ,
'test_type' => $this->when( $this->test_type , $this->test_type ) ,
'inputs' => $this->when( $this->inputs , $this->inputs ) ,
'options' => $this->when( $this->options , $this->options ) ,
'device_label' => $this->when( $this->device_label , $this->device_label ) ,
'input_values' => $this->when( $this->input_values , $this->input_values ) ,
'user' => UserResource::make( $this->whenLoaded( 'user' ) ) ,
'files' => MediaResource::collection( $this->media ) ,
'thumbnail' => $this->getFirstMediaUrl( 'main_images' , 'thumbnail' ) ,
'created_at' => $this->created_at ,
'updated_at' => $this->updated_at
];
}
}
app/Http/Resources/TransferResource.php
+41
View File
@@ -0,0 +1,41 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
class TransferResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param Request $request
* @return array
*/
public function toArray($request)
{
return [
'id' => $this->id,
'from_date' => $this->from_date,
'to_date' => $this->to_date,
'status' => $this->status,
'user_id' => $this->user_id,
'user' => UserResource::make($this->whenLoaded('user')),
'transferable' => $this->resourceFinder(),
'created_at' => $this->created_at,
'updated_at' => $this->updated_at
];
}
private function resourceFinder()
{
if ($this->whenLoaded('transferable')) {
if ($this->transferable_type == "App\\Package"){
return PackageResource::make($this->transferable);
}elseif($this->transferable_type == "App\\Item"){
return ItemResource::make($this->transferable);
}
}
}
}
app/Http/Resources/UserResource.php
+30
View File
@@ -0,0 +1,30 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
class UserResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param Request $request
* @return array
*/
public function toArray($request)
{
return [
'id' => $this->id,
'name' => $this->name,
'email' => $this->email,
'status' => $this->status,
'address' => $this->address,
'gender' => $this->gender,
'medical_center' => MedicalCenterResource::make($this->whenLoaded('medical_center')),
'created_at' => $this->created_at,
'updated_at' => $this->updated_at
];
}
}
app/Input.php
+4
View File
@@ -7,18 +7,22 @@ use Illuminate\Database\Eloquent\Model;
class Input extends Model
{
public $fillable = ['name','type','size','test_type_id','parent_id','require_scanner'];
public function test_type()
{
return $this->belongsTo('App\TestType');
}
public function parent()
{
return $this->belongsTo('App\Input', 'parent_id');
}
public function children()
{
return $this->hasMany('App\Input', 'parent_id');
}
public function options()
{
return $this->hasMany('App\Option');
app/Item.php
+50 -29
View File
@@ -1,35 +1,56 @@
<?php
namespace App;
namespace App;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Model;
use Spatie\MediaLibrary\HasMedia\HasMedia;
use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
use Spatie\MediaLibrary\Models\Media;
class Item extends Model
class Item extends Model implements HasMedia
{
use HasMediaTrait;
public $fillable = [ 'name' , 'size' , 'unique_id' , 'specific' , 'note' , 'user_id' , 'udi' , 'status' , 'repair' , 'package_id' , 'creator_id' ];
public function package()
{
public $fillable = [ 'name' , 'size' , 'unique_id' , 'specific' , 'note' , 'user_id' , 'udi' , 'status' , 'repair' ];
public function packages()
{
return $this->belongsToMany( 'App\Package' , 'item_package' )->withPivot( 'count' );
}
public function user()
{
return $this->belongsTo( 'App\User' );
}
public function files()
{
return $this->morphMany( 'App\Media' , 'model' );
}
public function transfers()
{
return $this->morphMany( 'App\Transfer' , "transferable" )->where( "status" ,"approved" );
}
public function transferActive()
{
return $this->morphMany( 'App\Transfer' , "transferable" )->where( "status" ,"approved" )->whereNull( "to_date" );
}
return $this->belongsTo( 'App\Package' );
}
public function user()
{
return $this->belongsTo( 'App\User' );
}
public function creator()
{
return $this->belongsTo( 'App\User' , "creator_id" );
}
public function transfers()
{
return $this->morphMany( 'App\Transfer' , "transferable" )->where( "status" , "approved" );
}
public function transferActive()
{
return $this->morphMany( 'App\Transfer' , "transferable" )->where( "status" , "approved" )->whereNull( "to_date" );
}
public function registerMediaCollections()
{
$this->addMediaCollection( 'main_images' )
->useFallbackUrl( '/images/default_pastry.jpg' )
->useFallbackPath( public_path( '/images/default_pastry.jpg' ) );
}
public function registerMediaConversions( Media $media = null ): void
{
$this->addMediaConversion( 'thumbnail' )
->width( 480 )
->height( 640 )
->nonQueued()
->performOnCollections( 'main_images' );
}
}
app/MedicalCenter.php
+2
View File
@@ -7,10 +7,12 @@ use Illuminate\Database\Eloquent\Model;
class MedicalCenter extends Model
{
public $fillable = ['name', 'city_id', 'address', 'phone_number'];
public function users()
{
return $this->hasMany('App\User');
}
public function city()
{
return $this->belongsTo('App\City');
app/Package.php
+29 -29
View File
@@ -1,35 +1,35 @@
<?php
namespace App;
namespace App;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Model;
class Package extends Model
class Package extends Model
{
public $fillable = [ 'name' , 'user_id' , 'note' , 'verified' , 'creator_id' ];
public function user()
{
public $fillable = [ 'name' , 'user_id' , 'note' , 'verified' ];
public function user()
{
return $this->belongsTo( 'App\User' );
}
public function items()
{
return $this->belongsToMany( 'App\Item' , 'item_package' )->withPivot( 'count' );
}
public function labels()
{
return $this->hasMany( 'App\Label' );
}
public function transfers()
{
return $this->morphMany( 'App\Transfer' , "transferable" )->where( "status" ,"approved" );
}
public function transferActive()
{
return $this->morphMany( 'App\Transfer' , "transferable" )->where( "status" ,"approved" )->whereNull( "to_date" );
}
return $this->belongsTo( 'App\User' );
}
public function items()
{
return $this->hasMany( 'App\Item' );
}
public function labels()
{
return $this->hasMany( 'App\Label' );
}
public function transfers()
{
return $this->morphMany( 'App\Transfer' , "transferable" )->where( "status" , "approved" );
}
public function transferActive()
{
return $this->morphMany( 'App\Transfer' , "transferable" )->where( "status" , "approved" )->whereNull( "to_date" );
}
}
app/Policies/ItemPolicy.php
+21 -15
View File
@@ -7,38 +7,44 @@ use App\Item;
class ItemPolicy
{
public function showAll(User $User)
public function showAll( User $User )
{
if($User->hasRole('Admin'))
return true;
}
public function delete(User $User, Item $Item)
{
if($User->hasRole('Admin') || ($User->hasRole('Supervisor') && $Item->user->medical_center_id == $User->medical_center_id))
if ( $User->hasRole( 'Admin' ) )
return true;
}
public function update(User $User, Item $Item)
public function delete( User $User , Item $Item )
{
if($User->hasRole('Admin') || ($User->hasRole('Supervisor') && $Item->user->medical_center_id == $User->medical_center_id))
if ( $User->hasRole( 'Admin' ) ) {
return true;
} elseif ( $User->hasRole( 'Supervisor' ) ) {
if ($Item->status == 0){
return true;
}
}
}
public function update( User $User , Item $Item )
{
if ( $User->hasRole( 'Admin' ) || ( $User->hasRole( 'Supervisor' ) && $Item->user->medical_center_id == $User->medical_center_id ) )
return true;
}
public function store(User $User)
public function store( User $User )
{
if($User->hasRole('Admin') || $User->hasRole('Supervisor'))
if ( $User->hasRole( 'Admin' ) || $User->hasRole( 'Supervisor' ) )
return true;
}
public function changeStatus(User $User)
public function changeStatus( User $User )
{
if($User->hasRole('Admin|Supervisor'))
if ( $User->hasRole( 'Admin|Supervisor' ) )
return true;
}
public function changeRepair(User $User)
public function changeRepair( User $User )
{
if($User->hasRole('Admin|Supervisor'))
if ( $User->hasRole( 'Admin|Supervisor' ) )
return true;
}
}
app/Policies/PackagePolicy.php
+1
View File
@@ -13,6 +13,7 @@ class PackagePolicy
if($User->hasRole('Admin'))
return true;
}
public function delete(User $User, Package $Package)
{
if($User->hasRole('Admin') || ($User->hasRole('Supervisor') && $Package->user->medical_center_id == $User->medical_center_id))
app/Policies/TransferPolicy.php
+24 -24
View File
@@ -15,38 +15,38 @@ class TransferPolicy
return true;
}
public function suspendedTransfer( User $User )
{
if ( $User->hasRole( 'Admin|Supervisor' ) )
return true;
}
//Item
public function transferItem( User $User , Item $Item )
{
if ( $User->hasRole( 'Admin|Supervisor' ) || $Item->user_id == $User->id )
if ( $User->hasRole( 'Admin' ) ) {
return true;
} else {
if ( $User->hasRole( 'Supervisor' ) ) {
if ( $Item->user->medical_center_id == $User->medical_center_id && $Item->package_id == null ) {
return true;
}
} else {
if ( $Item->user_id == $User->id && $Item->package_id == null ) {
return true;
}
}
}
}
public function items( User $User )
{
if ( $User->hasRole( 'Admin|Supervisor' ) )
return true;
}
//package
public function transferPackage( User $User , Package $Package )
{
if ( $User->hasRole( 'Admin|Supervisor' ) || $Package->user_id == $User->id )
return true;
}
public function packages( User $User )
{
if ( $User->hasRole( 'Admin|Supervisor' ) )
if ( $User->hasRole( 'Admin' ) ) {
return true;
} else {
if ( $User->hasRole( 'Supervisor' ) ) {
if ( $Package->user->medical_center_id == $User->medical_center_id) {
return true;
}
} else {
if ( $Package->user_id == $User->id) {
return true;
}
}
}
}
}
app/Services/Media/HasMediaTrait.php
+21
View File
@@ -0,0 +1,21 @@
<?php
namespace App\Services\Media;
use Spatie\MediaLibrary\HasMedia\HasMediaTrait as BasicHasMedia;
use Spatie\MediaLibrary\Models\Media;
trait HasMediaTrait
{
use BasicHasMedia;
public function main_image()
{
return $this->morphOne(Media::class, 'model')->where('collection_name', 'main_image');
}
public function main_images()
{
return $this->morphMany(Media::class, 'model')->where('collection_name', 'main_images');
}
}
app/Services/Media/Media.php
+24
View File
@@ -0,0 +1,24 @@
<?php
namespace App\Services\Media;
use Spatie\MediaLibrary\Models\Media as BaseMedia;
class Media extends BaseMedia
{
public function getTable()
{
return config('common.db_name') . '.media';
}
public function getThumbnailAddressAttribute()
{
return $this->getUrl('thumbnail');
}
public function assign($model, $collectionName)
{
$this->collection_name = $collectionName;
$model->media()->save($this);
}
}
app/Services/Media/MediaHelper.php
+58
View File
@@ -0,0 +1,58 @@
<?php
namespace App\Services\Media;
use App\FakeModel;
class MediaHelper
{
public static function moveMediaTo($model)
{
request()->validate([
'batch_id' => 'nullable|string',
]);
if ($fakeModel = FakeModel::where('batch_id', request('batch_id'))->first()) {
foreach ($fakeModel->getMedia('temp_medias') as $media) {
$media->move($model , 'main_images');
}
$fakeModel->delete();
}
}
// public static function moveTinyMCEMediaTo($model)
// {
//
// request()->validate([
// 'tinymce_batch_id' => 'nullable|string',
// ]);
//
// if ($fakeModel = FakeModel::where('batch_id', request('tinymce_batch_id'))->first()) {
// foreach ($fakeModel->getMedia('temp_files') as $media) {
// if (substr($media->mime_type, 0, 5) == 'image') {
// $media->assign($model, 'tinymce_images');
// } else {
// $media->assign($model, 'tinymce_files');
// }
// }
// $fakeModel->delete();
// }
//
// }
//
// public static function loadMedia($model, ...$collections)
// {
// $model->loadMissing(['media' => function ($query) use ($collections) {
// $query->select('id', 'model_type', 'model_id', 'collection_name', 'file_name', 'mime_type', 'size', 'disk', 'order_column');
// if (!empty($collections)) {
// $query->whereIn('collection_name', $collections);
// }
// }]);
// if ($model->media) {
// foreach ($model->media as $media) {
// $media->address = $media->getUrl();
// }
// }
// }
}
app/Services/Media/Resources/MediaResource.php
+26
View File
@@ -0,0 +1,26 @@
<?php
namespace App\Services\Media\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
class MediaResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request $request
* @return array
*/
public function toArray($request)
{
return [
'id' => $this->id,
'collection_name' => $this->collection_name,
'thumbnail' => $this->getUrl('thumbnail'),
'mime_type' => $this->mime_type,
'file_name' => $this->file_name,
'size' => $this->size,
];
}
}
app/Services/Responser.php
+32
View File
@@ -0,0 +1,32 @@
<?php
namespace App\Services;
class Responser
{
public static function success($content = null, $title = null, $data = []) {
$content = $content ?: trans('messages.success_message');
$title = $title ?: trans('messages.success');
return [
'data' => $data,
'message' => [
'title' => $title,
'content' => $content
]
];
}
public static function error($errors = null, $data = []) {
$errors = $errors ?: [trans('messages.failed') => trans('core::messages.failed_message')];
return [
'data' => $data,
'errors' => $errors,
];
}
public static function data($data) {
return [
'data' => $data,
];
}
}
app/TestResult.php
+21 -5
View File
@@ -3,28 +3,44 @@
namespace App;
use Illuminate\Database\Eloquent\Model;
use Spatie\MediaLibrary\HasMedia\HasMedia;
use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
use Spatie\MediaLibrary\Models\Media;
class TestResult extends Model
class TestResult extends Model implements HasMedia
{
use HasMediaTrait;
public $fillable = ['result','verified','test_type_id','user_id','device_id', 'cycle_number', 'date'];
public function test_type()
{
return $this->belongsTo('App\TestType');
}
public function user()
{
return $this->belongsTo('App\User');
}
public function input_values()
{
return $this->hasMany('App\InputValue');
}
public function files()
public function registerMediaCollections()
{
return $this->morphMany('App\Media', 'model');
$this->addMediaCollection( 'main_images' )
->useFallbackUrl( '/images/default_pastry.jpg' )
->useFallbackPath( public_path( '/images/default_pastry.jpg' ) );
}
public function TitleImage()
public function registerMediaConversions( Media $media = null ): void
{
return $this->morphToMany('App\Gallery', 'uploadable')->wherePivot('image_role', 'TitleImage');
$this->addMediaConversion( 'thumbnail' )
->width( 480 )
->height( 640 )
->nonQueued()
->performOnCollections( 'main_images' );
}
}
composer.json
+1
View File
@@ -11,6 +11,7 @@
"php": "^7.1.3",
"fideloper/proxy": "^4.0",
"intervention/image": "^2.5",
"spatie/laravel-medialibrary": "^7.0",
"kalnoy/nestedset": "^5.0",
"laravel/framework": "5.8.*",
"laravel/passport": "^7.2",
composer.lock
Generated
+508 -108
View File
File diff suppressed because it is too large Load Diff
config/filesystems.php
+9 -1
View File
@@ -55,13 +55,21 @@ return [
'visibility' => 'public',
],
's3' => [
'media' => [
'driver' => 's3',
'key' => env('AWS_ACCESS_KEY_ID'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'region' => env('AWS_DEFAULT_REGION'),
'bucket' => env('AWS_BUCKET'),
'url' => env('AWS_URL'),
'endpoint' => env('AWS_ENDPOINT'),
'root' => 'media',
'use_path_style_endpoint' => true,
],
'media-dev' => [
'driver' => 'local',
'root' => public_path('media'),
],
],
config/medialibrary.php
+156
View File
@@ -0,0 +1,156 @@
<?php
return [
/*
* The disk on which to store added files and derived images by default. Choose
* one or more of the disks you've configured in config/filesystems.php.
*/
'disk_name' => env('MEDIA_DISK', 'public'),
/*
* The maximum file size of an item in bytes.
* Adding a larger file will result in an exception.
*/
'max_file_size' => 1024 * 1024 * 10,
/*
* This queue will be used to generate derived and responsive images.
* Leave empty to use the default queue.
*/
'queue_name' => '',
/*
* The fully qualified class name of the media model.
*/
'media_model' => Spatie\MediaLibrary\Models\Media::class,
's3' => [
/*
* The domain that should be prepended when generating urls.
*/
'domain' => 'https://'.env('AWS_BUCKET').'.s3.amazonaws.com',
],
'remote' => [
/*
* Any extra headers that should be included when uploading media to
* a remote disk. Even though supported headers may vary between
* different drivers, a sensible default has been provided.
*
* Supported by S3: CacheControl, Expires, StorageClass,
* ServerSideEncryption, Metadata, ACL, ContentEncoding
*/
'extra_headers' => [
'CacheControl' => 'max-age=604800',
],
],
'responsive_images' => [
/*
* This class is responsible for calculating the target widths of the responsive
* images. By default we optimize for filesize and create variations that each are 20%
* smaller than the previous one. More info in the documentation.
*
* https://docs.spatie.be/laravel-medialibrary/v7/advanced-usage/generating-responsive-images
*/
'width_calculator' => Spatie\MediaLibrary\ResponsiveImages\WidthCalculator\FileSizeOptimizedWidthCalculator::class,
/*
* By default rendering media to a responsive image will add some javascript and a tiny placeholder.
* This ensures that the browser can already determine the correct layout.
*/
'use_tiny_placeholders' => true,
/*
* This class will generate the tiny placeholder used for progressive image loading. By default
* the medialibrary will use a tiny blurred jpg image.
*/
'tiny_placeholder_generator' => Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\Blurred::class,
],
/*
* When urls to files get generated, this class will be called. Leave empty
* if your files are stored locally above the site root or on s3.
*/
'url_generator' => null,
/*
* Whether to activate versioning when urls to files get generated.
* When activated, this attaches a ?v=xx query string to the URL.
*/
'version_urls' => false,
/*
* The class that contains the strategy for determining a media file's path.
*/
'path_generator' => null,
/*
* Medialibrary will try to optimize all converted images by removing
* metadata and applying a little bit of compression. These are
* the optimizers that will be used by default.
*/
'image_optimizers' => [
Spatie\ImageOptimizer\Optimizers\Jpegoptim::class => [
'--strip-all', // this strips out all text information such as comments and EXIF data
'--all-progressive', // this will make sure the resulting image is a progressive one
],
Spatie\ImageOptimizer\Optimizers\Pngquant::class => [
'--force', // required parameter for this package
],
Spatie\ImageOptimizer\Optimizers\Optipng::class => [
'-i0', // this will result in a non-interlaced, progressive scanned image
'-o2', // this set the optimization level to two (multiple IDAT compression trials)
'-quiet', // required parameter for this package
],
Spatie\ImageOptimizer\Optimizers\Svgo::class => [
'--disable=cleanupIDs', // disabling because it is known to cause troubles
],
Spatie\ImageOptimizer\Optimizers\Gifsicle::class => [
'-b', // required parameter for this package
'-O3', // this produces the slowest but best results
],
],
/*
* These generators will be used to create an image of media files.
*/
'image_generators' => [
Spatie\MediaLibrary\ImageGenerators\FileTypes\Image::class,
Spatie\MediaLibrary\ImageGenerators\FileTypes\Webp::class,
Spatie\MediaLibrary\ImageGenerators\FileTypes\Pdf::class,
Spatie\MediaLibrary\ImageGenerators\FileTypes\Svg::class,
Spatie\MediaLibrary\ImageGenerators\FileTypes\Video::class,
],
/*
* The engine that should perform the image conversions.
* Should be either `gd` or `imagick`.
*/
'image_driver' => env('IMAGE_DRIVER', 'gd'),
/*
* FFMPEG & FFProbe binaries paths, only used if you try to generate video
* thumbnails and have installed the php-ffmpeg/php-ffmpeg composer
* dependency.
*/
'ffmpeg_path' => env('FFMPEG_PATH', '/usr/bin/ffmpeg'),
'ffprobe_path' => env('FFPROBE_PATH', '/usr/bin/ffprobe'),
/*
* The path where to store temporary files while performing image conversions.
* If set to null, storage_path('medialibrary/temp') will be used.
*/
'temporary_directory_path' => null,
/*
* Here you can override the class names of the jobs used by this package. Make sure
* your custom jobs extend the ones provided by the package.
*/
'jobs' => [
'perform_conversions' => Spatie\MediaLibrary\Jobs\PerformConversions::class,
'generate_responsive_images' => Spatie\MediaLibrary\Jobs\GenerateResponsiveImages::class,
],
];
database/migrations/2023_12_02_140423_create_media_table.php
+39
View File
@@ -0,0 +1,39 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreateMediaTable extends Migration
{
/**
* Run the migrations.
*/
public function up()
{
Schema::dropIfExists( 'media' );
Schema::create('media', function (Blueprint $table) {
$table->bigIncrements('id');
$table->morphs('model');
$table->string('collection_name');
$table->string('name');
$table->string('file_name');
$table->string('mime_type')->nullable();
$table->string('disk');
$table->unsignedBigInteger('size');
$table->json('manipulations');
$table->json('custom_properties');
$table->json('responsive_images');
$table->unsignedInteger('order_column')->nullable();
$table->nullableTimestamps();
});
}
/**
* Reverse the migrations.
*/
public function down()
{
Schema::dropIfExists('media');
}
}
database/migrations/2023_12_02_150039_create_fake_models_table.php
+31
View File
@@ -0,0 +1,31 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateFakeModelsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('fake_models', function (Blueprint $table) {
$table->bigIncrements('id');
$table->string('batch_id' , 255);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('fake_models');
}
}
database/migrations/2023_12_04_124700_update_items_table3.php
+32
View File
@@ -0,0 +1,32 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class UpdateItemsTable3 extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('items', function (Blueprint $table) {
$table->unsignedBigInteger('creator_id');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('items', function (Blueprint $table) {
$table->dropColumn('creator_id');
});
}
}
database/migrations/2023_12_04_124700_update_packages_table3.php
+32
View File
@@ -0,0 +1,32 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class UpdatePackagesTable3 extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('packages', function (Blueprint $table) {
$table->unsignedBigInteger('creator_id');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('packages', function (Blueprint $table) {
$table->dropColumn('creator_id');
});
}
}
database/migrations/2023_12_05_124700_update_items_table4.php
+33
View File
@@ -0,0 +1,33 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class UpdateItemsTable4 extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::drop('item_package');
Schema::table('items', function (Blueprint $table) {
$table->unsignedBigInteger('package_id')->nullable()->after("id");
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('items', function (Blueprint $table) {
$table->dropColumn('package_id');
});
}
}
public/media/Items/33/1700553010.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.7 KiB

public/media/Items/33/1700553073.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.7 KiB

public/media/Items/34/1693305589.jpeg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

public/media/Items/34/1700553613.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.7 KiB

public/media/Items/35/1693307644.jpeg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

public/media/Temp/1700552241.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.7 KiB

public/media/Temp/5315849221/1693301702.jpeg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

public/media/Temp/7388614130/1693305526.jpeg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

public/media/Temp/7940270458/1693305106.jpeg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

public/media/TestResults/1/1700552213.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.7 KiB

public/media/TestResults/1/1700552280.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.7 KiB

public/media/TestResults/1/1700552290.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.7 KiB

public/media/TestResults/1/1701353894.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.7 KiB

public/media/TestResults/262/1693387378.jpeg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

public/media/TestResults/294/1693305542.jpeg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

public/media/TestResults/295/1693387486.jpeg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

public/media/TestResults/296/1693387829.jpeg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

public/media/TestResults/297/1693389024.jpeg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

public/media/TestResults/34/1693307064.jpeg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

public/media/TestResults/35/1693307658.jpeg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

public/media/TestResults/79/1591704182.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 132 KiB

public/media/TestResults/79/1591704272.jpeg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 66 KiB

public/media/TestResults/79/1591706622.jpeg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 134 KiB

public/media/TestResults/82/1593887700.jpeg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 66 KiB

routes/api.php
+30 -27
View File
@@ -24,20 +24,14 @@ Route::group(['namespace' => 'Api'],function () {
Route::middleware('auth:api')->group(function () {
Route::get('/TestResults/ListFilterItems', 'TestResultController@listFilterItems');
Route::post('/TestResults/Verify/{TestResult}/{Value}', 'TestResultController@verifyTestResult');
Route::get('TestTypes/ListNames', 'TestTypeController@listNames');
Route::post('/TestTypes/Barcode/{TestType}', 'TestTypeController@generateBarcode');
Route::resource('TestTypes', 'TestTypeController');
Route::resource('TestResults', 'TestResultController' , ['except' => 'show']);
Route::resource('MedicalCenters', 'MedicalCenterController');
Route::post('/GetInputs', 'TestTypeController@getInputs');
Route::post('/TestResults/chart', 'TestResultController@chart');
// Route::get('/TestTypes/All', 'TestTypeController@AllTestTypes');
// Route::get('/MedicalCenters/All', 'MedicalCenterController@listMedicalCenters');
Route::post('/TestResult/QRCode/{TestResult}', 'BarCodeController@generateQRcode');
Route::get('/GetInfo', 'UserController@getInfo');
Route::get('Users/MedicalCenter/{MedicalCenter}', 'UserController@getByMedicalCenter');
Route::post('Users/ChangeStatus/{User}', 'UserController@changeStatus');
@@ -46,18 +40,10 @@ Route::middleware('auth:api')->group(function () {
Route::get('users/search', 'UserController@searchUser');
Route::resource('Users', 'UserController');
Route::resource('Items', 'ItemController');
Route::post('Items/ChangeStatus/{Item}', 'ItemController@changeStatus');
Route::post('Items/ChangeRepair/{Item}', 'ItemController@changeRepair');
Route::resource('Packages', 'PackageController')->except(['showPackage']);
Route::resource('Labels', 'LabelController');
Route::resource('Messages', 'MessageController');
Route::delete('Messages/User/{User}', 'MessageController@destroyUserMessages');
Route::post('/Package/Verify/{Package}', 'PackageController@verifyPackage');
Route::get('/GetItems', 'ItemController@getItems');
Route::get('/GetPackages', 'PackageController@getPackages');
Route::get('/GetLabels', 'LabelController@getLabels');
Route::get('/GetCities', 'MedicalCenterController@getCities');
@@ -65,28 +51,45 @@ Route::middleware('auth:api')->group(function () {
Route::get('TestTypes/AllArchivedTestTypes', 'TestTypeController@allArchivedTestTypes');
Route::post('UploadFile', 'UploadController@uploadFile');
Route::post('DeleteFile', 'UploadController@deleteFile');
//transfer item
Route::get('transfer-items', 'TransferItemController@items');
Route::get('transfer-my-items', 'TransferItemController@myItems');
Route::get('suspended-transfer-items', 'TransferItemController@suspendedTransfer');
Route::get('my-suspended-transfer-items', 'TransferItemController@mySuspendedTransfer');
//TestResults
Route::resource('TestResults', 'TestResultController' , ['except' => 'show']);
Route::get('/TestResults/ListFilterItems', 'TestResultController@listFilterItems');
Route::post('/TestResults/Verify/{TestResult}/{Value}', 'TestResultController@verifyTestResult');
Route::post('/TestResults/chart', 'TestResultController@chart');
Route::post('/TestResult/QRCode/{TestResult}', 'BarCodeController@generateQRcode');
//Item
Route::resource('Items', 'ItemController');
Route::get('/MyItems', 'ItemController@myItems');
Route::get('/GetItems', 'ItemController@getItems');
Route::post('Items/ChangeStatus/{Item}', 'ItemController@changeStatus');
Route::post('Items/ChangeRepair/{Item}', 'ItemController@changeRepair');
//Transfer Item
Route::get('suspended-transfer-items', 'TransferItemController@getSuspendedTransfer');
Route::post('transfer-items/{Item}', 'TransferItemController@transfer');
Route::post('transfer-items/ChangeStatus/{Transfer}', 'TransferItemController@changeStatus');
//transfer package
Route::get('transfer-packages', 'TransferPackageController@packages');
Route::get('transfer-my-packages', 'TransferPackageController@myPackages');
Route::get('suspended-transfer-packages', 'TransferPackageController@suspendedTransfer');
Route::get('my-suspended-transfer-packages', 'TransferPackageController@mySuspendedTransfer');
//Package
Route::resource('Packages', 'PackageController');
Route::get('/MyPackages', 'PackageController@myPackages');
Route::get('/GetPackages', 'PackageController@getPackages');
//transfer package
Route::get('suspended-transfer-packages', 'TransferPackageController@getSuspendedTransfer');
Route::post('transfer-packages/{Package}', 'TransferPackageController@transfer');
Route::post('transfer-packages/ChangeStatus/{Transfer}', 'TransferPackageController@changeStatus');
//export
//export
Route::get('export/items', 'ExportController@items');
Route::get('export/packages', 'ExportController@packages');
//Media
Route::namespace('Media')->group(function () {
Route::post('store_media', 'StoreMedia');
Route::delete('destroy_media/{media}', 'DestroyMedia');
});
});
Route::post('/BarCode/{Code}/{Type?}', 'BarCodeController@generateBarcode');