diff --git a/app/Http/Controllers/TestResultController.php b/app/Http/Controllers/TestResultController.php index 2e9e0ae5..a1ccb493 100644 --- a/app/Http/Controllers/TestResultController.php +++ b/app/Http/Controllers/TestResultController.php @@ -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', diff --git a/app/Http/Requests/StoreItemRequest.php b/app/Http/Requests/StoreItemRequest.php index ce2e8fdc..87c6f98c 100644 --- a/app/Http/Requests/StoreItemRequest.php +++ b/app/Http/Requests/StoreItemRequest.php @@ -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', ]; diff --git a/app/Policies/MessagePolicy.php b/app/Policies/MessagePolicy.php index 3d947a2b..3aa4f181 100644 --- a/app/Policies/MessagePolicy.php +++ b/app/Policies/MessagePolicy.php @@ -1,27 +1,27 @@ -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; - } -} +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; + } +} diff --git a/app/TestResult.php b/app/TestResult.php index 63de83f3..69d0cf57 100644 --- a/app/TestResult.php +++ b/app/TestResult.php @@ -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'); diff --git a/resources/js/vue/views/TestResult/AddEdit.vue b/resources/js/vue/views/TestResult/AddEdit.vue index e0bd9b0f..8620c0a1 100644 --- a/resources/js/vue/views/TestResult/AddEdit.vue +++ b/resources/js/vue/views/TestResult/AddEdit.vue @@ -68,7 +68,7 @@ color="pink" no-title v-model="formData.date" - :date-format="date => new Date(date).toDateString()" + :date-format="date => new Date(formData.date).toDateString()" > @@ -113,8 +113,8 @@
{{ item.name }}
{{ children.name }}