Commit Graph
18389 Commits
Author SHA1 Message Date
SimonGschnell 6eeeb8b4b7 send email 2024-02-15 15:09:41 +01:00
SimonGschnell 279fbe51c3 sendMail function now gets all the studiengang emails of an active student or sends the mail to personalverwaltung if it is a mitarbeiter 2024-02-15 14:24:07 +01:00
Johann Hoffmann afa00caa4c Merge remote-tracking branch 'origin/feature-34543/UX_Template' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
# Conflicts:
#	system/filtersupdate.php
2024-02-15 14:16:33 +01:00
SimonGschnell fd260a6307 changes the check if a user has permissions to accept or deny a profil update 2024-02-15 09:59:27 +01:00
Cris caa7ad6cc4 Merge remote-tracking branch 'origin/feature-34543/UX_Template' into feature-34543/UX_Template 2024-02-15 09:54:51 +01:00
cgfhtw 3322f5115a FhcApi: Clean return value 2024-02-15 09:41:11 +01:00
cgfhtw f5b5f39689 FhcApi: return value 2024-02-14 16:00:48 +01:00
SimonGschnell 028be08ec3 fixes little bug with profil update checking 2024-02-14 14:38:21 +01:00
SimonGschnell 5758d7cf4f overrides old zustelladressen/kontakte when changing or adding a new zustelladresse/kontakt 2024-02-14 14:18:31 +01:00
SimonGschnell b655c4021a instead of calculating how many zustelladressen or zustellkontakte a user has in the backend, it is calculated in the client side to prevent an extra api call 2024-02-14 11:42:20 +01:00
SimonGschnell 65a9b8c80f little fix 2024-02-14 09:01:40 +01:00
SimonGschnell bfba05753e also shows the zustellungs warning when there is more than one kontakt marked as zustellung 2024-02-14 08:56:25 +01:00
SimonGschnell 5ee241d914 now editAdressen shows a warning message if a new adresse is marked as zustelladresse 2024-02-13 15:30:23 +01:00
Cris 8f81426fa4 Corrected error when using alertMultiple and handleSystemMessage 2024-02-13 14:54:42 +01:00
cgfhtw 091d8509f0 Send E-Mails after Wiederholer deadline 2024-02-13 14:53:58 +01:00
Cris 6140e15139 Removed unused tabulatorAdditionalColumns property. Instead additional cols like 'action buttons' are now checked by index. 2024-02-13 14:53:01 +01:00
SimonGschnell 409221434a removes the checkbox for heimatadresse because it should not be changed by the user 2024-02-13 14:25:07 +01:00
SimonGschnell 66b843be1b hides the profil updates list if no profil update is present 2024-02-13 14:20:01 +01:00
SimonGschnell 1be8c27cb5 checks the permissions of a user when accepting or denying a profil update 2024-02-13 13:37:10 +01:00
Cris acb29c5c69 Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
# Conflicts:
#	application/views/templates/FHC-Footer.php
#	composer.json
#	public/js/components/Bootstrap/Modal.js
#	public/js/components/filter/Filter.js
#	public/js/plugin/FhcAlert.js
2024-02-13 11:54:55 +01:00
SimonGschnell 92f2f5108c refactor of Profil.php to reuse function functionalities 2024-02-13 11:39:57 +01:00
Cris 91f43665fd Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-02-13 10:54:14 +01:00
Cris 4d8dbb2e78 Created Core BaseLayout Component 2024-02-13 10:52:11 +01:00
Cris 565f89c884 Added phrases anrechnung, geloescht and aenderungGespeichert 2024-02-13 10:51:37 +01:00
ma0068 7ec24bfc7b Component Status: Tabelle 2024-02-13 10:45:00 +01:00
SimonGschnell 24b467cd90 show different options for address types if the user is a mitarbeiter or a student 2024-02-12 16:29:19 +01:00
SimonGschnell 9ac523c087 deletes column name from public.tbl_profil_update 2024-02-12 16:00:17 +01:00
SimonGschnell 4b898bd976 queries full name of user that created profil_update using join in Profil_update_model 2024-02-12 15:58:52 +01:00
ma0068 f4197f090b Component Gesamthistorie 2024-02-12 15:11:00 +01:00
SimonGschnell 78bffb1348 little bugfix 2024-02-12 14:08:26 +01:00
SimonGschnell 6aa0bbb037 fixed little bug with fileOutput 2024-02-12 12:27:15 +01:00
SimonGschnell a09a350338 berechtigungen für die Ansicht von Profil Update Dokumente 2024-02-12 11:30:49 +01:00
Cris e6774024b9 Merge branch 'feature-34543/UX_Template' of https://github.com/FH-Complete/FHC-Core into feature-34543/UX_Template 2024-02-12 11:25:07 +01:00
ma0068 824423f3ea Update Fkt getTypenStg() 2024-02-12 11:00:35 +01:00
ma0068 a21a5ce044 edit field priority only with right basis/prestudent 2024-02-12 09:18:33 +01:00
SimonGschnell b21d3448cb fixes some data handling errors in controller functions 2024-02-12 09:07:51 +01:00
SimonGschnell 90012856dc EditAdresse layout change 2024-02-09 15:21:53 +01:00
Andreas Österreicher b4d6a46426 Fixed Typo in phrase 2024-02-09 15:18:14 +01:00
SimonGschnell bbf6616cd9 corrects the display of links to attachments of a profil update request 2024-02-09 14:41:29 +01:00
SimonGschnell 43492add0b changes how files are attached/replaced to a profil update 2024-02-09 13:55:08 +01:00
Andreas Österreicher bffaea8dda Merge branch 'feature-36028/uebersetzungen_zahlungen' 2024-02-09 12:50:45 +01:00
Andreas Österreicher f5dacefbbe Merge branch 'master' into feature-36028/uebersetzungen_zahlungen 2024-02-09 12:50:00 +01:00
Andreas Österreicher 752408aa3a Fixed LineEndings 2024-02-09 12:49:14 +01:00
ma0068 898f40e8a5 hidden fields ZGV depending on Config entries 2024-02-09 12:14:14 +01:00
Andreas Österreicher e34ff8819c Merge branch 'feature-33981/testtool_text_kopieren_verhindern_erschweren' 2024-02-09 11:11:41 +01:00
cgfhtw ce9ebee57d CSS: fhc-header w/o bottom border 2024-02-09 11:10:03 +01:00
Andreas Österreicher 0a8a17e49f Merge branch 'feature-36197/reihungstest_auswertung_bewerberstatus_setzen' 2024-02-09 10:48:51 +01:00
cgfhtw 8c6c2b7e11 FilterCmpt: defaults & Bugfix 2024-02-09 09:32:02 +01:00
cgfhtw 6e85b37b0f Tabs: optional border 2024-02-09 09:31:26 +01:00
cgfhtw c3ec909448 CSS improvements 2024-02-09 09:30:59 +01:00