@afeefa/vue-app 0.0.260 → 0.0.262

package/.afeefa/package/release/version.txt

@@ -1 +1 @@
-0.0.260
+0.0.262

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afeefa/vue-app",
-  "version": "0.0.260",
+  "version": "0.0.262",
   "description": "",
   "author": "Afeefa Kollektiv <kollektiv@afeefa.de>",
   "license": "MIT",

package/src/components/form/EditModal.vue

@@ -33,11 +33,11 @@
           justify-end
         >
           <v-btn
-            ref="deleteButton"
             v-if="deleteButton && modelToEdit.id"
+            ref="deleteButton"
             small
             color="error"
-            @click="handleDelete"
+            @click="handleDelete(modelToEdit)"
           >
             Löschen
           </v-btn>
@@ -53,6 +53,7 @@
             :changed="changed || forceChanged"
             :forceActive="forceActive"
             :valid="validFromOutside && valid"
+            :saveTitle="saveTitle"
             angular
             :has="{reset: reset && !!modelToEdit.id}"
             @save="$emit('save', modelToEdit, ignoreChangesOnClose, close)"
@@ -72,7 +73,7 @@ import { Component, Vue, Watch } from '@a-vue'
 import { DialogEvent } from '@a-vue/events'
 
 @Component({
-  props: ['model', 'createModelToEdit', 'show', {deleteButton: false, reset: true, valid: true, forceChanged: false, forceActive: false}]
+  props: ['model', 'createModelToEdit', 'show', {deleteButton: false, reset: true, valid: true, forceChanged: false, forceActive: false, saveTitle: 'Speichern'}]
 })
 export default class EditModal extends Vue {
   show_ = false
@@ -147,7 +148,7 @@ export default class EditModal extends Vue {
     this.show_ = false
   }
 
-  async handleDelete () {
+  async handleDelete (modelToEdit) {
     const result = await this.$events.dispatch(new DialogEvent(DialogEvent.SHOW, {
       anchor: this.$refs.form,
       title: 'Löschen bestätigen',
@@ -155,7 +156,7 @@ export default class EditModal extends Vue {
       yesButton: 'Löschen'
     }))
     if (result === DialogEvent.RESULT_YES) {
-      this.$emit('delete', this.ignoreChangesOnClose, this.close)
+      this.$emit('delete', modelToEdit, this.ignoreChangesOnClose, this.close)
       this.show_ = false
     }
   }

package/src/components/form/fields/FormFieldText.vue

@@ -6,7 +6,11 @@
     :validator="validator"
     v-bind="$attrs"
     v-on="$listeners"
-  />
+  >
+    <template #append>
+      <slot name="append" />
+    </template>
+  </a-text-field>
 </template>
 
 <script>

package/src/utils/format-euro-price.js

@@ -1,5 +1,5 @@
-export function formatEuroPrice (price) {
-  if (!price) {
+export function formatEuroPrice (price, showZero = false) {
+  if (!price && !showZero) {
     return ''
   }
 

package/src-admin/components/detail/EditableDetailProperty.vue

@@ -32,6 +32,8 @@
         :createModelToEdit="createModelToEdit"
         :title="label"
         :icon="icon"
+        :deleteButton="deleteButton"
+        @delete="deleteModel"
         @save="save"
         @close="close"
       >
@@ -86,6 +88,7 @@ import { Component, Vue } from '@a-vue'
       buttonEdit: false,
       buttonAdd: false,
       buttonCreate: false,
+      deleteButton: false,
       modalWidth: 'auto',
       buttonSize: 'small'
     }
@@ -98,6 +101,10 @@ export default class EditableDetailProperty extends Vue {
     this.$emit('save', {model, ignoreChangesOnClose, closeModal})
   }
 
+  deleteModel (model, ignoreChangesOnClose, closeModal) {
+    this.$emit('delete', {model, ignoreChangesOnClose, closeModal})
+  }
+
   openModal () {
     this.showForm = true
   }

package/src-admin/components/form/EditFormButtons.vue

@@ -11,7 +11,7 @@
             small
             :disabled="disabled"
             color="green white--text"
-            title="Speichern"
+            :title="saveTitle"
             @click="$emit('save')"
           >
             <v-icon
@@ -22,7 +22,7 @@
             </v-icon>
 
             <template v-if="angular">
-              Speichern
+              {{ saveTitle }}
             </template>
           </v-btn>
         </div>
@@ -30,10 +30,10 @@
 
       <span v-if="disabled">
         <template v-if="!valid">
-          Daten berichtigen,<br>um zu speichern
+          Daten berichtigen,<br>um zu {{ saveTitle.toLowerCase() }}
         </template>
         <template v-else>
-          Daten ändern,<br>um zu speichern
+          Daten ändern,<br>um zu {{ saveTitle.toLowerCase() }}
         </template>
       </span>
     </v-tooltip>
@@ -64,7 +64,12 @@ import { mdiRotateLeft} from '@mdi/js'
   props: [
     'changed',
     'valid',
-    {angular: false, small: false, forceActive: false}
+    {
+      angular: false,
+      small: false,
+      forceActive: false,
+      saveTitle: 'Speichern'
+    }
   ]
 })
 export default class EditFormButtons extends Vue {