40 Commits

Author SHA1 Message Date
Alexei Karpenko ce9a4e2e09 Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren 2025-08-23 16:16:41 +02:00
ma0048 9ae78f2de6 master gemerged 2025-08-11 09:23:18 +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
Alexei Karpenko caa70715ad Merge branch 'merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren 2025-07-15 15:24:30 +02:00
ma0068 074403abf5 Tab Notizen: show Name of verfasser and bearbeiter 2025-06-11 17:27:33 +02:00
ma0048 f96bfbe000 lehrfächerverteilung v1 2025-05-28 07:51:10 +02:00
ma0068 bca95bcb66 change dateFormat Tab Notizen 2025-02-10 11:04:02 +01:00
ma0048 70b44c2202 Merge branch 'feature-40717/pep_faktor' into pep_deploy
# Conflicts:
#	public/js/components/filter/Filter.js
#	system/dbupdate_3.4.php
#	system/phrasesupdate.php
2024-12-13 11:50:53 +01:00
ma0048 8127091e2e - tags werden im fas nicht angezeigt
- class für tags hinzugefuegt
- prop confirmLimit hinzugefuegt
2024-12-11 13:25:38 +01:00
cgfhtw f1a2ef25c7 Remove unused functions 2024-08-08 12:45:36 +02:00
ma0068 a728bec15f BewerberZuStudent: new action turnIntoStudent 2024-07-11 10:52:59 +02:00
ma0068 fd0fb7c9b4 Refactor Notizcomponent: add Endpoint and core NotizController 2024-04-22 16:21:54 +02:00
ma0068 69067c1ef9 Notizcomponent refactor: fhcapi, validations, phrases, format dates 2024-04-12 10:48:40 +02:00
ma0068 d56dbdf563 Adaptierung Notizcomponent: teleport datepicker, tinymce mount conditionally, fehlerhandling missing id and type 2024-02-07 09:28:30 +01:00
ma0068 b8c885c8a4 Remove html-Tags in tabulator text 2024-01-24 09:04:53 +01:00
ma0068 bd4bbe0b7a Update response/error handling 2024-01-18 07:45:08 +01:00
ma0068 dc5368f346 Letzte Änderung 2024-01-17 13:23:52 +01:00
ma0068 28fe3ef839 Funktionserweiterungen um idType 2024-01-16 14:34:13 +01:00
ma0068 4526c10d30 temp 2024-01-11 12:56:36 +01:00
ma0068 db6e1add8a refactoring Fkt addNewNotiz 2024-01-11 07:37:46 +01:00
ma0068 83335d6d30 neue Component File, filehandling mit datatransfer 2024-01-09 12:55:35 +01:00
ma0068 ff6f23b3f4 Notiz löschen mit Dokumenten, Start Umbau Funktionen von person_id auf typ 2024-01-05 15:13:10 +01:00
ma0068 b07d9a9a63 single fileupload 2024-01-03 09:50:06 +01:00
ma0068 c2fb582db0 temp 2023-12-22 12:04:03 +01:00
ma0068 5d4ec93b09 Change Font-Size in Tabulator 5, Start Dateiupload 2023-12-20 11:39:28 +01:00
ma0068 798469dfcc Start Component Notiz und Tab Notizen 2023-12-14 16:01:18 +01:00
ma0048 52127ade60 fixed datumanzeige 2021-09-17 10:27:55 +02:00
ma0048 42d2f45561 bei den anmerkungen studiengang hinzugefuegt 2021-04-06 13:51:27 +02:00
Cris 00799f2f64 Adapted: Ordered Notizen to retrieve last inserted first
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-08 17:35:34 +01:00
Cris 5235915d6a Changed method getNotizByAnrechnung() -> added param titel
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 10:57:27 +01:00
Cris 8fc338ccb4 Added GUI/functionality to add begruendung for 'NICHT EMPFEHLEN' in lectors overview
. Begruendung is added as Notiz
. GUI to attach begruendung will slide down the moment 'Nicht Empfehlen'
is clicked
. added phrases

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-02 14:06:49 +01:00
Manfred Kindl 0439c19cb1 Infocenter Notices "Anmerkung zur Bewerbung"
When there is an extra content after "Anmerkung zur Bewerbung" e.g. "Anmerkung zur Bewerbung (BWI)" the notice is also displayed on top
2019-04-16 16:44:55 +02:00
alex 835fe48442 - freigabemessage to bewerber only sent once each freigabe per semester (bachelor only)
- moved RTfreigabe button to right and made bigger
- new Vorlagen for Messages
- Message also sent for Studiengangfreigabe
2018-12-10 11:45:12 +01:00
alex 53fcda3504 added infomail when interessent freigegeben 2018-02-23 10:06:46 +01:00
alex 8f0b4c3114 infocenter: added confirmation popup when student freigegeben/abgewiesen, non-interessent or prestudenten with interessentenstatus confirmed are view-only (infoonly), added Nation data to Prestudent and akte, bugfixes 2018-01-17 11:45:23 +01:00
alex 2b186d0c45 improved infocenter details, added bootstrap and admin theme (sb admin 2) , added zgv pruefung Status, Studiensemester and Ausbildungssemester, contacts in one table, nachzureichen and nachgereicht am columns 2018-01-08 09:55:13 +01:00
alex fa3daa7a57 Created infocenter details page showing Person Stammdaten, Dokumente, Prestudent ZGVs, Logs and Notizen. 2017-12-18 14:01:42 +01:00
bison-paolo a20bf91193 - Added functions isSuccess, isError and hasData in message helper
- Updated the code using these new functions
2016-10-14 15:04:15 +02:00
bison-paolo 3d4167c39f Changes to manage the specialization of a prestudent:
- Added method getSpecialization to controller Prestudent
- Added method postRmSpecialization to controller Prestudent
- Added method postSpecialization to controller Prestudent
- Added method getSpecialization to model Notiz_model
- Added method rmSpecialization to model Notiz_model
- Added method addSpecialization to model Notiz_model
2016-10-11 16:56:12 +02:00
Paminger 6836c3608d Models 2016-05-04 07:05:23 +02:00