Commit Graph
1549 Commits
Author SHA1 Message Date
Andreas Österreicher b5d44de0b4 Merge branch 'feature-66843/infocenter_studentenverwaltung_verlinkung' 2025-09-22 14:15:49 +02:00
Andreas Österreicher efcc4b8ea5 Merge branch 'feature-62331/infocenter_anmerkung_zur_bewerbung_weiterleiten' 2025-09-22 13:59:13 +02:00
Alexei Karpenko 473715c25c Merge branch 'master' into feature-40314/Electronic_Onboarding_Anbindung_IDA 2025-09-18 17:39:31 +02:00
ma0048 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
Johann Hoffmann ce9f0536d6 Merge branch 'master' into feature-61164/AbgabetoolQualityGates 2025-09-17 16:40:53 +02:00
Johann Hoffmann 4e598a321d wip add new abgabe wizard 2025-09-08 10:44:41 +02:00
Andreas Österreicher 9067f0e00a Merge branch 'master' into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader 2025-09-05 12:48:33 +02:00
Andreas Österreicher e0a3df5d06 Merge branch 'feature-66775/UHSTAT_1_mit_normalem_login' 2025-09-02 14:59:52 +02:00
Johann Hoffmann a560c335b8 WIP responsive tabulator collapse abgabetool; paabgabe notiz column; 2025-09-02 13:35:42 +02:00
Alexei Karpenko 1d634a2530 uhstat form: bewerbungstool user data is loaded if there is a login, normal logged in user data otherwise. renamed methods, removed unnecessary model loads 2025-08-27 16:23:58 +02:00
ma0048 045b764d65 studentenverwaltung im infocenter verlinkt 2025-08-26 12:40:27 +02:00
Andreas Österreicher c6d04c7490 Merge branch 'master' into feature-61672/svnr_aus_infocenter_tool_entfernen 2025-08-26 08:43:22 +02:00
Andreas Österreicher 703872adc9 Merge branch 'master' into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader 2025-08-20 11:14:40 +02:00
Johann Hoffmann 2f7fe05d21 mobility legende; TopCalc Row (sum, negative, prueflinge); fix row selection issues; 2025-08-18 11:25:38 +02:00
Johann Hoffmann 3c9db86df2 Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4
# Conflicts:
#	application/config/routes.php
#	application/controllers/api/frontend/v1/Lehre.php
#	application/models/education/Lehrveranstaltung_model.php
#	application/views/CisRouterView/CisRouterView.php
#	public/js/apps/Dashboard/Fhc.js
#	system/phrasesupdate.php
2025-08-07 15:17:10 +02:00
ma0048 2b7f56622c Merge branch 'master' into feature-60973/komponente_fuer_lehrfaecherverteilung
# Conflicts:
#	application/models/education/Lehrveranstaltung_model.php
#	application/models/organisation/Studienplan_model.php
#	application/models/person/Notiz_model.php
#	application/models/ressource/Mitarbeiter_model.php
#	public/js/components/Stv/Studentenverwaltung.js
#	public/js/components/Stv/Studentenverwaltung/Verband.js
#	system/dbupdate_3.4.php
#	system/phrasesupdate.php
2025-08-07 11:03:05 +02:00
Harald Bamberger 66caf47d98 Merge branch 'merge_C4_25999_61235_61730' into rc1_FHC4_C4 2025-08-01 15:54:22 +02:00
Johann Hoffmann e58bf3a8cf WIP noten/pruefung import 2025-08-01 09:48:46 +02:00
Johann Hoffmann 52d9e0a195 pruefungen columns pro datum nicht pro termintyp; row Selection & modal newPruefungForSelectedStudents mit linked multiselect dropdown; WIP antritte berechnen 2025-07-25 12:50:51 +02:00
Johann Hoffmann 6a3982347b teilnoten/punkte berechnen für notenvorschläge; vorschläge übernehmen; noten freigabe mit passwort; prüfungen generisch anzeigen nach datum gruppiert; prüfungen anlegen/bearbeiten auf mapping termin1/2/3 möglich. 2025-07-24 17:02:57 +02:00
chfhtw 26b40866fc CSS updates 2025-07-16 13:51:37 +02:00
chfhtw 77e5dfeb9a add Luxon 2025-07-15 11:18:01 +02:00
Johann Hoffmann fe7feeb74e Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4 2025-07-15 09:51:11 +02:00
ma0068 179b50c798 fixed js-warnings
- Extraneous non-props attributes
 - duplicate html code
 - html template error
2025-07-10 14:27:54 +02:00
ma0048 aca49114be anmerkung zur bewerbung weiterleiten 2025-07-07 09:56:34 +02:00
ma0068 46a10bd92e page handling
- entry in main navigation menu
- import navigation component
- remove space side menu
2025-07-03 11:14:20 +02:00
Harald Bamberger 986d1cfb5f add aria-label to skip link and raumsuche tabulator links, move skip link to html body, change raumsuche h2 to h1 2025-06-30 17:02:45 +02:00
Alexei Karpenko 239eace246 registration links to Bewerbungstool: changed in infocenter and fas, studentenverwaltung so that user email is not verified 2025-06-27 23:14:56 +02:00
Harald Bamberger cac58a0fc2 Merge branch 'feature-60876/FHC4_Studierendenverwaltung_Funktionen_als_Corecomponent' into merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231 2025-06-20 11:48:11 +02:00
Andreas Österreicher 02df06288e Bugfix Rückstellgrund 2025-06-16 11:37:04 +02:00
Andreas Österreicher ce47579870 Merge branch 'master' into feature-55978/infocenter_electronic_onboarding_filter 2025-06-16 11:35:49 +02:00
Harald Bamberger 3adaf8a528 make logo configurable in theme, add fhcomplete logo as default 2025-06-12 16:57:27 +02:00
Harald Bamberger 596535b1b9 Merge branch 'master' into merge_C4_25999_61235_61730 2025-06-12 09:51:56 +02:00
ma0068 7d2da9e7f6 Merge master into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader 2025-06-06 11:46:31 +02:00
SimonGschnell b2419beca6 refactor(CIS4 MitarbeiterSeiten integration): updates the approveLehrauftrag view to include the CIS4 header and footer 2025-06-04 15:02:33 +02:00
SimonGschnell b752b475d9 update(Lehrauftrag Mitarbeiter View): adds the new CIS4-Header/Footer if in CIS4 context and updates minor layout problems 2025-06-04 11:18:02 +02:00
ma0048 f96bfbe000 lehrfächerverteilung v1 2025-05-28 07:51:10 +02:00
Harald Bamberger 4daf73ee6d Merge branch 'master' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231 2025-05-27 10:31:12 +02:00
Andreas Österreicher a52fcf1570 Merge branch 'feature-61601/Issue_Liste_hartcoded_eingeschraenkt' 2025-05-26 13:00:23 +02:00
Alexei Karpenko 660f195c57 issue list: removed empty space and removed const which was moved to config 2025-05-26 11:03:33 +02:00
ma0048 fce63eb31b svnr aus dem infocenter entfernt 2025-05-23 10:35:47 +02:00
Alexei Karpenko 80faf92dc2 made issue list configurable (apps, status, functions) 2025-05-22 18:41:26 +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
Harald Bamberger f6dd79b9a3 Merge branch 'feature-61231/FHC4_Studierendenverwaltung_Aufnahmetermine' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231 2025-05-21 16:31:29 +02:00
ma0068 c26bb98960 new Core Component Function
- autocomplete and dropdown field for search oes and search functions with active and non active entries
- possibility to dynamic styling of display switch, newButton in Tabulator, different editLabels
- possibility to show/hide column company
- possibility to show/hide to save function as copy
2025-05-21 15:34:43 +02:00
Harald Bamberger 5ed1bae456 Merge branch 'master' into feature-61231/FHC4_Studierendenverwaltung_Aufnahmetermine 2025-05-21 13:26:47 +02:00
Harald Bamberger b498da8603 Merge branch 'master' into feature-55992/FHC4_Studierendenverwaltung_Messaging 2025-05-21 13:18:43 +02:00
ma0048 419341f496 absage fuer alle und rueckstellung ueber infocenter uebersicht 2025-05-12 12:53:16 +02:00
Johann Hoffmann 5bbf05ac8a WIP Gesamtnoteneingabe Notenberechnung endpoint 2025-05-12 12:50:56 +02:00