diff --git a/public/js/pages/AssetManagement/AssetManagement.js b/public/js/pages/AssetManagement/AssetManagement.js index f6f4b50cb..a75786e6b 100644 --- a/public/js/pages/AssetManagement/AssetManagement.js +++ b/public/js/pages/AssetManagement/AssetManagement.js @@ -51,7 +51,7 @@ Vue.component('asset-management', { @@ -91,6 +91,13 @@ Vue.component('asset-management', { isDatePast(timestamp) { if (!timestamp) return false; return window.moment.unix(timestamp).isBefore(window.moment(), 'day'); + }, + async updateTableWithoutModalsOpening() { + if (this.$refs.table && this.$refs.table.$refs.table) { + this.$refs.table.$refs.table.$set(this.$refs.table.$refs.table, 'rows', []); + await this.$nextTick(); + await this.$refs.table.$refs.table.refreshTable(); + } } } }); @@ -144,15 +151,25 @@ Vue.component('asset-borrow-return-widget', { text="Zurückgeben" @click="showReturnModal = true" additional-class="btn-success mt-2"/> +
+
+ Dauerhaft Reserviert für {{ activeReservation.userName }} +
+
+ Nächste Reservierung: {{ formatDate(nextReservation.startDate, 'DD.MM.YYYY') }} + bis {{ formatDate(nextReservation.endDate, 'DD.MM.YYYY') }} +
({{ nextReservation.notes }})
+
für {{ nextReservation.userName }}
+
Verfügbar
-
- Reserviert für {{ activeReservation.userName }} +
+ Dauerhaft Reserviert für {{ activeReservation.userName }}
-
+
Nächste Reservierung: {{ formatDate(nextReservation.startDate, 'DD.MM.YYYY') }} bis {{ formatDate(nextReservation.endDate, 'DD.MM.YYYY') }}
({{ nextReservation.notes }})
@@ -464,7 +481,7 @@ Vue.component('asset-reservation-modal', {
Neue Reservierung
- + @@ -509,6 +526,9 @@ Vue.component('asset-reservation-modal', { isPermanent(val) { if (val) { this.newReservation.endDate = null; + if (!this.newReservation.startDate) { + this.newReservation.startDate = window.moment().startOf('day').unix(); + } } } }, diff --git a/public/plugins/vue/tt-components/tt-datepicker.js b/public/plugins/vue/tt-components/tt-datepicker.js index 17b2df590..31eee0812 100644 --- a/public/plugins/vue/tt-components/tt-datepicker.js +++ b/public/plugins/vue/tt-components/tt-datepicker.js @@ -28,7 +28,7 @@ Vue.component('tt-date-picker', { :disabled="disabled" v-bind="additionalProps" ref="input" - style="cursor: pointer; background-color: #ffffff;" + style="cursor: pointer;" > {{ hint }}