Skip to content
Snippets Groups Projects
Commit 1704aef3 authored by Moritz Strohm's avatar Moritz Strohm
Browse files

fixed removal of exceptions from calendar dates, fixes #4250

Closes #4250

Merge request studip/studip!3082


(cherry picked from commit d4bdf98b)

b13fc888 fixed removal of exceptions from calendar dates
c9f0a37f added code improvement
parent a61e732b
No related branches found
No related tags found
No related merge requests found
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
<div class="formpart"> <div class="formpart">
<div class="sr-only" aria-live="polite" ref="list_message_field"></div> <div class="sr-only" aria-live="polite" ref="list_message_field"></div>
<ul> <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)"> <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-date-time :timestamp="Math.floor(date.getTime() / 1000)" :date_only="true"></studip-date-time>
<studip-icon shape="trash" :title="$gettext('Löschen')" @click="removeDate" <studip-icon shape="trash" :title="$gettext('Löschen')" @click="removeDate(date)"
class="enter-accessible" aria-role="button" tabindex="0"></studip-icon> class="icon enter-accessible button undecorated" aria-role="button" tabindex="0"></studip-icon>
</li> </li>
</ul> </ul>
<label> <label>
...@@ -82,13 +82,13 @@ export default { ...@@ -82,13 +82,13 @@ export default {
this.selected_date_list.push(new Date(reformatted_date)); 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}); this.$refs.list_message_field.innerText = $gettextInterpolate($gettext('Datum %{date} hinzugefügt'), {date: this.selected_date_value});
}, },
removeDate(date_key) { removeDate(date) {
if (date_key) { this.selected_date_list = this.selected_date_list.filter(d => d !== date);
let date = this.selected_date_list.at(date_key);
let formatted_date = STUDIP.DateTime.getStudipDate(date, false, true); this.$refs.list_message_field.innerText = $gettextInterpolate(
this.selected_date_list.splice(date_key, 1); $gettext('Datum %{date} entfernt'),
this.$refs.list_message_field.innerText = $gettextInterpolate($gettext('Datum %{date} entfernt'), {date: formatted_date}); {date: STUDIP.DateTime.getStudipDate(date, false, true)}
} );
}, },
getISODate(date) { getISODate(date) {
return STUDIP.DateTime.getISODate(date); return STUDIP.DateTime.getISODate(date);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment