hft-informatik/ubiquitous-computing-geo-timetracking
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '122-fix-date-and-time-pickers' into 'master'

Browse Source 
Resolve "Fix date and time pickers"

Closes #122

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!93
This commit is contained in:
Tim Zieger 2020-06-01 09:25:12 +00:00
commit e2c698fd08
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/src/views/CreateTimerecord.vue
View File

@ -33,7 +33,7 @@
ref="menu"
v-model="menu"
:close-on-content-click="false"
:return-value.sync="newstartdate"
:nudge-right="40"
transition="scale-transition"
offset-y
min-width="290px"
@ -47,10 +47,8 @@
v-on="on"
></v-text-field>
</template>
<v-date-picker v-model="newstartdate" no-title scrollable>
<v-spacer></v-spacer>
<v-btn text color="primary" @click="menu = false">Cancel</v-btn>
<v-btn text color="primary" @click="$refs.menu.save(newstartdate)">OK</v-btn>
<v-date-picker v-model="newstartdate" @input="menu = false" no-title scrollable>
</v-date-picker>
</v-menu>
</v-col>
@ -59,7 +57,7 @@
ref="menu2"
v-model="menu2"
:close-on-content-click="false"
:return-value.sync="newenddate"
:nudge-right="40"
transition="scale-transition"
offset-y
min-width="290px"
@ -73,10 +71,8 @@
v-on="on"
></v-text-field>
</template>
<v-date-picker v-model="newenddate" no-title scrollable>
<v-spacer></v-spacer>
<v-btn text color="primary" @click="menu2 = false">Cancel</v-btn>
<v-btn text color="primary" @click="$refs.menu2.save(newenddate)">OK</v-btn>
<v-date-picker v-model="newenddate" @input="menu2 = false" no-title scrollable>
</v-date-picker>
</v-menu>
</v-col>
@ -107,6 +103,7 @@
v-if="menutime"
v-model="timestart"
full-width
format="24hr"
@click:minute="$refs.menutime.save(timestart)"
></v-time-picker>
</v-menu>
@ -136,6 +133,7 @@
v-if="menutime2"
v-model="timeend"
full-width
format="24hr"
@click:minute="$refs.menutime2.save(timeend)"
></v-time-picker>
</v-menu>

18
frontend/src/views/EditTimerecord.vue
View File

@ -20,7 +20,7 @@
ref="menu"
v-model="menu"
:close-on-content-click="false"
:return-value.sync="newstartdate"
:nudge-right="40"
transition="scale-transition"
offset-y
min-width="290px"
@ -34,10 +34,8 @@
v-on="on"
></v-text-field>
</template>
<v-date-picker v-model="newstartdate" no-title scrollable>
<v-spacer></v-spacer>
<v-btn text color="primary" @click="menu = false">Cancel</v-btn>
<v-btn text color="primary" @click="$refs.menu.save(newstartdate)">OK</v-btn>
<v-date-picker v-model="newstartdate" @input="menu = false" no-title scrollable>
</v-date-picker>
</v-menu>
</v-col>
@ -46,7 +44,7 @@
ref="menu2"
v-model="menu2"
:close-on-content-click="false"
:return-value.sync="newenddate"
:nudge-right="40"
transition="scale-transition"
offset-y
min-width="290px"
@ -60,10 +58,8 @@
v-on="on"
></v-text-field>
</template>
<v-date-picker v-model="newenddate" no-title scrollable>
<v-spacer></v-spacer>
<v-btn text color="primary" @click="menu2 = false">Cancel</v-btn>
<v-btn text color="primary" @click="$refs.menu2.save(newenddate)">OK</v-btn>
<v-date-picker v-model="newenddate" @input="menu2 = false" no-title scrollable>
</v-date-picker>
</v-menu>
</v-col>
@ -94,6 +90,7 @@
v-if="menutime"
v-model="timestart"
full-width
format="24hr"
@click:minute="$refs.menutime.save(timestart)"
></v-time-picker>
</v-menu>
@ -123,6 +120,7 @@
v-if="menutime2"
v-model="timeend"
full-width
format="24hr"
@click:minute="$refs.menutime2.save(timeend)"
></v-time-picker>
</v-menu>