-
-
-
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index e8c56fd4e..b55eefb7a 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -124,8 +124,6 @@ export default {
return { ...item, ...placement, weight };
});
- if (this.editModeIsActive)
- return placedItems;
return placedItems.filter(item => !item.hidden);
}
},
@@ -141,22 +139,12 @@ export default {
handleConfigClosed() {
this.configOpened = false
},
- removeWidget(item, revert) {
+ removeWidget(item) {
if (item.custom) {
BsConfirm.popup(this.$p.t('dashboard', 'alert_deleteWidget')).then(() => this.$emit('widgetRemove', item.id, this.name));
} else {
let update = {};
- update[item.id] = { hidden: !revert };
-
- if (!revert) {
- // NOTE(chris): move to last line
- update[item.id].place = [];
- let y = this.gridHeight;
- if (this.additionalRow)
- y--;
- update[item.id].place[this.gridWidth] = { x: 0, y };
- }
-
+ update[item.id] = { hidden: true };
this.updatePreset(update);
}
},
@@ -251,13 +239,12 @@ export default {
:loading="item.loading"
:config="item.config"
:custom="item.custom"
- :hidden="item.hidden"
:editMode="editModeIsActive"
:place="item.place[gridWidth]"
:widget-template="indexedWidgetsTemplates[item.widget]"
:source="adminMode ? null : item.source || 'custom'"
@change="saveConfig($event, item)"
- @remove="removeWidget(item, $event)"
+ @remove="removeWidget(item)"
@config-opened="handleConfigOpened"
@config-closed="handleConfigClosed"
@pin-item="updatePositions"
diff --git a/public/js/components/Dashboard/Widget/Picker.js b/public/js/components/Dashboard/Widget/Picker.js
index 1d49533dd..7a74f44d9 100644
--- a/public/js/components/Dashboard/Widget/Picker.js
+++ b/public/js/components/Dashboard/Widget/Picker.js
@@ -7,7 +7,8 @@ export default {
WidgetIcon,
},
props: [
- "widgets"
+ "widgets",
+ "hiddenWidgets"
],
data: () => ({
callbacks: {}
@@ -16,6 +17,13 @@ export default {
// filter widgets away the user has no permissions for
availableWidgets() {
return (this.widgets || []).filter(widget => widget.permitted !== false);
+ },
+ hasAnyWidgets() {
+ if (!this.widgets)
+ return false;
+ if (!this.availableWidgets.length && !this.hiddenWidgets?.length)
+ return false;
+ return true;
}
},
methods: {
@@ -43,23 +51,47 @@ export default {
{{ $p.t('dashboard/createWidget') }}
-
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 0b846df9c..e1810fc78 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -1,11 +1,17 @@
import ApiDetailHeader from "../../api/factory/detailHeader.js";
import ApiHandleFoto from "../../api/factory/fotoHandling.js";
import ModalUploadFoto from "./Modal/UploadFoto.js";
+import PvSkeleton from "../../../../index.ci.php/public/js/components/primevue/skeleton/skeleton.esm.min.js";
+import CoreTag from "../Tag/Tag.js";
+import ApiTag from "../../api/factory/stv/tag.js";
+import { idTagFormatter } from "../Tag/tagFormatter.js";
export default {
name: 'DetailHeader',
components: {
- ModalUploadFoto
+ ModalUploadFoto,
+ PvSkeleton,
+ CoreTag
},
props: {
headerData: {
@@ -38,8 +44,26 @@ export default {
'mitarbeiter',
].includes(value)
}
+ },
+ currentSemester: {
+ type: String,
+ default: ''
+ },
+ isLoading: { //if true, then parent isLoading
+ type: Boolean,
+ default: false
}
},
+ inject: {
+ tagsEnabled: {
+ from: 'configStvTagsEnabled',
+ default: false
+ },
+ lists: {
+ from: 'lists',
+ required: true
+ },
+ },
computed: {
appRoot() {
return FHC_JS_DATA_STORAGE_OBJECT.app_root;
@@ -58,20 +82,36 @@ export default {
hasTileGammaSlot() {
return !!this.$slots.titleGammaTile
},
+ hasTileDeltaSlot() {
+ return !!this.$slots.titleDeltaTile
+ },
hasTileUIDSlot() {
return !!this.$slots.uid
},
-
+ prestudentIds() {
+ if (this.headerData[0].prestudent_id)
+ {
+ return [this.headerData[0].prestudent_id];
+ }
+ },
+ semesterDates(){
+ return this.lists.studiensemester?.find(item => item.studiensemester_kurzbz === this.currentSemester) || {};
+ }
},
created(){
if (this.typeHeader === 'student') {
if (!this.headerData) {
throw new Error('[DetailHeader] "headerData" is required.')
}
+
+ if(this.tagsEnabled) {
+ this.loadTagsAndRender(this.headerData[0].prestudent_id);
+ }
+
} else if (this.typeHeader === 'mitarbeiter') {
if (!this.person_id || !this.mitarbeiter_uid || !this.domain) {
throw new Error(
- '[DetailHeader] "person_id", "mitarbeiter_uid", and "domain" are requried.'
+ '[DetailHeader] "person_id", "mitarbeiter_uid", and "domain" are required.'
)
}
this.loadHeaderData(this.person_id, this.mitarbeiter_uid);
@@ -86,13 +126,34 @@ export default {
},
deep: true,
},
+ headerData: {
+ handler(newVal) {
+ if (this.typeHeader === 'student' && newVal?.length) {
+ this.getSemesterStati(newVal[0].prestudent_id);
+ }
+
+ if(this.tagsEnabled) {
+ this.loadTagsAndRender(this.headerData[0].prestudent_id);
+ }
+ },
+ deep: true,
+ immediate: true
+ },
},
data(){
return{
headerDataMa: {},
departmentData: {},
leitungData: {},
- isFetchingIssues: false
+ isFetchingIssues: false,
+ noCurrentStatus: false,
+ semesterStatiLoading: false,
+ leitungOrgLoading: false,
+ departmentDataLoading: false,
+ headerDataMaLoading: false,
+ tagEndpoint: ApiTag,
+ tagData: null,
+ rebuildData: null,
};
},
methods: {
@@ -108,29 +169,40 @@ export default {
});
},
getHeader(person_id) {
+ this.headerDataMaLoading = true;
return this.$api
.call(ApiDetailHeader.getHeader(person_id))
.then(result => {
this.headerDataMa = result.data;
-
})
- .catch(this.$fhcAlert.handleSystemError);
+ .catch(this.$fhcAlert.handleSystemError)
+ .finally(() => {
+ this.headerDataMaLoading = false;
+ });
},
loadDepartmentData(mitarbeiter_uid) {
+ this.departmentDataLoading = true;
return this.$api
.call(ApiDetailHeader.getPersonAbteilung(mitarbeiter_uid))
.then(result => {
this.departmentData = result.data;
})
- .catch(this.$fhcAlert.handleSystemError);
+ .catch(this.$fhcAlert.handleSystemError)
+ .finally(() => {
+ this.departmentDataLoading = false;
+ });
},
getLeitungOrg(oekurzbz){
+ this.leitungOrgLoading = true;
return this.$api
.call(ApiDetailHeader.getLeitungOrg(oekurzbz))
.then(result => {
this.leitungData = result.data;
})
- .catch(this.$fhcAlert.handleSystemError);
+ .catch(this.$fhcAlert.handleSystemError)
+ .finally(() => {
+ this.leitungOrgLoading = false;
+ });
},
async goToLeitung() {
this.loadHeaderData(this.leitungData.person_id, this.leitungData.uid);
@@ -179,7 +251,98 @@ export default {
} else {
return 'data:image/jpeg;base64,' + foto;
}
- }
+ },
+ getSemesterStati(prestudent_id){
+ this.semesterStatiLoading = true;
+ this.$api
+ .call(ApiDetailHeader.getSemesterStati(prestudent_id))
+ .then(result => {
+ this.semesterStati = result.data;
+ this.setNoCurrentStatus();
+ })
+ .catch(this.$fhcAlert.handleSystemError)
+ .finally(() => {
+ this.semesterStatiLoading = false;
+ });
+ },
+ setNoCurrentStatus() {
+ if(!Array.isArray(this.semesterStati))
+ {
+ this.noCurrentStatus = false;
+ }
+
+ if(!this.semesterStati.some(item => item.studiensemester_kurzbz === this.currentSemester)) {
+ this.noCurrentStatus = true;
+ }
+ else
+ {
+ this.noCurrentStatus = false;
+ }
+ },
+ //methods tags
+ async loadTagsAndRender(prestudent_id) {
+ await this.getAllTags(prestudent_id);
+
+ const container = idTagFormatter(
+ prestudent_id,
+ this.tagData,
+ this.$refs.tagComponent,
+ 'prestudent_id',
+ this.semesterDates.start,
+ this.semesterDates.ende
+ );
+
+ if(this.headerData.length == 1) {
+ this.$refs.tagWrapper.innerHTML = '';
+ this.$refs.tagWrapper.appendChild(container);
+ }
+ },
+ getAllTags(prestudent_id){
+ return this.$api
+ .call(ApiTag.getAllTagsPrestudent({prestudent_id}))
+ .then(result => {
+ this.tagData = result.data.sort((a, b) => {
+ let adone = a.done ? 1 : 0;
+ let bdone = b.done ? 1 : 0;
+
+ if (adone !== bdone) {
+ return adone - bdone;
+ }
+ return a.prioritaet - b.prioritaet;
+ });
+ })
+ .catch(this.$fhcAlert.handleSystemError);
+ },
+ addedTag(addedTag)
+ {
+ this.reload();
+ },
+ deletedTag(id)
+ {
+ this.reload();
+ },
+ updatedTag(updatedTag)
+ {
+ this.reload();
+ },
+ rebuildPrestudentTags(){
+ const id = [this.headerData[0].prestudent_id];
+
+ const params = {
+ ids: id,
+ typeId: 'prestudent_id',
+ sem: this.currentSemester
+ };
+
+ return this.$api
+ .call(ApiTag.rebuildTagsforTypeId(params))
+ .then(result => {
+ this.rebuildData = result.data;
+ console.log("Rebuild manually triggered");
+ this.reload();
+ })
+ .catch(this.$fhcAlert.handleSystemError);
+ },
},
template: `
-
+
+
- {{ $p.t('dashboard/noWidgetsAvailable') }}
-
+
-
+
+
+
+
+
+
+
+
+
@@ -200,7 +363,6 @@ export default {
-
{{person.uid}}
-
-
- {{students[0].uid}}
- PersID
- {{tile_PersId}}
- MatrNr
- {{tile_MatrNr}}
- PersKz
- {{tile_PersKz}}
+ {{tile_UID}}
+ PrestdID
+ {{tile_PrestdId}}
+ PersID
+ {{tile_PersId}}
+ MatrNr
+ {{tile_MatrNr}}
+ PersKz
+ {{tile_PersKz}}
-
-
-
-
+
- {{headerData[0].titelpre}} - {{headerData[0].vorname}} - {{headerData[0].nachname}} - , - {{headerData[0].titelpost}} -
-unruly
+
+
+ {{$p.t('lehre', 'studiengang')}}
+
+ {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
+
+
+
-
-
+
+ + {{headerData[0].titelpre}} + {{headerData[0].vorname}} + {{headerData[0].nachname}} + , + {{headerData[0].titelpost}} +
+ +
+
-
+
+ {{currentSemester}}
+
- {{$p.t('lehre', 'studiengang')}} - {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}}) - | {{$p.t('lehre', 'semester')}} - {{headerData[0].semester}} - | {{$p.t('lehre', 'verband')}} - {{headerData[0].verband}} - | {{$p.t('lehre', 'gruppe')}} - {{headerData[0].gruppe}} -
+unruly
+
+
- unruly
+- Email - - {{headerData[0].mail_intern}} - - | Status - {{headerData[0].statusofsemester}} -
+
+ {{$p.t('lehre', 'studiengang')}}
+
+ {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
+
+
+
-
-
diff --git a/public/js/components/LVVerwaltung/Details/Gruppen.js b/public/js/components/LVVerwaltung/Details/Gruppen.js
index 024bf6468..5244136cc 100644
--- a/public/js/components/LVVerwaltung/Details/Gruppen.js
+++ b/public/js/components/LVVerwaltung/Details/Gruppen.js
@@ -2,6 +2,7 @@ import {CoreFilterCmpt} from "../../filter/Filter.js";
import FormForm from '../../Form/Form.js';
import FormInput from '../../Form/Input.js';
import ApiGruppe from "../../../api/lehrveranstaltung/gruppe.js";
+import drop from '../../../directives/drop.js';
export default{
name: "LVGruppen",
components: {
@@ -9,6 +10,9 @@ export default{
FormForm,
FormInput
},
+ directives: {
+ drop
+ },
props: {
lehreinheit_id: Number
},
@@ -187,28 +191,48 @@ export default{
this.reload();
})
},
+ onDropVerband(node, gruppe) {
+ this.$api.call(ApiGruppe.getGruppe(gruppe))
+ .then(result => result.data)
+ .then(result => {
+
+ let newData = {
+ 'gid': result,
+ 'lehreinheit_id': this.lehreinheit_id,
+ 'lehrverband': gruppe.lehrverband,
+ }
+ this.$api.call(ApiGruppe.add(newData))
+ .then(result => {
+ this.reload()
+ })
+ });
+
+ },
+
},
template: `
-
-
+ Email
+
+ {{headerData[0].mail_intern}}
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ UID
-
+ Email
+
+ {{headerData[0].mail_intern}}
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
UID
+
+
+
+
+
+
`
};
\ No newline at end of file
diff --git a/public/js/components/LVVerwaltung/LVVerwaltung.js b/public/js/components/LVVerwaltung/LVVerwaltung.js
index 42c50bdfa..6d9331d38 100644
--- a/public/js/components/LVVerwaltung/LVVerwaltung.js
+++ b/public/js/components/LVVerwaltung/LVVerwaltung.js
@@ -1,16 +1,18 @@
import CoreSearchbar from "../searchbar/searchbar.js";
import VerticalSplit from "../verticalsplit/verticalsplit.js";
+import HorizontalSplit from "../horizontalsplit/horizontalsplit.js";
import AppMenu from "../AppMenu.js";
-import StvVerband from "../Stv/Studentenverwaltung/Verband.js";
+import BaseTreemenu from '../Base/Treemenu.js';
import StvStudiensemester from "../Stv/Studentenverwaltung/Studiensemester.js";
import LvTable from "./Setup/Table.js";
import LvTabs from "./Setup/Tabs.js";
+import NavLanguage from "../navigation/Language.js";
import ApiDetails from "../../api/lehrveranstaltung/details.js";
import ApiLektor from "../../api/lehrveranstaltung/lektor.js";
-import ApiGruppe from "../../api/lehrveranstaltung/gruppe.js";
-import ApiStudiengangTree from "../../api/lehrveranstaltung/studiengangtree.js";
import ApiSearchbar from "../../api/factory/searchbar.js";
+import AppConfig from "../AppConfig.js";
+import ApiLvConfig from "../../api/lehrveranstaltung/config.js";
export default {
@@ -18,23 +20,23 @@ export default {
components: {
CoreSearchbar,
VerticalSplit,
+ HorizontalSplit,
AppMenu,
- StvVerband,
+ BaseTreemenu,
StvStudiensemester,
LvTable,
LvTabs,
+ AppConfig,
+ NavLanguage
},
props: {
+ avatarUrl: String,
+ logoutUrl: String,
defaultSemester: String,
lvRoot: String,
permissions: Object,
config: Object,
- stg: { type: String, required: false },
- semester: { type: [Number, String], required: false, default: null },
- studiensemester_kurzbz: { type: String, required: false, default: null },
- emp: { type: String, required: false, default: null }
},
-
provide() {
return {
currentSemester: Vue.computed(() => this.selectedStudiensemester),
@@ -44,46 +46,27 @@ export default {
lehreinheitAnmerkungDefault: (this.config.lehreinheitAnmerkungDefault || '').replace(/\\n/g, '\n'),
lehreinheitRaumtypDefault: this.config.lehreinheitRaumtypDefault,
lehreinheitRaumtypAlternativeDefault: this.config.lehreinheitRaumtypAlternativeDefault,
-
permissionLehrveranstaltung: this.permissions['lehre/lehrveranstaltung'],
permissionGruppenEntfernen: this.permissions['lv-plan/gruppenentfernen'],
permissionLektorEntfernen: this.permissions['lv-plan/lektorentfernen'],
- }
- },
- mounted() {
- this.updateFilter();
- },
- watch: {
- stg() {
- this.updateFilter();
- },
- semester() {
- this.updateFilter();
- },
- selectedStudiensemester() {
- this.updateFilter();
- },
- emp() {
- this.updateFilter();
- },
- studiensemester_kurzbz(newVal) {
- this.selectedStudiensemester = newVal ?? this.defaultSemester;
+ language: Vue.computed(() => this.$p.user_language),
+ isMobile: false,
}
},
data() {
return {
+ sidebarCollapsed: false,
+ appconfig:{},
+ configEndpoints: ApiLvConfig,
selected: [],
- studiengang: "",
- filter: {},
- selectedStudiensemester: this.studiensemester_kurzbz ?? this.defaultSemester,
- endpoint: ApiStudiengangTree,
+ studiengang_kz: null,
+ selectedStudiensemester: this.defaultSemester,
dropdowns: {
studiensemester_array: [],
sprachen_array: [],
lehrform_array: [],
raumtyp_array: [],
},
- selectedStudiengang: '',
searchbaroptions: {
origin: 'lvverwaltung',
cssclass: "position-relative",
@@ -107,28 +90,112 @@ export default {
},
}
},
+ computed: {
+ filter() {
+ let filter = {
+ emp: this.$route.params.emp,
+ studiensemester_kurzbz: this.selectedStudiensemester
+ };
+ let index;
+ if (this.$route.params.treemenu) {
+ index = this.$route.params.treemenu.indexOf('stg');
+ if (index > -1)
+ filter.stg = this.$route.params.treemenu[index+1];
+ index = this.$route.params.treemenu.indexOf('semester');
+ if (index > -1)
+ filter.semester = this.$route.params.treemenu[index+1];
+ }
+ filter.activeFilter = filter.emp ? 'employee' : filter.stg ? 'verband' : null;
+ return filter;
+ },
+ emp() {
+ return this.filter.emp;
+ },
+ stg() {
+ return this.filter.stg;
+ },
+ semester() {
+ return this.filter.semester;
+ },
+ appMenuExtraItems()
+ {
+ let extraItems = [];
+
+ const studiengang_kz = this.studiengang_kz || '';
+ const studiensemester = this.selectedStudiensemester;
+ const semester = this.semester || '';
+ const uid = this.emp || '';
+
+
+ extraItems.push(
+ {
+ description: 'lehre/berichte',
+ requires: ['studiengang_kz'],
+ children: [
+ {
+ link: FHC_JS_DATA_STORAGE_OBJECT.app_root
+ + 'content/statistik/lvplanung.xls.php'
+ + '?studiengang_kz=' + studiengang_kz
+ + '&studiensemester_kurzbz=' + studiensemester
+ + '&semester=' + semester,
+ description: 'lehre/lvplanung',
+ requires: ['studiengang_kz']
+ },
+ {
+ link: FHC_JS_DATA_STORAGE_OBJECT.app_root
+ + 'content/statistik/lehrauftragsliste_gst.xls.php'
+ + '?studiengang_kz=' + studiengang_kz
+ + '&studiensemester_kurzbz=' + studiensemester
+ + '&semester=' + semester,
+ description: 'lehre/lehrauftragsliste',
+ requires: ['studiengang_kz']
+ },
+ {
+ link: FHC_JS_DATA_STORAGE_OBJECT.app_root
+ + 'content/pdfExport.php?xml=lehrauftrag.xml.php'
+ + '&xsl=Lehrauftrag'
+ + '&stg_kz=' + studiengang_kz
+ + '&ss=' + studiensemester,
+ description: 'lehre/lehrauftraege',
+ requires: ['studiengang_kz']
+ },
+ {
+ link: FHC_JS_DATA_STORAGE_OBJECT.app_root
+ + 'content/pdfExport.php?xml=lehrauftrag.xml.php'
+ + '&xsl=Lehrauftrag'
+ + '&stg_kz=' + studiengang_kz
+ + '&ss=' + studiensemester
+ + '&uid=' + uid,
+ description: 'lehre/lehrauftragslisteemp',
+ requires: ['emp']
+ }
+ ]
+ },
+ {
+ link: FHC_JS_DATA_STORAGE_OBJECT.app_root
+ + 'vilesci/lehre/lehrveranstaltung.php'
+ + '?stg_kz=' + studiengang_kz,
+ description: 'lehre/extrakvverwaltung',
+ requires: ['studiengang_kz']
+ }
+ );
+
+ return extraItems;
+ }
+ },
+
+ watch: {
+ sidebarCollapsed(newVal) {
+ if(newVal)
+ this.$refs.hSplit.collapseLeft()
+ else
+ this.$refs.hSplit.showBoth()
+ }
+ },
methods: {
updateFilter()
{
- const filter = {
- stg: this.stg,
- emp: this.emp,
- semester: this.semester,
- studiensemester_kurzbz: this.selectedStudiensemester,
- activeFilter: this.emp ? 'employee' : this.stg ? 'verband' : null
- }
-
- if (this.stg !== undefined)
- {
- this.selectedStudiengang = this.semester !== '' && this.semester
- ? `${this.stg}/${this.semester}`
- : this.stg;
- }
- else
- {
- this.selectedStudiengang = '';
- }
- this.filter = filter;
+ // deprecated
},
handleRowClicked(data)
{
@@ -136,77 +203,107 @@ export default {
},
onSelectEmployee(emp)
{
- const { stg, semester } = this.filter;
-
- let studiensemester_kurzbz = this.selectedStudiensemester;
- const params = { emp };
-
- if (stg)
- params.stg = stg;
- if (semester !== null)
- params.semester = semester;
- if (studiensemester_kurzbz)
- params.studiensemester_kurzbz = studiensemester_kurzbz;
-
- this.$router.push({ name: 'byEmp', params })
+ this.$router.push({
+ name: 'emp',
+ params: {
+ ...this.$route.params,
+ emp
+ }
+ });
},
-
- onSelectVerband({link})
+ onSelectVerband({ path: link, stg_kz })
{
- let stg = null;
- let semester = null;
- let studiensemester_kurzbz = this.selectedStudiensemester;
-
- if (typeof link === 'number')
- stg = link;
- else if (typeof link === 'string')
- {
- [stg, semester] = link.split('/');
- }
-
- const routeName = this.filter.emp ? 'byEmp' : 'byStg';
- const params = { stg };
-
- params.semester = '';
- if (semester !== null)
- params.semester = semester;
- if (studiensemester_kurzbz)
- params.studiensemester_kurzbz = studiensemester_kurzbz;
- if (this.filter.emp)
- params.emp = this.filter.emp;
- this.$router.push({ name: routeName, params });
+ this.$router.push({
+ name: this.$route.name == 'emp' ? 'emp' : 'treemenu',
+ params: {
+ ...this.$route.params,
+ treemenu: link.split('/')
+ }
+ });
this.selected = [];
+ this.studiengang_kz = stg_kz;
},
resetEmployeeFilter()
{
- const newParams = { ...this.filter, activeFilter: 'verband' };
- if (newParams.stg === '')
- this.$router.replace({ name: 'index' });
- else
- {
- delete newParams.emp;
-
- this.$router.replace({ name: 'byStg', params: newParams });
- }
+ let params = { ...this.$route.params };
+
+ delete params.emp;
+
+ this.$router.replace({
+ name: params.treemenu ? 'treemenu' : 'stdsem',
+ params
+ });
},
resetStgFilter()
{
- const newParams = { ...this.filter, activeFilter: 'emp' };
- delete newParams.stg;
- this.selectedStudiengang = '';
- this.$router.replace({ name: 'byEmp', params: newParams });
+ let params = { ...this.$route.params };
+ let index = params.treemenu.indexOf('stg');
+ if (index > -1)
+ params.treemenu = params.treemenu.slice(0, index);
+ if (params.treemenu.length) {
+ this.$router.replace({
+ params: {
+ treemenu: params.treemenu
+ }
+ });
+ } else {
+ delete params.treemenu;
+ this.$router.replace({
+ name: params.emp ? 'emp' : 'stdsem',
+ params
+ });
+ }
},
- searchfunction(params) {
- return this.$api.call(ApiSearchbar.search(params));
+ searchfunction(params, config) {
+ return this.$api.call(ApiSearchbar.search(params), config);
},
- studiensemesterChanged(newValue) {
- const routeName = this.filter.activeFilter === 'employee' ? 'byEmp' : 'byStg';
- const newParams = {...this.filter, studiensemester_kurzbz: newValue};
- this.$router.push({ name: routeName, params: newParams });
+ studiensemesterChanged(stdsem) {
+ if (!stdsem) {
+ // no valid studiensemester in url
+ this.$router.replace({
+ params: {
+ stdsem: this.defaultSemester.toLowerCase()
+ }
+ });
+ return;
+ }
+ if (stdsem.toLowerCase() != this.selectedStudiensemester?.toLowerCase()) {
+ this.$router.push({
+ params: {
+ stdsem: stdsem.toLowerCase()
+ }
+ });
+ }
+ this.selectedStudiensemester = stdsem;
this.selected = [];
},
+ isDisabled(item)
+ {
+ if (!item?.requires?.length)
+ return false;
+
+ const values = {
+ studiengang_kz: this.studiengang_kz,
+ stg: this.stg,
+ emp: this.emp,
+ studiensemester: this.selectedStudiensemester,
+ semester: this.semester
+ };
+
+ return item.requires.some(req => !values[req]);
+
+ }
},
created() {
+ if (!this.$route.params.stdsem) {
+ this.$router.replace({
+ name: 'stdsem',
+ params: {
+ stdsem: this.defaultSemester.toLowerCase()
+ }
+ });
+ }
+
this.$p.loadCategory(['lehre', 'person', 'global'])
this.$api.call(ApiDetails.getStudiensemester())
@@ -239,9 +336,8 @@ export default {
})
.catch(this.$fhcAlert.handleSystemError);
},
-
template: /* html */`
-
+
-
-
-
-
-
- [{{ $p.t('lehre', 'lektor') }}: {{ filter.emp || '' }}
-
-
- | Stg: {{ filter.stg }}
-
-
- ]
-
+
+
+
+
+
+
+
+
+
+
+
+ [{{ $p.t('lehre', 'lektor') }}: {{ filter.emp || '' }}
+
+
+ | Stg: {{ filter.stg.toUpperCase() }}
+
+
+ ]
+
+
+
-
-
-
-
-
+
+ `
};
diff --git a/public/js/components/LVVerwaltung/Lektor/Daten.js b/public/js/components/LVVerwaltung/Lektor/Daten.js
index 21e5dc196..0263b236f 100644
--- a/public/js/components/LVVerwaltung/Lektor/Daten.js
+++ b/public/js/components/LVVerwaltung/Lektor/Daten.js
@@ -140,7 +140,7 @@ export default{
{
this.$emit('changedLektor', this.changed.mitarbeiter_uid);
}
- if (this.changed.semesterstunden || this.changed.stundensatz)
+ else if (this.changed.semesterstunden || this.changed.stundensatz)
{
this.$emit('changedCosts');
}
@@ -183,9 +183,6 @@ export default{
},
},
- created() {
- this.getLektorData()
- },
template: `
@@ -278,54 +419,99 @@ export default {
-
+
+
+
+ {{ $p.t(item.description) }}
+
+
+
+
+
+ {{ $p.t(item.description) }}
+
+
+
+
-
-
-
diff --git a/public/js/components/LVVerwaltung/Lektor/Table.js b/public/js/components/LVVerwaltung/Lektor/Table.js
index 85c39c25a..36934f389 100644
--- a/public/js/components/LVVerwaltung/Lektor/Table.js
+++ b/public/js/components/LVVerwaltung/Lektor/Table.js
@@ -49,6 +49,52 @@ export default{
{title: this.$p.t('person', 'nachname'), field:"nachname"},
{title: this.$p.t('person', 'vorname'), field:"vorname"},
{title: this.$p.t('person', 'uid'), field:"mitarbeiter_uid"},
+ {title: this.$p.t('global/insertvon'), field: 'insertvon', visible: false},
+ {
+ title: this.$p.t('global/insertamum'),
+ field: "insertamum",
+ visible: false,
+ formatter: function (cell) {
+ const dateStr = cell.getValue();
+
+ if (!dateStr) return "";
+
+ const date = new Date(dateStr);
+
+ return date.toLocaleString("de-DE", {
+ day: "2-digit",
+ month: "2-digit",
+ year: "numeric",
+ hour: "2-digit",
+ minute: "2-digit",
+ second: "2-digit",
+ hour12: false
+ });
+ }
+ },
+ {title: this.$p.t('global/updatevon'), field: 'updatevon', visible: false},
+ {
+ title: this.$p.t('global/updateamum'),
+ field: "updateamum",
+ visible: false,
+ formatter: function (cell) {
+ const dateStr = cell.getValue();
+
+ if (!dateStr) return "";
+
+ const date = new Date(dateStr);
+
+ return date.toLocaleString("de-DE", {
+ day: "2-digit",
+ month: "2-digit",
+ year: "numeric",
+ hour: "2-digit",
+ minute: "2-digit",
+ second: "2-digit",
+ hour12: false
+ });
+ }
+ },
{title: this.$p.t('lehre', 'lehreinheit_id'), field:"lehreinheit_id"},
{
title: this.$p.t('lehre', 'verplant'),
@@ -102,7 +148,7 @@ export default{
selectable: true,
selectableRangeMode: 'click',
selectableRows:1,
- persistenceID: 'lehrveranstaltungen_lektor_table_2025_05_27_v1',
+ persistenceID: 'lehrveranstaltungen_lektor_table_2026_09_11_v1',
}},
},
mounted(){
diff --git a/public/js/components/LVVerwaltung/Setup/Table.js b/public/js/components/LVVerwaltung/Setup/Table.js
index 67c63c3bb..79a5eec98 100644
--- a/public/js/components/LVVerwaltung/Setup/Table.js
+++ b/public/js/components/LVVerwaltung/Setup/Table.js
@@ -2,14 +2,25 @@ import {CoreFilterCmpt} from "../../filter/Filter.js";
import BsModal from "../../Bootstrap/Modal.js";
import DetailsForm from "../Details/Form.js";
import CoreTag from '../../Tag/Tag.js';
-import { tagHeaderFilter } from '../../../../js/tabulator/filters/extendedHeaderFilter.js';
-import { extendedHeaderFilter } from "../../../../js/tabulator/filters/extendedHeaderFilter.js";
+import {
+ buildTagHeaderFilterExpression,
+ buildTagOptionsFromRows,
+ customTagFilter,
+ setTagHeaderFilterValue,
+ tagHeaderFilter,
+ extendedHeaderFilter,
+ syncTagHeaderFilterOptions,
+ syncSelectedTagOptionsWithHeaderFilters
+} from "../../../../js/tabulator/filters/extendedHeaderFilter.js";
import { tagFormatter } from "../../../../js/tabulator/formatter/tags.js";
import { addTagInTable, deleteTagInTable, updateTagInTable } from "../../../../js/helpers/TagHelper.js";
import ApiLv from "../../../api/lehrveranstaltung.js";
import ApiTag from "../../../api/lehrveranstaltung/tag.js";
import ApiLehreinheit from "../../../api/lehrveranstaltung/lehreinheit.js";
+import ApiTreemenu from "../../../api/factory/treemenu.js";
+
+import LvvColumns from '../../../../../index.ci.php/js/tabulatorcolumns/lvverwaltung';
export default {
name: "LVVerwaltungTable",
@@ -54,6 +65,7 @@ export default {
if (this.$refs.table && this.$refs.table.tabulator)
{
this.expanded = [];
+ this.currentTreeLevel = 0;
this.reload();
}
},
@@ -65,7 +77,20 @@ export default {
this.lv_info_default.studiensemester_kurzbz = newVal
this.lv_info = false;
}
- }
+ },
+ "tagFilterState.selectedOptions": {
+ handler() {
+ const selectedOptions = this.tagFilterState.selectedOptions;
+ const combinedFilterStatement =
+ buildTagHeaderFilterExpression(selectedOptions);
+
+ setTagHeaderFilterValue(
+ combinedFilterStatement,
+ this.$refs.table.tabulator
+ );
+ },
+ deep: true,
+ },
},
data() {
return {
@@ -96,8 +121,37 @@ export default {
handler: (data) => {
this.getExpandedRows()
}
- }
+ },
+ {
+ event: "dataLoaded",
+ handler: (data) => {
+ syncTagHeaderFilterOptions(
+ Array.isArray(data) ? data : [],
+ this.tagFilterState.initialOptions,
+ this.tagFilterState.selectedOptions,
+ );
+ },
+ },
+ {
+ event: "dataFiltered",
+ handler: (filters, rows) => {
+ syncSelectedTagOptionsWithHeaderFilters(
+ filters,
+ this.tagFilterState.selectedOptions,
+ this.tagsEnabled,
+ );
+ },
+ },
+ {
+ event: "columnWidth",
+ handler: (column) => {
+ if (column.getField() !== "tags") return;
+ column.getCells().forEach((cell) => {
+ cell.getElement().firstElementChild?.fitTags?.();
+ });
+ },
+ },
],
formData: {},
lv_info: false,
@@ -111,7 +165,20 @@ export default {
raumtypalternativ: this.lehreinheitRaumtypAlternativeDefault,
lehrfach_id: ''
- }
+ },
+ tagFilterState: {
+ initialOptions: [],
+ selectedOptions: [],
+ },
+ tagFilterLabels: {
+ tag: "Tag",
+ clear: "Clear",
+ connectors: {
+ AND: "AND",
+ OR: "OR",
+ NOT: "NOT",
+ },
+ },
}
},
computed: {
@@ -122,7 +189,7 @@ export default {
ajaxRequestFunc: async (url, config, params) => {
let realUrl = this.buildApiUrl();
if (realUrl)
- return this.$api.call(ApiLv.getTable(this.buildApiUrl()));
+ return this.$api.call(this.buildApiUrl());
},
ajaxResponse: (url, params, response) => { return response?.data || [] },
dataTree: true,
@@ -140,7 +207,16 @@ export default {
headerFilterFunc: extendedHeaderFilter,
},
layout: 'fitDataStretch',
- persistenceID: 'lehrveranstaltungen_2025_07_31_v1',
+ height: '100%',
+ persistenceID: 'lehrveranstaltungen_2026_07_15_v1',
+ persistence: {
+ sort: true,
+ columns: ["width", "visible"],
+ filter: false,
+ headerFilter: false,
+ group: false,
+ page: false,
+ },
selectableRowsRangeMode: 'click',
selectableRows: true,
rowContextMenu: (component, e) => {
@@ -190,91 +266,35 @@ export default {
];
},
- columns: [
- {
- title: this.$p.t('lehre', 'kurzbz'),
- field: "lv_kurzbz",
- headerFilterFuncParams: {field: 'lv_kurzbz'},
- headerFilter: true,
- formatter: (cell, formatterParams) => {
- const rowData = cell.getRow().getData();
- const iconKey = (rowData.lehrtyp_kurzbz || '').toLowerCase();
- const lvkurzbz = (cell.getValue()).toUpperCase();
-
- const parentspan = document.createElement('span');
- const span = document.createElement('span');
-
-
- span.classList.add('lv_table_icon', `icon-${iconKey}`);
- span.title = iconKey || 'LV-Teil';
-
- parentspan.appendChild(span);
- parentspan.appendChild(document.createTextNode(` ${lvkurzbz}`));
-
- return parentspan
- },
-
- cellClick: (e, cell) => {
- cell.getRow().treeToggle();
- }
- },
- {
- title: 'Tags',
- field: 'tags',
- tooltip: false,
- headerFilter: "input",
- headerFilterFunc: tagHeaderFilter,
- headerFilterFuncParams: {field: 'tags'},
- formatter: (cell) => tagFormatter(cell, this.$refs.tagComponent),
- width: 150,
- },
- {
- title: this.$p.t('lehre', 'lehrveranstaltung_id'),
- field: "lehrveranstaltung_id",
- headerFilterFuncParams: {field: 'lehrveranstaltung_id'},
- headerFilter: true,
- visible: false
- },
- {title: this.$p.t('ui', 'bezeichnung'), field: "lv_bezeichnung", headerFilter: true, headerFilterFuncParams: {field: 'lv_bezeichnung'}},
- {title: this.$p.t('lehre', 'bezeichnungeng'), field: "lv_bezeichnung_english", headerFilter: true, headerFilterFuncParams: {field: 'lv_bezeichnung_english'}, visible: false},
- {
- title: this.$p.t('lehre', 'studiengangskennzahlLehre'),
- field: "lv_studiengang_kz",
- headerFilter: true,
- headerFilterFuncParams: {field: 'lv_studiengang_kz'},
- visible: false
- },
- {title: this.$p.t('lehre', 'studiengang'), field: "studiengang", headerFilter: true, headerFilterFuncParams: {field: 'studiengang'}, visible: false},
- {title: this.$p.t('lehre', 'semester'), field: "semester", headerFilter: true, headerFilterFuncParams: {field: 'semester'}},
- {title: this.$p.t('global', 'sprache'), field: "sprache", headerFilter: true, headerFilterFuncParams: {field: 'sprache'}, visible: false},
- {title: this.$p.t('lehre', 'ects'), field: "lv_ects", headerFilter: true, headerFilterFuncParams: {field: 'lv_ects'}, visible: false},
- {title: this.$p.t('lehre', 'semesterstunden'), field: "semesterstunden", headerFilter: true, headerFilterFuncParams: {field: 'semesterstunden'}, visible: false},
- {title: this.$p.t('global', 'anmerkung'), field: "anmerkung", headerFilter: true, headerFilterFuncParams: {field: 'anmerkung'}, visible: false},
- {title: this.$p.t('lehre', 'lehre'), field: "lehre", headerFilter: true, headerFilterFuncParams: {field: 'lehre'}, formatter: (cell) => cell.getValue() ? this.toUpperCase(this.$p.t('ui', 'ja')) : this.toUpperCase(this.$p.t('ui', 'nein')), visible: false},
- {title: this.$p.t('person', 'aktiv'), field: "aktiv", headerFilter: true, headerFilterFuncParams: {field: 'aktiv'}, formatter: (cell) => cell.getValue() ? this.toUpperCase(this.$p.t('ui', 'ja')) : this.toUpperCase(this.$p.t('ui', 'nein')), visible: false},
- {title: this.$p.t('lehre', 'organisationsform'), field: "orgform_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'orgform_kurzbz'}},
- {title: this.$p.t('ui', 'studienplan_id'), field: "studienplan_id", headerFilter: true, headerFilterFuncParams: {field: 'studienplan_id'}, visible: false},
- {title: this.$p.t('lehre', 'studienplan'), field: "studienplan_bezeichnung", headerFilter: true, headerFilterFuncParams: {field: 'studienplan_bezeichnung'}, visible: false},
- {title: this.$p.t('lehre', 'lehrtyp'), field: "lehrtyp_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'lehrtyp_kurzbz'}, visible: false},
- {title: this.$p.t('lehre', 'lehrform'), field: "lehrform_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'lehrform_kurzbz'}},
- {title: this.$p.t('lehre', 'leplanstunden'), field: "le_planstunden", headerFilter: true, headerFilterFuncParams: {field: 'le_planstunden'}, visible: false},
- {title: this.$p.t('lehre', 'lehreinheit_id'), field: "lehreinheit_id", headerFilter: true, headerFilterFuncParams: {field: 'lehreinheit_id'}, visible: false},
- {title: this.$p.t('lehre', 'studiensemester'), field: "studiensemester_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'studiensemester_kurzbz'}, visible: false},
- {title: this.$p.t('lehre', 'unr'), field: "unr", headerFilter: true, headerFilterFuncParams: {field: 'unr'}, visible: false},
- {title: this.$p.t('lehre', 'organisationseinheit'), field: "fachbereich", headerFilter: true, headerFilterFuncParams: {field: 'fachbereich'}, visible: false},
- {title: this.$p.t('lehre', 'stundenblockung'), field: "stundenblockung", headerFilter: true, headerFilterFuncParams: {field: 'stundenblockung'}, visible: false},
- {title: this.$p.t('lehre', 'wochenrhythmus'), field: "wochenrythmus", headerFilter: true, headerFilterFuncParams: {field: 'wochenrythmus'}, visible: false},
- {title: this.$p.t('lehre', 'startkw'), field: "start_kw", headerFilter: true, headerFilterFuncParams: {field: 'startkw'}, visible: false},
- {title: this.$p.t('lehre', 'raumtyp'), field: "raumtyp", headerFilter: true, headerFilterFuncParams: {field: 'raumtyp'}, visible: false},
- {title: this.$p.t('lehre', 'raumtypalternativ'), field: "raumtypalternativ", headerFilter: true, headerFilterFuncParams: {field: 'raumtypalternativ'}, visible: false},
- {title: this.$p.t('lehre', 'gruppen'), field: "gruppen", headerFilter: true, headerFilterFuncParams: {field: 'gruppen'}},
- {title: this.$p.t('lehre', 'lehrende'), field: "lektoren", headerFilter: true, headerFilterFuncParams: {field: ['lektoren', 'vorname', 'nachname']}},
- ],
+ columns: LvvColumns,
+ locale: true
}
}
},
-
+ created() {
+ Tabulator.extendModule("format", "formatters", {
+ tagHeaderFilter,
+ tagFormatter: (cell, params, onRendered) => tagFormatter(cell, this.$refs.tagComponent, onRendered),
+ ja_nein: cell => cell.getValue()
+ ? this.toUpperCase(this.$p.t('ui', 'ja'))
+ : this.toUpperCase(this.$p.t('ui', 'nein'))
+ });
+ LvvColumns.forEach(col => {
+ if (col.headerFilter == 'input' && col.headerFilterFunc == 'tagHeaderFilter') {
+ col.headerFilter = customTagFilter;
+ col.headerFilterParams = {
+ listOnEmpty: true,
+ autocomplete: true,
+ sort: "asc",
+ initialOptions: this.tagFilterState.initialOptions,
+ selectedOptions: this.tagFilterState.selectedOptions,
+ labels: this.tagFilterLabels,
+ };
+ col.headerSort = false;
+ }
+ });
+ },
mounted() {
if (this.shouldAutoLoad())
{
@@ -295,7 +315,8 @@ export default {
if (this.shouldAutoLoad)
{
- this.$refs.table.reloadTable();
+ if (this.$refs.table.tabulator)
+ this.$refs.table.reloadTable();
}
},
rowSelectionChanged(data) {
@@ -304,14 +325,13 @@ export default {
if (data[0]?.lehreinheit_id !== undefined && this.selectedColumnValues.length === 1)
{
- this.$emit('update:selected', [data[0]]);
this.lv_info = false
}
else if (data[0]?.lehrveranstaltung_id)
{
- this.$emit('update:selected', {});
this.getLVInfos(data[0]);
}
+ this.$emit('update:selected', data);
},
getLVInfos(data)
{
@@ -335,17 +355,20 @@ export default {
},
buildApiUrl()
{
- if (this.filter.activeFilter === 'employee' && this.filter.emp)
- {
- const { emp, stg, studiensemester_kurzbz } = this.filter;
- return this.$api.getUri(ApiLv.getByEmp(studiensemester_kurzbz, emp, stg));
+ if (!['emp', 'treemenu'].includes(this.$route.name))
+ return null;
+
+ let url = 'stdsem/' + this.$route.params.stdsem;
+
+ if (this.$route.params.emp) {
+ url += '/emp/' + this.$route.params.emp;
}
- if (this.filter.activeFilter === 'verband' && this.filter.stg)
- {
- const { stg, semester, studiensemester_kurzbz } = this.filter;
- return this.$api.getUri(ApiLv.getByStg(studiensemester_kurzbz, stg, semester));
+ if (this.$route.params.treemenu) {
+ url += '/' + this.$route.params.treemenu.join('/');
}
+
+ return ApiTreemenu.data('lvverwaltung', url);
},
resetEmployeeFilter()
{
@@ -381,16 +404,31 @@ export default {
},
addedTag(addedTag)
{
- addTagInTable(addedTag, this.allRows, 'lehreinheit_id')
+ addTagInTable(addedTag, this.allRows, 'lehreinheit_id');
+ syncTagHeaderFilterOptions(
+ this.$refs.table?.tabulator?.getData() || [],
+ this.tagFilterState.initialOptions,
+ this.tagFilterState.selectedOptions,
+ );
},
deletedTag(deletedTag)
{
deleteTagInTable(deletedTag, this.allRows);
+ syncTagHeaderFilterOptions(
+ this.$refs.table?.tabulator?.getData() || [],
+ this.tagFilterState.initialOptions,
+ this.tagFilterState.selectedOptions,
+ );
},
updatedTag(updatedTag)
{
updateTagInTable(updatedTag, this.allRows);
+ syncTagHeaderFilterOptions(
+ this.$refs.table?.tabulator?.getData() || [],
+ this.tagFilterState.initialOptions,
+ this.tagFilterState.selectedOptions,
+ );
},
async copyLehreinheit(row, art)
{
@@ -518,47 +556,50 @@ export default {
},
},
template: `
-
-
-
-
-
-
-
-
-
-
+
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 66ff7f891..b9ee54526 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -18,6 +18,7 @@
import CoreSearchbar from "../searchbar/searchbar.js";
import NavLanguage from "../navigation/Language.js";
import VerticalSplit from "../verticalsplit/verticalsplit.js";
+import HorizontalSplit from "../horizontalsplit/horizontalsplit.js";
import AppMenu from "../AppMenu.js";
import AppConfig from "../AppConfig.js";
import StvVerband from "./Studentenverwaltung/Verband.js";
@@ -26,8 +27,8 @@ import StvDetails from "./Studentenverwaltung/Details.js";
import StvStudiensemester from "./Studentenverwaltung/Studiensemester.js";
import ApiSearchbar from "../../api/factory/searchbar.js";
+import ApiTreemenu from "../../api/factory/treemenu.js";
import ApiStv from "../../api/factory/stv.js";
-import ApiStvVerband from '../../api/factory/stv/verband.js';
import ApiStvConfig from '../../api/factory/stv/config.js';
@@ -37,6 +38,7 @@ export default {
CoreSearchbar,
NavLanguage,
VerticalSplit,
+ HorizontalSplit,
AppMenu,
AppConfig,
StvVerband,
@@ -53,11 +55,7 @@ export default {
avatarUrl: String,
logoutUrl: String,
activeAddons: String, // semicolon separated list of active addons
- url_studiensemester_kurzbz: String,
- url_mode: String,
- url_prestudent_id: String,
- url_tab: String,
- url_studiengang: String
+ authUid: String
},
provide() {
return {
@@ -91,7 +89,9 @@ export default {
hasZGVMasterPermission: this.permissions['student/editMakkZgv'],
hasZGVDoctorPermission: this.permissions['student/editDokZgv'],
hasBismeldenPermission: this.permissions['student/editBismelden'],
-
+ authUid: this.authUid,
+ language: Vue.computed(() => this.$p.user_language),
+ isMobile: false,
}
},
data() {
@@ -140,7 +140,6 @@ export default {
mergeResults: 'person'
},
studiengangKz: undefined,
- studiengangKuerzel: '',
studiensemesterKurzbz: this.defaultSemester,
selected_semester: undefined,
selected_orgform: undefined,
@@ -149,7 +148,6 @@ export default {
sprachen: [],
geschlechter: []
},
- verbandEndpoint: ApiStvVerband,
filter: []
}
},
@@ -192,34 +190,111 @@ export default {
}
return extraItems;
+ },
+ appMenuLvPlanungItems() {
+ const extraItems = [];
+
+ if (this.studiengangKz !== undefined && this.selected_semester !== undefined) {
+ const studiengang_kz = String(this.studiengangKz);
+ const semester = String(this.selected_semester);
+ const orgform = this.selected_orgform || '';
+
+ extraItems.push({
+ link: FHC_JS_DATA_STORAGE_OBJECT.app_root
+ + 'content/statistik/lvplanung.xls.php?'
+ + '&studiengang_kz=' + studiengang_kz
+ + '&semester=' + semester
+ + '&studiensemester_kurzbz=' + this.studiensemesterKurzbz
+ + '&orgform_kurzbz=' + orgform,
+ description: 'stv/lvplanung_xls'
+ });
+ extraItems.push({
+ link: FHC_JS_DATA_STORAGE_OBJECT.app_root
+ + 'content/statistik/lvplanung.php?'
+ + '&studiengang_kz=' + studiengang_kz
+ + '&semester=' + semester,
+ description: 'stv/lvplanung_html'
+ });
+ }
+
+ return extraItems;
+ },
+ appMenuBisItems() {
+ const extraItems = [];
+
+ if (this.studiengangKz !== undefined) {
+ const studiengang_kz = String(this.studiengangKz);
+
+ extraItems.push({
+ link: FHC_JS_DATA_STORAGE_OBJECT.app_root
+ + 'vilesci/bis/studentenmeldung.php?'
+ + 'stg_kz=' + studiengang_kz,
+ description: 'stv/bis_stud_meldung'
+ });
+ extraItems.push({
+ link: FHC_JS_DATA_STORAGE_OBJECT.app_root
+ + 'system/checkStudenten.php?'
+ + 'stg_kz=' + studiengang_kz,
+ description: 'stv/bis_stud_plausicheck'
+ });
+ }
+
+ return extraItems;
+ },
+ linkRt(){
+ return FHC_JS_DATA_STORAGE_OBJECT.app_root + '/vilesci/stammdaten/reihungstestverwaltung.php'
+ },
+ selected_uid(){
+ return this.selected?.[this.selected.length - 1]?.uid ?? null;
+ },
+ linkGradeList(){
+ return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/person/gradelist/index/' + this.selected_uid
+ },
+ listEndpoint() {
+ if (['index', 'stdsem'].includes(this.$route.name))
+ return null;
+
+ if (this.$route.params.query) {
+ return ApiStv.students.search({
+ searchstr: this.$route.params.query,
+ types: this.$route.params.types?.split('+') || []
+ }, this.$route.params.stdsem);
+ }
+
+ let url = 'stdsem/' + this.$route.params.stdsem + '/';
+
+ if (this.$route.params.treemenu) {
+ url += this.$route.params.treemenu.join('/');
+ return ApiTreemenu.data('stv', url);
+ }
+
+ const paramName = Object.keys(this.$route.params).find(k => k != 'stdsem');
+ if (paramName) {
+ url += this.$route.name + '/' + this.$route.params[paramName];
+ return ApiTreemenu.data('stv', url);
+ }
+
+ return null;
+ },
+ studiengangKuerzel() {
+ if (!this.lists?.stgs)
+ return '';
+
+ const stg = this.lists.stgs
+ .find(stg => stg.studiengang_kz == this.studiengangKz);
+
+ if (stg)
+ return (stg.typ + stg.kurzbz).toUpperCase();
+
+ return '';
}
},
watch: {
- 'url_studiensemester_kurzbz': function (newVal, oldVal) {
- if (newVal !== oldVal) {
- this.studiensemesterKurzbz = newVal;
- if(this.$route.name === 'search')
- {
- this.handleSearchUrl();
- }
- else
- {
- this.$refs.stvList.updateUrl();
- this.$refs.details.reload();
- }
+ listEndpoint(n, o) {
+ if (n != o) {
+ this.$refs.stvList.updateUrl(n || []);
}
},
- 'url_studiengang': function (newVal, oldVal) {
- if (newVal !== oldVal) {
- this.checkUrlStudiengang();
- }
- },
- 'url_mode': function () {
- this.handlePersonUrl();
- },
- url_prestudent_id() {
- this.handlePersonUrl();
- },
'appconfig.font_size'() {
// add to html class
const classList = Object.keys(this.$refs.config.setup.font_size.options);
@@ -235,6 +310,15 @@ export default {
}
}
}
+ },
+ sidebarCollapsed(newVal) {
+ if(newVal) this.$refs.hSplit.collapseLeft()
+ else this.$refs.hSplit.showBoth()
+ },
+ studiengangKz(newVal, oldVal) {
+ if (newVal !== oldVal) {
+ this.$refs.stvList.clearSelection();
+ }
}
},
methods: {
@@ -272,177 +356,99 @@ export default {
);
},
onSelectVerband({ link, studiengang_kz, semester, orgform_kurzbz }) {
- let urlpath = String(link);
- if (!urlpath.match(/\/prestudent/))
- {
- urlpath = 'CURRENT_SEMESTER' + '/' + urlpath;
- }
- this.$refs.stvList.updateUrl(ApiStv.students.verband(urlpath));
-
this.studiengangKz = studiengang_kz;
this.selected_semester = semester;
this.selected_orgform = orgform_kurzbz;
- const stg = this.lists.stgs.find((element) => {
- return (element.studiengang_kz === this.studiengangKz);
- });
- if (stg)
- {
- this.studiengangKuerzel = (stg.typ + stg.kurzbz).toUpperCase()
- this.$router.push({
- name: 'studiengang',
- params: {
- studiensemester_kurzbz: this.studiensemesterKurzbz,
- studiengang: this.studiengangKuerzel
- }
- });
- } else
- {
- this.studiengangKuerzel = '';
- this.$router.push({
- name: 'studiensemester',
- params: {
- studiensemester_kurzbz: this.studiensemesterKurzbz
- }
- });
- }
- },
- studiensemesterChanged(v) {
- this.studiensemesterKurzbz = v;
this.$router.push({
+ name: 'treemenu',
params: {
- studiensemester_kurzbz: v
+ treemenu: link.split('/')
}
});
},
+ studiensemesterChanged(stdsem) {
+ if (!stdsem) {
+ // no valid studiensemester in url
+ this.$router.replace({
+ params: {
+ stdsem: this.defaultSemester.toLowerCase()
+ }
+ });
+ return;
+ }
+ if (stdsem.toLowerCase() != this.studiensemesterKurzbz?.toLowerCase()) {
+ this.$router.push({
+ params: {
+ stdsem: stdsem.toLowerCase()
+ }
+ });
+ }
+ this.studiensemesterKurzbz = stdsem;
+ },
reloadList() {
this.$refs.stvList.reload();
},
searchfunction(params, config) {
return this.$api.call(ApiSearchbar.searchStv(params), config);
},
- handlePersonUrl() {
- if (this.$route.params.id) {
- this.$refs.stvList.updateUrl(
- ApiStv.students.uid(this.$route.params.id, 'CURRENT_SEMESTER'),
- true
- );
- } else if (this.$route.params.prestudent_id) {
- this.$refs.stvList.updateUrl(
- ApiStv.students.prestudent(this.$route.params.prestudent_id, 'CURRENT_SEMESTER'),
- true
- );
- } else if (this.$route.params.person_id) {
- this.$refs.stvList.updateUrl(
- ApiStv.students.person(this.$route.params.person_id, 'CURRENT_SEMESTER'),
- true
- );
- } else if (this.$route.params.searchstr) {
- this.handleSearchUrl();
- }
- else
- {
- this.clearTabulator();
- }
- },
- handleSearchUrl() {
- const searchsettings = {
- searchstr: this.$route.params.searchstr,
- types: this.$route.params.types?.split('+') || []
- };
-
- // init into student list
- this.$refs.stvList.updateUrl(
- ApiStv.students.search(searchsettings, this.studiensemesterKurzbz)
- );
-
- // init into searchbar
- this.$refs.searchbar.searchsettings.searchstr = searchsettings.searchstr;
- this.$refs.searchbar.searchsettings.types = searchsettings.types;
- this.$nextTick(this.blurSearchbar);
- },
- clearTabulator() {
- if(['index', 'studiensemester'].includes(this.$route.name))
- {
- if(this.$refs?.stvList?.$refs?.table?.tabulator)
- {
- this.$refs.stvList.$refs.table.tabulator.setData([]);
- }
- }
- },
- checkUrlStudiengang() {
- if (this.url_studiengang) {
- const stg = this.lists.stgs.find((element) => {
- const kuerzel = (element.typ + element.kurzbz).toUpperCase();
- return (this.url_studiengang === kuerzel);
- });
- if (stg) {
- this.studiengangKz = stg.studiengang_kz;
- this.studiengangKuerzel = (stg.typ + stg.kurzbz).toUpperCase();
- } else {
- this.$router.replace({
- name: 'studiensemester',
- params: {
- studiensemester_kurzbz: this.studiensemesterKurzbz
- }
- });
- }
- }
- else
- {
- this.studiengangKz = undefined;
- this.studiengangKuerzel = '';
- this.clearTabulator();
- }
- },
onSearch(e) {
- this.deleteCustomFilter();
const searchsettings = { ...this.$refs.searchbar.searchsettings };
+
if (searchsettings.searchstr.length >= 2) {
- this.blurSearchbar();
+ this.deleteCustomFilter();
if (!searchsettings.types.length || searchsettings.types.length == this.$refs.searchbar.types.length) {
this.$router.push({
name: 'search',
params: {
- studiensemester_kurzbz: this.studiensemesterKurzbz,
- searchstr: searchsettings.searchstr
+ query: searchsettings.searchstr
}
});
} else {
this.$router.push({
- name: 'search_w_types',
+ name: 'searchtypes',
params: {
- studiensemester_kurzbz: this.studiensemesterKurzbz,
- searchstr: searchsettings.searchstr,
+ query: searchsettings.searchstr,
types: searchsettings.types.join('+')
}
});
}
}
},
- blurSearchbar() {
- this.$refs.searchbar.$refs.input.blur();
- this.$refs.searchbar.abort();
- this.$refs.searchbar.hideresult();
- },
handleCustomFilter(filter){
this.filter = filter;
},
deleteCustomFilter(){
this.$refs.stvList.resetFilter();
+ },
+ showAlertNoSelectedStudent(){
+ this.$fhcAlert.alertError(this.$p.t('ui', 'alert_chooseStudent'));
+ },
+ showAlertMultipleStudents() {
+ this.$fhcAlert.alertError(this.$p.t('ui', 'alert_chooseOnlyOneStudent'));
+ },
+ showAlertNoGroupChosen(){
+ this.$fhcAlert.alertError(this.$p.t('ui', 'alert_chooseGroupSem'));
+ },
+ showAlertNoDegreeProgramChosen(){
+ this.$fhcAlert.alertError(this.$p.t('ui', 'alert_chooseDegreeProgram'));
+ },
+ showMenu(refName) {
+ bootstrap.Dropdown.getOrCreateInstance(this.$refs[refName]).show();
+ },
+ hideMenu(refName) {
+ bootstrap.Dropdown.getOrCreateInstance(this.$refs[refName]).hide();
}
},
created() {
- if (!this.url_studiensemester_kurzbz) {
+ if (!this.$route.params.stdsem) {
this.$router.replace({
- name: 'studiensemester',
+ name: 'stdsem',
params: {
- studiensemester_kurzbz: this.defaultSemester
+ stdsem: this.defaultSemester.toLowerCase()
}
});
- } else {
- this.studiensemesterKurzbz = this.url_studiensemester_kurzbz;
}
this.$api
@@ -478,7 +484,6 @@ export default {
.then(result => {
this.lists.stgs = result.data;
this.lists.active_stgs = this.lists.stgs.filter(stg => stg.aktiv);
- this.checkUrlStudiengang();
})
.catch(this.$fhcAlert.handleSystemError);
@@ -505,7 +510,8 @@ export default {
.catch(this.$fhcAlert.handleSystemError);
},
mounted() {
- this.handlePersonUrl();
+ if (this.listEndpoint)
+ this.$refs.stvList.updateUrl(this.listEndpoint);
},
template: /* html */`
-
+
{{ $p.t('stv/grade_report') }}
-
+
+
+ {{ $p.t('stv/lvplanung') }}
+
+
+ {{ $p.t('stv/lvplanung') }}
+
+
+
+
+
+ {{ $p.t('stv/RTVerwaltung') }}
+
+
+
+
+ {{ $p.t('stv/studienverlauf') }}
+
+
+ {{ $p.t('stv/studienverlauf') }}
+
+
+ {{ $p.t('stv/studienverlauf') }}
+
+
+
+
+
+ {{ $p.t('stv/bis_stud') }}
+
+
+ {{ $p.t('stv/bis_stud') }}
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{$p.t('lehre', 'newlehreinheit')}}
- - - -
+
+
+
+
`
-};
\ No newline at end of file
+};
diff --git a/public/js/components/LVVerwaltung/Setup/Tabs.js b/public/js/components/LVVerwaltung/Setup/Tabs.js
index c8101846c..5425b5169 100644
--- a/public/js/components/LVVerwaltung/Setup/Tabs.js
+++ b/public/js/components/LVVerwaltung/Setup/Tabs.js
@@ -8,6 +8,7 @@ export default {
},
data() {
return {
+ configLETabs: {},
configLVTabs: {},
};
},
@@ -19,7 +20,7 @@ export default {
if (!this.lv || !this.lv.length)
return {};
- return this.configLVTabs;
+ return this.configLETabs;
}
},
methods: {
@@ -31,26 +32,42 @@ export default {
}
},
created() {
- this.$api.call(Setup.getTabs())
+ this.$api.call(Setup.getLETabs())
+ .then(result => {
+ this.configLETabs = result.data;
+ })
+ .catch(this.$fhcAlert.handleSystemError);
+
+ this.$api.call(Setup.getLVTabs())
.then(result => {
this.configLVTabs = result.data;
})
.catch(this.$fhcAlert.handleSystemError);
-
},
template: `
+
+
+
+
+
+
+
+ {{$p.t('lehre', 'newlehreinheit')}}
+ + + +
Bitte eine Lehreinheit auswählen!
-
+
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index 00b4e92a8..6a0dfa222 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -55,6 +55,7 @@ export default {
previewBody: "",
replyData: null,
messageSent: false,
+ isSending: false
}
},
methods: {
@@ -104,16 +105,21 @@ export default {
data.append('data', JSON.stringify(this.formData));
data.append('ids', JSON.stringify(this.id));
+ //for disabling sendButton and show Spinner
+ this.isSending = true;
+
return this.$api
.call(ApiMessages.sendMessage(this.typeId, data))
.then(response => {
- if(this.openMode == "inSamePage")
+ if(this.openMode == "inSamePage") {
this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
+ }
this.hideTemplate();
this.resetForm();
this.messageSent = true;
}).catch(this.$fhcAlert.handleSystemError)
.finally(() => {
+ this.isSending = false;
if(this.openMode == "inSamePage" && this.id.length == 1 ){
this.$emit('reloadTable');
}
@@ -413,7 +419,12 @@ export default {
-
+
+
`
+};
\ No newline at end of file
diff --git a/public/js/components/LVVerwaltung/Tabs/Noten.js b/public/js/components/LVVerwaltung/Tabs/Noten.js
new file mode 100644
index 000000000..07a428d01
--- /dev/null
+++ b/public/js/components/LVVerwaltung/Tabs/Noten.js
@@ -0,0 +1,132 @@
+import NotenZeugnis from "../../Stv/Studentenverwaltung/Details/Noten/Zeugnis.js";
+import NotenTeacher from "../../Stv/Studentenverwaltung/Details/Noten/Teacher.js";
+import NotenRepeater from "../../Stv/Studentenverwaltung/Details/Noten/Repeater.js";
+import ApiLVNoten from "../../../api/lehrveranstaltung/noten.js";
+import { highlightGesamtnote } from "../../../helpers/DocumentHelper.js";
+const LOCAL_STORAGE_ID = 'lv_details_noten_2025_12_02_stdsem_all';
+
+export default {
+ name: "LVTabNoten",
+ components: {
+ NotenZeugnis,
+ NotenTeacher,
+ NotenRepeater
+ },
+ provide() {
+ return {
+ config: this.config
+ }
+ },
+ props: {
+ modelValue: Object,
+ config: Object
+ },
+ data() {
+ return {
+ stdsem: '',
+ endpoint: ApiLVNoten,
+ tabulatorOptionsZeugnis: {
+ visibleColumns: {
+ vorname: true,
+ nachname: true,
+ uid: true,
+ lehrveranstaltung_bezeichnung: false
+ },
+ headerFilter: {
+ vorname: true,
+ nachname: true,
+ uid: true,
+ lehrveranstaltung_bezeichnung: false
+ },
+ persistenceZeugnisID: 'lv-details-noten-zeugnis-2025120401',
+ },
+ tabulatorOptionsTeacher: {
+ visibleColumns: {
+ vorname: true,
+ nachname: true,
+ student_uid: true,
+ lehrveranstaltung_bezeichnung: false
+ },
+ headerFilter: {
+ vorname: true,
+ nachname: true,
+ student_uid: true,
+ lehrveranstaltung_bezeichnung: false
+ },
+ persistenceTeacherID: 'lv-details-noten-teacher-2025120401',
+ },
+ zeugnisLoaded: false,
+ teacherLoaded: false,
+ };
+ },
+ methods: {
+ reload() {
+ this.zeugnisLoaded = false;
+ this.teacherLoaded = false;
+
+ this.$refs.zeugnis.$refs.table.reloadTable();
+ this.$refs.teacher.$refs.table.reloadTable();
+ },
+ saveStdsem(event) {
+ window.localStorage.setItem(LOCAL_STORAGE_ID, event.target.value);
+ },
+ onZeugnisLoaded() {
+ this.zeugnisLoaded = true;
+ this.checkHighlight();
+ },
+ onTeacherLoaded() {
+ this.teacherLoaded = true;
+ this.checkHighlight();
+ },
+ checkHighlight()
+ {
+ if (!this.zeugnisLoaded || !this.teacherLoaded)
+ return;
+
+ if (!this.$refs.zeugnis || !this.$refs.teacher)
+ return;
+
+ let zeugnisTable = this.$refs.zeugnis.$refs.table.tabulator;
+ let teacherTable = this.$refs.teacher.$refs.table.tabulator;
+
+ if (!zeugnisTable || !teacherTable)
+ return;
+
+ highlightGesamtnote(zeugnisTable, teacherTable);
+ }
+ },
+ created() {
+ const savedPath = window.localStorage.getItem(LOCAL_STORAGE_ID);
+ this.stdsem = savedPath || '';
+ },
+ template: `
+
+
`
+};
\ No newline at end of file
diff --git a/public/js/components/LVVerwaltung/Tabs/Termine.js b/public/js/components/LVVerwaltung/Tabs/Termine.js
new file mode 100644
index 000000000..8b005b6b4
--- /dev/null
+++ b/public/js/components/LVVerwaltung/Tabs/Termine.js
@@ -0,0 +1,21 @@
+import TableLvList from "../../Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js";
+import ApiLETermine from "../../../api/lehrveranstaltung/letermine.js";
+
+export default {
+ name: "LETabTermine",
+ components: {
+ TableLvList
+ },
+ props: {
+ modelValue: Object,
+ },
+ data() {
+ return {
+ endpoint: ApiLETermine
+ };
+ },
+ template: `
+
+
+
+
+
+
+
+
+
+
+
`
+};
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index b23eebbcd..36ee5f114 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -56,6 +56,7 @@ export default {
previewText: null,
previewBody: "",
replyData: null,
+ isSending: false
}
},
methods: {
@@ -113,6 +114,9 @@ export default {
data.append('data', JSON.stringify(this.formData));
data.append('ids', JSON.stringify(this.id));
+ //for disabling sendButton and show Spinner
+ this.isSending = true;
+
return this.$refs.formMessage
.call(ApiMessages.sendMessage(this.typeId, data))
.then(response => {
@@ -121,6 +125,7 @@ export default {
this.resetForm();
}).catch(this.$fhcAlert.handleSystemError)
.finally(() => {
+ this.isSending = false;
//just emit if no multitasking
if(this.id.length == 1){
@@ -288,6 +293,9 @@ export default {
dialog-class=" modal-dialog-scrollable modal-xl modal-msg"
header-class="flex-wrap pb-0"
body-class="px-3 py-2"
+ :backdrop="isSending ? 'static' : true"
+ :keyboard="!isSending"
+ :noCloseBtn="isSending"
@hidden.bs.modal="resetForm"
>
@@ -476,7 +484,12 @@ export default {
-
+
@@ -606,19 +612,30 @@ export default {
Loading...
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index 1c2c53dd7..5d89547d7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -78,7 +78,7 @@ export default {
layout: 'fitDataStretchFrozen',
layoutColumnsOnNewData: false,
height: 'auto',
- minHeight: '200',
+ minHeight: '200'
}
},
computed: {
@@ -238,6 +238,16 @@ export default {
}
return this.student.map(e => e.uid);
},
+ studentNames() {
+ if (this.student.uid)
+ {
+ return [this.student.vorname + ' ' + this.student.nachname];
+ }
+
+ const array = this.student.map(e => ' ' + e.vorname + ' ' + e.nachname + '(' + e.uid +')');
+
+ return array.toString();
+ },
studentKzs(){
if (this.student.uid)
{
@@ -287,10 +297,51 @@ export default {
.catch(this.$fhcAlert.handleSystemError);
},
actionNewAbschlusspruefung() {
- this.resetForm();
- this.statusNew = true;
- this.$refs.finalexamModal.show();
this.setDefaultFormData();
+ this.statusNew = true;
+
+ //prepare local Storage
+ let STORAGE_KEY = 'finalExamDefaultData';
+ const id = '20260625_01';
+ const stored = JSON.parse(localStorage.getItem(STORAGE_KEY)) || {};
+
+ if (stored[id]) {
+ const data = stored[id];
+
+ this.formData.pruefungstyp_kurzbz = data.pruefungstyp_kurzbz;
+ this.formData.datum = data.datum;
+ this.formData.sponsion = data.sponsion;
+ this.formData.akadgrad_id = data.akadgrad_id;
+ this.formData.pruefungsantritt_kurzbz = data.pruefungsantritt_kurzbz;
+
+ if (data.vorsitz_uid) {
+ this.selectedVorsitz = {
+ mitarbeiter_uid: data.vorsitz_uid,
+ person_id: data.vorsitz_person_id,
+ label: data.vorsitz_label
+ };
+ }
+
+ if (data.pruefer1_person_id) {
+ this.selectedPruefer1 = {
+ person_id: data.pruefer1_person_id,
+ label: data.pruefer1_label
+ };
+ }
+ if (data.pruefer2_person_id) {
+ this.selectedPruefer2 = {
+ person_id: data.pruefer2_person_id,
+ label: data.pruefer2_label
+ };
+ }
+ if (data.pruefer3_person_id) {
+ this.selectedPruefer3 = {
+ person_id: data.pruefer3_person_id,
+ label: data.pruefer3_label
+ };
+ }
+ }
+ this.$refs.finalexamModal.show();
},
actionEditAbschlusspruefung(abschlusspruefung_id) {
this.resetForm();
@@ -305,20 +356,23 @@ export default {
};
if (data.p1_person_id) {
this.selectedPruefer1 = {
- label: this.getPersonLabel(data.p1_titelpre, data.p1_nachname, data.p1_vorname, data.p1_titelpost),
- person_id: data.p1_person_id
+ label: this.getPersonLabel(data.p1_titelpre, data.p1_nachname, data.p1_vorname, data.p1_titelpost, data.p1_uid),
+ person_id: data.p1_person_id,
+ mitarbeiter_uid: data.p1_uid
};
}
if (data.p2_person_id) {
this.selectedPruefer2 = {
- label: this.getPersonLabel(data.p2_titelpre, data.p2_nachname, data.p2_vorname, data.p2_titelpost),
- person_id: data.p2_person_id
+ label: this.getPersonLabel(data.p2_titelpre, data.p2_nachname, data.p2_vorname, data.p2_titelpost, data.p2_uid),
+ person_id: data.p2_person_id,
+ mitarbeiter_uid: data.p2_uid
}
};
if (data.p3_person_id) {
this.selectedPruefer3= {
- label: this.getPersonLabel(data.p3_titelpre, data.p3_nachname, data.p3_vorname, data.p3_titelpost),
- person_id: data.p3_person_id
+ label: this.getPersonLabel(data.p3_titelpre, data.p3_nachname, data.p3_vorname, data.p3_titelpost, data.p3_uid),
+ person_id: data.p3_person_id,
+ mitarbeiter_uid: data.p3_uid
};
}
});
@@ -337,6 +391,30 @@ export default {
.then(this.deleteAbschlusspruefung)
.catch(this.$fhcAlert.handleSystemError);
},
+ saveOrUpdateLocalStorage(){
+ let STORAGE_KEY = 'finalExamDefaultData';
+
+ const id = '20260625_01';
+ const stored = JSON.parse(localStorage.getItem(STORAGE_KEY)) || {};
+
+ stored[id] = {
+ pruefungstyp_kurzbz: this.formData.pruefungstyp_kurzbz,
+ pruefungsantritt_kurzbz: this.formData.pruefungsantritt_kurzbz,
+ vorsitz_uid: this.selectedVorsitz?.mitarbeiter_uid || null,
+ vorsitz_person_id: this.selectedVorsitz?.person_id || null,
+ vorsitz_label: this.selectedVorsitz?.label || null,
+ pruefer1_person_id: this.selectedPruefer1?.person_id || null,
+ pruefer1_label: this.selectedPruefer1?.label || null,
+ pruefer2_person_id: this.selectedPruefer2?.person_id || null,
+ pruefer2_label: this.selectedPruefer2?.label || null,
+ pruefer3_person_id: this.selectedPruefer3?.person_id || null,
+ pruefer3_label: this.selectedPruefer3?.label || null,
+ akadgrad_id: this.formData.akadgrad_id,
+ datum: this.formData.datum,
+ sponsion: this.formData.sponsion
+ };
+ localStorage.setItem(STORAGE_KEY, JSON.stringify(stored));
+ },
addNewAbschlusspruefung() {
const dataToSend = {
uid: this.student.uid,
@@ -347,6 +425,8 @@ export default {
.call(ApiStvAbschlusspruefung.addNewAbschlusspruefung(dataToSend))
.then(response => {
this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+ //save formData fields in LocalStorage
+ this.saveOrUpdateLocalStorage();
this.hideModal('finalexamModal');
this.resetForm();
})
@@ -355,6 +435,43 @@ export default {
this.reload();
});
},
+ async addNewAbschlusspruefungMulti(){
+ try {
+ const arraySuccessfullySent = [];
+ const arrayError = [];
+
+ for (const student of this.studentUids) {
+ try {
+ await this.$refs.formFinalExam.call(
+ ApiStvAbschlusspruefung.addNewAbschlusspruefung({
+ uid: student,
+ formData: this.formData
+ })
+ );
+ arraySuccessfullySent.push(student);
+ } catch (error) {
+ arrayError.push(student);
+ }
+ }
+ if (arraySuccessfullySent.length) {
+ this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+ //TODO(Manu) check if really needed in case of success
+ //this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave') + ': Uids: ' + arraySuccessfullySent.join(", "));
+ }
+
+ if (arrayError.length) {
+ this.$fhcAlert.alertError(this.$p.t('ui', 'errorSavingData') + ': Uids: ' + arrayError.join(", "));
+ }
+
+ if (arraySuccessfullySent.length) {
+ this.saveOrUpdateLocalStorage();
+ this.hideModal("finalexamModal");
+ this.resetForm();
+ }
+ } catch (error) {
+ this.$fhcAlert.handleSystemError(error);
+ }
+ },
hideModal(modalRef){
this.$refs[modalRef].hide();
},
@@ -376,6 +493,9 @@ export default {
id: abschlusspruefung_id,
formData: this.formData
};
+ //uncomment if also save data in local storage for update
+ //this.saveOrUpdateLocalStorage();
+
return this.$refs.formFinalExam
.call(ApiStvAbschlusspruefung.updateAbschlusspruefung(dataToSend))
.then(response => {
@@ -417,7 +537,6 @@ export default {
this.selectedPruefer1 = null;
this.selectedPruefer2 = null;
this.selectedPruefer3 = null;
-
},
setDefaultFormData() {
@@ -434,7 +553,14 @@ export default {
}
if (!this.formData.akadgrad_id && this.arrAkadGrad.length > 0) {
- this.formData.akadgrad_id = this.arrAkadGrad[0].akadgrad_id;
+ const akadGradByGeschlecht = this.arrAkadGrad.find((item) => {
+ return item.geschlecht === this.student.geschlecht;
+ });
+
+ if(akadGradByGeschlecht)
+ this.formData.akadgrad_id = akadGradByGeschlecht.akadgrad_id;
+ else
+ this.formData.akadgrad_id = this.arrAkadGrad[0].akadgrad_id;
}
},
printDocument(link) {
@@ -471,29 +597,29 @@ export default {
searchPerson(event) {
if (this.abortController.persons) {
this.abortController.persons.abort();
- }
-
+ }
this.abortController.persons = new AbortController();
return this.$api
.call(ApiStvAbschlusspruefung.getPruefer(event.query))
.then(result => {
- this.filteredPersons = [];
- for (let person of result.data.retval) {
- this.filteredPersons.push(
- {
- label: this.getPersonLabel(
- person.titelpre,
- person.nachname,
- person.vorname,
- person.titelpost,
- person.person_uid
- ),
- person_id: person.person_id
- }
- );
- }
- });
+ this.filteredPersons = [];
+ for (let person of result.data.retval) {
+ this.filteredPersons.push(
+ {
+ label: this.getPersonLabel(
+ person.titelpre,
+ person.nachname,
+ person.vorname,
+ person.titelpost,
+ person.uid
+ ),
+ person_id: person.person_id,
+ mitarbeiter_uid: person.uid
+ }
+ );
+ }
+ });
},
},
created() {
@@ -526,7 +652,7 @@ export default {
.catch(this.$fhcAlert.handleSystemError);
this.$api
- .call(ApiStvAbschlusspruefung.getAkadGrade(this.student.studiengang_kz))
+ .call(ApiStvAbschlusspruefung.getAkadGrade(this.stg_kz))
.then(result => {
this.arrAkadGrad = result.data;
})
@@ -547,7 +673,8 @@ export default {
{{this.$p.t('stv','tab_finalexam')}}
-
+
+
+
-
+
+
+
@@ -718,10 +870,11 @@ export default {
:key="grad.akadgrad_id"
:value="grad.akadgrad_id"
>
- {{grad.titel}}
+ {{ grad.titel }} ({{ grad.geschlecht }})
@@ -779,6 +932,7 @@ export default {
>
-
{{$p.t('abschlusspruefung', 'abschluessPruefungAnlegen')}}
{{$p.t('abschlusspruefung', 'abschluessPruefungBearbeiten')}}
+
+ {{studentNames}}
+
- [{{$p.t('ui', 'neu')}}]
+
+
@@ -807,8 +961,9 @@ export default {
-
-
+
+
+
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 199a79d38..0b5eec44d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -158,6 +158,16 @@ export default {
},
reload(){
this.updateStudent(this.modelValue);
+ },
+ sendInfomail(){
+ const subject = this.$p.t('person', 'betreffProfilfoto');
+ const subjectEncoded = encodeURIComponent(subject);
+
+ const body = this.$p.t('person', 'mailText_profilfoto');
+ const bodyWithNewLines = body.replace(/\\n/g, '\n');
+ const bodyEncoded = encodeURIComponent(bodyWithNewLines);
+
+ window.location.href = "mailto:" + this.modelValue.mail_intern + "?subject=" + subjectEncoded + "&body=" + bodyEncoded;
}
},
created() {
@@ -387,10 +397,12 @@ export default {
container-class="col stv-details-details-foto"
:label="$p.t('person', 'foto')"
type="UploadImage"
+ titleActionButton="Infomail"
v-model="data.foto"
name="foto"
+ @actionbutton-clicked="sendInfomail"
>
- ![No Image]()
+ ![No Image]()
'
: '';
- // if nachgereicht_am show datum
+ // if nachgereicht_am show datum nachgereicht_am oder hochgeladenamum
let pill = dueDate
- ? `${dateFormatted}`
+ ? `${date}`
: '';
return `${tickCrossIcon} ${pill}`;
@@ -206,7 +220,7 @@ export default {
setHeader('anmerkung_intern', this.$p.t('global', 'anmerkung'));
setHeader('akte_id', this.$p.t('global', 'akte_id'));
setHeader('pflicht', this.$p.t('ampeln', 'mandatory'));
- setHeader('nachgereicht_am', this.$p.t('global', 'dokument'));
+ setHeader('nachgereicht_am', this.$p.t('dokumente', 'nachreichungAm'));
}
},
{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js
index ef61ef1b9..6d89d6b12 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js
@@ -1,6 +1,14 @@
-import { splitMailsHelper } from "../../../../helpers/EmailHelpers.js"
+import { splitMailsHelper } from "../../../../helpers/EmailHelpers.js";
+import { splitMailLinks } from "../../../../helpers/EmailHelpers.js";
+import FormInput from "../../../Form/Input.js";
+import FormForm from "../../../Form/Form.js";
+
export default {
name: "Kontaktieren",
+ components: {
+ FormInput,
+ FormForm
+ },
computed: {
internMails() {
if (this.modelValue.mail_intern)
@@ -21,38 +29,150 @@ export default {
props: {
modelValue: Object
},
-
+ inject: {
+ authUid: {
+ from: 'authUid',
+ required: true
+ },
+ },
+ data(){
+ return {
+ mailLinks: [],
+ mailLinksClicked: [],
+ showMailDialog: false,
+ showDivKomp: false,
+ showDivKompLocalStorageId: 'studvw-contact-showDivKomp'
+ }
+ },
+ activated() {
+ const showDivCompLocalStorage = window.localStorage.getItem(this.showDivKompLocalStorageId);
+ this.showDivKomp = (showDivCompLocalStorage === 'true') ? true : false;
+ },
methods: {
internMail(event) {
if (this.internMails.length)
{
- splitMailsHelper(this.internMails, event, null, null, this.$fhcAlert, this.$p)
+ splitMailsHelper(this.internMails, event, null, null, this.$fhcAlert, this.$p, this.authUid)
}
},
privateMail(event) {
if (this.privateMails.length)
{
- splitMailsHelper(this.privateMails, event, null,null, this.$fhcAlert, this.$p)
+ splitMailsHelper(this.privateMails, event, null, null, this.$fhcAlert, this.$p, this.authUid)
}
+ },
+ createMailLinks(event, mailGroup){
+ let recipients = mailGroup == 'private' ? this.privateMails : this.internMails;
+ this.mailLinks = splitMailLinks(
+ recipients,
+ "",
+ event.ctrlKey || event.metaKey,
+ this.authUid
+ );
+ this.mailLinksClicked = [];
+
+ this.showMailDialog = true;
+ },
+ handleMailLink(link, index){
+ this.mailLinksClicked.push(index);
+ window.open(link, '_blank', 'noopener');
+ },
+ reset(){
+ this.showMailDialog = false;
+ },
+ onSwitchChange(){
+ window.localStorage.setItem(this.showDivKompLocalStorageId, this.showDivKomp);
}
},
template: `
-
{{$p.t('abschlusspruefung', 'zurBeurteilung')}}
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
-
+ `
+};
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js
index 6845613ab..6eb324f27 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js
@@ -1,4 +1,5 @@
import TableLvList from "./Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js";
+import ApiStvCoursedates from "../../../../api/factory/stv/coursedates.js";
export default {
name: "TabCourseList",
@@ -8,11 +9,13 @@ export default {
props: {
modelValue: Object,
},
- data(){
- return {}
+ data() {
+ return {
+ endpoint: ApiStvCoursedates
+ };
},
template: `
-
+
+
`
-};
\ No newline at end of file
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{$p.t('stv', 'zuvieleEMails')}}
+ + +
-
`
};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
index b664964f7..855adc26b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
@@ -2,8 +2,6 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js";
import FormInput from "../../../../Form/Input.js";
import FormForm from '../../../../Form/Form.js';
-import ApiStvCoursedates from "../../../../../api/factory/stv/coursedates.js";
-
export default {
name: "TblCourseList",
components: {
@@ -17,7 +15,14 @@ export default {
},
},
props: {
- student: Object
+ id: {
+ type: [Number, String],
+ required: true
+ },
+ endpoint: {
+ type: Object,
+ required: true
+ },
},
data(){
return {
@@ -48,14 +53,7 @@ export default {
initTabulatorOptions(){
this.tabulatorOptions = {
ajaxURL: 'dummy',
- ajaxRequestFunc: () => this.$api.call(
- ApiStvCoursedates.getCourselist({
- student_uid: this.student.uid,
- start_date: this.dataSem.start,
- end_date: this.dataSem.ende,
- group_consecutiveHours: true,
- dbStundenplanTable: this.dbStundenplanTable})
- ),
+ ajaxRequestFunc: () => this.$api.call(this.endpoint.getCourselist(this.id, this.dataSem.start, this.dataSem.ende, this.dbStundenplanTable)),
ajaxResponse: (url, params, response) => {
return response.data;
},
@@ -131,7 +129,7 @@ export default {
this.dataSem = this.listStudiensemester.find(item => item.studiensemester_kurzbz === studiensemester_kurzbz);
},
exportToExcel(){
- window.open(this.downloadLink, '_blank');
+ window.open(this.endpoint.exportCalendar(this.id, this.dbStundenplanTable), '_blank');
},
reload() {
this.$refs.table.reloadTable();
@@ -145,10 +143,13 @@ export default {
currentSemester(newVal, oldVal) {
this.getDatesOfSemester(newVal);
},
+ id() {
+ this.reload();
+ }
},
created(){
this.$api
- .call(ApiStvCoursedates.getStudiensemester())
+ .call(this.endpoint.getStudiensemester())
.then(result => {
this.listStudiensemester = result.data;
this.getDatesOfSemester(this.currentSemester);
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten.js
index 71b8096ec..972326f26 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten.js
@@ -2,6 +2,9 @@ import NotenZeugnis from './Noten/Zeugnis.js';
import NotenTeacher from './Noten/Teacher.js';
import NotenRepeater from './Noten/Repeater.js';
+import ApiStvGrades from '../../../../api/factory/stv/grades.js';
+import { highlightGesamtnote } from "../../../../helpers/DocumentHelper.js";
+
const LOCAL_STORAGE_ID = 'stv_details_noten_2024-11-25_stdsem_all';
export default {
@@ -22,9 +25,17 @@ export default {
},
data() {
return {
- stdsem: ''
+ stdsem: '',
+ endpoint: ApiStvGrades,
+ zeugnisLoaded: false,
+ teacherLoaded: false,
};
},
+ computed: {
+ gradeListLink() {
+ return this.$api.getUri('/person/gradelist/index/' + this.modelValue.uid);
+ }
+ },
methods: {
reload() {
this.$refs.zeugnis.$refs.table.reloadTable();
@@ -33,26 +44,58 @@ export default {
},
saveStdsem(event) {
window.localStorage.setItem(LOCAL_STORAGE_ID, event.target.value);
+ },
+ onZeugnisLoaded() {
+ this.zeugnisLoaded = true;
+ this.checkHighlight();
+ },
+ onTeacherLoaded() {
+ this.teacherLoaded = true;
+ this.checkHighlight();
+ },
+ checkHighlight()
+ {
+ if (!this.zeugnisLoaded || !this.teacherLoaded)
+ return;
+
+ if (!this.$refs.zeugnis || !this.$refs.teacher)
+ return;
+
+ let zeugnisTable = this.$refs.zeugnis.$refs.table.tabulator;
+ let teacherTable = this.$refs.teacher.$refs.table.tabulator;
+
+ if (!zeugnisTable || !teacherTable)
+ return;
+
+ highlightGesamtnote(zeugnisTable, teacherTable);
}
},
created() {
const savedPath = window.localStorage.getItem(LOCAL_STORAGE_ID);
this.stdsem = savedPath || '';
},
- template: `
+ template: /* html */`
-
-
+
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js
index eaa34c1c7..ab7dedb3e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js
@@ -21,6 +21,7 @@ export default {
},
data() {
return {
+ renderTabulator: false,
tabulatorEvents: []
};
},
@@ -118,13 +119,13 @@ export default {
created() {
this.$p.loadCategory(['global', 'stv', 'lehre', 'profil'])
.then(() => {
- if (this.$refs.table.tableBuilt)
- this.$refs.table.tabulator.columnManager.setColumns(this.tabulatorOptions.columns);
+ this.renderTabulator = true
});
},
template: `
this.$emit("loaded"),
+ },
+ {
+ event: "tableBuilt",
+ handler: () => {
+ if(this.optionalTabulatorOptions?.visibleColumns
+ && this.setOptinalTabulatorOptionsVisibility)
+ {
+ for(let key in this.optionalTabulatorOptions.visibleColumns) {
+ if(this.optionalTabulatorOptions.visibleColumns[key])
+ this.$refs.table.tabulator.showColumn(key);
+ else
+ this.$refs.table.tabulator.hideColumn(key);
+ }
+ }
+ }
+ }
+ ]
};
},
computed: {
tabulatorOptions() {
return {
ajaxURL: 'dummy',
- ajaxRequestFunc: () => this.$api.call(ApiStvGrades.getTeacherProposal(
- this.student.prestudent_id,
+ ajaxRequestFunc: () => this.$api.call(this.endpoint.getTeacherProposal(
+ this.id,
(!this.allSemester ? this.currentSemester : null)
)),
ajaxResponse: (url, params, response) => {
@@ -74,19 +103,24 @@ export default {
{ field: 'studiensemester_kurzbz', title: this.$p.t('lehre/studiensemester'), visible: false },
{ field: 'note', title: this.$p.t('stv/grades_numericgrade'), visible: false },
{ field: 'student_uid', title: this.$p.t('profil/studentIn'), visible: false },
+ { field: 'vorname', title: this.$p.t('person/vorname'), visible: false },
+ { field: 'nachname', title: this.$p.t('person/nachname'), visible: false },
{ field: 'lehrveranstaltung_id', title: this.$p.t('lehre/lehrveranstaltung_id'), visible: false },
{ field: 'punkte', title: this.$p.t('stv/grades_points'), visible: false }
],
+ columnDefaults: {
+ headerFilter: this.optionalTabulatorOptions?.headerFilter ?? false,
+ },
layout: 'fitDataStretch',
height: '100%',
selectableRows: true,
selectableRowsRangeMode: 'click',
- persistenceID: 'stv-details-noten-teacher-20260217'
+ persistenceID: this.optionalTabulatorOptions?.persistenceTeacherID ?? 'stv-details-noten-teacher-2025120401',
};
}
},
watch: {
- student(n) {
+ id() {
this.$refs.table.reloadTable();
},
allSemester(n) {
@@ -97,7 +131,7 @@ export default {
copyGrades(selected) {
const promises = selected.map(
grade => this.$api
- .call(ApiStvGrades.copyTeacherProposalToCertificate(grade), {
+ .call(this.endpoint.copyTeacherProposalToCertificate(grade), {
errorHeader: grade.lehrveranstaltung_bezeichnung
})
.then(() => {
@@ -117,13 +151,19 @@ export default {
created() {
this.$p.loadCategory(['stv', 'lehre', 'profil'])
.then(() => {
- if (this.$refs.table.tableBuilt)
- this.$refs.table.tabulator.columnManager.setColumns(this.tabulatorOptions.columns);
+ this.renderTabulator = true;
});
+
+ if(this?.optionalTabulatorOptions)
+ {
+ const localStorageKey = 'tabulator-' + this.optionalTabulatorOptions.persistenceTeacherID + '-columns';
+ this.setOptinalTabulatorOptionsVisibility = (window.localStorage.getItem(localStorageKey) === null) ? true : false;
+ }
},
template: `
this.$emit("loaded")
+ },
{
event: "rowSelected",
handler: row => row.getElement().style.zIndex = 12
@@ -42,6 +55,21 @@ export default {
{
event: "rowDeselected",
handler: row => row.getElement().style.zIndex = ''
+ },
+ {
+ event: "tableBuilt",
+ handler: () => {
+ if(this.optionalTabulatorOptions?.visibleColumns
+ && this.setOptinalTabulatorOptionsVisibility)
+ {
+ for(let key in this.optionalTabulatorOptions.visibleColumns) {
+ if(this.optionalTabulatorOptions.visibleColumns[key])
+ this.$refs.table.tabulator.showColumn(key);
+ else
+ this.$refs.table.tabulator.hideColumn(key);
+ }
+ }
+ }
}
],
stdsem: '',
@@ -53,7 +81,7 @@ export default {
computed: {
tabulatorOptions() {
const listPromise = this.$api
- .call(ApiStvGrades.list())
+ .call(this.endpoint.list())
.then(res => res.data.map(({bezeichnung: label, note: value}) => ({label, value})));
let gradeField = {
@@ -86,7 +114,7 @@ export default {
note_bezeichnung
}))
// send to backend
- .then(data => this.$api.call(ApiStvGrades.updateCertificate(data)))
+ .then(data => this.$api.call(this.endpoint.updateCertificate(data)))
// get bezeichnung again
.then(() => listPromise)
.then(list => list.find(el => el.value == note))
@@ -109,7 +137,7 @@ export default {
if (filterTerm) {
return this.$api
.call(
- ApiStvGrades.getGradeFromPoints(
+ this.endpoint.getGradeFromPoints(
filterTerm,
cell.getData().lehrveranstaltung_id,
this.currentSemester
@@ -142,6 +170,8 @@ export default {
.then(() => node.innerText = this.$p.t('ui/loading'))
.catch(this.$fhcAlert.handleSystemError);
gradeField.editorParams.placeholderLoading = node;
+ gradeField.visible = this.optionalTabulatorOptions?.visibleColumns?.note ?? true
+ gradeField.headerFiler = this.optionalTabulatorOptions?.headerFilter?.note || this.optionalTabulatorOptions?.note || false
}
const columns = [
@@ -192,7 +222,10 @@ export default {
{ field: 'lehrform', title: this.$p.t('lehre/lehrform'), visible: false },
{ field: 'kurzbz', title: this.$p.t('lehre/kurzbz'), visible: false },
{ field: 'punkte', title: this.$p.t('stv/grades_points'), visible: false },
- { field: 'lehrveranstaltung_bezeichnung_english', title: this.$p.t('stv/grades_lehrveranstaltung_bezeichnung_english'), visible: false }
+ { field: 'lehrveranstaltung_bezeichnung_english', title: this.$p.t('stv/grades_lehrveranstaltung_bezeichnung_english'), visible: false },
+ { field: 'uid', title: this.$p.t('person/uid'), visible: false },
+ { field: 'vorname', title: this.$p.t('person/vorname'), visible: false },
+ { field: 'nachname', title: this.$p.t('person/nachname'), visible: false }
];
const hasDocuments = ['both', 'inline'].includes(this.config.documents);
@@ -202,6 +235,7 @@ export default {
columns.push({
field: 'actions',
title: this.$p.t('global/actions'),
+ minWidth: 120,
cssClass: "overflow-visible",
headerSort: false,
formatter: cell => {
@@ -221,7 +255,7 @@ export default {
deleteButton.className = 'btn btn-outline-secondary';
const icon = document.createElement('i');
icon.className = 'fa fa-trash';
- icon.title = this.$p.t('ui/loeschen');
+ icon.title = this.$p.t('lehre/info_deleteMarkEntry');
deleteButton.append(icon);
deleteButton.addEventListener('click', evt => {
evt.stopPropagation();
@@ -238,8 +272,8 @@ export default {
return {
ajaxURL: 'dummy',
- ajaxRequestFunc: () => this.$api.call(ApiStvGrades.getCertificate(
- this.student.prestudent_id,
+ ajaxRequestFunc: () => this.$api.call(this.endpoint.getCertificate(
+ this.id,
(!this.allSemester ? this.currentSemester : null)
)),
ajaxResponse: (url, params, response) => {
@@ -248,9 +282,10 @@ export default {
columns,
height: '100%',
layout: 'fitDataStretchFrozen',
- selectableRows: 1,
+ selectable: true,
selectableRowsRangeMode: 'click',
- persistenceID: 'stv-details-noten-zeugnis-20260217',
+ selectableRows: true,
+ persistenceID: this.optionalTabulatorOptions?.persistenceZeugnisID ?? 'stv-details-noten-zeugnis-20260217',
persistence:{
columns: ["width", "visible", "frozen"]
}
@@ -258,7 +293,8 @@ export default {
}
},
watch: {
- student(n) {
+ id()
+ {
this.$refs.table.reloadTable();
},
allSemester(n) {
@@ -269,7 +305,7 @@ export default {
setGrade(data) {
this.$api
.call(
- ApiStvGrades.updateCertificate(data),
+ this.endpoint.updateCertificate(data),
{ errorHeader: data.lehrveranstaltung_bezeichnung }
)
.then(this.$refs.table.reloadTable)
@@ -282,7 +318,7 @@ export default {
.confirmDelete()
.then(result => result ? data : Promise.reject({handled:true}))
.then(data => this.$api.call(
- ApiStvGrades.deleteCertificate(data),
+ this.endpoint.deleteCertificate(data),
{ errorHeader: data.lehrveranstaltung_bezeichnung }
))
.then(this.$refs.table.reloadTable)
@@ -291,15 +327,21 @@ export default {
}
},
created() {
- this.$p.loadCategory(['global', 'stv', 'lehre'])
+ this.$p.loadCategory(['global', 'stv', 'lehre', 'person'])
.then(() => {
- if (this.$refs.table.tableBuilt)
- this.$refs.table.tabulator.columnManager.setColumns(this.tabulatorOptions.columns);
+ this.renderTabulator = true;
});
+
+ if(this?.optionalTabulatorOptions)
+ {
+ const localStorageKey = 'tabulator-' + this.optionalTabulatorOptions.persistenceZeugnisID + '-columns';
+ this.setOptinalTabulatorOptionsVisibility = (window.localStorage.getItem(localStorageKey) === null) ? true : false;
+ }
},
template: `
@@ -49,16 +54,16 @@ ref="formc"
type-id: id to which table the notizdata should be connected... eg. person_id, prestudent_id, uid (for mitarbeiter_uid), projekt_kurzbz, projektphase_id, projekttask_id,
bestellung_id, lehreinheit_id, anrechnung_id
-notizLayout: "classicFas", "twoColumnsFormLeft", twoColumnsFormRight, popupModal"
+notizLayout: "classicFas", "twoColumnsFormLeft", twoColumnsFormRight, popupModal"; is now configurable in config/stv.php
showErweitert: if true: section with following fields will be displayed:
- 'verfasser', 'bearbeiter', 'von', 'bis'
+ 'verfasser', 'bearbeiter', 'von', 'bis' and 'erledigt'; is now configurable in config/stv.php
showDocument: if true: section with documentHandling will be displayed
showTinyMCE: if true: section with WYSIWYG Editor for Text will be displayed
-visibleColumns: list, which fields shoult be showed as default in filter component
+visibleColumns: list, which fields should be showed as default in filter component
fullVersion: :visibleColumns="['titel','text','bearbeiter','verfasser','von','bis','dokumente','erledigt','notiz_id','notizzuordnung_id','id','lastupdate']"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
index ea5a79a9d..e85c69938 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
@@ -193,7 +193,7 @@ export default {
return this.$api
.call(ApiStvProjektarbeit.getLehrveranstaltungen(
this.student.uid,
- this.newProjektarbeit ? this.student.studiengang_kz : null,
+ this.student.studiengang_kz,
this.studiensemester,
this.additional_lehrveranstaltung_id
))
@@ -227,7 +227,8 @@ export default {
if (preparedFormData.projektarbeit_id == null) delete(preparedFormData.projektarbeit_id);
delete(preparedFormData.firma);
delete(preparedFormData.firma_name);
- delete(preparedFormData.lehrveranstaltung_id);
+
+ preparedFormData.studiensemester_kurzbz = this.studiensemester
return preparedFormData;
}
@@ -290,7 +291,7 @@ export default {
+
+
+
+
-
-
-
+
-
+
{{ $p.t('projektarbeit', 'zurFirmenverwaltung') }}
@@ -313,14 +314,13 @@ export default {
-
-