diff --git a/app/Http/Controllers/BarCodeController.php b/app/Http/Controllers/BarCodeController.php index bcfe9781..6ea68319 100644 --- a/app/Http/Controllers/BarCodeController.php +++ b/app/Http/Controllers/BarCodeController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use \Milon\Barcode\DNS1D; use \Milon\Barcode\DNS2D; +use App\TestResult; class BarCodeController extends Controller { @@ -16,6 +17,16 @@ class BarCodeController extends Controller $QRCode = DNS2D::getBarcodePNG($Number, "QRCODE"); return \MessageResponse::data(['Barcode' => 'data:image/png;base64,' .$Barcode, 'QRCode' => 'data:image/png;base64,' .$QRCode]); } - + } -} \ No newline at end of file + public function generateQRcode(TestResult $TestResult) + { + if($TestResult) + { + $URL = 'https://www.cssd-doc.com/ShowTestResult/'.$TestResult->id; + $QRCode = DNS2D::getBarcodePNG($URL, "QRCODE"); + return \MessageResponse::data(['QRCode' => 'data:image/png;base64,' .$QRCode]); + } + + } +} diff --git a/app/Http/Controllers/TestResultController.php b/app/Http/Controllers/TestResultController.php index 9f802b2a..2e9e0ae5 100644 --- a/app/Http/Controllers/TestResultController.php +++ b/app/Http/Controllers/TestResultController.php @@ -483,4 +483,10 @@ class TestResultController extends Controller return \MessageResponse::data(['labels' => ['Number Of Accepted Test Results', 'Number Of Rejected Test Results'], 'data' => [$AcceptCount,$RejectCount]]); } + + //--------------------------------------------------------------------------Show + public function showTestResult($id) + { + return view('ShowTestResult', compact('id')); + } } diff --git a/routes/api.php b/routes/api.php index 40ae3dbc..57492a99 100644 --- a/routes/api.php +++ b/routes/api.php @@ -28,13 +28,14 @@ Route::middleware('auth:api')->group(function () { Route::get('TestTypes/ListNames', 'TestTypeController@listNames'); Route::post('/TestTypes/Barcode/{TestType}', 'TestTypeController@generateBarcode'); Route::resource('TestTypes', 'TestTypeController'); - Route::resource('TestResults', 'TestResultController'); + Route::resource('TestResults', 'TestResultController' , ['except' => 'show']); Route::resource('MedicalCenters', 'MedicalCenterController'); Route::post('/GetInputs', 'TestTypeController@getInputs'); Route::post('/TestResults/chart', 'TestResultController@chart'); // Route::get('/TestTypes/All', 'TestTypeController@AllTestTypes'); // Route::get('/MedicalCenters/All', 'MedicalCenterController@listMedicalCenters'); Route::post('/BarCode/{Code}', 'BarCodeController@generateBarcode'); + Route::post('/QRCode/{TestResult}', 'BarCodeController@generateQRcode'); Route::get('/GetInfo', 'UserController@getInfo'); Route::get('Users/MedicalCenter/{MedicalCenter}', 'UserController@getByMedicalCenter'); @@ -55,3 +56,5 @@ Route::middleware('auth:api')->group(function () { Route::resource('Cycles', 'CycleController'); }); + +Route::get('TestResults/{id}', 'TestResultController@show'); diff --git a/routes/web.php b/routes/web.php index f9bef4c6..387de288 100644 --- a/routes/web.php +++ b/routes/web.php @@ -44,6 +44,7 @@ Route::post('oauth/token/refresh', '\Laravel\Passport\Http\Controllers\Transient Route::get('oauth/tokens', '\Laravel\Passport\Http\Controllers\AuthorizedAccessTokenController@forUser')->middleware('auth:api'); Route::delete('oauth/tokens/{token_id}', '\Laravel\Passport\Http\Controllers\AuthorizedAccessTokenController@destroy')->middleware('auth:api'); +Route::get('/ShowTestResult/{id}', 'TestResultController@showTestResult'); /* |-------------------------------------------------------------------------- | Vue Router