From aff8e78bf8cb3a514ef850e6f25ba2cc2a03d34d Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 3 Jan 2022 10:12:17 +0100 Subject: [PATCH 01/11] month names in user search of open creations in multiple creation --- admin/src/pages/Creation.vue | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue index 4d6dca920..3e18b3078 100644 --- a/admin/src/pages/Creation.vue +++ b/admin/src/pages/Creation.vue @@ -62,7 +62,31 @@ export default { { key: 'bookmark', label: 'bookmark' }, { key: 'firstName', label: this.$t('firstname') }, { key: 'lastName', label: this.$t('lastname') }, - { key: 'creation', label: this.$t('open_creations') }, + { + key: 'creation', + label: this.$t('open_creation'), + formatter: (value, key, item) => { + return ( + ` +
` + + this.$moment().subtract(2, 'month').format('MMMM') + + ` - ` + + String(value[0]) + + ` GDD
+
` + + this.$moment().subtract(1, 'month').format('MMMM') + + ` - ` + + String(value[1]) + + ` GDD
+
` + + this.$moment().format('MMMM') + + ` - ` + + String(value[2]) + + ` GDD
+ ` + ) + }, + }, { key: 'email', label: this.$t('e_mail') }, ], fields: [ From 23875d6bc8e783ca8c8687ec5308e63594b1ebf3 Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 3 Jan 2022 10:13:44 +0100 Subject: [PATCH 02/11] month names in table of selected users of the open creations in multiple creations --- admin/src/pages/Creation.vue | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue index 3e18b3078..cdcc03c9d 100644 --- a/admin/src/pages/Creation.vue +++ b/admin/src/pages/Creation.vue @@ -93,7 +93,31 @@ export default { { key: 'email', label: this.$t('e_mail') }, { key: 'firstName', label: this.$t('firstname') }, { key: 'lastName', label: this.$t('lastname') }, - { key: 'creation', label: this.$t('open_creations') }, + { + key: 'creation', + label: this.$t('open_creation'), + formatter: (value, key, item) => { + return ( + ` +
` + + this.$moment().subtract(2, 'month').format('MMMM') + + ` - ` + + String(value[0]) + + ` GDD
+
` + + this.$moment().subtract(1, 'month').format('MMMM') + + ` - ` + + String(value[1]) + + ` GDD
+
` + + this.$moment().format('MMMM') + + ` - ` + + String(value[2]) + + ` GDD
+ ` + ) + }, + }, { key: 'bookmark', label: this.$t('remove') }, ], itemsList: [], From a387d1649bf1f776d541ef966e624308719a5b17 Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 3 Jan 2022 10:15:30 +0100 Subject: [PATCH 03/11] yarn lint --fix --- admin/src/pages/Creation.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue index cdcc03c9d..7643ff771 100644 --- a/admin/src/pages/Creation.vue +++ b/admin/src/pages/Creation.vue @@ -62,7 +62,7 @@ export default { { key: 'bookmark', label: 'bookmark' }, { key: 'firstName', label: this.$t('firstname') }, { key: 'lastName', label: this.$t('lastname') }, - { + { key: 'creation', label: this.$t('open_creation'), formatter: (value, key, item) => { @@ -93,7 +93,7 @@ export default { { key: 'email', label: this.$t('e_mail') }, { key: 'firstName', label: this.$t('firstname') }, { key: 'lastName', label: this.$t('lastname') }, - { + { key: 'creation', label: this.$t('open_creation'), formatter: (value, key, item) => { From c4d6daa57ef8d5606a51622229466979cef07738 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 6 Jan 2022 10:35:14 +0100 Subject: [PATCH 04/11] shortname month in open creations seltected multi creations --- admin/src/pages/Creation.vue | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue index 7643ff771..6502da381 100644 --- a/admin/src/pages/Creation.vue +++ b/admin/src/pages/Creation.vue @@ -95,27 +95,15 @@ export default { { key: 'lastName', label: this.$t('lastname') }, { key: 'creation', - label: this.$t('open_creation'), + // label: this.$t('open_creation') + 'Jan | Feb | März', + label: + this.$moment().subtract(2, 'month').format('MMM') + + ' | ' + + this.$moment().subtract(1, 'month').format('MMM') + + ' | ' + + this.$moment().format('MMM'), formatter: (value, key, item) => { - return ( - ` -
` + - this.$moment().subtract(2, 'month').format('MMMM') + - ` - ` + - String(value[0]) + - ` GDD
-
` + - this.$moment().subtract(1, 'month').format('MMMM') + - ` - ` + - String(value[1]) + - ` GDD
-
` + - this.$moment().format('MMMM') + - ` - ` + - String(value[2]) + - ` GDD
- ` - ) + return String(value[0]) + ` | ` + String(value[1]) + ` | ` + String(value[2]) }, }, { key: 'bookmark', label: this.$t('remove') }, From df17955fef6090cf635137916bdb7a21d8f128a0 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 6 Jan 2022 10:37:02 +0100 Subject: [PATCH 05/11] shortname month in open creations user search in multi creations --- admin/src/pages/Creation.vue | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue index 6502da381..4fabc064a 100644 --- a/admin/src/pages/Creation.vue +++ b/admin/src/pages/Creation.vue @@ -1,7 +1,7 @@