From 1704aef3dac5a5b6cfa3b54e35f0e84008dacbdc Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Mon, 3 Jun 2024 11:49:37 +0000
Subject: [PATCH] fixed removal of exceptions from calendar dates, fixes #4250
Closes #4250
Merge request studip/studip!3082
(cherry picked from commit d4bdf98b3e49d79d568051968054ef155635c0bf)
b13fc888 fixed removal of exceptions from calendar dates
c9f0a37f added code improvement
---
.../components/form_inputs/DateListInput.vue | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/resources/vue/components/form_inputs/DateListInput.vue b/resources/vue/components/form_inputs/DateListInput.vue
index 05f3c574e93..d77c993454f 100644
--- a/resources/vue/components/form_inputs/DateListInput.vue
+++ b/resources/vue/components/form_inputs/DateListInput.vue
@@ -2,11 +2,11 @@
<div class="formpart">
<div class="sr-only" aria-live="polite" ref="list_message_field"></div>
<ul>
- <li v-for="date in selected_date_list" v-bind="selected_date_list" :key="date">
+ <li v-for="date in selected_date_list" v-bind="selected_date_list" :key="getISODate(date)">
<input type="hidden" :name="input_name + '[]'" :value="getISODate(date)">
<studip-date-time :timestamp="Math.floor(date.getTime() / 1000)" :date_only="true"></studip-date-time>
- <studip-icon shape="trash" :title="$gettext('Löschen')" @click="removeDate"
- class="enter-accessible" aria-role="button" tabindex="0"></studip-icon>
+ <studip-icon shape="trash" :title="$gettext('Löschen')" @click="removeDate(date)"
+ class="icon enter-accessible button undecorated" aria-role="button" tabindex="0"></studip-icon>
</li>
</ul>
<label>
@@ -82,13 +82,13 @@ export default {
this.selected_date_list.push(new Date(reformatted_date));
this.$refs.list_message_field.innerText = $gettextInterpolate($gettext('Datum %{date} hinzugefügt'), {date: this.selected_date_value});
},
- removeDate(date_key) {
- if (date_key) {
- let date = this.selected_date_list.at(date_key);
- let formatted_date = STUDIP.DateTime.getStudipDate(date, false, true);
- this.selected_date_list.splice(date_key, 1);
- this.$refs.list_message_field.innerText = $gettextInterpolate($gettext('Datum %{date} entfernt'), {date: formatted_date});
- }
+ removeDate(date) {
+ this.selected_date_list = this.selected_date_list.filter(d => d !== date);
+
+ this.$refs.list_message_field.innerText = $gettextInterpolate(
+ $gettext('Datum %{date} entfernt'),
+ {date: STUDIP.DateTime.getStudipDate(date, false, true)}
+ );
},
getISODate(date) {
return STUDIP.DateTime.getISODate(date);
--
GitLab