+ {{ $p.t('lehre/noLvFound') }}
+
+ ({name: '', uid: ''}),
- validator(value) {
- return value && value.uid // && value.name -> extensive viewData use only for cis4 onwards
- }
- }
},
data() {
return {
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/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/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index da205816d..cba34951c 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -4,8 +4,8 @@ import ViewStudentProfil from "./StudentViewProfil.js";
import ViewMitarbeiterProfil from "./MitarbeiterViewProfil.js";
import Loading from "../../Loader.js";
-import ApiProfil from '../../../api/factory/profil.js';
-import ApiProfilUpdate from '../../../api/factory/profilUpdate.js';
+import ApiProfil from "../../../api/factory/profil.js";
+import ApiProfilUpdate from "../../../api/factory/profilUpdate.js";
Vue.$collapseFormatter = function (data) {
//data - an array of objects containing the column title and value for each cell
@@ -35,7 +35,7 @@ Vue.$collapseFormatter = function (data) {
};
export const Profil = {
- name: 'Profil',
+ name: "Profil",
components: {
StudentProfil,
MitarbeiterProfil,
@@ -46,11 +46,8 @@ export const Profil = {
props: {
uid: {
type: String,
- required:false,
+ required: false,
},
- viewData: {
- type: Object,
- }
},
data() {
return {
@@ -62,17 +59,19 @@ export const Profil = {
data: null,
// notfound is null by default, but contains an UID if no user exists with that UID
notFoundUID: null,
- isEditable: this.viewData.editable ?? false,
+ isEditable: false,
+ authPermissions: null,
+ calendarSyncUrls: [],
};
},
provide() {
return {
- isEditable: Vue.computed(()=>this.isEditable),
+ isEditable: Vue.computed(() => this.isEditable),
profilUpdateStates: Vue.computed(() =>
- this.profilUpdateStates ? this.profilUpdateStates : false
+ this.profilUpdateStates ? this.profilUpdateStates : false,
),
profilUpdateTopic: Vue.computed(() =>
- this.profilUpdateTopic ? this.profilUpdateTopic : false
+ this.profilUpdateTopic ? this.profilUpdateTopic : false,
),
setLoading: (newValue) => {
this.loading = newValue;
@@ -130,8 +129,12 @@ export const Profil = {
//? if they have the same status the insert date is used for ordering
if (ele1.status === ele2.status) {
result =
- new Date(ele2.insertamum.split(".").reverse().join("-")) -
- new Date(ele1.insertamum.split(".").reverse().join("-"));
+ new Date(
+ ele2.insertamum.split(".").reverse().join("-"),
+ ) -
+ new Date(
+ ele1.insertamum.split(".").reverse().join("-"),
+ );
}
return result;
},
@@ -139,6 +142,8 @@ export const Profil = {
},
methods: {
async load() {
+ await this.fetchViewData();
+
// fetch profilUpdateStates to provide them to children components
await this.$api
.call(ApiProfilUpdate.getStatus())
@@ -157,20 +162,20 @@ export const Profil = {
.catch((error) => {
console.error(error);
});
-
-
- this.$api
- .call(ApiProfil.profilViewData(this.$route.params.uid??null))
- .then((response) => response.data).then(data=>{
- this.view = data?.profil_data.view;
- this.data = data?.profil_data.data;
- this.isEditable = data?.editable ?? false;
- })
- .catch((error) => {
- console.error(error);
- });
-
-
+ },
+ async fetchViewData() {
+ let viewDataResult = await this.$api.call(
+ ApiProfil.getProfilViewData(this.$route.params.uid ?? null),
+ );
+
+ const data = viewDataResult.data;
+ if (!data) return;
+
+ this.view = data.profil_data.view;
+ this.isEditable = data.profil_data.editable;
+ this.data = data.profil_data.data;
+ this.calendarSyncUrls = data.calendar_sync_urls ?? [];
+ this.authPermissions = data.permissions;
},
zustellAdressenCount() {
if (!this.data || !this.data.adressen) {
@@ -186,7 +191,7 @@ export const Profil = {
})
.map((adresse) => {
return adresse.requested_change.adresse_id;
- })
+ }),
);
}
@@ -197,8 +202,9 @@ export const Profil = {
.every((adresse) =>
this.data.profilUpdates.some(
(update) =>
- update.requested_change.adresse_id == adresse.adresse_id
- )
+ update.requested_change.adresse_id ==
+ adresse.adresse_id,
+ ),
)
) {
adressenArray = adressenArray.concat(
@@ -208,12 +214,11 @@ export const Profil = {
})
.map((adr) => {
return adr.adresse_id;
- })
+ }),
);
}
return [...new Set(adressenArray)];
-
},
zustellKontakteCount() {
if (!this.data || !this.data.kontakte) {
@@ -226,14 +231,17 @@ export const Profil = {
kontakteArray = kontakteArray.concat(
this.data.profilUpdates
.filter((update) => {
- return update.status === 'Pending' && update.requested_change.zustellung;
+ return (
+ update.status === "Pending" &&
+ update.requested_change.zustellung
+ );
})
.map((kontant) => {
return {
- kontakt_id: kontant.requested_change.kontakt_id,
- kontakttyp: kontant.requested_change.kontakttyp
- };
- })
+ kontakt_id: kontant.requested_change.kontakt_id,
+ kontakttyp: kontant.requested_change.kontakttyp,
+ };
+ }),
);
}
@@ -244,8 +252,10 @@ export const Profil = {
.every((kontakt) =>
this.data.profilUpdates.some(
(update) =>
- update.status === 'Pending' && update.requested_change.kontakt_id == kontakt.kontakt_id
- )
+ update.status === "Pending" &&
+ update.requested_change.kontakt_id ==
+ kontakt.kontakt_id,
+ ),
)
) {
kontakteArray = kontakteArray.concat(
@@ -255,10 +265,10 @@ export const Profil = {
})
.map((kon) => {
return {
- kontakt_id: kon.kontakt_id,
- kontakttyp: kon.kontakttyp
- };
- })
+ kontakt_id: kon.kontakt_id,
+ kontakttyp: kon.kontakttyp,
+ };
+ }),
);
}
@@ -266,7 +276,6 @@ export const Profil = {
},
},
computed: {
-
filteredEditData() {
if (!this.data) {
return;
@@ -330,8 +339,12 @@ export const Profil = {
// excludes all contacts that are already used in pending profil update requests
return !this.data.profilUpdates?.some(
(update) =>
- update.status === this.profilUpdateStates["Pending"] &&
- update.requested_change?.kontakt_id === item.kontakt_id
+ update.status ===
+ this.profilUpdateStates[
+ "Pending"
+ ] &&
+ update.requested_change?.kontakt_id ===
+ item.kontakt_id,
);
})
.map((kontakt) => {
@@ -347,12 +360,18 @@ export const Profil = {
topic: this.profilUpdateTopic?.["Private Adressen"],
data: this.data.adressen
?.filter((item) => {
- return !this.data.profilUpdates?.some((update) => {
- return (
- update.status === this.profilUpdateStates["Pending"] &&
- update.requested_change?.adresse_id == item.adresse_id
- );
- });
+ return !this.data.profilUpdates?.some(
+ (update) => {
+ return (
+ update.status ===
+ this.profilUpdateStates[
+ "Pending"
+ ] &&
+ update.requested_change
+ ?.adresse_id == item.adresse_id
+ );
+ },
+ );
})
.map((adresse) => {
return {
@@ -374,23 +393,28 @@ export const Profil = {
this.$refs.loadingModalRef.hide();
}
},
- uid (newVal, oldVal) {
- this.load()
- }
+ uid(newVal, oldVal) {
+ this.load();
+ },
},
created() {
- this.load()
+ this.load();
},
template: `
-
-
-
-
+
-
-
`,
};
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') }}
+ +
+
+
+
+
+
+
+
+
+
+
+
+ `
+}
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 3fd5e6900..a8cb2bc97 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -73,11 +73,11 @@ export default {
},
grade() {
const languageIndex = this.$p.user_language.value === 'English' ? 1 : 0
+ // no more showing of grade LV, if grade Zeugnis is not existing yet
if(this.benotung && this.znotebez?.length) {
return this.znotebez[languageIndex]
- } else if(this.benotung && this.lvnotebez?.length) {
- return this.lvnotebez[languageIndex]
- } else return null
+ }
+ else return null
},
LvHasPruefungenInformation(){
return this.pruefungenData && this.pruefungenData.length > 0;
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 559006a1b..fd3c1b072 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -9,6 +9,7 @@ import QuickLinks from "./ProfilComponents/QuickLinks.js";
import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
import RoleInformation from "./ProfilComponents/RoleInformation.js";
import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
+import CalendarSync from "./ProfilComponents/CalendarSync.js";
import ApiProfilUpdate from '../../../api/factory/profilUpdate.js';
import { dateFilter } from '../../../tabulator/filters/Dates.js';
@@ -26,6 +27,7 @@ export default {
ProfilEmails,
RoleInformation,
ProfilInformation,
+ CalendarSync,
},
inject: ["sortProfilUpdates", "collapseFunction", "language","isEditable"],
@@ -103,7 +105,6 @@ export default {
},
],
},
-
betriebsmittel_table_options: {
persistenceID: "filterTableMaProfilBetriebsmittel",
persistence: {
@@ -160,6 +161,7 @@ export default {
props: {
data: Object,
editData: Object,
+ calendarSyncUrls: Array,
},
methods: {
@@ -296,6 +298,11 @@ export default {
}
};
},
+ quickLinks() {
+ let quickLinks = [];
+ //
+ return quickLinks;
+ },
},
created() {
@@ -313,7 +320,6 @@ export default {
});
//? sorts the profil Updates: pending -> accepted -> rejected
this.data.profilUpdates?.sort(this.sortProfilUpdates);
-
},
watch: {
'data.funktionen'(newVal) {
@@ -331,12 +337,6 @@ export default {
+
+
+ {{$p.t('lehre/notenstatistik')}}
+
+
+
+
+
+ | + {{$p.t('lehre/headerAverage')}} + | ++ {{ gradeAverage }} + | +
| + {{$p.t('lehre/headerWeightedAverage')}} + | ++ {{ gradeWeightedAverage }} + | +
+
+
+
+
+ {{$p.t('lehre/info_noGradesYet')}}
+
-
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 481714590..459ad6d29 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -1,30 +1,30 @@
-import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
+import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
import Mailverteiler from "./ProfilComponents/Mailverteiler.js";
-import QuickLinks from "./ProfilComponents/QuickLinks.js";
import RoleInformation from "./ProfilComponents/RoleInformation.js";
import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
+import QuickLinks from "./ProfilComponents/QuickLinks.js";
-import { dateFilter } from '../../../tabulator/filters/Dates.js';
+import { dateFilter } from "../../../tabulator/filters/Dates.js";
export default {
components: {
CoreFilterCmpt,
Mailverteiler,
- QuickLinks,
RoleInformation,
ProfilEmails,
ProfilInformation,
+ QuickLinks,
},
inject: ["collapseFunction", "language"],
data() {
return {
collapseIconFunktionen: true,
- preloadedPhrasen:{},
+ preloadedPhrasen: {},
funktionen_table_options: {
persistenceID: "filterTableMaViewProfilFunktionen",
persistence: {
- columns: false
+ columns: false,
},
minHeight: 300,
layout: "fitColumns",
@@ -35,58 +35,65 @@ export default {
//? option when wanting to hide the collapsed list
{
- title:
- "",
+ title: "",
field: "collapse",
headerSort: false,
headerFilter: false,
formatter: "responsiveCollapse",
maxWidth: 40,
headerClick: this.collapseFunction,
- visible: true
+ visible: true,
},
{
- title: Vue.computed(() => this.$p.t('ui/bezeichnung')),
+ title: Vue.computed(() => this.$p.t("ui/bezeichnung")),
field: "Bezeichnung",
headerFilter: true,
minWidth: 200,
- visible: true
+ visible: true,
},
{
- title: Vue.computed(() => this.$p.t('lehre/organisationseinheit')),
+ title: Vue.computed(() =>
+ this.$p.t("lehre/organisationseinheit"),
+ ),
field: "Organisationseinheit",
headerFilter: true,
minWidth: 200,
- visible: true
+ visible: true,
},
{
- title: Vue.computed(() => this.$p.t('global/gueltigVon')),
+ title: Vue.computed(() =>
+ this.$p.t("global/gueltigVon"),
+ ),
field: "Gültig_von",
- headerFilterFunc: 'dates',
+ headerFilterFunc: "dates",
headerFilter: dateFilter,
resizable: true,
minWidth: 200,
visible: true,
- formatter:"datetime",
- formatterParams: this.datetimeFormatterParams()
+ formatter: "datetime",
+ formatterParams: this.datetimeFormatterParams(),
},
{
- title: Vue.computed(() => this.$p.t('global/gueltigBis')),
+ title: Vue.computed(() =>
+ this.$p.t("global/gueltigBis"),
+ ),
field: "Gültig_bis",
- headerFilterFunc: 'dates',
+ headerFilterFunc: "dates",
headerFilter: dateFilter,
resizable: true,
minWidth: 200,
visible: true,
- formatter:"datetime",
- formatterParams: this.datetimeFormatterParams()
+ formatter: "datetime",
+ formatterParams: this.datetimeFormatterParams(),
},
{
- title: Vue.computed(() => this.$p.t('profil/wochenstunden')),
+ title: Vue.computed(() =>
+ this.$p.t("profil/wochenstunden"),
+ ),
field: "Wochenstunden",
headerFilter: true,
minWidth: 200,
- visible: true
+ visible: true,
},
],
},
@@ -94,47 +101,56 @@ export default {
},
//? this is the prop passed to the dynamic component with the custom data of the view
- props: ["data"],
+ props: ["data", "permissions"],
methods: {
funktionenTableBuilt: function () {
this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
},
- datetimeFormatterParams: function() {
+ datetimeFormatterParams: function () {
const params = {
- inputFormat:"yyyy-MM-dd",
- outputFormat:"dd.MM.yyyy",
- invalidPlaceholder:"(invalid date)",
- timezone:FHC_JS_DATA_STORAGE_OBJECT.timezone
+ inputFormat: "yyyy-MM-dd",
+ outputFormat: "dd.MM.yyyy",
+ invalidPlaceholder: "(invalid date)",
+ timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
};
return params;
- }
+ },
},
watch: {
- 'data.funktionen'(newVal) {
- if(this.$refs.funktionenTable) this.$refs.funktionenTable.tabulator.setData(newVal);
+ "data.funktionen"(newVal) {
+ if (this.$refs.funktionenTable)
+ this.$refs.funktionenTable.tabulator.setData(newVal);
+ },
+ "language.value"(newVal) {
+ // reevaluates computed phrasen
+ if (this.$refs.funktionenTable)
+ this.$refs.funktionenTable.tabulator.setColumns(
+ this.funktionen_table_options.columns,
+ );
},
- 'language.value'(newVal) { // reevaluates computed phrasen
- if(this.$refs.funktionenTable) this.$refs.funktionenTable.tabulator.setColumns(this.funktionen_table_options.columns)
- }
},
computed: {
getTelefonValue() {
- if(this.data.standort_telefon?.kontakt) {
- return this.data.standort_telefon.kontakt + " " + this.data.telefonklappe
- } else if(this.data.standort_telefon) {
- return this.data.standort_telefon + " " + this.data.telefonklappe
+ if (this.data.standort_telefon?.kontakt) {
+ return (
+ this.data.standort_telefon.kontakt +
+ " " +
+ this.data.telefonklappe
+ );
+ } else if (this.data.standort_telefon) {
+ return (
+ this.data.standort_telefon + " " + this.data.telefonklappe
+ );
} else {
- return this.data.telefonklappe
+ return this.data.telefonklappe;
}
},
fotoStatus() {
return this.data?.fotoStatus ?? null;
},
-
personEmails() {
return this.data?.emails ? this.data.emails : [];
},
-
profilInformation() {
if (!this.data) {
return {};
@@ -151,42 +167,67 @@ export default {
foto: this.data.foto,
};
},
-
roleInformation() {
if (!this.data) {
return {};
}
return {
geburtsdatum: {
- label: `${this.$p.t('profil','Geburtsdatum')}`,
- value: this.data.gebdatum
+ label: `${this.$p.t("profil", "Geburtsdatum")}`,
+ value: this.data.gebdatum,
},
geburtsort: {
- label: `${this.$p.t('profil','Geburtsort')}`,
- value: this.data.gebort
+ label: `${this.$p.t("profil", "Geburtsort")}`,
+ value: this.data.gebort,
},
personenkennzeichen: {
- label: `${this.$p.t('profil','Kurzzeichen')}`,
- value: this.data.kurzbz
+ label: `${this.$p.t("profil", "Kurzzeichen")}`,
+ value: this.data.kurzbz,
},
telefon: {
- label: `${this.$p.t('profil','Telefon')}`,
- value: this.getTelefonValue
+ label: `${this.$p.t("profil", "Telefon")}`,
+ value: this.getTelefonValue,
},
office: {
- label: `${this.$p.t('profil','Büro')}`,
- value: this.data.ort_kurzbz
- }
+ label: `${this.$p.t("profil", "Büro")}`,
+ value: this.data.ort_kurzbz,
+ },
};
},
+ quickLinks() {
+ let quickLinks = [];
+ if (
+ this.$props.permissions &&
+ this.$props.permissions["basis/other_lv_plan"]
+ ) {
+ quickLinks.push({
+ icon: "fa-calendar-days",
+ phrase: "lehre/stundenplan",
+ action: () => {
+ this.$router.push({
+ name: "OtherLvPlan",
+ params: { otherUid: this.$props.data.username },
+ });
+ },
+ });
+ }
+ return quickLinks;
+ },
},
- created(){
+ created() {
this.$p.loadCategory(["ui", "lehre", "global", "profil"]).then(() => {
- this.preloadedPhrasen.bezeichnungPhrase = this.$p.t('ui/bezeichnung');
- this.preloadedPhrasen.organisationseinheitPhrase = this.$p.t('lehre/organisationseinheit');
- this.preloadedPhrasen.gueltigVonPhrase = this.$p.t('global/gueltigVon');
- this.preloadedPhrasen.gueltigBisPhrase = this.$p.t('global/gueltigBis');
- this.preloadedPhrasen.wochenstundenPhrase = this.$p.t('profil/wochenstunden');
+ this.preloadedPhrasen.bezeichnungPhrase =
+ this.$p.t("ui/bezeichnung");
+ this.preloadedPhrasen.organisationseinheitPhrase = this.$p.t(
+ "lehre/organisationseinheit",
+ );
+ this.preloadedPhrasen.gueltigVonPhrase =
+ this.$p.t("global/gueltigVon");
+ this.preloadedPhrasen.gueltigBisPhrase =
+ this.$p.t("global/gueltigBis");
+ this.preloadedPhrasen.wochenstundenPhrase = this.$p.t(
+ "profil/wochenstunden",
+ );
this.preloadedPhrasen.loaded = true;
});
},
@@ -242,7 +283,7 @@ export default {
-
@@ -465,17 +465,11 @@ export default {
-
+
-
+
+
+
@@ -501,12 +495,17 @@ export default {
+
+
+
+
@@ -256,26 +297,22 @@ export default {
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
Es wurde keine Person mit der UID {{this.notFoundUID}} gefunden
+
`,
+};
diff --git a/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
index 3f8b7d77c..9efb21eab 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
@@ -1,53 +1,31 @@
export default {
- //TODO: To be implemented
- props: {
- data: {
- type: String,
- },
- title: {
- type: String,
- required: true,
- },
- mobile: {
- type: Boolean,
- default: false,
- },
- },
- methods: {
- hideCollapse: function () {
- this.collapseOpen = false;
- },
- showCollapse: function () {
- this.collapseOpen = true;
- },
- },
- data() {
- return {
- collapseOpen: false,
- };
- },
- template: /*html*/ `
+ name: "QuickLinks",
+ data() {
+ return {};
+ },
+ props: {
+ title: {
+ type: String,
+ required: true,
+ },
+ links: {
+ type: Array,
+ required: true,
+ },
+ },
+ template: `
+ {{ $p.t("profil/calendar_sync") }}
+
+
+
-
-
-
-
- {{$p.t('profil','zeitwuensche')}}
- {{$p.t('profil','lehrveranstaltungen')}}
- {{$p.t('profil','zeitsperren')}}
+
`,
};
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 3f8e8380d..57f933305 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -1,7 +1,6 @@
import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
import Mailverteiler from "./ProfilComponents/Mailverteiler.js";
import AusweisStatus from "./ProfilComponents/FhAusweisStatus.js";
-import QuickLinks from "./ProfilComponents/QuickLinks.js";
import Adresse from "./ProfilComponents/Adresse.js";
import Kontakt from "./ProfilComponents/Kontakt.js";
import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
@@ -9,6 +8,8 @@ import RoleInformation from "./ProfilComponents/RoleInformation.js";
import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
import FetchProfilUpdates from "./ProfilComponents/FetchProfilUpdates.js";
import EditProfil from "./ProfilModal/EditProfil.js";
+import QuickLinks from "./ProfilComponents/QuickLinks.js";
+import CalendarSync from "./ProfilComponents/CalendarSync.js";
import ApiProfilUpdate from '../../../api/factory/profilUpdate.js';
import { dateFilter } from '../../../tabulator/filters/Dates.js';
@@ -18,7 +19,6 @@ export default {
CoreFilterCmpt,
Mailverteiler,
AusweisStatus,
- QuickLinks,
Adresse,
Kontakt,
ProfilEmails,
@@ -26,6 +26,8 @@ export default {
ProfilInformation,
FetchProfilUpdates,
EditProfil,
+ QuickLinks,
+ CalendarSync,
},
inject: ["sortProfilUpdates", "collapseFunction", "language","isEditable"],
data() {
@@ -101,6 +103,7 @@ export default {
props: {
data: Object,
editData: Object,
+ calendarSyncUrls: Array,
},
provide() {
return {
@@ -240,6 +243,11 @@ export default {
}
};
},
+ quickLinks() {
+ let quickLinks = [];
+ //
+ return quickLinks;
+ },
},
created() {
// preload phrasen
@@ -265,15 +273,7 @@ export default {
:value="JSON.parse(JSON.stringify(filteredEditData))" :titel="$p.t('profil','profilBearbeiten')">
+ {{title}}
+
+
+
+
-
-
-
+
+ {{ $p.t(link.phrase) }}
+
{{title}}
-
-
+
-
-
-
-
@@ -403,12 +403,11 @@ export default {
-
+
@@ -434,13 +433,18 @@ export default {
+
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 2ce649dae..0f7a196f4 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -1,30 +1,28 @@
-import QuickLinks from "./ProfilComponents/QuickLinks.js";
import Mailverteiler from "./ProfilComponents/Mailverteiler.js";
import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
import RoleInformation from "./ProfilComponents/RoleInformation.js";
import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
+import QuickLinks from "./ProfilComponents/QuickLinks.js";
export default {
- data() {
- return {};
- },
components: {
- QuickLinks,
Mailverteiler,
ProfilEmails,
RoleInformation,
ProfilInformation,
+ QuickLinks,
+ },
+ props: ["data", "permissions"],
+ data() {
+ return {};
},
-
- props: ["data"],
provide() {
return {
- studiengang_kz: Vue.computed({ get: () => this.data.studiengang_kz }),
- }
+ studiengang_kz: Vue.computed({
+ get: () => this.data.studiengang_kz,
+ }),
+ };
},
-
- methods: {},
-
computed: {
fotoStatus() {
return this.data?.fotoStatus ?? null;
@@ -45,66 +43,67 @@ export default {
foto: this.data.foto,
};
},
-
personEmails() {
return this.data?.emails ? this.data.emails : [];
},
-
roleInformation() {
if (!this.data) {
return {};
}
-
return {
geburtsdatum: {
- label: `${this.$p.t('profil','Geburtsdatum')}`,
- value: this.data.gebdatum
+ label: `${this.$p.t("profil", "Geburtsdatum")}`,
+ value: this.data.gebdatum,
},
geburtsort: {
- label: `${this.$p.t('profil','Geburtsort')}`,
- value: this.data.gebort
+ label: `${this.$p.t("profil", "Geburtsort")}`,
+ value: this.data.gebort,
},
personenkennzeichen: {
- label: `${this.$p.t('person','personenkennzeichen')}`,
- value: this.data.personenkennzeichen
+ label: `${this.$p.t("person", "personenkennzeichen")}`,
+ value: this.data.personenkennzeichen,
},
studiengang: {
- label: `${this.$p.t('lehre','studiengang')}`,
- value: this.data.studiengang
+ label: `${this.$p.t("lehre", "studiengang")}`,
+ value: this.data.studiengang,
},
semester: {
- label: `${this.$p.t('lehre','semester')}`,
- value: this.data.semester
+ label: `${this.$p.t("lehre", "semester")}`,
+ value: this.data.semester,
},
verband: {
- label: `${this.$p.t('lehre','lehrverband')}`,
- value: this.data.verband
+ label: `${this.$p.t("lehre", "lehrverband")}`,
+ value: this.data.verband,
},
gruppe: {
- label: `${this.$p.t('lehre','gruppe')}`,
- value: this.data.gruppe.trim()
- }
+ label: `${this.$p.t("lehre", "gruppe")}`,
+ value: this.data.gruppe.trim(),
+ },
};
},
+ quickLinks() {
+ let quickLinks = [];
+ if (this.$props.permissions && this.$props.permissions["basis/other_lv_plan"]) {
+ quickLinks.push({
+ icon: "fa-calendar-days",
+ phrase: "lehre/stundenplan",
+ action: () => {
+ this.$router.push({
+ name: "OtherLvPlan",
+ params: { otherUid: this.$props.data.username },
+ });
+ },
+ });
+ }
+ return quickLinks;
+ },
},
-
- mounted() {
- },
-
template: /*html*/ `
+
+
+
-
-
-
@@ -112,12 +111,18 @@ export default {
-
+
+
@@ -145,17 +150,12 @@ export default {
+
+
+
-
-
-
-
+
+
+
+
+
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index 365da4911..3b0ebf538 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -3,14 +3,12 @@ import VueDatePicker from '../../vueDatepicker.js.php';
import ApiOrt from '../../../api/factory/ort.js'
export const Raumsuche = {
name: "Raumsuche",
- props: {
-
- },
components: {
VueDatePicker,
CoreFilterCmpt,
InputNumber: primevue.inputnumber,
},
+ inject: ["isMobile"],
data() {
return {
phrasenPromise: null,
@@ -194,8 +192,9 @@ export const Raumsuche = {
{{$p.t('rauminfo/roomSearch')}}
-
+
-
+
-
+
-
+
-
+
lektor.kurzbz).join("\n")
+ "\n" + this.$p.t('lehre/weitereLektoren', [this.event.lektor.length - 3])
].join(": "));
- } else {;
+ } else {
tooltipArray.push([
this.$p.t('lehre/lektor'),
this.event.lektor.map(lektor => lektor.kurzbz).join("\n")
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index d773a52ed..738c0c75c 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -142,7 +142,6 @@ export default {
-
- `,
}
\ 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..c70646608 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -1,5 +1,6 @@
import LvUebersicht from "../Mylv/LvUebersicht.js";
+import ApiCisStudium from '../../../api/factory/cis/studium.js';
export default {
data(){
@@ -26,6 +27,7 @@ export default {
}
},
+ name: "OverviewStudiengaenge",
components: {
LvUebersicht,
},
@@ -88,6 +90,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 +120,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 +187,7 @@ export default {
this.studiengaenge = studiengang.all;
this.selectedStudiengang = studiengang.preselected?.studiengang_kz;
+
this.semester = semester.all;
this.selectedSemester = semester?.preselected;
@@ -195,7 +223,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 +245,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 +267,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 +291,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 +315,13 @@ export default {
-
Studiensemester:
+{{$p.t('studium','studiensemester')}}:
-
-
Studiengang:
+{{$p.t('lehre','studiengang')}}:
-
-
Semester:
+{{$p.t('lehre','semester')}}:
-
-
Studienordnung:
+{{$p.t('studium','studienordnung')}}:
-