mirror of
https://git.meshkee.com/cssd/cssd-back.git
synced 2026-10-11 16:21:07 +03:30
fix promlems
This commit is contained in:
mahdi purHosseini
@@ -1,56 +1,55 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use \Milon\Barcode\Facades\DNS1DFacade;
|
||||
use \Milon\Barcode\Facades\DNS2DFacade;
|
||||
use App\TestResult;
|
||||
use App\Package;
|
||||
use \Milon\Barcode\Facades\DNS1DFacade;
|
||||
use \Milon\Barcode\Facades\DNS2DFacade;
|
||||
use App\TestResult;
|
||||
use App\Package;
|
||||
|
||||
class BarCodeController extends Controller
|
||||
{
|
||||
public function generateBarcode($Number, $Type = null)
|
||||
class BarCodeController extends Controller
|
||||
{
|
||||
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" );
|
||||
$QRCode = DNS2DFacade::getBarcodePNG( $URL , "QRCODE" );
|
||||
$ShowLink = 'Show/' . $Type . '/' . $Number;
|
||||
if ( $Type == 'TestType' ) {
|
||||
$QRCode = DNS2DFacade::getBarcodePNG( $Number , "QRCODE" );
|
||||
}
|
||||
|
||||
$Barcode = DNS1DFacade::getBarcodePNG($Number, "C128");
|
||||
$QRCode = DNS2DFacade::getBarcodePNG($URL, "QRCODE");
|
||||
$ShowLink = 'Show/'.$Type.'/'.$Number;
|
||||
if ($Type == 'TestType') {
|
||||
$QRCode = DNS2DFacade::getBarcodePNG($Number, "QRCODE");
|
||||
return \MessageResponse::data( [ 'Barcode' => 'data:image/png;base64,' . $Barcode , 'QRCode' => 'data:image/png;base64,' . $QRCode , 'ShowLink' => $ShowLink ] );
|
||||
}
|
||||
}
|
||||
|
||||
public function generateQRcode( TestResult $TestResult )
|
||||
{
|
||||
if ( $TestResult ) {
|
||||
$URL = 'https://www.cssd-doc.com/ShowTestResult/' . $TestResult->id;
|
||||
$QRCode = DNS2DFacade::getBarcodePNG( $URL , "QRCODE" );
|
||||
return \MessageResponse::data( [ 'QRCode' => 'data:image/png;base64,' . $QRCode ] );
|
||||
}
|
||||
|
||||
return \MessageResponse::data(['Barcode' => 'data:image/png;base64,' .$Barcode, 'QRCode' => 'data:image/png;base64,' .$QRCode, 'ShowLink' => $ShowLink]);
|
||||
}
|
||||
}
|
||||
public function generateQRcode(TestResult $TestResult)
|
||||
{
|
||||
if($TestResult)
|
||||
{
|
||||
$URL = 'https://www.cssd-doc.com/ShowTestResult/'.$TestResult->id;
|
||||
$QRCode = DNS2DFacade::getBarcodePNG($URL, "QRCODE");
|
||||
return \MessageResponse::data(['QRCode' => 'data:image/png;base64,' .$QRCode]);
|
||||
}
|
||||
|
||||
}
|
||||
public function generatePackageBarcode($Number)
|
||||
{
|
||||
if($Number != "undefined")
|
||||
public function generatePackageBarcode( $Number )
|
||||
{
|
||||
// $Barcode = DNS1DFacade::getBarcodePNGUri($Number, "C128");
|
||||
// $QRCode = DNS2DFacade::getBarcodePNGUri($Number, "QRCODE");
|
||||
$Barcode = DNS1DFacade::getBarcodePNG($Number, "C128");
|
||||
$QRCode = DNS2DFacade::getBarcodePNG($Number, "QRCODE");
|
||||
$Package = Package::where('unique_id', $Number)->first();
|
||||
return \MessageResponse::data(['Barcode' => $Barcode, 'QRCode' => $QRCode, 'ShowLink' => 'Show/Package/'.$Package->id]);
|
||||
if ( $Number != "undefined" ) {
|
||||
// $Barcode = DNS1DFacade::getBarcodePNGUri($Number, "C128");
|
||||
// $QRCode = DNS2DFacade::getBarcodePNGUri($Number, "QRCODE");
|
||||
$Barcode = DNS1DFacade::getBarcodePNG( $Number , "C128" );
|
||||
$QRCode = DNS2DFacade::getBarcodePNG( $Number , "QRCODE" );
|
||||
$Package = Package::where( 'unique_id' , $Number )->first();
|
||||
return \MessageResponse::data( [ 'Barcode' => $Barcode , 'QRCode' => $QRCode , 'ShowLink' => 'Show/Package/' . $Package->id ] );
|
||||
}
|
||||
}
|
||||
|
||||
public function generatePackageQRCode( Package $Package )
|
||||
{
|
||||
$URL = 'https://www.cssd-doc.com/Show/Package/' . $Package->id;
|
||||
$QRCode = DNS2DFacade::getBarcodePNG( $URL , "QRCODE" );
|
||||
return \MessageResponse::data( [ 'QRCode' => 'data:image/png;base64,' . $QRCode ] );
|
||||
}
|
||||
}
|
||||
public function generatePackageQRCode(Package $Package)
|
||||
{
|
||||
$URL = 'https://www.cssd-doc.com/Show/Package/'.$Package->id;
|
||||
$QRCode = DNS2DFacade::getBarcodePNG($URL, "QRCODE");
|
||||
return \MessageResponse::data(['QRCode' => 'data:image/png;base64,' .$QRCode]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,140 +1,194 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Requests\StoreItemRequest;
|
||||
use App\Item;
|
||||
use App\User;
|
||||
use App\Media;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Requests\StoreItemRequest;
|
||||
use App\Item;
|
||||
use App\User;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
|
||||
class ItemController extends Controller
|
||||
{
|
||||
public function index(Request $request)
|
||||
class ItemController extends Controller
|
||||
{
|
||||
$user = auth('api')->user();
|
||||
|
||||
if ($user->hasRole('User')) {
|
||||
return \MessageResponse::error('You dont have access to this section!');
|
||||
}
|
||||
|
||||
$Items = Item::when($user->cant('showAll', Item::class), function($query) use ($user) {
|
||||
if ($user->hasRole('Supervisor')) {
|
||||
$query->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('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);
|
||||
})
|
||||
->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');
|
||||
}])
|
||||
->paginate(10);
|
||||
return \MessageResponse::data($Items);
|
||||
}
|
||||
|
||||
public function create()
|
||||
{
|
||||
|
||||
}
|
||||
public function show(Item $Item)
|
||||
{
|
||||
$Item->load(['user' => function($query){
|
||||
$query->select('id', 'name', 'medical_center_id');
|
||||
},
|
||||
'user.medical_center' => function($query){
|
||||
$query->select('id', 'name');
|
||||
}]);
|
||||
return \MessageResponse::data($Item);
|
||||
}
|
||||
public function store(StoreItemRequest $request)
|
||||
{
|
||||
$ItemData = [
|
||||
'name' => $request->name,
|
||||
'size' => $request->size,
|
||||
'unique_id' => $request->unique_id,
|
||||
'specific' => $request->specific,
|
||||
'note' => $request->note,
|
||||
'user_id' => auth('api')->user()->id,
|
||||
];
|
||||
$ItemObj = Item::create($ItemData);
|
||||
|
||||
return \MessageResponse::success(trans('messages.success'));
|
||||
}
|
||||
public function edit(Item $Item)
|
||||
{
|
||||
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))
|
||||
public function index( Request $request )
|
||||
{
|
||||
$Item->packages()->detach();
|
||||
}
|
||||
$Item->delete();
|
||||
return \MessageResponse::success(trans('messages.success'));
|
||||
}
|
||||
$user = auth( 'api' )->user();
|
||||
|
||||
public function getItems(){
|
||||
|
||||
$user = auth('api')->user();
|
||||
|
||||
if ($user->hasRole('User')) {
|
||||
return \MessageResponse::data([]);
|
||||
}
|
||||
|
||||
$Items = Item::when($user->cant('showAll', Item::class), function($query) use ($user) {
|
||||
if ($user->hasRole('Supervisor')) {
|
||||
$query->whereHas('user', function($query) use ($user) {
|
||||
$query->where('medical_center_id', $user->medical_center_id);
|
||||
});
|
||||
if ( $user->hasRole( 'User' ) ) {
|
||||
return \MessageResponse::error( 'You dont have access to this section!' );
|
||||
}
|
||||
})
|
||||
->with(['user' => function($query){
|
||||
$query->select('id', 'name', 'medical_center_id');
|
||||
},
|
||||
'user.medical_center' => function($query){
|
||||
$query->select('id', 'name');
|
||||
}])
|
||||
->get();
|
||||
|
||||
return \MessageResponse::data($Items);
|
||||
}
|
||||
$Items = Item::when( $user->cant( 'showAll' , Item::class ) , function ( $query ) use ( $user ) {
|
||||
if ( $user->hasRole( 'Supervisor' ) ) {
|
||||
$query->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 );
|
||||
} )
|
||||
->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' );
|
||||
} ] )
|
||||
->paginate( 10 );
|
||||
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');
|
||||
}]);
|
||||
return \MessageResponse::data($Item);
|
||||
public function create()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public function show( Item $Item )
|
||||
{
|
||||
$Item->load( [ 'user' => function ( $query ) {
|
||||
$query->select( 'id' , 'name' , 'medical_center_id' );
|
||||
} ,
|
||||
'user.medical_center' => function ( $query ) {
|
||||
$query->select( 'id' , 'name' );
|
||||
} ] );
|
||||
|
||||
$FilesPath = [];
|
||||
if ( count( $Item->files ) ) {
|
||||
foreach ( $Item->files as $Key => $File ) {
|
||||
$FilesPath[] = $File->path;
|
||||
}
|
||||
$Item[ 'filesPath' ] = $FilesPath;
|
||||
}
|
||||
|
||||
return \MessageResponse::data( $Item );
|
||||
}
|
||||
|
||||
public function store( StoreItemRequest $request )
|
||||
{
|
||||
$ItemData = [
|
||||
'name' => $request->name ,
|
||||
'size' => $request->size ,
|
||||
'unique_id' => $request->unique_id ,
|
||||
'specific' => $request->specific ,
|
||||
'note' => $request->note ,
|
||||
'udi' => $request->udi ,
|
||||
'user_id' => auth( 'api' )->user()->id ,
|
||||
];
|
||||
$ItemObj = Item::create( $ItemData );
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////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
|
||||
|
||||
return \MessageResponse::success( trans( 'messages.success' ) );
|
||||
}
|
||||
|
||||
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->delete();
|
||||
return \MessageResponse::success( trans( 'messages.success' ) );
|
||||
}
|
||||
|
||||
public function getItems()
|
||||
{
|
||||
|
||||
$user = auth( 'api' )->user();
|
||||
|
||||
if ( $user->hasRole( 'User' ) ) {
|
||||
return \MessageResponse::data( [] );
|
||||
}
|
||||
|
||||
$Items = Item::when( $user->cant( 'showAll' , Item::class ) , function ( $query ) use ( $user ) {
|
||||
if ( $user->hasRole( 'Supervisor' ) ) {
|
||||
$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' );
|
||||
} ] )
|
||||
->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' );
|
||||
} ] );
|
||||
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 );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,192 +1,199 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Requests\StorePackageRequest;
|
||||
use App\Package;
|
||||
use App\User;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Requests\StorePackageRequest;
|
||||
use App\Package;
|
||||
use App\User;
|
||||
|
||||
class PackageController extends Controller
|
||||
{
|
||||
public function index(Request $request)
|
||||
class PackageController extends Controller
|
||||
{
|
||||
$user = auth('api')->user();
|
||||
|
||||
if ($user->hasRole('User')) {
|
||||
return \MessageResponse::error('You dont have access to this section!');
|
||||
}
|
||||
|
||||
$Packages = Package::
|
||||
when($user->cant('showAll', Package::class), function($query) use ($user) {
|
||||
if ($user->hasRole('Supervisor')) {
|
||||
$query->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')->paginate(10);
|
||||
|
||||
return \MessageResponse::data($Packages);
|
||||
}
|
||||
|
||||
public function create()
|
||||
{
|
||||
|
||||
}
|
||||
public function show(Package $Package)
|
||||
{
|
||||
$Package->load(['user' => function($query){
|
||||
$query->select('id', 'name', 'medical_center_id');
|
||||
},
|
||||
'user.medical_center' => function($query){
|
||||
$query->select('id', 'name');
|
||||
},
|
||||
'items']);
|
||||
return \MessageResponse::data($Package);
|
||||
}
|
||||
public function store(StorePackageRequest $request)
|
||||
{
|
||||
// $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
|
||||
$PackageData = [
|
||||
'name' => $request->name,
|
||||
'unique_id' => $request->unique_id,
|
||||
'note' => $request->note,
|
||||
'user_id' => auth('api')->user()->id,
|
||||
'verified' => 'NotVerified',
|
||||
];
|
||||
$PackageObj = Package::create($PackageData);
|
||||
$Items = [];
|
||||
$count = 1;
|
||||
foreach ($request->items as $key => $item) {
|
||||
if (array_key_exists($item['id'], $Items)) {
|
||||
$preCount = $Items[$item['id']];
|
||||
$Items[$item['id']] = $preCount + 1;
|
||||
}
|
||||
else {
|
||||
$Items[$item['id']] = $count;
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($Items as $Item => $Count) {
|
||||
$PackageObj->items()->attach(array($Item), ['count' => $Count]);
|
||||
}
|
||||
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);
|
||||
}
|
||||
public function update(StorePackageRequest $request, Package $Package)
|
||||
{
|
||||
$Package->update($request->except(['items']));
|
||||
$Items = [];
|
||||
$count = 1;
|
||||
foreach ($request->items as $key => $item) {
|
||||
if (array_key_exists($item['id'], $Items)) {
|
||||
$preCount = $Items[$item['id']];
|
||||
$Items[$item['id']] = $preCount + 1;
|
||||
}
|
||||
else {
|
||||
$Items[$item['id']] = $count;
|
||||
}
|
||||
}
|
||||
|
||||
$Package->items()->detach();
|
||||
|
||||
foreach ($Items as $Item => $Count) {
|
||||
$Package->items()->attach(array($Item), ['count' => $Count]);
|
||||
}
|
||||
|
||||
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'));
|
||||
}
|
||||
if(count($Package->items))
|
||||
public function index( Request $request )
|
||||
{
|
||||
$user = auth( 'api' )->user();
|
||||
|
||||
if ( $user->hasRole( 'User' ) ) {
|
||||
return \MessageResponse::error( 'You dont have access to this section!' );
|
||||
}
|
||||
|
||||
$Packages = Package::
|
||||
when( $user->cant( 'showAll' , Package::class ) , function ( $query ) use ( $user ) {
|
||||
if ( $user->hasRole( 'Supervisor' ) ) {
|
||||
$query->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( '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' )->paginate( 10 );
|
||||
|
||||
return \MessageResponse::data( $Packages );
|
||||
}
|
||||
|
||||
public function create()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public function show( Package $Package )
|
||||
{
|
||||
$Package->load( [ 'user' => function ( $query ) {
|
||||
$query->select( 'id' , 'name' , 'medical_center_id' );
|
||||
} ,
|
||||
'user.medical_center' => function ( $query ) {
|
||||
$query->select( 'id' , 'name' );
|
||||
} ,
|
||||
'items' ] );
|
||||
return \MessageResponse::data( $Package );
|
||||
}
|
||||
|
||||
public function store( StorePackageRequest $request )
|
||||
{
|
||||
// $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
|
||||
$PackageData = [
|
||||
'name' => $request->name ,
|
||||
'unique_id' => $request->unique_id ,
|
||||
'note' => $request->note ,
|
||||
'udi' => $request->udi ,
|
||||
'user_id' => auth( 'api' )->user()->id ,
|
||||
'verified' => 'NotVerified' ,
|
||||
];
|
||||
$PackageObj = Package::create( $PackageData );
|
||||
$Items = [];
|
||||
$count = 1;
|
||||
foreach ( $request->items as $key => $item ) {
|
||||
if ( array_key_exists( $item[ 'id' ] , $Items ) ) {
|
||||
$preCount = $Items[ $item[ 'id' ] ];
|
||||
$Items[ $item[ 'id' ] ] = $preCount + 1;
|
||||
} else {
|
||||
$Items[ $item[ 'id' ] ] = $count;
|
||||
}
|
||||
}
|
||||
|
||||
foreach ( $Items as $Item => $Count ) {
|
||||
$PackageObj->items()->attach( array( $Item ) , [ 'count' => $Count ] );
|
||||
}
|
||||
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 );
|
||||
}
|
||||
|
||||
public function update( StorePackageRequest $request , Package $Package )
|
||||
{
|
||||
$Package->update( $request->except( [ 'items' ] ) );
|
||||
$Items = [];
|
||||
$count = 1;
|
||||
foreach ( $request->items as $key => $item ) {
|
||||
if ( array_key_exists( $item[ 'id' ] , $Items ) ) {
|
||||
$preCount = $Items[ $item[ 'id' ] ];
|
||||
$Items[ $item[ 'id' ] ] = $preCount + 1;
|
||||
} else {
|
||||
$Items[ $item[ 'id' ] ] = $count;
|
||||
}
|
||||
}
|
||||
|
||||
$Package->items()->detach();
|
||||
}
|
||||
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|User')) {
|
||||
$query->whereHas('user', function($query) use ($user) {
|
||||
$query->where('medical_center_id', $user->medical_center_id);
|
||||
});
|
||||
foreach ( $Items as $Item => $Count ) {
|
||||
$Package->items()->attach( array( $Item ) , [ 'count' => $Count ] );
|
||||
}
|
||||
})
|
||||
->with(['user' => function($query){
|
||||
$query->select('id', 'name', 'medical_center_id');
|
||||
},
|
||||
'user.medical_center' => function($query){
|
||||
$query->select('id', 'name');
|
||||
}])->get();
|
||||
|
||||
return \MessageResponse::data($Packages);
|
||||
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' ) );
|
||||
}
|
||||
if ( count( $Package->items ) ) {
|
||||
$Package->items()->detach();
|
||||
}
|
||||
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|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' );
|
||||
} ] )->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' ] );
|
||||
return \MessageResponse::data( $Package );
|
||||
}
|
||||
}
|
||||
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']);
|
||||
return \MessageResponse::data($Package);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,516 +1,484 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use App\Http\Requests\StoreTestResultRequest;
|
||||
use App\TestResult;
|
||||
use App\InputValue;
|
||||
use App\Input;
|
||||
use App\MedicalCenter;
|
||||
use App\TestType;
|
||||
use App\Gallery;
|
||||
use App\Uploadable;
|
||||
use App\Media;
|
||||
use Intervention\Image\ImageManagerStatic as Image;
|
||||
use Intervention\Image\ImageManager;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
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;
|
||||
|
||||
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)
|
||||
class TestResultController extends Controller
|
||||
{
|
||||
$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;
|
||||
}
|
||||
public function index( Request $request )
|
||||
{
|
||||
$user = auth( 'api' )->user();
|
||||
|
||||
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);
|
||||
})
|
||||
->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, function($query) use($request){
|
||||
$device_label = $request->device_label ? $request->device_label : '';
|
||||
if ($device_label && $device_label != 'undefined'){
|
||||
$query->whereHas('input_values', function($query) use($request, $device_label){
|
||||
$query->whereHas('input', function($query) use($request, $device_label){
|
||||
$query->where('name', $device_label);
|
||||
})->where('value', $request->device_id);
|
||||
});
|
||||
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;
|
||||
}
|
||||
else{
|
||||
$query->where(function($query) use($request){
|
||||
$query->where('id', $request->device_id);
|
||||
});
|
||||
|
||||
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;
|
||||
}
|
||||
})
|
||||
->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' => 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);
|
||||
}
|
||||
$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( '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 ) {
|
||||
$query->whereHas( 'input_values' , function ( $query ) use ( $request ) {
|
||||
$query->whereHas( 'input' , function ( $query ) use ( $request ) {
|
||||
$query->where( 'name' , $request->device_label );
|
||||
} );
|
||||
} );
|
||||
} )
|
||||
->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' => 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 );
|
||||
|
||||
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
|
||||
}
|
||||
return \MessageResponse::data( $TestResult );
|
||||
}
|
||||
|
||||
$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;
|
||||
}
|
||||
public function create()
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
$FilesPath = [];
|
||||
public function store( StoreTestResultRequest $request )
|
||||
{
|
||||
try {
|
||||
$return_value = \DB::transaction( function () use ( $request ) {
|
||||
|
||||
if (count($TestResult->files)) {
|
||||
foreach ($TestResult->files as $Key => $file) {
|
||||
$FilesPath[] = $file;
|
||||
}
|
||||
$TestResult['filesPath'] = $FilesPath;
|
||||
}
|
||||
else {
|
||||
$TestResult['filesPath'] = [];
|
||||
}
|
||||
$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();
|
||||
|
||||
return \MessageResponse::data($TestResult);
|
||||
}
|
||||
$Inputs = Input::with( 'options' , 'children' , 'children.options' )->whereNull( 'parent_id' )->where( 'test_type_id' , $request->test_type_id )->get();
|
||||
|
||||
public static function storage_path($path)
|
||||
{
|
||||
if (starts_with($path, 'media/')) {
|
||||
$path = substr($path, 6);
|
||||
}
|
||||
return $path;
|
||||
}
|
||||
///////////////////////////////////////////////////////////////////////////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' ) {
|
||||
|
||||
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();
|
||||
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 ] );
|
||||
}
|
||||
}
|
||||
|
||||
$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]);
|
||||
} else {
|
||||
$InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $Input->id , 'value' => $Value ] );
|
||||
}
|
||||
if ($InputChild['type'] == 'Radiobutton' && $Option->id == $Value) {
|
||||
$InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]);
|
||||
} 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 ] );
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
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();
|
||||
}
|
||||
}
|
||||
///////////////////////////////////////////////////////////////////////////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 );
|
||||
}
|
||||
}
|
||||
$TestResult->delete();
|
||||
return \MessageResponse::success(null, trans('messages.success'));
|
||||
}
|
||||
return \MessageResponse::success( null , trans( 'messages.create' ) );
|
||||
|
||||
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)
|
||||
public function show( $id )
|
||||
{
|
||||
$query->where('id', $user->medical_center_id);
|
||||
})->select('name', 'id')->get()->toArray();
|
||||
$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;
|
||||
|
||||
$TestType = TestType::select('name', 'id')->get()->toArray();
|
||||
return \MessageResponse::data([
|
||||
'MedicalCenters' => $MedicalCenter,
|
||||
'TestTypes' => $TestType
|
||||
]);
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
$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;
|
||||
}
|
||||
|
||||
$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]]);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------Show
|
||||
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;
|
||||
$values[ $input->name ] = $options;
|
||||
$TestResult[ 'options' ] = $values;
|
||||
} else {
|
||||
$inputs[ $input->name ] = $value->value;
|
||||
$TestResult[ 'inputs' ] = $inputs;
|
||||
}
|
||||
//-----------------------------------------------------------------------Anothertype
|
||||
}
|
||||
}
|
||||
$TestResult['filesPath'] = $FilesPath;
|
||||
|
||||
$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 );
|
||||
}
|
||||
// dd($TestResult->test_type()->device_label);
|
||||
$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( '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;
|
||||
}
|
||||
// dd($TestResult->test_type()->device_label);
|
||||
$TestResult[ 'device_label' ] = $TestResult->test_type->device_label;
|
||||
return \MessageResponse::data( $TestResult );
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -115,7 +115,6 @@ class TestTypeController extends Controller
|
||||
|
||||
public function store(StoreTestTypeRequest $request)
|
||||
{
|
||||
// dd($request->all());
|
||||
try {
|
||||
$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']???????
|
||||
// dd($InputObject);
|
||||
$DeletedChildIDs = $InputObject->children->pluck('id')->toArray();
|
||||
//**********************************
|
||||
|
||||
@@ -388,6 +386,7 @@ class TestTypeController extends Controller
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
public function getInputs(Request $request)
|
||||
{
|
||||
if (auth('api')->user()->can('getInputs')) {
|
||||
@@ -437,11 +436,5 @@ class TestTypeController extends Controller
|
||||
$TestType->delete();
|
||||
return \MessageResponse::success(trans('messages.success'));
|
||||
}
|
||||
// public function allArchivedTestTypes()
|
||||
// {
|
||||
// $testTypes = TestType::where('deleted_at','<>', null)->get();
|
||||
// dd($testTypes);
|
||||
// return \MessageResponse::data($testTypes);
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
@@ -1,19 +1,13 @@
|
||||
<?php
|
||||
|
||||
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
use App\Http\Requests\StoreUserRequest;
|
||||
use App\MedicalCenter;
|
||||
use App\User;
|
||||
use App\Message;
|
||||
|
||||
|
||||
class UserController extends Controller
|
||||
{
|
||||
|
||||
@@ -159,6 +153,7 @@ class UserController extends Controller
|
||||
$user->load('medical_center');
|
||||
return \MessageResponse::data([ 'user' => $user, 'roles' => auth('api')->user()->getRoleNames() ]);
|
||||
}
|
||||
|
||||
public function getMessages()
|
||||
{
|
||||
$User = auth('api')->user();
|
||||
@@ -169,6 +164,7 @@ class UserController extends Controller
|
||||
|
||||
return \MessageResponse::data(['ReceivedMessages' => $ReceivedMessages, 'SentMessages' => $SentMessages]);
|
||||
}
|
||||
|
||||
public function searchUser(Request $request)
|
||||
{
|
||||
// if (auth('api')->user()->cant('searchUser', User::class)) {
|
||||
@@ -196,5 +192,4 @@ class UserController extends Controller
|
||||
return \MessageResponse::data($users);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -30,6 +30,7 @@ class StoreItemRequest extends FormRequest
|
||||
'size' => 'required',
|
||||
'specific' => 'required',
|
||||
'note' => 'nullable',
|
||||
'udi' => 'required|max:100|unique:items',
|
||||
];
|
||||
break;
|
||||
}
|
||||
@@ -42,9 +43,9 @@ class StoreItemRequest extends FormRequest
|
||||
'size' => 'required',
|
||||
'specific' => 'required',
|
||||
'note' => 'nullable',
|
||||
'udi' => 'required|max:100|unique:items,udi,'.$Item->id,
|
||||
];
|
||||
break;
|
||||
|
||||
}
|
||||
default:
|
||||
break;
|
||||
|
||||
@@ -29,6 +29,7 @@ class StorePackageRequest extends FormRequest
|
||||
'unique_id' => 'nullable|max:250|unique:packages',
|
||||
'note' => 'nullable',
|
||||
'items' => 'required',
|
||||
'udi' => 'required|max:100|unique:packages',
|
||||
];
|
||||
break;
|
||||
}
|
||||
@@ -40,6 +41,7 @@ class StorePackageRequest extends FormRequest
|
||||
'unique_id' => 'nullable|max:250|unique:packages,unique_id,'.$Package->id,
|
||||
'note' => 'nullable',
|
||||
'items' => 'required',
|
||||
'udi' => 'required|max:100|unique:packages',
|
||||
];
|
||||
break;
|
||||
|
||||
|
||||
+19
-12
@@ -1,18 +1,25 @@
|
||||
<?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'];
|
||||
public function packages()
|
||||
class Item extends Model
|
||||
{
|
||||
return $this->belongsToMany('App\Package', 'item_package')->withPivot('count');
|
||||
public $fillable = [ 'name' , 'size' , 'unique_id' , 'specific' , 'note' , 'user_id' , 'udi' , 'status' ];
|
||||
|
||||
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 user()
|
||||
{
|
||||
return $this->belongsTo('App\User');
|
||||
}
|
||||
}
|
||||
|
||||
+20
-21
@@ -1,27 +1,26 @@
|
||||
<?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'];
|
||||
public function user()
|
||||
class Package extends Model
|
||||
{
|
||||
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 $fillable = [ 'name' , 'unique_id' , 'user_id' , 'note' , 'verified' , 'udi' ];
|
||||
|
||||
}
|
||||
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' );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -31,4 +31,9 @@ class ItemPolicy
|
||||
return true;
|
||||
}
|
||||
|
||||
public function changeStatus(User $User)
|
||||
{
|
||||
if($User->hasRole('Admin|Supervisor'))
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
Generated
-15609
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user