Commit Graph

4101 Commits

Author SHA1 Message Date
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 a2dee4d6ba feature(FHC Core Renderer Event): adds the FHC Core renderer Event to the loadRenderer Event 2025-06-03 09:24:54 +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
Harald Bamberger d686ec0885 Merge branch 'feature-61730/Cis4_DashboardAnpassungen' into merge_C4_25999_61235_61730 2025-05-22 07:48:23 +02:00
Harald Bamberger a387533dc3 Merge branch 'feature-61235/Cis4_Studium_Uebersicht' into merge_C4_25999_61235_61730 2025-05-22 07:45:30 +02:00
Harald Bamberger f8438ee115 Merge branch 'feature-25999/C4_dark_theme' into merge_C4_25999_61235_61730 2025-05-22 07:44:42 +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 4e945648d0 Merge branch 'master' into feature-25999/C4_cleanup 2025-05-19 11:00:24 +02:00
Harald Bamberger bc4514b2a0 Merge branch 'master' into feature-40430/updateamum_von_im_AntragLib 2025-05-19 10:29:28 +02:00
SimonGschnell 4a10faeb25 update(Dashboard custom Section & additionalRow): the additional row is not removed when moving widgets and the custom section gets also created when created user_overrides 2025-05-19 10:28:15 +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
Harald Bamberger 7b9b1a762e Merge branch 'master' into feature-25999/C4_cleanup 2025-05-14 15:17:25 +02:00
Harald Bamberger 4bceddcc82 add systemerror_mailto ci config, render systemerror_mailto to FHC_JS_DATA_STORAGE_OBJECT, use FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto in FhcAlert Plugins 2025-05-09 13:58:14 +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
Harald Bamberger 5856f1c2ae Merge branch 'master' into feature-25999/C4_cleanup 2025-04-29 11:27:27 +02:00
Andreas Österreicher edcd2aa1df Merge branch 'feature-61464/infocenter_ausbildungssemester' 2025-04-28 13:23:38 +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
Harald Bamberger 9410388a7a tune order by to sort nearest active dv first 2025-04-24 15:40:58 +02:00
Harald Bamberger a196da03d2 change order by to ensure latest dv is sorted first 2025-04-24 10:52:47 +02:00
Johann Hoffmann e28067259b WIP Abgabetool Mitarbeiter DetailComponent 2025-04-23 13:59:31 +02:00
SimonGschnell 0c95dbad1f update(Dashboard Section description): adds phrases for the description of general/custom/other sections 2025-04-22 11:40:58 +02:00
SimonGschnell 8c00158d04 refactor(Dashboard Database data structure): changes how the data for the dashboard is structured in the database, instead of having a global widgets property, each section has its own widgets property where additional properties like description can be stored 2025-04-22 09:52:07 +02:00
ma0048 d4012232ab ausbildungssemester hinzugefuegt 2025-04-17 11:01:33 +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
Andreas Österreicher 2a2e2ea193 Warteliste Message angepasst damit die Tagesgrenze korrekt vom
Wartenden-Status ermittelt wird
2025-04-02 16:55:31 +02:00
Harald Bamberger e809e48262 fix order of parameters 2025-03-31 15:40:18 +02:00
Andreas Österreicher 392c15da77 Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite 2025-03-27 09:32:59 +01:00
ma0048 7126ab4561 - "Kaution" - column: buchungstyp von anzahlung auf kaution geandert 2025-03-24 14:33:34 +01:00