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

the end

Browse Source
This commit is contained in:
saeid
2019-08-22 14:41:12 +04:30
parent 9099065d8b
commit 3522700605
6 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TestResultController.php
+2 -2
View File
@@ -87,7 +87,7 @@ class TestResultController extends Controller
'user_id' => auth('api')->user()->id, 'user_id' => auth('api')->user()->id,
'cycle_number' => $request->cycle_number, 'cycle_number' => $request->cycle_number,
'device_id' => $request->device_id, 'device_id' => $request->device_id,
// 'device_label' => $request->device_label, 'date' => $request->date,
'test_type_id' => $request->test_type_id, 'test_type_id' => $request->test_type_id,
'result' => $request->result, 'result' => $request->result,
'verified' => 'NotVerified', 'verified' => 'NotVerified',
@@ -272,7 +272,7 @@ class TestResultController extends Controller
// 'autoclave_id' => $request->autoclave_id, // 'autoclave_id' => $request->autoclave_id,
'cycle_number' => $request->cycle_number, 'cycle_number' => $request->cycle_number,
'device_id' => $request->device_id, 'device_id' => $request->device_id,
// 'device_label' => $request->device_label, 'date' => $request->date,
'test_type_id' => $request->test_type_id, 'test_type_id' => $request->test_type_id,
'result' => $request->result, 'result' => $request->result,
'verified' => 'NotVerified', 'verified' => 'NotVerified',
app/Http/Requests/StoreItemRequest.php
+2 -2
View File
@@ -25,7 +25,7 @@ class StoreItemRequest extends FormRequest
switch ($this->method()) { switch ($this->method()) {
case 'POST': { case 'POST': {
return [ return [
'name' => 'required|max:100|unique:Items', 'name' => 'required|max:100|unique:items',
'result' => 'required', 'result' => 'required',
// 'description' => 'required', // 'description' => 'required',
]; ];
@@ -35,7 +35,7 @@ class StoreItemRequest extends FormRequest
case 'PATCH': { case 'PATCH': {
$Item = $this->route('Item'); $Item = $this->route('Item');
return [ return [
'name' => 'required|max:100|unique:Items,id,'.$Item->id, 'name' => 'required|max:100|unique:items,id,'.$Item->id,
'result' => 'required', 'result' => 'required',
// 'description' => 'required', // 'description' => 'required',
]; ];
app/TestResult.php
+1 -1
View File
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
class TestResult extends 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() public function test_type()
{ {
return $this->belongsTo('App\TestType'); return $this->belongsTo('App\TestType');
resources/js/vue/views/TestResult/AddEdit.vue
+6 -5
View File
@@ -68,7 +68,7 @@
color="pink" color="pink"
no-title no-title
v-model="formData.date" v-model="formData.date"
:date-format="date => new Date(date).toDateString()" :date-format="date => new Date(formData.date).toDateString()"
></v-date-picker> ></v-date-picker>
</v-menu> </v-menu>
</v-flex> </v-flex>
@@ -113,8 +113,8 @@
<p>{{ item.name }}</p> <p>{{ item.name }}</p>
<v-flex xs12> <v-flex xs12>
<v-slider <v-slider
prepend-icon="fa fa-tachometer" prepend-icon="fa fa-flask"
step="0.001" step="0.01"
v-model="formData[item.name+'_'+item.id]" v-model="formData[item.name+'_'+item.id]"
min="-1" min="-1"
max="3" max="3"
@@ -211,14 +211,15 @@
></v-slider> ></v-slider>
</v-flex> </v-flex>
</v-container> </v-container>
<v-container step="0.001" fluid v-if="children.type == 'Pressure'"> <v-container fluid v-if="children.type == 'Pressure'">
<p>{{ children.name }}</p> <p>{{ children.name }}</p>
<v-flex xs12> <v-flex xs12>
<v-slider <v-slider
v-model="formData[children.name+'_'+children.id]" v-model="formData[children.name+'_'+children.id]"
min="-1" min="-1"
step="0.01"
max="3" max="3"
prepend-icon="fa fa-tachometer" prepend-icon="fa fa-flask"
thumb-label="always" thumb-label="always"
></v-slider> ></v-slider>
</v-flex> </v-flex>
resources/js/vue/views/TestType/AddEdit.vue
+1 -1
View File
@@ -27,8 +27,8 @@
<v-autocomplete <v-autocomplete
:rules="[rules.required]" :rules="[rules.required]"
:items="deviceLabels" :items="deviceLabels"
item-text="name"
item-value="id" item-value="id"
item-name="name"
v-model="form.device_label" v-model="form.device_label"
label="ID Label" label="ID Label"
color="black" color="black"