 Harald Bamberger
|
9782fe5459
|
Merge branch 'cis40_2026-05_ma_rc_routerlink' into demo-cis40
|
2026-07-03 14:36:49 +02:00 |
|
|
Harald Bamberger
|
3f257af006
|
Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc
|
2026-07-03 14:35:20 +02:00 |
|
|
Harald Bamberger
|
e110e8fa57
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-07-01 13:04:44 +02:00 |
|
|
Harald Bamberger
|
d018ab18f8
|
use new Benotungstool for Links in LvMenu
|
2026-07-01 13:04:22 +02:00 |
|
|
Johann Hoffmann
|
8bf18b0d37
|
prüfung/notenimport enabled per config + adapt notenliste.xls.php highlighting as per config; check if higher antritt prüfungen exist when editing existing ones (changing grades is not allowed, dates inbetween the other 2 antritt termine allowed); prüfungstermine with entschuldigt note are being preserved since the whole series can have 1max; frozen columns selection dropdown + 4 columns freezable (selector, uid, vorname, nachname) -> setting saved in local storage; better mirroring of new pruefung studenten dropdown with actual table sort + update the label there to be uid + name aswell; fixed the note_vorschlag select input cell; table sort doesnt clear selection; show the NotenlisteLinks.js in import modal and filter it based on LE selection;
|
2026-06-26 12:52:18 +02:00 |
|
|
Johann Hoffmann
|
be0943f1ba
|
Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4
|
2026-06-22 18:12:29 +02:00 |
|
|
Harald Bamberger
|
e2dadcd208
|
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
|
2026-06-18 13:23:49 +02:00 |
|
|
Harald Bamberger
|
164c11e10a
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
|
2026-06-18 13:20:25 +02:00 |
|
|
Harald Bamberger
|
eb9c882fe9
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-06-18 08:48:52 +02:00 |
|
|
Harald Bamberger
|
245d0d3369
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-06-17 17:15:37 +02:00 |
|
|
Harald Bamberger
|
d3d04c5a77
|
Merge branch 'master' into studvw_2026_05_rc
|
2026-06-17 14:44:25 +02:00 |
|
|
Harald Bamberger
|
070ac1e878
|
override permission for all methods not only the overwritten ones
|
2026-06-15 14:37:43 +02:00 |
|
|
chfhtw
|
f5d81e4a93
|
move prepareQuery (and addSelectPrioRel) into a library and make joins more flexible & change JOIN to LEFT JOIN for tbl_studentlehrverband (the actual bugfix) & change order of JOIN tbl_benutzergruppe in fetchStudents to speed up query
|
2026-06-12 09:53:59 +02:00 |
|
|
Harald Bamberger
|
63ff8dd4c4
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-29 13:40:02 +02:00 |
|
|
adisposkofh
|
d7b2964e4e
|
obsolete use of viewData object from cisRouterView
|
2026-05-26 17:33:38 +02:00 |
|
|
Harald Bamberger
|
9430135592
|
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
|
2026-05-26 09:40:11 +02:00 |
|
|
Harald Bamberger
|
57eec98604
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-05-26 09:38:06 +02:00 |
|
|
Harald Bamberger
|
1561aa55b7
|
correct model path
|
2026-05-26 09:37:49 +02:00 |
|
|
Harald Bamberger
|
5cf14aa886
|
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
|
2026-05-19 10:28:32 +02:00 |
|
|
Harald Bamberger
|
ef2f9630a9
|
Merge branch 'feature-75959/StudVw_Automatische_Tags' into studvw_2026_05_rc_tags
|
2026-05-19 10:22:28 +02:00 |
|
|
Harald Bamberger
|
4d3c73c78f
|
add join condition for notizzuordung via prestudent_id only
|
2026-05-19 10:21:56 +02:00 |
|
|
Harald Bamberger
|
9ee6a0a01a
|
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
|
2026-05-19 09:51:42 +02:00 |
|
|
Harald Bamberger
|
ca8fe5bd19
|
Merge branch 'feature-75959/StudVw_Automatische_Tags' into studvw_2026_05_rc_tags
|
2026-05-18 17:27:06 +02:00 |
|
|
ma0068
|
e5ae400686
|
Tab Abschlusspruefung: use searchPersons instead of Mitarbeiter and refactor Label for dropdown
|
2026-05-13 17:38:39 +02:00 |
|
|
Harald Bamberger
|
d1a4cfd5df
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-11 13:55:07 +02:00 |
|
|
Harald Bamberger
|
23502d4fab
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
|
2026-05-11 13:54:38 +02:00 |
|
|
ma0068
|
dbcacdddd6
|
add tagFilter for semester to students endpoint, add decoding jsonResult in Tags
|
2026-05-11 13:18:56 +02:00 |
|
|
Harald Bamberger
|
8b2ef4e832
|
Merge branch 'master' into feature-75959/StudVw_Automatische_Tags
|
2026-05-11 10:54:26 +02:00 |
|
|
adisposkofh
|
d3ceed32c6
|
compacting all events in mobile monthly lv plan
|
2026-05-07 15:15:50 +02:00 |
|
|
Harald Bamberger
|
150d54eeda
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-07 14:02:19 +02:00 |
|
|
Harald Bamberger
|
3690babf62
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
|
2026-05-07 14:01:50 +02:00 |
|
|
adisposkofh
|
229882e8d8
|
Merge branch 'cis40_2026-02_rc' of github.com:FH-Complete/FHC-Core into cis40_2026-02_rc
|
2026-05-07 13:19:49 +02:00 |
|
|
Harald Bamberger
|
d42157c5f8
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-06 18:19:53 +02:00 |
|
|
Harald Bamberger
|
23edcf3aa7
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
|
2026-05-06 17:35:48 +02:00 |
|
|
Harald Bamberger
|
90e933de00
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-05-06 17:35:28 +02:00 |
|
|
Harald Bamberger
|
8ce67a4726
|
Merge branch 'master' into studvw_2026_05_rc
|
2026-05-06 17:35:05 +02:00 |
|
|
Harald Bamberger
|
bcfdf1e05c
|
Merge branch 'feature-75838/UXImproveProjektarbeitSTVSprint247' into studvw_2026_05_rc
|
2026-05-06 17:33:33 +02:00 |
|
|
Harald Bamberger
|
cb744799bd
|
Merge branch 'feature-71776/StudVW_Abschlusspruefung_DropdownsPrueferAndMultiActionNewPruefung' into studvw_2026_05_rc
|
2026-05-06 17:27:26 +02:00 |
|
|
Harald Bamberger
|
90ebee25fe
|
Merge branch 'feature-71775/StudVW_ChangeSem_Behaviour' into studvw_2026_05_rc
|
2026-05-06 16:28:44 +02:00 |
|
|
Harald Bamberger
|
3e8ed231a6
|
Merge branch 'feature-71392/StudVW_Einstiegssemester_bei_Interessenten_anzeigen' into studvw_2026_05_rc
|
2026-05-06 16:03:37 +02:00 |
|
|
adisposkofh
|
57e901be27
|
other_lv_plan permission on reservations
|
2026-05-06 13:41:16 +02:00 |
|
|
Harald Bamberger
|
b7e48633ab
|
Merge branch 'master' into bug-76146/studvw_karteireiter_dokumente_akzeptiert_eintraege_ohne_vorhandenes_dokument
|
2026-05-05 13:33:38 +02:00 |
|
|
Harald Bamberger
|
66c0c14748
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
|
2026-05-05 08:53:34 +02:00 |
|
|
Harald Bamberger
|
453fc209b8
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-05-05 08:53:07 +02:00 |
|
|
Harald Bamberger
|
cffa493984
|
Merge branch 'feature-68301/cis4_ma_raumreservierung' into cis40_2026-05_ma_rc
|
2026-05-04 18:17:53 +02:00 |
|
|
Harald Bamberger
|
9030cdcc76
|
Merge branch 'feature-70747/Zeitsperren_auf_VueJs_Portieren' into cis40_2026-05_ma_rc
|
2026-05-04 18:06:21 +02:00 |
|
|
Harald Bamberger
|
c3ef487a6f
|
Merge branch 'feature-76148/MyLvaMA' into cis40_2026-05_ma_rc
|
2026-05-04 17:59:51 +02:00 |
|
|
Harald Bamberger
|
e373e797f4
|
Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc
|
2026-05-04 17:01:44 +02:00 |
|
|
Harald Bamberger
|
382244035b
|
Merge branch 'feature-68610/CIS4_Projektabgabe' into cis40_2026-05_ma_rc
|
2026-05-04 16:09:33 +02:00 |
|
|
Harald Bamberger
|
cb60ddcc94
|
Merge branch 'master' into feature-62607/konto_oh_beitrag_betrag_aus_eigener_tabelle
|
2026-05-04 15:41:52 +02:00 |
|