Commit Graph

10822 Commits

Author SHA1 Message Date
OliiverHacker 2e44f58df9 check time in project for user input 2020-09-07 16:11:17 +02:00
OliiverHacker 6c857b7c24 cleanup var_dump 2020-09-03 15:25:33 +02:00
OliiverHacker 9250485cb3 check for time in csv import 2020-09-03 15:22:46 +02:00
Andreas Österreicher f2804fd2f6 Datenverbund pruefeBPK API um UUID erweitert 2020-08-19 09:47:47 +02:00
Andreas Österreicher fb05afb349 Datenverbund BPK Prüfung auf API Version 0.5 aktualisiert 2020-08-19 09:00:05 +02:00
Nikolaus Krondraf a44326c836 Studiengang zum Noten-Freigabemail hinzugefügt 2020-08-14 09:19:39 +02:00
Andreas Österreicher 176d153eb2 Merge branch 'feature-7697/SAPSF_erweiterte_Attributliste' 2020-08-13 17:29:37 +02:00
alex 676b3b3039 - added sanitizeProblemChars to common helper for sanitizing chars
- improved alias handling in benutzermodel
- added kurzbz handling to employeemodel
2020-08-12 21:33:08 +02:00
Andreas Österreicher 3f98d5106f Merge branch 'feature-6656/Worker_queue' 2020-08-11 07:35:45 +02:00
Andreas Österreicher bc305dc86c Merge branch 'master' into feature-6656/Worker_queue 2020-08-10 18:11:31 +02:00
Cris 93ecc89ebe Added method getPhones_byPerson to Kontakt model.
Gets all latest phones of person where zustellung is true. Ordered by
telefon > mobil > firmenhandy > else.

Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-08-06 10:32:45 +02:00
Cris 188319a1fc Adapted method getZustellAdresse of Adresse Model
Added param select.

Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-08-05 18:38:27 +02:00
Cris 1d2233152c Added method getBetriebsmittel to Betriebsmittelperson Model
Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-08-05 18:23:51 +02:00
Cris 2b0ff28c41 Added getAll_byPersonID in Kontakt Model
Get all latest contact data of person, where Zustellung is true.

Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-08-05 18:20:11 +02:00
alex bd388a03ad codex/Bisverwendung_model: getVerwendungen ordered by beginn by default
resource/Mitarbeiter_model: possible to retrieve Vorgesetzte within a timespan
2020-08-01 08:20:52 +02:00
Paolo 40766e7161 Added new public method getJobsByTypeStatusInput to controller core/JQW_Controller 2020-07-22 17:10:11 +02:00
Paolo a9ba3f039f Added new public method getJobsByTypeStatusInput to library JobsQueueLib 2020-07-22 16:51:38 +02:00
Paolo 73bf1fb050 Reverted changes added by commit be7ea871be 2020-07-22 16:47:41 +02:00
Andreas Österreicher 625a95c830 Merge branch 'bugfix-8664/Richtiges_Pruefungsprotokoll_fuer_Incomings_laden' 2020-07-22 14:52:03 +02:00
Andreas Österreicher 712cc635f5 Merge branch 'feature-8743/Alte_Pruefungsprotokolle_ausblenden' 2020-07-22 14:43:01 +02:00
Paolo 747d1d8d32 Fixed bug in application/core/JQW_Controller.php 2020-07-22 13:52:13 +02:00
Paolo 9c732a4870 Added utility methods updateJobs and generateJobs to controller core/JQW_Controller 2020-07-22 13:34:37 +02:00
Paolo ade81e5460 Merge branch 'feature-6656/Worker_queue' of https://github.com/FH-Complete/FHC-Core into feature-6656/Worker_queue 2020-07-22 01:00:04 +02:00
Paolo be7ea871be - Added new config entry job_schedulers_list to config/jqm.php
- Library JobsQueueLib:
	- Added constant JOB_SCHEDULERS_LIST
	- Constructor now loads the jqm configs
	- Added new public method schedule
2020-07-22 00:56:52 +02:00
alex 88e25524b3 person/Benutzerfunktion_model.php getBenutzerFunktionByUid method: added organisationseinheit_bezeichnung to Benutzerfunktionen, added sorting order (datumbis, datumvon) 2020-07-22 00:48:45 +02:00
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 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
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