Commit Graph

10843 Commits

Author SHA1 Message Date
OliiverHacker 47d7a4688f Zeiterfassung: Zeitausgleich und Krankenstand nur ganztägig eintragbar 2020-12-02 15:16:07 +01:00
OliiverHacker c33856ee50 Zeitsperren: User bekommt Warnhinweis bei auffällig langem Zeitraum 2020-12-02 12:57:54 +01:00
OliiverHacker a8227e1f91 Zeiterfassung: Tagesübergreifende Einträge verhindern 2020-12-02 11:58:51 +01:00
OliiverHacker 32a174d836 Zeiterfassung: Eintraege in der Zukunft 2020-11-30 11:09:49 +01:00
OliiverHacker 56c958319d fix bug in export 2020-11-12 15:49:45 +01:00
OliiverHacker f672cd2d53 user can enter project with projectphase even if not assigend to project 2020-09-24 11:14:32 +02:00
OliiverHacker 3d274645ac correct user 2020-09-24 08:52:33 +02:00
OliiverHacker 14fbfc7860 diplay date in error message 2020-09-24 08:48:59 +02:00
OliiverHacker 16fb610b3f impliment checks for ProjektPhase 2020-09-23 14:24:17 +02:00
OliiverHacker 4183e7f4f7 changed errormessage for projects that are already complited 2020-09-23 13:44:46 +02:00
OliiverHacker 49fb4d8afa sort csvExport 2020-09-23 13:16:07 +02:00
OliiverHacker 85c6aa08fc fix bug for empty projekt and projektphasen 2020-09-23 12:45:00 +02:00
Oliiver ad98fed84b additionally export projectphasen without project 2020-09-16 12:34:26 +02:00
Oliiver 82d7f4edd2 fix brackets; remove error_reporting 2020-09-16 09:37:31 +02:00
OliiverHacker a565b66751 display only projektphasen of the user 2020-09-10 13:07:51 +02:00
OliiverHacker 612c339305 only get project phases that user is assigned to in CSV Export 2020-09-10 10:39:33 +02:00
OliiverHacker e933cce0e8 add project ID to csv export 2020-09-10 09:29:39 +02:00
OliiverHacker 2e8ed786f4 impliment export 2020-09-09 13:05:28 +02:00
OliiverHacker 8173328c92 Merge branch '9502/csvImportChecks' of https://github.com/FH-Complete/FHC-Core into 9502/csvImportChecks 2020-09-09 10:51:23 +02:00
OliiverHacker e4f3139205 impliment zeitaufzeichnungs checks 2020-09-09 10:50:42 +02:00
Oliiver 37884b1f7e cleanup code 2020-09-08 09:49:57 +02:00
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