bc2ed35aa4
Merge remote-tracking branch 'origin/master'
2021-10-21 17:16:58 +02:00
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
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
45bb288127
error monitoring (issues): renamded variables, improved comments
2021-10-13 08:53:12 +02:00
7f00f506ea
add viewport meta tag
2021-10-11 13:06:28 +02:00
11952fe063
Merge branch 'feature-14635/UDF_move_permissions_to_JSON_definition'
2021-10-08 14:02:17 +02:00
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
45e4d5576c
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-09-21 00:59:26 +02:00
4c21d5364c
- added issue management functionality - adding, and displaying issues with filter widget.
2021-09-21 00:58:29 +02:00
52127ade60
fixed datumanzeige
2021-09-17 10:27:55 +02:00
8a417e5cb8
fixed uebersicht nicht abgeschickt
2021-09-15 13:45:43 +02:00
4fcb799731
Merge branch 'feature-14779/infocenter_getrennte_vorlagen'
2021-09-15 10:51:45 +02:00
e412125dd0
Merge branch 'feature/Wiederholer_features_12995_12997_12998_13864'
2021-09-15 10:34:06 +02:00
b6ae992c3c
getrennte msg bei freigabe qualikurs und einstieg anderes semester
2021-09-08 11:41:45 +02:00
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
493bf0edda
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-09-06 22:35:40 +02:00
4b94dfbda7
Merge branch 'master' into feature/Anrechnungen_NEU
2021-09-03 11:08:29 +02:00
0a97a028ee
Reihungstestübersicht zeigt nun die Reihungstests der letzten 12 Monate
...
an statt der letzten 5
2021-08-26 20:22:13 +02:00
484151bab2
Merge branch 'master' into feature/Anrechnungen_NEU
2021-08-26 11:32:47 +02:00
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
d091374622
create merged branch with all features on topic Wiederholer - feature 13864
2021-08-19 15:26:20 +02:00
6ff8df6ac3
merged master into anpassung_infocenter
2021-08-18 08:45:28 +02:00
36d0981331
neuer Branch + Korrektur Fehlermeldung bei Änderung Status
2021-07-23 12:57:28 +02:00
18bd6f7aa7
Öhbeitrags GUI:
...
- possible to edit whole Öhbeitragsrow at once
- added comments
2021-07-19 19:26:53 +02:00
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
b1ce67ebd5
Infocenter fixed STG Typ
2021-07-01 14:59:11 +02:00
07cb19ccd1
Merge branch 'feature-13604/Pruefungsprotokolle_Filter_fuer_zukuenftige_Termine'
2021-07-01 14:44:33 +02:00
2a51222e36
Merge branch 'feature-13207/lehrauftraege_passwortmanager_problem'
2021-07-01 14:40:10 +02:00
a9c5533959
Merge branch 'master' into feature-8210/status_abgewiesen_fuer_mehrere_personen
2021-07-01 14:00:47 +02:00
745ecf4711
zgv pruefung unterscheiden zwischen bachelor und master
2021-06-30 13:29:09 +02:00
36507959ac
dokumentenpruefung im infocenter in eigenes js ausgelagert, reloaden der anzeige beim nachreichen eines doks
2021-06-30 13:09:56 +02:00
d4d84a93ba
Nachreichdatum kann nun auch ueber das Infocenter gesetzt werden
2021-06-29 14:43:19 +02:00
7314352e79
absagen nun möglich auch bei studenten die den reihungstest absolviert haben
2021-06-22 16:54:45 +02:00
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
ca80d72734
added Öhbeitragsverwaltung to main menu
2021-06-21 17:42:08 +02:00
bf3c8a344b
Merge branch 'master' into feature/Anrechnungen_NEU
2021-06-21 17:18:07 +02:00
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
e76dead570
add parantheses although not explicitly needed for correct function
2021-06-18 14:45:05 +02:00
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
a0b86b6207
rename in_the_future to upcoming consistently
2021-06-18 09:21:39 +02:00
e5a6af7eb3
first guess adding filter for upcoming exams
2021-06-18 09:16:02 +02:00
ab799cb54f
abweisen auch wenn bereits freigegeben
2021-06-17 13:47:21 +02:00
934248aa0e
Merge branch 'feature-12178/message_bei_master_freigabe' into feature-13277/anpassung_infocenter
2021-06-16 09:26:30 +02:00
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
212261a38e
autofill vom username im falschen feld verhindern
2021-06-16 09:18:53 +02:00
42ff593cb1
zgvnation spalten umbenannt
2021-06-14 15:44:38 +02:00
c9ec4cb674
ist infocentermitarbeiter spalte nachgezogen
2021-06-10 12:19:42 +02:00
3ba88b43dd
zgvmaster spalte hinzugefuegt
2021-06-10 11:49:48 +02:00
4a2c90ac60
doktypen in zgv uebersicht nur readonly
2021-06-07 12:28:32 +02:00
df8c946bb2
enabled updating of oehbeitrag values
2021-05-31 23:20:56 +02:00
Manfred