blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-01 19:09:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,123 Commits 228 Branches 6 Tags
d53f14eeea259004d2ccef8aef7f5caecfececce
Commit Graph

12123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Österreicher 25080188cc Merge branch 'MS_Wrong_sender_if_reply_message_with_token_if_message_recipient_ou' 2020-07-20 18:26:10 +02:00
Andreas Österreicher 476f1cd7a7 Merge branch 'feature-8815/Zahlungsbestaetigungen_sperren' 2020-07-20 18:17:17 +02:00
Andreas Österreicher 1e60c7667b Merge branch 'hotfix-Workaround_for_Chrome_bug_autofilling_username' 2020-07-20 18:10:38 +02:00
Andreas Österreicher 8658485dfe Merge branch 'feature-9141/Zeitaufzeichnung_SupportLink' 2020-07-20 18:02:09 +02:00
Cris 82c8ca7f80 Adapted logic to display Pruefungsprotokolle of certain time period 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-07-20 16:50:29 +02:00
Cris 618644d41f Added GUI buttons to display Pruefungsprotokolle of certain time period 
Possible time periods: today / last week / all

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-07-20 16:48:48 +02:00
raab 514c79c2dd Zeitaufzeichnung Supportlink 2020-07-20 10:21:42 +02:00
Cris c295aa53cf Fixed broken loop of Lehrgang-students 
Variable 'result' for email-query was overwriting the main variable
'result' to loop through student-query. Fixed now.

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-07-15 15:47:48 +02:00
Cris 212a879077 Modified to accept studiensemester as GET-parameter 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-07-15 15:42:52 +02:00
Cris fcd7121801 Added: Hiding Zahlungsbestaetigungen in CIS and FAS 
If config entry ZAHLUNGSBESTAETIGUNG_ANZEIGEN is set to false,
confirmation of payments (Zahlungsbestaetigung) is not available.
CIS: zahlungen - page request will fail
FAS: downloading confirmation of payments will not be available
(hidden button)

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-07-15 12:51:51 +02:00
Cris 649d0e7f5d Fixed: retrieving correct Prüfungsprotokoll data for Incomings 
Study type (Bachelor/Master) and -kennzahl and -name are retrieved from
Studienordnung. Studienordnung is not assigned to Incomings, so this data
was missing.
. Now study type is always retrieved from Abschlusspruefung.
. If no Studienordnung is provided, studykennzahl and -name are retrieved
from Student.

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-07-14 17:40:47 +02:00
Cris 638c095e86 Added new xml field in Standortcode in container Lehrgangmeldung 
Added xml field Standortcode in container Lehrgangmeldung > Lehrgang > StudentIn.
The default value should be set in config-file.

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-07-13 14:34:03 +02:00
Cris 3ccc0eb753 Added new XML fields in container StudentIn + Plausichecks 
Added this new fields + validation checks for:
. AkadGradeVorname
. AkadGradeNachname
. bPK
. ZustellPLZ
. ZustellGemeinde
. ZustellStrasse
. ZustellNation
. coName
. eMailAdresse

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-07-07 14:39:47 +02:00
Cris de5ae4bdca Minor correction of former error-log output 
For better readability a comma will be set to seperate error messages.

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-07-07 14:34:15 +02:00
Cris 5ec1583777 Added new validation checks in container IO 
Added new validation checks (plausichecks) for:
. Aufenthaltszweckcode
. Aufenthaltsfoerderungscode
. ECTS erworben
. ECTS angerechnet

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-07-07 14:31:13 +02:00
Cris a6b5cc71e4 Added new XML fields in container StudentIn + Plausichecks 
Added this new fields + validation checks for:
. AkadGradeVorname
. AkadGradeNachname
. bPK
. ZustellPLZ
. ZustellGemeinde
. ZustellStrasse
. ZustellNation
. coName
. eMailAdresse

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-07-07 14:26:43 +02:00
Cris 1ba0695829 Changed co_name char length from 64 to 256 
Adapted to AQ Austrias requirement for BIS.

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-07-02 12:25:51 +02:00
Cris 998127740f Added co_name to FAS Adressedialogue/-fields & to class Adresse 
This new field co_name = Abweichender Empfaenger is required for
BIS Meldung.

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-07-02 12:08:19 +02:00
Cris 2d86477e1b Added column co_name to tbl_adresse (= Abweichender Empfaenger) 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-07-02 12:04:30 +02:00
Nikolaus Krondraf 21703cfc00 add functions to delete entries 2020-06-30 15:40:30 +02:00
Cris ebb6484f3d Chrome-bug: Force Chrome to autofill username in hidden input field 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-06-30 10:04:18 +02:00
alex 507be8c673 Merge remote-tracking branch 'origin/feature-6656/Worker_queue' into feature-6656/Worker_queue 2020-06-26 23:18:01 +02:00
alex f820fa76fb ressource/Mitarbeiter_model.php: possible to get Personal with personalnr >= 0, for excluding accounts like e.g. alumni 2020-06-26 23:17:37 +02:00
Manfred Kindl c53e6ce28d Merge remote-tracking branch 'origin/master' 2020-06-26 12:51:38 +02:00
Manfred Kindl 433c2af8a5 Quickfix Kontofilter Offene Gegenbuchungen 2020-06-26 12:51:31 +02:00
Andreas Österreicher 7ba3c49a35 Sperre für Kontobuchungen hinzugefügt die bereits ins SAP übertragen wurden. 2020-06-25 21:40:14 +02:00
alex 1ef8b95c49 codex/Bisverwendung_model: 
- getVerwendungen method: Verwendungen sorted by ende
 2020-06-22 20:46:37 +02:00
Andreas Österreicher 96a9662559 Removed useless Code that causes PHP notices 2020-06-22 19:37:13 +02:00
alex 5b264bb6a9 codex/Bisverwendung_model: 
- added getVerwendungen method
person/Benutzer_model
- added comment
person/Benutzerfunktion_model
- added getBenutzerFunktionByUid method
ressource/Mitarbeiter_model
- added getVorgesetzte method
- extended getPersonal method
 2020-06-22 11:20:27 +02:00
Paolo 32490dfc2d organisation/Studiensemester_model->getLastOrAktSemester: changed query to get more data 2020-06-21 21:57:50 +02:00
Andreas Österreicher 6ee2a0b47e Merge branch 'feature-8274/TimesheetOnlyFixangestellte' 2020-06-19 14:25:22 +02:00
gerryraab 83469bac67 Timesheet: show only fixangestellte 2020-06-19 14:05:54 +02:00
Manfred Kindl 7604b0ae64 Anzeige Protokoll im FAS 2020-06-18 13:59:01 +02:00
Manfred Kindl 8a52169bda Textkorrektur Diplomasupplement 2020-06-18 13:58:22 +02:00
Paolo 596494708d CL/Messages_model->prepareHtmlRead changed to redirect to an 
authenticated controller to reply to a message in case the receiver
is the the system sender
 2020-06-17 14:57:01 +02:00
Andreas Österreicher 5bd62e9ac8 Merge branch 'feature-7274/SAPSF_neuer_User_wird_aus_SF_geholt_und_im_FHC_angelegt' into feature-6656/Worker_queue 2020-06-17 12:25:01 +02:00
Andreas Österreicher c0693b3899 Merge branch 'master' into feature-6656/Worker_queue 2020-06-17 09:03:41 +02:00
Andreas Österreicher e8272a1757 Datenverbund Schnittstelle UUID zu Simple Requests hinzugefügt 2020-06-15 14:33:42 +02:00
Andreas Österreicher 623028ae62 Merge branch 'bug-7983/Pruefungsprotokoll_Speichern_ohne_Note' 2020-06-15 13:18:54 +02:00
alex 7ce489e847 - added iso3166_1_a3 field to bis.tbl_nation 
- person/kontakt_model: renamed getFirmenTelefon to getFirmentelefon, separated vorwahl from telefonklappe
 2020-06-10 10:11:19 +02:00
alex c2e9d27909 - Pruefungsprotokoll can be saved even when no grade provided 
- removed console log
 2020-06-09 13:09:35 +02:00
Cris 742c9fa857 Check that user is an active employee in message-cronjob 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-06-04 11:33:58 +02:00
Nikolaus Krondraf d5019289f5 Absolventen können sich nun auch zu Prüfungen anmelden 2020-06-04 09:49:33 +02:00
Andreas Österreicher 1a1ef262c6 Merge branch 'feature-7384/Message_reply_from_FAS_does_not_change_aktionstyp_in_Infocenter' 2020-06-03 16:13:00 +02:00
Andreas Österreicher ab128c0af0 Merge branch 'feature-7432/Notenuebernahme_keinePunkte_bei_Termin_1' 2020-06-03 16:10:34 +02:00
Andreas Österreicher 524e3f277e Merge branch 'feature-7529/Bundesadler_auf_Urkunden_im_Selfservice' 2020-06-03 15:45:24 +02:00
Nikolaus Krondraf b2644d2a17 Anzeige von Fehler- und Erfolgsmeldungen optimiert 2020-06-03 14:00:05 +02:00
Andreas Österreicher 5b76d2035e Merge branch 'feature-7387/AusbildungsvertragHerunterladen' 2020-06-03 13:05:51 +02:00
Cris 8304b4a1ae Adapted GUI: display user fields in tinymce-editor on doubleclick 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-06-02 16:31:52 +02:00
Cris 2906c1803e Changed 'Eigene Felder'-Alias: if alias is NULL, uid is used as alias 
This is to ensure the email is built correctly.

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-06-02 16:29:51 +02:00