Commit Graph

2839 Commits

Author SHA1 Message Date
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 cf1b34769c api & anpassungen fuer das kartenterminal 2021-11-12 12:16:35 +01:00
ma0048 15176e7ce6 eigenen filter fuer abgewiesene studenten hinzugefuegt 2021-11-11 15:52:39 +01:00
ma0068 70c24899d0 Verhalten MessageAnOEs für Master angepasst 2021-11-09 09:32:05 +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
Paolo 6f14b5cec5 - Changed DocsboxLib->convert, not it accepts a new optional parameter called format
- Integrated the DocsboxLib into the application/libraries/DocumentLib.php
2021-10-14 14:25:35 +02:00
Paolo 2fb4be0e55 - Added new config entry DOCSBOX_ENABLED to config/global.config-default.inc.php
- Added new library application/libraries/DocsboxLib.php to manage document conversion using docsbox
- Added new config file application/config/docsbox.php
- Integrated DocsboxLib into include/dokument_export.class.php
2021-10-14 11:34:27 +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
Paolo 1ebae59292 - Adapted controllers/widgets/UDF->saveUDFs to call UDFLib->saveUDFs without the udfUniqueId parameter
- UDFLib->saveUDFs changed, the udfUniqueId parameter is retrieved from the session
- UDFLib->saveUDFs changed, the check of the permission is performed by
  the method prepare prepareUDFsWrite called by the DB_Model
- Changed UDFLib->_validateUDFs and public/js/UDFWidget.js to have a
  better error handling and better message errors
2021-10-11 10:08:58 +02:00
Paolo c325046e8e - Renamed public method DB_Model->hasUDF to udfsExistAndDefined
- Adapted controllers/system/FAS_UDF and models/crm/Prestudent_model
- Added new private method _getUDFsNoPerms to DB_Model
- Changed private method DB_model->_prepareUDFsWrite to use _getUDFsNoPerms
2021-10-08 17:30:28 +02:00
Harald Bamberger 11952fe063 Merge branch 'feature-14635/UDF_move_permissions_to_JSON_definition' 2021-10-08 14:02:17 +02:00
Paolo 45fab928ad - Renamed private method _manageUDFs to _prepareUDFsWrite in application/core/DB_Model.php
- Changed private method _toPhp in application/core/DB_Model.php to check permissions on UDFs
- Adapted code to fit the changes in application/libraries/UDFLib.php
- Renamed public method manageUDFs to prepareUDFsWrite in application/libraries/UDFLib.php
- Added new public method prepareUDFsRead to application/libraries/UDFLib.php
- Fixed bugs, comments & code style
2021-10-07 17:32:49 +02:00
ma0048 9c4f8eb0eb bei logdata 'new application' entfernt
org_name hinzugefuegt
order by log_id statt zeitpunkt
2021-10-04 13:26:40 +02:00
ma0048 4a4c95aa08 auswahl fuer bewerbung abgeschickt ja/nein hinzugefuegt 2021-10-04 12:37:50 +02:00
KarpAlex cb3f3723ae issues table dataset:
- made more readable for assistance (added vorname, nachname, removed some fields)
- added default filters (all new, last 7 days...)
- issues displayed for children oes of permitted arrays as well
- query: more exact check for prestudents future status by using studiensemester start date
- typo fixes
2021-09-28 15:57:27 +02:00
KarpAlex 76f3afdda5 Person_model.php getPersonStammdaten method:
- added sorting order for contacts (by insertamum descending)
 - rewrote old ->retval to new isError, hasData etc. functions
2021-09-28 15:52:17 +02:00
Andreas Österreicher daa78aa190 Mehrfaches zurückziehen der Anrechnungen löscht keine anderen Stati mehr 2021-09-27 08:05:34 +02:00
cris-technikum 72868f4207 Fixed: Now downloading documents is possible for ALL STGLs of the concerning STG
Before it was possible only for first in array. Now sending to all.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-09-23 12:47:05 +02:00