From 73027b80587e09f8f19eff97168ab5096c9334a5 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 27 Dec 2021 10:14:45 +0100
Subject: [PATCH 1/2] Update admin/src/pages/UserSearch.vue

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 admin/src/pages/UserSearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index c5bb8113b..186f2c8ce 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -42,7 +42,7 @@ export default {
         { key: 'lastName', label: 'Lastname' },
         {
           key: 'creation',
-          label: 'open Creation',
+          label: 'Open creations',
           formatter: (value, key, item) => {
             return (
               `

From cfea775447435ce9b4056203d3f1b889e09cd3ef Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 27 Dec 2021 10:56:08 +0100
Subject: [PATCH 2/2] add variable year for formated date and added it to the
 predifined text.

---
 admin/src/components/CreationFormular.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index 78f53e6e5..9d1309cae 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -171,14 +171,17 @@ export default {
       currentMonth: {
         short: this.$moment().format('MMMM'),
         long: this.$moment().format('YYYY-MM-DD'),
+        year: this.$moment().format('YYYY'),
       },
       lastMonth: {
         short: this.$moment().subtract(1, 'month').format('MMMM'),
         long: this.$moment().subtract(1, 'month').format('YYYY-MM') + '-01',
+        year: this.$moment().subtract(1, 'month').format('YYYY'),
       },
       beforeLastMonth: {
         short: this.$moment().subtract(2, 'month').format('MMMM'),
         long: this.$moment().subtract(2, 'month').format('YYYY-MM') + '-01',
+        year: this.$moment().subtract(2, 'month').format('YYYY'),
       },
       submitObj: null,
       isdisabled: true,
@@ -190,7 +193,7 @@ export default {
     // Auswählen eines Zeitraumes
     updateRadioSelected(name, index, openCreation) {
       this.createdIndex = index
-      this.text = 'Schöpfung für ' + name.short + ' ' + this.$moment().format('YYYY')
+      this.text = 'Schöpfung für ' + name.short + ' ' + name.year
       // Wenn Mehrfachschöpfung
       if (this.type === 'massCreation') {
         // An Creation.vue emitten und radioSelectedMass aktualisieren