Commit Graph

1948 Commits

Author SHA1 Message Date
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
Harald Bamberger 44c1e65011 getBetriebsmittel add parameter to only retrieve aktive users 2021-10-20 15:48:34 +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
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
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
Andreas Österreicher 13a040737a Fehler behoben wodurch die LV-Leitung von Lehrveranstaltungen nicht
immer korrekt ermittelt wurde
2021-09-21 17:17:28 +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
ma0048 52127ade60 fixed datumanzeige 2021-09-17 10:27:55 +02:00
ma0048 8a417e5cb8 fixed uebersicht nicht abgeschickt 2021-09-15 13:45:43 +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 4fcb799731 Merge branch 'feature-14779/infocenter_getrennte_vorlagen' 2021-09-15 10:51:45 +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
ma0048 b6ae992c3c getrennte msg bei freigabe qualikurs und einstieg anderes semester 2021-09-08 11:41:45 +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 4b94dfbda7 Merge branch 'master' into feature/Anrechnungen_NEU 2021-09-03 11:08:29 +02:00
Andreas Österreicher 6034da43d8 Fixed loading of current Geschaeftsjahr if it is the last day of the
year
2021-08-31 07:56:59 +02:00
Andreas Österreicher 0a97a028ee Reihungstestübersicht zeigt nun die Reihungstests der letzten 12 Monate
an statt der letzten 5
2021-08-26 20:22:13 +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
Andreas Österreicher 98d485b2ba Merge branch 'feature-13943/SAPByD_purchase_orders_job_queue_worker' 2021-08-23 17:04:09 +02:00
Andreas Österreicher a6b37c452f Merge branch 'feature-6189/SAP_basic_structure_for_data_synchronization' 2021-08-23 16:43:20 +02:00
Paolo 68b5e49f91 Merge branch 'master' into feature-6189/SAP_basic_structure_for_data_synchronization 2021-08-22 21:04:53 +02:00
Paolo ff715a72c8 Merge branch 'master' into feature-13943/SAPByD_purchase_orders_job_queue_worker 2021-08-22 21:04:32 +02:00
Paolo a2fc3fe09b Merge branch 'master' into feature-12894/LDAP_changes_on_CI 2021-08-22 20:59:01 +02:00
Andreas Österreicher 73ce635188 Merge branch 'master' into feature-12988/MobilityOnline_Outgoing_mo_fhc_Verknuepfung 2021-08-20 10:34:55 +02:00
Harald Bamberger d091374622 create merged branch with all features on topic Wiederholer - feature 13864 2021-08-19 15:26:20 +02:00
KarpAlex 24a979f9f1 Zeugnisnote_model.php, method getByPerson: note and note bezeichnung are also selected 2021-08-18 22:16:15 +02:00
ma0048 6ff8df6ac3 merged master into anpassung_infocenter 2021-08-18 08:45:28 +02:00
KarpAlex 367c266e2e Zeugnisnote_model.php: added method getEctsSumsByPerson 2021-07-29 13:02:24 +02:00
manu 36d0981331 neuer Branch + Korrektur Fehlermeldung bei Änderung Status 2021-07-23 12:57:28 +02:00
Andreas Österreicher 3bf03a9869 Merge branch 'sonstiges-sprint174/LehrauftraegeErteilen_DoppelteTabellen' 2021-07-21 15:07:16 +02:00
Paolo e4aa42ad58 models/CL/Messages_model->getVorlage now filters out the _not_ active
templates
2021-07-21 10:39:52 +02:00
KarpAlex 18bd6f7aa7 Öhbeitrags GUI:
- possible to edit whole Öhbeitragsrow at once
- added comments
2021-07-19 19:26:53 +02:00
Paolo 47326fe9fb - Added new protected method getOldestJobs to core/JQW_Controller
- Changed method JQW_Controller->getOldestJob to be a wrapper for getOldestJobs
- Changed method generateJobs to be a wrapper for static method JobsQueueLib::generateJobs
- Removed method JobsQueueLib->getOldestJob
- Added new public method getOldestJobs to JobsQueueLib
- Added new public static method generateJobs to JobsQueueLib
2021-07-14 13:02:08 +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
KarpAlex cee6156646 - added Bisioaufenthaltfoerderung_model.php
- dbupdate_3.3.php: added Buchungstyp "ZuschussIO"
2021-07-07 20:22:53 +02:00