Commit Graph

865 Commits

Author SHA1 Message Date
KarpAlex fce92f78d4 Merge branch 'master' into feature-15795/DVUH_Mehrsprachigkeit 2021-11-04 12:05:32 +01:00
KarpAlex 8cc5be2c40 Issues GUI: added phrases 2021-10-25 19:14:59 +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
KarpAlex 2a8d91119a Öhbeitrag Management GUI: using phrases 2021-10-21 05:48:18 +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
ma0048 3e00e4b3a1 infocenter warning falls bewerberIn bereits vorhanden ist 2021-10-12 13:08:17 +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
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
Andreas Österreicher daa78aa190 Mehrfaches zurückziehen der Anrechnungen löscht keine anderen Stati mehr 2021-09-27 08:05:34 +02:00
KarpAlex 45e4d5576c Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer 2021-09-21 00:59:26 +02:00
KarpAlex 4c21d5364c - added issue management functionality - adding, and displaying issues with filter widget. 2021-09-21 00:58:29 +02:00
ma0048 ddfe41de2a fixed rechte, damit die assistenz zugriff drauf hat 2021-09-20 09:12:47 +02:00
Andreas Österreicher a77756a0d6 Merge branch 'hotfix-15106/Logs_Viewer_shows_Filters_from_other_People' 2021-09-15 11:20:32 +02:00
Andreas Österreicher e412125dd0 Merge branch 'feature/Wiederholer_features_12995_12997_12998_13864' 2021-09-15 10:34:06 +02:00
Paolo 848cc52cfa - Renamed public method system/Filters_model->getFiltersByAppDatasetName to getFiltersByAppDatasetNamePersonId
- Added new parameter person_id to method getFiltersByAppDatasetNamePersonId
- Changed query inside getFiltersByAppDatasetNamePersonId to get global
  and personal filters
- Adapted FilterWidgetLib to use the new method getFiltersByAppDatasetNamePersonId
2021-09-14 12:44:33 +02:00
Andreas Österreicher 2159e81888 Bugfix Anrechnung Rejected Mails 2021-09-09 08:34:36 +02:00
Paolo 9c84558f5f - Added requiredPermissions to the application/config/udfmasterschema.json and set them as mandatory
- Removed the private method _isAllowed from application/controllers/widgets/UDF.php
- Removed required permissions from views application/views/system/fas_udf.php and application/views/system/infocenter/zgvpruefungen.php
- Widget views application/views/widgets/checkbox, dropdown, textarea and textfield now they print the attribute disabled
- Added constant DISABLED to application/widgets/html/HTMLWidget.php
- Removed private property _requiredPermissions from application/widgets/udf/UDFWidget.php
- application/widgets/udf/UDFWidget.php does not check permissions anymore and does not store them anymore
- Added constants PERMISSION_TYPE_READ and PERMISSION_TYPE_WRITE to application/libraries/UDFLib.php
- Removed constant PERMISSION_TYPE from application/libraries/UDFLib.php
- Removed public method isAllowed from application/libraries/UDFLib.php
- Added private methods _readAllowed, _writeAllowed, _setRequiredPermissions and _setReadOnly to application/libraries/UDFLib.php
- UDFLib->displayUDFWidget now checks if permissions are declared in the UDF JSON and if the user is allowed to read and write such UDF
- UDFLib->saveUDFs now checks if the user has the permissions to write such UDF
- Now the UDFs are even displayed in read only mode
2021-09-07 12:13:59 +02:00
KarpAlex 493bf0edda Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer 2021-09-06 22:35:40 +02:00
Andreas Österreicher 484151bab2 Merge branch 'master' into feature/Anrechnungen_NEU 2021-08-26 11:32:47 +02:00
KarpAlex b9ac73955a Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
# Conflicts:
#	application/models/crm/Prestudent_model.php
#	system/dbupdate_3.3.php
2021-08-24 01:19:26 +02:00
Paolo 68b5e49f91 Merge branch 'master' into feature-6189/SAP_basic_structure_for_data_synchronization 2021-08-22 21:04:53 +02:00
Harald Bamberger d091374622 create merged branch with all features on topic Wiederholer - feature 13864 2021-08-19 15:26:20 +02:00
ma0048 6ff8df6ac3 merged master into anpassung_infocenter 2021-08-18 08:45:28 +02:00
manu 36d0981331 neuer Branch + Korrektur Fehlermeldung bei Änderung Status 2021-07-23 12:57:28 +02:00
KarpAlex 18bd6f7aa7 Öhbeitrags GUI:
- possible to edit whole Öhbeitragsrow at once
- added comments
2021-07-19 19:26:53 +02:00
cris-technikum 1c0de3ec45 Fixed: Doppelte Tabellenanzeige in SanchoMail korrigiert
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-07-08 15:05:19 +02:00
cris-technikum 635974fa22 Merge branch 'master' into feature/Anrechnungen_NEU
# Conflicts:
#	application/models/crm/Prestudent_model.php
#	system/dbupdate_3.3.php
2021-07-07 15:05:31 +02:00
Andreas Österreicher a9c5533959 Merge branch 'master' into feature-8210/status_abgewiesen_fuer_mehrere_personen 2021-07-01 14:00:47 +02:00
ma0048 745ecf4711 zgv pruefung unterscheiden zwischen bachelor und master 2021-06-30 13:29:09 +02:00
ma0048 36507959ac dokumentenpruefung im infocenter in eigenes js ausgelagert, reloaden der anzeige beim nachreichen eines doks 2021-06-30 13:09:56 +02:00
ma0048 d4d84a93ba Nachreichdatum kann nun auch ueber das Infocenter gesetzt werden 2021-06-29 14:43:19 +02:00
ma0048 7314352e79 absagen nun möglich auch bei studenten die den reihungstest absolviert haben 2021-06-22 16:54:45 +02:00
KarpAlex ca80d72734 added Öhbeitragsverwaltung to main menu 2021-06-21 17:42:08 +02:00
cris-technikum bf3c8a344b Merge branch 'master' into feature/Anrechnungen_NEU 2021-06-21 17:18:07 +02:00
cris-technikum 46edad620a Fixed: to NOT send Ablehnungsmail to students multiple times
If STGL was rejecting - withdrawing multiple times and entering different
reasons (notizen), the Ablehnungsmail was sent for each of that reasons.
Now the mail is sent only once for most recent reason.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-06-21 15:50:27 +02:00
ma0048 ab799cb54f abweisen auch wenn bereits freigegeben 2021-06-17 13:47:21 +02:00
ma0048 8fa40a843b Merge branch 'feature-11001/zgv_ueberpruefung' into feature-13277/anpassung_infocenter
# Conflicts:
#	application/controllers/system/infocenter/InfoCenter.php
#	application/views/system/infocenter/dokpruefung.php
#	application/views/system/infocenter/infocenterData.php
#	application/views/system/infocenter/infocenterFreigegebenData.php
#	application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
2021-06-16 09:26:03 +02:00
ma0048 6a3fb14ea6 zgv ueberpruefung zwischen master und bachelor unterscheiden 2021-06-16 09:16:15 +02:00
ma0048 3171ec2c42 dokumententypen nach bezeichnung sortiert 2021-06-10 12:01:01 +02:00
ma0048 cdfaf5b90b dokumententypen nach bezeichnung sortiert 2021-06-10 11:56:07 +02:00
KarpAlex b206c019df Oehbeitrag GUI: correct decimal format conversion before after update 2021-06-09 01:34:47 +02:00
ma0048 4a2c90ac60 doktypen in zgv uebersicht nur readonly 2021-06-07 12:28:32 +02:00
ma0048 5330e2b250 beim abweisen das studiensemester hinzugefuegt 2021-06-01 11:13:23 +02:00
KarpAlex df8c946bb2 enabled updating of oehbeitrag values 2021-05-31 23:20:56 +02:00