Commit Graph

455 Commits

Author SHA1 Message Date
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 484151bab2 Merge branch 'master' into feature/Anrechnungen_NEU 2021-08-26 11:32:47 +02:00
Andreas Österreicher 98d485b2ba Merge branch 'feature-13943/SAPByD_purchase_orders_job_queue_worker' 2021-08-23 17:04:09 +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
ma0048 6ff8df6ac3 merged master into anpassung_infocenter 2021-08-18 08:45:28 +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
Paolo e1a6a899f6 - Renamed libraries/LDAPLib.php to libraries/AuthLDAPLib.php
- Removed constants LDAP_NO_USER_DN and LDAP_TOO_MANY_USER_DN from config/constants.php
- Added config entry timeout to config/ldap.php
- Changed private method libraries/AuthLib->_checkLDAPAuthentication
to use libraries/AuthLDAPLib->checkUsernamePassword
- Changed AuthLDAPLib to have only one public method called checkUsernamePassword that makes use of the other private methods to check if a username and password are valid on many LDAP servers
2021-06-21 17:03:40 +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
cris-technikum b86844197d Merge branch 'master' into feature/Anrechnungen_NEU 2021-06-07 14:39:38 +02:00
Paolo e056dcd3c2 LDAPLib hotfix: in case that is not possible to connect to an LDAP
server it is not possible to display a valid error message
2021-06-07 10:36:50 +02:00
cris-technikum 0b7adba115 Adapted dokumentname to be empty since Nachweisdokumente can be deleted now (Datenschutz)
Error was thrown in AnrechnungLib since dms_id can be null and no document
exist after Datenschutz delete. This is fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-20 16:26:02 +02:00
ma0048 7c02e0247d Merge branch 'feature-12010/filter_for_bachelor_master' into feature-11001/zgv_ueberpruefung 2021-04-29 10:55:35 +02:00
Cris 81bd719e39 Added Empfehlungsnotiz in STGL Detailview + minor GUI change
Now STGL can save and update notes regarding recommendation.

Therefore minor GUI change by displaying tables within panels instead of
appending directly to panel - in STGL and lectors Detail view. This is
for clearer view and gives space for the notes.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-29 09:54:57 +02:00
Cris 21ce118f0b Merged master into branch
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-28 15:54:54 +02:00
Cris 7b485053d9 Adapted DMSLib upload method to be accept field name from Controller
The fieldname represents the HTML uploadfile input name attribute, which
is given by the developer in the VIEW.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-21 18:46:51 +02:00
Cris 6dcb5e3a65 Adapted DMSLib download method to be more generic
DMSLib now extends FHC Controller to use its new method 'outputFile',
which sets HTTP headers and reads the file.
DMSLib uses now download function to accept params from Controller like
own filename or special disposition.
Loading document and retrieving file info is outsourced into own method
to be reusable.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-21 17:53:42 +02:00
Paolo 9699de8c33 Removed commented code 2021-04-20 14:09:52 +02:00
Cris b9955c14a6 Minor code changes for better maintainance
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-13 16:33:53 +02:00
Cris fe4b70ba19 Usability: Added 'Empfehlungsanforderung an/am' to STGL + lectors Detail view
. Now more "Empfehlungs"-data shown in a table.
. Better separation of PHP / JS.
. Adapted Controller, View, JS and library to provide data about WHEN and
TO WHOME the requests for recommendation had been sent.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-07 15:50:05 +02:00
Cris 343b7a3087 Adapted Controller to use library method getLectors()
...instead of redundant private method.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-07 11:59:13 +02:00
Cris 7c875d5f80 Usability: Added 'ZGV' to STGL and lectors Detail site
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-06 14:48:08 +02:00
FHBGLD 376f413d2a Update LDAPLib.php 2021-03-31 14:58:31 +02:00
Cris 7690a122b8 Refactored: Moved getAnrechnungstatusbezeichnung to AnrechnungLib
This method retrieves the Anrechnungstatusbezeichnung in the users language.
It is used multiple times -> moved to library.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-30 13:57:43 +02:00
Cris d183dda815 Fixed: Anrechnunglib returning values, Adapted error messages
Fixed: method getData in Controller was producing wrong returning message.
Fixed by removing, as library is returning boolean value now.

Adapted few error functions to be more generic and bilingual.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-29 18:48:26 +02:00
Cris f9cbd9caf5 Refactored code
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-25 16:51:11 +01:00
Cris 683e9ffdda Modified to request recommendation (+send mails) ONLY if LV has lectors
Modifications done for STGL Overview and Detailview

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-24 16:22:56 +01:00
Cris 3a0720e4de Changed: If LV has no lectors, show empty field instead of error message
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-22 17:28:29 +01:00
Cris 00656efaef Changed filename on download to 'Anrechnungsantrag_OrgForm_LVID_VornameNachname'
Adapted STGL and lectors views to change the filename on download event.
All download functions moved from view to library.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-22 12:12:04 +01:00
Cris 050eef120c Adapted download function in DMSLib to accept params filename and disposition
. Filename: uses given string as filename. Otherwise upload filename is used.
. Disposition: inline (open in new tab), attached (download dialog box)

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-22 12:08:57 +01:00
Andreas Österreicher 581a4c33a4 Merge branch 'feature-11690/SAPByD_User_Update_Request_Limit' 2021-02-23 08:48:30 +01:00
Andreas Österreicher 577d0f1eb5 Fixed Filename 2021-02-17 15:21:38 +01:00
ma0048 935b370166 added filter for bachelor and master 2021-02-17 15:07:09 +01:00
Paolo 94d335600c - Added new protected method getOldestJob to JQW_Controller
- Added new public method getOldestJob to JobsQueueLib
2021-02-16 21:21:11 +01:00
Andreas Österreicher fec8fbb6d4 Anrechnungen - Mail Empfänger korrigiert bei Personen mit mehreren Accounts 2021-02-16 09:46:50 +01:00
Andreas Österreicher 4d81f91840 Problem behoben wodurch falsche Anrechnungen geladen wurden 2021-02-15 16:44:34 +01:00
Andreas Österreicher bff6307a62 Anrechnungen
- Neuer Job zum Setzen der Anrechnungsnote hinzugefügt
- Direktes setzen der Zeugnisnote bei Anrechnung entfernt
2021-02-12 15:52:26 +01:00
Cris 25400d8b5f Removed updateamum/updatevon when updating Anrechnungmodel
They are not needed. Just confusing.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-08 17:25:34 +01:00
Cris e9664c179a Added Genehmigungs GUI + Begreundungsnotiz for rejected Anrechnungen in STGL VIEWS
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-04 10:24:08 +01:00
Cris 110f05b91c Corrected empfehlung_datum
Now the query uses the correct status kurzbz 'inProgressDP'.
This is because the date the lector sends the recommendation (=empfehlung_datum),
the status is changed to inProgressDP and the insertamum is set there.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 15:43:14 +01:00
Cris e780a3e505 Added GUI for STGL Detail VIEW + logic (Antrag- and Empfehlungdata)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 15:30:53 +01:00
Cris 5109828772 Adapted STGL overview: info/begruendungsangabe when approving/rejecting
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 12:59:46 +01:00
Cris b13fb0cda8 Added lector Detail GUI to retrieve and process Empfehlungen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 11:01:02 +01:00
Cris 8fc338ccb4 Added GUI/functionality to add begruendung for 'NICHT EMPFEHLEN' in lectors overview
. Begruendung is added as Notiz
. GUI to attach begruendung will slide down the moment 'Nicht Empfehlen'
is clicked
. added phrases

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-02 14:06:49 +01:00
Cris da3720e65d Added lectors detail view CONTROLLER
+ adaptations to AnrechnungLib
+ phrases

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-01 10:11:57 +01:00
Cris 70d02e25f9 Removed doublecheck of last status
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-29 11:54:52 +01:00
Cris bd293f3b3a Changed mail text to inform students about approved/rejected Anrechnungen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-28 16:04:21 +01:00
Cris 8d09ee7299 Modified to update Zeugnisnote, if already exists
During approving process the zeugnisnote is set to 6 (angerechnet).
If zeugnisnote already exists, it will be updated now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-28 11:28:44 +01:00
Cris 35009097f1 Added sending Sanchomail to student when Anrechnung was approved/rejected
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-27 14:49:30 +01:00
Cris 7d0ff4fcee Added check, when STGL tries to request recommendation for already recommended Antraege
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-26 13:56:34 +01:00