neviyn/ObservationDatabase
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Added person filters to the frontend.

Browse Source
This commit is contained in:
neviyn 2018-10-22 14:42:12 +01:00
parent 4cba15acb3
commit 680fe08a9e
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/src/views/Stats.vue
View File

@ -25,10 +25,15 @@
</b-form-group> </b-form-group>
</b-col> </b-col>
<b-col> <b-col>
<b-form-group label="Who"> <b-form-group label="Shift">
<b-form-input class="text-center" v-model="whom" type="text"></b-form-input> <b-form-input class="text-center" v-model="whom" type="text"></b-form-input>
</b-form-group> </b-form-group>
</b-col> </b-col>
<b-col>
<b-form-group label="Person">
<b-form-input v-model="person" type="text" class="text-center"></b-form-input>
</b-form-group>
</b-col>
<b-col> <b-col>
<b-form-group label="From"> <b-form-group label="From">
<date-picker v-model="startDate" @dp-change="changeStartDate" value="startDate" <date-picker v-model="startDate" @dp-change="changeStartDate" value="startDate"
@ -117,7 +122,8 @@ export default {
siteOptions: [], siteOptions: [],
tutorSelection: null, tutorSelection: null,
tutorOptions: [], tutorOptions: [],
whom: null whom: null,
person: null
}; };
}, },
methods: { methods: {
@ -128,7 +134,8 @@ export default {
tutor: this.tutorSelection, tutor: this.tutorSelection,
startDate: moment(this.startDate).format("YYYY-MM-DD"), startDate: moment(this.startDate).format("YYYY-MM-DD"),
endDate: moment(this.endDate).format("YYYY-MM-DD"), endDate: moment(this.endDate).format("YYYY-MM-DD"),
whom: this.whom whom: this.whom,
person: this.person
}) })
.then(response => { .then(response => {
this.chartData = response.data; this.chartData = response.data;

11
frontend/src/views/ViewObservations.vue
View File

@ -27,10 +27,15 @@
</b-form-group> </b-form-group>
</b-col> </b-col>
<b-col> <b-col>
<b-form-group label="Who"> <b-form-group label="Shift">
<b-form-input v-model="whom" type="text" class="text-center"></b-form-input> <b-form-input v-model="whom" type="text" class="text-center"></b-form-input>
</b-form-group> </b-form-group>
</b-col> </b-col>
<b-col>
<b-form-group label="Person">
<b-form-input v-model="person" type="text" class="text-center"></b-form-input>
</b-form-group>
</b-col>
<b-col> <b-col>
<b-form-group label="From"> <b-form-group label="From">
<date-picker v-model="startDate" @dp-change="changeStartDate" value="startDate" <date-picker v-model="startDate" @dp-change="changeStartDate" value="startDate"
@ -138,6 +143,7 @@ export default {
tutorSelection: null, tutorSelection: null,
tutorOptions: [], tutorOptions: [],
whom: null, whom: null,
person: null,
observationData: null, observationData: null,
errorStatus: null, errorStatus: null,
errorMessage: null errorMessage: null
@ -165,7 +171,8 @@ export default {
tutor: this.tutorSelection, tutor: this.tutorSelection,
startDate: moment(this.startDate).format("YYYY-MM-DD"), startDate: moment(this.startDate).format("YYYY-MM-DD"),
endDate: moment(this.endDate).format("YYYY-MM-DD"), endDate: moment(this.endDate).format("YYYY-MM-DD"),
whom: this.whom whom: this.whom,
person: this.person
}) })
.then(response => { .then(response => {
this.observationData = response.data; this.observationData = response.data;