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

fix some problems

Browse Source
This commit is contained in:
mahdi purHosseini
2023-09-25 11:15:42 +03:30
parent dbc9b4419a
commit d019cdac58
6 changed files with 1 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TestResultController.php
+1 -17
View File
@@ -2,21 +2,6 @@
namespace App\Http\Controllers;
<<<<<<< HEAD
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 App\Http\Requests\StoreTestResultRequest;
use App\Input;
use App\InputValue;
@@ -25,7 +10,6 @@
use App\TestResult;
use App\TestType;
use Illuminate\Http\Request;
>>>>>>> b389ea53068b2084084b9704400a50529ba035eb
use Illuminate\Support\Facades\Storage;
class TestResultController extends Controller
@@ -492,7 +476,7 @@
}
$TestResult[ 'filesPath' ] = $FilesPath;
}
// dd($TestResult->test_type()->device_label);
$TestResult[ 'device_label' ] = $TestResult->test_type->device_label;
return \MessageResponse::data( $TestResult );
}