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
Andreas Österreicher
7859559311
Merge branch 'bug-7422/Bewerbungsfrist_wird_falsch_angezeigt'
2020-05-14 13:04:41 +02:00
Paolo
a1600c9f3a
CL/Messages_model->sendImplicitTemplate now writes the person log in any case
2020-05-13 17:55:56 +02:00
Cris
f45f4f6987
Fixed check for external lector to display / hide infosheet correctly
2020-05-13 17:13:42 +02:00
KarpAlex
7e1f1acb22
Prestudent_model getPrestudentWithZgv: Bewerbungsfrist shown corretly evne if Prestudent from Drittland
2020-05-13 16:18:05 +02:00
Alexei
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
Cris
8be6552235
Added check if language isset in COOKIE in hlp_language_helper
2020-05-07 14:48:05 +02:00
Andreas Österreicher
b7a9f139af
Merge branch 'review/DigitaleLehrauftraege'
2020-05-05 08:03:13 +02:00
Alexei
e8648e52ec
person/Benutzer_model.php: generated alias string is sanitized (special characters, spaces,...)
2020-05-04 20:21:57 +02:00
Alexei
554fb2586a
person/Benutzer_model:
...
- added methods for generating alias and checking if alias exists
ressource/Mitarbeiter_model:
- added method getPersonal
2020-04-30 21:42:30 +02:00
gerryraab
364d754b51
Anpassung Datumsformat, Darstellung aller RTs des laufenden
...
Studienjahres
2020-04-27 15:52:47 +02:00
Andreas Österreicher
ec884fe372
Merge branch 'master' into feature-5491/UDFWidget_add_new_features
2020-04-21 15:59:09 +02:00
Andreas Österreicher
b935d7a175
Merge branch 'feature-6814/Infocentertool_nach_dem_RT_hinzugefuegte_Bewerbungen_auf_Detailseite_markieren'
2020-04-21 15:33:11 +02:00
Andreas Österreicher
4679701bcd
Merge branch 'feature-6963/Messaging_system_hide_button_to_write'
2020-04-21 15:16:38 +02:00
Andreas Österreicher
ebb6e1b90f
Fixed Phrasename for Back Button
2020-04-21 15:15:57 +02:00