Commit Graph

17414 Commits

Author SHA1 Message Date
Cristina deebe987d3 Added slot selectedItem to autocomplete component in Input.js 2025-10-01 13:51:43 +02:00
Cristina cb77f3148a Added method to get Stundenplantermine for Lehreinheit/Lehrveranstaltung 2025-10-01 13:50:57 +02:00
Cristina cb64c83b50 Added method to get LV-Leitung from given LV 2025-10-01 13:48:10 +02:00
Cristina ed747fe07c Merge remote-tracking branch 'origin/epic-56039/LV-Evaluierung' into epic-56039/LV-Evaluierung
# Conflicts:
#	application/models/education/Lehrveranstaltung_model.php
2025-09-03 15:26:39 +02:00
Cristina 10d58d1a42 Added column prestudent_id to getStudentsByLv method query in Lehrveranstaltung_model.php 2025-09-03 15:24:44 +02:00
Cristina fd2ff27e22 Added column prestudent_id to getStudentsByLv method query in Lehrveranstaltung_model.php 2025-09-03 15:24:07 +02:00
Cristina 594333889d Merge branch 'epic-56039/LV-Evaluierung_NEU' of https://github.com/FH-Complete/FHC-Core into epic-56039/LV-Evaluierung
# Conflicts:
#	system/dbupdate_3.4.php
#	system/phrasesupdate.php
2025-09-03 15:14:53 +02:00
Cristina 174ed990a7 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2025-09-03 13:06:47 +02:00
Andreas Österreicher edce5716fd Merge branch 'feature-63370/AnwesenheitenMicrotuning' 2025-09-02 15:50:45 +02:00
Andreas Österreicher 8e4f2143f2 Merge branch 'feature-61742/UHSTAT_Staatenlos_Meldung_geht_nicht2' 2025-09-02 15:15:40 +02:00
Alexei Karpenko 0782de0550 uhstat form: moved constant down for better readability 2025-09-02 15:09:15 +02:00
Alexei Karpenko 022fb26e92 uhstat1 form: removed staatenlos code from dropdowns 2025-09-02 15:08:58 +02:00
Andreas Österreicher e0a3df5d06 Merge branch 'feature-66775/UHSTAT_1_mit_normalem_login' 2025-09-02 14:59:52 +02:00
Johann Hoffmann fa6d651b21 phrasen & permissionLib/Phrases reference $param in lvMenuBuild event 2025-09-01 16:48:24 +02:00
Andreas Österreicher f18de90c67 Merge branch 'nscbrandb-env_routes' 2025-08-29 12:11:06 +02:00
Andreas Österreicher 014d2b68ae Merge branch 'bug-66817/ku_udfs' 2025-08-29 11:41:15 +02:00
Andreas Österreicher 4bc58ee946 Merge branch 'feature-66852/raum_content_anzeige_im_alten_cis' 2025-08-29 11:23:38 +02:00
nscbrandb d17f87be09 also take environment config into account 2025-08-29 10:35:27 +02:00
ma0048 7df383f45e hinzugefuegte spann class caps durch den parser entfernt 2025-08-28 08:36:20 +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 9a35ee5945 raum content im alten cis wieder auf tablesorter 2025-08-27 11:48:35 +02:00
chfhtw 2d2bbd1bb3 Bootstrap Modal Component: forward shown-bs-modal event 2025-08-27 10:20:41 +02:00
chfhtw 41d26246aa Form Input Component: add name & use autocomplete that was loaded in the CI View 2025-08-27 10:19:39 +02:00
Andreas Österreicher e366556992 Dienstverhinderung für Volksschultag hinzugefügt 2025-08-26 16:05:06 +02:00
Andreas Österreicher d8eac58ab1 Merge branch 'feature-61672/svnr_aus_infocenter_tool_entfernen' 2025-08-26 08:45:05 +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 866d95c4b8 Merge branch 'feature-62681/mc1_vorlage_v2025_07' 2025-08-25 14:12:54 +02:00
Andreas Österreicher 1025a8b461 Removed Duplicate Phrase 2025-08-25 11:19:20 +02:00
Andreas Österreicher 67290a5af8 Merge branch 'feature-61592/AnwesenheitenFinetuning' 2025-08-25 11:10:34 +02:00
Alexei Karpenko 531fae8ab5 enabled filling out UHSTAT1 form for logged in students 2025-08-23 16:46:26 +02:00
Harald Bamberger ad83228396 do not terminatewithsuccess in function called in db transaction because this results in the transaction being rollbacked 2025-08-19 17:34:23 +02:00
Harald Bamberger 905a2dadff terminate with error if receiver person_id or prestudent_id is not found 2025-08-19 17:18:57 +02:00
Harald Bamberger 1c86a6ad55 add validation callback wrapper method 2025-08-19 16:05:47 +02:00
Harald Bamberger a482016dee modal-dialog-scrollable 2025-08-19 13:58:41 +02:00
Harald Bamberger 2198ea95e4 use form.post instead of form.send since latter expects a promise 2025-08-19 13:51:09 +02:00
Harald Bamberger ef80a19a24 allow negative studiengang_kz in prestudent and orgform urls 2025-08-19 13:22:59 +02:00
Johann Hoffmann c5001f87bd modal header flex container for buttons (close, expand); 2025-08-19 11:03:23 +02:00
Harald Bamberger ba7f59de24 Merge branch 'bug-63358/CIS4_Kalendar_Widget_Deutsch_English_Tagesname_schalten_nicht_um' 2025-08-19 10:56:34 +02:00
Johann Hoffmann 9707258e62 Merge remote-tracking branch 'origin/master' into feature-61592/AnwesenheitenFinetuning
# Conflicts:
#	public/js/components/Bootstrap/Modal.js
#	system/phrasesupdate.php
2025-08-19 09:43:30 +02:00
chfhtw f50171ad9a Calender: track locale change for day & list mode 2025-08-18 15:38:35 +02:00
Harald Bamberger 6d7429eb8e Merge branch 'feature-62779/xul_abloese_haustechnik_schluesselverwaltung' 2025-08-14 18:10:36 +02:00
Harald Bamberger b9e3c47be9 Merge branch 'master' into feature-62779/xul_abloese_haustechnik_schluesselverwaltung 2025-08-14 18:03:36 +02:00
Harald Bamberger 5119858c12 Merge branch 'feature-63411/Notizen_Anzahl_im_Tab_Header_anzeigen' 2025-08-14 17:52:47 +02:00
Harald Bamberger ed00c8d0ae add permission for new function in Core_Notizcontroller to NotizPerson Controller 2025-08-14 16:45:52 +02:00
Harald Bamberger 83d98c258e stv Notiz Controller add permission for new function getCountNotes 2025-08-14 16:36:00 +02:00
Harald Bamberger aaf9e8c885 revert to popupModal to stay consistent with other stv tabs 2025-08-14 16:16:53 +02:00
Harald Bamberger aa3e1ad1d1 Merge branch 'merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231' into feature-63411/Notizen_Anzahl_im_Tab_Header_anzeigen 2025-08-14 15:24:42 +02:00
Harald Bamberger 1092463beb show count of notes in tab title 2025-08-14 15:23:42 +02:00
Harald Bamberger 33fbbde99f Merge branch 'master' into feature-63411/Notizen_Anzahl_im_Tab_Header_anzeigen 2025-08-14 12:32:07 +02:00
Harald Bamberger 79506319a0 Merge branch 'master' into merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231 2025-08-14 12:31:47 +02:00