@afeefa/vue-app 0.0.316 → 0.0.318

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

@@ -1 +1 @@
-0.0.316
+0.0.318

package/package.json

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

package/src/components/ADatePicker.vue

@@ -251,13 +251,22 @@ export default class ADatePicker extends Mixins(ComponentWidthMixin, UsesPositio
               : value.substr(4, 4))
         value = `${day.padStart(2, '0')}.${month.padStart(2, '0')}.${year}`
       } else {
-        // also accept DD.MM.YY and expand to YYYY (covers inputs like '1.2.20')
-        const m = value.match(/^(\d{1,2})\.(\d{1,2})\.(\d{2})$/)
-        if (m) {
-          const day = m[1].padStart(2, '0')
-          const month = m[2].padStart(2, '0')
-          const year = (2000 + parseInt(m[3], 10)).toString()
+        // accept D.M. without year and expand to current year (covers inputs like '1.7.')
+        const mNoYear = value.match(/^(\d{1,2})\.(\d{1,2})\.$/)
+        if (mNoYear) {
+          const day = mNoYear[1].padStart(2, '0')
+          const month = mNoYear[2].padStart(2, '0')
+          const year = new Date().getFullYear().toString()
           value = `${day}.${month}.${year}`
+        } else {
+          // also accept DD.MM.YY and expand to YYYY (covers inputs like '1.2.20')
+          const m = value.match(/^(\d{1,2})\.(\d{1,2})\.(\d{2})$/)
+          if (m) {
+            const day = m[1].padStart(2, '0')
+            const month = m[2].padStart(2, '0')
+            const year = (2000 + parseInt(m[3], 10)).toString()
+            value = `${day}.${month}.${year}`
+          }
         }
       }
 

package/src/components/ASearchSelect.vue

@@ -1,5 +1,8 @@
 <template>
-  <div :class="['a-search-select', widthClass]">
+  <div
+    :class="['a-search-select', widthClass]"
+    :style="cwm_widthStyle"
+  >
     <div
       class="activator"
       @click="open"

package/src-admin/components/controls/SearchSelectFormField.vue

@@ -1,223 +0,0 @@
-<template>
-  <div>
-    <a-table
-      v-if="selectedItems.length"
-      :style="selectedWidthStyle"
-    >
-      <a-table-header
-        v-if="hasHeader"
-        small
-      >
-        <div
-          v-for="(column, index) in selectedColumns"
-          :key="index"
-        >
-          {{ column.header }}
-        </div>
-      </a-table-header>
-
-      <a-table-row
-        v-for="(item, index) in selectedItems"
-        :key="item.id"
-        :selected="isClicked(item)"
-      >
-        <template v-for="(column, index2) in selectedColumns">
-          <v-icon
-            v-if="column.icon"
-            :key="'icon' + index2"
-            :color="column.icon.color"
-            class="selectedIcon"
-            size="1.5rem"
-            v-text="column.icon.icon"
-          />
-
-          <div
-            v-else
-            :key="'text' + index2"
-            class="selectedContent"
-          >
-            {{ column.text(item) }}
-          </div>
-        </template>
-
-        <div>
-          <a-context-menu
-            :ref="'editItem' + index"
-            @open="clickedItem = item"
-            @close="clickedItem = null"
-          >
-            <a-context-menu-item @click="removeItem(item, index)">
-              <v-icon>$trashCanIcon</v-icon>
-              Löschen
-            </a-context-menu-item>
-          </a-context-menu>
-        </div>
-      </a-table-row>
-    </a-table>
-
-    <div v-else>
-      {{ isEmptyText }}
-    </div>
-
-    <a-search-select
-      :listAction="selectableConfig.listAction"
-      :selectedItems="selectableSelectedItems"
-      :width="selectableWidth"
-      @select="addItem"
-    >
-      <template #activator>
-        <a-icon-button
-          small
-          icon="$plusIcon"
-          :text="selectableConfig.addButtonTitle || 'Hinzufügen'"
-          class="mt-4"
-        />
-      </template>
-
-      <template #filters>
-        <a-row gap="4">
-          <list-filter-search
-            :focus="true"
-            maxWidth="100%"
-            label="Suche Berater:in"
-          />
-
-          <list-filter-page
-            :has="{page_size: false, page_number: true}"
-            :totalVisible="0"
-          />
-        </a-row>
-      </template>
-
-      <template #row="{ model, on }">
-        <template
-          v-for="(column, index) in selectableColumns"
-          v-on="on"
-        >
-          <v-icon
-            v-if="column.icon"
-            :key="'icon' + index"
-            :color="column.icon.color"
-            class="selectableIcon"
-            size="1.5rem"
-            v-on="on"
-            v-text="column.icon.icon"
-          />
-
-          <div
-            v-else
-            :key="'text' + index"
-            class="selectableContent"
-            v-on="on"
-          >
-            {{ column.text(model) }}
-          </div>
-        </template>
-      </template>
-    </a-search-select>
-  </div>
-</template>
-
-
-<script>
-import { Component, Vue } from '@a-vue'
-
-@Component({
-  props: [
-    'value',
-    'selectedConfig',
-    'selectedWidth',
-    'selectableConfig',
-    'selectableWidth'
-  ]
-})
-export default class SearchSelectFormField extends Vue {
-  clickedItem = null
-
-  get hasHeader () {
-    return this.selectedColumns.some(c => !!c.header)
-  }
-
-  get selectedItems () {
-    return this.value
-  }
-
-  get selectableSelectedItems () {
-    return this.value.map(this.selectedConfig.selectedToSelectableItem)
-  }
-
-  get isEmptyText () {
-    return this.selectedConfig.isEmptyText
-  }
-
-  isClicked (selectedItem) {
-    return selectedItem === this.clickedItem
-  }
-
-  get selectedColumns () {
-    return this.selectedConfig.columns
-  }
-
-  get selectableColumns () {
-    return this.selectableConfig.columns
-  }
-
-  addItem (selectableItem) {
-    const selectedItem = this.selectedConfig.newSelectedItem(selectableItem)
-    const selectedItems = [...this.value, selectedItem]
-    if (this.$listeners.add) {
-      this.$emit('add', selectedItems)
-    } else {
-      this.$emit('input', selectedItems)
-    }
-  }
-
-  async removeItem (selectedItem, rowIndex) {
-    const removeDialog = this.selectedConfig.removeDialog(selectedItem)
-    const dialog = {
-      anchor: this.$refs['editItem' + rowIndex], // is array [component]
-      ...removeDialog,
-      yesButton: 'Löschen',
-      yesColor: 'red white--text'
-    }
-
-    const selectedItems = this.value.filter(i => i !== selectedItem)
-    if (this.$listeners.remove) {
-      this.$emit('remove', selectedItems, dialog)
-    } else {
-      this.$emit('input', selectedItems)
-    }
-  }
-
-  get selectedWidthStyle () {
-    if (!this.selectedWidth) {
-      return ''
-    }
-
-    let width = this.selectedWidth
-    if (!isNaN(width)) {
-      width = width + 'px'
-    }
-    return `width: ${width};`
-  }
-}
-</script>
-
-
-<style scoped lang="scss">
-.selectedIcon:deep() {
-  padding-right: .3rem !important;
-}
-
-.selectableIcon:deep() {
-  padding-right: 2rem !important;
-}
-
-.selectedContent:deep() {
-  width: 100%;
-}
-
-.selectableContent:deep() {
-  width: 100%;
-}
-</style>