Commit Graph

1999 Commits

Author SHA1 Message Date
KarpAlex cf7cfd7cd2 sorted results of geBetreuerOfProjektarbeit method of Projektbetreuer_model.php and added mitarbeiter data to the result 2022-01-21 05:15:36 +01:00
KarpAlex 094f75ef61 - Projektbetreuer_model.php: method getBetreuerOfProjektarbeit for getting Betreuer by betreuerart
- phrasesupdate.php: added Projektarbeitsbeurteilung phrases
2022-01-21 00:41:13 +01:00
ma0048 b8ac076bdb projektbeurteilungs uebersicht hinzugefuegt 2022-01-19 17:56:30 +01:00
Andreas Österreicher 6aae50fec9 Merge branch 'master' into feature-279/FAS_AliasgenerierungMitSonderzeichen 2022-01-17 15:51:44 +01:00
Andreas Österreicher 0d53b72583 Merge branch 'master' into Sonstiges-Sprint-176/Anrechnungen_Bugfixes 2022-01-17 10:32:37 +01:00
Andreas Österreicher df09807bb7 Merge branch 'feature-16425/infocenter_nachname_statt_uid' 2021-12-10 08:56:12 +01:00
Andreas Österreicher 6331ed5396 Merge branch 'feature-15889/infocenter_report_ueber_kuerzlich_abgewiesene' 2021-12-10 08:51:42 +01:00
ma0048 c3588b4eb4 studeingang hinzugefuegt bei der uebersicht 2021-12-09 20:27:08 +01:00
Andreas Österreicher 88ad75295d Merge branch 'master' into feature-7423/infocenter_udf_schule_job 2021-12-03 13:41:40 +01:00
Andreas Österreicher 78876fa807 Merge branch 'feature-16624/infocenter_firefox_anzeigefehler_dokumente' 2021-12-03 11:41:13 +01:00
Andreas Österreicher 84500652ef Merge branch 'feature-16191/inofcenter_bachelor_die_megssage_an_die_studiengaenge_deaktivieren' 2021-12-03 11:38:01 +01:00
Andreas Österreicher efa348456a Merge branch 'feature-15889/infocenter_report_ueber_kuerzlich_abgewiesene' 2021-12-03 11:27:48 +01:00
Andreas Österreicher b61a5a6f34 Merge branch 'feature-13735/message_ohne_gefundener_sprache' 2021-12-03 11:04:20 +01:00
ma0048 554a27cc01 anzeigefehler fixed dokpruefung 2021-12-02 21:06:56 +01:00
Andreas Österreicher 1613a9837b Merge branch 'master' into feature-279/FAS_AliasgenerierungMitSonderzeichen 2021-12-02 09:37:41 +01:00
ma0048 b2d46af0d6 wording und datum angepasst 2021-12-01 19:31:31 +01:00
Andreas Österreicher b4eb2d426a Lehrauftragsverwaltung - Anzeige von Nachname und Vorname bei Betreuungen vertauscht 2021-12-01 17:00:28 +01:00
ma0048 6800c42b90 nachname statt der uid anzeigen 2021-11-26 14:52:39 +01:00
ma0048 6f877acd7b Mail an Studiengang nur bei "Freigabe an Studiengang" - Button - Bachelor 2021-11-15 12:40:53 +01:00
ma0048 15176e7ce6 eigenen filter fuer abgewiesene studenten hinzugefuegt 2021-11-11 15:52:39 +01:00
Andreas Österreicher 6d69d572ee Merge branch 'feature-15795/DVUH_Mehrsprachigkeit' 2021-11-04 15:56:26 +01:00
Andreas Österreicher 01907c4901 Merge branch 'feature-3774/FilterWidget_change_Filter_settings_GUI' 2021-11-04 14:55:28 +01:00
KarpAlex fce92f78d4 Merge branch 'master' into feature-15795/DVUH_Mehrsprachigkeit 2021-11-04 12:05:32 +01:00
KarpAlex d339713d0b Issue Zuständigkeiten bugfix: zuständig = "Ja" if Zuständigkeit defined, even if there are other Zuständigkeiten defined 2021-10-30 09:45:46 +02:00
KarpAlex f5bc354199 ÖH-Beitragsverwaltung: changed phrase Öhbeitragsverwaltung to correct ÖH-Beitragsverwaltung (in menu and GUI) 2021-10-29 16:06:38 +02:00
KarpAlex 8068fb1c7c Issues list: added Hauptzuständig column to filter out issues assigned to other persons/oes than logged in user 2021-10-28 18:10:13 +02:00
ma0048 a31d33bcf9 in eigenes model 2021-10-27 17:59:52 +02:00
KarpAlex 8cc5be2c40 Issues GUI: added phrases 2021-10-25 19:14:59 +02:00
KarpAlex b0b49f7a41 moved errormonitoring menu entry to person category 2021-10-25 16:48:47 +02:00
ma0048 d269fd003d added new log to logdataname 2021-10-25 14:03:30 +02:00
ma0048 15ba3602f7 job fixed 2021-10-25 13:22:44 +02:00
ma0048 54f6d88901 Merge branch 'feature-7423/infocenter_udf_schule_job' into feature/infocenter_anpassungen 2021-10-25 10:37:14 +02:00
ma0048 29ae48bc48 udflib fixed fuer den infocenter udf schule uebernehmen job 2021-10-25 09:51:06 +02:00
ma0048 b74247a7f2 Merge remote-tracking branch 'origin/feature-15314/infocenter_abgewiesen_von_nicht_abgeschickten' into feature/infocenter_anpassungen 2021-10-22 07:13:22 +02:00
ma0048 d7364d08dd Merge remote-tracking branch 'origin/feature-15389/infocenter_automatische_abfrage_ob_bewerberin_vorhanden' into feature/infocenter_anpassungen 2021-10-22 07:13:06 +02:00
ma0048 3f003f8fc3 Merge remote-tracking branch 'origin/feature-15572/infocenter_zurueckgestellt_nicht_immer_erste_stelle' into feature/infocenter_anpassungen 2021-10-22 07:12:53 +02:00
Manfred bc2ed35aa4 Merge remote-tracking branch 'origin/master' 2021-10-21 17:16:58 +02:00
Manfred a72f6597b3 BugFix 9. und 10. Semester bei Lehrauftragsverwaltung
Manche Studiengänge haben ein 9. oder 10. Semester. Dieses muss auch bei der Lehrauftragsverwaltung aufscheinen.
2021-10-21 17:16:20 +02:00
KarpAlex 2a8d91119a Öhbeitrag Management GUI: using phrases 2021-10-21 05:48:18 +02:00
Harald Bamberger 44c1e65011 getBetriebsmittel add parameter to only retrieve aktive users 2021-10-20 15:48:34 +02:00
Paolo 458cd6ae0c - Added new phrase for the filter widget and fixed GUI tranlations
- Fixed error logs in public/js/FilterWidget.js
- Changed the behavior of the Apply and Save buttons for the FilterWidget
- Changed the GUI aesthetic of the FilterWidget settings
- Added new option reloadPage to the AjaxLib, to reload the page after the complete callback
- Added new classes to the public/css/FilterWidget.css
- Changed FilterWidgetLib->loadDefinition: added a new fallback to find a filter in the database for the currend FilterWidget
- Changed FilterWidgetLib->removeCustomFilter: when a custom filter is removed from the database then it is removed even from the session
- Added new private method _dropFromSessionFilterWidgetById to application/libraries/FilterWidgetLib.php
2021-10-19 15:37:44 +02:00
KarpAlex 901f9ba7fa Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
# Conflicts:
#	application/models/crm/Prestudent_model.php
#	system/dbupdate_3.3.php
2021-10-13 09:05:05 +02:00
KarpAlex 45bb288127 error monitoring (issues): renamded variables, improved comments 2021-10-13 08:53:12 +02:00
cris-technikum 902ed7d22d Merge branch 'master' into Sonstiges-Sprint-176/Anrechnungen_Bugfixes 2021-10-12 16:18:20 +02:00
ma0048 3e00e4b3a1 infocenter warning falls bewerberIn bereits vorhanden ist 2021-10-12 13:08:17 +02:00
cris-technikum 8677cbf6dc Fixed requesting Anrechnungsantrag although grade is a blocking grade
Blocking grades (eg angerechnet), that should not allow
the student to request for Anrechnung, were not fully blocking.
This is fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-10-12 12:11:06 +02:00
cris-technikum 35cdac0438 Small Code Enhencement
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-10-12 10:51:10 +02:00
KarpAlex 4f0b34137b replacement of hatschek letters added in hlp_common_helper.php to be the same as in function.inc.php 2021-10-11 18:48:25 +02:00
Harald Bamberger 7f00f506ea add viewport meta tag 2021-10-11 13:06:28 +02:00
Harald Bamberger 4c74176d64 Merge remote-tracking branch 'origin/feature-14635/UDF_move_permissions_to_JSON_definition' 2021-10-11 12:55:24 +02:00