blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-15 14:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,585 Commits 212 Branches 6 Tags
ab4c7ee19480e89a97f6a564fd813e6f8602ab9b
Commit Graph

1898 Commits

Author SHA1 Message Date
cris-technikum 4f46476f87 Fixed: Now entitlement checked for all STGL. Also added hasData checks. 
Before only the first returning STGL was checked for entitlement.
Also added hasData checks to avoid using getData on NULL values.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-09-06 12:56:43 +02:00
cris-technikum b7c22ac56f Fixed: Now including correctly config start- and enddate 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-09-06 12:25:29 +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
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
ma0048 6ff8df6ac3 merged master into anpassung_infocenter 2021-08-18 08:45: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
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
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 b1ce67ebd5 Infocenter fixed STG Typ 2021-07-01 14:59:11 +02:00
Andreas Österreicher 07cb19ccd1 Merge branch 'feature-13604/Pruefungsprotokolle_Filter_fuer_zukuenftige_Termine' 2021-07-01 14:44:33 +02:00
Andreas Österreicher 2a51222e36 Merge branch 'feature-13207/lehrauftraege_passwortmanager_problem' 2021-07-01 14:40:10 +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
cris-technikum 1eb3f96200 Added STGL-Notizfeld to Lectors Detail View 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-06-22 12:46:03 +02:00
cris-technikum bf3c8a344b Merge branch 'master' into feature/Anrechnungen_NEU 2021-06-21 17:18:07 +02:00
cris-technikum 2d6bd0af34 Adjusted 'createAnrechnung'-button to stay inline in smaller devices 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-06-21 17:17:10 +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
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
Harald Bamberger e76dead570 add parantheses although not explicitly needed for correct function 2021-06-18 14:45:05 +02:00
Harald Bamberger cea673fa82 adjust indentation, changed filter lastWeek to cover last 7 days and not only a week ago today 2021-06-18 12:45:44 +02:00
Harald Bamberger a0b86b6207 rename in_the_future to upcoming consistently 2021-06-18 09:21:39 +02:00
Harald Bamberger e5a6af7eb3 first guess adding filter for upcoming exams 2021-06-18 09:16:02 +02:00
ma0048 ab799cb54f abweisen auch wenn bereits freigegeben 2021-06-17 13:47:21 +02:00
ma0048 934248aa0e Merge branch 'feature-12178/message_bei_master_freigabe' into feature-13277/anpassung_infocenter 2021-06-16 09:26:30 +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 212261a38e autofill vom username im falschen feld verhindern 2021-06-16 09:18:53 +02:00
ma0048 6a3fb14ea6 zgv ueberpruefung zwischen master und bachelor unterscheiden 2021-06-16 09:16:15 +02:00
ma0048 42ff593cb1 zgvnation spalten umbenannt 2021-06-14 15:44:38 +02:00
Andreas Österreicher 5b80ab2726 Merge branch 'master' into BUG-13075/Urlaubstool_Markierung_Folgemonat 2021-06-14 13:42:17 +02:00
ma0048 c9ec4cb674 ist infocentermitarbeiter spalte nachgezogen 2021-06-10 12:19:42 +02:00
ma0048 3171ec2c42 dokumententypen nach bezeichnung sortiert 2021-06-10 12:01:01 +02:00
ma0048 ccffdf9b7f statusgruende sortiert 2021-06-10 12:00:09 +02:00
ma0048 cdfaf5b90b dokumententypen nach bezeichnung sortiert 2021-06-10 11:56:07 +02:00
ma0048 3ba88b43dd zgvmaster spalte hinzugefuegt 2021-06-10 11:49:48 +02:00
cris-technikum b86844197d Merge branch 'master' into feature/Anrechnungen_NEU 2021-06-07 14:39:38 +02:00
ma0048 4a2c90ac60 doktypen in zgv uebersicht nur readonly 2021-06-07 12:28:32 +02:00