Commit Graph

12123 Commits

Author SHA1 Message Date
Cris 922b0a2b32 Added display of weekday in Reihungstest-Dropdown
In FAS > tab Aufnahme-Termine > Dropdown: Reihungstest/Interview:
Now the weekdays of the Reihungstests are displayed.
2019-03-14 11:37:08 +01:00
Paolo 3494c7a2ef Merge branch 'master' into ciauth 2019-03-13 18:15:41 +01:00
Paolo 04b1ec327a - Added new config file permission.php
- It contains the following entries:
	- List of permissions that are allowed to perform loginAs
	- List of permissions that cannot be gained with loginAs
	- List of users whose identity cannot be obtained with loginAs
- Removed config entries authentication_loginas_perms and authentication_loginas_blacklist from config file auth.php
- Added constants to PermissionLib: LOGINAS_ALLOWED, LOGINAS_BLACKLIST and LOGINAS_USERS_BLACKLIST
- PermissionLib loads the config file permission.php
- Added public method isEntitledLoginAS to PermissionLib
- Added private methods _inLAUsersBlacklist, _hasLANotAllowedPermissions and _hasLAPermissions to PermissionLib
- Added public method loginAS to AuthLib
- Fixed logout method in AuthLib
- Fixed loginLDAP method in AuthLib
2019-03-13 18:07:15 +01:00
Cris 09097c6205 Corrected function getReihungstestErgebnisPerson
Now the prestudent_id is retrieved by joining on study semester (instead of studienplan, which was inconsistent).
Added also restricion on stufe = 1 to retrieve only Reihungstest absolved on desktop.
2019-03-13 15:14:56 +01:00
Paolo 53a0b60ba8 - Removed method getCheckUserAuth form api/v1/CheckUserAuth
- Changed LDAP_Model to a library: LDAPLib
- Removed controller system/Login

AuthLib:
- Added new private method _createAuthObjByPerson
- Moved config load from constructor to _authenticate
- Moved Person_Model load from constructor to _createAuthObjByPerson
- Removed method checkUserAuthByCode
- Removed method checkUserAuthByCodeEmail
- Adapted code to use LDAPLib
2019-03-13 11:57:36 +01:00
Paolo fd9a2266ec Added new public method loginLDAP to AuthLib 2019-03-13 10:24:19 +01:00
Cris 991ca747d1 Separated Bachelor and Masters on testtool
Now if the logged-in prestudents study is a Bachelor-study, all other Bachelor studies he might have applied for, are displayed. Also the testing areas (gebiete) are shown only for that Bachelor studies.

If the logged-in prestudents study is a Master (or something else than a Bachelor), only that one particular Master study is displayed on the starting page.  The testing areas are shown only for that one particular Master study.
2019-03-12 18:03:49 +01:00
Cris 0b5f9f51f7 Extended function getActualInteressenten to differ only by STG-type/-kz
Now the function accepts the optional arguments:
. typ (= studiengangstyp)
. studiengang_kz
to retrieve more specific data.
2019-03-12 17:53:44 +01:00
Paolo d1b4024b76 - Added new constants LDAP_NO_USER_DN and LDAP_TOO_MANY_USER_DN in constants.php
- LDAP_Model->getUserDN now returns errors with more information
- Login redirection is performed with HTTP code 302 instead of 301
- Fixed _checkHBALDAPAuthentication behavior
- AuthLib errors have more information
2019-03-12 16:14:58 +01:00
Paolo 13db712fa7 - Changed authentication_login to AUTH_LDAP in auth.php
- Fixed paths in array authentication_login_pages in ayth.php
- Added new constants AUTHENTICATION_LOGIN and AUTHENTICATION_LOGIN_PAGES to AuthLib
- Added private method _redirectToLogin to AuthLib
- Better comments
2019-03-12 14:00:56 +01:00
Paolo aefd210273 - Added new configuration file auth.php for authentication
- Added new configuration file ldap.php for LDAP connection
- Added new controller system/Login to manage logins
- Added new controller system/Logout to manage logout
- Added new core model LDAP_Model to manage LDAP connections
- Added new constants in config/constants for authentication
- Added new function getCode to hlp_message_helper
- Now core/Auth_Controller loads the AuthLib as first step
- Now PermissionLib does NOT load anymore the AuthLib
- Removed old logic from PermissionLib
- Now function getAuthUID (hlp_authentication_helper) does not load anymore the AuthLib
- Now REST_Controller loads hlp_message_helper and hlp_common_helper
- core/APIv1_Controller does NOT load anymore hlp_message_helper and hlp_common_helper
- Added new constants to AuthLib
- AuthLib constructor now accept a parameter to enable the authentication immediatly (default)
- AuthLib loads configuration file auth.php and Person_model by default
- Added public methods getAuthObj and logout to AuthLib
- Renamed CheckUserAuthByUsernamePassword to checkUserAuthByUsernamePassword, CheckUserAuthByCode to checkUserAuthByCode and CheckUserAuthByCodeEmail to checkUserAuthByCodeEmail in AuthLib
- Added private methods _createAuthObj, _isLogged, _showInvalidAuthentication, _showError, _checkBTAuthentication, _checkHBALDAPAuthentication, _checkLDAPAuthentication, _checkForeignAuthentication, _storeAuthObj and _authenticate to AuthLib
2019-03-12 11:33:01 +01:00
Paolo abf766ce51 - Added session_start() to hlp_session_helper to start a PHP standard session (NOT CI session)
- Added functions cleanSession and cleanSessionElement to hlp_session_helper
- Renamed setElementSession to setSessionElement in hlp_session_helper
- Renamed getElementSession to getSessionElement in hlp_session_helper
- Adapted the code that were using this helper
- Autoload does NOT load anymore helper hlp_session_helper
- Controller controllers/system/Filters now loads the AuthLib
- Removed var_dump from controllers/jobs/ReihungstestJob
2019-03-12 11:16:42 +01:00
Andreas Österreicher e45fc66770 - Added check if a Person is corretly selected when adding to a direct group
- Persons in the direct group drop down are now ordered by name
2019-03-12 08:04:13 +01:00
Cris 2fe8f9c540 Added Total Reihungstestpunkte WITH and WITHOUT specific areas in FAS
Now the total Reihungstestpunkte are calculated and displayed in two ways:
1. the total amount of points achieved on overall gebiete
2. the total amount of points achieved excluding specific areas, which are defined in the config file.
2019-03-11 17:17:38 +01:00
Cris 7f364835bf Extended function getReihungstestErgebnisPerson: excluding gebiete opt.
Now questioning areas (gebiete) can be excluded when calculating the total Reihungstestpunkte.

excluding gebiete should be defined in the config array FAS_REIHUNGSTEST_EXCLUDE_GEBIETE.
2019-03-11 17:11:33 +01:00
Manfred Kindl ddf9153b7f Function load_person: studiengang_kz is now optional 2019-03-08 15:03:25 +01:00
Manfred Kindl ff704d4a39 Merge remote-tracking branch 'origin/master' 2019-03-08 10:35:36 +01:00
Manfred Kindl 4acc4f128d Konstante "CAMPUS_NAME" in Vilesci-Config 2019-03-08 10:35:27 +01:00
Manfred Kindl 1ef1f1ea7b ID für Uhrzeit-Row bei FAS-Abschlussprüfung 2019-03-08 10:34:41 +01:00
Manfred Kindl 505026896d Neues Recht "reihungstestAufsicht"
RT-Aufsichtspersonen dürfen zB Tests freischalten, Personen hinzufügen, Antworten löschen
2019-03-08 10:33:49 +01:00
alex c325c98728 direct group deletion, education/Lehreinheitgruppe_model:
- fixed "bug" when checking if users are in group
- added additional checks for existence of group in lehreinheitgruppe and benutzergruppe before group deletion
2019-03-08 10:32:05 +01:00
Andreas Österreicher 5576159cb1 Prüfungstyp von Abschlussprüfungen zu Diplomasupplement XML hinzugefügt
Vorlagen angepasst damit Lehrgangsabschlüsse nicht als Abschlussprüfung
auf den Zeugnissen und Diplomasupplements angedruckt werden
2019-03-08 09:01:02 +01:00
Andreas Österreicher 5684f8788a Updated Changelog and Tempus Version Number 2019-03-07 18:39:25 +01:00
Werner Masik d13872428b Bug Fix: Beim Anlegen einer Firma im WAWI kam Fehlermeldung wegen falschem Typs des Lieferant-Feldes 2019-03-07 16:52:38 +01:00
alex 68dd0f3cb8 - added method getLesForLv to education/Lehreinheit_model
- added methods direktUserAdd, direktuserDelete (for direkt User Zuordnung to le) to education/Lehreinheitgruppe_model
- added method getLvsByStudent to education/Lehrveranstaltung_model
- Added hasSequence = false to Benutzergruppe_model
- fixed typo in lehrveranstaltungDBML
2019-03-06 19:03:02 +01:00
Andreas Oesterreicher 31b0e8bea3 Config Eintrag hinzugefügt um den SelfService Dokumentendownload im CIS
zu aktivieren/deaktivieren
2019-03-06 13:25:32 +01:00
Cris 5335ac3a71 Added Reihungstest language logic
Now the language of the Reihungstest questions is set based on the language-settings of the STG, which has the highest priority. If the language-option is true, the user will have the option to choose between the languages.
2019-03-06 12:18:39 +01:00
Cris af79da67cb Added function to retrieve actual Interessenten (optionally only for prio)
The query retrieves all actual prestudenten with the status 'Interessent' of the users person_id.  (+ prio, stg, stpl and ausbildungssemester) 
Optionally the function limits the result to the one stg with the highest priority.
2019-03-06 12:09:14 +01:00
Cris c23cefa77f Added db_parse_bool to sprachwahl (testtool)
Now sprachwahl is returning a boolean

- function concerned: getAblaufVorgabeStudiengang

- files using this function are approved
2019-03-06 11:58:43 +01:00
Andreas Österreicher 92d5c8a9d2 Kategorien für Services hinzugefügt 2019-03-05 16:06:42 +01:00
Andreas Österreicher d46f288978 Default Stunden für Bachelorbetreuung von 3 auf 4 Stunden geändert 2019-03-05 15:25:47 +01:00
Andreas Österreicher ed94235e85 Added API call from employee updates 2019-03-05 14:04:32 +01:00
Manfred Kindl 7979643006 Merge remote-tracking branch 'origin/master' 2019-03-04 19:02:27 +01:00
Manfred Kindl 3c2873d301 OE-Baum kompakter gestaltet
- OEs mit hinterlegter Leitung und Freigabegrenze werden markiert. 
- OE-Typ wird abgekürzt (1. und letzter Buchstabe)
2019-03-04 19:02:18 +01:00
Andreas Österreicher c318819fe8 Job hinzugefügt zum aktualisieren von Studienplänen von Reihungstests
Wenn Studienpläne zugeordnet sind die in diesem Semester nicht gültig
sind, wird automatisch ein passender gesucht und zugeordnet
2019-03-04 15:54:53 +01:00
Manfred Kindl 34dd7b2dc5 Recht "basis/organisationseinheit" zum Bereich "Stammdaten" hinzugefügt 2019-03-04 13:56:50 +01:00
Manfred Kindl 2edc9c566c Lehraufträgen inkludierte Lehre Spalten ausblenden
Bei Lehraufträgen mit inkludierter Lehre werden die Spalten "Satz" und "Brutto" nun gänzlich ausgeblendet, wenn inkludierte Lehre eingetragen ist
2019-03-01 13:44:57 +01:00
Manfred Kindl 10da7bde5a Typo corrected
Wochenrythmus ausgebessert auf Wochenrhythmus
2019-03-01 13:43:22 +01:00
Manfred Kindl 63877ef8f9 Neues Recht lehre/reservierungAdvanced in LV-Plan implementiert
- Reservierungen können damit überschrieben werden
- Wenn Raum grundsätzlich nicht reservierbar, wird eine entsprechende Meldung angezeigt.
2019-03-01 13:42:34 +01:00
Manfred Kindl d1588d00dc Neues Recht reservierungAdvanced
Erlaubt das Einfügen von Reservierungen auch über bestehende
- Berechtigung auf testtool.tbl_kategorie für web-user
2019-03-01 13:39:53 +01:00
Manfred Kindl 17aa4b7756 BugFix 2019-03-01 13:38:19 +01:00
raab 2524aa90cc LehreExtern nicht mehr zur Auswahl anzeigen 2019-03-01 09:27:24 +01:00
Cris 7a1027280e Added Reihungstest-Gebiete for person
Now the areas for the Reihungstest are put together depending on the studies the examinee is interested in and if the examinee is a Quereinsteiger or not.

Therefore all prestudents of the examinee are detected that are set for the actual and future studiensemester. 

The areas are chosen because of the Studienplan. If not available, they are chosen because of the Studiengang.
2019-02-28 15:04:17 +01:00
Andreas Österreicher 03c6873b70 Unterstützung von Matrikelnummern zur Semesterticket Schnittstelle
hinzugefügt.
Es wird nun sowohl das Personenkenneichen als auch die Matrikelnummer
unterstützt.
2019-02-28 07:13:02 +01:00
Paolo fdddb52259 - Moved REST_Controller from libraries to core directory
- Changed the relatives includes
- Changed the controller api/v1/CheckUserAuth to be adapted to the AuthLib changes
- Removed function auth from helpers/hlp_authentication_helper
- Adapted function getAuthUID of helpers/hlp_authentication_helper to the AuthLib changes
- Adapted constructor of PermissionLib to the AuthLib changes
2019-02-27 11:24:27 +01:00
Andreas Oesterreicher 1068a0ab33 Doppelten Anmerkung Tag aus RDF entfernt 2019-02-27 09:13:28 +01:00
Paolo c20d7779ca Moved all constants definitions from config/* to config/constants.php 2019-02-26 12:33:13 +01:00
Andreas Oesterreicher 729611aa87 Problem behoben beim Erstellen der Studienerfolgsbestätigung mit
Sonderzeichen
2019-02-26 08:35:37 +01:00
Paolo 663c1d9f35 Merge branch 'messages' 2019-02-25 15:57:40 +01:00
Paolo acd918a547 system/MessageToken_model and system/PersonLog_model models now extend DB_Model 2019-02-25 15:57:07 +01:00