e984425e36
Merge branch 'feature-68530/Dashboard_Cleanup_Admin' into cis40_2026-02_rc
2026-04-23 12:09:09 +02:00
d14b9e2ab5
Merge branch 'feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe' into cis40_2026-02_rc
2026-04-20 18:02:23 +02:00
d926e4165b
Merge branch 'master' into cis40_2026-02_rc
2026-04-20 17:52:24 +02:00
92a2053b42
Merge branch 'feature-40870/BUG_Studstatus_unpause_order_should_be_DESC'
2026-04-20 17:30:14 +02:00
6cc09969dd
Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin
2026-04-20 10:45:20 +02:00
70ebe34f1f
merge develop into -- manual conflict resolution
2026-04-16 16:09:03 +02:00
6ce14a25d7
Merge branch 'master' into feature-70376/Lohnguide
2026-04-15 11:49:26 +02:00
f1c3c8296f
implemented 'OtherLvPlan' to view other users' timetables
2026-04-13 10:41:41 +02:00
f06e59b362
Merge branch 'master' into feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe
2026-04-08 14:13:02 +02:00
5c463c0866
add vordienstzeit to lohnguide
2026-04-06 22:25:13 +02:00
00e019d6fe
cleanup db data
2026-03-26 15:21:41 +01:00
5b0c115b10
Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin
2026-03-25 17:06:52 +01:00
6fbb09eb6e
group or clause
2026-03-25 16:32:43 +01:00
91d656ff60
remove unnecessary function
2026-03-25 16:11:52 +01:00
e3093bdf3f
get magic funktionen (Mitarbeiter, Student) as dashboard presets
2026-03-24 15:15:36 +01:00
b11d8d056a
get access rights from permissionlib
2026-03-24 15:15:12 +01:00
f15fd40636
dashboardlib bug: array <=> stdclass
2026-03-23 15:41:32 +01:00
059b13938e
Merge branch 'master' into feature-70376/Lohnguide
2026-03-18 11:46:27 +01:00
5fbcf588ed
fix vertragsbestandteil lohnguide
2026-03-05 14:29:56 +01:00
e054f1222b
basic model and factory for lohnguide
2026-03-03 11:50:45 +01:00
d6108d816e
Merge branch 'master' into hotfix-69228/DOCSBOX
2026-02-23 14:28:54 +01:00
37395b70f6
Merge branch 'feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe' into cis40_2026-02_rc
2026-02-03 11:56:16 +01:00
85a10e27cc
fix setFirstStudent if GENERATE_ALIAS_STUDENT is false
2026-02-02 17:59:15 +01:00
1ce362b66b
Removed forgotten error_log
2026-01-07 15:54:59 +01:00
c113c80862
fix calculation of next student matrikelnr aka personenkennzeichen and student uid
2025-12-22 21:11:05 +01:00
0616236e00
bugfix: ZGV Übernahme bei Interessentenanlage, bestehende ZGVs die null sind ausfiltern
2025-12-18 12:48:08 +01:00
50439ee6cc
Merge branch 'master' into feature-63468/Studierendenverwaltung_Neuanlage_von_Interessenten_ueberarbeiten
2025-12-09 11:37:57 +01:00
455e0533fe
Merge branch 'master' into feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe
2025-11-21 08:53:36 +01:00
a8c4fc7607
CIS4 #69146 Lvplan for View StG/Semester/Verband/Gruppe
...
- new API Endpoint lvPlan/eventsStgOrg
- new view Cis/LvPlan/StgOrg
- new component LvPlan/StgOrg.js
- new overview Cis/OverviewLvPlan with Dropdown
- phrases
2025-11-20 14:06:12 +01:00
0b6dc34220
If docsbox queue is slow, the DocsboxLib can stop checking the queued document status and raise an error
2025-11-10 15:41:01 +01:00
4407310f40
Merge branch 'master' into feature-67484/lvverwaltung_finetunning
2025-10-20 11:33:43 +02:00
07bcbee11b
add Interessent: insertamum and insertvon when adding prestuden
2025-10-13 10:52:52 +02:00
e4943e0bb8
Merge branch 'feature-67550/CIS4_Profilupdate_Finetuning'
2025-10-07 16:22:09 +02:00
4054a0cfee
format Zutrittskarte Datum
2025-10-07 15:24:45 +02:00
8a1ca9a598
Checked that the session is not an error in the FilterComponent
2025-10-07 13:33:49 +02:00
a1d616ff03
alter profilupdate api if heimatadresse is updated create new adress, readd missing isMitarbeiter info in frontend an provide/inject it
2025-10-06 18:27:19 +02:00
1c21e8f88d
Merge branch 'master' into feature-63468/Studierendenverwaltung_Neuanlage_von_Interessenten_ueberarbeiten
2025-10-06 16:54:41 +02:00
60a1d40048
prstudentlib incoming: removed addmeta (debugging)
2025-10-03 14:03:41 +02:00
8c6033fed6
add first incoming: correctly check lehrverband, moved creating of incoming prestudentstatus to prestudent lib
2025-10-03 14:02:53 +02:00
3a6fb08350
Creating of Interessenten: moved to PRestudentlib, renamed check to getPerson, corrected transaction handling, enabled creating of Incomings
2025-10-02 16:52:11 +02:00
35b37dec55
Other filters are still working even if for one of them the user does not have permissions
2025-10-02 13:34:44 +02:00
a2d2025e4c
Fixed
2025-10-02 13:33:47 +02:00
d148eaed11
ReservierungModel getRerservierungenMitarbeiter remove unused paramter ort_kurzbz, StundenplanLib only query reservations for logged in user if request is for the personal lv plan aka if ort_kurbz is empty
2025-10-01 16:19:15 +02:00
6047b19f47
do not show contacts with type hidden in cis4 profile
2025-09-25 17:19:19 +02:00
0f43e8eb7a
autocomplete auf backend umgestellt
...
textarea formattedAnmerkung rausgenommen
ui angepasst
2025-09-24 14:27:01 +02:00
f97951966c
Merge branch 'deploy_22_09_25_lvverwaltung'
2025-09-22 10:49:15 +02:00
41143a6dfc
profile functions use tbl_benutzerfunktion.beschreibung in column description, format date columns in profile tabulators, fix vuejs dev version warnings
2025-09-19 10:58:53 +02:00
0577f3f8b9
Cis4 Profile only show current userfunctions with description from tbl_funktion
2025-09-18 18:46:11 +02:00
6a31eade8b
Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into deploy_22_09_25_lvverwaltung
...
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2025-09-18 15:04:01 +02:00
57531d956d
gruppen in eigenen tab verschoben
...
styling
phrases
2025-09-18 13:18:44 +02:00
Harald Bamberger