79d23a4557
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
...
# Conflicts:
# public/js/components/Form/Upload/Dms.js
2024-09-10 11:25:19 +02:00
6bc58c00b7
unruly controller benutzerrechte; studstatus unruly api fix;
2024-09-10 10:50:02 +02:00
d9f5646ad1
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
...
# Conflicts:
# application/models/crm/Prestudentstatus_model.php
# public/js/api/fhcapifactory.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2024-09-10 10:17:55 +02:00
7b110aaf50
adds the needed phrase to the api/frontend/v1/Cms Controller
2024-09-09 14:16:37 +02:00
7a63301f08
puts profil settings ul outside of the sticky container
2024-09-09 13:49:38 +02:00
5f50d9f0ec
Merge branch 'feature-40311/Stundenplan_widget' into feature-25999/C4
2024-09-09 13:26:03 +02:00
996a49105b
Merge branch 'feature-40309/Cis_News_widget' into feature-25999/C4
2024-09-09 13:03:47 +02:00
ff51d3964f
Merge branch 'feature-40842/DashboardAmpeln' into feature-25999/C4
2024-09-09 12:56:55 +02:00
c2c30b86a1
Merge branch 'feature-40841/SearchBarChanges' into feature-25999/C4
2024-09-09 12:02:09 +02:00
97b34d98fb
Merge branch 'feature-41133/side_menu_sticky' into feature-25999/C4
2024-09-09 11:51:34 +02:00
1f4628720a
Merge branch 'feature-39911/Suche_um_raeume_erweitern' into feature-25999/C4
2024-09-09 11:50:27 +02:00
a8141e5dac
Merge branch 'master' into feature-25999/C4
2024-09-09 11:45:10 +02:00
33122a0708
WIP performance testing & UI upgrades
2024-09-09 10:49:21 +02:00
ec8b3ccb6f
adds the organisations bezeichnung through a subquery to the lehrveranstaltungs events
2024-09-06 13:11:22 +02:00
122673d291
gets rid of the stunden dependency and uses the beginn and ende property of the queried events
2024-09-06 11:20:20 +02:00
8376e8b92d
bundles the room_events and the reservierungen api calls together with Promise.allSettled
2024-09-06 11:02:14 +02:00
f9b69fe08c
changes how the reservierungen are fetched from the database to have the same information as the room events
2024-09-05 14:57:57 +02:00
e33162d20e
changes the structure of the JSON data from the stundenplan
2024-09-04 14:59:56 +02:00
87f82b7f5d
also adds the stundenplan information as object in the response of the endpoint
2024-09-03 12:07:13 +02:00
f19c1b4eaf
adds the lector and the gruppe as objects to the endpoint result instead of just strings
2024-09-02 14:47:40 +02:00
0c4d1afded
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
...
# Conflicts:
# system/phrasesupdate.php
2024-08-21 13:46:41 +02:00
fc8c748bc4
Added View LvTemplateUebersicht.php
2024-08-21 13:32:14 +02:00
6168a6b806
Added Controller LvTemplateUebersicht.php
2024-08-21 13:26:20 +02:00
d07f19d893
Added api Controller Studiensemester.php + methods getAll and getAktNext
2024-08-21 13:23:26 +02:00
bff5d4ffbe
Added api Controller Lehrveranstaltung.php + method getTemplateLvTree
2024-08-21 13:22:15 +02:00
4dc698a6be
Added navigation menu item 'Lehrveranstaltungen' > 'LV Template Uebersicht'
2024-08-21 13:17:54 +02:00
3963358d95
Added getTemplateLvTree method to Lehrveranstaltung_model.php
...
This method gets all Templates and unions with all Lehrveranstaltungen of given Studiensemester and Oes, that are assigned to
a template. This data structure can be used for nested tabulator data tree.
2024-08-21 13:16:22 +02:00
a2f9fba896
Bugfix: Favorites: Correct loading procedure for Prestudent-Subverbände
2024-08-21 12:50:58 +02:00
a594ddeb75
AntragJob: Abmeldungen durch Stg config mismatch
2024-08-19 13:08:12 +02:00
f771b54f10
StV: Favorites use now correct API return functions
2024-08-14 09:16:11 +02:00
2c6212f75f
fix reuse of for multiple purposes overwriting each other
2024-08-14 07:36:14 +02:00
30396b3f0e
Merge remote-tracking branch 'origin/feature-40728/Issues_logik_auslagern_in_eigene_library' into feature-39161/PV21_Valorisierung
2024-08-13 18:32:15 +02:00
8a9e040554
added Gehaltstyp model
2024-08-13 16:57:05 +02:00
2bd578edb3
remove unused Abstract_Searchbar_Controller
2024-08-13 16:42:09 +02:00
3a466e8e0f
puts nav-toggle and nav-menu-items in a sticky container
2024-08-13 15:27:51 +02:00
8bc8c67f8d
better comments
2024-08-13 15:10:23 +02:00
36bd1795ed
makes the cis4 side menu sticky
2024-08-13 15:04:44 +02:00
e24c610bf1
Studiensemester now: change getAkt to getNearest
2024-08-13 14:59:54 +02:00
2e3576b06e
Bugfix: Advance Status: object in array
2024-08-13 14:34:53 +02:00
50a96b3e4f
Prestudent History: Wrong Function for Permissioncheck
2024-08-13 14:20:40 +02:00
5d169e188a
move permissions from abstract to concrete Notiz Controller
2024-08-13 14:12:55 +02:00
4fc61c342c
Prestudent Permissions
2024-08-13 13:52:04 +02:00
f8f352fe65
Students Permissions
2024-08-13 13:41:35 +02:00
a988ff20c8
Notiz Permissions
2024-08-13 13:38:09 +02:00
6fb050fa58
Tab Config Permissions
2024-08-13 13:32:29 +02:00
f9a41b9685
Studienplan & Studiensemester => Auth Controller
2024-08-13 13:25:10 +02:00
e5217afc09
ZGV Ausstellungsstaat
2024-08-13 13:10:11 +02:00
3d07aa3bd0
UDFs Prestudent aktivieren
2024-08-13 11:29:24 +02:00
761ec96662
Bugfix: uft8 json & codequality
2024-08-13 11:20:32 +02:00
db8e2bfb69
Interessent hinzufügen und Notenkarteireiter ausblenden
2024-08-13 11:01:49 +02:00
Johann Hoffmann