Commit Graph

729 Commits

Author SHA1 Message Date
Harald Bamberger 44b538885f use additional result variable 2025-06-12 11:40:24 +02:00
Harald Bamberger 57d71be792 revert change of loaded StudienplanModel name 2025-06-12 11:39:23 +02:00
Harald Bamberger 596535b1b9 Merge branch 'master' into merge_C4_25999_61235_61730 2025-06-12 09:51:56 +02:00
Harald Bamberger d6f92d23a0 Merge branch 'feature-62366/merge_C4_25999_61235_61730' into merge_C4_25999_61235_61730_testremerge 2025-06-11 14:56:57 +02:00
Harald Bamberger 7929a6b74b Merge branch 'feature-25999/C4_cleanup' into merge_C4_25999_61235_61730_testremerge 2025-06-11 14:51:09 +02:00
Harald Bamberger d83eb42a23 Merge branch 'feature-25999/C4_cleanup' into merge_C4_25999_61235_61730_testremerge 2025-06-11 14:49:26 +02:00
SimonGschnell 29f968f308 fix(Profil email extern):Profil endpoint does not provide the extern alias email if the benutzer has no alias defined 2025-06-11 11:24:18 +02:00
SimonGschnell 49c510537a fix(Profil Mailverteiler): adds safeguards and checks on the return value of the Mailverteiler of a person 2025-06-11 11:06:35 +02:00
SimonGschnell d2e8505689 refactor(Profil alias): checks if user has alias, creates extern alias email if available otherwise not 2025-06-10 14:49:30 +02:00
SimonGschnell 83d3f515de refactor(Modals and z-index): ensures dashboard modals are in the forground 2025-06-10 13:18:31 +02:00
SimonGschnell c080d1abb2 refactor(Rename Stundenplan to LvPlan):renames all methods and files from Stundenplan to LvPlan 2025-06-10 11:46:19 +02:00
Harald Bamberger d1264c7e5a Merge branch 'feature-61235/Cis4_Studium_Uebersicht' into merge_C4_25999_61235_61730 2025-06-03 16:14:00 +02:00
Harald Bamberger 96274a2a4a Merge branch 'feature-25999/C4_cleanup_testabgabe' into merge_C4_25999_61235_61730 2025-06-03 10:29:33 +02:00
Harald Bamberger fb01629ec1 Merge branch 'feature-25999/C4_cleanup_testabgabe' into feature-25999/C4_cleanup 2025-06-03 10:29:01 +02:00
SimonGschnell a5bb72baf6 feature(Stundenplan Moodle Events Dependency Injection): injects moodle components dependency to the Stundenplan 2025-05-28 12:30:38 +02:00
SimonGschnell a0fb34420e fix(Stundenplan API):corrects little bug with if statement check 2025-05-27 14:30:34 +02:00
SimonGschnell b5bacbbf75 refactor(Studium): changes the query to fetch lehrveranstaltungen for the studienplan 2025-05-23 12:02:13 +02:00
Harald Bamberger 126b2d388b fix upload and adapt styling of Abgabetool Student 2025-05-22 18:55:34 +02:00
SimonGschnell a1423c33e5 update(Studium): fetches the preselect lehrverband values if the user is a student 2025-05-21 14:12:16 +02:00
Harald Bamberger b8d0037e16 Merge branch 'feature-25999/C4_cleanup' into feature-61235/Cis4_Studium_Uebersicht 2025-05-14 15:43:04 +02:00
ma0048 6e56de1790 null werte abgefangen 2025-05-14 08:33:25 +02:00
SimonGschnell 7d095b4998 feature(Studium LvModal): checks whether the lv has stundenplan entries and disables menu option if not/ checks the lvevaluierung information and adds it to the lvmodal information 2025-05-07 11:03:12 +02:00
SimonGschnell b5d3bf3f1e update(Cis4 Studium): finilizes Studium feature 2025-05-06 13:30:06 +02:00
Harald Bamberger 05de9cd94a move logic processing moodle events from core to moodle addon 2025-05-06 13:24:08 +02:00
SimonGschnell eae44bc634 update(Studium): loads lehrmodule and lehrveranstaltungen for studienplan and displays the ui with the lvModal 2025-05-02 11:23:39 +02:00
SimonGschnell 9b895fbd23 feature(Studium API endpoinds): adds the api endpoints for the Studium View to get the studienplan from a studiensemester/studiengang/semester 2025-04-30 13:45:01 +02:00
Harald Bamberger 7d3ffdde7b fix api endpoint http error 500 when stundenplan_events is null or empty array 2025-04-29 17:15:32 +02:00
Johann Hoffmann d791a6d3ef phrasen & change email template name to under 32 characters long 2025-04-29 15:03:10 +02:00
Johann Hoffmann 38424bc875 serientermin anlegen mitarbeiter; deadline overview mitarbeiter; 2025-04-29 14:36:40 +02:00
Johann Hoffmann a5ab2f1381 match abgabetool_detail student/mitarbeiter look&feel; WIP terminserie, zweitbetreuer logic etc 2025-04-25 14:30:12 +02:00
Johann Hoffmann 54e8a855f4 Merge branch 'master' into feature-25999/C4_cleanup
# Conflicts:
#	public/js/apps/Dashboard/Fhc.js
#	public/js/components/Cis/Cms/Content.js
#	public/js/components/Cis/Cms/News.js
#	public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
#	public/js/components/Cis/Mylv/LvUebersicht.js
#	public/js/components/Cis/Stundenplan/Stundenplan.js
#	public/js/components/DashboardWidget/Ampel.js
#	public/js/components/DashboardWidget/News.js
#	public/js/components/DashboardWidget/Stundenplan.js
#	public/js/components/DashboardWidget/Url.js
#	system/phrasesupdate.php
2025-04-25 10:58:02 +02:00
Johann Hoffmann 97d83d3acf WIP abgabetool mitarbeiter 2025-04-25 09:59:41 +02:00
Johann Hoffmann e28067259b WIP Abgabetool Mitarbeiter DetailComponent 2025-04-23 13:59:31 +02:00
Harald Bamberger 3669e0df40 check if entry in tbl_studentlehrverband exits and update or insert on result 2025-04-15 08:24:16 +02:00
Johann Hoffmann 2759bb0309 cis4 abgabetool student uploads/signature check/emails working; TODO: - testing with diff users, styling & mobile layout; 2025-03-19 15:57:08 +01:00
SimonGschnell 0dd1e4a628 refactor(RoomInformation): updates the roomInformation endpoint to use the Stundenplan library functions 2025-03-13 10:29:23 +01:00
Johann Hoffmann 669752dd90 WIP cis4 abgabetool student 2025-03-12 13:41:01 +01:00
Cristina 3a83d468ef Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite 2025-03-06 09:50:55 +01:00
Cristina aab0dd7fc7 Added / Adapted Model queries and api Controller regarding for Lehrveranstaltung- and Studienjahr Model 2025-03-06 09:40:40 +01:00
Harald Bamberger bd7669ff5b Merge branch 'merge_FHC4_C4' 2025-03-05 17:37:16 +01:00
Harald Bamberger 00b766cb69 tweak mobility form behavior 2025-03-05 17:35:27 +01:00
SimonGschnell c677c48b00 fix(StudiengangsInformationen API data): fixes little error when checking if the uid is a mitarbeiter or not 2025-03-05 10:47:45 +01:00
SimonGschnell 415e759586 fix(StudiengangsInformationen API data): fixes little error when checking if the uid is a mitarbeiter or not 2025-03-05 08:54:26 +01:00
ma0068 188e6db759 bugfix: update sqls with LEFT condiiton 2025-03-05 08:49:42 +01:00
ma0068 d5eae17ba5 extend queries for lehrveranstaltung_id to see dropdown 2025-03-04 13:49:39 +01:00
Harald Bamberger 93ff868501 ensure student_uids is an array even if only one uid is passed 2025-03-04 11:23:46 +01:00
ma0068 701c57966f tab contact - field plz: numberformat validation only for Austria 2025-03-04 10:53:03 +01:00
Johann Hoffmann e4317f7a94 mobile breakpoints & form validation; 2025-03-03 15:57:55 +01:00
Johann Hoffmann 225d6b0a83 raumsuche student config for allowed roomtypes 2025-03-03 13:51:43 +01:00
ma0068 50ec93f5c1 extend function getLesFromLvIds for studiensemesterkurzb and aggregation lehreinheit_id 2025-03-03 13:43:19 +01:00