Show And Barcode

This commit is contained in:
saeid
2019-05-09 19:54:25 +04:30
parent 56b108401a
commit aa61c9e54f
16 changed files with 750 additions and 276 deletions
+19 -7
View File
@@ -95,9 +95,13 @@ class TestResultController extends Controller
}
///////////////////////////////////////////////////////////////////////////Inputs
///////////////////////////////////////////////////////////////////////////Image
if ($request->hasFile('img')) {
// if ($request->hasFile('img')) {
//
// $Image = $request->file('img');
if ($request->img != null) {
$Image = $request->file('img');
// $Image = $request->file('img');
$Image = $request->img;
$InterventionImage = Image::make($Image);
$Mime = explode('/', $InterventionImage->mime());
@@ -185,6 +189,10 @@ class TestResultController extends Controller
$TestResult[$input->name] = $value->value;
}
}
if (count($TestResult->TitleImage)) {
$TestResult['imagePath'] = $TestResult->TitleImage[0]->path;
}
return \MessageResponse::data($TestResult);
}
@@ -198,6 +206,7 @@ class TestResultController extends Controller
public function update(StoreTestResultRequest $request, TestResult $TestResult)
{
$TestResultData = [
'user_id' => auth('api')->user()->id,
'autoclave_id' => $request->autoclave_id,
@@ -243,14 +252,16 @@ class TestResultController extends Controller
}
}
}
//////////////////////////////////////////////////////////////////Image
/////////////////////////////////////////////////////////////////////Image
$image = '';
if (count($TestResult->TitleImage))
$image = $TestResult->TitleImage[0];
// dd($request->img);
// if ($request->hasFile('img')) {
if ($request->img != null) {
if ($request->hasFile('img')) {
$Image = $request->file('img');
// $Image = $request->file('img');
$Image = $request->img;
$InterventionImage = Image::make($Image);
$Mime = explode('/', $InterventionImage->mime());
@@ -303,7 +314,8 @@ class TestResultController extends Controller
$TestResult->verified = 'Verified';
}
$TestResult->save();
return \MessageResponse::success(trans('messages.success'));
$TestResult = $TestResult->load('user.medical_center');
return \MessageResponse::success(trans('messages.success'), null, $TestResult);
}
}
+16 -1
View File
@@ -8,15 +8,24 @@ use App\TestResult;
use App\Input;
use App\Option;
use App\Http\Requests\StoreTestTypeRequest;
use \Milon\Barcode\DNS1D;
class TestTypeController extends Controller
{
public function index()
{
$TestTypes = TestType::with('user','user.medical_center')->paginate(10);
$TestTypes = TestType::withCount('test_results')->with('user','user.medical_center')->paginate(10);
return \MessageResponse::data($TestTypes);
}
public function generateBarcode(TestType $TestType)
{
$Number = $TestType->unique_code;
$Barcode = DNS1D::getBarcodePNGUri($Number, "C128");
$TestType->update(['bar_code' => $Barcode]);
return \MessageResponse::data($Barcode);
}
public function create()
{
//
@@ -148,6 +157,9 @@ class TestTypeController extends Controller
public function edit(TestType $TestType)
{
if (count($TestType->test_results) > 0) {
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();
$Info = [];
@@ -280,6 +292,9 @@ class TestTypeController extends Controller
public function update(StoreTestTypeRequest $request, TestType $TestType)
{
if (count($TestType->test_results) > 0) {
return \MessageResponse::error(trans('messages.access_denied'));
}
$TestTypeData = [
'name' => $request['name'],
'unique_code' => $request['unique_code'],
-4
View File
@@ -76,8 +76,6 @@ class UserController extends Controller
return \MessageResponse::data($MedicalCenter);␍
}␍
␍
␍
␍
public function changeStatus(User $User)␍
{␍
if ($User->status == 'Active') {␍
@@ -89,8 +87,6 @@ class UserController extends Controller
return \MessageResponse::data($User);␍
}␍
␍
␍
␍
public function changeRole(User $User, Request $request)␍
{␍
$User->syncRoles($request->roles);␍
+2 -2
View File
@@ -8,8 +8,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
class TestType extends Model
{
use SoftDeletes;
public $fillable = ['name','unique_code','user_id'];
public $fillable = ['name','unique_code','user_id','bar_code'];
// protected $softDelete = true;
public function user()