blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-30 02:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,768 Commits 226 Branches 6 Tags
7ef88fcc022db8501a5d94de9a26a11af04c7ad7
Commit Graph

2653 Commits

Author SHA1 Message Date
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
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
KarpAlex 1ce0045f86 - Prestudent_model.php: added getStandortCode and getFoerderrelevant methods 
- indent formatting
 2021-06-25 13:19:02 +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
KarpAlex c950047fe7 Merge branch 'feature-12987/Sonderbeitrag_versicherung_trennen' into feature-10450/DVUH_requestMatrikelnummer 2021-06-21 18:20:03 +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 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 b7d5fef30a nachrichten wegschicken auch wenn die Sprache nicht gefunden wurde 2021-06-16 08:03:54 +02:00
KarpAlex 3d22412321 added parameters aktiv, lehre, offiziell, positiv to getByPerson method of Zeugnisnote_model.php 2021-06-14 18:39:29 +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
KarpAlex b206c019df Oehbeitrag GUI: correct decimal format conversion before after update 2021-06-09 01:34:47 +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
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
KarpAlex 5944938052 Oehbeitraege GUI: correct table sorting and refreshing of tablesorter 2021-06-01 15:18:54 +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
ma0048 36f52cf3cc dokumententyp kann nun im Infocenter geaendert werden und zgv master wird angezeigt 2021-05-31 13:20:45 +02:00
KarpAlex 4b237cbc7f oehbeitrag versicherung: possible to display and add Oehbeitraege and Versicherungsbeiträge per semester 2021-05-28 02:12:55 +02:00
cris-technikum b7939f645e Fixed width exceeding table columns, when containing large text 
In some cases table columns were exceeding the table width. Fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-05-26 19:57:23 +02:00
cris-technikum cfcf556a6a Corrected: Status now displaying correct Status (issue when deadline has expired) 
Before, if application deadline has expired, the status was showing
'Deadline expired', even if the application was already existing and in
process. This is fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-05-25 13:24:59 +02:00