mirror of
https://git.meshkee.com/cssd/cssd-back.git
synced 2026-10-13 21:41:07 +03:30
change GetInputs api
This commit is contained in:
@@ -7,6 +7,7 @@ use App\Models\Input;
|
|||||||
use App\Models\Option;
|
use App\Models\Option;
|
||||||
use App\Models\TestResult;
|
use App\Models\TestResult;
|
||||||
use App\Models\TestType;
|
use App\Models\TestType;
|
||||||
|
use Exception;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Milon\Barcode\Facades\DNS1DFacade;
|
use Milon\Barcode\Facades\DNS1DFacade;
|
||||||
@@ -380,20 +381,13 @@ class TestTypeController extends Controller
|
|||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
public function getInputs(Request $request)
|
public function getInputs(int $testTypeId)
|
||||||
{
|
{
|
||||||
if (auth('api')->user()->can('getInputs')) {
|
if (auth('api')->user()->can('getInputs')) {
|
||||||
return MessageResponse::error(trans('messages.failed'));
|
return MessageResponse::error(trans('messages.failed'));
|
||||||
}
|
}
|
||||||
if ($request->test_result_id !== '') {
|
try {
|
||||||
$testTypeId = TestResult::find($request->test_result_id);
|
$testType = TestType::select('id', 'name', 'unique_code', 'device_label')->findOrFail($testTypeId);
|
||||||
}
|
|
||||||
if (isset($testTypeId) && $testTypeId) {
|
|
||||||
$testType = TestType::select('id', 'name', 'unique_code', 'device_label')->find($testTypeId->test_type_id);
|
|
||||||
} else {
|
|
||||||
$testType = TestType::where('name', $request->name)->orWhere('unique_code', $request->unique_code)->select('id', 'name', 'unique_code', 'device_label')->first();
|
|
||||||
}
|
|
||||||
if (isset($testType) && $testType) {
|
|
||||||
|
|
||||||
$inputs = Input::select('id', 'name', 'type', 'size', 'parent_id', 'require_scanner')->with(
|
$inputs = Input::select('id', 'name', 'type', 'size', 'parent_id', 'require_scanner')->with(
|
||||||
['options' => function ($query) {
|
['options' => function ($query) {
|
||||||
@@ -408,9 +402,10 @@ class TestTypeController extends Controller
|
|||||||
)->whereNull('parent_id')->where('test_type_id', $testType->id)->get();
|
)->whereNull('parent_id')->where('test_type_id', $testType->id)->get();
|
||||||
|
|
||||||
return MessageResponse::data(['testType' => $testType, 'inputs' => $inputs]);
|
return MessageResponse::data(['testType' => $testType, 'inputs' => $inputs]);
|
||||||
}
|
} catch(Exception $e) {
|
||||||
return MessageResponse::error();
|
return MessageResponse::error();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function list()
|
public function list()
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -35,7 +35,7 @@ Route::middleware('auth:api')->group(function () {
|
|||||||
Route::post('/TestTypes/Barcode/{TestType}', [TestTypeController::class, 'generateBarcode']);
|
Route::post('/TestTypes/Barcode/{TestType}', [TestTypeController::class, 'generateBarcode']);
|
||||||
Route::resource('TestTypes', TestTypeController::class);
|
Route::resource('TestTypes', TestTypeController::class);
|
||||||
Route::resource('MedicalCenters', MedicalCenterController::class);
|
Route::resource('MedicalCenters', MedicalCenterController::class);
|
||||||
Route::post('/GetInputs', [TestTypeController::class, 'getInputs']);
|
Route::get('/GetInputs/{id}', [TestTypeController::class, 'getInputs']); // Route::post('/GetInputs', [TestTypeController::class, 'getInputs']) این بود قبلا
|
||||||
|
|
||||||
Route::get('/GetInfo', [UserController::class, 'getInfo']);
|
Route::get('/GetInfo', [UserController::class, 'getInfo']);
|
||||||
Route::get('Users/MedicalCenter/{MedicalCenter}', [UserController::class, 'getByMedicalCenter']);
|
Route::get('Users/MedicalCenter/{MedicalCenter}', [UserController::class, 'getByMedicalCenter']);
|
||||||
|
|||||||
Reference in New Issue
Block a user