-
{{ course.showname }}
+
+ {{ course.lehrfach }} {{ course.lehrform }}
+ {{ course.raumtyp }}
-
-
{{ course.studiengang }} - {{ course.semester }}
+
+ {{ course.lehrverband }}
+ KW: {{ course.start_kw }}
+
-
-
{{ course.lektoren }}
+
+
+ {{ lektor.kurzbz }}
+
+
+ WR: {{ course.wochenrythmus }} Bl: {{ course.stundenblockung }}
-
-
WR: {{ course.wochenrythmus }} Bl: {{ course.stundenblockung }}
+
+ Offen: {{ course.offenestunden }}
+ {{ course.semesterstunden }}
-
- Drag & Drop on Calendar
-
`
-}
+}
\ No newline at end of file
diff --git a/public/js/components/Tempus/ParkingSlot.js b/public/js/components/Tempus/ParkingSlot.js
index d5e632b9d..6bc7bbf95 100644
--- a/public/js/components/Tempus/ParkingSlot.js
+++ b/public/js/components/Tempus/ParkingSlot.js
@@ -64,7 +64,7 @@ export default {
class="parkingslot"
v-drop:move.kalender-collection="(evt, item) => park(evt, item)"
>
-
+
lecture.showEvents).map(lecture => lecture.uid);
- }
+ },
+ visibleStatusOptions() {
+ return Object.entries(this.visibleStatusArray).map(([key, label]) => ({ key, label }));
+ },
+ visibleStatusValue() {
+ if (this.visibleStatus.includes('all'))
+ return this.visibleStatusOptions.filter(visibleStatus => visibleStatus.key === 'all');
+ return this.visibleStatus.map(status => ({ key: status, label: this.visibleStatusArray[status] }));
+ },
},
methods: {
async openRaumauswahl(orig) {
@@ -201,11 +215,14 @@ export default {
this.ort_kurzbz = data.ort_kurzbz;
this.$refs.calendar.resetEventLoader();
},
+ onSelectVerbandAndClose(payload) {
+ this.onSelectVerband(payload);
+ bootstrap.Offcanvas.getOrCreateInstance(this.$refs.verbandMenu).hide();
+ },
onSelectVerband({link, name})
{
let stg = null;
let semester = null;
- let studiensemester_kurzbz = this.selectedStudiensemester;
this.show_stg = name
if (typeof link === 'number')
stg = link;
@@ -216,8 +233,7 @@ export default {
this.stg = stg;
if (semester !== null)
this.semester = semester;
- if (studiensemester_kurzbz)
- this.studiensemester_kurzbz = studiensemester_kurzbz;
+
this.$refs.calendar.resetEventLoader();
},
@@ -239,12 +255,42 @@ export default {
if (this.lastRange)
this.handleRange(this.lastRange);
},
- handleChangeDate() {
- console.log("handleChangeDate");
+ jumpToKw(kw) {
+ const num = parseInt(kw);
+ if (!num)
+ return;
+
+ const date = luxon.DateTime.fromObject({
+ weekYear: luxon.DateTime.now().setZone(this.config.timezone).weekYear,
+ weekNumber: num,
+ weekday: 1,
+ }, { zone: this.config.timezone });
+ this.calendarDate = date.toISODate();
+ },
+ handleChangeDate(newDate) {
+ if (newDate && luxon.DateTime.isDateTime(newDate) && newDate.isValid)
+ this.calendarDate = newDate.toISODate();
},
handleChangeMode() {
console.log("handleChangeMode")
},
+ toggleStatus(selected) {
+ if (!selected || selected.length === 0) {
+ this.visibleStatus = ['all'];
+ return;
+ }
+ const hasAll = selected.includes('all');
+ const hadAll = this.visibleStatus.includes('all');
+
+ if (hasAll && !hadAll)
+ {
+ this.visibleStatus = ['all'];
+ return;
+ }
+ this.visibleStatus = selected.filter(k => k !== 'all');
+ if (this.visibleStatus.length === 0)
+ this.visibleStatus = ['all'];
+ },
searchfunction(params) {
return this.$api.call(ApiSearchbar.search(params));
},
@@ -309,9 +355,64 @@ export default {
return calculatedEnd > lastGridEndSameDay ? lastGridEndSameDay : calculatedEnd;
},
+ _parseDates(start, end)
+ {
+ const startDT = luxon.DateTime.fromISO(start);
+ const endDT = luxon.DateTime.fromISO(end);
+
+ if (!startDT.isValid || !endDT.isValid)
+ {
+ alert("Ungültiges Datum");
+ return null;
+ }
+
+ return {
+ startDT,
+ endDT,
+ start_time: startDT.toFormat('yyyy-MM-dd HH:mm'),
+ end_time: endDT.toFormat('yyyy-MM-dd HH:mm'),
+ };
+ },
+
+ _updateKalenderEvent(obj, startDT, endDT, start_time, end_time, onSuccess)
+ {
+ const origStart = luxon.DateTime.fromISO(obj.orig.isostart);
+ const origEnd = luxon.DateTime.fromISO(obj.orig.isoend);
+
+ if (origStart.toMillis() === startDT.toMillis() && origEnd.toMillis() === endDT.toMillis())
+ return;
+
+ const updatedInfos = {
+ ort_kurzbz: this.ort_kurzbz ? this.ort_kurzbz : obj.orig.ort_kurzbz,
+ start_time,
+ end_time,
+ };
+
+ this.$api.call(ApiKalender.updateKalenderEvent(obj.orig.kalender_id, updatedInfos))
+ .then(() => {
+ if (onSuccess)
+ onSuccess();
+ });
+ },
+
+ resizeHandler(payload) {
+ const { item, start, end } = payload;
+ const obj = item[0];
+ if (!obj?.orig?.kalender_id)
+ return alert("Kein gültiges Kalender-Event zum Resizen");
+
+ const dates = this._parseDates(start, end);
+
+ if (!dates)
+ return;
+
+ this._updateKalenderEvent(obj, dates.startDT, dates.endDT, dates.start_time, dates.end_time, () => {
+ this.$refs.calendar.resetEventLoader();
+ });
+ },
+
dropHandler(payload) {
const { item, start, end } = payload;
-
if (!item?.length)
return alert("Keine Daten gedroppt");
@@ -319,18 +420,12 @@ export default {
if (!obj?.type)
return alert("Unbekannter Drop-Typ");
- const startDT = luxon.DateTime.fromISO(start);
- const endDT = luxon.DateTime.fromISO(end);
+ const dates = this._parseDates(start, end);
+ if (!dates) return;
- if (!startDT.isValid || !endDT.isValid)
- return alert("Ungültiges Datum");
+ const { startDT, endDT, start_time, end_time } = dates;
- const start_time = startDT.toFormat('yyyy-MM-dd HH:mm');
- const end_time = endDT.toFormat('yyyy-MM-dd HH:mm');
-
-
- if (obj.type === 'lehreinheit')
- {
+ if (obj.type === 'lehreinheit') {
this.$api.call(
ApiKalender.addKalenderEvent(
obj.orig.lehreinheit_id,
@@ -338,29 +433,13 @@ export default {
start_time,
end_time
)
- ).then(() => {
- this.$refs.calendar.resetEventLoader();
- });
+ );
}
else if (obj.type === 'kalender')
{
- let updatedInfos = {
- ort_kurzbz: this.ort_kurzbz ? this.ort_kurzbz : obj.orig.ort_kurzbz,
- start_time: start_time,
- end_time: end_time
- }
-
- this.$api.call(
- ApiKalender.updateKalenderEvent(
- obj.orig.kalender_id,
- updatedInfos
- )
- ).then(() => {
- this.$refs.parking.unpark({
- type: obj.type,
- id: obj.orig.kalender_id
- });
- this.$refs.calendar.resetEventLoader();
+ this._updateKalenderEvent(obj, startDT, endDT, start_time, end_time, () =>
+ {
+ this.$refs.parking.unpark({ type: obj.type, id: obj.orig.kalender_id });
});
}
else
@@ -538,6 +617,12 @@ export default {
this.renderers[rendertype].calendarEvent = calendarEvent;
}
});
+
+ this.$api.call(ApiTempusConfig.getHeader())
+ .then(res => {
+ this.visibleStatusArray = res.data.visible_status;
+ this.visibleStatus = ['all'];
+ });
},
template: `
@@ -632,10 +717,42 @@ export default {