diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php index 8a73dcaa4..d0f4fa7ba 100644 --- a/application/controllers/api/frontend/v1/LvPlan.php +++ b/application/controllers/api/frontend/v1/LvPlan.php @@ -358,10 +358,10 @@ class LvPlan extends FHCAPI_Controller 'studiengang_kz' => $studiengang_kz, ]; - if ($semester !== null && $semester !== 'null') { + if ($semester !== null && $semester !== 'null' && $semester !== 'undefined') { $where['semester'] = $semester; } - if ($verband !== null && $verband !== 'null') { + if ($verband !== null && $verband !== 'null' && $verband !== 'undefined') { $where['verband'] = $verband; } diff --git a/public/js/components/Cis/LvPlan/OverviewLvPlan.js b/public/js/components/Cis/LvPlan/OverviewLvPlan.js index 4a7cdec60..dafdc13f5 100644 --- a/public/js/components/Cis/LvPlan/OverviewLvPlan.js +++ b/public/js/components/Cis/LvPlan/OverviewLvPlan.js @@ -17,7 +17,7 @@ export default { return { formData: { stgkz: null, - semester: null, + sem: null, verband: null, gruppe: null, }, @@ -25,7 +25,7 @@ export default { listSem: [], listVerband: [], listGroup: [], - dataLvStudiengang: {} + // dataLvStudiengang: {} }; }, methods: { @@ -34,13 +34,14 @@ export default { this.$fhcAlert.alertError(this.$p.t('LvPlan', 'chooseStg')); return; } + console.log(this.$route.name, this.$route.params); this.$router.push({ name: "StgOrgLvPlan", params: { mode: "Week", focus_date: this.currentDay, stgkz: this.formData.stgkz, - sem: this.formData.semester, + sem: this.formData.sem, verband: this.formData.verband, gruppe: this.formData.gruppe, } @@ -52,7 +53,7 @@ export default { }, loadListVerband(){ this.$api - .call(ApiLvPlan.getLehrverband(this.formData.stgkz, this.formData.semester, this.formData.verband)) + .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); @@ -68,7 +69,7 @@ export default { }, loadListGroup(){ this.$api - .call(ApiLvPlan.getGruppe(this.formData.stgkz, this.formData.semester, this.formData.verband)) + .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); @@ -122,7 +123,7 @@ export default { diff --git a/public/js/components/Cis/LvPlan/StgOrg.js b/public/js/components/Cis/LvPlan/StgOrg.js index b6e4a37b4..f7deff692 100644 --- a/public/js/components/Cis/LvPlan/StgOrg.js +++ b/public/js/components/Cis/LvPlan/StgOrg.js @@ -1,3 +1,5 @@ +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'; @@ -7,12 +9,9 @@ export const DEFAULT_MODE_LVPLAN = 'Week'; export default { name: 'LvPlanStgOrg', - inject: { - cisRoot: { - from: 'cisRoot' - }, - }, components: { + FormForm, + FormInput, FhcCalendar, }, props: { @@ -21,17 +20,46 @@ export default { }, 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: [], - currentStgBezeichnung: null + listSem: [1,2,3,4,5,6,7,8,9,10], + listVerband: [], + listGroup: [], + rangeIntervalFirst: null }; }, - computed:{ + computed: { + maxSemester(){ + const currentStg = this.listStg.find( + item => item.studiengang_kz === this.formData.stgkz + ); + return currentStg.max_semester; + }, + //use local props, for viewDataProps cannot be changed +/* currentDay() { + if (!this.localProps?.focus_date || isNaN(new Date(this.localProps.focus_date))) + return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate(); + return this.localProps.focus_date; + }, + + currentMode() { + if (!this.localProps?.mode || !['day', 'week', 'month'].includes(this.localProps.mode.toLowerCase())) + return DEFAULT_MODE_LVPLAN; + return this.localProps.mode; + },*/ currentDay() { if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date))) return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate(); @@ -78,14 +106,94 @@ export default { } }, methods: { + loadLvPlan(){ + if(!this.formData.stgkz){ + this.$fhcAlert.alertError(this.$p.t('LvPlan', 'chooseStg')); + return; + } + +/* if(this.rangeIntervalFirst) { + console.log("in range IntervalFirst "); + this.updateRange(this.rangeIntervalFirst); + } + + console.log("formParameters: " + this.formData.stgkz + " focusdate" + this.currentDay);*/ + +/* const newFocus = luxon.DateTime.fromISO(this.propsViewData.focus_date) + .setZone(this.viewData.timezone) + .toISODate() + "_";*/ // minimaler Unterschied + + //also use router push here + this.$router.push({ + name: "StgOrgLvPlan", + params: { + mode: this.currentMode, + focus_date: this.currentDay, + stgkz: this.formData.stgkz, + sem: this.formData.sem, + verband: this.formData.verband, + gruppe: this.formData.gruppe, + }, + }); + + //wenn sich formvariablen ändern? + if(this.rangeIntervalFirst) { + console.log("in range IntervalFirst second try "); + const start = luxon.DateTime.fromISO(this.rangeIntervalFirst.start).toISODate(); + const end = luxon.DateTime.fromISO(this.rangeIntervalFirst.end).toISODate(); + console.log("start und end" + start + " - " + end); + this.getPromiseFunc(start, end); + } + + }, + loadListSem(){ + this.listSem = [...Array(this.maxSemester).keys()].map(i => i + 1); + this.loadListVerband(); + }, + loadListVerband(){ + this.$api + .call(ApiLvPlan.getLehrverband(this.formData.stgkz, this.formData.semester, 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); + this.loadListGroup(); + }, + loadListGroup(){ + this.$api + .call(ApiLvPlan.getGruppe(this.formData.stgkz, this.formData.semester, 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) { + console.log("in handleChangeDate: day: " + day + " newMode " + newMode); return this.handleChangeMode(newMode, day); }, handleChangeMode(newMode, day) { - const mode = newMode[0].toUpperCase() + newMode.slice(1) + console.log("in handleChangeMode: day: " + day + " newMode " + newMode); + console.log(this.$route.name, this.$route.params); + const mode = newMode[0].toUpperCase() + newMode.slice(1); const focus_date = day.toISODate(); - this.$router.push({ + console.log(this.formData.stgkz, this.formData.sem, this.formData.verband, this.formData.gruppe); + + +/* this.$router.push({ name: "StgOrgLvPlan", params: { mode, @@ -95,9 +203,52 @@ export default { verband: this.propsViewData.verband, gruppe: this.propsViewData.gruppe, } + });*/ + + 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, + }, }); + + //try for reload + if(this.rangeIntervalFirst) { + console.log("in range IntervalFirst second try "); + const start = luxon.DateTime.fromISO(this.rangeIntervalFirst.start).toISODate(); + const end = luxon.DateTime.fromISO(this.rangeIntervalFirst.end).toISODate(); + console.log("start und end" + start + " - " + end); + this.getPromiseFunc(start, end); + } + }, updateRange(rangeInterval) { + console.log("in updateRange " + rangeInterval); + + //initialise at first run + if(!this.rangeIntervalFirst) { + this.rangeIntervalFirst = rangeInterval; + console.log("new local RI " + this.rangeIntervalFirst); + } + + +/* const startOfWeek = rangeInterval.end.startOf('week').toISODate(); + + console.log("in updateRange", startOfWeek);*/ +/* + if (!rangeInterval || !rangeInterval.end || !rangeInterval.end.startOf) { + console.warn("updateRange: invalid rangeInterval", rangeInterval); + return; + } + + const startOfWeek = rangeInterval.end.startOf('week').toISODate(); + + console.log("in updateRange", startOfWeek);*/ this.$api .call(ApiLvPlan.studiensemesterDateInterval( rangeInterval.end.startOf('week').toISODate() @@ -109,17 +260,18 @@ export default { }); }, getPromiseFunc(start, end) { + console.log("start " + start + " end " + end); + console.log(this.propsViewData.stgkz, this.propsViewData.sem, this.propsViewData.verband, this.propsViewData.gruppe); + console.log(this.formData.stgkz, this.formData.sem, this.formData.verband, this.formData.gruppe); + return [ - this.$api.call(ApiLvPlan.eventsStgOrg(start.toISODate(), end.toISODate(), this.propsViewData.stgkz, this.propsViewData.sem, this.propsViewData.verband, this.propsViewData.gruppe)), + //this.$api.call(ApiLvPlan.eventsStgOrg(start, end, this.propsViewData.stgkz, this.propsViewData.sem, this.propsViewData.verband, this.propsViewData.gruppe)), + //variante die von außen funktioniert +/* 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))*/ + this.$api.call(ApiLvPlan.eventsStgOrg(start, end, this.formData.stgkz, this.formData.sem, this.formData.verband, this.formData.gruppe)) ]; }, - backToDropdown(){ - this.$router.push({ - name: "OverviewLvPlan", - }); - } }, created(){ this.$api @@ -130,30 +282,95 @@ export default { 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); + this.$api + .call(ApiLvPlan.getStudiengaenge()) + .then(result => { + this. listStg = result.data; + }) + .catch(this.$fhcAlert.handleSystemError); + + //this.localProps = { ...this.propsViewData }; + + 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; } }, + /* + + v-if="propsViewData && propsViewData.stgkz" + {{propsViewData}} || {{formData}} || {{viewData}} + */ + template: `
-

{{ $p.t('LvPlan/headerLvPlanLvVerband') }}

-

{{currentStgBezeichnung}} - Semester: {{propsViewData.sem}} - Verband: {{propsViewData.verband}} - Gruppe: {{propsViewData.gruppe}} - -

-

{{ $p.t('LvPlan/noStgProvided') }}

+ +
+ + + + + + + + + + + + + + + + + + + + +
`, + + }; \ No newline at end of file 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: ` +
+

{{ $p.t('LvPlan/headerLvPlanLvVerband') }}

+

{{currentStgBezeichnung}} + Semester: {{propsViewData.sem}} + Verband: {{propsViewData.verband}} + Gruppe: {{propsViewData.gruppe}} + +

+

{{ $p.t('LvPlan/noStgProvided') }}

+ + +
+
+ +
+ + {{ title }} +
+ +
+
+ +
+ `, +}; \ No newline at end of file diff --git a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js index badbf537f..d4ddeaf60 100644 --- a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js +++ b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js @@ -31,7 +31,7 @@ export default { this.event.lektor.slice(0, 3).map(lektor => lektor.kurzbz).join("\n") + "\n" + this.$p.t('lehre/weitereLektoren', [this.event.lektor.length - 3]) ].join(": ")); - } else {console.log(this.event.lektor); + } else {//console.log(this.event.lektor); tooltipArray.push([ this.$p.t('lehre/lektor'), this.event.lektor.map(lektor => lektor.kurzbz).join("\n")