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

feat: install phpstan and resolving reported errors in PHPStan

Browse Source
This commit is contained in:
amir-ys
2024-11-07 01:41:19 +03:30
parent b7efa6b24a
commit 865d565a91
27 changed files with 1023 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/Auth/RegisterController.php
+5 -5
View File
@@ -3,22 +3,22 @@
namespace App\Http\Controllers\Api\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use App\User;
use Illuminate\Http\Request;
use Packages\Messaging\src\Facades\MessageResponse;
class RegisterController extends Controller
{
/**
* Register the given user.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\JsonResponse
*/
public function register(Request $request)
{
if (auth('api')->user()->cant('store', User::class)) {
return \MessageResponse::error(trans('messages.failed'));
return MessageResponse::error(trans('messages.failed'));
}
$this->validate($request, $this->rules(), $this->validationErrorMessages());
@@ -28,7 +28,7 @@ class RegisterController extends Controller
$user->cell_number = $request->cell_number;
$user->gender = $request->gender;
$user->medical_center_id = $request->medical_center_id;
$user->password = bcrypt( $request->password );
$user->password = bcrypt($request->password);
$user->save();
$user->assignRole('User');
return response()->json($user, 200);
app/Http/Controllers/Api/Auth/ResetPasswordController.php
+10 -7
View File
@@ -3,7 +3,10 @@
namespace App\Http\Controllers\Api\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
use Packages\Messaging\src\Facades\MessageResponse;
class ResetPasswordController extends Controller
{
@@ -16,8 +19,8 @@ class ResetPasswordController extends Controller
/**
* Reset the given user's password.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
* @param Request $request
* @return JsonResponse
*/
public function reset(Request $request)
{
@@ -25,20 +28,20 @@ class ResetPasswordController extends Controller
if (auth('api')->check()) {
$user = auth('api')->user();
$user->password = \Hash::make($request->password);
$user->password = Hash::make($request->password);
$user->save();
return \MessageResponse::success('Success Change Password');
return MessageResponse::success('Success Change Password');
}
return \MessageResponse::success('You Are Not Login');
return MessageResponse::success('You Are Not Login');
}
/**
* Validate the email for the given request.
*
* @param \Illuminate\Http\Request $request
* @param Request $request
* @return void
*/
protected function validatePassword(Request $request)
protected function validatePassword(Request $request): void
{
$request->validate(['password' => 'required|confirmed|min:8',]);
}
app/Http/Controllers/BarCodeController.php
+47 -46
View File
@@ -1,55 +1,56 @@
<?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 App\Package;
use App\TestResult;
use Milon\Barcode\Facades\DNS1DFacade;
use Milon\Barcode\Facades\DNS2DFacade;
use Packages\Messaging\src\Facades\MessageResponse;
class BarCodeController extends Controller
class BarCodeController extends Controller
{
public function generateBarcode($Number, $Type = null)
{
public function generateBarcode( $Number , $Type = null )
{
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" );
}
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 ] );
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");
}
}
public function generatePackageBarcode( $Number )
{
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 ] );
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") {
// $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]);
}
}
app/Http/Controllers/Media/DestroyMedia.php
+4 -3
View File
@@ -3,14 +3,15 @@
namespace App\Http\Controllers\Media;
use App\Http\Controllers\Controller;
use Illuminate\Http\JsonResponse;
use Packages\Messaging\src\Facades\MessageResponse;
use Spatie\MediaLibrary\Models\Media;
use Spatie\MediaLibrary\MediaCollections\Models\Media;
class DestroyMedia extends Controller
{
public function __invoke(Media $media)
public function __invoke(Media $media): JsonResponse
{
$media->delete();
return MessageResponse::success( null , trans( 'messages.success' ) );
return MessageResponse::success(null, trans('messages.success'));
}
}
app/Http/Controllers/MessageController.php
+99 -95
View File
@@ -2,46 +2,47 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Http\Requests\StoreMessageRequest;
use App\Message;
use App\User;
use Illuminate\Http\Request;
use Packages\Messaging\src\Facades\MessageResponse;
class MessageController extends Controller
{
public function index(Request $request)
{
$User = auth('api')->user();
$role = null;
$medical_center_id = null;
public function index(Request $request)
{
$User = auth('api')->user();
$role = null;
$medical_center_id = null;
$User = auth('api')->user();
if ($User->hasRole('Supervisor') || $User->hasRole('User')) {
$medical_center_id = $User->medical_center_id;
$role = 'Admin';
}
$remove = $User->id;
$Users = User::whereHas('messagesSent', function($q) use($User){
$User = auth('api')->user();
if ($User->hasRole('Supervisor') || $User->hasRole('User')) {
$medical_center_id = $User->medical_center_id;
$role = 'Admin';
}
$remove = $User->id;
$Users = User::whereHas('messagesSent', function ($q) use ($User) {
$q->where('recipient_user_id', $User->id);
})
->orWhereHas('messagesReceived', function($q) use($User){
$q->where('sender_user_id', $User->id);
})
->when($medical_center_id, function($query) use ($medical_center_id){
$query->where('medical_center_id', $medical_center_id);
})
->when($role, function($query) use($role){
$query->role($role);
})
->paginate(10);
->orWhereHas('messagesReceived', function ($q) use ($User) {
$q->where('sender_user_id', $User->id);
})
->when($medical_center_id, function ($query) use ($medical_center_id) {
$query->where('medical_center_id', $medical_center_id);
})
->when($role, function ($query) use ($role) {
$query->role($role);
})
->paginate(10);
foreach ($Users as $user) {
$UnReadReceivedMessages = Message::where('sender_user_id', $user->id)->where('recipient_user_id', $User->id)->where('status','UnRead')->get()->count();
$UnReadReceivedMessages = Message::where('sender_user_id', $user->id)->where('recipient_user_id', $User->id)->where('status', 'UnRead')->get()->count();
$user->unread_messages_count = $UnReadReceivedMessages;
$MessagesCount = Message::where(function ($query) use ($user,$User){
$MessagesCount = Message::where(function ($query) use ($user, $User) {
$query->where('sender_user_id', $user->id)->where('recipient_user_id', $User->id);
})->orWhere(function ($query) use ($user,$User){
})->orWhere(function ($query) use ($user, $User) {
$query->where('sender_user_id', $User->id)->where('recipient_user_id', $user->id);
})->get()->count();
@@ -53,78 +54,81 @@ class MessageController extends Controller
// return $value['id'] != $remove;
// });
return \MessageResponse::data($Users);
}
public function create()
{
return MessageResponse::data($Users);
}
}
public function show($UserID)
{
// if (!auth('api')->user()->can('show', $Message)) {
// return \MessageResponse::error(trans('messages.access_denied'));
// }
public function create()
{
$User = User::findOrFail($UserID);
// $SendMessages = Message::where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $UserID)->get();
$ReceivedMessages = Message::where('sender_user_id', $UserID)->where('recipient_user_id', auth('api')->user()->id)->get();
}
$Messages = Message::where(function ($query) use ($UserID)
{
$query->where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $UserID);
})->orWhere(function ($query) use ($UserID)
{
$query->where('sender_user_id', $UserID)->where('recipient_user_id', auth('api')->user()->id);
})->get();
public function show($UserID)
{
// if (!auth('api')->user()->can('show', $Message)) {
// return MessageResponse::error(trans('messages.access_denied'));
// }
foreach ($ReceivedMessages as $ReceivedMessage) {
$ReceivedMessage->status = 'Read';
$ReceivedMessage->save();
}
$User = User::findOrFail($UserID);
// $SendMessages = Message::where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $UserID)->get();
$ReceivedMessages = Message::where('sender_user_id', $UserID)->where('recipient_user_id', auth('api')->user()->id)->get();
return \MessageResponse::data($Messages);
}
public function store(StoreMessageRequest $request)
{
$MessageData = [
// 'title' => $request->title,
'text' => $request->message,
'sender_user_id' => auth('api')->user()->id,
'recipient_user_id' => $request->user_id,
'status' => 'UnRead',
];
Message::create($MessageData);
return \MessageResponse::success(trans('messages.success'));
}
public function edit(Message $Message)
{
// return \MessageResponse::data($Message);
}
public function update(StoreMessageRequest $request, Message $Message)
{
// $Message->update($request->all());
// return \MessageResponse::success(trans('messages.success'));
}
public function destroy(Message $Message)
{
if (auth('api')->user()->cant('delete', $Message)) {
return \MessageResponse::error(trans('messages.access_denied'));
}
$Message->delete();
return \MessageResponse::success(trans('messages.success'));
}
public function destroyUserMessages(User $User)
{
// if (auth('api')->user()->cant('deleteUserMessage', Message::class)) {
// return \MessageResponse::error(trans('messages.access_denied'));
// }
Message::where(function ($query) use ($User)
{
$query->where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $User->id);
})->orWhere(function ($query) use ($User)
{
$query->where('sender_user_id', $User->id)->where('recipient_user_id', auth('api')->user()->id);
})->get()->each->delete();
return \MessageResponse::success(trans('messages.success'));
}
$Messages = Message::where(function ($query) use ($UserID) {
$query->where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $UserID);
})->orWhere(function ($query) use ($UserID) {
$query->where('sender_user_id', $UserID)->where('recipient_user_id', auth('api')->user()->id);
})->get();
foreach ($ReceivedMessages as $ReceivedMessage) {
$ReceivedMessage->status = 'Read';
$ReceivedMessage->save();
}
return MessageResponse::data($Messages);
}
public function store(StoreMessageRequest $request)
{
$MessageData = [
// 'title' => $request->title,
'text' => $request->message,
'sender_user_id' => auth('api')->user()->id,
'recipient_user_id' => $request->user_id,
'status' => 'UnRead',
];
Message::create($MessageData);
return MessageResponse::success(trans('messages.success'));
}
public function edit(Message $Message)
{
// return MessageResponse::data($Message);
}
public function update(StoreMessageRequest $request, Message $Message)
{
// $Message->update($request->all());
// return MessageResponse::success(trans('messages.success'));
}
public function destroy(Message $Message)
{
if (auth('api')->user()->cant('delete', $Message)) {
return MessageResponse::error(trans('messages.access_denied'));
}
$Message->delete();
return MessageResponse::success(trans('messages.success'));
}
public function destroyUserMessages(User $User)
{
// if (auth('api')->user()->cant('deleteUserMessage', Message::class)) {
// return MessageResponse::error(trans('messages.access_denied'));
// }
Message::where(function ($query) use ($User) {
$query->where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $User->id);
})->orWhere(function ($query) use ($User) {
$query->where('sender_user_id', $User->id)->where('recipient_user_id', auth('api')->user()->id);
})->get()->each->delete();
return MessageResponse::success(trans('messages.success'));
}
}
app/Http/Controllers/TestResultController.php
+229 -228
View File
@@ -12,141 +12,142 @@ use App\TestResult;
use App\TestType;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;
use Packages\Messaging\src\Facades\MessageResponse;
class TestResultController extends Controller
{
public function index( Request $request )
public function index(Request $request)
{
$user = auth( 'api' )->user();
$user = auth('api')->user();
if ( $user->hasRole( 'Supervisor|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' ) {
} elseif ($request->has('medicalCenter_id') && $request->medicalCenter_id != '' && $request->medicalCenter_id != 'undefined') {
$medical_center_id = $request->medicalCenter_id;
} else {
$medical_center_id = null;
}
if ( $user->hasRole( 'User' ) ) {
if ($user->hasRole('User')) {
$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;
} else {
$user_name = null;
}
$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 );
} );
$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 );
} );
$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' ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' , 'address' , 'phone_number' );
} ,
'test_type' => function ( $query ) {
$query->select( 'id' , 'name' );
} ] )
->orderByDesc( 'id' )->paginate( 10 );
})
->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',
'user.medical_center' => function ($query) {
$query->select('id', 'name', 'address', 'phone_number');
},
'test_type' => function ($query) {
$query->select('id', 'name');
}])
->orderByDesc('id')->paginate(10);
return TestResultResource::collection( $TestResult );
return TestResultResource::collection($TestResult);
}
public function store( StoreTestResultRequest $request )
public function store(StoreTestResultRequest $request)
{
try {
DB::transaction( function () use ( $request ) {
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' ,
'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 );
$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 = 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 ($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 ] );
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 ] );
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 ] );
$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 ];
foreach ($Input->children as $InputChild) {
$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
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 ] );
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 ] );
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 ] );
$InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $InputChild->id, 'value' => $Value]);
}
}
@@ -155,285 +156,285 @@ class TestResultController extends Controller
}
///////////////////////////////////////////////////////////////////////////Inputs
MediaHelper::moveMediaTo( $TestResultObj );
MediaHelper::moveMediaTo($TestResultObj);
} );
} catch ( \Exception $e ) {
return response()->json( $e->getMessage() , 441 );
});
} catch (\Exception $e) {
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 = [];
foreach ( $TestResult->input_values as $value ) {
foreach ($TestResult->input_values as $value) {
$input = $value->input;
if ( $input->parent_id != null && $input->parent[ 'type' ] == 'Form' ) {
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();
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 ) {
foreach ($input_options as $input_option) {
$options[] = $input_option->option->title;
$input_values[ $input->name ] = $options;
$input_values[$input->name] = $options;
}
$children[ $input->parent->name ] = $input_values;
$TestResult[ 'children' ] = $children;
$children[$input->parent->name] = $input_values;
$TestResult['children'] = $children;
} else {
$children[ $input->parent->name ][ $input->name ] = $value->value;
$TestResult[ 'children' ] = $children;
$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();
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 ) {
foreach ($input_options as $input_option) {
$options[] = $input_option->option->title;
}
$values[ $input->name ] = $options;
$TestResult[ 'options' ] = $values;
$values[$input->name] = $options;
$TestResult['options'] = $values;
} else {
$inputs[ $input->name ] = $value->value;
$TestResult[ 'inputs' ] = $inputs;
$inputs[$input->name] = $value->value;
$TestResult['inputs'] = $inputs;
}
//-----------------------------------------------------------------------Anothertype
}
}
$TestResult[ 'device_label' ] = $TestResult->test_type->device_label;
$TestResult['device_label'] = $TestResult->test_type->device_label;
return TestResultResource::make( $TestResult );
return TestResultResource::make($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;
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 ];
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;
$TestResult[$input->name . '_' . $input->id] = $input_options;
}
} else {
$TestResult[ $input->name . '_' . $input->id ] = $value->value;
$TestResult[$input->name . '_' . $input->id] = $value->value;
}
}
return TestResultResource::make( $TestResult );
return TestResultResource::make($TestResult);
}
public static function storage_path( $path )
public static function storage_path($path)
{
if ( starts_with( $path , 'media/' ) ) {
$path = substr( $path , 6 );
if (Str::startsWith($path, 'media/')) {
$path = substr($path, 6);
}
return $path;
}
public function update( StoreTestResultRequest $request , TestResult $TestResult )
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 ,
'cycle_number' => $request->cycle_number,
'date' => $request->date,
'test_type_id' => $request->test_type_id,
'result' => $request->result,
// 'verified' => 'NotVerified',
];
$TestResult->update( $TestResultData );
$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();
$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' ) {
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();
$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 ] );
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 ] );
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 ] );
$InputValueObj = InputValue::where('test_result_id', $TestResult->id)->where('input_id', $Input['id'])->update(['value' => $Value]);
}
} 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' ) {
$InputOptions = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $InputChild->id )->get()->each->delete();
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 ] );
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 ] );
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 ] );
$InputValueObj = InputValue::where('test_result_id', $TestResult->id)->where('input_id', $InputChild['id'])->update(['value' => $Value]);
}
}
}
}
/////////////////////////////////////////////////////////////////////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 ) ) {
return MessageResponse::error( trans( 'messages.access_denied' ) );
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->input_values)) {
InputValue::where('test_result_id', $TestResult->id)->get()->each->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 ) ) {
return MessageResponse::error( trans( 'You dont have permission or this test result belongs to another medical center' ) );
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 );
$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();
$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 ,
$TestType = TestType::select('name', 'id')->get()->toArray();
return MessageResponse::data([
'MedicalCenters' => $MedicalCenter,
'TestTypes' => $TestType
] );
]);
}
public function chart( Request $request )
public function chart(Request $request)
{
$user = auth( 'api' )->user();
if ( $user->hasRole( 'User' ) ) {
$user = auth('api')->user();
if ($user->hasRole('User')) {
$userId = $user->id;
} elseif ( $request->has( 'userId' ) && $request->userId ) {
} elseif ($request->has('userId') && $request->userId) {
$userId = $request->userId;
} else {
$userId = null;
}
if ( $user->hasRole( 'Admin' ) && $request->has( 'medicalCenterId' ) && $request->medicalCenterId ) {
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;
$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 ] ] );
return MessageResponse::data(['labels' => ['Number Of Accepted Test Results', 'Number Of Rejected Test Results'], 'data' => [$AcceptCount, $RejectCount]]);
}
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 = [];
foreach ( $TestResult->input_values as $value ) {
foreach ($TestResult->input_values as $value) {
$input = $value->input;
if ( $input->parent_id != null && $input->parent[ 'type' ] == 'Form' ) {
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();
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 ) {
foreach ($input_options as $input_option) {
$options[] = $input_option->option->title;
$input_values[ $input->name ] = $options;
$input_values[$input->name] = $options;
}
$children[ $input->parent->name ] = $input_values;
$TestResult[ 'children' ] = $children;
$children[$input->parent->name] = $input_values;
$TestResult['children'] = $children;
} else {
$children[ $input->parent->name ][ $input->name ] = $value->value;
$TestResult[ 'children' ] = $children;
$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();
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 ) {
foreach ($input_options as $input_option) {
$options[] = $input_option->option->title;
}
$values[ $input->name ] = $options;
$TestResult[ 'options' ] = $values;
$values[$input->name] = $options;
$TestResult['options'] = $values;
} else {
$inputs[ $input->name ] = $value->value;
$TestResult[ 'inputs' ] = $inputs;
$inputs[$input->name] = $value->value;
$TestResult['inputs'] = $inputs;
}
//-----------------------------------------------------------------------Anothertype
}
}
$TestResult[ 'device_label' ] = $TestResult->test_type->device_label;
return MessageResponse::data( $TestResult );
$TestResult['device_label'] = $TestResult->test_type->device_label;
return MessageResponse::data($TestResult);
}
}
app/Http/Controllers/TestTypeController.php
+101 -108
View File
@@ -2,67 +2,63 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\TestType;
use App\TestResult;
use App\Http\Requests\StoreTestTypeRequest;
use App\Input;
use App\Option;
use App\Http\Requests\StoreTestTypeRequest;
use \Milon\Barcode\DNS1D;
use \Milon\Barcode\DNS2D;
use App\TestResult;
use App\TestType;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Milon\Barcode\Facades\DNS1DFacade;
use Milon\Barcode\Facades\DNS2DFacade;
use Packages\Messaging\src\Facades\MessageResponse;
use App\InputValue;
use App\Gallery;
use App\Uploadable;
use Illuminate\Support\Facades\Storage;
class TestTypeController extends Controller
{
public function index(Request $request)
{
if (!auth('api')->user()->can('list', TestType::class)) {
return \MessageResponse::error(trans('messages.access_denied'));
return MessageResponse::error(trans('messages.access_denied'));
}
$TestTypes = TestType::when($request->has('name') && $request->name, function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%');
$TestTypes = TestType::when($request->has('name') && $request->name, function ($query) use ($request) {
$query->where('name', 'LIKE', '%' . $request->name . '%');
})
->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('unique_id') && $request->unique_id, function($query) use($request){
$query->where('unique_code', $request->unique_id);
})
->when($request->has('user_name') && $request->user_name, function($query) use($request){
$query->whereHas('user', function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->user_name.'%');
});
})
->withCount('test_results')
->with(['user' => function($query){
$query->select('id', 'name', 'medical_center_id');
},
'user.medical_center' => function($query){
$query->select('id', 'name');
}])->orderByDesc('id')->paginate(10);
->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('unique_id') && $request->unique_id, function ($query) use ($request) {
$query->where('unique_code', $request->unique_id);
})
->when($request->has('user_name') && $request->user_name, function ($query) use ($request) {
$query->whereHas('user', function ($query) use ($request) {
$query->where('name', 'LIKE', '%' . $request->user_name . '%');
});
})
->withCount('test_results')
->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($TestTypes);
return MessageResponse::data($TestTypes);
}
public function generateBarcode(TestType $TestType)
{
if (!auth('api')->user()->can('generateBarcode', $TestType)) {
return \MessageResponse::error(trans('messages.access_denied'));
return MessageResponse::error(trans('messages.access_denied'));
}
$Number = $TestType->unique_code;
$Barcode = DNS1D::getBarcodePNGUri($Number, "C128");
$QRCode = DNS2D::getBarcodePNGUri($Number, "QRCODE");
$Barcode = DNS1DFacade::getBarcodePNGUri($Number, "C128");
$QRCode = DNS2DFacade::getBarcodePNGUri($Number, "QRCODE");
$TestType->update(['bar_code' => $Barcode]);
return \MessageResponse::data(['Barcode' => $Barcode, 'QRCode' => $QRCode]);
return MessageResponse::data(['Barcode' => $Barcode, 'QRCode' => $QRCode]);
}
public function create()
@@ -76,7 +72,7 @@ class TestTypeController extends Controller
//////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////
public function CreateInput($Input,$TestType,$ParentID = null)
public function CreateInput($Input, $TestType, $ParentID = null)
{
//---------------------------------------------Input
$InputData = [
@@ -94,20 +90,20 @@ class TestTypeController extends Controller
//---------------------------------------------Option
if ($Input['type'] == 'Checkbox' || $Input['type'] == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
foreach ($Input['options'] as $Option) {
$Option = Option::create(['title' => $Option['title'] , 'input_id' => $InputObj->id]);
$Option = Option::create(['title' => $Option['title'], 'input_id' => $InputObj->id]);
}
}
//---------------------------------------------Option
return $InputObj;
}
public function CreateChildForm($Input,$TestType,$InputObj)
public function CreateChildForm($Input, $TestType, $InputObj)
{
if (isset($Input['children'])) {
foreach ($Input['children'] as $InputChild) {
$InputChildObj = $this->CreateInput($InputChild,$TestType,$InputObj->id);
$InputChildObj = $this->CreateInput($InputChild, $TestType, $InputObj->id);
if (isset($InputChild['children'])) {
$this->CreateChildForm($InputChild,$TestType,$InputChildObj);
$this->CreateChildForm($InputChild, $TestType, $InputChildObj);
}
}
}
@@ -116,7 +112,7 @@ class TestTypeController extends Controller
public function store(StoreTestTypeRequest $request)
{
try {
$return_value = \DB::transaction(function () use ($request) {
$return_value = DB::transaction(function () use ($request) {
$TestType = [
'name' => $request['name'],
@@ -130,17 +126,17 @@ class TestTypeController extends Controller
foreach ($TestTypeInfo as $Input) {
$InputObj = $this->CreateInput($Input,$TestType);
$InputObj = $this->CreateInput($Input, $TestType);
if ($Input['type'] == 'Form') {
$this->CreateChildForm($Input,$TestType,$InputObj);
$this->CreateChildForm($Input, $TestType, $InputObj);
}
}
});
} catch (\Exception $e) {
return response()->json($e->getMessage(), 441);
}
return \MessageResponse::success(null,trans('messages.create'));
return MessageResponse::success(null, trans('messages.create'));
}
public function show($id)
@@ -162,8 +158,8 @@ class TestTypeController extends Controller
'id' => $Input->id,
'name' => $Input->name,
'type' => $Input->type,
'size' => $Input->size ,
'require_scanner' => $Input->require_scanner ,
'size' => $Input->size,
'require_scanner' => $Input->require_scanner,
'parent_id' => $Input->parent_id,
'options' => [],
'children' => []
@@ -174,7 +170,7 @@ class TestTypeController extends Controller
foreach ($Input['options'] as $Option) {
$OptionInfo = [
'id' => $Option->id ,
'id' => $Option->id,
'title' => $Option->title
];
$Options[] = $OptionInfo;
@@ -185,7 +181,7 @@ class TestTypeController extends Controller
return $InputInfo;
}
public function CreateChildFormInfo($Input,$InputInfo)
public function CreateChildFormInfo($Input, $InputInfo)
{
$Children = [];
foreach ($Input['children'] as $InputChild) {
@@ -193,7 +189,7 @@ class TestTypeController extends Controller
$ChildInfo = $this->CreateInputInfo($InputChild);
$Children[] = $ChildInfo;
if ($InputChild['type'] == 'Form') {
$this->CreateChildFormInfo($InputChild,$ChildInfo);
$this->CreateChildFormInfo($InputChild, $ChildInfo);
}
}
return $Children;
@@ -202,9 +198,9 @@ class TestTypeController extends Controller
public function edit(TestType $TestType)
{
if (count($TestType->test_results) > 0) {
return \MessageResponse::error(trans('messages.access_denied'));
return MessageResponse::error(trans('messages.access_denied'));
}
$Inputs = Input::with('children','options','children.options')->where('test_type_id',$TestType->id)->where('parent_id',null)->get();
$Inputs = Input::with('children', 'options', 'children.options')->where('test_type_id', $TestType->id)->where('parent_id', null)->get();
$Info = [];
$Options = [];
@@ -215,7 +211,7 @@ class TestTypeController extends Controller
$InputInfo = $this->CreateInputInfo($Input);
if ($Input['type'] == 'Form') {
$Children = $this->CreateChildFormInfo($Input,$InputInfo);
$Children = $this->CreateChildFormInfo($Input, $InputInfo);
$InputInfo['children'] = $Children;
}
$Info[] = $InputInfo;
@@ -227,7 +223,7 @@ class TestTypeController extends Controller
'device_label' => $TestType->device_label,
'info' => $Info,
];
return \MessageResponse::data($TestTypeInfo);
return MessageResponse::data($TestTypeInfo);
}
//////////////////////////////////////////////////////////////////////////////////////////////////
@@ -236,7 +232,7 @@ class TestTypeController extends Controller
//////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////
public function UpdateInput($Input,$TestType,$ParentID = null)
public function UpdateInput($Input, $TestType, $ParentID = null)
{
//---------------------------------------------Input
$InputData = [
@@ -249,7 +245,7 @@ class TestTypeController extends Controller
if ($Input['type'] == 'Text') {
$InputData['require_scanner'] = $Input['require_scanner'];
}
Input::where('id',$Input['id'])->update($InputData);
Input::where('id', $Input['id'])->update($InputData);
$InputObj = Input::findOrFail($Input['id']);
//---------------------------------------------Input
//---------------------------------------------Option
@@ -262,24 +258,23 @@ class TestTypeController extends Controller
foreach ($Input['options'] as $Option) {
if ($Option['id'] == 0) {//--new
$Option = Option::create(['title' => $Option['title'] , 'input_id' => $Input['id'] ]);
}
else {
$Option = Option::create(['title' => $Option['title'], 'input_id' => $Input['id']]);
} else {
//**************************
if(in_array($Option['id'],$DeletedOptionIDs)){
foreach ($DeletedOptionIDs as $index=>$DeletedOptionID){
if($DeletedOptionID == $Option['id']){
if (in_array($Option['id'], $DeletedOptionIDs)) {
foreach ($DeletedOptionIDs as $index => $DeletedOptionID) {
if ($DeletedOptionID == $Option['id']) {
unset($DeletedOptionIDs[$index]);
}
}
}
//****************************
$Option = Option::where('id', $Option['id'])->update(['title' => $Option['title'] ]);
$Option = Option::where('id', $Option['id'])->update(['title' => $Option['title']]);
}
}
//**************************
foreach ($DeletedOptionIDs as $DeletedOptionID){
foreach ($DeletedOptionIDs as $DeletedOptionID) {
$DeletedOption = Option::findOrFail($DeletedOptionID);
$DeletedOption->delete();
}
@@ -289,7 +284,7 @@ class TestTypeController extends Controller
return $Input;
}
public function UpdateChildForm($Input,$TestType,$InputObj)
public function UpdateChildForm($Input, $TestType, $InputObj)
{
//**********************************
$InputObject = Input::findOrFail($InputObj['id']);//$InputObj['id'] OR $Input['id']???????
@@ -300,30 +295,29 @@ class TestTypeController extends Controller
foreach ($Input['children'] as $InputChild) {
if ($InputChild['id'] == 0) {//--newChild
$InputChildObj = $this->CreateInput($InputChild,$TestType,$InputObj['id']);
$InputChildObj = $this->CreateInput($InputChild, $TestType, $InputObj['id']);
if (isset($InputChild['children'])) {
$this->CreateChildForm($InputChild,$TestType,$InputChildObj);
$this->CreateChildForm($InputChild, $TestType, $InputChildObj);
}
}
else {
} else {
//******************************
if(in_array($InputChild['id'],$DeletedChildIDs)){
foreach ($DeletedChildIDs as $index=>$DeletedChildID){
if($DeletedChildID == $InputChild['id']){
if (in_array($InputChild['id'], $DeletedChildIDs)) {
foreach ($DeletedChildIDs as $index => $DeletedChildID) {
if ($DeletedChildID == $InputChild['id']) {
unset($DeletedChildIDs[$index]);
}
}
}
//******************************
$InputChildObj = $this->UpdateInput($InputChild,$TestType,$InputObj['id']);
$InputChildObj = $this->UpdateInput($InputChild, $TestType, $InputObj['id']);
if (isset($InputChild['children'])) {
$this->UpdateChildForm($InputChild,$TestType,$InputChildObj);
$this->UpdateChildForm($InputChild, $TestType, $InputChildObj);
}
}
}
//*****************************
foreach ($DeletedChildIDs as $DeletedChildID){
foreach ($DeletedChildIDs as $DeletedChildID) {
$DeletedChild = Input::findOrFail($DeletedChildID);
$DeletedChild->options()->delete();
foreach ($DeletedChild->children as $DeletedChild1) {
@@ -346,31 +340,30 @@ class TestTypeController extends Controller
];
$TestType->update($TestTypeData);
$TestTypeInfo = $request['info'];
$DeletedInputIDs = $TestType->inputs->where('parent_id',null)->pluck('id')->toArray();
$DeletedInputIDs = $TestType->inputs->where('parent_id', null)->pluck('id')->toArray();
foreach ($TestTypeInfo as $Input) {
if ($Input['id'] == 0) {//--new
$InputObj = $this->CreateInput($Input,$TestType);
}
else {
$InputObj = $this->CreateInput($Input, $TestType);
} else {
//**************************
if(in_array($Input['id'],$DeletedInputIDs)){
foreach ($DeletedInputIDs as $index=>$DeletedInputID){
if($DeletedInputID == $Input['id']){
if (in_array($Input['id'], $DeletedInputIDs)) {
foreach ($DeletedInputIDs as $index => $DeletedInputID) {
if ($DeletedInputID == $Input['id']) {
unset($DeletedInputIDs[$index]);
}
}
}
//****************************
$InputObj = $this->UpdateInput($Input,$TestType);
$InputObj = $this->UpdateInput($Input, $TestType);
}
if ($Input['type'] == 'Form') {
$this->UpdateChildForm($Input,$TestType,$InputObj);
$this->UpdateChildForm($Input, $TestType, $InputObj);
}
}
//******************************
foreach ($DeletedInputIDs as $DeletedInputID){
foreach ($DeletedInputIDs as $DeletedInputID) {
$DeletedInput = Input::findOrFail($DeletedInputID);
$DeletedInput->options()->delete();
foreach ($DeletedInput->children as $DeletedInput1) {
@@ -382,7 +375,7 @@ class TestTypeController extends Controller
}
//******************************
return \MessageResponse::success(null,trans('messages.update'));
return MessageResponse::success(null, trans('messages.update'));
}
/////////////////////////////////////////////////////////////////////////////////////
@@ -390,9 +383,9 @@ class TestTypeController extends Controller
public function getInputs(Request $request)
{
if (auth('api')->user()->can('getInputs')) {
return \MessageResponse::error(trans('messages.failed'));
return MessageResponse::error(trans('messages.failed'));
}
if($request->test_result_id !== '') {
if ($request->test_result_id !== '') {
$testTypeId = TestResult::find($request->test_result_id);
}
if (isset($testTypeId) && $testTypeId) {
@@ -403,38 +396,38 @@ class TestTypeController extends Controller
if (isset($testType) && $testType) {
$inputs = Input::select('id', 'name', 'type', 'size', 'parent_id', 'require_scanner')->with(
['options' => function ($query) {
$query->select('id', 'title','input_id');
},
'children' => function ($query) {
$query->select('id', 'name', 'type', 'size', 'parent_id', 'test_type_id', 'require_scanner');
},
'children.options' => function ($query) {
$query->select('id', 'title', 'input_id');
}]
)->whereNull('parent_id')->where('test_type_id',$testType->id)->get();
['options' => function ($query) {
$query->select('id', 'title', 'input_id');
},
'children' => function ($query) {
$query->select('id', 'name', 'type', 'size', 'parent_id', 'test_type_id', 'require_scanner');
},
'children.options' => function ($query) {
$query->select('id', 'title', 'input_id');
}]
)->whereNull('parent_id')->where('test_type_id', $testType->id)->get();
return \MessageResponse::data(['testType' => $testType, 'inputs' => $inputs]);
return MessageResponse::data(['testType' => $testType, 'inputs' => $inputs]);
}
return \MessageResponse::error();
return MessageResponse::error();
}
public function listNames()
{
$testType = TestType::pluck('name');
return \MessageResponse::data($testType);
return MessageResponse::data($testType);
}
public function destroy(TestType $TestType)
{
if (!auth('api')->user()->can('delete', $TestType)) {
return \MessageResponse::error(trans('messages.access_denied'));
return MessageResponse::error(trans('messages.access_denied'));
}
$UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
$TestType->unique_code = $TestType->unique_code.'--'.$UniqueID;
$TestType->unique_code = $TestType->unique_code . '--' . $UniqueID;
$TestType->save();
$TestType->delete();
return \MessageResponse::success(trans('messages.success'));
return MessageResponse::success(trans('messages.success'));
}
}