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

fix promlems

Browse Source
This commit is contained in:
mahdi purHosseini
2023-09-11 14:00:52 +03:30
parent d118b182a4
commit 1af9a45c79
19 changed files with 911 additions and 16490 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BarCodeController.php
+34 -35
View File
@@ -1,56 +1,55 @@
<?php <?php
namespace App\Http\Controllers; namespace App\Http\Controllers;
use \Milon\Barcode\Facades\DNS1DFacade; use \Milon\Barcode\Facades\DNS1DFacade;
use \Milon\Barcode\Facades\DNS2DFacade; use \Milon\Barcode\Facades\DNS2DFacade;
use App\TestResult; use App\TestResult;
use App\Package; use App\Package;
class BarCodeController extends Controller class BarCodeController extends Controller
{
public function generateBarcode($Number, $Type = null)
{ {
if($Number != "undefined") public function generateBarcode( $Number , $Type = null )
{ {
$URL = 'https://www.cssd-doc.com/Show/'.$Type.'/'.$Number; if ( $Number != "undefined" ) {
$URL = 'https://www.cssd-doc.com/Show/' . $Type . '/' . $Number;
$Barcode = DNS1DFacade::getBarcodePNG($Number, "C128"); $Barcode = DNS1DFacade::getBarcodePNG( $Number , "C128" );
$QRCode = DNS2DFacade::getBarcodePNG($URL, "QRCODE"); $QRCode = DNS2DFacade::getBarcodePNG( $URL , "QRCODE" );
$ShowLink = 'Show/'.$Type.'/'.$Number; $ShowLink = 'Show/' . $Type . '/' . $Number;
if ($Type == 'TestType') { if ( $Type == 'TestType' ) {
$QRCode = DNS2DFacade::getBarcodePNG($Number, "QRCODE"); $QRCode = DNS2DFacade::getBarcodePNG( $Number , "QRCODE" );
} }
return \MessageResponse::data(['Barcode' => 'data:image/png;base64,' .$Barcode, 'QRCode' => 'data:image/png;base64,' .$QRCode, 'ShowLink' => $ShowLink]); return \MessageResponse::data( [ 'Barcode' => 'data:image/png;base64,' . $Barcode , 'QRCode' => 'data:image/png;base64,' . $QRCode , 'ShowLink' => $ShowLink ] );
} }
} }
public function generateQRcode(TestResult $TestResult)
public function generateQRcode( TestResult $TestResult )
{ {
if($TestResult) if ( $TestResult ) {
{ $URL = 'https://www.cssd-doc.com/ShowTestResult/' . $TestResult->id;
$URL = 'https://www.cssd-doc.com/ShowTestResult/'.$TestResult->id; $QRCode = DNS2DFacade::getBarcodePNG( $URL , "QRCODE" );
$QRCode = DNS2DFacade::getBarcodePNG($URL, "QRCODE"); return \MessageResponse::data( [ 'QRCode' => 'data:image/png;base64,' . $QRCode ] );
return \MessageResponse::data(['QRCode' => 'data:image/png;base64,' .$QRCode]);
} }
} }
public function generatePackageBarcode($Number)
{ public function generatePackageBarcode( $Number )
if($Number != "undefined")
{ {
if ( $Number != "undefined" ) {
// $Barcode = DNS1DFacade::getBarcodePNGUri($Number, "C128"); // $Barcode = DNS1DFacade::getBarcodePNGUri($Number, "C128");
// $QRCode = DNS2DFacade::getBarcodePNGUri($Number, "QRCODE"); // $QRCode = DNS2DFacade::getBarcodePNGUri($Number, "QRCODE");
$Barcode = DNS1DFacade::getBarcodePNG($Number, "C128"); $Barcode = DNS1DFacade::getBarcodePNG( $Number , "C128" );
$QRCode = DNS2DFacade::getBarcodePNG($Number, "QRCODE"); $QRCode = DNS2DFacade::getBarcodePNG( $Number , "QRCODE" );
$Package = Package::where('unique_id', $Number)->first(); $Package = Package::where( 'unique_id' , $Number )->first();
return \MessageResponse::data(['Barcode' => $Barcode, 'QRCode' => $QRCode, 'ShowLink' => 'Show/Package/'.$Package->id]); return \MessageResponse::data( [ 'Barcode' => $Barcode , 'QRCode' => $QRCode , 'ShowLink' => 'Show/Package/' . $Package->id ] );
} }
} }
public function generatePackageQRCode(Package $Package)
public function generatePackageQRCode( Package $Package )
{ {
$URL = 'https://www.cssd-doc.com/Show/Package/'.$Package->id; $URL = 'https://www.cssd-doc.com/Show/Package/' . $Package->id;
$QRCode = DNS2DFacade::getBarcodePNG($URL, "QRCODE"); $QRCode = DNS2DFacade::getBarcodePNG( $URL , "QRCODE" );
return \MessageResponse::data(['QRCode' => 'data:image/png;base64,' .$QRCode]); return \MessageResponse::data( [ 'QRCode' => 'data:image/png;base64,' . $QRCode ] );
}
} }
}
app/Http/Controllers/ItemController.php
+152 -98
View File
@@ -1,140 +1,194 @@
<?php <?php
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Http\Request; use App\Media;
use App\Http\Requests\StoreItemRequest; use Illuminate\Http\Request;
use App\Item; use App\Http\Requests\StoreItemRequest;
use App\User; use App\Item;
use App\User;
use Illuminate\Support\Facades\Storage;
class ItemController extends Controller class ItemController extends Controller
{
public function index(Request $request)
{ {
$user = auth('api')->user(); public function index( Request $request )
{
$user = auth( 'api' )->user();
if ($user->hasRole('User')) { if ( $user->hasRole( 'User' ) ) {
return \MessageResponse::error('You dont have access to this section!'); return \MessageResponse::error( 'You dont have access to this section!' );
} }
$Items = Item::when($user->cant('showAll', Item::class), function($query) use ($user) { $Items = Item::when( $user->cant( 'showAll' , Item::class ) , function ( $query ) use ( $user ) {
if ($user->hasRole('Supervisor')) { if ( $user->hasRole( 'Supervisor' ) ) {
$query->whereHas('user', function($query) use ($user) { $query->whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where('medical_center_id', $user->medical_center_id); $query->where( 'medical_center_id' , $user->medical_center_id );
}); } );
} }
}) } )
->when($request->has('name') && $request->name != '', function($query) use($request){ ->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
$query->where('name', 'LIKE', '%'.$request->name.'%'); $query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
}) } )
->when($request->has('size') && $request->size != '', function($query) use($request){ ->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
$query->where('size', $request->size); $query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
}) } )
->when($request->has('item_id') && $request->item_id != '', function($query) use($request){ ->when( $request->has( 'size' ) && $request->size != '' , function ( $query ) use ( $request ) {
$query->where('id', $request->item_id); $query->where( 'size' , $request->size );
}) } )
->when($request->has('specific') && $request->specific != '', function($query) use($request){ ->when( $request->has( 'item_id' ) && $request->item_id != '' , function ( $query ) use ( $request ) {
$query->where('specific', $request->specific); $query->where( 'id' , $request->item_id );
}) } )
->when($request->has('medical_center_id') && $request->medical_center_id != '' && $request->medical_center_id != 'undefined', function($query) use($request){ ->when( $request->has( 'specific' ) && $request->specific != '' , function ( $query ) use ( $request ) {
$query->whereHas('user', function($query) use ($request) { $query->where( 'specific' , $request->specific );
$query->where('medical_center_id', $request->medical_center_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 ) {
->with(['user' => function($query){ $query->where( 'medical_center_id' , $request->medical_center_id );
$query->select('id', 'name', 'medical_center_id'); } );
}, } )
'user.medical_center' => function($query){ ->with( [ 'user' => function ( $query ) {
$query->select('id', 'name'); $query->select( 'id' , 'name' , 'medical_center_id' );
}]) } ,
->paginate(10); 'user.medical_center' => function ( $query ) {
return \MessageResponse::data($Items); $query->select( 'id' , 'name' );
} ] )
->paginate( 10 );
return \MessageResponse::data( $Items );
} }
public function create() public function create()
{ {
} }
public function show(Item $Item)
public function show( Item $Item )
{ {
$Item->load(['user' => function($query){ $Item->load( [ 'user' => function ( $query ) {
$query->select('id', 'name', 'medical_center_id'); $query->select( 'id' , 'name' , 'medical_center_id' );
}, } ,
'user.medical_center' => function($query){ 'user.medical_center' => function ( $query ) {
$query->select('id', 'name'); $query->select( 'id' , 'name' );
}]); } ] );
return \MessageResponse::data($Item);
$FilesPath = [];
if ( count( $Item->files ) ) {
foreach ( $Item->files as $Key => $File ) {
$FilesPath[] = $File->path;
} }
public function store(StoreItemRequest $request) $Item[ 'filesPath' ] = $FilesPath;
}
return \MessageResponse::data( $Item );
}
public function store( StoreItemRequest $request )
{ {
$ItemData = [ $ItemData = [
'name' => $request->name, 'name' => $request->name ,
'size' => $request->size, 'size' => $request->size ,
'unique_id' => $request->unique_id, 'unique_id' => $request->unique_id ,
'specific' => $request->specific, 'specific' => $request->specific ,
'note' => $request->note, 'note' => $request->note ,
'user_id' => auth('api')->user()->id, 'udi' => $request->udi ,
'user_id' => auth( 'api' )->user()->id ,
]; ];
$ItemObj = Item::create($ItemData); $ItemObj = Item::create( $ItemData );
return \MessageResponse::success(trans('messages.success')); ///////////////////////////////////////////////////////////////////////////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 ) );
} }
public function edit(Item $Item) $Image->model_id = $ItemObj->id;
{ $Image->path = $NewPath;
return \MessageResponse::data($Item); $Image->save();
} }
public function update(StoreItemRequest $request, Item $Item)
{
$Item->update($request->all());
return \MessageResponse::success(trans('messages.success'));
} }
public function destroy(Item $Item) ///////////////////////////////////////////////////////////////////////////Images
{
if (!auth('api')->user()->can('delete', $Item)) { return \MessageResponse::success( trans( 'messages.success' ) );
return \MessageResponse::error(trans('messages.access_denied'));
} }
if(count($Item->packages))
public function edit( Item $Item )
{ {
if ( count( $Item->files ) ) {
foreach ( $Item->files as $Key => $file ) {
$FilesPath[] = $file;
}
$Item[ 'filesPath' ] = $FilesPath;
} else {
$Item[ 'filesPath' ] = [];
}
return \MessageResponse::data( $Item );
}
public function update( StoreItemRequest $request , Item $Item )
{
$Item->update( $request->all() );
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(); $Item->packages()->detach();
} }
$Item->delete(); $Item->delete();
return \MessageResponse::success(trans('messages.success')); return \MessageResponse::success( trans( 'messages.success' ) );
} }
public function getItems(){ public function getItems()
{
$user = auth('api')->user(); $user = auth( 'api' )->user();
if ($user->hasRole('User')) { if ( $user->hasRole( 'User' ) ) {
return \MessageResponse::data([]); return \MessageResponse::data( [] );
} }
$Items = Item::when($user->cant('showAll', Item::class), function($query) use ($user) { $Items = Item::when( $user->cant( 'showAll' , Item::class ) , function ( $query ) use ( $user ) {
if ($user->hasRole('Supervisor')) { if ( $user->hasRole( 'Supervisor' ) ) {
$query->whereHas('user', function($query) use ($user) { $query->whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where('medical_center_id', $user->medical_center_id); $query->where( 'medical_center_id' , $user->medical_center_id );
}); } );
} }
}) } )
->with(['user' => function($query){ ->with( [ 'user' => function ( $query ) {
$query->select('id', 'name', 'medical_center_id'); $query->select( 'id' , 'name' , 'medical_center_id' );
}, } ,
'user.medical_center' => function($query){ 'user.medical_center' => function ( $query ) {
$query->select('id', 'name'); $query->select( 'id' , 'name' );
}]) } ] )
->get(); ->get();
return \MessageResponse::data($Items); return \MessageResponse::data( $Items );
} }
public function showItem(Item $Item) public function showItem( Item $Item )
{ {
$Item->load(['user' => function($query){ $Item->load( [ 'user' => function ( $query ) {
$query->select('id', 'name', 'medical_center_id'); $query->select( 'id' , 'name' , 'medical_center_id' );
}, } ,
'user.medical_center' => function($query){ 'user.medical_center' => function ( $query ) {
$query->select('id', 'name'); $query->select( 'id' , 'name' );
}]); } ] );
return \MessageResponse::data($Item); return \MessageResponse::data( $Item );
}
public function changeStatus( Item $Item )
{
if ( auth( 'api' )->user()->cant( 'changeStatus' , Item::class ) ) {
return \MessageResponse::error( trans( 'messages.access_denied' ) );
}
$Item->status = ! $Item->status;
$Item->save();
return \MessageResponse::data( $Item );
}
} }
}
app/Http/Controllers/PackageController.php
+125 -118
View File
@@ -1,192 +1,199 @@
<?php <?php
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Requests\StorePackageRequest; use App\Http\Requests\StorePackageRequest;
use App\Package; use App\Package;
use App\User; use App\User;
class PackageController extends Controller class PackageController extends Controller
{
public function index(Request $request)
{ {
$user = auth('api')->user(); public function index( Request $request )
{
$user = auth( 'api' )->user();
if ($user->hasRole('User')) { if ( $user->hasRole( 'User' ) ) {
return \MessageResponse::error('You dont have access to this section!'); return \MessageResponse::error( 'You dont have access to this section!' );
} }
$Packages = Package:: $Packages = Package::
when($user->cant('showAll', Package::class), function($query) use ($user) { when( $user->cant( 'showAll' , Package::class ) , function ( $query ) use ( $user ) {
if ($user->hasRole('Supervisor')) { if ( $user->hasRole( 'Supervisor' ) ) {
$query->whereHas('user', function($query) use ($user) { $query->whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where('medical_center_id', $user->medical_center_id); $query->where( 'medical_center_id' , $user->medical_center_id );
}); } );
} }
}) } )
->when($request->has('name') && $request->name != '', function($query) use($request){ ->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
$query->where('name', 'LIKE', '%'.$request->name.'%'); $query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
}) } )
->when($request->has('package_id') && $request->package_id != '', function($query) use($request){ ->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
$query->where('id', $request->package_id); $query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
}) } )
->when($request->has('medical_center_id') && $request->medical_center_id != '' && $request->medical_center_id != 'undefined', function($query) use($request){ ->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) {
$query->whereHas('user', function($query) use ($request) { $query->where( 'id' , $request->package_id );
$query->where('medical_center_id', $request->medical_center_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 ) {
->with(['user' => function($query){ $query->where( 'medical_center_id' , $request->medical_center_id );
$query->select('id', 'name', 'medical_center_id'); } );
}, } )
'user.medical_center' => function($query){ ->with( [ 'user' => function ( $query ) {
$query->select('id', 'name'); $query->select( 'id' , 'name' , 'medical_center_id' );
}])->orderByDesc('id')->paginate(10); } ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
} ] )->orderByDesc( 'id' )->paginate( 10 );
return \MessageResponse::data($Packages); return \MessageResponse::data( $Packages );
} }
public function create() public function create()
{ {
} }
public function show(Package $Package)
public function show( Package $Package )
{ {
$Package->load(['user' => function($query){ $Package->load( [ 'user' => function ( $query ) {
$query->select('id', 'name', 'medical_center_id'); $query->select( 'id' , 'name' , 'medical_center_id' );
}, } ,
'user.medical_center' => function($query){ 'user.medical_center' => function ( $query ) {
$query->select('id', 'name'); $query->select( 'id' , 'name' );
}, } ,
'items']); 'items' ] );
return \MessageResponse::data($Package); return \MessageResponse::data( $Package );
} }
public function store(StorePackageRequest $request)
public function store( StorePackageRequest $request )
{ {
// $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10); // $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
$PackageData = [ $PackageData = [
'name' => $request->name, 'name' => $request->name ,
'unique_id' => $request->unique_id, 'unique_id' => $request->unique_id ,
'note' => $request->note, 'note' => $request->note ,
'user_id' => auth('api')->user()->id, 'udi' => $request->udi ,
'verified' => 'NotVerified', 'user_id' => auth( 'api' )->user()->id ,
'verified' => 'NotVerified' ,
]; ];
$PackageObj = Package::create($PackageData); $PackageObj = Package::create( $PackageData );
$Items = []; $Items = [];
$count = 1; $count = 1;
foreach ($request->items as $key => $item) { foreach ( $request->items as $key => $item ) {
if (array_key_exists($item['id'], $Items)) { if ( array_key_exists( $item[ 'id' ] , $Items ) ) {
$preCount = $Items[$item['id']]; $preCount = $Items[ $item[ 'id' ] ];
$Items[$item['id']] = $preCount + 1; $Items[ $item[ 'id' ] ] = $preCount + 1;
} } else {
else { $Items[ $item[ 'id' ] ] = $count;
$Items[$item['id']] = $count;
} }
} }
foreach ($Items as $Item => $Count) { foreach ( $Items as $Item => $Count ) {
$PackageObj->items()->attach(array($Item), ['count' => $Count]); $PackageObj->items()->attach( array( $Item ) , [ 'count' => $Count ] );
} }
return \MessageResponse::success(trans('messages.success')); return \MessageResponse::success( trans( 'messages.success' ) );
} }
public function edit(Package $Package)
public function edit( Package $Package )
{ {
$Items = []; $Items = [];
$Package->load('items'); $Package->load( 'items' );
foreach ($Package->items as $item) { foreach ( $Package->items as $item ) {
for ($i=0; $i < $item->pivot->count ; $i++) { for ( $i = 0 ; $i < $item->pivot->count ; $i++ ) {
$Items[] = (object) array('id' => $item->id, 'name' => $item->name); $Items[] = (object) array( 'id' => $item->id , 'name' => $item->name );
} }
} }
unset($Package->items); unset( $Package->items );
$Package->items = $Items; $Package->items = $Items;
return \MessageResponse::data($Package); return \MessageResponse::data( $Package );
} }
public function update(StorePackageRequest $request, Package $Package)
public function update( StorePackageRequest $request , Package $Package )
{ {
$Package->update($request->except(['items'])); $Package->update( $request->except( [ 'items' ] ) );
$Items = []; $Items = [];
$count = 1; $count = 1;
foreach ($request->items as $key => $item) { foreach ( $request->items as $key => $item ) {
if (array_key_exists($item['id'], $Items)) { if ( array_key_exists( $item[ 'id' ] , $Items ) ) {
$preCount = $Items[$item['id']]; $preCount = $Items[ $item[ 'id' ] ];
$Items[$item['id']] = $preCount + 1; $Items[ $item[ 'id' ] ] = $preCount + 1;
} } else {
else { $Items[ $item[ 'id' ] ] = $count;
$Items[$item['id']] = $count;
} }
} }
$Package->items()->detach(); $Package->items()->detach();
foreach ($Items as $Item => $Count) { foreach ( $Items as $Item => $Count ) {
$Package->items()->attach(array($Item), ['count' => $Count]); $Package->items()->attach( array( $Item ) , [ 'count' => $Count ] );
} }
return \MessageResponse::success(trans('messages.success')); return \MessageResponse::success( trans( 'messages.success' ) );
} }
public function destroy(Package $Package)
public function destroy( Package $Package )
{ {
if (auth('api')->user()->cant('delete', $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)) if ( count( $Package->items ) ) {
{
$Package->items()->detach(); $Package->items()->detach();
} }
if(count($Package->labels)) if ( count( $Package->labels ) ) {
{
$Package->labels()->delete(); $Package->labels()->delete();
} }
$Package->delete(); $Package->delete();
return \MessageResponse::success(trans('messages.success')); return \MessageResponse::success( trans( 'messages.success' ) );
} }
public function verifyPackage(Package $Package)
public function verifyPackage( Package $Package )
{ {
if (auth('api')->user()->cant('verifyPackage', $Package)) { if ( auth( 'api' )->user()->cant( 'verifyPackage' , $Package ) ) {
return \MessageResponse::error(trans('You dont have permission')); return \MessageResponse::error( trans( 'You dont have permission' ) );
} }
if ($Package->verified == 'Verified') { if ( $Package->verified == 'Verified' ) {
$Package->verified = 'NotVerified'; $Package->verified = 'NotVerified';
} else { } else {
$Package->verified = 'Verified'; $Package->verified = 'Verified';
} }
$Package->save(); $Package->save();
$Package = $Package->load('user'); $Package = $Package->load( 'user' );
return \MessageResponse::success(trans('messages.success'), null, $Package); return \MessageResponse::success( trans( 'messages.success' ) , null , $Package );
} }
public function getPackages() public function getPackages()
{ {
$user = auth('api')->user(); $user = auth( 'api' )->user();
$Packages = Package:: $Packages = Package::
when($user->cant('showAll', Package::class), function($query) use ($user) { when( $user->cant( 'showAll' , Package::class ) , function ( $query ) use ( $user ) {
if ($user->hasRole('Supervisor|User')) { if ( $user->hasRole( 'Supervisor|User' ) ) {
$query->whereHas('user', function($query) use ($user) { $query->whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where('medical_center_id', $user->medical_center_id); $query->where( 'medical_center_id' , $user->medical_center_id );
}); } );
} }
}) } )
->with(['user' => function($query){ ->with( [ 'user' => function ( $query ) {
$query->select('id', 'name', 'medical_center_id'); $query->select( 'id' , 'name' , 'medical_center_id' );
}, } ,
'user.medical_center' => function($query){ 'user.medical_center' => function ( $query ) {
$query->select('id', 'name'); $query->select( 'id' , 'name' );
}])->get(); } ] )->get();
return \MessageResponse::data($Packages); return \MessageResponse::data( $Packages );
} }
public function showPackage(Package $Package)
public function showPackage( Package $Package )
{ {
$Package->load(['user' => function($query){ $Package->load( [ 'user' => function ( $query ) {
$query->select('id', 'name', 'medical_center_id'); $query->select( 'id' , 'name' , 'medical_center_id' );
}, } ,
'user.medical_center' => function($query){ 'user.medical_center' => function ( $query ) {
$query->select('id', 'name'); $query->select( 'id' , 'name' );
}, } ,
'items']); 'items' ] );
return \MessageResponse::data($Package); return \MessageResponse::data( $Package );
}
} }
}
app/Http/Controllers/TestResultController.php
+277 -309
View File
@@ -1,110 +1,98 @@
<?php <?php
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Http\Request; use App\Http\Requests\StoreTestResultRequest;
use Illuminate\Support\Facades\Auth; use App\Input;
use App\Http\Requests\StoreTestResultRequest; use App\InputValue;
use App\TestResult; use App\Media;
use App\InputValue; use App\MedicalCenter;
use App\Input; use App\TestResult;
use App\MedicalCenter; use App\TestType;
use App\TestType; use Illuminate\Http\Request;
use App\Gallery; use Illuminate\Support\Facades\Storage;
use App\Uploadable;
use App\Media;
use Intervention\Image\ImageManagerStatic as Image;
use Intervention\Image\ImageManager;
use Illuminate\Support\Facades\Storage;
class TestResultController extends Controller class TestResultController extends Controller
{
private function filterByInputs($inputArray){
$searchArray = ['Patient ID' => 1111, 'Autoclave ID' => 2222];
$TestResults = TestResult::query();
foreach ($inputArray as $key => $value) {
$TestResults .= $TestResults->whereHas('input_values', function($query) use($value, $key){
$query->whereHas('input', function($query) use($key){
$query->where('name', $key);
})->where('value', $value);
});
}
return $query;
}
public function index(Request $request)
{ {
$user = auth('api')->user();
if ($user->hasRole('Supervisor|User')) { public function index( Request $request )
{
$user = auth( 'api' )->user();
if ( $user->hasRole( 'Supervisor|User' ) ) {
$medical_center_id = $user->medical_center_id; $medical_center_id = $user->medical_center_id;
} } elseif ( $request->has( 'medicalCenter_id' ) && $request->medicalCenter_id != '' && $request->medicalCenter_id != 'undefined' ) {
elseif($request->has('medicalCenter_id') && $request->medicalCenter_id != '' && $request->medicalCenter_id != 'undefined' ) {
$medical_center_id = $request->medicalCenter_id; $medical_center_id = $request->medicalCenter_id;
} else { } else {
$medical_center_id = null; $medical_center_id = null;
} }
if ($user->hasRole('User')) { if ( $user->hasRole( 'User' ) ) {
$user_name = $user->name; $user_name = $user->name;
} } elseif ( $request->has( 'user_name' ) && $request->user_name ) {
elseif($request->has('user_name') && $request->user_name) {
$user_name = $request->user_name; $user_name = $request->user_name;
} } else {
else {
$user_name = null; $user_name = null;
} }
$TestResult = TestResult::when($request->has('verified'), function ($query) use ($request){ $TestResult = TestResult::when( $request->has( 'verified' ) , function ( $query ) use ( $request ) {
return $query->where('verified', $request->verified); return $query->where( 'verified' , $request->verified )->orWhere('verified' , "None" );
}) } )
->when(($request->has('fromPicker') && $request->fromPicker) || ($request->has('upToPicker') && $request->upToPicker), function ($query) use ($request){ ->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'); $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'); $upTo = ( $request->upToPicker ) ? date( $request->upToPicker . ' 23:59:59' ) : date( 'Y-m-d' . ' 23:59:59' );
return $query->whereBetween('created_at', [$from, $upTo]); return $query->whereBetween( 'created_at' , [ $from , $upTo ] );
}) } )
->when($request->has('testType_id') && $request->testType_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); $query->where( 'test_type_id' , $request->testType_id );
}) } )
->when($request->has('device_id') && $request->device_id, function($query) use($request){ ->when( ($request->has( 'device_id' ) && $request->device_id) && ($request->has( 'device_label' ) && $request->device_label && $request->device_label != "undefined") , function ( $query ) use ( $request ) {
$device_label = $request->device_label ? $request->device_label : ''; if ( $request->device_label != 'undefined' ) {
if ($device_label && $device_label != 'undefined'){ $query->whereHas( 'input_values' , function ( $query ) use ( $request ) {
$query->whereHas('input_values', function($query) use($request, $device_label){ $query->whereHas( 'input' , function ( $query ) use ( $request ) {
$query->whereHas('input', function($query) use($request, $device_label){ $query->where( 'name' , $request->device_label );
$query->where('name', $device_label); } )->where( 'value' , $request->device_id );
})->where('value', $request->device_id); } );
}); } else {
$query->where( function ( $query ) use ( $request ) {
$query->where( 'id' , $request->device_id );
} );
} }
else{ } )
$query->where(function($query) use($request){ ->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('id', $request->device_id); $query->where( function ( $query ) use ( $request ) {
}); $query->where( 'id' , $request->device_id );
} } );
}) } )
->when($user_name, function($query) use($user_name){ ->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('user', function($query) use($user_name){ $query->whereHas( 'input_values' , function ( $query ) use ( $request ) {
$query->where('name', 'LIKE', '%'.$user_name.'%'); $query->whereHas( 'input' , function ( $query ) use ( $request ) {
}); $query->where( 'name' , $request->device_label );
}) } );
->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); ->when( $user_name , function ( $query ) use ( $user_name ) {
}); $query->whereHas( 'user' , function ( $query ) use ( $user_name ) {
}) $query->where( 'name' , 'LIKE' , '%' . $user_name . '%' );
->with(['user' => function($query){ } );
$query->select('id', 'name', 'medical_center_id'); } )
}, ->when( $medical_center_id , function ( $query ) use ( $medical_center_id ) {
'user.medical_center' => function($query){ $query->whereHas( 'user' , function ( $query ) use ( $medical_center_id ) {
$query->select('id', 'name'); $query->where( 'medical_center_id' , $medical_center_id );
}, } );
'test_type' => function($query){ } )
$query->select('id', 'name'); ->with( [ 'user' => function ( $query ) {
}]) $query->select( 'id' , 'name' , 'medical_center_id' );
->orderByDesc('id')->paginate(10); } ,
'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); return \MessageResponse::data( $TestResult );
} }
public function create() public function create()
@@ -112,59 +100,58 @@ class TestResultController extends Controller
// //
} }
public function store(StoreTestResultRequest $request) public function store( StoreTestResultRequest $request )
{ {
try { try {
$return_value = \DB::transaction(function () use ($request) { $return_value = \DB::transaction( function () use ( $request ) {
$TestResult = [ $TestResult = [
'user_id' => auth('api')->user()->id, 'user_id' => auth( 'api' )->user()->id ,
'cycle_number' => $request->cycle_number, 'cycle_number' => $request->cycle_number ,
'date' => $request->date, 'date' => $request->date ,
'test_type_id' => $request->test_type_id, 'test_type_id' => $request->test_type_id ,
'result' => $request->result, 'result' => $request->result ,
'verified' => 'None', 'verified' => 'None' ,
]; ];
$TestResultObj = TestResult::create($TestResult); $TestResultObj = TestResult::create( $TestResult );
$TestResultInfo = $request->all(); $TestResultInfo = $request->all();
$Inputs = Input::with('options','children','children.options')->whereNull('parent_id')->where('test_type_id',$request->test_type_id)->get(); $Inputs = Input::with( 'options' , 'children' , 'children.options' )->whereNull( 'parent_id' )->where( 'test_type_id' , $request->test_type_id )->get();
///////////////////////////////////////////////////////////////////////////Inputs ///////////////////////////////////////////////////////////////////////////Inputs
foreach ($Inputs as $Input) { foreach ( $Inputs as $Input ) {
if ($Input['type'] != 'Form') { if ( $Input[ 'type' ] != 'Form' ) {
$Value = $TestResultInfo[$Input->name.'_'.$Input->id]; $Value = $TestResultInfo[ $Input->name . '_' . $Input->id ];
if ($Input['type'] == 'Checkbox' || $Input['type'] == 'Select' || $Input['type'] == 'Radiobutton') { if ( $Input[ 'type' ] == 'Checkbox' || $Input[ 'type' ] == 'Select' || $Input[ 'type' ] == 'Radiobutton' ) {
foreach ($Input->options as $Option) {//--2 foreach ( $Input->options as $Option ) {//--2
if(is_array($Value) && in_array($Option->id,$Value)){ 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]); $InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $Input->id , 'option_id' => $Option->id ] );
} }
if ($Input['type'] == 'Radiobutton' && $Option->id == $Value) { if ( $Input[ 'type' ] == 'Radiobutton' && $Option->id == $Value ) {
$InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $Input->id, 'option_id' => $Option->id]); $InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $Input->id , 'option_id' => $Option->id ] );
} }
} }
} else { } else {
$InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $Input->id, 'value' => $Value]); $InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $Input->id , 'value' => $Value ] );
} }
} else { } else {
foreach ($Input->children as $InputChild) { foreach ( $Input->children as $InputChild ) {
$Value = $TestResultInfo[$InputChild->name.'_'.$InputChild->id]; $Value = $TestResultInfo[ $InputChild->name . '_' . $InputChild->id ];
if ($InputChild['type'] == 'Checkbox' || $InputChild['type'] == 'Select' || $InputChild['type'] == 'Radiobutton') { if ( $InputChild[ 'type' ] == 'Checkbox' || $InputChild[ 'type' ] == 'Select' || $InputChild[ 'type' ] == 'Radiobutton' ) {
foreach ($InputChild->options as $Option) {//--2 foreach ( $InputChild->options as $Option ) {//--2
if(is_array($Value) && in_array($Option->id,$Value)){ 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]); $InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $InputChild->id , 'option_id' => $Option->id ] );
} }
if ($InputChild['type'] == 'Radiobutton' && $Option->id == $Value) { if ( $InputChild[ 'type' ] == 'Radiobutton' && $Option->id == $Value ) {
$InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]); $InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $InputChild->id , 'option_id' => $Option->id ] );
} }
} }
} } else {
else { $InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $InputChild->id , 'value' => $Value ] );
$InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $InputChild->id, 'value' => $Value]);
} }
} }
@@ -173,13 +160,13 @@ class TestResultController extends Controller
} }
///////////////////////////////////////////////////////////////////////////Inputs ///////////////////////////////////////////////////////////////////////////Inputs
///////////////////////////////////////////////////////////////////////////Images ///////////////////////////////////////////////////////////////////////////Images
$Images = Media::whereNull('model_id')->where('batch_id', $request->file_batch_id)->get(); $Images = Media::whereNull( 'model_id' )->where( 'batch_id' , $request->file_batch_id )->get();
if($Images){ if ( $Images ) {
foreach ($Images as $Image) { foreach ( $Images as $Image ) {
$NewPath = 'media'.'/TestResults'.'/'.$TestResultObj->id .'/'.$Image->file_name; $NewPath = 'media' . '/TestResults' . '/' . $TestResultObj->id . '/' . $Image->file_name;
Storage::disk('public')->makeDirectory('TestResults'.'/'.$TestResultObj->id); Storage::disk( 'public' )->makeDirectory( 'TestResults' . '/' . $TestResultObj->id );
if (\File::exists(public_path($Image->path))) { if ( \File::exists( public_path( $Image->path ) ) ) {
\File::move(public_path($Image->path), public_path($NewPath)); \File::move( public_path( $Image->path ) , public_path( $NewPath ) );
} }
$Image->model_id = $TestResultObj->id; $Image->model_id = $TestResultObj->id;
$Image->path = $NewPath; $Image->path = $NewPath;
@@ -188,230 +175,220 @@ class TestResultController extends Controller
} }
///////////////////////////////////////////////////////////////////////////Images ///////////////////////////////////////////////////////////////////////////Images
}); } );
} catch (\Exception $e) { } catch ( \Exception $e ) {
return response()->json($e->getMessage(), 441); return response()->json( $e->getMessage() , 441 );
} }
return \MessageResponse::success(null,trans('messages.create')); return \MessageResponse::success( null , trans( 'messages.create' ) );
} }
public function show($id) 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); $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 = []; $options = [];
foreach ($TestResult->input_values as $value) { foreach ( $TestResult->input_values as $value ) {
$input = $value->input; $input = $value->input;
if ($input->parent_id != null && $input->parent['type'] == 'Form') { if ( $input->parent_id != null && $input->parent[ 'type' ] == 'Form' ) {
//----------------------------------------------------------------------FormType //----------------------------------------------------------------------FormType
if ($input->type == 'Checkbox' || $input->type == 'Select' || $input['type'] == 'Radiobutton') { 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(); $input_options = InputValue::with( 'option' )->where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $input->id )->get();
$options = []; $options = [];
foreach ($input_options as $input_option) { foreach ( $input_options as $input_option ) {
$options[] = $input_option->option->title; $options[] = $input_option->option->title;
$input_values[$input->name] = $options; $input_values[ $input->name ] = $options;
} }
$children[$input->parent->name] = $input_values; $children[ $input->parent->name ] = $input_values;
$TestResult['children'] = $children; $TestResult[ 'children' ] = $children;
} } else {
else {
$children[$input->parent->name][$input->name] = $value->value; $children[ $input->parent->name ][ $input->name ] = $value->value;
$TestResult['children'] = $children; $TestResult[ 'children' ] = $children;
} }
//-----------------------------------------------------------------------FormType //-----------------------------------------------------------------------FormType
} } else {
else {
//-----------------------------------------------------------------------Anothertype //-----------------------------------------------------------------------Anothertype
if ($input->type == 'Checkbox' || $input->type == 'Select' || $input['type'] == 'Radiobutton') { 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(); $input_options = InputValue::with( 'option' )->where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $input->id )->get();
$options = []; $options = [];
foreach ($input_options as $input_option) { foreach ( $input_options as $input_option ) {
$options[] = $input_option->option->title; $options[] = $input_option->option->title;
} }
$values[$input->name] = $options; $values[ $input->name ] = $options;
$TestResult['options'] = $values; $TestResult[ 'options' ] = $values;
} } else {
else { $inputs[ $input->name ] = $value->value;
$inputs[$input->name] = $value->value; $TestResult[ 'inputs' ] = $inputs;
$TestResult['inputs'] = $inputs;
} }
//-----------------------------------------------------------------------Anothertype //-----------------------------------------------------------------------Anothertype
} }
} }
$FilesPath = []; $FilesPath = [];
if (count($TestResult->files)) { if ( count( $TestResult->files ) ) {
foreach ($TestResult->files as $Key => $File) { foreach ( $TestResult->files as $Key => $File ) {
$FilesPath[] = $File->path; $FilesPath[] = $File->path;
} }
$TestResult['filesPath'] = $FilesPath; $TestResult[ 'filesPath' ] = $FilesPath;
} }
$TestResult['device_label'] = $TestResult->test_type->device_label; $TestResult[ 'device_label' ] = $TestResult->test_type->device_label;
return \MessageResponse::data($TestResult); return \MessageResponse::data( $TestResult );
} }
public function edit(TestResult $TestResult) public function edit( TestResult $TestResult )
{ {
foreach ($TestResult->input_values as $key => $value) { foreach ( $TestResult->input_values as $key => $value ) {
$input = $value->input; $input = $value->input;
if ($input->type == 'Checkbox' || $input->type == 'Select' || $input['type'] == 'Radiobutton') { 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(); $input_options = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $input->id )->get()->pluck( 'option_id' )->toArray();
if ($input['type'] == 'Radiobutton') { if ( $input[ 'type' ] == 'Radiobutton' ) {
$TestResult[$input->name.'_'.$input->id] = $input_options[0]; $TestResult[ $input->name . '_' . $input->id ] = $input_options[ 0 ];
} else {
$TestResult[ $input->name . '_' . $input->id ] = $input_options;
} }
else { } else {
$TestResult[$input->name.'_'.$input->id] = $input_options; $TestResult[ $input->name . '_' . $input->id ] = $value->value;
}
}
else {
$TestResult[$input->name.'_'.$input->id] = $value->value;
} }
} }
$FilesPath = []; $FilesPath = [];
if (count($TestResult->files)) { if ( count( $TestResult->files ) ) {
foreach ($TestResult->files as $Key => $file) { foreach ( $TestResult->files as $Key => $file ) {
$FilesPath[] = $file; $FilesPath[] = $file;
} }
$TestResult['filesPath'] = $FilesPath; $TestResult[ 'filesPath' ] = $FilesPath;
} } else {
else { $TestResult[ 'filesPath' ] = [];
$TestResult['filesPath'] = [];
} }
return \MessageResponse::data($TestResult); return \MessageResponse::data( $TestResult );
} }
public static function storage_path($path) public static function storage_path( $path )
{ {
if (starts_with($path, 'media/')) { if ( starts_with( $path , 'media/' ) ) {
$path = substr($path, 6); $path = substr( $path , 6 );
} }
return $path; return $path;
} }
public function update(StoreTestResultRequest $request, TestResult $TestResult) public function update( StoreTestResultRequest $request , TestResult $TestResult )
{ {
$TestResultData = [ $TestResultData = [
'cycle_number' => $request->cycle_number, 'cycle_number' => $request->cycle_number ,
'date' => $request->date, 'date' => $request->date ,
'test_type_id' => $request->test_type_id, 'test_type_id' => $request->test_type_id ,
'result' => $request->result, 'result' => $request->result ,
// 'verified' => 'NotVerified', // 'verified' => 'NotVerified',
]; ];
$TestResult->update($TestResultData); $TestResult->update( $TestResultData );
$TestResultInfo = $request->all(); $TestResultInfo = $request->all();
$Inputs = Input::with('options', 'children', 'children.options')->whereNull('parent_id')->where('test_type_id',$request->test_type_id)->get(); $Inputs = Input::with( 'options' , 'children' , 'children.options' )->whereNull( 'parent_id' )->where( 'test_type_id' , $request->test_type_id )->get();
foreach ($Inputs as $Input) { foreach ( $Inputs as $Input ) {
if ($Input['type'] != 'Form') { if ( $Input[ 'type' ] != 'Form' ) {
$Value = $TestResultInfo[$Input->name.'_'.$Input->id]; $Value = $TestResultInfo[ $Input->name . '_' . $Input->id ];
if ($Input['type'] == 'Checkbox' || $Input['type'] == 'Select' || $Input['type'] == 'Radiobutton') { 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(); $InputOptions = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $Input->id )->get()->each->delete();
foreach ($Input->options as $Option) {//--2 foreach ( $Input->options as $Option ) {//--2
if(is_array($Value) && in_array($Option->id,$Value)){ 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]); $InputValueObj = InputValue::create( [ 'test_result_id' => $TestResult->id , 'input_id' => $Input->id , 'option_id' => $Option->id ] );
} }
if ($Input['type'] == 'Radiobutton' && $Option->id == $Value) { if ( $Input[ 'type' ] == 'Radiobutton' && $Option->id == $Value ) {
$InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $Input->id, 'option_id' => $Option->id]); $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 { } else {
$InputValueObj = InputValue::where('test_result_id', $TestResult->id)->where('input_id', $Input['id'])->update(['value' => $Value]); foreach ( $Input->children as $InputChild ) {
}
}
else {
foreach ($Input->children as $InputChild) {
$Value = $TestResultInfo[$InputChild->name.'_'.$InputChild->id]; $Value = $TestResultInfo[ $InputChild->name . '_' . $InputChild->id ];
if ($InputChild['type'] == 'Checkbox' || $InputChild['type'] == 'Select' || $InputChild['type'] == 'Radiobutton') { 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(); $InputOptions = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $InputChild->id )->get()->each->delete();
foreach ($InputChild->options as $Option) {//--2 foreach ( $InputChild->options as $Option ) {//--2
if(is_array($Value) && in_array($Option->id,$Value)){ 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]); $InputValueObj = InputValue::create( [ 'test_result_id' => $TestResult->id , 'input_id' => $InputChild->id , 'option_id' => $Option->id ] );
} }
if ($InputChild['type'] == 'Radiobutton' && $Option->id == $Value) { if ( $InputChild[ 'type' ] == 'Radiobutton' && $Option->id == $Value ) {
$InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]); $InputValueObj = InputValue::create( [ 'test_result_id' => $TestResult->id , 'input_id' => $InputChild->id , 'option_id' => $Option->id ] );
} }
} }
} } else {
else { $InputValueObj = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $InputChild[ 'id' ] )->update( [ 'value' => $Value ] );
$InputValueObj = InputValue::where('test_result_id', $TestResult->id)->where('input_id', $InputChild['id'])->update(['value' => $Value]);
} }
} }
} }
} }
/////////////////////////////////////////////////////////////////////Images /////////////////////////////////////////////////////////////////////Images
return \MessageResponse::success(null,trans('messages.update')); return \MessageResponse::success( null , trans( 'messages.update' ) );
} }
public function destroy(TestResult $TestResult) public function destroy( TestResult $TestResult )
{ {
if (!auth('api')->user()->can('delete', $TestResult)) { if ( ! auth( 'api' )->user()->can( 'delete' , $TestResult ) ) {
return \MessageResponse::error(trans('messages.access_denied')); return \MessageResponse::error( trans( 'messages.access_denied' ) );
} }
if (count($TestResult->input_values)) { if ( count( $TestResult->input_values ) ) {
InputValue::where('test_result_id', $TestResult->id)->get()->each->delete(); InputValue::where( 'test_result_id' , $TestResult->id )->get()->each->delete();
} }
if (count($TestResult->files)){ if ( count( $TestResult->files ) ) {
foreach ($TestResult->files as $file) { foreach ( $TestResult->files as $file ) {
Storage::disk('public')->delete(static::storage_path($file->path)); Storage::disk( 'public' )->delete( static::storage_path( $file->path ) );
Media::where('id', $file->id)->delete(); Media::where( 'id' , $file->id )->delete();
} }
} }
$TestResult->delete(); $TestResult->delete();
return \MessageResponse::success(null, trans('messages.success')); return \MessageResponse::success( null , trans( 'messages.success' ) );
} }
public function verifyTestResult(TestResult $TestResult, $Value) public function verifyTestResult( TestResult $TestResult , $Value )
{ {
if (auth('api')->user()->cant('verifyTestResult', $TestResult)) { if ( auth( 'api' )->user()->cant( 'verifyTestResult' , $TestResult ) ) {
return \MessageResponse::error(trans('You dont have permission or this test result belongs to another medical center')); return \MessageResponse::error( trans( 'You dont have permission or this test result belongs to another medical center' ) );
} }
$TestResult->verified = $Value; $TestResult->verified = $Value;
$TestResult->save(); $TestResult->save();
$TestResult = $TestResult->load('user.medical_center'); $TestResult = $TestResult->load( 'user.medical_center' );
return \MessageResponse::success(trans('messages.success'), null, $TestResult); return \MessageResponse::success( trans( 'messages.success' ) , null , $TestResult );
} }
public function listFilterItems() public function listFilterItems()
{ {
$user = auth('api')->user(); $user = auth( 'api' )->user();
$MedicalCenter = MedicalCenter::when(!$user->hasRole('Admin'), function ($query) use ($user) $MedicalCenter = MedicalCenter::when( ! $user->hasRole( 'Admin' ) , function ( $query ) use ( $user ) {
{ $query->where( 'id' , $user->medical_center_id );
$query->where('id', $user->medical_center_id); } )->select( 'name' , 'id' )->get()->toArray();
})->select('name', 'id')->get()->toArray();
$TestType = TestType::select('name', 'id')->get()->toArray(); $TestType = TestType::select( 'name' , 'id' )->get()->toArray();
return \MessageResponse::data([ return \MessageResponse::data( [
'MedicalCenters' => $MedicalCenter, 'MedicalCenters' => $MedicalCenter ,
'TestTypes' => $TestType 'TestTypes' => $TestType
]); ] );
} }
public function chart(Request $request) public function chart( Request $request )
{ {
$user = auth('api')->user(); $user = auth( 'api' )->user();
if ($user->hasRole('User')) { if ( $user->hasRole( 'User' ) ) {
$userId = $user->id; $userId = $user->id;
} elseif($request->has('userId') && $request->userId) { } elseif ( $request->has( 'userId' ) && $request->userId ) {
$userId = $request->userId; $userId = $request->userId;
} else { } else {
$userId = null; $userId = null;
} }
if ($user->hasRole('Admin') && $request->has('medicalCenterId') && $request->medicalCenterId) { if ( $user->hasRole( 'Admin' ) && $request->has( 'medicalCenterId' ) && $request->medicalCenterId ) {
$medicalCenterId = $request->medicalCenterId; $medicalCenterId = $request->medicalCenterId;
} else { } else {
$medicalCenterId = $user->medical_center_id; $medicalCenterId = $user->medical_center_id;
@@ -419,98 +396,89 @@ class TestResultController extends Controller
$TestResults = TestResult:: $TestResults = TestResult::
when($userId, function ($query) use ($userId) when( $userId , function ( $query ) use ( $userId ) {
{ $query->where( 'user_id' , $userId );
$query->where('user_id', $userId); } )
}) ->when( $medicalCenterId , function ( $query ) use ( $medicalCenterId ) {
->when($medicalCenterId, function ($query) use ($medicalCenterId) $query->whereHas( 'user' , function ( $query ) use ( $medicalCenterId ) {
{ $query->where( 'medical_center_id' , $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('testTypeId') && $request->testTypeId, function ($query) use ($request) } )
{ ->when( $request->has( 'result' ) && $request->result , function ( $query ) use ( $request ) {
$query->where('test_type_id', $request->testTypeId); $query->where( 'result' , $request->result );
}) } )
->when($request->has('result') && $request->result, function ($query) use ($request) ->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' );
$query->where('result', $request->result); $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) } )
{ ->when( $request->has( 'verify' ) && $request->verify , function ( $query ) use ( $request ) {
$from = ($request->fromPicker) ? date($request->fromPicker . ' 00:00:00') : date('2010-01-01' . ' 00:00:00'); $query->where( 'verified' , $request->verify );
$upTo = ($request->upToPicker) ? date($request->upToPicker . ' 23:59:59') : date('Y-m-d' . ' 23:59:59'); } )->select( 'result' )->get()->groupBy( 'result' );
return $query->whereBetween('created_at', [$from, $upTo]); $AcceptCount = ( isset( $TestResults[ 'Accept' ] ) ) ? $TestResults[ 'Accept' ]->count() : 0;
}) $RejectCount = ( isset( $TestResults[ 'Reject' ] ) ) ? $TestResults[ 'Reject' ]->count() : 0;
->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]]); return \MessageResponse::data( [ 'labels' => [ 'Number Of Accepted Test Results' , 'Number Of Rejected Test Results' ] , 'data' => [ $AcceptCount , $RejectCount ] ] );
} }
//--------------------------------------------------------------------------Show public function showTestResult( $id )
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); $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 = []; $options = [];
foreach ($TestResult->input_values as $value) { foreach ( $TestResult->input_values as $value ) {
$input = $value->input; $input = $value->input;
if ($input->parent_id != null && $input->parent['type'] == 'Form') { if ( $input->parent_id != null && $input->parent[ 'type' ] == 'Form' ) {
//----------------------------------------------------------------------FormType //----------------------------------------------------------------------FormType
if ($input->type == 'Checkbox' || $input->type == 'Select' || $input['type'] == 'Radiobutton') { 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(); $input_options = InputValue::with( 'option' )->where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $input->id )->get();
$options = []; $options = [];
foreach ($input_options as $input_option) { foreach ( $input_options as $input_option ) {
$options[] = $input_option->option->title; $options[] = $input_option->option->title;
$input_values[$input->name] = $options; $input_values[ $input->name ] = $options;
} }
$children[$input->parent->name] = $input_values; $children[ $input->parent->name ] = $input_values;
$TestResult['children'] = $children; $TestResult[ 'children' ] = $children;
} } else {
else {
$children[$input->parent->name][$input->name] = $value->value; $children[ $input->parent->name ][ $input->name ] = $value->value;
$TestResult['children'] = $children; $TestResult[ 'children' ] = $children;
} }
//-----------------------------------------------------------------------FormType //-----------------------------------------------------------------------FormType
} } else {
else {
//-----------------------------------------------------------------------Anothertype //-----------------------------------------------------------------------Anothertype
if ($input->type == 'Checkbox' || $input->type == 'Select' || $input['type'] == 'Radiobutton') { 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(); $input_options = InputValue::with( 'option' )->where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $input->id )->get();
$options = []; $options = [];
foreach ($input_options as $input_option) { foreach ( $input_options as $input_option ) {
$options[] = $input_option->option->title; $options[] = $input_option->option->title;
} }
$values[$input->name] = $options; $values[ $input->name ] = $options;
$TestResult['options'] = $values; $TestResult[ 'options' ] = $values;
} } else {
else { $inputs[ $input->name ] = $value->value;
$inputs[$input->name] = $value->value; $TestResult[ 'inputs' ] = $inputs;
$TestResult['inputs'] = $inputs;
} }
//-----------------------------------------------------------------------Anothertype //-----------------------------------------------------------------------Anothertype
} }
} }
$FilesPath = []; $FilesPath = [];
if (count($TestResult->files)) { if ( count( $TestResult->files ) ) {
foreach ($TestResult->files as $Key => $File) { foreach ( $TestResult->files as $Key => $File ) {
$FilesPath[] = $File->path; $FilesPath[] = $File->path;
} }
$TestResult['filesPath'] = $FilesPath; $TestResult[ 'filesPath' ] = $FilesPath;
} }
// dd($TestResult->test_type()->device_label); // dd($TestResult->test_type()->device_label);
$TestResult['device_label'] = $TestResult->test_type->device_label; $TestResult[ 'device_label' ] = $TestResult->test_type->device_label;
return \MessageResponse::data($TestResult); return \MessageResponse::data( $TestResult );
}
} }
}
app/Http/Controllers/TestTypeController.php
+1 -8
View File
@@ -115,7 +115,6 @@ class TestTypeController extends Controller
public function store(StoreTestTypeRequest $request) public function store(StoreTestTypeRequest $request)
{ {
// dd($request->all());
try { try {
$return_value = \DB::transaction(function () use ($request) { $return_value = \DB::transaction(function () use ($request) {
@@ -294,7 +293,6 @@ class TestTypeController extends Controller
{ {
//********************************** //**********************************
$InputObject = Input::findOrFail($InputObj['id']);//$InputObj['id'] OR $Input['id']??????? $InputObject = Input::findOrFail($InputObj['id']);//$InputObj['id'] OR $Input['id']???????
// dd($InputObject);
$DeletedChildIDs = $InputObject->children->pluck('id')->toArray(); $DeletedChildIDs = $InputObject->children->pluck('id')->toArray();
//********************************** //**********************************
@@ -388,6 +386,7 @@ class TestTypeController extends Controller
} }
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
public function getInputs(Request $request) public function getInputs(Request $request)
{ {
if (auth('api')->user()->can('getInputs')) { if (auth('api')->user()->can('getInputs')) {
@@ -437,11 +436,5 @@ class TestTypeController extends Controller
$TestType->delete(); $TestType->delete();
return \MessageResponse::success(trans('messages.success')); return \MessageResponse::success(trans('messages.success'));
} }
// public function allArchivedTestTypes()
// {
// $testTypes = TestType::where('deleted_at','<>', null)->get();
// dd($testTypes);
// return \MessageResponse::data($testTypes);
// }
} }
app/Http/Controllers/UserController.php
+2 -7
View File
@@ -1,19 +1,13 @@
<?php <?php
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Requests\StoreUserRequest; use App\Http\Requests\StoreUserRequest;
use App\MedicalCenter; use App\MedicalCenter;
use App\User; use App\User;
use App\Message; use App\Message;
class UserController extends Controller class UserController extends Controller
{ {
@@ -159,6 +153,7 @@ class UserController extends Controller
$user->load('medical_center'); $user->load('medical_center');
return \MessageResponse::data([ 'user' => $user, 'roles' => auth('api')->user()->getRoleNames() ]); return \MessageResponse::data([ 'user' => $user, 'roles' => auth('api')->user()->getRoleNames() ]);
} }
public function getMessages() public function getMessages()
{ {
$User = auth('api')->user(); $User = auth('api')->user();
@@ -169,6 +164,7 @@ class UserController extends Controller
return \MessageResponse::data(['ReceivedMessages' => $ReceivedMessages, 'SentMessages' => $SentMessages]); return \MessageResponse::data(['ReceivedMessages' => $ReceivedMessages, 'SentMessages' => $SentMessages]);
} }
public function searchUser(Request $request) public function searchUser(Request $request)
{ {
// if (auth('api')->user()->cant('searchUser', User::class)) { // if (auth('api')->user()->cant('searchUser', User::class)) {
@@ -196,5 +192,4 @@ class UserController extends Controller
return \MessageResponse::data($users); return \MessageResponse::data($users);
} }
} }
app/Http/Requests/StoreItemRequest.php
+2 -1
View File
@@ -30,6 +30,7 @@ class StoreItemRequest extends FormRequest
'size' => 'required', 'size' => 'required',
'specific' => 'required', 'specific' => 'required',
'note' => 'nullable', 'note' => 'nullable',
'udi' => 'required|max:100|unique:items',
]; ];
break; break;
} }
@@ -42,9 +43,9 @@ class StoreItemRequest extends FormRequest
'size' => 'required', 'size' => 'required',
'specific' => 'required', 'specific' => 'required',
'note' => 'nullable', 'note' => 'nullable',
'udi' => 'required|max:100|unique:items,udi,'.$Item->id,
]; ];
break; break;
} }
default: default:
break; break;
app/Http/Requests/StorePackageRequest.php
+2
View File
@@ -29,6 +29,7 @@ class StorePackageRequest extends FormRequest
'unique_id' => 'nullable|max:250|unique:packages', 'unique_id' => 'nullable|max:250|unique:packages',
'note' => 'nullable', 'note' => 'nullable',
'items' => 'required', 'items' => 'required',
'udi' => 'required|max:100|unique:packages',
]; ];
break; break;
} }
@@ -40,6 +41,7 @@ class StorePackageRequest extends FormRequest
'unique_id' => 'nullable|max:250|unique:packages,unique_id,'.$Package->id, 'unique_id' => 'nullable|max:250|unique:packages,unique_id,'.$Package->id,
'note' => 'nullable', 'note' => 'nullable',
'items' => 'required', 'items' => 'required',
'udi' => 'required|max:100|unique:packages',
]; ];
break; break;
app/Item.php
+15 -8
View File
@@ -1,18 +1,25 @@
<?php <?php
namespace App; namespace App;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
class Item extends Model
{
public $fillable = [ 'name' , 'size' , 'unique_id' , 'specific' , 'note' , 'user_id' , 'udi' , 'status' ];
class Item extends Model
{
public $fillable = ['name', 'size', 'unique_id', 'specific', 'note', 'user_id'];
public function packages() public function packages()
{ {
return $this->belongsToMany('App\Package', 'item_package')->withPivot('count'); return $this->belongsToMany( 'App\Package' , 'item_package' )->withPivot( 'count' );
} }
public function user() public function user()
{ {
return $this->belongsTo('App\User'); return $this->belongsTo( 'App\User' );
}
public function files()
{
return $this->morphMany( 'App\Media' , 'model' );
}
} }
}
app/Package.php
+18 -19
View File
@@ -1,27 +1,26 @@
<?php <?php
namespace App; namespace App;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
class Package extends Model
{
public $fillable = [ 'name' , 'unique_id' , 'user_id' , 'note' , 'verified' , 'udi' ];
class Package extends Model
{
public $fillable = ['name', 'unique_id', 'user_id', 'note', 'verified'];
public function user() public function user()
{ {
return $this->belongsTo('App\User'); return $this->belongsTo( 'App\User' );
}
public function items()
{
return $this->belongsToMany('App\Item', 'item_package')->withPivot('count');
}
// public function packs()
// {
// return $this->belongsToMany('App\Pack', 'pack_package');
// }
public function labels()
{
return $this->hasMany('App\Label');
} }
} public function items()
{
return $this->belongsToMany( 'App\Item' , 'item_package' )->withPivot( 'count' );
}
public function labels()
{
return $this->hasMany( 'App\Label' );
}
}
app/Policies/ItemPolicy.php
+5
View File
@@ -31,4 +31,9 @@ class ItemPolicy
return true; return true;
} }
public function changeStatus(User $User)
{
if($User->hasRole('Admin|Supervisor'))
return true;
}
} }
database/migrations/2019_07_16_095633_create_packages_table.php → database/oldTables/2019_07_16_095633_create_packages_table.php
View File
database/migrations/2019_07_16_100154_create_items_table.php → database/oldTables/2019_07_16_100154_create_items_table.php
View File
database/migrations/2019_07_16_100249_create_item_package_table.php → database/oldTables/2019_07_16_100249_create_item_package_table.php
View File
database/migrations/2019_08_19_105247_create_cycles_table.php → database/oldTables/2019_08_19_105247_create_cycles_table.php
View File
database/migrations/2019_09_07_121652_create_table_packes.php → database/oldTables/2019_09_07_121652_create_table_packes.php
View File
database/migrations/2019_09_07_121817_create_table_pack_package.php → database/oldTables/2019_09_07_121817_create_table_pack_package.php
View File
database/migrations/2019_09_07_121922_create_table_cycle_pack.php → database/oldTables/2019_09_07_121922_create_table_cycle_pack.php
View File
package-lock.json
Generated
-15609
View File
File diff suppressed because it is too large Load Diff