@afeefa/vue-app 0.0.261 → 0.0.263

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

@@ -1 +1 @@
-0.0.261
+0.0.263

package/package.json

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

package/src/components/ADatePicker.vue

@@ -229,7 +229,8 @@ export default class ADatePicker extends Mixins(ComponentWidthMixin, UsesPositio
       // take given date string an create a local time date object
       // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date#date_time_string_format
       // > When the time zone offset is absent, date-only forms are interpreted as a UTC time and date-time forms are interpreted as local time.
-      const dateStringThatGetsConvertedToLocalDate = date + 'T00:00'
+      const timeString = this.value_ ? this.value_.toTimeString().split(' ')[0] : '00:00:00'
+      const dateStringThatGetsConvertedToLocalDate = date + 'T' + timeString
       this.value_ = new Date(dateStringThatGetsConvertedToLocalDate)
     } else {
       this.value_ = null

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>
@@ -148,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',
@@ -156,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/components/list/filters/ListFilterSearchSelect.vue

@@ -79,7 +79,7 @@
 
 
 <script>
-import { Component, Mixins } from '@a-vue'
+import { Component, Mixins, Watch } from '@a-vue'
 import { ListFilterMixin } from '../ListFilterMixin'
 import { ListAction, GetAction } from '@a-vue/api-resources/ApiActions'
 import { Category } from '@/models'
@@ -97,8 +97,18 @@ export default class ListFilterSearchSelect extends Mixins(ListFilterMixin) {
 
   items = []
   inputModel = 'Alle'
+  filterChangedFromInside = false
 
   async created () {
+    this.onFilterValueChanged()
+  }
+
+  @Watch('filter.value')
+  async onFilterValueChanged () {
+    if (this.filterChangedFromInside) {
+      return
+    }
+
     if (this.filter.value) {
       const model = await this.createGetAction()
         .params({
@@ -164,12 +174,19 @@ export default class ListFilterSearchSelect extends Mixins(ListFilterMixin) {
   }
 
   itemSelected (model) {
+    this.filterChangedFromInside = true
+
     if (model) {
       this.filter.value = model.id
       this.inputModel = model.getTitle()
     } else {
       this.filter.value = null
     }
+
+    this.$nextTick(() => {
+      this.filterChangedFromInside = false
+    })
+
     this.$emit('select', model)
   }
 

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
   }