 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
|
ac0eddf4c7
|
Merge branch 'feature-69187/CIS_MA_Pruefungsprotokolle' into cis40_2026-05_ma_rc
|
2026-05-04 17:05:36 +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 |
|
|
chfhtw
|
dfe05cbfa8
|
make tagsArrayAC a computed and rename it to availableTags
|
2026-04-27 10:03:36 +02:00 |
|
|
chfhtw
|
5798e960a2
|
Use config update for widgets as intended instead of a proprietary solution
|
2026-04-27 09:37:17 +02:00 |
|
|
Harald Bamberger
|
e984425e36
|
Merge branch 'feature-68530/Dashboard_Cleanup_Admin' into cis40_2026-02_rc
|
2026-04-23 12:09:09 +02:00 |
|
|
Harald Bamberger
|
2c1702a20b
|
Merge branch 'feature-68957/CIS4_Dashboard_Bookmark_Widget_Sort_Tags' into cis40_2026-02_rc
|
2026-04-23 11:19:17 +02:00 |
|
|
Harald Bamberger
|
076ae15abd
|
Merge branch 'bug-75998/menuepunkt_fallback_wenn_die_sprache_nicht_uebereinstimmt' into cis40_2026-02_rc
|
2026-04-23 11:03:44 +02:00 |
|
|
Harald Bamberger
|
2dd5a95232
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-04-23 10:41:41 +02:00 |
|
|
Johann Hoffmann
|
85043e57db
|
added missing parenthesis
|
2026-04-21 17:00:07 +02:00 |
|
|
Johann Hoffmann
|
194de7b4e7
|
change lva fetch to select semesterstunden from a seperate aggregation subquery since they used to be listed by LE but current view should only show LVA to have the correct amounts displayed
|
2026-04-21 15:29:45 +02:00 |
|
|
Johann Hoffmann
|
5beddbccb4
|
changed the where clause to a simpler = CURRENT_DATE comparison -> works the same if the job runs daily and fetches updates of one day/date; has to be changed back in case we want to find updates in a range larger than 1 day in an interval larger than 1 day;
|
2026-04-21 14:18:45 +02:00 |
|
|
Harald Bamberger
|
1a37273a9e
|
Merge branch 'feature-63349/Cis_Menu_Aktiv_Flag' into cis40_2026-02_rc
|
2026-04-20 18:08:46 +02:00 |
|
|
Harald Bamberger
|
d14b9e2ab5
|
Merge branch 'feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe' into cis40_2026-02_rc
|
2026-04-20 18:02:23 +02:00 |
|
|
Harald Bamberger
|
d926e4165b
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-04-20 17:52:24 +02:00 |
|
|
Harald Bamberger
|
c53d451000
|
Merge branch 'master' into feature-68301/cis4_ma_raumreservierung
|
2026-04-20 16:34:30 +02:00 |
|
|
Harald Bamberger
|
6e103480cc
|
Merge branch 'master' into feature-63349/Cis_Menu_Aktiv_Flag
|
2026-04-20 16:00:28 +02:00 |
|
|
Harald Bamberger
|
f6747713a1
|
Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
|
2026-04-20 11:13:14 +02:00 |
|
|
Johann Hoffmann
|
3a646ffe77
|
adapt AbgabeJob relevant queries so they compare with the pgsql date function CURRENT_DATE instead of NOW() to avoid the cutoff from uploads the happened "yesterday but more than 24 hours ago"; also added another "abgabedatum < CURRENT_DATE" condition, to avoid sending this exact case as updates 2 days in a row;
|
2026-04-20 11:06:06 +02:00 |
|
|
Harald Bamberger
|
6cc09969dd
|
Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin
|
2026-04-20 10:45:20 +02:00 |
|
|
Johann Hoffmann
|
ccd8d5f871
|
WIP alternative table representation of Cis4 MyLv page for teachers assigned to a lot of different degree programs -> cards layout would result in a lot of fluff & scroll; finalized getMultipleLvMenu() functionality in LvMenu.php controller to avoid http request overhead; deleted phrasen mixin from old components since this is a plugin bound to the apps globalConfigince some time already; Allow to switch layout similar to calendar modes -> need to further adapt old component structure to resuse lvmenu data
|
2026-04-20 10:28:49 +02:00 |
|
|
Harald Bamberger
|
bd47ad2b8c
|
Merge branch 'master' into feature-69187/CIS_MA_Pruefungsprotokolle
|
2026-04-20 09:48:34 +02:00 |
|
|
Harald Bamberger
|
e90019cdd8
|
Merge branch 'master' into feature-68610/CIS4_Projektabgabe
|
2026-04-20 09:30:54 +02:00 |
|
|
Harald Bamberger
|
98a10a2f55
|
Merge branch 'feature-69389/AbmeldungSTGL_Anzeige_mit_Studiengangskuerzel'
|
2026-04-17 12:37:49 +02:00 |
|
|
Harald Bamberger
|
e48b94b858
|
studiengangskuerzel statt kurzbzlang
|
2026-04-17 12:35:55 +02:00 |
|
|
Harald Bamberger
|
1c2491385f
|
Merge branch 'master' into feature-68957/CIS4_Dashboard_Bookmark_Widget_Sort_Tags
|
2026-04-17 10:38:00 +02:00 |
|
|
adisposkofh
|
70ebe34f1f
|
merge develop into -- manual conflict resolution
|
2026-04-16 16:09:03 +02:00 |
|
|
Johann Hoffmann
|
be508c99ea
|
fetch & show lva semesterstunden in cards template in footer area
|
2026-04-16 11:59:10 +02:00 |
|
|
Harald Bamberger
|
ba543448ae
|
Merge branch 'bug-76260/StudVW_Messages_TinyMCE_Cursor_Jumping_TextInput'
|
2026-04-16 11:26:32 +02:00 |
|
|
Harald Bamberger
|
f121f9b5a2
|
deactivate pagination - since potentially msg threads are not shown completely
|
2026-04-16 11:23:57 +02:00 |
|
|
Harald Bamberger
|
6ce14a25d7
|
Merge branch 'master' into feature-70376/Lohnguide
|
2026-04-15 11:49:26 +02:00 |
|
|
adisposkofh
|
f1c3c8296f
|
implemented 'OtherLvPlan' to view other users' timetables
|
2026-04-13 10:41:41 +02:00 |
|
|
chfhtw
|
f06e59b362
|
Merge branch 'master' into feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe
|
2026-04-08 14:13:02 +02:00 |
|
|
Johann Hoffmann
|
ac44b36b59
|
cis4 myLv employee functionality implemented; wrote new query fetching studiensemester an employee in which he had assigned lehraufträge; afterwards fetch all lva by employee uid and sem_kurzbz so they fit in the existing component structure; MyLv/Lvs/SS2026 etc now also returns a 'student' | 'employee' string based on path taken inside the controller to aid vue components in rendering useful information and avoiding senseless fetch requests -> e.g. employees cant have grades on lva they are teaching; added component names for sanity when using vuedevtools;
|
2026-04-07 16:07:10 +02:00 |
|
|
Werner Masik
|
5c463c0866
|
add vordienstzeit to lohnguide
|
2026-04-06 22:25:13 +02:00 |
|
|
Cristina
|
386cc779bf
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2026-04-02 15:49:20 +02:00 |
|
|
Cristina
|
3f53c5feba
|
Added: method getKFLByUID to get Kompetenzfeldleitung by UID
|
2026-04-02 14:23:59 +02:00 |
|
|
chfhtw
|
91d656ff60
|
remove unnecessary function
|
2026-03-25 16:11:52 +01:00 |
|
|
chfhtw
|
e3093bdf3f
|
get magic funktionen (Mitarbeiter, Student) as dashboard presets
|
2026-03-24 15:15:36 +01:00 |
|
|
Harald Bamberger
|
059b13938e
|
Merge branch 'master' into feature-70376/Lohnguide
|
2026-03-18 11:46:27 +01:00 |
|
|
ma0048
|
9fd73ca34d
|
menu anzeigen auch wenn englischer eintrag nicht vorhanden ist
|
2026-03-17 13:05:23 +01:00 |
|
|
Harald Bamberger
|
fb388346bf
|
Merge branch 'master' into vv_und_studvw_2026_02_rc4_ma0080
|
2026-03-10 08:41:56 +01:00 |
|
|
Werner Masik
|
6b816def31
|
add lohnguide to vertragsbestandteil SQL
|
2026-03-05 15:34:51 +01:00 |
|
|
Harald Bamberger
|
c40fdb2c4f
|
getMessagesForTable laststatus only for filteredmessages
|
2026-03-05 11:35:57 +01:00 |
|
|
Harald Bamberger
|
47b5eecb9b
|
Merge branch 'master' into vv_und_studvw_2026_02_rc4_ma0080
|
2026-03-04 18:57:13 +01:00 |
|
|
Werner Masik
|
e054f1222b
|
basic model and factory for lohnguide
|
2026-03-03 11:50:45 +01:00 |
|
|
Cristina
|
c57eb1b8de
|
Adapted method getLvLeitung: filter Dummy and allow only active Benutzer/Person
|
2026-03-02 11:00:05 +01:00 |
|