Merge pull request #264 from EC-Nordbund/dev

Release 1.0.2

electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ec-verwaltungs-app",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "EC-Verwaltungs Application",
   "keywords": [],
   "homepage": "https://ec-nordbund.de",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ec-verwaltungs-app",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "EC-Verwaltungs Application",
   "keywords": [],
   "homepage": "https://ec-nordbund.de",

src/views/anmeldungen/details.vue

@@ -128,7 +128,7 @@
               :mapper="item=>item"
               icon="notes"
               edit
-              @edit="soon"
+              @edit="bemerkungen_edit"
             />
             <v-divider/>
             <ec-list
@@ -182,8 +182,10 @@
       />
       <ec-form
         title="Bemerkungen editieren"
-        :fieldConfig="[]"
-        :show="false"
+        :fieldConfig="bemerkungen_config"
+        v-model="bemerkungen_show"
+        :value="bemerkungen_value"
+        @save="bemerkungen_save"
       />
     </template> 
 
@@ -321,6 +323,58 @@ const loadGQL = gql`
   }
 })
 export default class anmeldungsDetails extends reloaderBase {
+  bemerkungen_value:any={}
+  bemerkungen_edit() {
+    this.bemerkungen_value={}
+    this.bemerkungen_value={
+      vegetarisch: this.data.anmeldung.vegetarisch,
+      lebensmittelAllergien: this.data.anmeldung.lebensmittelAllergien,
+      gesundheitsinformationen: this.data.anmeldung.gesundheitsinformationen,
+      bemerkungen: this.data.anmeldung.bemerkungen,
+    }
+    this.bemerkungen_show=true
+  }
+  bemerkungen_config = [
+    {
+      name: 'vegetarisch',
+      label: 'Verpflegung',
+      componentName: 'v-select',
+      items: [
+        {text: 'Vegetarisch', value: true},
+        {text: 'Normal', value: false}
+      ]
+    },
+    {
+      name: 'lebensmittelAllergien',
+      label: 'Lebensmittelallergien',
+      componentName: 'v-textarea'
+    },
+    {
+      name: 'gesundheitsinformationen',
+      label: 'Gesundheitsinformationen',
+      componentName: 'v-textarea'
+    },
+    {
+      name: 'bemerkungen',
+      label: 'Bemerkungen',
+      componentName: 'v-textarea'
+    }
+  ]
+  bemerkungen_save(value:any){
+    this.$apollo.mutate({
+      mutation: gql`
+        mutation($authToken: String!, $anmeldeID: String!, $vegetarisch: Boolean!, $gesundheitsinformationen: String!, $bemerkungen: String!, $lebensmittelAllergien: String!){
+          anmeldungBesonderheiten(authToken: $authToken, anmeldeID: $anmeldeID, vegetarisch: $vegetarisch, gesundheitsinformationen: $gesundheitsinformationen, bemerkungen: $bemerkungen, lebensmittelAllergien: $lebensmittelAllergien)
+        }
+      `,
+      variables: {
+        authToken: auth.authToken,
+        anmeldeID: this.$route.params.id,
+        ...value
+      }
+    }).then(this.refetch)
+  }
+  bemerkungen_show=false
   tree = []
   data: any = {
     anmeldung: {

src/views/arbeitskreise/details.vue

@@ -216,10 +216,7 @@ export default class AKDetails extends reloaderBase {
   edit(item: any) {
     this.editAKPerson_value = {
       personAKID: item.personAKID,
-      personID: item.person.personID,
-      eintritt: item.eintritt.input,
-      austritt: (item.austritt || {}).input,
-      leiter: item.leiter
+      personID: item.person.personID
     }
     this.editAKPerson_show = true
   }

yarn.lock

@@ -1412,18 +1412,10 @@ array-map@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
 
-array-parallel@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/array-parallel/-/array-parallel-0.1.3.tgz#8f785308926ed5aa478c47e64d1b334b6c0c947d"
-
 array-reduce@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
 
-array-series@~0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/array-series/-/array-series-0.1.5.tgz#df5d37bfc5c2ef0755e2aa4f92feae7d4b5a972f"
-
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -2456,13 +2448,6 @@ cross-spawn@^3.0.0:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
-cross-spawn@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
-  dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
-
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -3885,15 +3870,6 @@ globule@^1.0.0:
     lodash "~4.17.10"
     minimatch "~3.0.2"
 
-gm@^1.23.1:
-  version "1.23.1"
-  resolved "https://registry.yarnpkg.com/gm/-/gm-1.23.1.tgz#2edeeb958084d0f8ea7988e5d995b1c7dfc14777"
-  dependencies:
-    array-parallel "~0.1.3"
-    array-series "~0.1.5"
-    cross-spawn "^4.0.0"
-    debug "^3.1.0"
-
 good-listener@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
@@ -8673,13 +8649,6 @@ vuepress@^0.10.0:
     webpackbar "^2.6.1"
     workbox-build "^3.1.0"
 
-vuetify-loader@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/vuetify-loader/-/vuetify-loader-1.0.5.tgz#da04cdab6b4fc49f9d14964ee23e6f26564ce310"
-  dependencies:
-    gm "^1.23.1"
-    loader-utils "^1.1.0"
-
 vuetify@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-1.3.0.tgz#7f30641ae906f88728dea21da689d02b0a297f41"