b5510f023e
Fixed Corner Case where wrong actual Studysemester ist retrieved if Start and End Dates are overlapping
2020-12-02 12:18:02 +01:00
0738f28144
Merge branch 'master' into feature-7434/Messages_Neue_Felder_zu_eingeloggtem_User_ergaenzen
2020-11-25 14:52:22 +01:00
119d5d99df
Fixed Query to get User for Messages by PersonID and OrganisationUnit
2020-11-23 16:18:43 +01:00
443caa91f2
Messaging sysntem: the internal email account is used only if the user
...
account is older then 24 hours
2020-11-09 10:45:25 +01:00
bf0ada5d1e
Merge branch 'feature-10172/Firmenhandy_von_FHC_nach_SAPSF'
2020-10-22 14:11:17 +02:00
a7d577baa5
person/Kontakt_model: added getZustellKontakt method for getting latest Zustellkontakt
2020-10-22 00:38:52 +02:00
048238a16f
Merge branch 'feature-9150/TableWidgetAdaptations_for_Sync-Projects-FHtoSAP'
2020-10-15 13:38:58 +02:00
e6a761abd7
Darstellungsfehler in OE-Widget behoben
2020-10-15 13:38:01 +02:00
a6e77b73c8
Merge remote-tracking branch 'origin/master'
2020-10-13 18:32:27 +02:00
15877dd914
Lehrveranstaltung_model getStudents: possible to get only active students
2020-10-13 18:32:09 +02:00
3b33b6bcdb
Formatierung des Betrags bei automatisierten Gegenbuchungen korrigiert
2020-09-18 11:55:52 +02:00
3309157a99
Merge remote-tracking branch 'origin/master'
2020-09-14 11:11:58 +02:00
080e3582cf
Mitarbeiter_model getPersonal: possible to reduce result to eonly certain uids
2020-09-14 11:11:44 +02:00
b365ac5611
Funktion zum Zahlungsausgleich hinzugefügt
2020-08-28 09:50:48 +02:00
8a4d2abfd9
Added Start and End Date to getAktOrNextStudiensemester
2020-08-20 20:33:17 +02:00
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
bc305dc86c
Merge branch 'master' into feature-6656/Worker_queue
2020-08-10 18:11:31 +02:00
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
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
1d2233152c
Added method getBetriebsmittel to Betriebsmittelperson Model
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-08-05 18:23:51 +02:00
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
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
625a95c830
Merge branch 'bugfix-8664/Richtiges_Pruefungsprotokoll_fuer_Incomings_laden'
2020-07-22 14:52:03 +02:00
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
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
21703cfc00
add functions to delete entries
2020-06-30 15:40:30 +02:00
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
1ef8b95c49
codex/Bisverwendung_model:
...
- getVerwendungen method: Verwendungen sorted by ende
2020-06-22 20:46:37 +02:00
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
32490dfc2d
organisation/Studiensemester_model->getLastOrAktSemester: changed query to get more data
2020-06-21 21:57:50 +02:00
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
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
c0693b3899
Merge branch 'master' into feature-6656/Worker_queue
2020-06-17 09:03:41 +02:00
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
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
1a1ef262c6
Merge branch 'feature-7384/Message_reply_from_FAS_does_not_change_aktionstyp_in_Infocenter'
2020-06-03 16:13:00 +02:00
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
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
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
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
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
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
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
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
3199d5e25f
Added Function for Loading Last Student Status of all Prestudents of a Person
2020-05-25 21:43:32 +02:00
28d0563fa5
Digital Pruefungsprotokoll is displayed for Bachelor/Master, English/German
2020-05-25 18:21:08 +02:00
784afe0044
crm/Prestudent_model getPrestudentWithZgv: added order for Bewerbungstermine
2020-05-14 13:40:34 +02:00
a1600c9f3a
CL/Messages_model->sendImplicitTemplate now writes the person log in any case
2020-05-13 17:55:56 +02:00
7e1f1acb22
Prestudent_model getPrestudentWithZgv: Bewerbungsfrist shown corretly evne if Prestudent from Drittland
2020-05-13 16:18:05 +02:00
704d39095b
- ressource/Mitarbeiter_model.php - improved getPersonal method
...
- person/Kontakt_model.php - added getFormaKontakttyp and get FirmenTelefon methods
2020-05-12 19:34:17 +02:00
Andreas Österreicher