@@ -1760,7 +1786,7 @@ export default {
:data-type="type.unterrichtszeitentyp_kurzbz"
class="btn btn-sm btn-outline-dark class-schedule-type-selector-option"
>
- {{ type.bezeichnung_mehrsprachig[0].value }}
+ {{ getClassTimeSlotTypeLabel(type) }}
diff --git a/public/js/components/ClassSchedule/ClassScheduleOverview.js b/public/js/components/ClassSchedule/ClassScheduleOverview.js
index 02fbdfee8..d58595230 100644
--- a/public/js/components/ClassSchedule/ClassScheduleOverview.js
+++ b/public/js/components/ClassSchedule/ClassScheduleOverview.js
@@ -1,9 +1,13 @@
-// Import the Core Filter- and Core RESTClient Component to build your table and handle data
import { CoreFilterCmpt } from "../filter/Filter.js";
import ApiClassSchedule from "../../../js/api/factory/classSchedule.js";
+import ApiStudienSemester from "../../../js/api/factory/studiensemester.js";
+import { formatDate } from "../../helpers/DateHelpers.js";
import ClassScheduleTypeModal from "./ClassScheduleTypeModal.js";
import ClassScheduleValidityPeriodModal from "./ClassScheduleValidityPeriodModal.js";
+import CoreForm from "../Form/Form.js";
+import FormInput from "../Form/Input.js";
+import ApiOrganizationalUnit from "../../../js/api/factory/organizationalUnit.js";
export default {
name: "ClassScheduleOverview",
@@ -11,6 +15,8 @@ export default {
CoreFilterCmpt,
ClassScheduleTypeModal,
ClassScheduleValidityPeriodModal,
+ CoreForm,
+ FormInput,
},
props: {
permissions: Object,
@@ -22,6 +28,29 @@ export default {
this.permissions["lehre/unterrichtszeiten_typ_w"] || false,
};
},
+ watch: {
+ filterData: {
+ handler(newValue) {
+ this.$refs.classTimeSlotValidityPeriodsTable.tabulator.setData("/", {
+ organizationalUnitShortCode:
+ newValue.selectedOrganizationalUnit?.value,
+ validityPeriodFrom: newValue.validityPeriodFrom
+ ? formatDate(newValue.validityPeriodFrom, "yyyy-MM-dd")
+ : null,
+ validityPeriodTo: newValue.validityPeriodTo
+ ? formatDate(newValue.validityPeriodTo, "yyyy-MM-dd")
+ : null,
+ });
+ },
+ deep: true,
+ },
+ selectedSemester: {
+ handler(newValue) {
+ this.filterData.validityPeriodFrom = this.selectedSemester.start;
+ this.filterData.validityPeriodTo = this.selectedSemester.ende;
+ },
+ },
+ },
data: () => {
return {
phrasesLoaded: false,
@@ -32,14 +61,25 @@ export default {
mondayClassTimeSlots: [],
isClassTimeSlotTypeModalVisible: false,
isClassTimeSlotValidityPeriodModalVisible: false,
+ organizationalUnits: [],
+ filteredOrganizationalUnits: [],
+ allSemesters: [],
+ filteredSemesters: [],
+ filterData: {
+ selectedOrganizationalUnit: null,
+ validityPeriodFrom: null,
+ validityPeriodTo: null,
+ },
+ selectedSemester: null,
};
},
computed: {
tabulatorOptions() {
const options = {
ajaxURL: "dummy",
- ajaxRequestFunc: async () =>
- await this.getParsedClassTimeSlotValidityPeriodData(),
+ ajaxRequestFunc: async () => {
+ return await this.getParsedClassTimeSlotValidityPeriodData();
+ },
ajaxResponse: (url, params, response) => response,
persistenceID: "core_class_schedule_validity_periods",
selectableRows: true,
@@ -163,8 +203,7 @@ export default {
container.style.width = "100%";
let label = document.createElement("span");
- label.textContent =
- value + " (" + count + " item" + (count > 1 ? "s" : "") + ")";
+ label.textContent = value;
container.append(label);
let button = document.createElement("button");
@@ -187,8 +226,7 @@ export default {
container.style.width = "100%";
let label = document.createElement("span");
- label.textContent =
- value + " (" + count + " item" + (count > 1 ? "s" : "") + ")";
+ label.textContent = value;
container.append(label);
let button = document.createElement("button");
@@ -250,14 +288,38 @@ export default {
];
return events;
},
+ dropdownParsedOrganizationalUnits() {
+ return this.organizationalUnits.map((unit) => {
+ return {
+ label: `${unit.bezeichnung} (${unit.organisationseinheittyp_kurzbz})`,
+ value: unit.oe_kurzbz,
+ };
+ });
+ },
+ dropdownParsedSemesters() {
+ return this.allSemesters.map((semester) => {
+ return {
+ label: semester.studiensemester_kurzbz,
+ value: semester.studiensemester_kurzbz,
+ start: semester.start,
+ ende: semester.ende,
+ };
+ });
+ }
},
methods: {
- test() {
- alert("test");
- },
async getParsedClassTimeSlotValidityPeriodData() {
let getAllClassTimeValidityPeriodsResponse = await this.$api.call(
- ApiClassSchedule.getAllClassTimeValidityPeriods(),
+ ApiClassSchedule.getAllClassTimeValidityPeriods({
+ organizationalUnitShortCode:
+ this.filterData.selectedOrganizationalUnit?.value,
+ validityPeriodFrom: this.filterData.validityPeriodFrom
+ ? formatDate(this.filterData.validityPeriodFrom, "yyyy-MM-dd")
+ : null,
+ validityPeriodTo: this.filterData.validityPeriodTo
+ ? formatDate(this.filterData.validityPeriodTo, "yyyy-MM-dd")
+ : null,
+ }),
);
if (getAllClassTimeValidityPeriodsResponse.meta.status === "success") {
@@ -323,6 +385,36 @@ export default {
resetClassTimeSlotValidityPeriodModal() {
this.isClassTimeSlotValidityPeriodModalVisible = false;
},
+ filterOrganizationalUnits(event) {
+ let defaultItem = {
+ label: '----------',
+ value: null,
+ };
+
+ const query = event.query.toLowerCase();
+ if (!query) {
+ return this.filteredOrganizationalUnits = [defaultItem, ...this.dropdownParsedOrganizationalUnits];
+ }
+
+ return this.filteredOrganizationalUnits = [defaultItem].concat(this.dropdownParsedOrganizationalUnits.filter((unit) => {
+ return unit.label.toLowerCase().includes(query);
+ }));
+ },
+ filterSemesters(event) {
+ let defaultItem = {
+ label: '----------',
+ value: null,
+ };
+
+ const query = event.query.toLowerCase();
+ if (!query) {
+ return this.filteredSemesters = [defaultItem, ...this.dropdownParsedSemesters];
+ }
+
+ return this.filteredSemesters = [defaultItem].concat(this.dropdownParsedSemesters.filter((semester) => {
+ return semester.label.toLowerCase().includes(query);
+ }));
+ }
},
async created() {
let getAllClassTimeValidityPeriodsResponse = await this.$api.call(
@@ -337,6 +429,32 @@ export default {
getAllClassTimeValidityPeriodsResponse.meta.message,
);
}
+
+ let getAllOrganizationalUnitsResponse = await this.$api.call(
+ ApiOrganizationalUnit.getAllOrganizationalUnits(),
+ );
+ if (getAllOrganizationalUnitsResponse.meta.status === "success") {
+ this.organizationalUnits = getAllOrganizationalUnitsResponse.data.sort(
+ (a, b) => a.bezeichnung.localeCompare(b.bezeichnung),
+ );
+ } else {
+ console.error(
+ "Error fetching organizational units:",
+ getAllOrganizationalUnitsResponse.meta.message,
+ );
+ }
+
+ let getAllSemestersResponse = await this.$api.call(
+ ApiStudienSemester.getAll('DESC'),
+ );
+ if (getAllSemestersResponse.meta.status === "success") {
+ this.allSemesters = getAllSemestersResponse.data;
+ } else {
+ console.error(
+ "Error fetching semesters:",
+ getAllSemestersResponse.meta.message,
+ );
+ }
},
mounted() {
this.$p
@@ -349,8 +467,9 @@ export default {
{{ $p.t("ui", "classScheduleOverviewHeading") }}
-
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
`,
};
diff --git a/public/js/components/ClassSchedule/ClassScheduleValidityPeriodModal.js b/public/js/components/ClassSchedule/ClassScheduleValidityPeriodModal.js
index cb38231f3..c2871063f 100644
--- a/public/js/components/ClassSchedule/ClassScheduleValidityPeriodModal.js
+++ b/public/js/components/ClassSchedule/ClassScheduleValidityPeriodModal.js
@@ -47,9 +47,23 @@ export default {
.call(ApiClassSchedule.getClassTimeValidityPeriod(newValue))
.then((response) => {
let validityPeriodData = response.data[0];
+ let organizationalUnit = this.organizationalUnits.find(
+ (unit) => unit.oe_kurzbz === validityPeriodData.oe_kurzbz,
+ );
+ if (!organizationalUnit) {
+ console.error(
+ "Organizational unit not found for validity period:",
+ validityPeriodData,
+ );
+ this.$fhcAlert.alertError(this.$p.t("ui", "errorLoadingData"));
+ return;
+ }
+
+ this.editedClassTimeSlotValidityPeriod = validityPeriodData;
+
this.classTimeSlotValidityPeriodFormData = {
id: validityPeriodData.unterrichtszeitengueltigkeit_id,
- organizationalUnitShortCode: validityPeriodData.oe_kurzbz,
+ organizationalUnit,
studyPlanId: validityPeriodData.studienplan_id,
classTimeSlotTypeShortcode:
validityPeriodData.unterrichtszeitentyp_kurzbz,
@@ -68,48 +82,29 @@ export default {
this.$fhcAlert.handleSystemError(error);
});
},
- async "classTimeSlotValidityPeriodFormData.organizationalUnitShortCode"(
- newValue,
- ) {
- if (!newValue) {
- this.classTimeSlotValidityPeriodFormData.studyPlanId = null;
- return;
- }
-
- this.refetchFilterableOptions();
+ "classTimeSlotValidityPeriodFormData.organizationalUnit"() {
+ this.updateClassTimeSlotValidityPeriodFormDataWatcher();
},
- async "classTimeSlotValidityPeriodFormData.validityPeriodFrom"(newValue) {
- if (!newValue) {
- this.classTimeSlotValidityPeriodFormData.studyPlanId = null;
- return;
- }
-
- this.refetchFilterableOptions();
+ "classTimeSlotValidityPeriodFormData.validityPeriodFrom"() {
+ this.updateClassTimeSlotValidityPeriodFormDataWatcher();
},
- async "classTimeSlotValidityPeriodFormData.validityPeriodTo"(newValue) {
- if (!newValue) {
- this.classTimeSlotValidityPeriodFormData.studyPlanId = null;
- return;
- }
-
- this.refetchFilterableOptions();
- },
- async "classTimeSlotValidityPeriodFormData.studyPlanId"(newValue) {
- this.refetchFilterableOptions();
+ "classTimeSlotValidityPeriodFormData.validityPeriodTo"() {
+ this.updateClassTimeSlotValidityPeriodFormDataWatcher();
},
},
data: () => {
return {
+ editedValidityPeriod: null,
isFormVisible: false,
- isEditInProgress: false,
organizationalUnits: [],
+ filteredOrganizationalUnits: [],
studyPlans: [],
studySemesters: [],
studySemestersByNumber: [],
classTimeSlotTypes: [],
classTimeSlotValidityPeriodFormData: {
id: null,
- organizationalUnitShortCode: null,
+ organizationalUnit: null,
studyPlanId: null,
classTimeSlotTypeShortcode: null,
validityPeriodFrom: null,
@@ -120,9 +115,13 @@ export default {
};
},
computed: {
+ isEditMode() {
+ return !!this.$props.editedClassTimeSlotValidityPeriodId;
+ },
isStudyPlanSelectDisabled() {
return (
- !this.classTimeSlotValidityPeriodFormData.organizationalUnitShortCode ||
+ !this.classTimeSlotValidityPeriodFormData.organizationalUnit
+ ?.oe_kurzbz ||
!this.classTimeSlotValidityPeriodFormData.validityPeriodFrom ||
!this.classTimeSlotValidityPeriodFormData.validityPeriodTo
);
@@ -142,23 +141,62 @@ export default {
this.classTimeSlotValidityPeriodFormData.validityPeriodTo,
);
},
+ userLanguage() {
+ return Vue.ref(FHC_JS_DATA_STORAGE_OBJECT.user_language);
+ },
},
methods: {
+ updateClassTimeSlotValidityPeriodFormDataWatcher() {
+ if (
+ !this.classTimeSlotValidityPeriodFormData.organizationalUnit
+ ?.oe_kurzbz ||
+ !this.classTimeSlotValidityPeriodFormData.validityPeriodFrom ||
+ !this.classTimeSlotValidityPeriodFormData.validityPeriodTo
+ ) {
+ this.classTimeSlotValidityPeriodFormData.studyPlanId = null;
+ return;
+ }
+
+ this.refetchFilterableOptions();
+ },
async refetchFilterableOptions() {
this.studyPlans = await this.getTargetedStudyPlans(
- this.classTimeSlotValidityPeriodFormData.organizationalUnitShortCode,
+ this.classTimeSlotValidityPeriodFormData.organizationalUnit?.oe_kurzbz,
this.formattedValidityPeriodFrom,
this.formattedValidityPeriodTo,
);
+ if (this.isEditMode) {
+ let isStudyPlanStillValid = this.studyPlans.some(
+ (plan) =>
+ plan.studienplan_id ===
+ this.editedClassTimeSlotValidityPeriod.studienplan_id,
+ );
+
+ if (!isStudyPlanStillValid) {
+ let editedStudyPlan = await this.getStudyPlan(
+ this.editedClassTimeSlotValidityPeriod.studienplan_id,
+ );
+ if (editedStudyPlan) {
+ this.studyPlans.push(editedStudyPlan);
+ } else {
+ console.error(
+ "Edited study plan not found:",
+ this.editedClassTimeSlotValidityPeriod.studienplan_id,
+ );
+ }
+ }
+ }
+
let studySemestersByDates =
await this.getStudySemestersByOrganizationalUnitAndDates(
- this.classTimeSlotValidityPeriodFormData.organizationalUnitShortCode,
+ this.classTimeSlotValidityPeriodFormData.organizationalUnit
+ ?.oe_kurzbz,
this.formattedValidityPeriodFrom,
this.formattedValidityPeriodTo,
);
- let studySemesters = new Array(
+ let studySemesters = new Array(
...new Set(
studySemestersByDates
.map((s) => s.semester_numbers)
@@ -220,6 +258,24 @@ export default {
? getAllStudyPlansResponse.data
: [];
},
+ async getStudyPlan(studienplan_id) {
+ if (!studienplan_id) {
+ return null;
+ }
+
+ let getStudyPlanResponse = await this.$api.call(
+ ApiStudienPlan.getStudyPlan(studienplan_id),
+ );
+ if (getStudyPlanResponse.meta.status !== "success") {
+ console.error(
+ "Error fetching study plan details:",
+ getStudyPlanResponse.meta.message,
+ );
+ return null;
+ }
+
+ return getStudyPlanResponse.data ? getStudyPlanResponse.data : null;
+ },
async getStudySemestersByOrganizationalUnitAndDates(
organizationalUnitShortCode,
validityPeriodFrom,
@@ -251,13 +307,21 @@ export default {
? getStudySemestersResponse.data
: [];
},
- async getStudySemestersByStudyPlanAndDates(studyProgramId, validityPeriodFrom, validityPeriodTo) {
+ async getStudySemestersByStudyPlanAndDates(
+ studyProgramId,
+ validityPeriodFrom,
+ validityPeriodTo,
+ ) {
if (!studyProgramId || !validityPeriodFrom || !validityPeriodTo) {
return [];
}
let getStudySemestersResponse = await this.$api.call(
- ApiStudienSemester.getStudySemestersByStudyPlanAndDates(studyProgramId, validityPeriodFrom, validityPeriodTo),
+ ApiStudienSemester.getStudySemestersByStudyPlanAndDates(
+ studyProgramId,
+ validityPeriodFrom,
+ validityPeriodTo,
+ ),
);
if (getStudySemestersResponse.meta.status !== "success") {
console.error(
@@ -273,10 +337,12 @@ export default {
createClassTimeSlotValidityPeriod() {
return this.$refs.classTimeSlotValidityPeriodData
.call(
- ApiClassSchedule.createClassTimeSlotValidityPeriod(
- this.id,
- this.classTimeSlotValidityPeriodFormData,
- ),
+ ApiClassSchedule.createClassTimeSlotValidityPeriod(this.id, {
+ ...this.classTimeSlotValidityPeriodFormData,
+ organizationalUnitShortCode:
+ this.classTimeSlotValidityPeriodFormData.organizationalUnit
+ ?.oe_kurzbz,
+ }),
)
.then((response) => {
this.$fhcAlert.alertSuccess(this.$p.t("ui", "successSave"));
@@ -299,7 +365,12 @@ export default {
ApiClassSchedule.updateClassTimeSlotValidityPeriod(
this.id,
this.classTimeSlotValidityPeriodFormData.id,
- this.classTimeSlotValidityPeriodFormData,
+ {
+ ...this.classTimeSlotValidityPeriodFormData,
+ organizationalUnitShortCode:
+ this.classTimeSlotValidityPeriodFormData.organizationalUnit
+ ?.oe_kurzbz,
+ },
),
)
.then((response) => {
@@ -307,6 +378,9 @@ export default {
this.$refs.classTimeSlotValidityPeriodModal.hide();
this.resetClassTimeSlotValidityPeriodModal();
window.scrollTo(0, 0);
+
+ this.editedClassTimeSlotValidityPeriod = null;
+
this.$emit("classTimeSlotValidityPeriodUpdated");
})
.catch((error) => {
@@ -321,7 +395,7 @@ export default {
this.$refs.classTimeSlotValidityPeriodData?.clearValidation();
this.classTimeSlotValidityPeriodFormData = {
id: null,
- organizationalUnitShortCode: null,
+ organizationalUnit: null,
studyPlanId: null,
classTimeSlotTypeShortcode: null,
validityPeriodFrom: null,
@@ -330,6 +404,26 @@ export default {
description: null,
};
},
+ filterOrganizationalUnits(event) {
+ const query = event.query.toLowerCase();
+ if (!query) {
+ return (this.filteredOrganizationalUnits = [
+ ...this.organizationalUnits,
+ ]);
+ }
+
+ return (this.filteredOrganizationalUnits =
+ this.organizationalUnits.filter((unit) => {
+ let label = `${unit.bezeichnung} (${unit.organisationseinheittyp_kurzbz})`;
+ return label.toLowerCase().includes(query);
+ }));
+ },
+ getClassTimeSlotTypeLabel(classTimeSlotType) {
+ if (!classTimeSlotType) return "";
+ return this.userLanguage?.value === "English"
+ ? classTimeSlotType.bezeichnung_mehrsprachig[1].value
+ : classTimeSlotType.bezeichnung_mehrsprachig[0].value;
+ },
},
async created() {
let getAllOrganizationalUnitsResponse = await this.$api.call(
@@ -392,18 +486,17 @@ export default {
-
@@ -449,7 +542,7 @@ export default {
:key="studyPlan.studienplan_id"
:value="studyPlan.studienplan_id"
>
- {{studyPlan.bezeichnung}} - {{studyPlan.studienplan_id}}
+ {{studyPlan.bezeichnung}}
@@ -478,12 +571,13 @@ export default {
:label="$p.t('ui/classTimeSlotType')"
v-model="classTimeSlotValidityPeriodFormData.classTimeSlotTypeShortcode"
>
+
diff --git a/public/js/components/ClassSchedule/ClassScheduleValidityPeriodOverview.js b/public/js/components/ClassSchedule/ClassScheduleValidityPeriodOverview.js
index 2215cafed..88debe983 100644
--- a/public/js/components/ClassSchedule/ClassScheduleValidityPeriodOverview.js
+++ b/public/js/components/ClassSchedule/ClassScheduleValidityPeriodOverview.js
@@ -248,8 +248,14 @@ export default {
{{ $p.t("lehre", "ausbildungssemester") }}: {{ classTimeSlotValidityPeriod?.ausbildungssemester }}
-
-
{{ $p.t("ui", "noClassScheduleValidityPeriodTimeSlotsFound") }}
+
{{ $p.t("ui", "noClassScheduleValidityPeriodTimeSlotsFound") }}