blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-06 05:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,245 Commits 229 Branches 6 Tags
bhdev_rollup
Commit Graph

2839 Commits

Author SHA1 Message Date
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
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
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 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
alex 1ef8b95c49 codex/Bisverwendung_model: 
- getVerwendungen method: Verwendungen sorted by ende
 2020-06-22 20:46:37 +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
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
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
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
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
Cris d35ee0c834 Adapted method to retrieve user fields when method is called by a cronjob 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-06-02 15:06:22 +02:00
Cris 8b80f2226e Added logic for cronjob to add senders fields into message body 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-06-02 15:03:31 +02:00
Andreas Österreicher 944b46c352 Merge branch 'feature-7772/Digitalisiertes_Pruefungsprotokoll' 2020-05-29 15:11:55 +02:00
KarpAlex 466264befe Prüfungsprotokoll: 
- changed phrases
- added notice  that grade cannot be set when Einverständniserklärung is not checked
 2020-05-29 13:00:31 +02:00
KarpAlex f03ed2f666 Prüfungsprotokoll: 
Verfassungscheck is not checked by default, if no grade filled out
 2020-05-29 10:48:00 +02:00
KarpAlex bc32a643f1 Prüfungsprotokoll: 
- phrases: multilingual database fields shown depending on language (e.g. beurteilung, studiengang,...
- added phrases
- added timepicker css
- if student not in condition, time can still be filled out
 2020-05-28 20:53:21 +02:00
Andreas Österreicher 2fc0b0f0ce Prüfungsprotokoll 
- Löschen von Abschlussarbeiten mit freigegebenem Protokoll wird verhindert
- Berechtigungen für web User erteilt damit protokoll gespeichert werden kann
 2020-05-28 19:36:08 +02:00
KarpAlex f1a346c545 Prüfungsprotokoll: 
- new fields: beginnzeit, endezeit, Prüfungsantritt
- Einverständniserklärung: if not checked no save possible
- can be saved and freigegeben
- added phrases
 2020-05-28 11:08:38 +02:00
Cris 4f1796ee9d Added logic to add message vars data of logged in user into message body 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-05-28 09:48:31 +02:00
Cris ebd9c2c0ba Added method to retrieve message vars data of the logged in user 
This method retrieves the specific data of the logged in user to be
used in 'Meine Felder'

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-05-28 09:46:15 +02:00
Andreas Österreicher 772c4fa308 Prüfungsprotokoll Übersichtsliste für Vorsitz hinzugefügt 2020-05-28 09:44:52 +02:00
Cris 634401485a Renamed 'Meine Felder'-msg names and small method adaptation to retrieve fields 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-05-28 09:42:51 +02:00
Andreas Österreicher 744cf8945a Wartende Jobs angepasst damit Tage als Parameter akzeptiert werden statt Monate 
Emfpänger korrigiert damit nur ein Infomail pro Person verschickt wird
 2020-05-27 12:06:52 +02:00
Cris a5e0c9ca5a Added logic to provide fields of logged in user in Messaging system 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-05-27 11:52:12 +02:00
Cris 7ab2155d6a Added method to retrieve data of logged in user in Message model 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-05-27 11:49:35 +02:00
Cris 1be1d1c8e9 Added GUI for 'Eigene Felder' + layout adaptations 
. GUI: added multidropdown 'Eigene Felder', which contains fields of
the logged in user
. Layout: Message text area has now min and max height; sending
button now aligned correctly; multidropdowns now aligned to text area

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-05-27 11:48:05 +02:00
Andreas Österreicher 3199d5e25f Added Function for Loading Last Student Status of all Prestudents of a Person 2020-05-25 21:43:32 +02:00
KarpAlex 28d0563fa5 Digital Pruefungsprotokoll is displayed for Bachelor/Master, English/German 2020-05-25 18:21:08 +02:00
Andreas Österreicher 08b0a7bf08 Merge branch 'hotfix/DigitalerLehrauftrag_Sprache_umschalten' 2020-05-20 08:49:30 +02:00
Andreas Österreicher 3d52c4b598 Merge branch 'bug-7422/Bewerbungsfrist_wird_falsch_angezeigt' 2020-05-20 08:38:57 +02:00
alex 784afe0044 crm/Prestudent_model getPrestudentWithZgv: added order for Bewerbungstermine 2020-05-14 13:40:34 +02:00