.
+ */
+import BsModal from "../Bootstrap/Modal.js";
+import FormInput from "../Form/Input.js";
+import ApiOperationalResourceToCalender from "../../api/factory/operationalResourceToCalender.js";
+
+export default {
+ name: "ResourcesAssignmentModal",
+ components: {
+ BsModal,
+ FormInput,
+ },
+ emits: ["saveFinished"],
+ data() {
+ return {
+ calendar: null,
+ availableResources: [],
+ filteredAvailableResources: [],
+ selectedAvailableResource: null,
+ assignedResources: [],
+ areFormButtonsDisplayed: false,
+ };
+ },
+ computed: {
+ dropdownParsedAvailableResources() {
+ return this.availableResources
+ .map((unit) => ({
+ label: unit.beschreibung,
+ value: unit.betriebsmittel_id,
+ data: unit,
+ }))
+ .sort((a, b) => a.label?.localeCompare(b.label));
+ },
+ },
+ watch: {
+ selectedAvailableResource(newValue) {
+ if (!newValue) return;
+
+ this.assignedResources.push({
+ betriebsmittel_kalender_id: null,
+ betriebsmittel_id: newValue.data.betriebsmittel_id,
+ beschreibung: newValue.data.beschreibung,
+ anmerkung: "",
+ isNoteTextareaShown: false,
+ });
+
+ this.areFormButtonsDisplayed = true;
+ },
+ },
+ methods: {
+ async open(calendar) {
+ if (!calendar?.kalender_id) return;
+
+ this.calendar = calendar;
+ this.availableResources =
+ await this.fetchSchedulableResourcesByCalender(calendar.kalender_id);
+ this.filteredAvailableResources = [
+ ...this.dropdownParsedAvailableResources,
+ ];
+ this.assignedResources =
+ await this.fetchAssignedResourcesByCalender(calendar.kalender_id);
+
+ this.show();
+ },
+ show() {
+ this.$refs.modal.show();
+ },
+ hide() {
+ this.$refs.modal.hide();
+ },
+ reset() {
+ this.calendar = null;
+ this.availableResources = [];
+ this.filteredAvailableResources = [];
+ this.selectedAvailableResource = null;
+ this.assignedResources = [];
+ this.areFormButtonsDisplayed = false;
+ },
+ async fetchAssignedResourcesByCalender(calenderId) {
+ const result = await this.$api.call(
+ ApiOperationalResourceToCalender.getAssignedResourcesByCalender(
+ calenderId,
+ ),
+ );
+
+ if (result.meta.status === "success") {
+ return result.data
+ .filter((unit) => !!unit)
+ .map((unit) => ({
+ isNoteTextareaShown:
+ unit.anmerkung && unit.anmerkung.trim() !== "",
+ ...unit,
+ }));
+ }
+
+ this.$fhcAlert.alertError(
+ this.$p.t("ui", "failed_assigned_resources_fetch_error_message"),
+ );
+ return [];
+ },
+ async fetchSchedulableResourcesByCalender(calendarId) {
+ const result = await this.$api.call(
+ ApiOperationalResourceToCalender.getSchedulableResourcesByCalendar(
+ calendarId,
+ ),
+ );
+
+ if (result.meta.status === "success") return result.data;
+
+ this.$fhcAlert.alertError(
+ this.$p.t("ui", "failed_schedulable_resources_fetch_error_message"),
+ );
+ return [];
+ },
+ filterAvailableResources(event) {
+ const query = event.query.toLowerCase();
+ const unassignedResources = this.dropdownParsedAvailableResources.filter(
+ (unit) =>
+ !this.assignedResources.some(
+ (assigned) => assigned.betriebsmittel_id === unit.value,
+ ),
+ );
+
+ this.filteredAvailableResources = query
+ ? unassignedResources.filter((unit) =>
+ unit.label.toLowerCase().includes(query),
+ )
+ : unassignedResources;
+ },
+ toggleAssignedResourceNoteInput(resource) {
+ const assignedResource = this.assignedResources.find(
+ (assigned) => assigned.betriebsmittel_id === resource.betriebsmittel_id,
+ );
+
+ if (assignedResource) {
+ assignedResource.isNoteTextareaShown =
+ !assignedResource.isNoteTextareaShown;
+ }
+
+ this.areFormButtonsDisplayed = true;
+ },
+ removeAssignedResource(resource) {
+ this.assignedResources = this.assignedResources.filter(
+ (assigned) =>
+ assigned.betriebsmittel_id !== resource.betriebsmittel_id,
+ );
+ this.areFormButtonsDisplayed = true;
+ },
+ async refreshResourcesAssignmentModalData() {
+ if (!this.calendar?.kalender_id) return;
+
+ this.availableResources =
+ await this.fetchSchedulableResourcesByCalender(
+ this.calendar.kalender_id,
+ );
+ this.filteredAvailableResources = [
+ ...this.dropdownParsedAvailableResources,
+ ];
+ this.assignedResources = await this.fetchAssignedResourcesByCalender(
+ this.calendar.kalender_id,
+ );
+ this.selectedAvailableResource = null;
+ this.areFormButtonsDisplayed = false;
+ },
+ async saveAssignedResourcesToCalendarItem() {
+ if (!this.calendar?.kalender_id) return;
+
+ const result = await this.$api.call(
+ ApiOperationalResourceToCalender.storeResourcesToCalendarRelationship(
+ this.calendar.kalender_id,
+ this.assignedResources,
+ ),
+ );
+
+ if (result.meta.status === "success") {
+ this.$fhcAlert.alertSuccess(
+ this.$p.t("ui", "assigned_resources_save_success_message"),
+ );
+ await this.refreshResourcesAssignmentModalData();
+ } else {
+ this.$fhcAlert.alertError(
+ this.$p.t("ui", "failed_assigned_resources_save_error_message"),
+ );
+ }
+
+ this.$emit("saveFinished");
+ this.hide();
+ },
+ },
+ template: `
+
+ {{ $p.t('ui', 'resource_assignment_modal_title') }}
+
+
+
+
+
+
+ {{ $p.t('ui', 'assigned_resources_subtitle') }}
+
+
+
+
+
+
{{ resource.beschreibung }}
+
+
+
+
+
+
+
{{ $p.t('ui', 'no_assigned_resources') }}
+
+
+
+ {{ $p.t('ui', 'abbrechen') }}
+
+
+ {{ $p.t('ui', 'speichern') }}
+
+
+
+
+ `,
+};
diff --git a/public/js/components/Tempus/SidebarMenu.js b/public/js/components/Tempus/SidebarMenu.js
new file mode 100644
index 000000000..264105d56
--- /dev/null
+++ b/public/js/components/Tempus/SidebarMenu.js
@@ -0,0 +1,190 @@
+import FhcCoursepicker from './Coursepicker.js';
+import LectureSelection from './Filters/LectureSelection.js';
+import VerbandSelection from './Filters/VerbandSelection.js';
+import RoomSelection from './Filters/RoomSelection.js';
+import ParkingSlot from './ParkingSlot.js';
+import StvStudiensemester from '../Stv/Studentenverwaltung/Studiensemester.js';
+
+export default {
+ name: 'TempusSidebarMenu',
+ components: {
+ FhcCoursepicker,
+ LectureSelection,
+ VerbandSelection,
+ RoomSelection,
+ ParkingSlot,
+ StvStudiensemester,
+ },
+ props: {
+ previewRole: {
+ type: String,
+ required: true,
+ },
+ rooms: {
+ type: Array,
+ required: true,
+ },
+ studiengaenge: {
+ type: Array,
+ required: true,
+ },
+ studiengaengeAll: {
+ type: Array,
+ default: () => [],
+ },
+ lecturers: {
+ type: Array,
+ required: true,
+ },
+ selectedStudiensemester: {
+ type: String,
+ required: true,
+ },
+ raumvorschlagPreview: {
+ type: Object,
+ default: null,
+ },
+ raumvorschlagLoading: {
+ type: Boolean,
+ default: false,
+ },
+ },
+ emits: [
+ 'update:previewRole',
+ 'update:rooms',
+ 'update:studiengaenge',
+ 'update:parkedKeys',
+ 'update:selectedStudiensemester',
+ 'remove-lecturer',
+ 'select-lecturer',
+ 'select-kw',
+ 'sync',
+ 'preview-raumvorschlag',
+ ],
+ methods: {
+ reloadCoursepicker() {
+ return this.$refs.coursepicker?.reload();
+ },
+ isParked(id) {
+ return this.$refs.parking?.isParked(id) ?? false;
+ },
+ park(items) {
+ return this.$refs.parking?.park(null, items);
+ },
+ unpark(item) {
+ return this.$refs.parking?.unpark(item);
+ },
+ },
+ computed: {
+ courseLecturers() {
+ if (!this.lecturers.length) return [];
+ return this.lecturers
+ .filter((lecture) => lecture.showCoursePicker)
+ .map((lecture) => lecture.uid);
+ },
+ },
+ template: /* html */ `
+
+ `,
+};
diff --git a/public/js/components/Tempus/TagsAssignmentModal.js b/public/js/components/Tempus/TagsAssignmentModal.js
new file mode 100644
index 000000000..9874d7b46
--- /dev/null
+++ b/public/js/components/Tempus/TagsAssignmentModal.js
@@ -0,0 +1,239 @@
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
.
+ */
+import BsModal from "../Bootstrap/Modal.js";
+import FormInput from "../Form/Input.js";
+import CoreTag from "../Tag/Tag.js";
+import ApiTempusTag from "../../api/factory/tempus/tag.js";
+
+export default {
+ name: "TagsAssignmentModal",
+ components: {
+ BsModal,
+ FormInput,
+ CoreTag,
+ },
+ emits: ["tagsChanged"],
+ data() {
+ return {
+ calendar: null,
+ availableTags: [],
+ filteredAvailableTags: [],
+ selectedAvailableTag: null,
+ assignedTags: [],
+ tagEndpoint: ApiTempusTag,
+ tagModalEscapeHandler: null,
+ };
+ },
+ computed: {
+ dropdownParsedAvailableTags() {
+ return this.availableTags.map((tag) => ({
+ label: tag.bezeichnung,
+ value: tag.tag_typ_kurzbz,
+ data: tag,
+ }));
+ },
+ },
+ methods: {
+ async open(calendar) {
+ if (!calendar?.kalender_id) return;
+
+ this.calendar = calendar;
+ this.availableTags = await this.fetchAvailableTags();
+ this.filteredAvailableTags = [...this.dropdownParsedAvailableTags];
+ this.assignedTags = await this.fetchAssignedTagsByCalender(
+ calendar.eindeutige_kalender_gruppen_id,
+ );
+
+ this.show();
+ },
+ show() {
+ this.$refs.modal.show();
+ },
+ hide() {
+ this.$refs.modal.hide();
+ },
+ reset() {
+ this.removeTagModalEscapeHandler();
+ this.calendar = null;
+ this.availableTags = [];
+ this.filteredAvailableTags = [];
+ this.selectedAvailableTag = null;
+ this.assignedTags = [];
+ },
+ prepareTagModal() {
+ const tagModal = this.$refs.tagComponent?.$refs.tagModal;
+ const tagModalElement = tagModal?.$el;
+
+ if (!tagModalElement) return;
+
+ tagModalElement.addEventListener(
+ "shown.bs.modal",
+ () => {
+ this.tagModalEscapeHandler = (event) => {
+ if (event.key !== "Escape") return;
+
+ event.preventDefault();
+ event.stopImmediatePropagation();
+ tagModal.hide();
+ };
+ document.addEventListener("keydown", this.tagModalEscapeHandler, true);
+ },
+ { once: true },
+ );
+ tagModalElement.addEventListener(
+ "hidden.bs.modal",
+ () => this.restoreAssignmentModalFocus(),
+ { once: true },
+ );
+ },
+ removeTagModalEscapeHandler() {
+ if (!this.tagModalEscapeHandler) return;
+
+ document.removeEventListener(
+ "keydown",
+ this.tagModalEscapeHandler,
+ true,
+ );
+ this.tagModalEscapeHandler = null;
+ },
+ restoreAssignmentModalFocus() {
+ this.removeTagModalEscapeHandler();
+ this.$refs.modal?.$el?.focus();
+ },
+ async fetchAvailableTags() {
+ const result = await this.$api.call(ApiTempusTag.getTags());
+
+ if (result.meta.status === "success") return result.data;
+
+ this.$fhcAlert.alertError(
+ this.$p.t("ui", "failed_available_tags_fetch_error_message"),
+ );
+ return [];
+ },
+ async fetchAssignedTagsByCalender(calendarGroupId) {
+ const result = await this.$api.call(
+ ApiTempusTag.getTagsByCalendar(calendarGroupId),
+ );
+
+ if (result.meta.status === "success") {
+ return result.data.filter((tag) => !!tag);
+ }
+
+ this.$fhcAlert.alertError(
+ this.$p.t("ui", "failed_assigned_tags_fetch_error_message"),
+ );
+ return [];
+ },
+ filterAvailableTags(event) {
+ const query = event.query.toLowerCase();
+ const unassignedTags = this.dropdownParsedAvailableTags.filter(
+ (tag) =>
+ !this.assignedTags.some(
+ (assigned) => assigned.tag_id === tag.value,
+ ),
+ );
+
+ this.filteredAvailableTags = query
+ ? unassignedTags.filter((tag) =>
+ tag.label.toLowerCase().includes(query),
+ )
+ : unassignedTags;
+ },
+ selectTag(event) {
+ this.selectedAvailableTag = event.value;
+ this.prepareTagModal();
+ this.$refs.tagComponent?.openModal(event.value.data);
+ },
+ editTag(tag) {
+ this.prepareTagModal();
+ this.$refs.tagComponent?.editTag(tag.notiz_id);
+ },
+ async handleCalendarTagChange() {
+ this.removeTagModalEscapeHandler();
+
+ const calendarGroupId = this.calendar?.eindeutige_kalender_gruppen_id;
+ if (!calendarGroupId) return;
+
+ this.assignedTags =
+ await this.fetchAssignedTagsByCalender(calendarGroupId);
+ this.$emit("tagsChanged");
+ },
+ },
+ template: /* html */`
+
+ {{ $p.t('ui', 'tags_assignment_modal_title') }}
+
+
+
+
+ {{ option.label }}
+
+
+
+
+
+
+ {{ $p.t('ui', 'assigned_tags_subtitle') }}
+
+
+
+ {{ tag.bezeichnung }}
+
+
+
{{ $p.t('ui', 'no_assigned_tags') }}
+
+
+
+
+ `,
+};
diff --git a/public/js/components/Tempus/Tempus.js b/public/js/components/Tempus/Tempus.js
index 5abeffd98..4cd6e8966 100644
--- a/public/js/components/Tempus/Tempus.js
+++ b/public/js/components/Tempus/Tempus.js
@@ -14,65 +14,49 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see
.
*/
-import CoreSearchbar from "../searchbar/searchbar.js";
-import NavLanguage from "../navigation/Language.js";
-import VerticalSplit from "../verticalsplit/verticalsplit.js";
-import FhcCalendar from "../Calendar/Tempus.js";
-import FhcCoursepicker from "./Coursepicker.js";
-import LectureSelection from "./Filters/LectureSelection.js";
-import VerbandSelection from "./Filters/VerbandSelection.js";
-import RoomSelection from "./Filters/RoomSelection.js";
-import ParkingSlot from "./ParkingSlot.js";
-import ApiKalender from "../../api/factory/tempus/kalender.js";
-import ApiSearchbar from "../../api/factory/searchbar.js";
-import ApiRenderers from "../../api/factory/renderers.js";
-import ApiTempusConfig from "../../api/factory/tempus/config.js";
-import ApiOperationalResourceToCalender from "../../api/factory/operationalResourceToCalender.js";
-import AppMenu from "../AppMenu.js";
-import drop from "../../directives/drop.js";
-import AppConfig from "../AppConfig.js";
-
-import BsModal from "../Bootstrap/Modal.js";
-
-import BaseTreemenu from '../Base/Treemenu.js';
-
-import ApiStudiengangTree from "../../api/factory/tempus/studiengangtree.js";
-import ApiInfo from "../../api/factory/tempus/info.js";
-import StvStudiensemester from "../Stv/Studentenverwaltung/Studiensemester.js";
-import FormInput from "../../../js/components/Form/Input.js";
-import Reservierung from "./Reservierung.js";
-import { getTempusShortcuts } from "./shortcuts.js";
-import KeyboardShortcuts from "./KeyboardShortcuts.js";
-import { useContextMenuActions } from "../../composables/Tempus/ContextMenuActions.js";
-import MultiWeekPlanModal from "./MultiWeekPlanModal.js";
-import { getTempusSearchbarOptions } from "./Filters/searchbarOptions.js";
-import RaumauswahlModal from "./RaumauswahlModal.js";
-import LehreinheitModal from "./LehreinheitModal.js";
+import FhcCalendar from '../Calendar/Tempus.js';
+import ApiKalender from '../../api/factory/tempus/kalender.js';
+import ApiSearchbar from '../../api/factory/searchbar.js';
+import ApiRenderers from '../../api/factory/renderers.js';
+import ApiTempusConfig from '../../api/factory/tempus/config.js';
+import drop from '../../directives/drop.js';
+import AppConfig from '../AppConfig.js';
+import ApiInfo from '../../api/factory/tempus/info.js';
+import Reservierung from './Reservierung.js';
+import { getTempusShortcuts } from './shortcuts.js';
+import KeyboardShortcuts from './KeyboardShortcuts.js';
+import { useContextMenuActions } from '../../composables/Tempus/ContextMenuActions.js';
+import MultiWeekPlanModal from './MultiWeekPlanModal.js';
+import HistoryModal from './HistoryModal.js';
+import ResourcesAssignmentModal from './ResourcesAssignmentModal.js';
+import TagsAssignmentModal from './TagsAssignmentModal.js';
+import { getTempusSearchbarOptions } from './Filters/searchbarOptions.js';
+import TempusHeader from './Header.js';
+import TempusAppMenu from './AppMenu.js';
+import TempusVerbandMenu from './VerbandMenu.js';
+import TempusSidebarMenu from './SidebarMenu.js';
+import RaumauswahlModal from './RaumauswahlModal.js';
+import LehreinheitModal from './LehreinheitModal.js';
+import HorizontalSplit from '../horizontalsplit/horizontalsplit.js';
export default {
- name: "Tempus",
+ name: 'Tempus',
components: {
- CoreSearchbar,
- VerticalSplit,
FhcCalendar,
- FhcCoursepicker,
- LectureSelection,
- VerbandSelection,
- RoomSelection,
- ParkingSlot,
AppConfig,
- AppMenu,
- NavLanguage,
- BsModal,
- BaseTreemenu,
- StvStudiensemester,
- Multiselect: primevue.multiselect,
- FormInput,
+ TempusAppMenu,
+ TempusHeader,
+ TempusVerbandMenu,
+ TempusSidebarMenu,
Reservierung,
KeyboardShortcuts,
MultiWeekPlanModal,
+ HistoryModal,
+ ResourcesAssignmentModal,
+ TagsAssignmentModal,
RaumauswahlModal,
- LehreinheitModal
+ LehreinheitModal,
+ HorizontalSplit,
},
props: {
defaultSemester: String,
@@ -98,7 +82,9 @@ export default {
contextMenuActions: useContextMenuActions({
openRaumauswahl: (orig) => this.$refs.raumModal.show(orig),
openLehreinheit: (orig) => this.$refs.lehreinheitModal.show(orig),
- openResourcesAssignmentModal: (orig) => this.openResourcesAssignmentModal(orig),
+ openResourcesAssignmentModal: (orig) =>
+ this.$refs.resourcesAssignmentModal?.open(orig),
+ openTagsModal: (orig) => this.$refs.tagsAssignmentModal?.open(orig),
openHistory: (orig) => this.openHistory(orig),
deleteEntry: (orig) => this.deleteEntry(orig),
syncToLecturer: (orig) => this.syncToLecturer(orig),
@@ -108,52 +94,35 @@ export default {
deleteEntries: (origList) => this.deleteEntries(origList),
openRaumauswahl: (orig) => this.$refs.raumModal.show(orig),
},
+ canToggleGrid: this.permissions.stundenraster,
};
},
data() {
return {
appconfig: {},
- currentMode: "week",
+ currentMode: 'week',
configEndpoints: ApiTempusConfig,
- endpoint: ApiStudiengangTree,
- raumVorschlaege: [],
- selected: [],
-
- lv_id: null,
- events: null,
- minimized: false,
- currentlySelectedEvent: null,
hoveredEvent: null,
- //currentDay: new Date(),
- studiensemesterKurzbz: this.defaultSemester,
- lists: {
- nations: [],
- sprachen: [],
- geschlechter: [],
- },
- renderers: null,
+ renderers: {},
ort_kurzbz: null,
- view: "room",
parkedKeys: new Set(),
lecturers: [],
studiengaenge: [],
rooms: [],
- overlayCache: [],
+ overlayCache: {},
extraBackgrounds: [],
lastRange: null,
- stg: null,
- semester: null,
- studiensemester_kurzbz: null,
-
- visibleStatusArray: {},
- visibleStatus: ["all"],
- selectedStudiensemester:
- this.studiensemester_kurzbz ?? this.defaultSemester,
- calendarDate: luxon.DateTime.now()
- .setZone(this.config.timezone)
- .toISODate(),
+ visibleStatus: ['all'],
+ selectedStudiensemester: this.defaultSemester,
+ calendarDatesByMode: {
+ week: luxon.DateTime.now().setZone(this.config.timezone).toISODate(),
+ month: luxon.DateTime.now().setZone(this.config.timezone).toISODate(),
+ tableList: luxon.DateTime.now()
+ .setZone(this.config.timezone)
+ .toISODate(),
+ },
historyEntries: [],
- previewRole: "planer",
+ previewRole: 'planer',
multiWeekModal: {
show: false,
lehreinheitId: null,
@@ -162,20 +131,20 @@ export default {
endTime: null,
},
studiengaenge_all: [],
- resourcesAssignmentModal: {
- calendar: null,
- availableResources: [],
- filteredAvailableResources: [],
- selectedAvailableResource: null,
- assignedResources: [],
- areFormButtonsDisplayed: false,
- },
maxDailyEventLimitForMonthView: 10,
+ raumvorschlagPreview: null,
+ raumvorschlagLoading: false,
+ showEvents: true,
+ reservierungPending: false,
+ bcc: null,
};
},
computed: {
- currentDay() {
- return luxon.DateTime.now().setZone(this.config.timezone).toISODate();
+ calendarDate() {
+ return (
+ this.calendarDatesByMode[this.currentMode] ??
+ this.calendarDatesByMode.week
+ );
},
visibleLecturerUids() {
if (!this.lecturers.length) return null;
@@ -183,62 +152,21 @@ export default {
.filter((lecture) => 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],
- }));
- },
keyboardShortcuts() {
return getTempusShortcuts(this);
},
searchbaroptions() {
return getTempusSearchbarOptions(this);
},
- dropdownParsedAvailableResources() {
- return this.resourcesAssignmentModal.availableResources
- .map((unit) => {
- return {
- label: unit.beschreibung,
- value: unit.betriebsmittel_id,
- data: unit,
- };
- })
- .sort((a, b) => a.label?.localeCompare(b.label));
- },
},
methods: {
- async openResourcesAssignmentModal(orig) {
- if (!orig?.kalender_id) return;
-
- this.resourcesAssignmentModal.calendar = orig;
- this.resourcesAssignmentModal.availableResources =
- await this.fetchSchedulableResourcesByCalender(orig.kalender_id);
- this.resourcesAssignmentModal.filteredAvailableResources = [
- ...this.dropdownParsedAvailableResources,
- ];
-
- this.resourcesAssignmentModal.assignedResources =
- await this.fetchAssignedResourcesByCalender(orig.kalender_id);
-
- this.$refs.resourcesAssignmentModal.show();
- },
async deleteEntry(orig) {
if (!orig?.kalender_id) return;
await this.deleteEntryCall(orig);
this.$refs.calendar.resetEventLoader();
- this.$refs.coursepicker.reload();
+ this.$refs.sidebar.reloadCoursepicker();
+ this.rebuildRaumvorschlag();
},
async deleteEntries(origList) {
let validList = (origList ?? []).filter((orig) => orig?.kalender_id);
@@ -248,13 +176,13 @@ export default {
validList.map((orig) => this.deleteEntryCall(orig)),
);
this.$refs.calendar.resetEventLoader();
- this.$refs.coursepicker.reload();
+ this.$refs.sidebar.reloadCoursepicker();
},
async deleteEntryCall(orig) {
await this.$api
.call(ApiKalender.deleteEntry(orig.kalender_id))
.then(() => {
- this.$refs.parking.unpark({ type: orig.type, id: orig.kalender_id });
+ this.$refs.sidebar.unpark({ type: orig.type, id: orig.kalender_id });
});
},
async openHistory(orig) {
@@ -263,7 +191,7 @@ export default {
.call(ApiKalender.getHistory(orig.kalender_id))
.then((result) => {
this.historyEntries = result.data ?? [];
- this.$refs.historyModel.show();
+ this.$refs.historyModal.show();
});
},
syncToLecturer(orig) {
@@ -278,17 +206,103 @@ export default {
.call(ApiKalender.syncToStudent(orig.kalender_id))
.then(() => this.$refs.calendar.resetEventLoader());
},
- setOrt: function (data) {
+ rebuildRaumvorschlag() {
+ if (this.raumvorschlagPreview)
+ this.previewRaumvorschlag({
+ lehreinheit_id: this.raumvorschlagPreview?.lehreinheit_id,
+ });
+ },
+
+ clearRaumvorschlagPreview() {
+ this.raumvorschlagPreview = null;
+ this.raumvorschlagLoading = false;
+ this.rebuildExtraBackgrounds();
+ this.showEvents = true;
+ },
+ async previewRaumvorschlag(orig) {
+ if (!orig) {
+ this.clearRaumvorschlagPreview();
+ return;
+ }
+ if (!this.lastRange) return;
+
+ this.raumvorschlagLoading = true;
+ this.raumvorschlagPreview = {
+ lehreinheit_id: orig.lehreinheit_id,
+ slots: [],
+ };
+
+ await this.$api
+ .call(
+ ApiKalender.getRaumvorschlagSlots(
+ orig.lehreinheit_id,
+ this.lastRange.start.toISODate(),
+ this.lastRange.end.toISODate(),
+ ),
+ )
+ .then((result) => {
+ this.raumvorschlagPreview.slots = (result.data ?? []).map((slot) => ({
+ class: `rounded-3 bg-raumvorschlag-slot rating-${slot.rating}`,
+ start: slot.isostart,
+ matchEnd: slot.isoend,
+ end: slot.marker_isoend,
+ label: slot.label,
+ raeume: slot.raeume,
+ }));
+
+ if (this.raumvorschlagPreview.slots.length > 0)
+ this.showEvents = false;
+ })
+ .catch(this.$fhcAlert.handleSystemError)
+ .finally(() => {
+ this.raumvorschlagLoading = false;
+ this.rebuildExtraBackgrounds();
+ });
+ },
+ findRaumvorschlagSlot(lehreinheit_id, startDT, endDT) {
+ if (this.raumvorschlagPreview?.lehreinheit_id !== lehreinheit_id)
+ return null;
+
+ return (
+ this.raumvorschlagPreview.slots.find((slot) => {
+ const slotStart = luxon.DateTime.fromISO(slot.start);
+ const slotEnd = luxon.DateTime.fromISO(slot.matchEnd);
+ return (
+ slotStart.toMillis() === startDT.toMillis() &&
+ slotEnd.toMillis() === endDT.toMillis()
+ );
+ }) ?? null
+ );
+ },
+ setOrt(data) {
this.ort_kurzbz = data.ort_kurzbz;
this.rooms = [{ ort_kurzbz: data.ort_kurzbz }];
},
+ setEmp(data) {
+ const uid = data.uid;
+ const label = data.name;
+
+ this.lecturers = [
+ {
+ uid,
+ label,
+ showEvents: true,
+ overlays: { blocks: true, wishes: true },
+ showCoursePicker: false,
+ },
+ ];
+
+ this.$refs.calendar.resetEventLoader();
+ if (this.lastRange) this.handleRange(this.lastRange);
+ },
onSelectVerbandAndClose(payload) {
this.onSelectVerband(payload);
- bootstrap.Offcanvas.getOrCreateInstance(this.$refs.verbandMenu).hide();
+
+ const verbandMenu = this.$refs.verbandMenu?.$el;
+ if (verbandMenu)
+ bootstrap.Offcanvas.getOrCreateInstance(verbandMenu).hide();
},
-
- onSelectVerband({ path, stg_kz, semester, orgform_kurzbz, name }) {
-
+ onSelectVerband({ stg_kz, semester, orgform_kurzbz, name }) {
let exists = this.studiengaenge.some(
(stg) =>
stg.stg_kz == stg_kz &&
@@ -303,7 +317,7 @@ export default {
];
}
},
- setEmp: function (data) {
+ setEmp(data) {
const uid = data.uid;
const label = data.name;
@@ -315,28 +329,57 @@ export default {
label,
showEvents: true,
overlays: { blocks: true, wishes: true },
+ showCoursePicker: false,
},
];
this.$refs.calendar.resetEventLoader();
if (this.lastRange) this.handleRange(this.lastRange);
},
- addToFilter: function (filter, type) {
- if (type === "ort") {
+ addToCoursePicker(data) {
+ const uid = data.uid;
+ let lecturer = this.lecturers.find((lecture) => lecture.uid === uid);
+
+ if (!lecturer) {
+ this.addToFilter(data, 'mitarbeiter');
+ lecturer = this.lecturers.find((lecture) => lecture.uid === uid);
+
+ if (lecturer) {
+ lecturer.overlays = {
+ blocks: false,
+ wishes: false,
+ };
+ }
+ }
+
+ if (lecturer) {
+ lecturer.showCoursePicker = true;
+ }
+ },
+
+ addToFilter(filter, type) {
+ if (type === 'ort') {
const ort_kurzbz = filter.ort_kurzbz;
if (!this.rooms.some((room) => room.ort_kurzbz === ort_kurzbz)) {
this.rooms.push({ ort_kurzbz });
}
- } else if (type === "mitarbeiter") {
+ } else if (type === 'mitarbeiter') {
const uid = filter.uid;
const label = filter.name;
- if (!this.lecturers.some((l) => l.uid === uid)) {
+
+ let lecturer = this.lecturers.find((lecture) => lecture.uid === uid);
+
+ if (!lecturer) {
this.lecturers.push({
uid,
label,
showEvents: true,
overlays: { blocks: true, wishes: true },
+ showCoursePicker: false,
});
+ } else {
+ lecturer.showEvents = true;
+ lecturer.overlays = { blocks: true, wishes: true };
}
}
@@ -355,42 +398,42 @@ export default {
},
{ zone: this.config.timezone },
);
- this.calendarDate = date.toISODate();
+ this.calendarDatesByMode = {
+ ...this.calendarDatesByMode,
+ week: date.toISODate(),
+ };
+ this.currentMode = 'week';
},
handleChangeDate(newDate) {
- if (newDate && luxon.DateTime.isDateTime(newDate) && newDate.isValid)
- this.calendarDate = newDate.toISODate();
+ if (!(newDate && luxon.DateTime.isDateTime(newDate) && newDate.isValid))
+ return;
+
+ this.calendarDatesByMode = {
+ ...this.calendarDatesByMode,
+ [this.currentMode]: newDate.toISODate(),
+ };
},
handleChangeMode(newMode, newDate) {
if (!newMode) return;
+
+ if (newDate && luxon.DateTime.isDateTime(newDate) && newDate.isValid) {
+ this.calendarDatesByMode = {
+ ...this.calendarDatesByMode,
+ [this.currentMode]: newDate.toISODate(),
+ };
+ }
+
this.currentMode = newMode;
- if (newDate && luxon.DateTime.isDateTime(newDate) && newDate.isValid)
- this.calendarDate = newDate.toISODate();
},
updateCollision() {
this.$api
.call(ApiTempusConfig.updateCollision())
.then(() => {
this.$refs.config.reload();
- this.$fhcAlert.alertSuccess(this.$p.t("ui/settings_saved"));
+ this.$fhcAlert.alertSuccess(this.$p.t('ui/settings_saved'));
})
.catch(this.$fhcAlert.handleSystemErrors);
},
- 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));
},
@@ -417,7 +460,7 @@ export default {
if (hasLektoren)
filter.uid = this.lecturers.map((lecture) => lecture.uid);
- if (this.previewRole === "lektor")
+ if (this.previewRole === 'lektor')
return [
this.$api.call(
ApiKalender.getPlanLecturer(
@@ -429,7 +472,7 @@ export default {
),
];
- if (this.previewRole === "student")
+ if (this.previewRole === 'student')
return [
this.$api.call(
ApiKalender.getPlanStudent(
@@ -453,65 +496,20 @@ export default {
),
];
},
- toDateTime(value, timezone) {
- if (luxon.DateTime.isDateTime(value)) return value;
-
- if (value?.date?.isValid) return value.date;
-
- if (typeof value === "number")
- return luxon.DateTime.fromMillis(value, { zone: timezone });
-
- if (value instanceof Date)
- return luxon.DateTime.fromJSDate(value, { zone: timezone });
-
- if (typeof value === "string")
- return luxon.DateTime.fromISO(value, { zone: timezone });
-
- return luxon.DateTime.invalid("invalid datetime");
- },
- getLastEndOfSameDay(startDT, ends) {
- if (!ends?.length) return null;
-
- const dayKey = startDT.toISODate();
- let lastSameDay = null;
-
- for (const end of ends) {
- const dt = luxon.DateTime.isDateTime(end)
- ? end
- : luxon.DateTime.fromISO(String(end), { zone: startDT.zoneName });
-
- if (!dt.isValid) continue;
-
- if (dt.toISODate() === dayKey) lastSameDay = dt;
- }
-
- return lastSameDay;
- },
- clampEndToGrid(startDT, durationMin, ends) {
- const calculatedEnd = startDT.plus({ minutes: durationMin });
-
- const lastGridEndSameDay = this.getLastEndOfSameDay(startDT, ends);
-
- if (!lastGridEndSameDay) return calculatedEnd;
-
- 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");
+ 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"),
+ start_time: startDT.toFormat('yyyy-MM-dd HH:mm'),
+ end_time: endDT.toFormat('yyyy-MM-dd HH:mm'),
};
},
@@ -528,7 +526,7 @@ export default {
const updatedInfos = {
ort_kurzbz: this.rooms.length
? this.rooms.map((room) => room.ort_kurzbz)
- : obj.orig.ort_kurzbz ?? [],
+ : (obj.orig.ort_kurzbz ?? []),
start_time,
end_time,
};
@@ -543,13 +541,13 @@ export default {
},
resizeHandler(payload) {
- if (this.previewRole !== "planer")
+ if (this.previewRole !== 'planer')
//TODO (david) testzweck
return;
const { item, start, end } = payload;
const obj = item[0];
if (!obj?.orig?.kalender_id)
- return alert("Kein gültiges Kalender-Event zum Resizen");
+ return alert('Kein gültiges Kalender-Event zum Resizen');
const dates = this._parseDates(start, end);
@@ -563,25 +561,26 @@ export default {
dates.end_time,
() => {
this.$refs.calendar.resetEventLoader();
- this.$refs.coursepicker.reload();
+ this.$refs.sidebar.reloadCoursepicker();
+ this.rebuildRaumvorschlag();
},
);
},
dropHandler(payload) {
- if (this.previewRole !== "planer")
+ if (this.previewRole !== 'planer')
//TODO (david) testzweck
return;
const { item, start, end } = payload;
- if (!item?.length) return alert("Keine Daten gedroppt");
+ if (!item?.length) return alert('Keine Daten gedroppt');
const obj = item[0];
- if (!obj?.type) return alert("Unbekannter Drop-Typ");
+ if (!obj?.type) return alert('Unbekannter Drop-Typ');
if (payload.targetKalenderId) {
- if (obj.type !== "lehreinheit" || !obj.orig?.lehreinheit_id)
+ if (obj.type !== 'lehreinheit' || !obj.orig?.lehreinheit_id)
return alert(
- "Nur Lehreinheiten können einem Termin hinzugefügt werden",
+ 'Nur Lehreinheiten können einem Termin hinzugefügt werden',
);
return this.$api
@@ -593,7 +592,9 @@ export default {
)
.then(() => {
this.$refs.calendar.resetEventLoader();
- this.bcc.postMessage("dropped");
+ this.$refs.sidebar.reloadCoursepicker();
+ this.rebuildRaumvorschlag();
+ this.bcc.postMessage('dropped');
});
}
@@ -602,10 +603,10 @@ export default {
const { startDT, endDT, start_time, end_time } = dates;
- if (obj.type === "reservierung") {
+ if (obj.type === 'reservierung') {
this.reservierungPending = true;
this.$refs.reservierung.show(start_time, end_time);
- } else if (obj.type === "lehreinheit") {
+ } else if (obj.type === 'lehreinheit') {
if (obj.multiweek) {
this.openMultiWeekPreview(
obj.orig.lehreinheit_id,
@@ -616,24 +617,69 @@ export default {
return;
}
- return this.$api
- .call(
- ApiKalender.addKalenderEvent(
- obj.orig.lehreinheit_id,
- this.rooms.length
- ? this.rooms.map((r) => r.ort_kurzbz)
- : obj.orig.ort_kurzbz ?? [],
- start_time,
- end_time,
- ),
- )
- .then((result) => result.data)
- .then((result) => {
- this.$refs.calendar.resetEventLoader();
- this.$refs.coursepicker.reload();
- this.bcc.postMessage("dropped");
- });
- } else if (obj.type === "kalender") {
+ const matchedSlot = this.findRaumvorschlagSlot(
+ obj.orig.lehreinheit_id,
+ startDT,
+ endDT,
+ );
+ const raeume = matchedSlot?.raeume ?? null;
+
+ if (!raeume) {
+ return this.$api
+ .call(
+ ApiKalender.addKalenderEvent(
+ obj.orig.lehreinheit_id,
+ this.rooms.length
+ ? this.rooms.map((r) => r.ort_kurzbz)
+ : (obj.orig.ort_kurzbz ?? []),
+ start_time,
+ end_time,
+ ),
+ )
+ .then((result) => result.data)
+ .then((result) => {
+ if (result.needs_room_selection) {
+ this.$refs.raumModal.showForNew(
+ obj.orig.lehreinheit_id,
+ start_time,
+ end_time,
+ result.raum_vorschlaege,
+ );
+ return;
+ }
+
+ this.$refs.calendar.resetEventLoader();
+ this.$refs.sidebar.reloadCoursepicker();
+ this.rebuildRaumvorschlag();
+ this.bcc.postMessage('dropped');
+ });
+ }
+
+ if (raeume.length === 1) {
+ return this.$api
+ .call(
+ ApiKalender.addKalenderEvent(
+ obj.orig.lehreinheit_id,
+ raeume[0].ort_kurzbz,
+ start_time,
+ end_time,
+ ),
+ )
+ .then(() => {
+ this.$refs.calendar.resetEventLoader();
+ this.$refs.sidebar.reloadCoursepicker();
+ this.bcc.postMessage('dropped');
+ this.rebuildRaumvorschlag();
+ });
+ }
+
+ this.$refs.raumModal.showForNew(
+ obj.orig.lehreinheit_id,
+ start_time,
+ end_time,
+ raeume,
+ );
+ } else if (obj.type === 'kalender') {
return this._updateKalenderEvent(
obj,
startDT,
@@ -641,16 +687,17 @@ export default {
start_time,
end_time,
() => {
- this.$refs.parking.unpark({
+ this.$refs.sidebar.unpark({
type: obj.type,
id: obj.orig.kalender_id,
});
this.$refs.calendar.resetEventLoader();
- this.bcc.postMessage("dropped");
+ this.rebuildRaumvorschlag();
+ this.bcc.postMessage('dropped');
},
);
} else {
- alert("Unbekannter Drop-Typ: " + obj.type);
+ alert('Unbekannter Drop-Typ: ' + obj.type);
}
},
openMultiWeekPreview(lehreinheit_id, ort_kurzbz, start_time, end_time) {
@@ -665,18 +712,19 @@ export default {
},
onMultiWeekConfirmed() {
this.$refs.calendar.resetEventLoader();
- this.$refs.coursepicker.reload();
- this.bcc.postMessage("dropped");
+ this.$refs.sidebar.reloadCoursepicker();
+ this.rebuildRaumvorschlag();
+ this.bcc.postMessage('dropped');
},
handleRange(range) {
if (!range?.start || !range?.end) return;
- if (this.currentMode === "week") {
+ if (this.currentMode === 'week') {
//Workaround because, updateRange is emitting 2 times
- const startDay = range.start.startOf("day");
- const endDay = range.end.startOf("day");
+ const startDay = range.start.startOf('day');
+ const endDay = range.end.startOf('day');
- const days = Math.round(endDay.diff(startDay, "days").days) + 1;
+ const days = Math.round(endDay.diff(startDay, 'days').days) + 1;
if (days > 8) return;
}
@@ -689,6 +737,11 @@ export default {
}
this.rebuildExtraBackgrounds();
+
+ if (this.raumvorschlagPreview)
+ this.previewRaumvorschlag({
+ lehreinheit_id: this.raumvorschlagPreview.lehreinheit_id,
+ });
},
getOverlays(uid, range, rangeKey) {
@@ -775,141 +828,12 @@ export default {
if (lect.overlays.wishes) res.push(...(entry.wishes || []));
}
+ if (this.raumvorschlagPreview)
+ res.push(...this.raumvorschlagPreview.slots);
+
this.extraBackgrounds = res;
},
- async fetchAssignedResourcesByCalender(calenderId) {
- let getAssignedResources = await this.$api.call(
- ApiOperationalResourceToCalender.getAssignedResourcesByCalender(
- calenderId,
- ),
- );
- if (getAssignedResources.meta.status === "success") {
- return getAssignedResources.data
- .filter((unit) => !!unit)
- .map((unit) => {
- return {
- isNoteTextareaShown:
- unit.anmerkung && unit.anmerkung.trim() !== "",
- ...unit,
- };
- })
- .filter((unit) => !!unit);
- } else {
- this.$fhcAlert.alertError(
- this.$p.t("ui", "failed_assigned_resources_fetch_error_message"),
- );
- }
-
- return [];
- },
- async fetchSchedulableResourcesByCalender(calendarID) {
- let getSchedulableResourcesByCalendar = await this.$api.call(
- ApiOperationalResourceToCalender.getSchedulableResourcesByCalendar(
- calendarID,
- ),
- );
- if (getSchedulableResourcesByCalendar.meta.status === "success") {
- return getSchedulableResourcesByCalendar.data;
- } else {
- this.$fhcAlert.alertError(
- this.$p.t("ui", "failed_schedulable_resources_fetch_error_message"),
- );
- }
-
- return [];
- },
- filterAvailableResources(event) {
- this.resourcesAssignmentModal.filteredAvailableResources;
- const query = event.query.toLowerCase();
- if (!query) {
- return (this.resourcesAssignmentModal.filteredAvailableResources = [
- ...this.dropdownParsedAvailableResources.filter((unit) => {
- return !this.resourcesAssignmentModal.assignedResources.some(
- (assigned) => assigned.betriebsmittel_id === unit.value,
- );
- }),
- ]);
- }
-
- return (this.resourcesAssignmentModal.filteredAvailableResources =
- this.dropdownParsedAvailableResources
- .filter((unit) => {
- return !this.resourcesAssignmentModal.assignedResources.some(
- (assigned) => assigned.betriebsmittel_id === unit.value,
- );
- })
- .filter((unit) => {
- return unit.label.toLowerCase().includes(query);
- }));
- },
- toggleAssignedResourceNoteInput(resource) {
- const index = this.resourcesAssignmentModal.assignedResources.findIndex(
- (assigned) => assigned.betriebsmittel_id === resource.betriebsmittel_id,
- );
- if (index !== -1) {
- this.resourcesAssignmentModal.assignedResources[
- index
- ].isNoteTextareaShown =
- !this.resourcesAssignmentModal.assignedResources[index]
- .isNoteTextareaShown;
- }
-
- this.resourcesAssignmentModal.areFormButtonsDisplayed = true;
- },
- removeAssignedResource(resource) {
- this.resourcesAssignmentModal.assignedResources =
- this.resourcesAssignmentModal.assignedResources.filter(
- (assigned) =>
- assigned.betriebsmittel_id !== resource.betriebsmittel_id,
- );
-
- this.resourcesAssignmentModal.areFormButtonsDisplayed = true;
- },
- async refreshResourcesAssignmentModalData(calenderItem) {
- this.resourcesAssignmentModal.availableResources =
- await this.fetchSchedulableResourcesByCalender(
- calenderItem.kalender_id,
- );
- this.resourcesAssignmentModal.filteredAvailableResources = [
- ...this.dropdownParsedAvailableResources,
- ];
-
- this.resourcesAssignmentModal.assignedResources =
- await this.fetchAssignedResourcesByCalender(calenderItem.kalender_id);
- this.resourcesAssignmentModal.selectedAvailableResource = null;
- this.resourcesAssignmentModal.areFormButtonsDisplayed = false;
- },
- async saveAssignedResourcesToCalendarItem(calenderItem, assignedResources) {
- let getSchedulableResourcesByCalendar = await this.$api.call(
- ApiOperationalResourceToCalender.storeResourcesToCalendarRelationship(
- calenderItem.kalender_id,
- assignedResources,
- ),
- );
- if (getSchedulableResourcesByCalendar.meta.status === "success") {
- this.$fhcAlert.alertSuccess(
- this.$p.t("ui", "assigned_resources_save_success_message"),
- );
- await this.refreshResourcesAssignmentModalData(calenderItem);
- } else {
- this.$fhcAlert.alertError(
- this.$p.t("ui", "failed_assigned_resources_save_error_message"),
- );
- }
-
- this.$refs.calendar.resetEventLoader();
- this.$refs.resourcesAssignmentModal.hide();
- },
- closeResourcesAssignmentModal() {
- this.resourcesAssignmentModal = {
- availableResources: [],
- filteredAvailableResources: [],
- selectedAvailableResource: null,
- assignedResources: [],
- areFormButtonsDisplayed: false,
- };
- },
removeLecturer(uid) {
if (uid == null) {
for (const lect of this.lecturers) delete this.overlayCache[lect.uid];
@@ -924,10 +848,18 @@ export default {
this.$refs.calendar.resetEventLoader();
}
},
+ handlePreviewRoleChange(role) {
+ this.previewRole = role;
+ this.$refs.calendar.resetEventLoader();
+ },
+ openReservierung() {
+ this.reservierungPending = false;
+ this.$refs.reservierung?.show();
+ },
triggerSync() {
this.$api
.call(ApiKalender.sync())
- .then(this.$refs.calendar.resetEventLoader());
+ .then(() => this.$refs.calendar.resetEventLoader());
},
onEventHover(event) {
this.hoveredEvent = event;
@@ -941,11 +873,11 @@ export default {
const event = this.hoveredEvent;
if (!event?.kalender_id) return;
- if (this.$refs.parking.isParked(event.kalender_id)) {
- this.$refs.parking.unpark({ type: event.type, id: event.kalender_id });
+ if (this.$refs.sidebar.isParked(event.kalender_id)) {
+ this.$refs.sidebar.unpark({ type: event.type, id: event.kalender_id });
} else {
- this.$refs.parking.park(null, {
- type: "kalender",
+ this.$refs.sidebar.park({
+ type: 'kalender',
id: event.kalender_id,
orig: event,
});
@@ -957,11 +889,8 @@ export default {
this.deleteEntry(event);
},
- clearHoveredEvent() {
- this.hoveredEvent = null;
- },
focusSearchbar() {
- this.$refs.searchbar?.$refs?.input.focus();
+ this.$refs.header?.focusSearchbar();
},
},
watch: {
@@ -977,33 +906,21 @@ export default {
studiengaenge: {
deep: true,
handler() {
+ this.clearRaumvorschlagPreview();
this.$refs.calendar.resetEventLoader();
},
},
- "resourcesAssignmentModal.selectedAvailableResource": function (newVal) {
- if (!newVal) return;
-
- this.resourcesAssignmentModal.assignedResources.push({
- betriebsmittel_kalender_id: null,
- betriebsmittel_id: newVal.data.betriebsmittel_id,
- beschreibung: newVal.data.beschreibung,
- anmerkung: "",
- isNoteTextareaShown: false,
- });
-
- this.resourcesAssignmentModal.areFormButtonsDisplayed = true;
- },
},
mounted() {
this.reservierungPending = false;
- this.bcc = new BroadcastChannel("fhc-dnd");
- this.bcc.addEventListener("message", (e) => {
- if (e.data === "dropped" && !this.reservierungPending)
+ this.bcc = new BroadcastChannel('fhc-dnd');
+ this.bcc.addEventListener('message', (e) => {
+ if (e.data === 'dropped' && !this.reservierungPending)
this.$refs.calendar.resetEventLoader();
});
},
beforeUnmount() {
- this.bcc.close();
+ this.bcc?.close();
},
async created() {
await this.$api
@@ -1040,17 +957,14 @@ export default {
`link[href="${data[rendertype].calendarEventStyles}"]`,
)
) {
- var link = document.createElement("link");
- link.type = "text/css";
- link.rel = "stylesheet";
+ var link = document.createElement('link');
+ link.type = 'text/css';
+ link.rel = 'stylesheet';
link.href = data[rendertype].calendarEventStyles;
head.appendChild(link);
}
}
- if (this.renderers === null) {
- this.renderers = {};
- }
if (!this.renderers[rendertype]) {
this.renderers[rendertype] = {};
}
@@ -1060,333 +974,97 @@ export default {
}
});
- this.$api.call(ApiTempusConfig.getHeader()).then((res) => {
- this.visibleStatusArray = res.data.visible_status;
- this.visibleStatus = ["all"];
- });
this.$api.call(ApiInfo.getStudiengaenge()).then((res) => {
this.studiengaenge_all = res.data;
});
},
- template: `
+ template: /* html */ `
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
-
-
-
- {{$p.t('ui', 'resource_assignment_modal_title')}}
-
-
-
-
-
-
-
-
{{$p.t('ui', 'assigned_resources_subtitle')}}
-
-
-
-
-
{{ resource.beschreibung }}
-
-
-
-
-
-
-
-
{{$p.t('ui', 'no_assigned_resources')}}
-
-
- {{$p.t('ui', 'abbrechen')}}
- {{$p.t('ui', 'speichern')}}
-
-
-
-
- History
-
-
-
-
- Von
- Bis
- Status
- Ort
-
-
-
-
- {{ entry.von }}
- {{ entry.bis }}
- {{ entry.status_kurzbz }}
- {{ entry.ort }}
-
-
-
-
-
+
+
+
+
+
this.$api.call(ApiTempusSync.getSyncs(this.studiensemester_kurzbz)),
+ ajaxResponse: (url, params, response) => {
+ return response.data || [];
+ },
+ layout: 'fitDataStretch',
+ placeholder: "Keine Daten verfügbar",
+ persistenceID: "2026_07_21_tempus_sync_v1",
+ locale: true,
+ columns: [
+ {
+ formatter: 'rowSelection',
+ titleFormatter: 'rowSelection',
+ headerSort: false,
+ width: 40
+ },
+ {titlePhrase: 'lehre/organisationseinheit', field: 'oebezeichnung'},
+ {titlePhrase: 'lehre/studiensemester', field: 'studiensemester_kurzbz'},
+ {titlePhrase: 'lehre/bis_title', field: 'datum_bis',
+ formatter: (cell) => {
+ const value = cell.getValue();
+ if (!value) return ''
+ const date = luxon.DateTime.fromSQL(value)
+ return date.isValid ? date.toFormat('dd.MM.yyyy') : value
+ },
+ minWidth: 100
+ },
+ {titlePhrase: 'lehre/studienplan', field: 'studienplanbezeichnung', minWidth: 200},
+ {titlePhrase: 'lehre/ausbildungssemester', field: 'ausbildungssemester'},
+ {titlePhrase: 'global/status', field: 'sync_status'},
+ {titlePhrase: 'lehre/mail_benachrichtigung', field: 'mail', formatter: 'tickCross', hozAlign: 'center', minWidth: 80},
+ {titlePhrase:'global/insertamum', field: 'insertamum',
+ formatter: (cell) => {
+ const value = cell.getValue();
+ if (!value) return ''
+ const date = luxon.DateTime.fromSQL(value)
+ return date.isValid ? date.toFormat('dd.MM.yyyy HH:mm') : value
+ },
+ visible: false
+ },
+ {titlePhrase: 'global/insertvon', field: 'insertvon', visible: false},
+ {titlePhrase: 'global/updateamum', field: 'updateamum',
+ formatter: (cell) => {
+ const value = cell.getValue();
+ if (!value) return ''
+ const date = luxon.DateTime.fromSQL(value)
+ return date.isValid ? date.toFormat('dd.MM.yyyy HH:mm') : value
+ },
+ visible: false
+ },
+ {titlePhrase: 'global/updatevon', field: 'updatevon', visible: false},
+ {
+ titlePhrase: 'global/aktionen',
+ field: 'actions',
+ headerSort: false,
+ hozAlign: 'center',
+ width: 120,
+ formatter: (cell) => {
+ let container = document.createElement('div');
+ container.className = 'd-flex gap-3';
+
+ const editButton = document.createElement('button');
+ editButton.className = 'btn btn-outline-secondary';
+ editButton.innerHTML = '
+
+
+
+
+
+ -- {{ $p.t('lehre', 'studiensemester') }} --
+ {{ $p.t('ui', 'alleAnzeigen') }}
+
+ {{ studiensemester.studiensemester_kurzbz }}
+
+
+
+ {{ $p.t('global', 'jetztStarten') }}
+
+
+
+
+
+
+
+
+
+
+ `
+};
\ No newline at end of file
diff --git a/public/js/components/Tempus/VerbandMenu.js b/public/js/components/Tempus/VerbandMenu.js
new file mode 100644
index 000000000..ecf56e60b
--- /dev/null
+++ b/public/js/components/Tempus/VerbandMenu.js
@@ -0,0 +1,25 @@
+import BaseTreemenu from '../Base/Treemenu.js';
+
+export default {
+ name: 'TempusVerbandMenu',
+ components: {
+ BaseTreemenu,
+ },
+ emits: ['select-verband-and-close'],
+ methods: {
+ onSelectVerbandAndClose(payload) {
+ this.$emit('select-verband-and-close', payload);
+ },
+ },
+ template: /* html */ `
+
+
+
+ `,
+};
diff --git a/public/js/composables/Tempus/ContextMenuActions.js b/public/js/composables/Tempus/ContextMenuActions.js
index 1c6144902..5f6495ed1 100644
--- a/public/js/composables/Tempus/ContextMenuActions.js
+++ b/public/js/composables/Tempus/ContextMenuActions.js
@@ -18,6 +18,11 @@ export function useContextMenuActions(handlers)
icon: 'fa-solid fa-table-list',
action: handlers.openResourcesAssignmentModal
},
+ {
+ label: 'Tags',
+ icon: 'fa-solid fa-tags',
+ action: handlers.openTagsModal
+ },
{
label: 'Freischalten für Voransicht',
icon: 'fa-solid fa-chalkboard-user',
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index dc4507d5f..4b1468906 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -99,11 +99,17 @@ require_once('dbupdate_3.4/76150_perm_other_lv_plan.php');
require_once('dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php');
require_once('dbupdate_3.4/68530_Dashboard_Cleanup.php');
require_once('dbupdate_3.4/77375_ressourcen.php');
+require_once('dbupdate_3.4/78052_tempus_tag_events.php');
+require_once('dbupdate_3.4/78318_rename_column_of_eindeutige_gruppen_id_to_eindeutige_kalender_gruppen_id_in_tbl_kalender.php');
require_once('dbupdate_3.4/78318_rename_column_of_eindeutige_gruppen_id_to_eindeutige_kalender_gruppen_id_in_tbl_kalender.php');
require_once('dbupdate_3.4/75959_StudVw_Automatische_Tags.php');
require_once('dbupdate_3.4/76160_lvv_favorites.php');
require_once('dbupdate_3.4/77080_tabulator_presets_table.php');
require_once('dbupdate_3.4/78292_gehaltsanpassungtyp.php');
+require_once('dbupdate_3.4/77949_tempus_synchronisation.php');
+require_once('dbupdate_3.4/78287_tempus_raumzuordnung.php');
+
+require_once('dbupdate_3.4/78285_tempus_stundenraster.php');
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
echo 'Pruefe Tabellen und Attribute! ';
diff --git a/system/dbupdate_3.4/46975_tempus.php b/system/dbupdate_3.4/46975_tempus.php
index 68d5cdcf8..921bbb4e6 100644
--- a/system/dbupdate_3.4/46975_tempus.php
+++ b/system/dbupdate_3.4/46975_tempus.php
@@ -249,3 +249,32 @@ if ($result = @$db->db_query("SELECT 1 FROM public.tbl_variablenname WHERE name
echo 'public.tbl_variablenname: Added name "tempus_favorites"lehre.tbl_kalender: '.$db->db_last_error().' lehre.tbl_kalender_syncstatus: '.$db->db_last_error().' public.tbl_notizzuordnung: '.$db->db_last_error().' Berechtigung: '.$db->db_last_error().' public.tbl_variablenname '.$db->db_last_error().'