mirror of
https://git.meshkee.com/cssd/cssd-back.git
synced 2026-10-13 10:21:06 +03:30
the end
This commit is contained in:
@@ -87,7 +87,7 @@ class TestResultController extends Controller
|
||||
'user_id' => auth('api')->user()->id,
|
||||
'cycle_number' => $request->cycle_number,
|
||||
'device_id' => $request->device_id,
|
||||
// 'device_label' => $request->device_label,
|
||||
'date' => $request->date,
|
||||
'test_type_id' => $request->test_type_id,
|
||||
'result' => $request->result,
|
||||
'verified' => 'NotVerified',
|
||||
@@ -272,7 +272,7 @@ class TestResultController extends Controller
|
||||
// 'autoclave_id' => $request->autoclave_id,
|
||||
'cycle_number' => $request->cycle_number,
|
||||
'device_id' => $request->device_id,
|
||||
// 'device_label' => $request->device_label,
|
||||
'date' => $request->date,
|
||||
'test_type_id' => $request->test_type_id,
|
||||
'result' => $request->result,
|
||||
'verified' => 'NotVerified',
|
||||
|
||||
@@ -25,7 +25,7 @@ class StoreItemRequest extends FormRequest
|
||||
switch ($this->method()) {
|
||||
case 'POST': {
|
||||
return [
|
||||
'name' => 'required|max:100|unique:Items',
|
||||
'name' => 'required|max:100|unique:items',
|
||||
'result' => 'required',
|
||||
// 'description' => 'required',
|
||||
];
|
||||
@@ -35,7 +35,7 @@ class StoreItemRequest extends FormRequest
|
||||
case 'PATCH': {
|
||||
$Item = $this->route('Item');
|
||||
return [
|
||||
'name' => 'required|max:100|unique:Items,id,'.$Item->id,
|
||||
'name' => 'required|max:100|unique:items,id,'.$Item->id,
|
||||
'result' => 'required',
|
||||
// 'description' => 'required',
|
||||
];
|
||||
|
||||
@@ -1,27 +1,27 @@
|
||||
<?php␍
|
||||
␍
|
||||
namespace App\Policies;␍
|
||||
␍
|
||||
use App\User;␍
|
||||
use App\Message;␍
|
||||
use Doctrine\Tests\Common\Inflector\InflectorTest;␍
|
||||
␍
|
||||
class MessagePolicy␍
|
||||
{␍
|
||||
public function delete(User $User, Message $Message)␍
|
||||
{␍
|
||||
// if($Message->sender_user_id == $User->id || $Message->recipient_user_id == $User->id)␍
|
||||
return true;␍
|
||||
}␍
|
||||
␍
|
||||
public function update(User $User, Message $Message)␍
|
||||
{␍
|
||||
// if($User->hasRole('Admin'))␍
|
||||
return true;␍
|
||||
}␍
|
||||
public function store(User $User)␍
|
||||
{␍
|
||||
// if($User->hasRole('Admin'))␍
|
||||
return true;␍
|
||||
}␍
|
||||
}␍
|
||||
<?php
|
||||
|
||||
namespace App\Policies;
|
||||
|
||||
use App\User;
|
||||
use App\Message;
|
||||
use Doctrine\Tests\Common\Inflector\InflectorTest;
|
||||
|
||||
class MessagePolicy
|
||||
{
|
||||
public function delete(User $User, Message $Message)
|
||||
{
|
||||
// if($Message->sender_user_id == $User->id || $Message->recipient_user_id == $User->id)
|
||||
return true;
|
||||
}
|
||||
|
||||
public function update(User $User, Message $Message)
|
||||
{
|
||||
// if($User->hasRole('Admin'))
|
||||
return true;
|
||||
}
|
||||
public function store(User $User)
|
||||
{
|
||||
// if($User->hasRole('Admin'))
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class TestResult extends Model
|
||||
{
|
||||
public $fillable = ['result','verified','test_type_id','user_id','device_id', 'cycle_number'];
|
||||
public $fillable = ['result','verified','test_type_id','user_id','device_id', 'cycle_number', 'date'];
|
||||
public function test_type()
|
||||
{
|
||||
return $this->belongsTo('App\TestType');
|
||||
|
||||
Reference in New Issue
Block a user