summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorChristian Hofmaier2019-04-15 18:26:00 +0200
committerChristian Hofmaier2019-04-15 18:26:00 +0200
commitd7ff0d5ac3698f51709be1be3decf8573ab5c02b (patch)
treee37ef50a1107beee3de2ac51ba6698bf095e235f /webapp
parent[eventmanager] integrate WoL utility (diff)
downloadbas-d7ff0d5ac3698f51709be1be3decf8573ab5c02b.tar.gz
bas-d7ff0d5ac3698f51709be1be3decf8573ab5c02b.tar.xz
bas-d7ff0d5ac3698f51709be1be3decf8573ab5c02b.zip
[eventmanager] UI improvements
- show IDs in table - dblclick events to open dialog - some stepper improvements - language tags
Diffstat (limited to 'webapp')
-rw-r--r--webapp/src/components/EventModuleDelete.vue8
-rw-r--r--webapp/src/components/EventModuleEdit.vue5
-rw-r--r--webapp/src/components/EventModuleEventList.vue3
3 files changed, 11 insertions, 5 deletions
diff --git a/webapp/src/components/EventModuleDelete.vue b/webapp/src/components/EventModuleDelete.vue
index f22fc41..ebf1f83 100644
--- a/webapp/src/components/EventModuleDelete.vue
+++ b/webapp/src/components/EventModuleDelete.vue
@@ -1,10 +1,12 @@
<i18n>
{
"en": {
- "delete-are-you-sure": "Are you sure you want to delete this event? | Are you sure you want to delete these events?"
+ "delete-are-you-sure": "Are you sure you want to delete this event? | Are you sure you want to delete these events?",
+ "eventDeleteSuccess": "Event deleted successfully | Events deleted successfully"
},
"de": {
- "delete-are-you-sure": "Sind sie sicher, dass sie diese Veranstaltung Löschen wollen? | Sind sie sicher, dass sie diese Veranstaltungen löschen wollen?"
+ "delete-are-you-sure": "Sind sie sicher, dass sie diese Veranstaltung Löschen wollen? | Sind sie sicher, dass sie diese Veranstaltungen löschen wollen?",
+ "eventDeleteSuccess": "Event erfolgreich gelöscht | Events erfolgreich gelöscht"
}
}
</i18n>
@@ -53,7 +55,7 @@ export default {
}
await this.$http.post('/api/events?delete', { ids: deleteIds })
this.setDialog({ show: false })
- this.$snackbar({ color: 'success', text: this.$t('eventDeleteSuccess') })
+ this.$snackbar({ color: 'success', text: this.$tc('eventDeleteSuccess', [deleteIds.length]) })
this.$store.dispatch('events/loadEvents')
}
}
diff --git a/webapp/src/components/EventModuleEdit.vue b/webapp/src/components/EventModuleEdit.vue
index 025ecfb..437fc02 100644
--- a/webapp/src/components/EventModuleEdit.vue
+++ b/webapp/src/components/EventModuleEdit.vue
@@ -17,6 +17,7 @@
"event": "Event",
"eventName": "Event Name",
"eventNameEmptyError": "Event Name can't be empty!",
+ "eventSavedSuccess": "Event saved successfully",
"february": "February",
"friday": "Friday",
"groups": "Groups",
@@ -68,6 +69,7 @@
"event": "Veranstaltung",
"eventName": "Veranstaltungsname",
"eventNameEmptyError": "Der Veranstaltungsname kann nicht leer sein!",
+ "eventSavedSuccess": "Event erfolgreich gespeichert",
"february": "Februar",
"friday": "Freitag",
"groups": "Gruppen",
@@ -379,9 +381,10 @@
<v-card-actions>
<v-spacer></v-spacer>
<v-btn flat @click.native="$store.commit('events/setDialog', { show : false } )">{{ $t('cancel') }}</v-btn>
+ <v-btn :color="dialog.info.id ? 'primary' : 'success'" v-show="step == 1" @click="submit" type="submit">{{ dialog.info.id ? $t('save') : $t('create') }}</v-btn>
<v-btn color="primary" v-show="step == 1" @click.native="completeStepOne()">{{ $t('continue') }}</v-btn>
<v-btn :color="dialog.info.id ? 'primary' : 'success'" v-show="step == 2" @click="submit" type="submit">{{ dialog.info.id ? $t('save') : $t('create') }}</v-btn>
- <v-btn color="primary" v-show="step == 2" @click.native="completeStepTwo()">{{ $t('continue') }}</v-btn>
+ <v-btn color="primary" v-show="step == 2 && groups.length > 0" @click.native="completeStepTwo()">{{ $t('continue') }}</v-btn>
<v-btn :color="dialog.info.id ? 'primary' : 'success'" v-show="step == 3" @click="submit" type="submit">{{ dialog.info.id ? $t('save') : $t('create') }}</v-btn>
</v-card-actions>
</v-card>
diff --git a/webapp/src/components/EventModuleEventList.vue b/webapp/src/components/EventModuleEventList.vue
index 1cbe233..f07b6e9 100644
--- a/webapp/src/components/EventModuleEventList.vue
+++ b/webapp/src/components/EventModuleEventList.vue
@@ -22,7 +22,7 @@
<template>
<div>
<v-card>
- <data-table v-model="selectedEvents" :headers="headers" :items="events">
+ <data-table v-model="selectedEvents" :headers="headers" :items="events" @dblclick="editEvent($event)">
<div slot="action" slot-scope="row" style="text-align: right">
<v-btn flat icon color="primary" @click.stop="editEvent(row.item)"><v-icon>edit</v-icon></v-btn>
</div>
@@ -56,6 +56,7 @@ export default {
computed: {
headers () {
return [
+ { text: this.$t('id'), key: 'id', width: '50px' },
{ text: this.$t('name'), key: 'name' },
{ text: this.$t('description'), key: 'description' },
{ text: this.$t('config'), key: 'configName' },