@@ -215,8 +228,9 @@ export default {
i + 1);
@@ -208,24 +209,26 @@ export default {
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;
+ },
},
- created(){
- this.$api
- .call(ApiAuthinfo.getAuthInfo())
- .then(res => {
- this.uid = res.data.uid;
- this.isMitarbeiter = res.data.isMitarbeiter;
- this.isStudent = res.data.isStudent;
- });
+ async created(){
+ await this.fetchAuthInfo();
+ await this.fetchViewData();
- this.$api
- .call(ApiLvPlan.getStudiengaenge())
- .then(result => {
- this. listStg = result.data;
- })
- .catch(this.$fhcAlert.handleSystemError);
-
- if(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;
@@ -298,37 +301,39 @@ export default {
-
-
`,
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 44e0ca6eb..fd3c1b072 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -105,7 +105,6 @@ export default {
},
],
},
- quickLinks: [],
betriebsmittel_table_options: {
persistenceID: "filterTableMaProfilBetriebsmittel",
persistence: {
@@ -299,6 +298,11 @@ export default {
}
};
},
+ quickLinks() {
+ let quickLinks = [];
+ //
+ return quickLinks;
+ },
},
created() {
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 42a2700f3..459ad6d29 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -1,11 +1,11 @@
-import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
+import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
import Mailverteiler from "./ProfilComponents/Mailverteiler.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: {
@@ -20,11 +20,11 @@ export default {
data() {
return {
collapseIconFunktionen: true,
- preloadedPhrasen:{},
+ preloadedPhrasen: {},
funktionen_table_options: {
persistenceID: "filterTableMaViewProfilFunktionen",
persistence: {
- columns: false
+ columns: false,
},
minHeight: 300,
layout: "fitColumns",
@@ -35,62 +35,68 @@ 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,
},
],
},
- quickLinks: [],
};
},
@@ -100,42 +106,51 @@ export default {
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 {};
@@ -152,59 +167,69 @@ 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,
+ },
};
},
- },
- 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.loaded = true;
- });
-
- if (this.$props.permissions["basis/other_lv_plan"]) {
- this.quickLinks.push(
- {
+ 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 },
- })
+ name: "OtherLvPlan",
+ params: { otherUid: this.$props.data.username },
+ });
},
- }
+ });
+ }
+ return quickLinks;
+ },
+ },
+ 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.loaded = true;
+ });
},
template: /*html*/ `
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index b5f3fd552..c965652a1 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -48,9 +48,6 @@ export const Profil = {
type: String,
required: false,
},
- viewData: {
- type: Object,
- },
},
data() {
return {
@@ -62,7 +59,9 @@ 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() {
@@ -143,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())
@@ -161,18 +162,20 @@ export const Profil = {
.catch((error) => {
console.error(error);
});
+ },
+ async fetchViewData() {
+ let viewDataResult = await this.$api.call(
+ ApiProfil.getProfilViewData(this.$route.params.uid ?? null),
+ );
- 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);
- });
+ 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) {
@@ -408,8 +411,8 @@ export const Profil = {
:is="view"
:data="data"
:editData="filteredEditData"
- :permissions="$props.viewData.permissions"
- :calendarSyncUrls="$props.viewData.calendarSyncUrls">
+ :permissions="authPermissions"
+ :calendarSyncUrls="calendarSyncUrls">