cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-12 04:51:05 +03:30
Code Issues Packages Projects Releases Wiki Activity

new update

Browse Source
This commit is contained in:
Fateme
2020-04-05 12:07:12 +04:30
parent d654566a1b
commit 91f954c9dd
18 changed files with 371 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Requests/StoreTestResultRequest.php
+2 -2
View File
@@ -25,7 +25,7 @@ class StoreTestResultRequest extends FormRequest
switch ($this->method()) {
case 'POST': {
return [
'device_id' => 'required',
// 'device_id' => 'required',
// 'cycle_number' => 'required',
'test_type_id' => 'required|numeric|exists:test_types,id',
'result' => 'required',
@@ -36,7 +36,7 @@ class StoreTestResultRequest extends FormRequest
case 'PATCH': {
// $TestResult = $this->route('TestResult');
return [
'device_id' => 'required',
// 'device_id' => 'required',
// 'cycle_number' => 'required',
'test_type_id' => 'required|numeric|exists:test_types,id',
'result' => 'required',
app/Http/Requests/StoreTestTypeRequest.php
+16 -14
View File
@@ -6,7 +6,7 @@ use App\TestType;
use Illuminate\Validation\Rule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Contracts\Validation\Validator;
use Illuminate\Http\Request;
class StoreTestTypeRequest extends FormRequest
{
@@ -20,26 +20,29 @@ class StoreTestTypeRequest extends FormRequest
}
}
public function rules()
public function rules(Request $request)
{
switch ($this->method()) {
case 'POST': {
return [
'name' => 'required|max:100|unique:test_types',
// 'unique_code' => 'required|max:100|unique:test_types',
'device_label' => 'required',
$rules = [
'info.*.name'=>'required',
'info.*.type'=>'required',
'info.*.size'=>'nullable',
'info.*.parent_id'=>'nullable|numeric|exists:inputs,id',
];
// $rules['unique_code'] = [
// 'required',
// Rule::unique('test_types')->where(function ($query) use ($request) {
// return $query->whereNotNull('deleted_at');
// })
// ];
// return $rules;
$rules['name'] = [
'required',
Rule::unique('test_types')->where(function ($query) use ($request) {
return $query->whereNull('deleted_at');
})
];
$rules['unique_code'] = [
'required',
Rule::unique('test_types')->where(function ($query) use ($request) {
return $query->whereNull('deleted_at');
})
];
return $rules;
break;
}
case 'PUT':
@@ -48,7 +51,6 @@ 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',