From 67f6dd188b2dbbfa60e28ee020a784bcf021a509 Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Mon, 25 Feb 2019 23:17:17 +0000 Subject: [webapp] small ui fixes --- webapp/src/components/AccountModule.vue | 2 +- webapp/src/components/BackendModule.vue | 2 +- webapp/src/components/ConfiguratorModule.vue | 14 ++- webapp/src/components/ConfiguratorModuleAssign.vue | 110 +++++++++++++++++++++ webapp/src/components/ConfiguratorModuleConfig.vue | 5 +- webapp/src/components/ConfiguratorModuleDelete.vue | 5 +- webapp/src/components/ConfiguratorModuleEntry.vue | 5 +- webapp/src/components/GroupModuleDialog.vue | 2 +- webapp/src/components/PermissionModule.vue | 2 +- webapp/src/components/RegistrationModuleDelete.vue | 5 +- webapp/src/components/RegistrationModuleEdit.vue | 2 +- webapp/src/components/UserModuleDelete.vue | 2 +- webapp/src/components/UserModuleEdit.vue | 2 +- webapp/src/store/groups.js | 1 + 14 files changed, 137 insertions(+), 22 deletions(-) create mode 100644 webapp/src/components/ConfiguratorModuleAssign.vue (limited to 'webapp') diff --git a/webapp/src/components/AccountModule.vue b/webapp/src/components/AccountModule.vue index 3b3b2e4..22ad287 100644 --- a/webapp/src/components/AccountModule.vue +++ b/webapp/src/components/AccountModule.vue @@ -230,7 +230,7 @@ :fullscreen="$vuetify.breakpoint.smAndDown" > - +
{{ $t('deleteAccount') }}
diff --git a/webapp/src/components/BackendModule.vue b/webapp/src/components/BackendModule.vue index 874110c..c48c20d 100644 --- a/webapp/src/components/BackendModule.vue +++ b/webapp/src/components/BackendModule.vue @@ -43,7 +43,7 @@ scrollable > - +
{{ $tc('removeBackend', selected.length, [selected.length]) }}
diff --git a/webapp/src/components/ConfiguratorModule.vue b/webapp/src/components/ConfiguratorModule.vue index 597ff30..9682dc0 100644 --- a/webapp/src/components/ConfiguratorModule.vue +++ b/webapp/src/components/ConfiguratorModule.vue @@ -41,6 +41,7 @@
+ device_hub edit
@@ -74,7 +75,7 @@ + @@ -91,6 +93,7 @@ import DataTable from '@/components/DataTable' import ConfiguratorModuleDelete from '@/components/ConfiguratorModuleDelete' import ConfiguratorModuleConfig from '@/components/ConfiguratorModuleConfig' import ConfiguratorModuleEntry from '@/components/ConfiguratorModuleEntry' +import ConfiguratorModuleAssign from '@/components/ConfiguratorModuleAssign' import { mapState, mapGetters, mapMutations } from 'vuex' export default { @@ -99,7 +102,8 @@ export default { DataTable, ConfiguratorModuleDelete, ConfiguratorModuleConfig, - ConfiguratorModuleEntry + ConfiguratorModuleEntry, + ConfiguratorModuleAssign }, data () { return { @@ -116,7 +120,7 @@ export default { { key: 'id', text: this.$t('id'), width: '50px' }, { key: 'name', text: this.$t('name') }, { key: 'description', text: this.$t('description') }, - { key: 'actions', width: '60px' } + { key: 'actions', width: '120px' } ] }, entryHeaders () { @@ -145,6 +149,9 @@ export default { createEntry () { this.setDialog({ show: true, type: 'entry', info: {} }) }, + assignConfig (item) { + this.setDialog({ show: true, type: 'assign', info: item }) + }, editConfig (item) { this.setDialog({ show: true, type: 'config', info: item }) }, @@ -154,6 +161,7 @@ export default { }, created () { this.$store.dispatch('configurator/loadData') + this.$store.dispatch('groups/loadLists') } } diff --git a/webapp/src/components/ConfiguratorModuleAssign.vue b/webapp/src/components/ConfiguratorModuleAssign.vue new file mode 100644 index 0000000..6f6e61f --- /dev/null +++ b/webapp/src/components/ConfiguratorModuleAssign.vue @@ -0,0 +1,110 @@ + +{ + "en": { + "name": "Name", + "description": "Description", + "ip": "IP Address", + "title": "Assign groups and clients", + "assign": "Assign" + }, + "de": { + "name": "Name", + "description": "Beschreibung", + "ip": "IP Adresse", + "title": "Gruppen und Clienten zuweisen", + "assign": "Zuweisen" + } +} + + + + + + + + diff --git a/webapp/src/components/ConfiguratorModuleConfig.vue b/webapp/src/components/ConfiguratorModuleConfig.vue index 0cd31e4..45dc352 100644 --- a/webapp/src/components/ConfiguratorModuleConfig.vue +++ b/webapp/src/components/ConfiguratorModuleConfig.vue @@ -35,7 +35,7 @@