@@ -161,6 +155,14 @@ $this->load->view(
studiengangstyp == 'Bachelor' ? $this->p->t('abschlusspruefung', 'pruefungsgegenstandBachelor') : $this->p->t('abschlusspruefung', 'pruefungsgegenstandMaster')) ?>
+
+
+ p->t('abschlusspruefung', 'spracheDerArbeit') ?>
+
+
+ abschlussarbeit_sprache ?? '' ?>
+
+
p->t('global', 'notizen')); ?>
@@ -201,7 +203,9 @@ $this->load->view(
@@ -236,7 +240,14 @@ $this->load->view(
load->view(
- 'templates/FHC-Footer',
- $sitesettings
-);
+if (defined('CIS4')) {
+ $this->load->view(
+ 'templates/CISVUE-Footer',
+ $sitesettings
+ );
+} else {
+ $this->load->view(
+ 'templates/FHC-Footer',
+ $sitesettings
+ );
+}
\ No newline at end of file
diff --git a/application/views/templates/CISVUE-Footer.php b/application/views/templates/CISVUE-Footer.php
index d7c1de24c..eae2a94ff 100644
--- a/application/views/templates/CISVUE-Footer.php
+++ b/application/views/templates/CISVUE-Footer.php
@@ -6,7 +6,7 @@ $includesArray = array(
'fontawesome6' => true,
'axios027' => true,
'customJSModules' => array_merge([
- 'public/js/apps/Cis.js'
+ 'public/js/apps/Cis/Menu.js'
], $customJSModules ?? []),
'customCSSs' => array_merge([
'public/css/Cis4/Cis.css'
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 804a43821..d98cbc9cd 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -8,7 +8,7 @@ $includesArray = array(
'axios027' => true,
'primevue3' => true,
'customJSModules' => array_merge([
- 'public/js/apps/Cis.js'
+ 'public/js/apps/Cis/Menu.js'
], $customJSModules ?? []),
'customCSSs' => array_merge([
'public/css/Cis4/Cis.css',
diff --git a/application/views/widgets/navigationMenu.php b/application/views/widgets/navigationMenu.php
index 42dd901fb..974128343 100644
--- a/application/views/widgets/navigationMenu.php
+++ b/application/views/widgets/navigationMenu.php
@@ -1,4 +1,4 @@
-
`
-}
+}
\ No newline at end of file
diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
index 36d9877da..aeb374cde 100644
--- a/public/js/components/Calendar/Base.js
+++ b/public/js/components/Calendar/Base.js
@@ -44,7 +44,10 @@ export default {
return () => true;
}),
hasDragoverFunc: Vue.computed(() => this.onDragover),
- mode: Vue.computed(() => this.mode)
+ mode: Vue.computed(() => this.mode),
+ reservierbarMap: Vue.computed(() => this.reservierbarMap),
+ isReservierbar: Vue.computed(() => this.isReservierbar),
+ createContext: Vue.computed(() => this.createContext)
};
},
props: {
@@ -97,7 +100,13 @@ export default {
draggableEvents: [Boolean, Array, Function],
dropableEvents: [Boolean, Array, Function],
onDragover: Function,
- onDrop: Function
+ onDrop: Function,
+ isReservierbar: Boolean,
+ createContext: Object,
+ reservierbarMap: {
+ type: Object,
+ default: () => ({})
+ },
},
emits: [
"click:next",
@@ -105,11 +114,13 @@ export default {
"click:mode",
"click:event",
"click:day",
+ "click:slot",
"click:week",
"update:date",
"update:mode",
"update:range",
- "drop"
+ "drop",
+ "create-event"
],
data() {
return {
diff --git a/public/js/components/Calendar/Base/DragAndDrop.js b/public/js/components/Calendar/Base/DragAndDrop.js
index 631a792a8..fb6cb1848 100644
--- a/public/js/components/Calendar/Base/DragAndDrop.js
+++ b/public/js/components/Calendar/Base/DragAndDrop.js
@@ -20,7 +20,8 @@ export default {
},
inject: {
mode: "mode",
- dropableEvents: "dropableEvents"
+ dropableEvents: "dropableEvents",
+ timezone: "timezone"
},
props: {
events: Array,
diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index 3418a9151..1a10533b3 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -2,6 +2,7 @@ import GridLine from './Grid/Line.js';
import GridLineEvent from './Grid/Line/Event.js';
import CalDnd from '../../../directives/Calendar/DragAndDrop.js';
+import CalClick from '../../../directives/Calendar/Click.js';
export default {
name: "CalendarGrid",
@@ -10,12 +11,15 @@ export default {
GridLineEvent
},
directives: {
- CalDnd
+ CalDnd,
+ CalClick
},
inject: {
originalEvents: "events",
originalBackgrounds: "backgrounds",
- dropAllowed: "dropAllowed"
+ dropAllowed: "dropAllowed",
+ timezone: "timezone",
+ reservierbar: "isReservierbar"
},
provide() {
return {
@@ -308,6 +312,20 @@ export default {
} else {
this.$refs.scroller.scrollTo(0, 0);
}
+ },
+ isFreeSlot(date, part, dayEvents) {
+ const pastEnd = luxon.DateTime.now().setZone(this.timezone);
+
+ const start = date.plus(part.start || part);
+ const end = date.plus(part.end || part.plus({ hours: 1 }));
+
+ if (start < pastEnd)
+ return false;
+
+ if (!dayEvents || !dayEvents.length)
+ return true;
+
+ return !dayEvents.some(ev => ev.start < end && ev.end > start);
}
},
beforeUnmount() {
@@ -400,6 +418,18 @@ export default {
:style="'grid-' + axisCol + ':' + (1+index) + ';grid-' + axisRow + ':ps_' + i + '/pe_' + i"
>
-
-
`,
}
\ No newline at end of file
diff --git a/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js b/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js
index 2447c4f61..a26788990 100644
--- a/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js
@@ -5,6 +5,10 @@ export default {
required: true
}
},
+ inject: {
+ mode: "mode",
+ },
+ emits: ['delete-event'],
computed: {
tooltipString() {
const tooltipArray = [];
@@ -50,12 +54,20 @@ export default {
return luxon.Duration
.fromISOTime(this.event.ende)
.toISOTime({ suppressSeconds: true });
+ },
+ isFutureEvent() {
+ const eventStart = luxon.DateTime.fromISO(`${this.event.datum}T${this.event.beginn}`);
+ return eventStart > luxon.DateTime.now();
+ }
+ },
+ methods: {
+ handleDelete() {
+ this.$emit('delete-event', this.event);
}
},
template: /* html */`
freigabedatum); ?> - +
+
+
+
+
+ {
- const rows = [1, -1];
+ formattedEvents() {
+ let formattedEvents = this.events.map((event) => {
+ event.rows = [1, -1];
if (event.startsHere) {
- rows[0] = 't_' + event.start.diff(this.date).toMillis();
+ event.rows[0] =
+ "t_" + event.start.diff(this.date).toMillis();
}
if (event.endsHere) {
- rows[1] = 't_' + event.end.diff(this.date).toMillis();
+ event.rows[1] = "t_" + event.end.diff(this.date).toMillis();
}
- events.push({
- ...event,
- rows
- });
+ return event;
});
- return events;
- }
+
+ if (this.shouldCompactEvents && this.compactibleEventTypes?.length) {
+ formattedEvents =
+ this.compactEvents(formattedEvents, this.compactibleEventTypes);
+ }
+
+ return formattedEvents;
+ },
},
- template: /* html */`
+ methods: {
+ compactEvents(events, compactibleEventTypes) {
+ let formattedEvents = events
+ .filter(
+ (event) =>
+ !compactibleEventTypes.includes(event.type),
+ )
+ .map((event) => {
+ event.display = "default";
+ return event;
+ });
+ let eventsToBeCompacted = events.filter((event) =>
+ compactibleEventTypes.includes(event.type),
+ );
+ let compactedEvents = [];
+
+ eventsToBeCompacted.forEach((event) => {
+ let existingCompactedEvent = compactedEvents.find(
+ (compactedEvent) =>
+ event.rows[0] === compactedEvent.rows[0] &&
+ event.rows[1] === compactedEvent.rows[1],
+ );
+
+ if (!existingCompactedEvent) {
+ compactedEvents.push({
+ events: [
+ {
+ farbe: event.orig.farbe,
+ },
+ ],
+ rows: event.rows,
+ });
+ } else {
+ existingCompactedEvent.events.push({
+ farbe: event.orig.farbe,
+ });
+ }
+ });
+
+ compactedEvents.forEach((compactedEvent) => {
+ if (compactedEvent.events.length < 4) {
+ formattedEvents.push({
+ display: "compacted",
+ ...compactedEvent,
+ });
+ } else {
+ formattedEvents.push({
+ display: "compacted",
+ events: compactedEvent.events.slice(0, 3),
+ rows: compactedEvent.rows,
+ });
+ formattedEvents.push({
+ display: "compactedExtra",
+ events: compactedEvent.events.slice(3),
+ rows: compactedEvent.rows,
+ });
+ }
+ });
+
+ return formattedEvents;
+ },
+ },
+ template: /* html */ `
-
-
-
+
+
+
+
+
- `
-}
+ `,
+};
diff --git a/public/js/components/Calendar/LvPlan.js b/public/js/components/Calendar/LvPlan.js
index e0e918f01..d7049b23f 100644
--- a/public/js/components/Calendar/LvPlan.js
+++ b/public/js/components/Calendar/LvPlan.js
@@ -3,24 +3,20 @@ import FhcCalendar from "./Base.js";
import ApiLvPlan from '../../api/factory/lvPlan.js';
import { useEventLoader } from '../../composables/EventLoader.js';
+import { useRenderers } from '../../composables/Renderers.js';
import ModeDay from './Mode/Day.js';
import ModeWeek from './Mode/Week.js';
import ModeMonth from './Mode/Month.js';
+import ModeList from './Mode/List.js';
export default {
name: "CalendarLvPlan",
components: {
FhcCalendar
},
- inject: [
- "renderers"
- ],
+ inject: ["isMobile"],
props: {
- timezone: {
- type: String,
- required: true
- },
date: {
type: [Date, String, Number, luxon.DateTime],
default: luxon.DateTime.local()
@@ -32,20 +28,49 @@ export default {
getPromiseFunc: {
type: Function,
required: true
- }
+ },
+ reservierbar: {
+ type: Boolean,
+ default: false
+ },
+ createContext: {
+ type: Object,
+ default: () => ({})
+ },
+ },
+ provide() {
+ return {
+ shouldCompactEvents: Vue.computed(
+ () => this.$props.mode === "Month" && this.isMobile,
+ ),
+ compactibleEventTypes: Vue.computed(
+ () => this.compactibleEventTypes,
+ ),
+ };
},
emits: [
"update:date",
"update:mode",
- "update:range"
+ "update:range",
+ "create-event",
+ "delete-event",
+ 'update:reservierbarMap'
],
data() {
return {
- modes: {
- day: Vue.markRaw(ModeDay),
- week: Vue.markRaw(ModeWeek),
- month: Vue.markRaw(ModeMonth)
- },
+ timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
+ isReservierbar: Vue.computed(() => {
+ if (!this.reservierbar)
+ return false;
+
+ if (!this.reservierbarMap)
+ return false;
+
+ if (typeof this.reservierbarMap === 'object')
+ return Object.keys(this.reservierbarMap).length > 0;
+
+ return false;
+ }),
modeOptions: {
day: {
emptyMessage: Vue.computed(() => this.$p.t('lehre/noLvFound')),
@@ -53,9 +78,13 @@ export default {
},
week: {
collapseEmptyDays: false
- }
+ },
+ list: {
+ length: 7,
+ },
},
- teachingunits: null
+ teachingunits: null,
+ compactibleEventTypes: [],
};
},
computed: {
@@ -77,7 +106,20 @@ export default {
label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
}
];
- }
+ },
+ modes() {
+ let modes = {
+ day: Vue.markRaw(ModeDay),
+ month: Vue.markRaw(ModeMonth),
+ };
+ if (this.isMobile) {
+ modes.list = Vue.markRaw(ModeList);
+ } else {
+ modes.week = Vue.markRaw(ModeWeek);
+ }
+
+ return modes;
+ },
},
methods: {
eventStyle(event) {
@@ -88,33 +130,55 @@ export default {
updateRange(rangeInterval) {
this.rangeInterval = rangeInterval;
this.$emit('update:range', rangeInterval);
- }
+ },
+ resetEventLoader() {
+ this.reset();
+ },
+ async getStunden() {
+ let stundenResponse = await this.$api.call(ApiLvPlan.getStunden());
+ this.teachingunits = stundenResponse.data.map((el) => ({
+ id: el.stunde,
+ start: el.beginn,
+ end: el.ende,
+ }));
+ },
+ async getCompactibleEventTypes() {
+ let compactibleEventTypesResponse = await this.$api.call(
+ ApiLvPlan.getCompactibleEventTypes(),
+ );
+ this.compactibleEventTypes = compactibleEventTypesResponse.data;
+ },
+ closeModal() {
+ this.$refs.calendar.hideEventModal();
+ },
},
setup(props, context) {
const rangeInterval = Vue.ref(null);
- const { events, lv } = useEventLoader(rangeInterval, props.getPromiseFunc);
+ const { events, lv, reservierbarMap, reset } = useEventLoader(rangeInterval, props.getPromiseFunc);
Vue.watch(lv, newValue => {
context.emit('update:lv', newValue);
});
+ const { renderers } = useRenderers();
+
+ Vue.watch(reservierbarMap, newVal => {
+ context.emit('update:reservierbarMap', newVal);
+ });
+
return {
rangeInterval,
events,
- lv
+ lv,
+ reservierbarMap,
+ reset,
+ renderers
};
},
- created() {
- this.$api
- .call(ApiLvPlan.getStunden())
- .then(res => {
- return this.teachingunits = res.data.map(el => ({
- id: el.stunde,
- start: el.beginn,
- end: el.ende
- }));
- });
+ async created() {
+ await this.getStunden();
+ await this.getCompactibleEventTypes();
},
template: /* html */`
+
+
+
+ {{"+" + event.events.length}}
+
+
+ {{ $p.t('lehre/noLvFound') }}
+
+ {}
+ },
+ },
props: {
currentDate: {
type: luxon.DateTime,
@@ -83,14 +91,33 @@ export default {
},
handleClickDefaults(evt) {
switch (evt.detail.source) {
- case 'day':
- // default: Set current-date
- this.$emit('update:currentDate', evt.detail.value);
- break;
- case 'event':
- // default: Request Modal
- this.$emit('requestModalOpen', { event: evt.detail.value });
- break;
+ case 'day':
+ // default: Set current-date
+ this.$emit('update:currentDate', evt.detail.value);
+ break;
+ case 'event':
+ // default: Request Modal
+ this.$emit('requestModalOpen', { event: evt.detail.value });
+ break;
+ case 'slot':
+ {
+ const { date, part } = evt.detail.value || {};
+ if (!date)
+ return;
+ let reservierbar = this.reservierbarMap?.[date.toISODate()] === true;
+ if (!reservierbar)
+ return;
+
+ this.$emit('requestModalOpen', {
+ event: {
+ type: this.createContext?.scope ?? 'slot',
+ start: date.plus(part.start || part),
+ end: date.plus(part.end || part.plus({ hours: 1 })),
+ createContext: this.createContext
+ }
+ });
+ break;
+ }
}
}
},
diff --git a/public/js/components/Calendar/Widget.js b/public/js/components/Calendar/Widget.js
index f9d641d4e..54109268e 100644
--- a/public/js/components/Calendar/Widget.js
+++ b/public/js/components/Calendar/Widget.js
@@ -1,6 +1,7 @@
import FhcCalendar from "./Base.js";
import { useEventLoader } from '../../composables/EventLoader.js';
+import { useRenderers } from '../../composables/Renderers.js';
import ModeList from '../Calendar/Mode/List.js';
@@ -9,22 +10,17 @@ export default {
components: {
FhcCalendar
},
- inject: [
- "renderers"
- ],
props: {
- timezone: {
- type: String,
- required: true
- },
getPromiseFunc: {
type: Function,
required: true
}
},
data() {
+ const timezone = FHC_JS_DATA_STORAGE_OBJECT.timezone;
return {
- now: luxon.DateTime.now().setZone(this.timezone),
+ timezone,
+ now: luxon.DateTime.now().setZone(timezone),
modes: {
list: Vue.markRaw(ModeList)
},
@@ -59,10 +55,12 @@ export default {
const rangeInterval = Vue.ref(null);
const { events } = useEventLoader(rangeInterval, props.getPromiseFunc);
+ const { renderers } = useRenderers();
return {
rangeInterval,
- events
+ events,
+ renderers
};
},
template: /* html */`
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index bb5c6a710..d65f7222b 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -42,14 +42,6 @@ export const AbgabetoolAssistenz = {
stg_kz_prop: {
default: null
},
- viewData: {
- type: Object,
- required: true,
- default: () => ({name: '', uid: ''}),
- validator(value) {
- return value && value.uid // && value.name -> extensive viewData use only for cis4 onwards
- }
- }
},
data() {
return {
@@ -530,41 +522,20 @@ export const AbgabetoolAssistenz = {
const table = this.$refs.abgabeTable.tabulator
this.tableBuiltResolve()
-
- table.on("columnMoved", () => {
- this.saveState(table);
- });
-
- table.on("columnResized", () => {
- this.saveState(table);
- });
-
- table.on("columnVisibilityChanged", () => {
- this.saveState(table);
- });
-
- table.on("filterChanged", () => {
- this.saveState(table);
- });
-
- table.on("headerFilterChanged", () => {
- this.saveState(table);
- });
-
- table.on("dataSorted", () => {
- this.saveState(table);
- });
-
- table.on("columnSorted", () => {
- this.saveState(table);
- });
-
- table.on("sortersChanged", () => {
- this.saveState(table);
- });
const saved = this.loadState();
+ // setup change eventlisteners
+ const events = [
+ "columnMoved", "columnResized", "columnVisibilityChanged",
+ "filterChanged", "headerFilterChanged", "dataSorted",
+ "columnSorted", "sortersChanged"
+ ];
+
+ events.forEach(eventName => {
+ table.on(eventName, () => this.saveState(table));
+ });
+
table.on("renderComplete", () => {
if(!this.stateRestored) {
@@ -1007,7 +978,6 @@ export const AbgabetoolAssistenz = {
this.tableData = this.mapProjekteToTableData(this.projektarbeiten)
await this.tableBuiltPromise
-
this.$refs.abgabeTable.tabulator.setData(this.tableData);
},
loadProjektarbeiten(all = false, callback) {
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 6791d31aa..0acb46bb6 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -31,16 +31,6 @@ export const AbgabetoolMitarbeiter = {
old_abgabe_beurteilung_link: Vue.computed(() => this.old_abgabe_beurteilung_link)
}
},
- props: {
- viewData: {
- type: Object,
- required: true,
- default: () => ({name: '', uid: ''}),
- validator(value) {
- return value && value.uid // && value.name -> extensive viewData use only for cis4 onwards
- }
- }
- },
data() {
return {
tableData: null,
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index e8401d309..24b2f7619 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -3,6 +3,7 @@ import ApiAbgabe from '../../../api/factory/abgabe.js'
import BsModal from "../../Bootstrap/Modal.js";
import FhcOverlay from "../../Overlay/FhcOverlay.js";
import { getDateStyleClass} from "./getDateStyleClass.js";
+import ApiAuthinfo from "../../../api/factory/authinfo.js";
export const AbgabetoolStudent = {
name: "AbgabetoolStudent",
@@ -24,14 +25,6 @@ export const AbgabetoolStudent = {
student_uid_prop: {
default: null
},
- viewData: {
- type: Object,
- required: true,
- default: () => ({uid: ''}),
- validator(value) {
- return value && value.uid
- }
- }
},
data() {
return {
@@ -44,9 +37,18 @@ export const AbgabetoolStudent = {
detail: null,
projektarbeiten: null,
selectedProjektarbeit: null,
- moodle_link: null
+ moodle_link: null,
+ uid: null,
};
},
+ computed: {
+ isViewMode() {
+ return this.student_uid !== this.uid
+ },
+ student_uid() {
+ return this.student_uid_prop || this.uid || null
+ }
+ },
methods: {
checkQualityGatesStrict(termine) {
let qgate1Passed = false
@@ -258,18 +260,11 @@ export const AbgabetoolStudent = {
},
handleDownloadBeurteilung2(projektarbeit) {
window.open(projektarbeit.beurteilung2)
- }
- },
- watch: {
-
- },
- computed: {
- isViewMode() {
- return this.student_uid !== this.viewData.uid
},
- student_uid() {
- return this.student_uid_prop || this.viewData?.uid || null
- }
+ async fetchAuthUID() {
+ const authIdResponse = await this.$api.call(ApiAuthinfo.getAuthUID());
+ this.uid = authIdResponse.data.uid;
+ },
},
async created() {
this.phrasenPromise = this.$p.loadCategory(['abgabetool', 'global'])
@@ -302,6 +297,8 @@ export const AbgabetoolStudent = {
}).catch(e => {
this.loading = false
})
+
+ await this.fetchAuthUID();
},
mounted() {
this.setupMounted()
diff --git a/public/js/components/Cis/Abgabetool/DeadlineOverview.js b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
index 6d0ddd02d..5f6d1e159 100644
--- a/public/js/components/Cis/Abgabetool/DeadlineOverview.js
+++ b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
@@ -10,14 +10,6 @@ export const DeadlineOverview = {
person_uid_prop: {
default: null
},
- viewData: {
- type: Object,
- required: true,
- default: () => ({name: '', uid: ''}),
- validator(value) {
- return value && value.name && value.uid
- }
- }
},
data() {
return {
diff --git a/public/js/components/Cis/Benotungstool/Benotungstool.js b/public/js/components/Cis/Benotungstool/Benotungstool.js
new file mode 100644
index 000000000..3e3374164
--- /dev/null
+++ b/public/js/components/Cis/Benotungstool/Benotungstool.js
@@ -0,0 +1,2347 @@
+import {CoreFilterCmpt} from "../../filter/Filter.js";
+import ApiLehre from "../../../api/factory/lehre.js";
+import ApiNoten from "../../../api/factory/noten.js";
+import ApiStudiensemester from "../../../api/factory/studiensemester.js";
+import BsModal from '../../Bootstrap/Modal.js';
+import BsOffcanvas from '../../Bootstrap/Offcanvas.js';
+import VueDatePicker from '../../vueDatepicker.js.php';
+import LehreinheitenModule from '../../DropdownModes/LehreinheitenModule';
+import MobilityLegende from '../../Mobility/Legende.js';
+import FhcOverlay from "../../Overlay/FhcOverlay.js";
+import {debounce} from "../../../helpers/debounce.js";
+import {centeredFormatter} from "../../../tabulator/formatter/centered.js";
+
+export const Benotungstool = {
+ name: "Benotungstool",
+ components: {
+ BsModal,
+ BsOffcanvas,
+ CoreFilterCmpt,
+ MobilityLegende,
+ Dropdown: primevue.dropdown,
+ Divider: primevue.divider,
+ InputNumber: primevue.inputnumber,
+ Password: primevue.password,
+ Textarea: primevue.textarea,
+ Datepicker: VueDatePicker,
+ Multiselect: primevue.multiselect,
+ FhcOverlay
+ },
+ props: {
+ lv_id: {
+ default: null,
+ required: true
+ },
+ sem_kurzbz: {
+ default: null,
+ required: true
+ },
+ viewData: {
+ type: Object,
+ required: true,
+ default: () => ({uid: ''}),
+ validator(value) {
+ return value && value.uid
+ }
+ }
+ },
+ data() {
+ return {
+ headerFiltersRestored: false,
+ filtersRestored: false,
+ colLayoutRestored: false,
+ sortRestored: false,
+ stateRestored: false,
+ persistenceID: 'notenToolTable2026-02-16',
+ debouncedFetchPunkteForPruefung: null,
+ config: null, // cis config
+ neuesPruefungsdatumModalVisible: false,
+ loading: false,
+ selectedUids: [], // shared selection state
+ selectedLehreinheit: null,
+ tabulatorCanBeBuilt: false,
+ selectedPruefungNote: null,
+ selectedPruefungDate: new Date(), // v-model for pruefung edit datepicker
+ selectedPruefungPunkte: null,
+ distinctPruefungsDates: null,
+ pruefungStudent: null,
+ pruefung: null,
+ password: '',
+ changedNotenCounter: 0,
+ tabulatorUuid: Vue.ref(0),
+ domain: '',
+ importString: '',
+ teilnoten: null,
+ lv: null,
+ studenten: null,
+ pruefungen: null,
+ studiensemester: null,
+ selectedSemester: null,
+ lehrveranstaltungen: null,
+ selectedLehrveranstaltung: null,
+ tableBuiltResolve: null,
+ notenOptions: null,
+ notenOptionsLehre: null,
+ notenOptionsPromise: null,
+ tableBuiltPromise: null,
+ notenTableOptions: null, // built later when noten are available
+ notenTableEventHandlers: [
+ {
+ event: "rowSelectionChanged",
+ handler: async (data, rows) => {
+ // avoid an expensive update loop if selection happens in modal
+ if(this.neuesPruefungsdatumModalVisible) return
+
+ if(data.length == 1 && this.selectedUids.length == 1 && data[0].uid === this.selectedUids[0].uid){
+ // special case to work around an internal tabulator selection quirk
+ this.selectedUids = []
+ } else {
+ this.selectedUids = data.filter(d => d.selectable);
+ }
+
+ }
+ },
+ {
+ event: "cellEdited",
+ handler: async (cell) => {
+ const field = cell.getField()
+
+ if(field === 'note_vorschlag') {
+ const rowData = cell.getRow().getData();
+ const newValue = cell.getValue();
+ const original = rowData._originalNoteVorschlag;
+
+ // If nothing was selected, restore
+ if (newValue == null || newValue === "" || newValue === original) {
+ // revert value
+ cell.setValue(original, true);
+ }
+
+ delete rowData._originalNoteVorschlag; // Clean up
+
+ const row = cell.getRow()
+ row.reformat() // trigger reformat of arrow
+ }
+ }
+ },
+ {
+ event: "cellClick",
+ handler: async (e, cell) => {
+ const field = cell.getField()
+
+ if(field == "mobility_zusatz") {
+ this.$refs.drawer.show()
+ e.stopPropagation()
+ this.undoSelection(cell)
+ } else if (field == "punkte" || field == "note_vorschlag" || field == "übernehmen") {
+ this.undoSelection(cell)
+ }
+ }
+ }
+ ]};
+ },
+ methods: {
+ loadState() {
+ return JSON.parse(localStorage.getItem(this.persistenceID) || "null");
+ },
+ saveState(table) {
+ // Only save if we have finished the initial restoration
+ // AND the table actually has columns (to avoid saving empty states)
+ if (!this.stateRestored) return;
+
+ const rawLayout = table.getColumnLayout();
+ const filteredLayout = rawLayout.filter(col => {
+ if(this.notenTableOptions.columns.some(colDef => colDef.field === col.field)) return col
+ return null
+ })
+
+ // TODO: if dynamic cols have sort/filter/headerfilter functionality filter them here before persisting
+ // into local storage
+ const rawSorters = table.getSorters()
+
+ const rawFilters = table.getFilters()
+
+ const rawHeaderFilters = table.getHeaderFilters()
+ const state = {
+ columns: filteredLayout.map(col => ({
+ field: col.field,
+ visible: col.visible,
+ width: col.width,
+ })),
+ sort: rawSorters.map(s => ({
+ field: s.field,
+ dir: s.dir,
+ })),
+ filters: rawFilters,
+ headerFilters: rawHeaderFilters
+ };
+
+ localStorage.setItem(this.persistenceID, JSON.stringify(state));
+ },
+ handleTableBuilt() {
+ const table = this.$refs.notenTable.tabulator;
+
+ this.tableBuiltResolve()
+
+ const saved = this.loadState();
+
+ // setup change eventlisteners
+ const events = [
+ "columnMoved", "columnResized", "columnVisibilityChanged",
+ "filterChanged", "headerFilterChanged", "dataSorted",
+ "columnSorted", "sortersChanged"
+ ];
+
+ events.forEach(eventName => {
+ table.on(eventName, () => this.saveState(table));
+ });
+
+ // renderComplete restore state logic
+ table.on("renderComplete", () => {
+ if (this.stateRestored) return;
+
+ // layout restore should be happening in setupData()
+
+ if (saved?.filters && !this.filtersRestored) {
+ this.filtersRestored = true;
+ table.setFilter(saved.filters);
+ }
+
+ if (saved?.headerFilters && !this.headerFiltersRestored) {
+ this.headerFiltersRestored = true;
+ saved.headerFilters.forEach(hf => {
+ table.setHeaderFilterValue(hf.field, hf.value);
+ });
+ }
+
+ if (saved?.sort?.length && !this.sortRestored) {
+ this.sortRestored = true;
+ setTimeout(() => {
+ const sortList = saved.sort.map(s => {
+ const col = table.columnManager.findColumn(s.field);
+ return col ? { column: col, dir: s.dir } : null;
+ }).filter(Boolean);
+
+ if (sortList.length) {
+ table.setSort(sortList);
+ }
+ }, 100);
+ }
+
+ this.stateRestored = true;
+ });
+
+ // finalize the promise
+ if (this.tableResolve) this.tableResolve();
+ },
+ undoSelection(cell) {
+ // checks if cells row is selected and unselects -> imitates columns which dont trigger row selection
+ // but actually just revert it after the fact
+
+ const row = cell.getRow()
+ if(row.isSelected()) {
+ row.deselect();
+ }
+ },
+ // using this to expose input event of editor element properly, tabulator makes it hard to access on default editor
+ // implemented after tabulator/src/js/modules/edit/defaults/editors/number.js
+ liveNumberEditor(cell, onRendered, success, cancel) {
+ const editor = document.createElement("input");
+ editor.setAttribute("type", "number");
+ editor.value = cell.getValue();
+
+ const row = cell.getRow()
+ const rowData = row.getData()
+
+ rowData._debouncedFetchNoteForPunkte = debounce(this.fetchNoteForPunkte, 500)
+ editor.addEventListener("input", (e) => {
+ rowData._debouncedFetchNoteForPunkte(e.target.value, row)
+ });
+
+ onRendered(() => {
+ editor.focus();
+ editor.style.height = "100%";
+ });
+
+ editor.addEventListener("change", () => success(editor.value));
+ editor.addEventListener("blur", () => success(editor.value));
+ editor.addEventListener("keydown", (e) => {
+ if (e.keyCode === 13) success(editor.value);
+ if (e.keyCode === 27) cancel();
+ });
+
+ return editor;
+ },
+ fetchNoteForPunkte(valueParam, row) {
+ const value = valueParam == '' ? null : valueParam
+ this.$api.call(ApiNoten.getNoteByPunkte(value, this.lv_id, this.sem_kurzbz)).then(res => {
+ if(res?.meta?.status === 'success' && res.data >= 0) {
+ row.update({note_vorschlag: res.data})
+ row.reformat()
+ }
+ })
+ },
+ fetchNoteForPunktePruefung(event) {
+ const value = event.value == '' ? null : event.value
+ this.$api.call(ApiNoten.getNoteByPunkte(value, this.lv_id, this.sem_kurzbz)).then(res => {
+ if(res?.meta?.status === 'success' && res.data >= 0) {
+ this.selectedPruefungNote = this.notenOptions.find(n => n.note == res.data)
+ }
+ })
+ },
+ isValidDate_ddmmyyyy(str) {
+ if (typeof str !== 'string') return false;
+
+ // Check format: dd.mm.yyyy
+ const regex = /^(\d{2})\.(\d{2})\.(\d{4})$/;
+ const match = str.match(regex);
+ if (!match) return false;
+
+ // Extract date parts
+ const day = parseInt(match[1], 10);
+ const month = parseInt(match[2], 10);
+ const year = parseInt(match[3], 10);
+
+ // Check valid ranges
+ if (month < 1 || month > 12 || day < 1 || day > 31) return false;
+
+ // Handle months with different days and leap years
+ const date = new Date(year, month - 1, day);
+ return (
+ date.getFullYear() === year &&
+ date.getMonth() === month - 1 &&
+ date.getDate() === day
+ );
+ },
+ identifyUid(str) {
+ if (typeof str !== 'string') return null;
+ const firstChar = str.charAt(0);
+
+ if (/^[0-9]$/.test(firstChar)) {
+ return 'matrikelnr';
+ } else if (/^[a-zA-Z]$/.test(firstChar)) {
+ return 'uid';
+ } else {
+ return null;
+ }
+ },
+ validatePruefungBulk(pruefungen) {
+ // need to check pruefungen for validity in respect to the students nr of antritte
+ // pruefungsdatum will be validated aswell so we dont get a termin 3 chronologically before
+ // a termin 2 which is totally possible in the old tool
+ const validatedPruefungen = []
+ pruefungen.forEach( p => {
+ const student = this.studenten.find(s => s.uid === p.uid)
+
+ // if a student doesnt have a lv_note entered definitely dont allow to create pruefung
+ if(!student.lv_note) {
+ this.$fhcAlert.alertWarning('Student ' + student.uid + ' hat noch keine LV-Note eingetragen! Es wird keine Prüfung angelegt.')
+ return
+ }
+
+ if(!student.note) {
+ this.$fhcAlert.alertWarning('Student ' + student.uid + ' hat noch keine Zeugnis Note eingetragen! Es wird keine Prüfung angelegt.')
+ return
+ }
+
+ // check if student antrittCount is too high already
+ if(student.hoechsterAntritt >= this.maxAntrittCount) {
+ this.$fhcAlert.alertWarning('Student ' + student.uid + ' hat bereits ' + student.hoechsterAntritt + ' Prüfungsantritte abgelegt. Die Zeile wurde übersprungen.')
+ return
+ }
+
+ // get student for pruefung and check if proposed datum does not conflict (no new pruefungen before existing ones)
+ const youngerPruefung = student.pruefungen.find(pr => {
+ return pr.dateObj >= p.dateObj
+ })
+ if(youngerPruefung) {
+ this.$fhcAlert.alertWarning('Student ' + student.uid + ' hat bereits eine Prüfung am '+ youngerPruefung.datum +' eingetragen. Die Zeile wurde übersprungen.')
+ return
+ }
+
+ validatedPruefungen.push(p)
+ })
+
+ pruefungen.splice(0, pruefungen.length, ...validatedPruefungen);
+ },
+ validateNotenBulk(noten) {
+ // in case we need to further validate noten, currently parser does all
+ },
+ parseNote(rowParts, notenbulk, rowNum) {
+ const id = this.identifyUid(rowParts[0])
+ const idTrimmed = rowParts[0].trim()
+ let student = null
+
+ if(id === 'matrikelnr') { // find student by matrnr and use uid later on
+ student = this.studenten.find(s => s.matrikelnr?.trim() === idTrimmed)
+ } else if(id === 'uid') {
+ student = this.studenten.find(s => s.uid?.trim() === idTrimmed)
+ }
+ if(!student) {
+ this.$fhcAlert.alertWarning(this.$p.t('benotungstool/c4importNoStudentFoundForIdInRow', [rowParts[0], rowNum]))
+ return
+ }
+
+ let punkte = null
+ let note = null
+ if(this.config?.CIS_GESAMTNOTE_PUNKTE) {
+ punkte = Number.parseFloat(rowParts[1])
+ } else {
+ note = rowParts[1]
+
+ // find notenoption and check if its allowed to use in lehre
+ const notenOption = this.notenOptions.find(n => n.note == note)
+ if(!notenOption.lehre) {
+ this.$fhcAlert.alertWarning(this.$p.t('benotungstool/c4importNoGradeFoundForIdInRow', [rowParts[0], rowNum]))
+ return
+ }
+ }
+
+ notenbulk.push({uid: student.uid, note, punkte})
+ },
+ parsePruefung(rowParts, pruefungbulk, rowNum) {
+ const id = this.identifyUid(rowParts[0])
+ const idTrimmed = rowParts[0].trim()
+ let student = null
+ if(id === 'matrikelnr') { // find student by matrnr and use uid later on
+ student = this.studenten.find(s => s.matrikelnr?.trim() === idTrimmed)
+ } else if(id === 'uid') {
+ student = this.studenten.find(s => s.uid?.trim() === idTrimmed)
+ }
+ if(!student) {
+ this.$fhcAlert.alertWarning(this.$p.t('benotungstool/c4importNoStudentFoundForIdInRow', [rowParts[0], rowNum]))
+ return
+ }
+
+ const datum = rowParts[1] // should be in 'dd.MM.yyyy'
+ if(!this.isValidDate_ddmmyyyy(datum)) {
+ this.$fhcAlert.alertWarning(this.$p.t('benotungstool/c4importInvalidDateFoundForIdInRow', [rowParts[0], rowNum]))
+ return
+ }
+ const datumParts = datum.split('.')
+ const day = datumParts[0]
+ const month = datumParts[1].padStart(2, '0')
+ const year = datumParts[2].padStart(2, '0')
+ const dateStr = `${year}-${month}-${day}`
+
+ // build date obj for validation later on
+ let monthInt = parseInt(month, 10)
+ monthInt -= 1
+ const dateObj = new Date(year, monthInt, day)
+
+
+ let punkte = null
+ let note = null
+ if(this.config?.CIS_GESAMTNOTE_PUNKTE) {
+ punkte = Number.parseFloat(rowParts[1])
+ } else {
+ note = rowParts[1]
+
+ // find notenoption and check if its allowed to use in lehre
+ const notenOption = this.notenOptions.find(n => n.note == note)
+ if(!notenOption.lehre) {
+ this.$fhcAlert.alertWarning(this.$p.t('benotungstool/c4importNoGradeFoundForIdInRow', [rowParts[0], rowNum]))
+ return
+ }
+ }
+
+ const typ = this.getPruefungstypForStudentByAntritt(student)
+
+ pruefungbulk.push({uid: student.uid, datum: dateStr, note, punkte, typ, lehreinheit_id: student.lehreinheit_id, dateObj})
+ },
+ saveNotenBulk(notenbulk) {
+ this.loading = true
+ this.$api.call(ApiNoten.saveNotenvorschlagBulk(this.lv_id, this.sem_kurzbz, notenbulk)).then(res => {
+ if(res.meta.status === 'success') {
+ this.$fhcAlert.alertDefault(
+ 'success',
+ 'Info',
+ this.$capitalize(this.$p.t('benotungstool/notenImportSuccessAlert')),
+ true
+ )
+ const lvNoten = res.data
+
+
+ lvNoten.forEach(lvn => {
+ // 1.) get relevant student row by uid
+ const s = this.studenten.find(s => s.uid === lvn.student_uid)
+ s.note_vorschlag = lvn.note // TODO: check if note_vorschlag should be changed by import
+
+ s.lv_note = lvn.note
+ if(this.config?.CIS_GESAMTNOTE_PUNKTE) {
+ s.punkte = lvn.punkte
+ }
+
+ this.teilnoten[s.uid].note_lv = lvn.note
+ // recalculate freigabestatus
+ s.freigabedatum = this.parseDate(lvn['freigabedatum'])
+ s.benotungsdatum = this.parseDate(lvn['benotungsdatum'])
+
+ s.freigegeben = this.checkFreigabe(s.freigabedatum, s.benotungsdatum, s.uid);
+ })
+
+ }
+
+ this.$refs.notenTable.tabulator.redraw(true)
+ }).finally(()=>{
+ this.loading = false
+ })
+ },
+ savePruefungBulk(pruefungenbulk) {
+ this.loading = true
+ this.$api.call(ApiNoten.saveStudentPruefungBulk(this.lv_id, this.sem_kurzbz, pruefungenbulk))
+ .then((res)=> {
+ if(res.meta.status === 'success') {
+ this.$fhcAlert.alertDefault(
+ 'success',
+ 'Info',
+ this.$capitalize(this.$p.t('benotungstool/pruefungImportSuccessAlert')),
+ true
+ )
+ this.handleAddNewPruefungenResponse(res, pruefungenbulk)
+ }
+ }).finally(()=>{this.loading = false})
+ },
+ handleAddNewPruefungenResponse(res, uids) {
+ // in case we reload when changing lva_id or stsem to always consider local storage layout
+ this.colLayoutRestored = false;
+
+ const pruefungen = res.data
+ uids.forEach(entry => {
+ const saved = pruefungen[entry.uid].savedPruefung?.[0]
+ const extra = pruefungen[entry.uid].extraPruefung?.[0]
+
+ const student = this.studenten.find(s => s.uid == entry.uid)
+ if(!student) return
+
+ // check for extra pruefung (termin1) to add before
+ if(extra) {
+ student["Termin1"] = extra
+ student.pruefungen.push(extra) // push to pruefungen array for antritt evaluation
+ }
+
+ this.correctOldTerminTypenForStudent(student, saved)
+
+ if(!this.distinctPruefungsDates.includes(saved.datum)) {
+ this.insertSortedDate(this.distinctPruefungsDates, saved.datum)
+ }
+
+ // add pruefung to pruefungen array
+ student.pruefungen.push(saved)
+
+ // add pruefung to student via its datum as a field
+ student[saved.datum] = saved
+
+ // usually should be in order naturally, just to be save
+ student.pruefungen.sort((p1, p2) => {
+ if(p1.datum > p2.datum) {
+ return 1
+ } else if (p1.datum < p2.datum) {
+ return -1
+ } else {
+ return 0
+ }
+ })
+
+ // recalculate student antritte
+ student.hoechsterAntritt = this.getAntrittCountStudent(student)
+ this.recalculateSelectable(student)
+ this.reformatStudentRow(student)
+ })
+
+ // add col to table
+ const cols = [...this.notenTableOptions.columns.slice(0, -1)];
+ let kommCol = null
+ if(this.config?.CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF) kommCol = this.notenTableOptions.columns[this.notenTableOptions.columns.length - 1];
+
+ if(this.distinctPruefungsDates.length) {
+ cols.push({
+ title: this.$capitalize(this.$p.t('benotungstool/c4originalZnote')),
+ field: "Termin1",
+ formatter: this.pruefungFormatter,
+ titleFormatter: this.pruefungTitleFormatter,
+ topCalc: this.terminCalcFunc,
+ topCalcFormatter: this.terminCalcFormatter,
+ hozAlign:"center",
+ widthGrow: 1,
+ minWidth: 200,
+ width: 250,
+ visible: true,
+ tooltip: false
+ })
+ }
+
+ this.distinctPruefungsDates.forEach((date)=>{
+ const dateparts = date.split('-')
+ const titledate = `${dateparts[2]}.${dateparts[1]}.${dateparts[0]}`
+
+ cols.push({
+ title: titledate,//this.$p.t('benotungstool/pruefungNr', [index+1]),
+ field: date,
+ formatter: this.pruefungFormatter,
+ titleFormatter: this.pruefungTitleFormatter,
+ topCalc: this.terminCalcFunc,
+ topCalcFormatter: this.terminCalcFormatter,
+ hozAlign:"center",
+ widthGrow: 1,
+ minWidth: 200,
+ width: 250,
+ visible: true,
+ tooltip: false
+ })
+ })
+
+ if(this.config?.CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF) cols.push(kommCol) // keep kommPruef Col as last
+ // redraw table
+
+
+ // preemptively do the persistence part of columns already here so we get the merged definition before
+ // tabulator internal go to war with vue reactives
+ let colsUsed = null
+ const saved = this.loadState();
+ if (saved && saved.columns) {
+ // new columns map for lookup
+ const colMap = new Map(cols.map(c => [c.field, c]));
+
+ const restoredCols = [];
+
+ // add columns in the SAVED order, applying saved width/visibility
+ saved.columns.forEach(savedCol => {
+ const originalDef = colMap.get(savedCol.field);
+ if (originalDef) {
+ restoredCols.push({
+ ...originalDef, // Keep formatters, calcs, etc.
+ width: savedCol.width,
+ visible: savedCol.visible
+ });
+ colMap.delete(savedCol.field); // Remove so we don't double-add
+ }
+ });
+
+ // append any NEW columns aka pruefungs cols
+ colMap.forEach((def) => {
+ restoredCols.push(def);
+ });
+
+ colsUsed = restoredCols;
+ this.colLayoutRestored = true;
+ }
+
+ this.loading = false
+
+ const colsFinal = colsUsed ?? cols
+ this.$refs.notenTable.tabulator.setColumns(colsFinal)
+ this.$refs.notenTable.tabulator.setData(this.studenten);
+ this.$refs.notenTable.tabulator.redraw(true);
+ },
+ reformatStudentRow(student) {
+ const table = this.$refs.notenTable.tabulator
+ if(!table) return
+
+ const row = table.rowManager.getRowFromDataObject(student)
+
+ const rowComponent = row.getComponent()
+ rowComponent.reformat()
+ },
+ correctOldTerminTypenForStudent(student, saved) {
+ // check if student has a preceding pruefung from same type and remove it since in this case
+ // the new pruefung will have overwritten the old one
+ const oldP = student.pruefungen.find(p => p.pruefungstyp_kurzbz == saved.pruefungstyp_kurzbz)
+ if(oldP) {
+ delete student[oldP.datum] // delete the variable col value
+
+ const pIndex = student.pruefungen.indexOf(oldP)
+ if (pIndex > -1) {
+ student.pruefungen.splice(pIndex, 1)
+ }
+ // student.pruefungen.splice(student.pruefungen.indexOf(oldP), 1) // delete from pruefungen array
+
+ // check if on that date any other student has a pruefung, if not delete it from distinctPruefungsDates
+ const other = this.studenten.find(s => s[oldP.datum] !== undefined)
+ if(!other) {
+ const dateIndex = this.distinctPruefungsDates.indexOf(oldP.datum);
+ if (dateIndex > -1) {
+ this.distinctPruefungsDates.splice(dateIndex, 1);
+ }
+ // this.distinctPruefungsDates.splice(this.distinctPruefungsDates.findIndex(oldP.datum), 1)
+ }
+ }
+ },
+ importNoten() {
+ const rows = this.importString.split('\n')
+ const bulk = []
+ let mode = ''
+ // read the lines
+ rows.forEach((r,i) => {
+ const rowParts = r.split('\t')
+ if(rowParts.length === 3) {
+ this.parsePruefung(rowParts, bulk, i)
+ mode = 'pruefung' // if line parts are not uniform we are in trouble
+ } else if(rowParts.length === 2) {
+ this.parseNote(rowParts, bulk, i)
+ mode = 'note'
+ }
+ })
+
+ // parsers check for notenOption.lehre === true and if student uid/matrikelnr matches
+
+ // pruefungen check for younger pruefungen, so there are no further antritte with
+ // previous dates from automatic imports
+ if(mode === 'note') {
+ this.validateNotenBulk(bulk)
+ this.saveNotenBulk(bulk)
+ }
+ else if (mode === 'pruefung') {
+ this.validatePruefungBulk(bulk)
+ this.savePruefungBulk(bulk)
+ }
+
+ this.$refs.modalContainerNotenImport.hide()
+ },
+ selectionArraysAreEqual(arr1, arr2) {
+ if(arr1.length !== arr2.length) return false
+
+ const sortFunc = (s1, s2) => {
+ if(s1.nachname > s2.nachname) {
+ return 1
+ } else if (s1.nachname < s2.nachname) {
+ return -1
+ } else {
+ return 0
+ }
+ }
+ const sortedArr1 = arr1.sort(sortFunc)
+ const sortedArr2 = arr2.sort(sortFunc)
+
+ const arrsREqual = sortedArr1.every((val, index) => val === sortedArr2[index]);
+
+ return arrsREqual
+ },
+ getNotenTableOptions() {
+
+ return {
+ height: 700,
+ virtualDom: true,
+ virtualDomBuffer: 5000,
+ index: 'uid',
+ layout: 'fitDataStretch',
+ placeholder: this.$capitalize(this.$p.t('global/noDataAvailable')),
+ selectable: true,
+ selectableRangeMode: "click", // shift+click
+ selectablePersistence: false, // reset selection on table reload
+ selectableCheck: this.selectableCheck,
+ rowFormatter: this.fixTabulatorSelectionFormatter,
+ columns: this.getColumnsDefinition(),
+ persistence: false,
+ }
+
+ },
+ selectableCheck(row, e) {
+ const data = row.getData();
+
+ if(data['kommPruef']) return false
+ else if(data.hoechsterAntritt >= this.maxAntrittCount) return false // 2 or 3 pruefungen counted
+
+ return true; // student can be selected to add pruefung
+
+ },
+ getColumnsDefinition() {
+ const columns = []
+
+
+ columns.push({
+ formatter: function (cell, formatterParams, onRendered) {
+ // create the built-in checkbox
+ let checkbox = document.createElement("input");
+ checkbox.type = "checkbox";
+
+ // Handle select manually
+ checkbox.addEventListener("click", (e) => {
+ e.stopPropagation();
+
+ // call our function
+ if (formatterParams && formatterParams.handleClick) {
+ formatterParams.handleClick(e, cell);
+ }
+ });
+
+ return checkbox;
+ },
+ titleFormatter: function (cell, formatterParams, onRendered) {
+ // create the built-in checkbox
+ let checkbox = document.createElement("input");
+ checkbox.type = "checkbox";
+
+ // Handle "select all" manually
+ checkbox.addEventListener("click", (e) => {
+ e.stopPropagation();
+
+ // call our function
+ if (formatterParams && formatterParams.handleClick) {
+ formatterParams.handleClick(e, cell);
+ }
+ });
+
+ return checkbox;
+ },
+ hozAlign: "center",
+ headerSort: false,
+ formatterParams: {
+ handleClick: this.selectHandler
+ },
+ titleFormatterParams: {
+ handleClick: this.selectAllHandler
+ },
+ width: 50,
+ cssClass: 'sticky-col',
+ field: 'selectCol',
+ title: ''
+ })
+ columns.push({title: 'UID', field: 'uid', tooltip: false, widthGrow: 1, topCalc: this.sumCalcFunc, formatter: centeredFormatter, cssClass: 'sticky-col'})
+ columns.push({title: Vue.computed(() => this.$capitalize(this.$p.t('benotungstool/c4mail'))), field: 'email', formatter: this.mailFormatter, tooltip: false, visible: false, widthGrow: 1, variableHeight: true})
+ columns.push({title: Vue.computed(() => this.$capitalize(this.$p.t('benotungstool/c4antrittCountv2'))), field: 'hoechsterAntritt', formatter: centeredFormatter, tooltip: false, widthGrow: 1})
+ columns.push({title: Vue.computed(() => this.$capitalize(this.$p.t('benotungstool/c4vorname'))), field: 'vorname', formatter: centeredFormatter, headerFilter: true, tooltip: false, widthGrow: 1})
+ columns.push({title: Vue.computed(() => this.$capitalize(this.$p.t('benotungstool/c4nachname'))), field: 'nachname', formatter: centeredFormatter, headerFilter: true, widthGrow: 1})
+ columns.push({title: Vue.computed(() => this.$capitalize(this.$p.t('benotungstool/c4anwesenheitsquote'))), field: 'anwquote', widthGrow: 1, formatter: this.percentFormatter})
+ columns.push({title: Vue.computed(() => this.$capitalize(this.$p.t('benotungstool/c4mobility'))), field: 'mobility_zusatz', formatter: centeredFormatter, headerFilter: true, widthGrow: 1, visible: false})
+ if(this.config?.CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE) {
+ columns.push({title: Vue.computed(() => this.$capitalize(this.$p.t('benotungstool/c4teilnoten'))), field: 'teilnote', widthGrow: 1, formatter: this.teilnotenFormatter, variableHeight: true})
+ }
+ if(this.config?.CIS_GESAMTNOTE_PUNKTE) {
+ columns.push({title: Vue.computed(() => this.$capitalize(this.$p.t('benotungstool/c4punkte'))), field: 'punkte', widthGrow: 1,
+ editor: this.liveNumberEditor,
+ editable: (cell) => {
+ const rowData = cell.getRow().getData();
+ if(this.pruefungen?.find(p => p.student_uid == rowData.uid)) return false
+
+ return true
+ },
+ variableHeight: true
+ })
+ }
+ columns.push({title: Vue.computed(() => this.$capitalize(this.$p.t('benotungstool/c4notenvorschlag'))), field: 'note_vorschlag',
+ editor: 'list',
+ editorParams: (cell) => {
+ // write original cell value into row to it can be retrieved if edit is cancelled without selection
+ const rowData = cell.getRow().getData();
+ rowData._originalNoteVorschlag = cell.getValue();
+
+ return {
+ values: this.notenOptionsLehre.map(opt => ({
+ label: opt.bezeichnung,
+ value: opt.note
+ }))
+ };
+ },
+ editable: (cell) => {
+ // punkte features enables mapping but unable to set note directly
+ if(this.config?.CIS_GESAMTNOTE_PUNKTE) return false
+ const rowData = cell.getRow().getData();
+ const noteOption = this.notenOptions.find(opt => opt.note == rowData.note)
+ if(!noteOption) return true
+
+ // also if student has any pruefungsnote disable noten selection
+ if(this.pruefungen?.find(p => p.student_uid == rowData.uid)) return false
+
+ return noteOption.lkt_ueberschreibbar
+ },
+ formatter: (cell) => {
+ const rowData = cell.getRow().getData();
+ const value = cell.getValue()
+ const match = this.notenOptions?.find(opt => opt.note == value)
+ const val = match ? match.bezeichnung : value
+ const p = this.pruefungen?.find(p => p.student_uid == rowData.uid)
+ let style = ''
+
+ if(val === undefined) return ''
+ if(p || !match?.lkt_ueberschreibbar) style = 'color: gray;font-style: italic; background-color: #f0f0f0;pointer-events: none;opacity: 0.6;user-select: none;cursor: not-allowed;'
+ return '
') + else s.teilnote += (''+g.text +''+ '
') + }) + + const vueThis = this + Object.defineProperty(s, 'selectable', { + get() { + const kP = s.pruefungen?.find(p => p.pruefungstyp_kurzbz == 'kommPruef') + const maxAntrittReached = s.hoechsterAntritt >= vueThis.maxAntrittCount + return !(kP || maxAntrittReached) + + }, + set() { + // empty setter so tabulator doesnt scream + }, + enumerable: true, + configurable: true + }) + + }) + + // if we have any pruefungen at all someone must have original note/termin1 pruefung + if(this.distinctPruefungsDates.length) { + cols.push({ + title: this.$capitalize(this.$p.t('benotungstool/c4originalZnote')), + field: "Termin1", + formatter: this.pruefungFormatter, + titleFormatter: this.pruefungTitleFormatter, + sorter: this.pruefungSorter, + topCalc: this.terminCalcFunc, + topCalcFormatter: this.terminCalcFormatter, + hozAlign:"center", + widthGrow: 1, + minWidth: 200, + width: 250, + visible: true, + tooltip: false + }) + } + + this.distinctPruefungsDates.sort((d1, d2) => { + if(d1 > d2) { + return 1 + } else if (d1 < d2) { + return -1 + } else { + return 0 + } + }) + this.distinctPruefungsDates.forEach((date)=>{ + const dateparts = date.split('-') + const titledate = `${dateparts[2]}.${dateparts[1]}.${dateparts[0]}` + + cols.push({ + title: titledate, + field: date, + formatter: this.pruefungFormatter, + titleFormatter: this.pruefungTitleFormatter, + sorter: this.pruefungSorter, + topCalc: this.terminCalcFunc, + topCalcFormatter: this.terminCalcFormatter, + hozAlign:"center", + widthGrow: 1, + minWidth: 200, + width: 250, + visible: true, + tooltip: false + }) + }) + + if(this.config?.CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF) cols.push(kommCol) // keep kommPruef Col as last + + + // preemptively do the persistence part of columns already here so we get the merged definition before + // tabulator internal go to war with vue reactives + let colsUsed = null + const saved = this.loadState(); + if (saved && saved.columns) { + // new columns map for lookup + const colMap = new Map(cols.map(c => [c.field, c])); + + const restoredCols = []; + + // add columns in the SAVED order, applying saved width/visibility + saved.columns.forEach(savedCol => { + const originalDef = colMap.get(savedCol.field); + if (originalDef) { + restoredCols.push({ + ...originalDef, // Keep formatters, calcs, etc. + width: savedCol.width, + visible: savedCol.visible + }); + colMap.delete(savedCol.field); // Remove so we don't double-add + } + }); + + // append any NEW columns aka pruefungs cols + colMap.forEach((def) => { + restoredCols.push(def); + }); + + colsUsed = restoredCols; + this.colLayoutRestored = true; + } + + const colsFinal = colsUsed ?? cols + this.loading = false + + this.$refs.notenTable.tabulator.setColumns(colsFinal) + this.$refs.notenTable.tabulator.setData(this.studenten); + this.$refs.notenTable.tabulator.redraw(true); + }, + loadNoten(lv_id, sem_kurzbz) { + this.loading = true + this.$api.call(ApiNoten.getStudentenNoten(lv_id, sem_kurzbz)) + .then(res => { + if(res?.data) this.setupData(res.data) + if(res?.meta?.getExternalGradesError) this.$fhcAlert.alertError(res.meta.getExternalGradesError) + }).finally(()=> { + this.loading = false + }) + }, + handleUuidDefined(uuid) { + this.tabulatorUuid = uuid + }, + calcMaxTableHeight() { + const tableID = this.tabulatorUuid ? ('-' + this.tabulatorUuid) : '' + const tableDataSet = document.getElementById('filterTableDataset' + tableID); + if(!tableDataSet) return + const rect = tableDataSet.getBoundingClientRect(); + + this.notenTableOptions.height = window.visualViewport.height - rect.top - 50 + this.$refs.notenTable.tabulator.setHeight(this.notenTableOptions.height) + }, + async setupCreated() { + this.loading = true + + this.debouncedFetchPunkteForPruefung = debounce(this.fetchNoteForPunktePruefung, 500) + + // fetch cis config regarding gesamtnoteneingabe, needs to be fetched before setup can finish + const configPromise = this.$api.call(ApiNoten.getCisConfig()).then(res => { + this.config = res.data + }) + + // fetch lva dropdown + this.$api.call(ApiLehre.getZugewieseneLv(this.viewData?.uid, this.sem_kurzbz)).then(res => { + this.lehrveranstaltungen = res.data + + // build dropdown option string + this.lehrveranstaltungen.forEach(lva => { + lva.fullString = `${lva.stg_kurzbz} - ${lva.lv_semester}: ${lva.lv_bezeichnung}` + }) + + this.selectedLehrveranstaltung = this.lehrveranstaltungen.find(lva => lva.lehrveranstaltung_id == this.lv_id) + }) + + LehreinheitenModule.setupContext(this.$.appContext.config.globalProperties) + LehreinheitenModule.bindParams(Vue.ref(Vue.computed(() => this.LeDropdownParams))); + + // fetch sem_kurzbz dropdown + this.$api.call(ApiStudiensemester.getStudiensemester()).then(res => { + this.studiensemester = res.data[0] + this.selectedSemester = this.studiensemester.find(sem => sem.studiensemester_kurzbz === this.sem_kurzbz) + }) + + // fetch noten dropdown + this.$api.call(ApiNoten.getNoten()).then(async res => { + this.notenOptions = res.data + this.notenOptionsLehre = res.data.filter(n => n.lehre === true) + + await configPromise + this.notenTableOptions = this.getNotenTableOptions() + this.tabulatorCanBeBuilt = true // because promises would be more work and not much better here + }).catch(e => { + this.loading = false + }) + + }, + async setupMounted() { + this.tableBuiltPromise = new Promise(this.tableResolve) + await this.tableBuiltPromise + + this.loadNoten(this.lv_id, this.sem_kurzbz) + this.calcMaxTableHeight() + + }, + lvChanged(e) { + this.$router.push({ + name: "Benotungstool", + params: { + sem_kurzbz: this.sem_kurzbz, + lv_id: e.value.lehrveranstaltung_id + } + }) + + // reload data + this.loadNoten(e.value.lehrveranstaltung_id, this.sem_kurzbz) + }, + ssChanged(e) { + // change url params & write history + this.$router.push({ + name: "Benotungstool", + params: { + sem_kurzbz: e.value.studiensemester_kurzbz, + lv_id: this.lv_id + } + }) + + this.loading = true + // diff lv_id -> reload zugewiesene lv + this.$api.call(ApiLehre.getZugewieseneLv(this.viewData?.uid, e.value.studiensemester_kurzbz)).then(res => { + this.lehrveranstaltungen = res.data + + // build dropdown option string + this.lehrveranstaltungen.forEach(lva => { + lva.fullString = `${lva.stg_kurzbz} - ${lva.lv_semester}: ${lva.lv_bezeichnung}` + }) + + this.selectedLehrveranstaltung = this.lehrveranstaltungen.find(lva => lva.lehrveranstaltung_id == this.lv_id) + }).then(()=>{ + + // reload data + this.loadNoten(this.lv_id, e.value.studiensemester_kurzbz) + }).finally( () => this.loading = false) + + }, + getOptionLabel(option) { + return option.studiensemester_kurzbz + }, + getOptionLabelLv(option) { + return option.fullString + }, + getOptionLabelLe(option) { + return option.infoString + }, + getPruefungstypForStudentByAntritt(student) { + // when adding new pruefungen, determine the next pruefungstyp by using the antritt counter + switch (student.hoechsterAntritt) { + case 0: + return "Termin2" + break + case 1: + return "Termin2" + break + case 2: + return "Termin3" + break + default: + return "" + } + }, + savePruefungEingabe() { + const year = this.selectedPruefungDate.getFullYear(); + const month = String(this.selectedPruefungDate.getMonth() + 1).padStart(2, '0'); // Months are 0-based + const day = String(this.selectedPruefungDate.getDate()).padStart(2, '0'); + const dateStr = `${year}-${month}-${day}`; + + // first pruefung is always "Termin2" since normal note counts as Termin1 + // const pOffset = this.pruefung === null && this.pruefungStudent.pruefungen.length === 0 ? 2 : 1 + + const typ = this.pruefung ? this.pruefung.pruefungstyp_kurzbz : this.getPruefungstypForStudentByAntritt(this.pruefungStudent) + const note = this.selectedPruefungNote?.note ?? 9 // noch nicht eingetragen + const punkte = this.selectedPruefungPunkte ?? 0 + this.$api.call(ApiNoten.saveStudentPruefung( + this.pruefungStudent.uid, + note, + punkte, + dateStr, + this.lv_id, + this.pruefungStudent.lehreinheit_id, + this.sem_kurzbz, + typ + )).then(res => { + if(res.meta.status === 'success') { //'Prüfung für Student ' + this.pruefungStudent.uid + ' bearbeitet oder angelegt' + this.$fhcAlert.alertDefault( + 'success', + 'Info', + this.$capitalize(this.$p.t('benotungstool/pruefungSaveForUid', [this.pruefungStudent.uid])), + true + ) + const s = this.studenten.find(s => s.uid === res.data[1]?.student_uid) + + s.freigabedatum = this.parseDate(res.data[1]?.['freigabedatum']) + s.benotungsdatum = this.parseDate(res.data[1]?.['benotungsdatum']) + + s.freigegeben = this.checkFreigabe(s.freigabedatum, s.benotungsdatum, s.uid); + + s.lv_note = res.data[1]?.note + const oldScrollLeft = this.$refs.notenTable.tabulator.rowManager.scrollLeft + const oldScrollTop = this.$refs.notenTable.tabulator.rowManager.scrollTop + + // add new pruefung to row + if(!this.pruefung) { + this.handleAddNewTermin(res.data, s) + } else { // update existing + const oldIndex = s.pruefungen.findIndex(p => p.pruefung_id == this.pruefung.pruefung_id) + if(oldIndex !== -1) { + s.pruefungen.splice(oldIndex, 1, res.data[0]) + s[res.data[0].datum] = res.data[0] + } + + // antritte might have changed due to different benotung + s.hoechsterAntritt = this.getAntrittCountStudent(s) + this.recalculateSelectable(s) + this.reformatStudentRow(s) + } + + this.$refs.notenTable.tabulator.redraw(true) + Vue.nextTick(()=> { + const table = this.$refs.notenTable.tabulator.element.querySelector('.tabulator-tableholder') + if(table) { + table.scrollLeft = oldScrollLeft; + table.scrollTop = oldScrollTop; + } + }) + + } + }).finally(()=> { + this.pruefungStudent = null + this.pruefung = null + }) + + this.$refs.modalContainerPruefung.hide() + }, + handleAddNewTermin(data, student){ + this.colLayoutRestored = false; // always keep persistence options in mind when modifying table cols dynamically + + const savedPruefung = data[0] + const extra = data[2] + + // check for extra pruefung (termin1) to add before + if(extra) { + student["Termin1"] = extra + student.pruefungen.push(extra) // push to pruefungen array for antritt evaluation + } + + this.correctOldTerminTypenForStudent(student, savedPruefung) + + if(!this.distinctPruefungsDates.includes(savedPruefung.datum)) { + this.insertSortedDate(this.distinctPruefungsDates, savedPruefung.datum) + } + + // add pruefung to pruefungen array + student.pruefungen.push(savedPruefung) + + // add pruefung to student via its datum as a field + student[savedPruefung.datum] = savedPruefung + + // usually should be in order naturally, just to be save + student.pruefungen.sort((p1, p2) => { + if(p1.datum > p2.datum) { + return 1 + } else if (p1.datum < p2.datum) { + return -1 + } else { + return 0 + } + }) + + // recalculate student antritte + + student.hoechsterAntritt = this.getAntrittCountStudent(student) + this.recalculateSelectable(student) + this.reformatStudentRow(student) + + // add col to table + const cols = [...this.notenTableOptions.columns.slice(0, -1)]; + let kommCol = null + if(this.config?.CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF) kommCol = this.notenTableOptions.columns[this.notenTableOptions.columns.length - 1]; + + if(this.distinctPruefungsDates.length) { + cols.push({ + title: this.$capitalize(this.$p.t('benotungstool/c4originalZnote')), + field: "Termin1", + formatter: this.pruefungFormatter, + titleFormatter: this.pruefungTitleFormatter, + sorter: this.pruefungSorter, + topCalc: this.terminCalcFunc, + topCalcFormatter: this.terminCalcFormatter, + hozAlign:"center", + widthGrow: 1, + minWidth: 200, + width: 250, + visible: true, + tooltip: false + }) + } + + this.distinctPruefungsDates.forEach((date)=>{ + const dateparts = date.split('-') + const titledate = `${dateparts[2]}.${dateparts[1]}.${dateparts[0]}` + + cols.push({ + title: titledate,//this.$p.t('benotungstool/pruefungNr', [index+1]), + field: date, + formatter: this.pruefungFormatter, + titleFormatter: this.pruefungTitleFormatter, + sorter: this.pruefungSorter, + topCalc: this.terminCalcFunc, + topCalcFormatter: this.terminCalcFormatter, + hozAlign:"center", + widthGrow: 1, + minWidth: 200, + width: 250, + visible: true, + tooltip: false + }) + }) + + if(this.config?.CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF) cols.push(kommCol) // keep kommPruef Col as last + + + // preemptively do the persistence part of columns already here so we get the merged definition before + // tabulator internal go to war with vue reactives + let colsUsed = null + const saved = this.loadState(); + if (saved && saved.columns) { + // new columns map for lookup + const colMap = new Map(cols.map(c => [c.field, c])); + + const restoredCols = []; + + // add columns in the SAVED order, applying saved width/visibility + saved.columns.forEach(savedCol => { + const originalDef = colMap.get(savedCol.field); + if (originalDef) { + restoredCols.push({ + ...originalDef, // Keep formatters, calcs, etc. + width: savedCol.width, + visible: savedCol.visible + }); + colMap.delete(savedCol.field); // Remove so we don't double-add + } + }); + + // append any NEW columns aka pruefungs cols + colMap.forEach((def) => { + restoredCols.push(def); + }); + + colsUsed = restoredCols; + this.colLayoutRestored = true; + } + + + const colsFinal = colsUsed ?? cols + this.$refs.notenTable.tabulator.setColumns(colsFinal) + // this.$refs.notenTable.tabulator.redraw(true) + // redraw table outside this function + }, + recalculateSelectable(student) { + const vueThis = this + Object.defineProperty(student, 'selectable', { + get() { + const kP = student.pruefungen?.find(p => p.pruefungstyp_kurzbz == 'kommPruef') + return !(kP || student.hoechsterAntritt >= vueThis.maxAntrittCount) + }, + set() { + // empty setter so tabulator doesnt scream + }, + enumerable: true, + configurable: true + }) + }, + saveNoteneingabe() { + this.$api.call(ApiNoten.saveStudentenNoten(this.password, this.changedNoten, this.lv_id, this.sem_kurzbz)) + .then((res) => { + if(res.meta.status === 'success') { + this.$fhcAlert.alertDefault( + 'success', + 'Info', + 'Noten gespeichert', + true + ) + } + + res.data.forEach(d => { + const s = this.studenten.find(s => s.uid === d.uid) + s.freigabedatum = this.parseDate(d.freigabedatum) + s.benotungsdatum = this.parseDate(d.benotungsdatum) + s.freigegeben = this.checkFreigabe(s.freigabedatum, s.benotungsdatum, s.uid); + }) + this.changedNotenCounter++; + + this.$refs.notenTable.tabulator.redraw(true) + }) + + this.$refs.modalContainerNotenSpeichern.hide() + }, + openSaveModal() { + this.$refs.modalContainerNotenSpeichern.show() + }, + openNewPruefungsdatumModal() { + this.$refs.modalContainerNeuesPruefungsdatum.show() + }, + openNotenImportModal() { + this.$refs.modalContainerNotenImport.show() + }, + getOptionLabelNotePruefung(option) { + return option.bezeichnung + }, + leChanged(e) { + this.selectedLehreinheit = e.value + }, + addPruefung(){ + + this.$refs.modalContainerNeuesPruefungsdatum.hide() + + // filter students that already have a pruefung on datum + + const year = this.selectedPruefungDate.getFullYear(); + const month = String(this.selectedPruefungDate.getMonth() + 1).padStart(2, '0'); // Months are 0-based + const day = String(this.selectedPruefungDate.getDate()).padStart(2, '0'); + const dateStrDb = `${year}-${month}-${day}`; + const dateStrFront = `${day}.${month}.${year}`; + + const uids = [] + // const uids = this.selectedUids.map(student => { + this.selectedUids.forEach(student => { + + // if a student doesnt have a lv_note entered definitely dont allow to create pruefung + if(!student.lv_note) { + this.$fhcAlert.alertWarning('Student ' + student.uid + ' hat noch keine LV-Note eingetragen! Es wird keine Prüfung angelegt.') + return + } + + if(!student.note) { + this.$fhcAlert.alertWarning('Student ' + student.uid + ' hat noch keine Zeugnis Note eingetragen! Es wird keine Prüfung angelegt.') + return + } + + // check if student antrittCount is too high already + if(student.hoechsterAntritt >= this.maxAntrittCount) { + this.$fhcAlert.alertWarning('Student ' + student.uid + ' hat bereits ' + student.hoechsterAntritt + ' Prüfungsantritte abgelegt. Es wird keine Prüfung angelegt.') + return + } + + // get student for pruefung and check if proposed datum does not conflict (no new pruefungen before existing ones) + const youngerPruefung = student.pruefungen.find(pr => { + return pr.dateObj >= this.selectedPruefungDate + }) + if(youngerPruefung) { + this.$fhcAlert.alertWarning('Student ' + student.uid + ' hat bereits eine Prüfung am '+ youngerPruefung.datum +' eingetragen. Es wird keine Prüfung angelegt.') + return + } + + uids.push({ + uid: student.uid, + lehreinheit_id: student.lehreinheit_id, + typ: this.getPruefungstypForStudentByAntritt(student)//student.hoechsterAntritt + }) + }) + + this.loading = true; + this.$api.call(ApiNoten.createPruefungen( + uids, + dateStrDb, + this.lv_id, + this.sem_kurzbz, + )).then(res => { + if(res.meta.status === "success") { + + // iterate over response data + // -> alert successful pruefungen + // -> alert denied pruefungen + reason + + let uidListSuccess = '' + let uidListError = '' + const successData = [] + Object.keys(res.data).forEach(student_uid => { + const student = res.data[student_uid] + // actual pruefung has been allocated + if(student.savedPruefung || student.extraPruefung) { + uidListSuccess += ' ' + student_uid + + // keep res.data format intact for handleResponse method + successData[student_uid] = student + } else { // there should be an error message why no pruefungen where allocated for this person, many reasons possible + uidListError += student_uid + ' - ' + student +'\n'// student variable is the error message here + } + }) + + if(uidListError != '') { + this.$fhcAlert.alertError( + this.$capitalize(this.$p.t('benotungstool/c4pruefungAnlageError', [dateStrFront])) + ': ' + uidListError + ' ' + ) + } + + if(uidListSuccess != '') { + this.$fhcAlert.alertDefault( + 'success', + 'Info', + this.$capitalize(this.$p.t('benotungstool/pruefungAngelegtAn', [dateStrFront])) + ': ' + uidListSuccess, + true + ) + + this.handleAddNewPruefungenResponse({data: successData}, uids) + } + + } + }).finally(()=> this.loading = false) + }, + getAntrittCountStudent(student) { + // checks for existence of a prüfung with a note that resolves to a + // "angetretene Prüfung" -> anything except "entschuldigt" & "noch nicht eingetragen" + // and returns the next allowed pruefungstyp from the number of taken pruefungen + + // 1 -> reguläre note + // 2 -> erste Nachprüfung / Termin2 + // 3 -> 2te Nachprüfung / Termin3 + // 4 -> kommPruef + if(student['kommPruef']) return 4 + + let pruefungsAntrittCount = 0 + const pLen = student.pruefungen.length + for(let i = 0; i < pLen; i++) { + const p = student.pruefungen[i] + + const isDefinedAsAntrittsloseNote = this.config.NOTEN_OHNE_ANTRITT.find(n_pk => n_pk == p.note) + if(!isDefinedAsAntrittsloseNote) pruefungsAntrittCount++ + } + + // when student never had to take an exam beyond the original benotung + // aka pruefungsantritt (even though it does not have to have pruefungscharacter) + // it still counts as an antritt, except it is coming from a notenOption like "angerechnet" + // which indicates no participation at all + if(pruefungsAntrittCount === 0 && student.note){ + const noteOption = this.notenOptions.find(note => note.note == student.note) + + if(noteOption.lehre) return 1 + else return 0 + } + + return pruefungsAntrittCount + } + }, + watch: { + selectedUids(newVal, oldVal) { + const table = this.$refs.notenTable?.tabulator + + if (!table) return; + + const allRows = table.getRows(); + + allRows.forEach(row => { + const rowData = row.getData(); + const found = newVal.find(stud => stud.uid == rowData.uid) + if (found) { + row.select(); // ensure row is selected + const cb = row.getElement().children[0]?.children[0] + if(cb) cb.checked = true + } else { + row.deselect(); // ensure row is deselected + const cb = row.getElement().children[0]?.children[0] + if(cb) cb.checked = false + } + }); + }, + selectedLehreinheit(newVal) { + if(!this.$refs.notenTable) return + this.$refs.notenTable.tabulator.clearFilter(); + if(newVal) this.$refs.notenTable.tabulator.setFilter("lehreinheit_id", "=", newVal.lehreinheit_id); + }, + getKommPruefCount(newVal) { + if(!this.config.CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF) return 0 + if(this.$refs.notenTable?.tabulator && newVal > 0) { + const kommPruefCol = this.$refs.notenTable?.tabulator.getColumn("kommPruef") + kommPruefCol.show() + } else if(this.$refs.notenTable?.tabulator && newVal == 0) { + const kommPruefCol = this.$refs.notenTable?.tabulator.getColumn("kommPruef") + kommPruefCol.hide() + } + } + }, + computed: { + maxAntrittCount() { + let maxAntritte = 1; + + if(this.config?.CIS_GESAMTNOTE_PRUEFUNG_TERMIN2) maxAntritte++ + if(this.config?.CIS_GESAMTNOTE_PRUEFUNG_TERMIN3) maxAntritte++ + + return maxAntritte; + }, + getFreigabeCounter() { + return this.studenten ? this.studenten.reduce((acc, cur) => { + if(cur.freigegeben == 'changed') { + acc++ + } + return acc + }, 0) : 0 + }, + LehreinheitenModule() { + return LehreinheitenModule; + }, + LeDropdownParams() { + return { + lv_id: this.lv_id, + sem_kurzbz: this.sem_kurzbz + } + }, + getStudentenOptions() { + return this.studenten ? this.studenten.filter(s => s.selectable) : [] + }, + getKommPruefCount(){ + let counter = 0 + this.studenten?.forEach(s => {if(s['kommPruef']){counter++}}) + return counter + }, + getSaveBtnClass() { + return this.changedNoten?.length ? "btn btn-primary ml-2" : "btn btn-secondary ml-2" + }, + getNewBtnClass() { + return "btn btn-primary ml-2" + }, + getNotenImportBtnClass() { + return "btn btn-primary ml-2" + }, + changedNoten() { + const v = this.changedNotenCounter // hack to trigger computed + const cs = this.studenten ? this.studenten.reduce((acc, cur) => { + const teilnote = this.teilnoten[cur.uid] + if(teilnote.note_lv && (cur.benotungsdatum > cur.freigabedatum)) { + + // write noteBezeichnung into changed Note so we can send emails in backend easier... + const opt = this.notenOptions.find(opt => opt.note == cur.lv_note) + cur.noteBezeichnung = opt.bezeichnung + + acc.push(cur) + } + return acc + }, []) : [] + return cs + }, + getNotenfreigabeHinweistext() { + return this.$capitalize(this.$p.t('benotungstool/notenfreigabeHinweistextv4')) + }, + getNotenimportHinweistext() { + return this.$capitalize(this.$p.t('benotungstool/notenimportHinweistextv5')) + } + }, + created() { + this.setupCreated() + }, + mounted() { + this.setupMounted() + }, + template: ` +
+ {{$capitalize($p.t('benotungstool/c4notenImportieren'))}}
+
+
+
+
+ {{$capitalize($p.t('benotungstool/c4addNewPruefung'))}}
+
+
+
+
+ {{ $p.t('benotungstool/noteneingabeSpeichern') }}
+
+
+
+
+ {{ pruefung ? $capitalize($p.t('benotungstool/editPruefungFor')) : $capitalize($p.t('benotungstool/createPruefungFor')) }} {{pruefungStudent?.vorname}} {{pruefungStudent?.nachname}}
+
+
+
+
+
+
+
+
+
+
+
+ +
-
-
-
' + val + '
'
+ },
+ widthGrow: 1
+ })
+ columns.push({title: Vue.computed(() => this.$capitalize(this.$p.t('benotungstool/c4notenvorschlagUebernehmen'))), field: 'übernehmen', width: 150, hozAlign: 'center', formatter: this.arrowFormatter,
+ cellClick: this.saveNote,
+ variableHeight: true})
+ columns.push({title: Vue.computed(() => this.$capitalize(this.$p.t('benotungstool/c4lvnote'))), field: 'lv_note',
+ formatter: this.notenFormatter,
+ headerFilter: 'list',
+ headerFilterParams: () => {
+ return { values: ["\u00A0",this.$p.t('benotungstool/c4noteEmpty') ,this.$p.t('benotungstool/c4positiv'), this.$p.t('benotungstool/c4negativ') ,...this.notenOptions.map(opt => opt.bezeichnung)] }
+ },
+ headerFilterFunc: this.notenFilterFunc,
+ widthGrow: 1
+ })
+ columns.push({title: Vue.computed(() => this.$capitalize(this.$p.t('benotungstool/c4freigabe'))), field: 'freigegeben', widthGrow: 1, formatter: this.freigabeFormatter, variableHeight: true})
+ columns.push({title: Vue.computed(() => this.$capitalize(this.$p.t('benotungstool/c4zeugnisnote'))),
+ field: 'note',
+ formatter: this.notenFormatter,
+ topCalc: this.negativeNotenCalc,
+ topCalcFormatter: this.negativeNotenCalcFormatter,
+ headerFilter: 'list',
+ headerFilterParams: () => {
+ return { values: ["\u00A0", this.$p.t('benotungstool/c4noteEmpty'),this.$p.t('benotungstool/c4positiv'), this.$p.t('benotungstool/c4negativ') ,...this.notenOptions.map(opt => opt.bezeichnung)] }
+ },
+ headerFilterFunc: this.notenFilterFunc,
+ widthGrow: 1
+ })
+ columns.push({title: Vue.computed(() => this.$capitalize(this.$p.t('benotungstool/c4kommPruef'))),
+ field: 'kommPruef', widthGrow: 1,
+ formatter: this.pruefungFormatter,
+ sorter: this.pruefungSorter,
+ topCalc: this.terminCalcFunc,
+ topCalcFormatter: this.terminCalcFormatter,
+ hozAlign:"center", minWidth: 150, visible: false,
+ tooltip: false
+ })
+
+ return columns
+ },
+ pruefungSorter(a, b, aRow, bRow, column, dir, params) {
+ if (a === null || typeof a === "undefined" || a === '') return -1;
+ if (b === null || typeof b === "undefined" || b === '') return 1;
+
+ // sort by notenvalue since pruefungen are in same date by column
+ return a.note - b.note
+ },
+ selectHandler(e, cell) {
+ const row = cell.getRow();
+
+ if(row.isSelected()){
+ row.deselect();
+ } else {
+ row.select();
+ }
+
+ // stop built-in handler
+ e.stopPropagation();
+ return false;
+ },
+ selectAllHandler(e, cell) {
+ const table = cell.getTable();
+ const rows = table.getRows();
+
+ // custom select all logic
+ const allowed = rows.filter(r => r.getData().selectable);
+ const selected = allowed.every(r => r.isSelected());
+
+ if(selected){
+ allowed.forEach(r => r.deselect());
+ } else {
+ allowed.forEach(r => r.select());
+ }
+
+ // stop built-in handler
+ e.stopPropagation();
+ return false;
+ },
+ fixTabulatorSelectionFormatter(row) {
+ // if a row is not selectable, remove the checkbox from the dom
+
+ const data = row.getData()
+
+ const notSelectable = data.pruefungen?.find(p => p.pruefungstyp_kurzbz == 'kommPruef') || data.hoechsterAntritt >= this.maxAntrittCount
+ if(notSelectable) {
+ const el = row.getElement()
+ el.children[0]?.children[0]?.remove()
+
+ el.classList.remove("tabulator-selectable");
+ el.classList.add("tabulator-unselectable");
+ } else {
+ const el = row.getElement()
+
+ el.classList.add("tabulator-selectable");
+ el.classList.remove("tabulator-unselectable");
+ }
+ },
+ terminCalcFunc(entries) {
+ return entries.reduce((acc, cur) => {
+ if(cur !== undefined) acc++
+ return acc
+ }, 0)
+ },
+ terminCalcFormatter(cell) {
+ const cellval = cell.getValue()
+ return this.$capitalize(this.$p.t('benotungstool/prueflingSelectionv2'))+': ' + cellval
+ },
+ negativeNotenCalcFormatter(cell) {
+ const cellval = cell.getValue()
+ return this.$capitalize(this.$p.t('benotungstool/c4negativ'))+': ' + cellval
+ },
+ negativeNotenCalc(entries) {
+ return entries.reduce((acc, cur) => {
+ const opt = this.notenOptions.find(opt => opt.note == cur)
+ if(opt && !opt.positiv) acc++
+ return acc
+ }, 0)
+ },
+ sumCalcFunc(entries) {
+ return entries.length
+ },
+ notenFilterFunc(filterVal, rowVal) {
+ // option of the searchterm
+ const opt = this.notenOptions.find(opt => opt.bezeichnung === filterVal)
+ // searchterm is not empty fallback and the note finds an option match
+ if(rowVal !== null && rowVal !== undefined && opt?.note == rowVal) {
+ return true
+ }
+
+ // empty searchterm fallback to show all
+ if(filterVal === "\u00A0" || filterVal === "" || filterVal === null) {
+ return true
+ }
+
+ // specific searchterm cases
+ if(filterVal === this.$capitalize(this.$p.t('benotungstool/c4positiv'))) {
+ // option of the rowValue
+ const valOpt = this.notenOptions.find(opt => opt.note == rowVal)
+ if(!valOpt) return false
+ return valOpt.positiv
+ }
+ if(filterVal === this.$capitalize(this.$p.t('benotungstool/c4negativ'))) {
+ const valOpt = this.notenOptions.find(opt => opt.note == rowVal)
+ if(!valOpt) return false
+ return !valOpt.positiv
+ }
+ if(filterVal === this.$capitalize(this.$p.t('benotungstool/c4noteEmpty')) && rowVal === null) {
+ return true
+ }
+
+ return false
+ },
+ parseDate(timestamp) {
+ if(!timestamp) return null
+ const [datePart, timePart] = timestamp.split(" ");
+ const [year, month, day] = datePart.split("-").map(Number);
+ const [hour, minute, second] = timePart.split(":").map(Number);
+ return new Date(year, month - 1, day, hour, minute, second);
+ },
+ checkFreigabe(freigabedatum, benotungsdatum, uid) {
+ if(!freigabedatum) {
+ // check for change -> set freigabe to 'changed' on change
+ return 'offen'
+ } else if(benotungsdatum > freigabedatum) {
+ return 'changed'
+ } else {
+ return 'ok'
+ }
+ },
+ unselectableFormatter(row) {
+
+ },
+ notenFormatter(cell) {
+ const value = cell.getValue()
+ const field = cell.getField()
+ let style = 'display: flex; justify-content: center; align-items: center; height: 100%;';
+ // Wenn sich die Zeugnisnote von der von Ihnen freigegebenen Note unterscheidet,
+ // wird erstere rot umrandet markiert.
+
+
+ const data = cell.getData()
+ if(field == 'note' && data.note && data.note != data.lv_note) {
+ style += 'color:red; border-color:red; border-style:solid; border-width:1px;'
+ }
+
+ const match = this.notenOptions.find(opt => opt.note == value)
+ const val = match ? match.bezeichnung : value
+ if(val) return '' + val + '
'
+ else return ''
+
+ },
+ freigabeFormatter(cell) {
+ const value = cell.getValue()
+
+ let style = 'display: flex; justify-content: center; align-items: center; height: 100%;'
+
+ if(value === 'ok') {
+ return '' +
+ '
'
+ } else if (value === 'offen') {
+ return '' +
+ '
'
+ } else if (value === 'changed') {
+ return '' +
+ '
'
+ }
+
+ return value
+ },
+ saveNote(e, cell) { // Notenvorschlag freigeben
+ const row = cell.getRow()
+ const data = row.getData()
+
+ if(!data.note_vorschlag) return
+
+ // if vorschlag is the same as lv_note do nothing
+ if(data.note_vorschlag == data.lv_note) return
+
+ // if the student already has pruefungen disable this part
+ if(data.pruefungen.length) return
+
+ this.loading = true
+ this.$api.call(ApiNoten.saveNotenvorschlag(this.lv_id, this.sem_kurzbz, data.uid, data.note_vorschlag, data.punkte))
+ .then((res) => {
+ if (res.meta.status === 'success') {
+ const s = this.studenten.find(s => s.uid === data.uid)
+ this.teilnoten[s.uid].note_lv = data.note_vorschlag
+ s.freigabedatum = this.parseDate(res.data[0]['freigabedatum'])
+ s.benotungsdatum = this.parseDate(res.data[0]['benotungsdatum'])
+
+ s.freigegeben = this.checkFreigabe(s.freigabedatum, s.benotungsdatum, s.uid);
+
+ row.update({ lv_note: data.note_vorschlag, freigegeben: 'changed' })
+ // row.update({ freigegeben: 'changed' })
+ row.reformat() // trigger reformat of arrow
+ this.changedNotenCounter++;
+ }
+ }).finally(()=>this.loading = false)
+
+
+ },
+ teilnotenFormatter(cell) {
+ const val = cell.getValue()
+
+ let style = 'white-space: pre-line;'
+
+ return ''+val+'
'
+ },
+ pruefungFormatter(cell) {
+ const data = cell.getData()
+
+ const noteDef = data.note ? this.notenOptions.find(n => n.note == data.note) : null
+ if(!data.note || !noteDef?.lkt_ueberschreibbar) {
+ return ''
+ }
+
+ const colDef = cell.getColumn().getDefinition()
+
+ // column is just a date, student can have any of his antritte on this date, so we need to get
+ // student.pruefungen and look for a pruefung with this cols title as date
+
+ const field = cell.getColumn().getField()
+ let studentPruefung = null
+ if(field === 'kommPruef') { studentPruefung = data['kommPruef'] }
+ else if(field === "Termin1") { studentPruefung = data['Termin1'] }
+ else { studentPruefung = data.pruefungen.find(p => p.datum === field) }
+
+ // is this column/cell allowed to have an add pruefung action
+ const canAdd = field !== 'kommPruef' && field !== "Termin1" && data.hoechsterAntritt < this.maxAntrittCount
+
+ // TODO: check for some time limit maybe? old pruefungen can be changed/created
+
+ // Create root row div
+ const rowDiv = document.createElement('div');
+ rowDiv.className = 'row flex-nowrap';
+ rowDiv.style.display = 'flex';
+ rowDiv.style.justifyContent = 'center';
+ rowDiv.style.alignItems = 'center';
+ rowDiv.style.height = '100%';
+
+ if(studentPruefung) {
+ let color = ''
+ switch(studentPruefung.pruefungstyp_kurzbz) {
+ case 'Termin1':
+ color = 'green'
+ break
+ case 'Termin2':
+ color = 'yellow'
+ break
+ case 'Termin3':
+ color = 'orange'
+ break
+ case 'kommPruef':
+ color = 'red'
+ break
+ }
+
+ rowDiv.style.borderLeft = `4px solid ${color}`;
+ rowDiv.style.marginLeft = "6px"; // small indent so text doesn't overlap
+ rowDiv.style.boxSizing = "border-box";
+ }
+
+ function createCol(content, classParam) {
+ const colDiv = document.createElement('div');
+ colDiv.className = classParam ?? 'col-4';
+ colDiv.style.justifyContent = 'center';
+ colDiv.style.alignItems = 'center';
+ colDiv.style.alignContent = 'center';
+ colDiv.style.height = '100%';
+
+ if (typeof content === 'string') {
+ colDiv.textContent = content;
+ } else if (content instanceof HTMLElement) {
+ colDiv.appendChild(content);
+ }
+
+ return colDiv;
+ }
+
+ if(data[field]) {
+
+ const noteDefEntry = data.note ? this.notenOptions.find(n => n.note == data[field].note) : null
+
+ // Second column (note_bezeichnung)
+ rowDiv.appendChild(createCol(noteDefEntry.bezeichnung || '', 'col-auto d-flex justify-content-center align-items-center'));
+
+ // no actions on kommPruef allowed
+ // no actions on termin1 aka pruefung 0 aka ursprüngliche note erlaubt
+ if(field === 'kommPruef' || field === "Termin1") {
+ return rowDiv
+ }
+
+ if(data[field]?.pruefungstyp_kurzbz !== 'Termin1') {
+ // Third column (button)
+ const button = document.createElement('button');
+ button.className = 'btn btn-outline-secondary';
+ button.textContent = this.$capitalize(this.$p.t('benotungstool/changePruefungButtonText'));
+ button.addEventListener('click', () => {
+ this.openPruefungModal(data, data[field], field);
+ });
+
+ rowDiv.appendChild(createCol(button, 'col-4 d-flex justify-content-center align-items-center'));
+ }
+
+ return rowDiv;
+
+ } else if (canAdd) { // return new btn action
+ // dont render the add button in cells where a younger pruefung exists for the students
+ const youngerPruefung = data.pruefungen.find(p => p.datum > field)
+ if(youngerPruefung) return rowDiv
+
+ const button = document.createElement('button');
+ button.className = 'btn btn-outline-secondary';
+ button.textContent = this.$capitalize(this.$p.t('benotungstool/addPruefungButtonText'));
+ button.addEventListener('click', () => {
+ this.openPruefungModal(data, null, field)
+ });
+
+ rowDiv.appendChild(createCol(button), 'col-4 d-flex justify-content-center align-content-center');
+
+ return rowDiv;
+ } else {
+ return ''
+ }
+ },
+ openPruefungModal(student, pruefung = null, field) {
+ this.pruefungStudent = student
+ this.pruefung = pruefung
+ const dateStr = this.pruefung?.datum ?? field
+
+ const pruefungDateParts = dateStr.split('-')
+
+ const newDate = new Date(Number(pruefungDateParts[0]), Number(pruefungDateParts[1]) - 1, Number(pruefungDateParts[2]))
+ this.selectedPruefungDate = newDate
+
+
+ if(this.pruefung?.note) {
+ this.selectedPruefungNote = this.notenOptions.find(n => n.note == this.pruefung.note)
+ } else {
+ this.selectedPruefungNote = null
+ }
+
+ this.selectedPruefungPunkte = this.pruefung?.punkte ?? null
+
+ this.$refs.modalContainerPruefung.show()
+ },
+ pruefungTitleFormatter(cell) {
+ const def = cell.getColumn().getDefinition()
+ return def.title;
+ },
+ arrowFormatter(cell) {
+ const row = cell.getRow()
+ const data = row.getData()
+
+ let style = 'display: flex; justify-content: center; align-items: center; height: 100%;'
+
+ if(!data.note_vorschlag || (data.note_vorschlag == data.lv_note) || data.pruefungen.length) {
+ // arrow to ambiguous in meaning, use str8 forward worded button here instead
+ // uncolored arrow
+ // return '' +
+ // '
'
+
+ return ''
+ }
+
+ const button = document.createElement('button');
+ button.className = 'btn btn-outline-secondary';
+ button.textContent = this.$capitalize(this.$p.t('benotungstool/c4notenvorschlagUebernehmen'));
+ return button;
+
+ // // can save a notenvorschlag -> colored
+ // return '' +
+ // '
'
+ },
+ mailFormatter(cell) {
+ const val = cell.getValue()
+
+ let style = 'display: flex; justify-content: center; align-items: center; height: 100%;'
+
+ return ''
+ },
+ percentFormatter(cell) {
+ const data = cell.getData()
+ const val = data.anwquote ?? '-'
+ return ''+ val + ' %
'
+ },
+ buildMailToLink(student){
+ return 'mailto:' + student.uid +'@'+ this.domain
+ },
+ insertSortedDate(arr, dateStr) {
+ // Binary search to find insertion index
+ let left = 0, right = arr.length;
+ while (left < right) {
+ const mid = (left + right) >> 1;
+ if (arr[mid] < dateStr) left = mid + 1;
+ else right = mid;
+ }
+ arr.splice(left, 0, dateStr); // insert at index
+ return arr;
+ },
+ tableResolve(resolve) {
+ this.tableBuiltResolve = resolve
+ },
+ notenOptionsResolve(resolve) {
+ this.notenOptionsResolve = resolve
+ },
+ async setupData(data){
+ // in case we reload when changing lva_id or stsem to always consider local storage layout
+ this.colLayoutRestored = false;
+
+ this.studenten = data[0] ?? []
+ this.studenten.forEach(s => {
+ s.pruefungen = []
+ s.infoString = `${s.vorname} ${s.nachname}`// (${s.semester}${s.verband}${s.gruppe}) Mat.: ${s.matrikelnr}`// used for multiselect
+ })
+ this.pruefungen = data[1] ?? []
+ this.domain = data[2]
+
+ // contains notenvorschläge from moodle, lv_note
+ this.teilnoten = data[3] ?? []
+
+ // let pruefungenRegularColCount = 0;
+ this.distinctPruefungsDates = []
+ const cols = [...this.notenTableOptions.columns.slice(0, -1)];
+ let kommCol = null
+ if(this.config?.CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF) kommCol = this.notenTableOptions.columns[this.notenTableOptions.columns.length - 1];
+
+ this.pruefungen?.forEach(p => {
+ const dateParts = p.datum.split('-')
+ p.dateObj = new Date(dateParts[0], +(dateParts[1]) - 1, dateParts[2])
+
+ const student = this.studenten.find(s => s.uid === p.student_uid)
+ if(!student) return
+
+ if(p.pruefungstyp_kurzbz !== 'kommPruef'
+ && p.pruefungstyp_kurzbz !== 'Termin1'
+ && !this.distinctPruefungsDates.includes(p.datum)) {
+ this.distinctPruefungsDates.push(p.datum)
+ }
+
+ // seperate kommPruefungen from previous pruefungen counts since the column count variability always ends with this
+ if(p.pruefungstyp_kurzbz == 'kommPruef') {
+ student['kommPruef'] = p
+ } else {
+ student.pruefungen.push(p)
+ }
+
+ })
+
+ this.studenten?.forEach(s => {
+ // sort students regular pruefungen by datum
+ s.pruefungen.sort((p1, p2) => {
+ if(p1.datum > p2.datum) {
+ return 1
+ } else if (p1.datum < p2.datum) {
+ return -1
+ } else {
+ return 0
+ }
+ })
+ // set the sorted pruefungen to their respective column fields
+ s.pruefungen.forEach((p, i) => {
+ // Termin1 aka originale Zeugnisnote should note create variable columns
+ if(p.pruefungstyp_kurzbz == "Termin1") {
+ s["Termin1"] = p
+ } else {
+ s[p.datum] = p
+ }
+ })
+
+ s.hoechsterAntritt = this.getAntrittCountStudent(s)
+ s.email = this.buildMailToLink(s)
+ s.lv_note = this.teilnoten[s.uid].note_lv
+ s.freigabedatum = this.parseDate(this.teilnoten[s.uid]['freigabedatum'])
+ s.benotungsdatum = this.parseDate(this.teilnoten[s.uid]['benotungsdatum'])
+ s.freigegeben = this.checkFreigabe(s.freigabedatum, s.benotungsdatum, s.uid);
+
+ s.punkte = this.teilnoten[s.uid].punkte_lv
+
+ const grades = this.teilnoten[s.uid].grades
+ s.teilnote = ''
+ s.mobility_zusatz = this.teilnoten[s.uid].mobility_zusatz
+ grades.forEach(g => {
+ const notenOption = this.notenOptions.find(n=>n.note == g.grade)
+ if(notenOption.positiv) s.teilnote += (''+g.text +''+ '') + else s.teilnote += (''+g.text +''+ '
') + }) + + const vueThis = this + Object.defineProperty(s, 'selectable', { + get() { + const kP = s.pruefungen?.find(p => p.pruefungstyp_kurzbz == 'kommPruef') + const maxAntrittReached = s.hoechsterAntritt >= vueThis.maxAntrittCount + return !(kP || maxAntrittReached) + + }, + set() { + // empty setter so tabulator doesnt scream + }, + enumerable: true, + configurable: true + }) + + }) + + // if we have any pruefungen at all someone must have original note/termin1 pruefung + if(this.distinctPruefungsDates.length) { + cols.push({ + title: this.$capitalize(this.$p.t('benotungstool/c4originalZnote')), + field: "Termin1", + formatter: this.pruefungFormatter, + titleFormatter: this.pruefungTitleFormatter, + sorter: this.pruefungSorter, + topCalc: this.terminCalcFunc, + topCalcFormatter: this.terminCalcFormatter, + hozAlign:"center", + widthGrow: 1, + minWidth: 200, + width: 250, + visible: true, + tooltip: false + }) + } + + this.distinctPruefungsDates.sort((d1, d2) => { + if(d1 > d2) { + return 1 + } else if (d1 < d2) { + return -1 + } else { + return 0 + } + }) + this.distinctPruefungsDates.forEach((date)=>{ + const dateparts = date.split('-') + const titledate = `${dateparts[2]}.${dateparts[1]}.${dateparts[0]}` + + cols.push({ + title: titledate, + field: date, + formatter: this.pruefungFormatter, + titleFormatter: this.pruefungTitleFormatter, + sorter: this.pruefungSorter, + topCalc: this.terminCalcFunc, + topCalcFormatter: this.terminCalcFormatter, + hozAlign:"center", + widthGrow: 1, + minWidth: 200, + width: 250, + visible: true, + tooltip: false + }) + }) + + if(this.config?.CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF) cols.push(kommCol) // keep kommPruef Col as last + + + // preemptively do the persistence part of columns already here so we get the merged definition before + // tabulator internal go to war with vue reactives + let colsUsed = null + const saved = this.loadState(); + if (saved && saved.columns) { + // new columns map for lookup + const colMap = new Map(cols.map(c => [c.field, c])); + + const restoredCols = []; + + // add columns in the SAVED order, applying saved width/visibility + saved.columns.forEach(savedCol => { + const originalDef = colMap.get(savedCol.field); + if (originalDef) { + restoredCols.push({ + ...originalDef, // Keep formatters, calcs, etc. + width: savedCol.width, + visible: savedCol.visible + }); + colMap.delete(savedCol.field); // Remove so we don't double-add + } + }); + + // append any NEW columns aka pruefungs cols + colMap.forEach((def) => { + restoredCols.push(def); + }); + + colsUsed = restoredCols; + this.colLayoutRestored = true; + } + + const colsFinal = colsUsed ?? cols + this.loading = false + + this.$refs.notenTable.tabulator.setColumns(colsFinal) + this.$refs.notenTable.tabulator.setData(this.studenten); + this.$refs.notenTable.tabulator.redraw(true); + }, + loadNoten(lv_id, sem_kurzbz) { + this.loading = true + this.$api.call(ApiNoten.getStudentenNoten(lv_id, sem_kurzbz)) + .then(res => { + if(res?.data) this.setupData(res.data) + if(res?.meta?.getExternalGradesError) this.$fhcAlert.alertError(res.meta.getExternalGradesError) + }).finally(()=> { + this.loading = false + }) + }, + handleUuidDefined(uuid) { + this.tabulatorUuid = uuid + }, + calcMaxTableHeight() { + const tableID = this.tabulatorUuid ? ('-' + this.tabulatorUuid) : '' + const tableDataSet = document.getElementById('filterTableDataset' + tableID); + if(!tableDataSet) return + const rect = tableDataSet.getBoundingClientRect(); + + this.notenTableOptions.height = window.visualViewport.height - rect.top - 50 + this.$refs.notenTable.tabulator.setHeight(this.notenTableOptions.height) + }, + async setupCreated() { + this.loading = true + + this.debouncedFetchPunkteForPruefung = debounce(this.fetchNoteForPunktePruefung, 500) + + // fetch cis config regarding gesamtnoteneingabe, needs to be fetched before setup can finish + const configPromise = this.$api.call(ApiNoten.getCisConfig()).then(res => { + this.config = res.data + }) + + // fetch lva dropdown + this.$api.call(ApiLehre.getZugewieseneLv(this.viewData?.uid, this.sem_kurzbz)).then(res => { + this.lehrveranstaltungen = res.data + + // build dropdown option string + this.lehrveranstaltungen.forEach(lva => { + lva.fullString = `${lva.stg_kurzbz} - ${lva.lv_semester}: ${lva.lv_bezeichnung}` + }) + + this.selectedLehrveranstaltung = this.lehrveranstaltungen.find(lva => lva.lehrveranstaltung_id == this.lv_id) + }) + + LehreinheitenModule.setupContext(this.$.appContext.config.globalProperties) + LehreinheitenModule.bindParams(Vue.ref(Vue.computed(() => this.LeDropdownParams))); + + // fetch sem_kurzbz dropdown + this.$api.call(ApiStudiensemester.getStudiensemester()).then(res => { + this.studiensemester = res.data[0] + this.selectedSemester = this.studiensemester.find(sem => sem.studiensemester_kurzbz === this.sem_kurzbz) + }) + + // fetch noten dropdown + this.$api.call(ApiNoten.getNoten()).then(async res => { + this.notenOptions = res.data + this.notenOptionsLehre = res.data.filter(n => n.lehre === true) + + await configPromise + this.notenTableOptions = this.getNotenTableOptions() + this.tabulatorCanBeBuilt = true // because promises would be more work and not much better here + }).catch(e => { + this.loading = false + }) + + }, + async setupMounted() { + this.tableBuiltPromise = new Promise(this.tableResolve) + await this.tableBuiltPromise + + this.loadNoten(this.lv_id, this.sem_kurzbz) + this.calcMaxTableHeight() + + }, + lvChanged(e) { + this.$router.push({ + name: "Benotungstool", + params: { + sem_kurzbz: this.sem_kurzbz, + lv_id: e.value.lehrveranstaltung_id + } + }) + + // reload data + this.loadNoten(e.value.lehrveranstaltung_id, this.sem_kurzbz) + }, + ssChanged(e) { + // change url params & write history + this.$router.push({ + name: "Benotungstool", + params: { + sem_kurzbz: e.value.studiensemester_kurzbz, + lv_id: this.lv_id + } + }) + + this.loading = true + // diff lv_id -> reload zugewiesene lv + this.$api.call(ApiLehre.getZugewieseneLv(this.viewData?.uid, e.value.studiensemester_kurzbz)).then(res => { + this.lehrveranstaltungen = res.data + + // build dropdown option string + this.lehrveranstaltungen.forEach(lva => { + lva.fullString = `${lva.stg_kurzbz} - ${lva.lv_semester}: ${lva.lv_bezeichnung}` + }) + + this.selectedLehrveranstaltung = this.lehrveranstaltungen.find(lva => lva.lehrveranstaltung_id == this.lv_id) + }).then(()=>{ + + // reload data + this.loadNoten(this.lv_id, e.value.studiensemester_kurzbz) + }).finally( () => this.loading = false) + + }, + getOptionLabel(option) { + return option.studiensemester_kurzbz + }, + getOptionLabelLv(option) { + return option.fullString + }, + getOptionLabelLe(option) { + return option.infoString + }, + getPruefungstypForStudentByAntritt(student) { + // when adding new pruefungen, determine the next pruefungstyp by using the antritt counter + switch (student.hoechsterAntritt) { + case 0: + return "Termin2" + break + case 1: + return "Termin2" + break + case 2: + return "Termin3" + break + default: + return "" + } + }, + savePruefungEingabe() { + const year = this.selectedPruefungDate.getFullYear(); + const month = String(this.selectedPruefungDate.getMonth() + 1).padStart(2, '0'); // Months are 0-based + const day = String(this.selectedPruefungDate.getDate()).padStart(2, '0'); + const dateStr = `${year}-${month}-${day}`; + + // first pruefung is always "Termin2" since normal note counts as Termin1 + // const pOffset = this.pruefung === null && this.pruefungStudent.pruefungen.length === 0 ? 2 : 1 + + const typ = this.pruefung ? this.pruefung.pruefungstyp_kurzbz : this.getPruefungstypForStudentByAntritt(this.pruefungStudent) + const note = this.selectedPruefungNote?.note ?? 9 // noch nicht eingetragen + const punkte = this.selectedPruefungPunkte ?? 0 + this.$api.call(ApiNoten.saveStudentPruefung( + this.pruefungStudent.uid, + note, + punkte, + dateStr, + this.lv_id, + this.pruefungStudent.lehreinheit_id, + this.sem_kurzbz, + typ + )).then(res => { + if(res.meta.status === 'success') { //'Prüfung für Student ' + this.pruefungStudent.uid + ' bearbeitet oder angelegt' + this.$fhcAlert.alertDefault( + 'success', + 'Info', + this.$capitalize(this.$p.t('benotungstool/pruefungSaveForUid', [this.pruefungStudent.uid])), + true + ) + const s = this.studenten.find(s => s.uid === res.data[1]?.student_uid) + + s.freigabedatum = this.parseDate(res.data[1]?.['freigabedatum']) + s.benotungsdatum = this.parseDate(res.data[1]?.['benotungsdatum']) + + s.freigegeben = this.checkFreigabe(s.freigabedatum, s.benotungsdatum, s.uid); + + s.lv_note = res.data[1]?.note + const oldScrollLeft = this.$refs.notenTable.tabulator.rowManager.scrollLeft + const oldScrollTop = this.$refs.notenTable.tabulator.rowManager.scrollTop + + // add new pruefung to row + if(!this.pruefung) { + this.handleAddNewTermin(res.data, s) + } else { // update existing + const oldIndex = s.pruefungen.findIndex(p => p.pruefung_id == this.pruefung.pruefung_id) + if(oldIndex !== -1) { + s.pruefungen.splice(oldIndex, 1, res.data[0]) + s[res.data[0].datum] = res.data[0] + } + + // antritte might have changed due to different benotung + s.hoechsterAntritt = this.getAntrittCountStudent(s) + this.recalculateSelectable(s) + this.reformatStudentRow(s) + } + + this.$refs.notenTable.tabulator.redraw(true) + Vue.nextTick(()=> { + const table = this.$refs.notenTable.tabulator.element.querySelector('.tabulator-tableholder') + if(table) { + table.scrollLeft = oldScrollLeft; + table.scrollTop = oldScrollTop; + } + }) + + } + }).finally(()=> { + this.pruefungStudent = null + this.pruefung = null + }) + + this.$refs.modalContainerPruefung.hide() + }, + handleAddNewTermin(data, student){ + this.colLayoutRestored = false; // always keep persistence options in mind when modifying table cols dynamically + + const savedPruefung = data[0] + const extra = data[2] + + // check for extra pruefung (termin1) to add before + if(extra) { + student["Termin1"] = extra + student.pruefungen.push(extra) // push to pruefungen array for antritt evaluation + } + + this.correctOldTerminTypenForStudent(student, savedPruefung) + + if(!this.distinctPruefungsDates.includes(savedPruefung.datum)) { + this.insertSortedDate(this.distinctPruefungsDates, savedPruefung.datum) + } + + // add pruefung to pruefungen array + student.pruefungen.push(savedPruefung) + + // add pruefung to student via its datum as a field + student[savedPruefung.datum] = savedPruefung + + // usually should be in order naturally, just to be save + student.pruefungen.sort((p1, p2) => { + if(p1.datum > p2.datum) { + return 1 + } else if (p1.datum < p2.datum) { + return -1 + } else { + return 0 + } + }) + + // recalculate student antritte + + student.hoechsterAntritt = this.getAntrittCountStudent(student) + this.recalculateSelectable(student) + this.reformatStudentRow(student) + + // add col to table + const cols = [...this.notenTableOptions.columns.slice(0, -1)]; + let kommCol = null + if(this.config?.CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF) kommCol = this.notenTableOptions.columns[this.notenTableOptions.columns.length - 1]; + + if(this.distinctPruefungsDates.length) { + cols.push({ + title: this.$capitalize(this.$p.t('benotungstool/c4originalZnote')), + field: "Termin1", + formatter: this.pruefungFormatter, + titleFormatter: this.pruefungTitleFormatter, + sorter: this.pruefungSorter, + topCalc: this.terminCalcFunc, + topCalcFormatter: this.terminCalcFormatter, + hozAlign:"center", + widthGrow: 1, + minWidth: 200, + width: 250, + visible: true, + tooltip: false + }) + } + + this.distinctPruefungsDates.forEach((date)=>{ + const dateparts = date.split('-') + const titledate = `${dateparts[2]}.${dateparts[1]}.${dateparts[0]}` + + cols.push({ + title: titledate,//this.$p.t('benotungstool/pruefungNr', [index+1]), + field: date, + formatter: this.pruefungFormatter, + titleFormatter: this.pruefungTitleFormatter, + sorter: this.pruefungSorter, + topCalc: this.terminCalcFunc, + topCalcFormatter: this.terminCalcFormatter, + hozAlign:"center", + widthGrow: 1, + minWidth: 200, + width: 250, + visible: true, + tooltip: false + }) + }) + + if(this.config?.CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF) cols.push(kommCol) // keep kommPruef Col as last + + + // preemptively do the persistence part of columns already here so we get the merged definition before + // tabulator internal go to war with vue reactives + let colsUsed = null + const saved = this.loadState(); + if (saved && saved.columns) { + // new columns map for lookup + const colMap = new Map(cols.map(c => [c.field, c])); + + const restoredCols = []; + + // add columns in the SAVED order, applying saved width/visibility + saved.columns.forEach(savedCol => { + const originalDef = colMap.get(savedCol.field); + if (originalDef) { + restoredCols.push({ + ...originalDef, // Keep formatters, calcs, etc. + width: savedCol.width, + visible: savedCol.visible + }); + colMap.delete(savedCol.field); // Remove so we don't double-add + } + }); + + // append any NEW columns aka pruefungs cols + colMap.forEach((def) => { + restoredCols.push(def); + }); + + colsUsed = restoredCols; + this.colLayoutRestored = true; + } + + + const colsFinal = colsUsed ?? cols + this.$refs.notenTable.tabulator.setColumns(colsFinal) + // this.$refs.notenTable.tabulator.redraw(true) + // redraw table outside this function + }, + recalculateSelectable(student) { + const vueThis = this + Object.defineProperty(student, 'selectable', { + get() { + const kP = student.pruefungen?.find(p => p.pruefungstyp_kurzbz == 'kommPruef') + return !(kP || student.hoechsterAntritt >= vueThis.maxAntrittCount) + }, + set() { + // empty setter so tabulator doesnt scream + }, + enumerable: true, + configurable: true + }) + }, + saveNoteneingabe() { + this.$api.call(ApiNoten.saveStudentenNoten(this.password, this.changedNoten, this.lv_id, this.sem_kurzbz)) + .then((res) => { + if(res.meta.status === 'success') { + this.$fhcAlert.alertDefault( + 'success', + 'Info', + 'Noten gespeichert', + true + ) + } + + res.data.forEach(d => { + const s = this.studenten.find(s => s.uid === d.uid) + s.freigabedatum = this.parseDate(d.freigabedatum) + s.benotungsdatum = this.parseDate(d.benotungsdatum) + s.freigegeben = this.checkFreigabe(s.freigabedatum, s.benotungsdatum, s.uid); + }) + this.changedNotenCounter++; + + this.$refs.notenTable.tabulator.redraw(true) + }) + + this.$refs.modalContainerNotenSpeichern.hide() + }, + openSaveModal() { + this.$refs.modalContainerNotenSpeichern.show() + }, + openNewPruefungsdatumModal() { + this.$refs.modalContainerNeuesPruefungsdatum.show() + }, + openNotenImportModal() { + this.$refs.modalContainerNotenImport.show() + }, + getOptionLabelNotePruefung(option) { + return option.bezeichnung + }, + leChanged(e) { + this.selectedLehreinheit = e.value + }, + addPruefung(){ + + this.$refs.modalContainerNeuesPruefungsdatum.hide() + + // filter students that already have a pruefung on datum + + const year = this.selectedPruefungDate.getFullYear(); + const month = String(this.selectedPruefungDate.getMonth() + 1).padStart(2, '0'); // Months are 0-based + const day = String(this.selectedPruefungDate.getDate()).padStart(2, '0'); + const dateStrDb = `${year}-${month}-${day}`; + const dateStrFront = `${day}.${month}.${year}`; + + const uids = [] + // const uids = this.selectedUids.map(student => { + this.selectedUids.forEach(student => { + + // if a student doesnt have a lv_note entered definitely dont allow to create pruefung + if(!student.lv_note) { + this.$fhcAlert.alertWarning('Student ' + student.uid + ' hat noch keine LV-Note eingetragen! Es wird keine Prüfung angelegt.') + return + } + + if(!student.note) { + this.$fhcAlert.alertWarning('Student ' + student.uid + ' hat noch keine Zeugnis Note eingetragen! Es wird keine Prüfung angelegt.') + return + } + + // check if student antrittCount is too high already + if(student.hoechsterAntritt >= this.maxAntrittCount) { + this.$fhcAlert.alertWarning('Student ' + student.uid + ' hat bereits ' + student.hoechsterAntritt + ' Prüfungsantritte abgelegt. Es wird keine Prüfung angelegt.') + return + } + + // get student for pruefung and check if proposed datum does not conflict (no new pruefungen before existing ones) + const youngerPruefung = student.pruefungen.find(pr => { + return pr.dateObj >= this.selectedPruefungDate + }) + if(youngerPruefung) { + this.$fhcAlert.alertWarning('Student ' + student.uid + ' hat bereits eine Prüfung am '+ youngerPruefung.datum +' eingetragen. Es wird keine Prüfung angelegt.') + return + } + + uids.push({ + uid: student.uid, + lehreinheit_id: student.lehreinheit_id, + typ: this.getPruefungstypForStudentByAntritt(student)//student.hoechsterAntritt + }) + }) + + this.loading = true; + this.$api.call(ApiNoten.createPruefungen( + uids, + dateStrDb, + this.lv_id, + this.sem_kurzbz, + )).then(res => { + if(res.meta.status === "success") { + + // iterate over response data + // -> alert successful pruefungen + // -> alert denied pruefungen + reason + + let uidListSuccess = '' + let uidListError = '' + const successData = [] + Object.keys(res.data).forEach(student_uid => { + const student = res.data[student_uid] + // actual pruefung has been allocated + if(student.savedPruefung || student.extraPruefung) { + uidListSuccess += ' ' + student_uid + + // keep res.data format intact for handleResponse method + successData[student_uid] = student + } else { // there should be an error message why no pruefungen where allocated for this person, many reasons possible + uidListError += student_uid + ' - ' + student +'\n'// student variable is the error message here + } + }) + + if(uidListError != '') { + this.$fhcAlert.alertError( + this.$capitalize(this.$p.t('benotungstool/c4pruefungAnlageError', [dateStrFront])) + ': ' + uidListError + ' ' + ) + } + + if(uidListSuccess != '') { + this.$fhcAlert.alertDefault( + 'success', + 'Info', + this.$capitalize(this.$p.t('benotungstool/pruefungAngelegtAn', [dateStrFront])) + ': ' + uidListSuccess, + true + ) + + this.handleAddNewPruefungenResponse({data: successData}, uids) + } + + } + }).finally(()=> this.loading = false) + }, + getAntrittCountStudent(student) { + // checks for existence of a prüfung with a note that resolves to a + // "angetretene Prüfung" -> anything except "entschuldigt" & "noch nicht eingetragen" + // and returns the next allowed pruefungstyp from the number of taken pruefungen + + // 1 -> reguläre note + // 2 -> erste Nachprüfung / Termin2 + // 3 -> 2te Nachprüfung / Termin3 + // 4 -> kommPruef + if(student['kommPruef']) return 4 + + let pruefungsAntrittCount = 0 + const pLen = student.pruefungen.length + for(let i = 0; i < pLen; i++) { + const p = student.pruefungen[i] + + const isDefinedAsAntrittsloseNote = this.config.NOTEN_OHNE_ANTRITT.find(n_pk => n_pk == p.note) + if(!isDefinedAsAntrittsloseNote) pruefungsAntrittCount++ + } + + // when student never had to take an exam beyond the original benotung + // aka pruefungsantritt (even though it does not have to have pruefungscharacter) + // it still counts as an antritt, except it is coming from a notenOption like "angerechnet" + // which indicates no participation at all + if(pruefungsAntrittCount === 0 && student.note){ + const noteOption = this.notenOptions.find(note => note.note == student.note) + + if(noteOption.lehre) return 1 + else return 0 + } + + return pruefungsAntrittCount + } + }, + watch: { + selectedUids(newVal, oldVal) { + const table = this.$refs.notenTable?.tabulator + + if (!table) return; + + const allRows = table.getRows(); + + allRows.forEach(row => { + const rowData = row.getData(); + const found = newVal.find(stud => stud.uid == rowData.uid) + if (found) { + row.select(); // ensure row is selected + const cb = row.getElement().children[0]?.children[0] + if(cb) cb.checked = true + } else { + row.deselect(); // ensure row is deselected + const cb = row.getElement().children[0]?.children[0] + if(cb) cb.checked = false + } + }); + }, + selectedLehreinheit(newVal) { + if(!this.$refs.notenTable) return + this.$refs.notenTable.tabulator.clearFilter(); + if(newVal) this.$refs.notenTable.tabulator.setFilter("lehreinheit_id", "=", newVal.lehreinheit_id); + }, + getKommPruefCount(newVal) { + if(!this.config.CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF) return 0 + if(this.$refs.notenTable?.tabulator && newVal > 0) { + const kommPruefCol = this.$refs.notenTable?.tabulator.getColumn("kommPruef") + kommPruefCol.show() + } else if(this.$refs.notenTable?.tabulator && newVal == 0) { + const kommPruefCol = this.$refs.notenTable?.tabulator.getColumn("kommPruef") + kommPruefCol.hide() + } + } + }, + computed: { + maxAntrittCount() { + let maxAntritte = 1; + + if(this.config?.CIS_GESAMTNOTE_PRUEFUNG_TERMIN2) maxAntritte++ + if(this.config?.CIS_GESAMTNOTE_PRUEFUNG_TERMIN3) maxAntritte++ + + return maxAntritte; + }, + getFreigabeCounter() { + return this.studenten ? this.studenten.reduce((acc, cur) => { + if(cur.freigegeben == 'changed') { + acc++ + } + return acc + }, 0) : 0 + }, + LehreinheitenModule() { + return LehreinheitenModule; + }, + LeDropdownParams() { + return { + lv_id: this.lv_id, + sem_kurzbz: this.sem_kurzbz + } + }, + getStudentenOptions() { + return this.studenten ? this.studenten.filter(s => s.selectable) : [] + }, + getKommPruefCount(){ + let counter = 0 + this.studenten?.forEach(s => {if(s['kommPruef']){counter++}}) + return counter + }, + getSaveBtnClass() { + return this.changedNoten?.length ? "btn btn-primary ml-2" : "btn btn-secondary ml-2" + }, + getNewBtnClass() { + return "btn btn-primary ml-2" + }, + getNotenImportBtnClass() { + return "btn btn-primary ml-2" + }, + changedNoten() { + const v = this.changedNotenCounter // hack to trigger computed + const cs = this.studenten ? this.studenten.reduce((acc, cur) => { + const teilnote = this.teilnoten[cur.uid] + if(teilnote.note_lv && (cur.benotungsdatum > cur.freigabedatum)) { + + // write noteBezeichnung into changed Note so we can send emails in backend easier... + const opt = this.notenOptions.find(opt => opt.note == cur.lv_note) + cur.noteBezeichnung = opt.bezeichnung + + acc.push(cur) + } + return acc + }, []) : [] + return cs + }, + getNotenfreigabeHinweistext() { + return this.$capitalize(this.$p.t('benotungstool/notenfreigabeHinweistextv4')) + }, + getNotenimportHinweistext() { + return this.$capitalize(this.$p.t('benotungstool/notenimportHinweistextv5')) + } + }, + created() { + this.setupCreated() + }, + mounted() { + this.setupMounted() + }, + template: ` +
+
+
+
+
+
+
+
+
+
+
+
+
+ {{$capitalize($p.t('benotungstool/c4date'))}}:
+
+
+
+
+
+
+
+
+
+
+
+ {{$capitalize($p.t('benotungstool/prueflingSelectionv2'))}}:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{$capitalize($p.t('benotungstool/c4date'))}}:
+
+
+
+
+
+
+ {{$capitalize($p.t('benotungstool/c4punkte'))}}:
+
+
+
+
+
+
+
+
+
+
+ {{$capitalize($p.t('lehre/note'))}}:
+
+
+
+
+
+ {{ option.bezeichnung }}
+
+
+
+
+
+ {{$capitalize($p.t('benotungstool/benotungstoolTitle'))}}
+{{ lv?.bezeichnung }}
+
+
+
+
+
+
+
+
+ {{ option.fullString }}
+
+
+
+
+
+
+
+
+
+
+ {{ slotProps.option.infoString }}
+
+ {{ slotProps.option.studentcount }}
+
+ {{ slotProps.option.termincount }}
+
+
+
+
+
+
+
+
+
+ {{ option.studiensemester_kurzbz }}
+
+ + +
+
+
+
+
+
+
+
+ `,
+};
+
+export default Benotungstool;
\ No newline at end of file
diff --git a/public/js/components/Cis/Cms/News.js b/public/js/components/Cis/Cms/News.js
index bf17666a2..edf700db5 100644
--- a/public/js/components/Cis/Cms/News.js
+++ b/public/js/components/Cis/Cms/News.js
@@ -2,115 +2,137 @@ import Pagination from "../../Pagination/Pagination.js";
import StudiengangInformation from "./StudiengangInformation/StudiengangInformation.js";
import BsConfirm from "../../Bootstrap/Confirm.js";
-import ApiCms from '../../../api/factory/cms.js';
+import ApiCms from "../../../api/factory/cms.js";
export default {
name: "NewsComponent",
- components: {
- Pagination,
- StudiengangInformation,
- },
- data() {
- return {
- content: null,
- maxPageCount: 0,
- page_size: 10,
- page:1,
- };
- },
- watch:{
- '$p.user_language.value':function(sprache){
- this.fetchNews();
- }
- },
- computed:{
- sprache: function(){
- return this.$p.user_language.value;
+ components: {
+ Pagination,
+ StudiengangInformation,
},
- },
- methods: {
- fetchNews() {
- return this.$api
- .call(ApiCms.getNews(this.page, this.page_size, this.sprache))
- .then(res => res.data)
- .then(result => {
- this.content = result;
+ inject: ["isMobile"],
+ data() {
+ return {
+ content: null,
+ maxPageCount: 0,
+ page_size: 10,
+ page: 1,
+ };
+ },
+ watch: {
+ "$p.user_language.value": function (sprache) {
+ this.fetchNews();
+ },
+ },
+ computed: {
+ sprache: function () {
+ return this.$p.user_language.value;
+ },
+ },
+ methods: {
+ async fetchNews() {
+ let newsResponse = await this.$api.call(
+ ApiCms.getNews(this.page, this.page_size, this.sprache),
+ );
+ this.content = newsResponse.data;
- document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
- el.addEventListener("click", (evt) => {
- evt.preventDefault();
- BsConfirm.popup(el.dataset.confirm)
- .then(() => {
- Axios.get(el.href)
- .then((res) => {
- // TODO(chris): check for success then show message and/or reload
- location = location;
- })
- .catch((err) => console.error("ERROR:", err));
+ document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
+ el.addEventListener("click", (evt) => {
+ evt.preventDefault();
+ BsConfirm.popup(el.dataset.confirm)
+ .then(() => {
+ Axios.get(el.href)
+ .then((res) => {
+ // TODO(chris): check for success then show message and/or reload
+ location = location;
})
- .catch(() => {
- });
- });
- });
- document.querySelectorAll("#cms [data-href]").forEach((el) => {
- el.href = el.dataset.href.replace(
- /^ROOT\//,
- FHC_JS_DATA_STORAGE_OBJECT.app_root
- );
- });
- Vue.nextTick(()=>{
- document.querySelectorAll(".card-header").forEach((el) => {
- el.classList.add("fhc-primary");
- });
- document.querySelectorAll(".row").forEach((el) => {
- el.classList.add("w-100");
- el.classList.add("align-items-center");
-
- });
- document.querySelectorAll(".row h2").forEach((el) => {
- el.classList.add("mb-0");
- });
+ .catch((err) => console.error("ERROR:", err));
+ })
+ .catch(() => {});
+ });
+ });
+ document.querySelectorAll("#cms [data-href]").forEach((el) => {
+ el.href = el.dataset.href.replace(
+ /^ROOT\//,
+ FHC_JS_DATA_STORAGE_OBJECT.app_root,
+ );
+ });
- })
+ await this.$nextTick();
+ this.formatExternalHtml();
+ },
+ async loadNewPageContent(data) {
+ let newsResponse = await this.$api.call(
+ ApiCms.getNews(data.page, data.rows),
+ );
+ this.content = newsResponse.data;
+
+ await this.$nextTick();
+
+ this.formatExternalHtml();
+ },
+ formatExternalHtml() {
+ document
+ .querySelectorAll(".news-list-item .card-header")
+ .forEach((el) => {
+ el.classList.add("fhc-primary");
+ });
+ document.querySelectorAll(".news-list-item .row").forEach((el) => {
+ el.classList.add("w-100");
+ el.classList.add("align-items-center");
+ });
+ document
+ .querySelectorAll(".news-list-item .row h2")
+ .forEach((el) => {
+ el.classList.add("mb-0");
});
},
- loadNewPageContent(data) {
- this.$api
- .call(ApiCms.getNews(data.page, data.rows))
- .then(res => res.data)
- .then(result => {
- this.content = result;
-
- });
- }
- },
- created() {
- this.fetchNews();
+ afterPageUpdated(event) {
+ this.page = event.page;
+ this.page_size = event.rows;
+ this.$refs.newsPageHeading.scrollIntoView({block: 'end'});
+ this.loadNewPageContent(event);
+ },
+ },
+ created() {
+ this.fetchNews();
this.$api
.call(ApiCms.getNewsRowCount())
- .then(res => res.data)
- .then(result => {
+ .then((res) => res.data)
+ .then((result) => {
this.maxPageCount = result;
});
- },
- template: /*html*/ `
- News
--
-
-
-
-
-
-
-
`,
};
diff --git a/public/js/components/Cis/LvPlan/Lehrveranstaltung.js b/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
index 4364a5df4..87f82eb0e 100644
--- a/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
+++ b/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
@@ -3,7 +3,8 @@ import FhcCalendar from "../../Calendar/LvPlan.js";
import ApiLvPlan from '../../../api/factory/lvPlan.js';
import ApiAuthinfo from '../../../api/factory/authinfo.js';
-export const DEFAULT_MODE_LVPLAN = 'Week'
+export const DEFAULT_MODE_LVPLAN_MOBILE = 'List';
+export const DEFAULT_MODE_LVPLAN_DESKTOP = 'Week';
export default {
name: 'LvPlanLehrveranstaltung',
@@ -19,15 +20,21 @@ export default {
lv: null
};
},
+ inject: ["isMobile"],
computed:{
currentDay() {
if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
- return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+ return luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate();
return this.propsViewData?.focus_date;
},
currentMode() {
- if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
- return DEFAULT_MODE_LVPLAN;
+ let validModes = ['day', 'month'];
+ validModes.push(this.isMobile ? 'list' : 'week');
+
+ const defaultMode = this.isMobile ? DEFAULT_MODE_LVPLAN_MOBILE : DEFAULT_MODE_LVPLAN_DESKTOP;
+
+ if (!this.propsViewData?.mode || !validModes.includes(this.propsViewData?.mode.toLowerCase()))
+ return defaultMode;
return this.propsViewData?.mode;
},
currentLv() {
@@ -95,7 +102,6 @@ export default {
{
- this.uid = res.data.uid;
- this.isMitarbeiter = res.data.isMitarbeiter;
- this.isStudent = res.data.isStudent;
- });
+ async created() {
+ await this.fetchAuthInfo();
},
template: /*html*/`
+
+
- News
++
+
+
+
+
+
+
+
@@ -123,8 +137,9 @@ export default {
{
+ this.studiensemester_kurzbz =
+ res.data.studiensemester_kurzbz;
+ this.studiensemester_start = res.data.start;
+ this.studiensemester_ende = res.data.ende;
+ });
+ },
+ getPromiseFunc(start, end) {
+ return [
+ this.$api.call(
+ ApiLvPlan.eventsPersonal(
+ start.toISODate(),
+ end.toISODate(),
+ this.propsViewData.otherUid,
+ ),
+ ),
+ this.$api.call(
+ ApiLvPlan.getLvPlanReservierungen(
+ start.toISODate(),
+ end.toISODate(),
+ this.propsViewData.otherUid,
+ ),
+ ),
+ ];
+ },
+ async fetchViewData() {
+ const viewDataResponse = await this.$api.call(
+ ApiOtherLvPlan.getOtherLvPlanViewData(
+ this.propsViewData.otherUid,
+ ),
+ );
+
+ const viewData = viewDataResponse.data;
+
+ this.isOtherPersonMitarbeiter =
+ !!viewData?.user_data?.is_mitarbeiter;
+ this.isOtherPersonStudent = !!viewData?.user_data?.is_student;
+ this.otherPersonData.fullName =
+ viewData?.user_data?.vorname +
+ " " +
+ viewData?.user_data?.nachname;
+ this.otherPersonData.photo = viewData?.user_data?.foto;
+ },
+ async redirectToMyLvPlanIfAuthUid() {
+ const authInfoResponse = await this.$api.call(
+ ApiAuthinfo.getAuthInfo(),
+ );
+ const authId = authInfoResponse.data.uid;
+ if (authId === this.propsViewData.otherUid) {
+ this.$router.push({ name: "MyLvPlan" });
+ }
+ },
+ },
+ async created() {
+ await this.redirectToMyLvPlanIfAuthUid();
+ await this.fetchViewData();
+ },
+ template: `
+
+
+
+
+
+
+
+ `,
+};
diff --git a/public/js/components/Cis/LvPlan/StgOrg.js b/public/js/components/Cis/LvPlan/StgOrg.js
new file mode 100644
index 000000000..8a18e273c
--- /dev/null
+++ b/public/js/components/Cis/LvPlan/StgOrg.js
@@ -0,0 +1,413 @@
+import FormForm from "../../Form/Form.js";
+import FormInput from "../../Form/Input.js";
+import FhcCalendar from "../../Calendar/LvPlan.js";
+
+import ApiLvPlan from '../.././../api/factory/lvPlan.js';
+import ApiStgOrgLvPlan from '../.././../api/factory/stgOrgLvPlan.js';
+import ApiAuthinfo from '../../../api/factory/authinfo.js';
+
+export const DEFAULT_MODE_LVPLAN_DESKTOP = "Week";
+export const DEFAULT_MODE_LVPLAN_MOBILE = "List";
+
+export default {
+ name: "LvPlanStgOrg",
+ components: {
+ FormForm,
+ FormInput,
+ FhcCalendar,
+ },
+ props: {
+ propsViewData: Object
+ },
+ data() {
+ return {
+ localProps: {},
+ studiensemester_kurzbz: null,
+ studiensemester_start: null,
+ studiensemester_ende: null,
+ uid: null,
+ isMitarbeiter: false,
+ isStudent: false,
+ currentStgBezeichnung: null,
+ formData: {
+ stgkz: null,
+ sem: null,
+ verband: null,
+ gruppe: null,
+ },
+ listStg: [],
+ listSem: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+ listVerband: [],
+ listGroup: [],
+ rangeIntervalFirst: null,
+ timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
+ };
+ },
+ inject: ["isMobile"],
+ computed: {
+ maxSemester() {
+ const currentStg = this.listStg.find(
+ (item) => item.studiengang_kz === this.formData.stgkz,
+ );
+ return currentStg?.max_semester;
+ },
+ currentDay() {
+ if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
+ return luxon.DateTime.now().setZone(this.timezone).toISODate();
+ return this.propsViewData?.focus_date;
+ },
+ currentMode() {
+ let validModes = ["day", "month"];
+ validModes.push(this.isMobile ? "list" : "week");
+
+ const defaultMode = this.isMobile
+ ? DEFAULT_MODE_LVPLAN_MOBILE
+ : DEFAULT_MODE_LVPLAN_DESKTOP;
+
+ if (
+ !this.propsViewData?.mode ||
+ !validModes.includes(this.propsViewData?.mode.toLowerCase())
+ )
+ return defaultMode;
+ return this.propsViewData?.mode;
+ },
+ downloadLinks() {
+ if (
+ !this.studiensemester_start ||
+ !this.studiensemester_ende ||
+ !this.uid
+ )
+ return false;
+
+ let type = false;
+ type = this.isStudent ? "student" : type;
+ type = this.isMitarbeiter ? "lektor" : type;
+ if (false === type) {
+ return;
+ }
+
+ const opts = { zone: this.timezone };
+ const start = luxon.DateTime
+ .fromISO(this.studiensemester_start, opts)
+ .toUnixInteger();
+ const ende = luxon.DateTime
+ .fromISO(this.studiensemester_ende, opts)
+ .toUnixInteger();
+
+ const download_link =
+ FHC_JS_DATA_STORAGE_OBJECT.app_root +
+ "cis/private/lvplan/stpl_kalender.php" +
+ "?type=" +
+ type +
+ "&pers_uid=" +
+ this.uid +
+ "&begin=" +
+ start +
+ "&ende=" +
+ ende;
+
+ return [
+ {
+ title: "excel",
+ icon: "fa-solid fa-file-excel",
+ link: download_link + "&format=excel",
+ },
+ {
+ title: "csv",
+ icon: "fa-solid fa-file-csv",
+ link: download_link + "&format=csv",
+ },
+ {
+ title: "ical1",
+ icon: "fa-regular fa-calendar",
+ link: download_link + "&format=ical&version=1&target=ical",
+ },
+ {
+ title: "ical2",
+ icon: "fa-regular fa-calendar",
+ link: download_link + "&format=ical&version=2&target=ical",
+ },
+ ];
+ },
+ },
+ methods: {
+ loadLvPlan() {
+ if (!this.formData.stgkz) {
+ this.$fhcAlert.alertError(this.$p.t("LvPlan", "chooseStg"));
+ return;
+ }
+
+ if (
+ !this.formData.sem &&
+ (this.formData.verband || this.formData.gruppe)
+ ) {
+ this.$fhcAlert.alertError(
+ this.$p.t("LvPlan", "error_SemMissing"),
+ );
+ return;
+ }
+
+ if (!this.formData.verband && this.formData.gruppe) {
+ this.$fhcAlert.alertError(
+ this.$p.t("LvPlan", "error_VerbandMissing"),
+ );
+ return;
+ }
+
+ const params = {
+ mode: this.currentMode,
+ focus_date: this.currentDay,
+ stgkz: this.formData.stgkz,
+ sem: this.formData.sem,
+ verband: this.formData.verband,
+ gruppe: this.formData.gruppe,
+ };
+
+ //ensure logic: no value after a null value in route
+ if (params.sem == null) {
+ params.verband = null;
+ params.gruppe = null;
+ }
+ if (params.verband == null) {
+ params.gruppe = null;
+ }
+
+ //delete all null values to avoid null in router
+ Object.keys(params).forEach(
+ (key) => params[key] == null && delete params[key],
+ );
+
+ this.$router.push({
+ name: "StgOrgLvPlan",
+ params,
+ });
+
+ this.$refs['calendar']?.resetEventLoader();
+ },
+ loadListSem(){
+ if(!this.listSem)
+ this.listSem = [...Array(this.maxSemester).keys()].map(i => i + 1);
+ },
+ loadListVerband() {
+ this.$api
+ .call(ApiLvPlan.getLehrverband(this.formData.stgkz, this.formData.sem, this.formData.verband))
+ .then(result => {
+ const data = result.data;
+ const mappedData = data.map((item) => item.verband);
+ this.listVerband = [
+ ...new Set(
+ mappedData.filter(
+ (v) =>
+ v !== null &&
+ v !== undefined &&
+ String(v).trim() !== "",
+ ),
+ ),
+ ].sort();
+ })
+ .catch(this.$fhcAlert.handleSystemError);
+ },
+ loadListGroup() {
+ this.$api
+ .call(ApiLvPlan.getGruppe(this.formData.stgkz, this.formData.sem, this.formData.verband))
+ .then(result => {
+ const data = result.data;
+ const mappedData = data.map((item) => item.gruppe);
+ this.listGroup = [
+ ...new Set(
+ mappedData.filter(
+ (v) =>
+ v !== null &&
+ v !== undefined &&
+ String(v).trim() !== "",
+ ),
+ ),
+ ].sort();
+ })
+ .catch(this.$fhcAlert.handleSystemError);
+ },
+ handleChangeDate(day, newMode) {
+ return this.handleChangeMode(newMode, day);
+ },
+ handleChangeMode(newMode, day) {
+ const mode = newMode[0].toUpperCase() + newMode.slice(1);
+ const focus_date = day.toISODate();
+
+ this.$router.push({
+ name: "StgOrgLvPlan",
+ params: {
+ mode,
+ focus_date,
+ stgkz: this.formData.stgkz,
+ sem: this.formData.sem,
+ verband: this.formData.verband,
+ gruppe: this.formData.gruppe,
+ },
+ });
+ },
+ updateRange(rangeInterval) {
+ this.$api
+ .call(
+ ApiLvPlan.studiensemesterDateInterval(
+ rangeInterval.end.startOf("week").toISODate(),
+ ),
+ )
+ .then((res) => {
+ this.studiensemester_kurzbz =
+ res.data.studiensemester_kurzbz;
+ this.studiensemester_start = res.data.start;
+ this.studiensemester_ende = res.data.ende;
+ });
+ },
+ getPromiseFunc(start, end) {
+ return [
+ this.$api.call(
+ ApiLvPlan.eventsStgOrg(
+ start,
+ end,
+ this.formData.stgkz,
+ this.formData.sem,
+ this.formData.verband,
+ this.formData.gruppe,
+ ),
+ ),
+ ];
+ },
+ async fetchAuthInfo() {
+ const authInfoResponse = await this.$api.call(ApiAuthinfo.getAuthInfo());
+
+ const authInfo = authInfoResponse.data;
+ this.uid = authInfo.uid;
+ this.isMitarbeiter = authInfo.isMitarbeiter;
+ this.isStudent = authInfo.isStudent;
+ },
+ async fetchViewData() {
+ const viewDataResponse = await this.$api.call(ApiStgOrgLvPlan.getStgOrgLvPlanViewData());
+
+ const viewData = viewDataResponse.data;
+ this.listStg = viewData.studiengaenge;
+ },
+ },
+ async created(){
+ await this.fetchAuthInfo();
+ await this.fetchViewData();
+
+ if (this.propsViewData) {
+ this.formData.stgkz = this.propsViewData.stgkz ? this.propsViewData.stgkz: null;
+ this.formData.sem = this.propsViewData.sem ? this.propsViewData.sem: null;
+ this.formData.verband = this.propsViewData.verband ? this.propsViewData.verband: null;
+ this.formData.gruppe = this.propsViewData.gruppe ? this.propsViewData.gruppe: null;
+
+ //ensure loading dropdown arrays for version propsView
+ if(!this.listVerband.length && this.formData.sem)
+ {
+ this.loadListVerband();
+ }
+ if(!this.listGroup.length && this.formData.verband)
+ {
+ this.loadListGroup();
+ }
+ }
+ },
+ template: `
+
+
+
+ {{ $p.t('lehre/stundenplan') + (studiensemester_kurzbz ? " " + studiensemester_kurzbz : "") }}
+
+
+
+ {{ otherPersonData.fullName }}
+
+ ![profile picture]()
+
+
+
+
+
+ {{ otherPersonData.fullName }}
+
+ ![profile picture]()
+
+ +
+
+
+
+
+
+
+
+
+ `,
+};
diff --git a/public/js/components/Cis/LvPlan/StgOrg_DEPR.js b/public/js/components/Cis/LvPlan/StgOrg_DEPR.js
new file mode 100644
index 000000000..02606a1db
--- /dev/null
+++ b/public/js/components/Cis/LvPlan/StgOrg_DEPR.js
@@ -0,0 +1,187 @@
+import FhcCalendar from "../../Calendar/LvPlan.js";
+
+import ApiLvPlan from '../.././../api/factory/lvPlan.js';
+import ApiAuthinfo from '../../../api/factory/authinfo.js';
+
+export const DEFAULT_MODE_LVPLAN = 'Week';
+
+export default {
+ name: 'LvPlanStgOrg',
+ inject: {
+ cisRoot: {
+ from: 'cisRoot'
+ },
+ },
+ components: {
+ FhcCalendar,
+ },
+ props: {
+ viewData: Object,
+ propsViewData: Object
+ },
+ data() {
+ return {
+ studiensemester_kurzbz: null,
+ studiensemester_start: null,
+ studiensemester_ende: null,
+ uid: null,
+ isMitarbeiter: false,
+ isStudent: false,
+ listStg: [],
+ currentStgBezeichnung: null
+ };
+ },
+ computed:{
+ currentDay() {
+ if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
+ return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+ return this.propsViewData?.focus_date;
+ },
+ currentMode() {
+ if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
+ return DEFAULT_MODE_LVPLAN;
+ return this.propsViewData?.mode;
+ },
+ downloadLinks() {
+ if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
+ return false;
+
+ let type = false;
+ type = this.isStudent ? 'student' : type;
+ type = this.isMitarbeiter ? 'lektor' : type;
+ if (false === type)
+ {
+ return;
+ }
+
+ const opts = { zone: this.viewData.timezone };
+ const start = luxon.DateTime
+ .fromISO(this.studiensemester_start, opts)
+ .toUnixInteger();
+ const ende = luxon.DateTime
+ .fromISO(this.studiensemester_ende, opts)
+ .toUnixInteger();
+
+ const download_link = FHC_JS_DATA_STORAGE_OBJECT.app_root
+ + 'cis/private/lvplan/stpl_kalender.php'
+ + '?type=' + type
+ + '&pers_uid=' + this.uid
+ + '&begin=' + start
+ + '&ende=' + ende;
+
+ return [
+ { title: "excel", icon: 'fa-solid fa-file-excel', link: download_link + '&format=excel' },
+ { title: "csv", icon: 'fa-solid fa-file-csv', link: download_link + '&format=csv' },
+ { title: "ical1", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=1&target=ical' },
+ { title: "ical2", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=2&target=ical' }
+ ];
+ }
+ },
+ methods: {
+ handleChangeDate(day, newMode) {
+ return this.handleChangeMode(newMode, day);
+ },
+ handleChangeMode(newMode, day) {
+ const mode = newMode[0].toUpperCase() + newMode.slice(1)
+ const focus_date = day.toISODate();
+
+ this.$router.push({
+ name: "StgOrgLvPlan",
+ params: {
+ mode,
+ focus_date,
+ stgkz: this.propsViewData.stgkz,
+ sem: this.propsViewData.sem,
+ verband: this.propsViewData.verband,
+ gruppe: this.propsViewData.gruppe,
+ }
+ });
+ },
+ updateRange(rangeInterval) {
+ this.$api
+ .call(ApiLvPlan.studiensemesterDateInterval(
+ rangeInterval.end.startOf('week').toISODate()
+ ))
+ .then(res => {
+ this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
+ this.studiensemester_start = res.data.start;
+ this.studiensemester_ende = res.data.ende;
+ });
+ },
+ getPromiseFunc(start, end) {
+ return [
+ this.$api.call(ApiLvPlan.eventsStgOrg(start.toISODate(), end.toISODate(), this.propsViewData.stgkz, this.propsViewData.sem, this.propsViewData.verband, this.propsViewData.gruppe)),
+ //local for test
+ /* this.$api.call(ApiLvPlan.eventsStgOrg(start.toISODate(), end.toISODate(), this.stgkz, this.sem, this.verband, this.gruppe))*/
+ ];
+ },
+ backToDropdown(){
+ this.$router.push({
+ name: "OverviewLvPlan",
+ });
+ }
+ },
+ created(){
+ this.$api
+ .call(ApiAuthinfo.getAuthInfo())
+ .then(res => {
+ this.uid = res.data.uid;
+ this.isMitarbeiter = res.data.isMitarbeiter;
+ this.isStudent = res.data.isStudent;
+ });
+
+ if(this.propsViewData.stgkz) {
+ this.$api
+ .call(ApiLvPlan.getStudiengaenge())
+ .then(result => {
+ const currentStg = result.data.find(
+ item => item.studiengang_kz == this.propsViewData.stgkz
+ );
+ this.currentStgBezeichnung = currentStg.kurzbzlang + " - " + currentStg.bezeichnung;
+ })
+ .catch(this.$fhcAlert.handleSystemError);
+ }
+ },
+ template: `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `,
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index f073d5a38..573e569ec 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -30,6 +30,7 @@ export default {
menuOpen:true,
};
},
+ inject: ["isMobile"],
provide(){
return{
setActiveEntry: this.setActiveEntry,
@@ -58,7 +59,7 @@ export default {
},
site_url(){
return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
- }
+ },
},
methods: {
fetchMenu() {
@@ -112,10 +113,26 @@ export default {
});
},
template: /*html*/`
-
- {{ $p.t('LvPlan/headerLvPlanLvVerband') }}
+{{currentStgBezeichnung}} + Semester: {{propsViewData.sem}} + Verband: {{propsViewData.verband}} + Gruppe: {{propsViewData.gruppe}} + +
+{{ $p.t('LvPlan/noStgProvided') }}
+ +
+
+
+
+
+
+
+
+
+
+ class="cis-renderer-reservierungen-calendar-event calendar-event-default h-100 w-100 p-1 position-relative">
{{ end }}
+
+
{{ event.topic }}
t.start === startTime)?.start || this.timeGrid[0]?.start;
+ this.selectedEnd = this.timeGrid.find(t => t.end === endTime)?.end || this.timeGrid.at(-1)?.end;
+ },
+ saveEvent() {
+ const [startHour, startMinute] = this.selectedStart.split(':').map(Number);
+ const [endHour, endMinute] = this.selectedEnd.split(':').map(Number);
+ const selectedStart = this.event.start.startOf('day').set({ hour: startHour, minute: startMinute });
+ const selectedEnd = this.event.start.startOf('day').set({ hour: endHour, minute: endMinute });
+
+ const lektoren_uid = this.selectedLektoren.map(m => m.uid)
+
+ const spezialgruppe = this.selectedGruppe?.gruppe_kurzbz;
+
+ const event = {
+ selectedStart: selectedStart,
+ selectedEnd: selectedEnd,
+ title: this.title,
+ beschreibung: this.beschreibung,
+ studiengang: this.studiengang,
+ semester: this.semester,
+ verband: this.verband,
+ gruppe: this.gruppe,
+ spezialgruppe: spezialgruppe,
+ lektoren: lektoren_uid
+ }
+
+ this.$emit('create-event', event);
+ },
+ async searchGroup(event) {
+ this.filteredGroups = await this.event.createContext.room_create_information.searchGroup(event)
+ },
+ async searchLektor(event) {
+ this.filteredLektoren = await this.event.createContext.room_create_information.searchLektor(event)
+ },
+ capitalize(text)
+ {
+ if (!text) return ''
+ return text.charAt(0).toUpperCase() + text.slice(1)
+ }
+ },
+
+ template: `
+
+
+ `
+};
diff --git a/public/js/components/Cis/Renderer/Slot/roomModalTitle.js b/public/js/components/Cis/Renderer/Slot/roomModalTitle.js
new file mode 100644
index 000000000..1f477a997
--- /dev/null
+++ b/public/js/components/Cis/Renderer/Slot/roomModalTitle.js
@@ -0,0 +1,3 @@
+export default {
+ template:`Neue Reservierung
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $p.t('lehre','new_reservierung') }}
`
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index 1b7aff81b..815793f55 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -1,7 +1,9 @@
import LvUebersicht from "../Mylv/LvUebersicht.js";
+import ApiCisStudium from '../../../api/factory/cis/studium.js';
export default {
+ name: 'Studium',
data(){
return {
studienSemester :[],
@@ -26,6 +28,7 @@ export default {
}
},
+ name: "OverviewStudiengaenge",
components: {
LvUebersicht,
},
@@ -88,6 +91,27 @@ export default {
studienordnung.selectedIndex = newSelectIndex;
this.changeSelectedStudienPlan(studienordnung.value);
},
+ onStudiensemesterChange(event) {
+ const value = event.target.value;
+ this.setHash(value);
+ this.changeSelectedStudienSemester(value);
+
+ },
+ onStudiengangChange(event) {
+ const value = event.target.value;
+ this.setHash(value);
+ this.changeSelectedStudienGang(value);
+ },
+ onSemesterChange(event) {
+ const value = event.target.value;
+ this.setHash(value);
+ this.changeSelectedSemester(value);
+ },
+ onStudienordnungChange(event) {
+ const value = event.target.value;
+ this.setHash(value);
+ this.changeSelectedStudienPlan(value);
+ },
storeDataToLocalStorage(key,value){
localStorage.setItem(key, value);
@@ -97,28 +121,32 @@ export default {
return value;
},
changeSelectedStudienSemester(studiensemester_kurzbz) {
- this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester_kurzbz, this.selectedStudiengang, this.selectedSemester, this.selectedStudienordnung)
+ return this.$api
+ .call(ApiCisStudium.getAllStudienSemester(studiensemester_kurzbz, this.selectedStudiengang, this.selectedSemester, this.selectedStudienordnung))
.then(data => data.data)
.then(res => {
this.extractPropertyValues(res);
})
},
changeSelectedStudienGang(studiengang_kz) {
- this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, studiengang_kz, this.selectedSemester, this.selectedStudienordnung)
+ return this.$api
+ .call(ApiCisStudium.getAllStudienSemester(this.selectedStudiensemester, studiengang_kz, this.selectedSemester, this.selectedStudienordnung))
.then(data => data.data)
.then(res => {
this.extractPropertyValues(res);
})
},
changeSelectedSemester(semester) {
- this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, semester, this.selectedStudienordnung)
+ return this.$api
+ .call(ApiCisStudium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, semester, this.selectedStudienordnung))
.then(data => data.data)
.then(res => {
this.extractPropertyValues(res);
})
},
changeSelectedStudienPlan(studienplan_id) {
- this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, this.selectedSemester, studienplan_id)
+ return this.$api
+ .call(ApiCisStudium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, this.selectedSemester, studienplan_id))
.then(data => data.data)
.then(res => {
this.extractPropertyValues(res);
@@ -160,6 +188,7 @@ export default {
this.studiengaenge = studiengang.all;
this.selectedStudiengang = studiengang.preselected?.studiengang_kz;
+
this.semester = semester.all;
this.selectedSemester = semester?.preselected;
@@ -195,7 +224,11 @@ export default {
},
studiengangTitel(studiengang) {
if (!studiengang) return "";
- return `${studiengang?.kurzbzlang} (${studiengang?.bezeichnung})`;
+ if(this.isGermanLanguage){
+ return `${studiengang?.kurzbzlang} (${studiengang?.bezeichnung})`;
+ }else{
+ return `${studiengang?.kurzbzlang} (${studiengang?.english})`;
+ }
},
studiensemesterTitel(studiensemester){
if (!studiensemester) return "";
@@ -213,9 +246,12 @@ export default {
},
computed:{
+ isGermanLanguage(){
+ return this.$p.user_language.value == "German"
+ },
selectedLehrveranstaltungTitel(){
const studiengang = this.studiengaenge.find((studiengang) => studiengang.studiengang_kz == this.selectedStudiengang);
- return `${this.selectedLehrveranstaltung?.bezeichnung} ${this.selectedLehrveranstaltung?.lehrform_kurzbz} / ${studiengang.kurzbzlang}-${this.selectedSemester} ${this.selectedLehrveranstaltung?.orgform_kurzbz} (${this.selectedStudiensemester})`;
+ return `${this.isGermanLanguage ? this.selectedLehrveranstaltung?.bezeichnung : this.selectedLehrveranstaltung?.bezeichnung_english} ${this.selectedLehrveranstaltung?.lehrform_kurzbz} / ${studiengang.kurzbzlang}-${this.selectedSemester} ${this.selectedLehrveranstaltung?.orgform_kurzbz} (${this.selectedStudiensemester})`;
},
computedStudienOrdnung(){
if(!this.studienOrdnung) return null;
@@ -232,14 +268,14 @@ export default {
let result = [];
Object.entries(this.computedStudienOrdnung).forEach(([key,value])=>{
result.push({
- bezeichnung: `Studienordnung: ${key}`,
+ bezeichnung: `${this.$p.t('studium', 'studienordnung') }: ${key}`,
disabled: true,
});
value.forEach((studienplan)=>{
result.push({
studienplan:studienplan,
diabled: false,
- bezeichnung: `${studienplan?.bezeichnung}-${studienplan?.orgform_kurzbz} ( ${studienplan?.orgform_bezeichnung}, ${studienplan?.sprache} )`
+ bezeichnung: `${studienplan?.bezeichnung}-${studienplan?.orgform_kurzbz} ( ${this.isGermanLanguage ? studienplan?.orgform_bezeichnung : studienplan?.orgform_bezeichnung_english}, ${studienplan?.sprache} )`
});
})
@@ -256,22 +292,23 @@ export default {
const studienordnung = JSON.parse(this.getDataFromLocalStorage("studienordnung")) ?? undefined;
// only fetch default data if no data is stored in the local storage
-
- this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester, studiengang, semester, studienordnung)
- .then(data => data.data)
- .then(res => {
- this.extractPropertyValues(res);
- })
+
+ this.$api
+ .call(ApiCisStudium.getAllStudienSemester(studiensemester, studiengang, semester, studienordnung))
+ .then(data => data.data)
+ .then(res => {
+ this.extractPropertyValues(res);
+ })
},
- template: `
+ template: /*html*/`
-
Studium
+{{$p.t('studium','studium')}}
Menu:
@@ -279,13 +316,13 @@ export default {
-
Studiensemester:
+{{$p.t('studium','studiensemester')}}:
-
-
Studiengang:
+{{$p.t('lehre','studiengang')}}:
-
-
Semester:
+{{$p.t('lehre','semester')}}:
-
-
Studienordnung:
+{{$p.t('studium','studienordnung')}}:
-