change Item

This commit is contained in:
Fayyazi
2019-07-18 17:13:59 +04:30
parent ff1aaa74cc
commit f5dc54e963
107 changed files with 434 additions and 118 deletions
+51
View File
@@ -0,0 +1,51 @@
<?php
namespace App\Http\Requests;
use App\Item;
use Illuminate\Validation\Rule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Contracts\Validation\Validator;
class StoreItemRequest extends FormRequest
{
public function authorize()
{
if ($this->method() == 'POST') {
return auth('api')->check() && auth('api')->user()->can('store', Item::class);
} else {
$Item = $this->route('Item');
return auth('api')->check() && $Item && auth('api')->user()->can('update', $Item);
}
}
public function rules()
{
switch ($this->method()) {
case 'POST': {
return [
'name' => 'required|max:100|unique:Items',
'result' => 'required',
// 'description' => 'required',
];
break;
}
case 'PUT':
case 'PATCH': {
$Item = $this->route('Item');
return [
'name' => 'required|max:100|unique:Items,id,'.$Item->id,
'result' => 'required',
// 'description' => 'required',
];
break;
}
default:
break;
}
}
}
+2 -8
View File
@@ -25,10 +25,7 @@ class StoreTestResultRequest extends FormRequest
switch ($this->method()) {
case 'POST': {
return [
// 'user_id' => 'required',
// 'autoclave_id' => 'required',
'device_id' => 'required',
'device_label' => 'required',
// 'device_id' => 'requisred',
'cycle_number' => 'required',
'test_type_id' => 'required|numeric|exists:test_types,id',
'result' => 'required',
@@ -39,10 +36,7 @@ class StoreTestResultRequest extends FormRequest
case 'PATCH': {
// $TestResult = $this->route('TestResult');
return [
// 'user_id' => 'required',
// 'autoclave_id' => 'required',
'device_id' => 'required',
'device_label' => 'required',
// 'device_id' => 'required',
'cycle_number' => 'required',
'test_type_id' => 'required|numeric|exists:test_types,id',
'result' => 'required',
@@ -27,6 +27,7 @@ class StoreTestTypeRequest extends FormRequest
return [
'name' => 'required|max:100|unique:test_types',
'unique_code' => 'required|max:100|unique:test_types',
'device_label' => 'required',
'info.*.name'=>'required',
'info.*.type'=>'required',
'info.*.size'=>'nullable',
@@ -40,6 +41,7 @@ class StoreTestTypeRequest extends FormRequest
return [
'name' => 'required|max:100|unique:test_types,id,'.$TestType->id,
'unique_code' => 'required|max:100|unique:test_types,id,'.$TestType->id,
'device_label' => 'required',
'info.*.name'=>'required',
'info.*.type'=>'required',
'info.*.size'=>'nullable',