 Harald Bamberger
|
92a2053b42
|
Merge branch 'feature-40870/BUG_Studstatus_unpause_order_should_be_DESC'
|
2026-04-20 17:30:14 +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
|
8d815d40b6
|
Merge branch 'master' into feature-62450/Studium_Phrasen
|
2026-04-20 14:49:48 +02:00 |
|
|
chfhtw
|
9a281dfa71
|
don't save source property for widgets since it get generated when fetched
|
2026-04-20 12:51:19 +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
|
59ddf175ed
|
Merge branch 'master' into feature-61236/Cis4MenuErweiterung
|
2026-04-20 10:47:58 +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
|
94f742187e
|
Merge branch 'feature-76150/CIS4-LV-Plan-von-anderen-Personen-anzeigen' into feature-76464/reworking-use-of-controller-viewdata
|
2026-04-16 16:12:33 +02:00 |
|
|
adisposkofh
|
70ebe34f1f
|
merge develop into -- manual conflict resolution
|
2026-04-16 16:09:03 +02:00 |
|
|
adisposkofh
|
d577ac6d54
|
naming cleanup
|
2026-04-16 15:54:12 +02:00 |
|
|
adisposkofh
|
2aecc6e0f2
|
removed use of viewData object as passed by controller thru routerview to component -- component fetches data instead
|
2026-04-16 15:49:16 +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 |
|
|
chfhtw
|
24c8a1c501
|
Decode JSON in backend not frontend and make component path a full path (also in backend)
|
2026-04-16 09:51:32 +02:00 |
|
|
Harald Bamberger
|
6ce14a25d7
|
Merge branch 'master' into feature-70376/Lohnguide
|
2026-04-15 11:49:26 +02:00 |
|
|
adisposkofh
|
cdc279b5da
|
added 'other lv plan' permission check in api controller
|
2026-04-14 16:28:01 +02:00 |
|
|
adisposkofh
|
7edddd0566
|
removed redundant OverviewLvPlan page (same as StgOrgLvPlan)
|
2026-04-14 14:19:38 +02:00 |
|
|
adisposkofh
|
ebafc4576f
|
implemented profile calendar sync section
|
2026-04-14 14:08:16 +02:00 |
|
|
adisposkofh
|
7daaf79fcc
|
implemented permission for viewing other users' lv plans
|
2026-04-13 15:44:09 +02:00 |
|
|
ma0048
|
21d80905a2
|
akzeptierte dokumente anzeigen, auch wenn kein dokument vorhanden ist
|
2026-04-13 13:04:46 +02:00 |
|
|
adisposkofh
|
f1c3c8296f
|
implemented 'OtherLvPlan' to view other users' timetables
|
2026-04-13 10:41:41 +02:00 |
|
|
Andreas Österreicher
|
3a91b12f31
|
Merge branch 'epic-56039/LV-Evaluierung'
|
2026-04-13 10:39:00 +02:00 |
|
|
Johann Hoffmann
|
a028297da6
|
call authInfo api on created in fhc app to provide isStudent, isMitarbeiter & uid; renamed main component of MyLv route from 'student' to 'MyLv' since it fits for employees aswell; adapt Lv.js component to render a bootstrap5 dropdown list when menuItem has a c4_linkList or c4_moodle_links;
|
2026-04-08 15:11:03 +02:00 |
|
|
chfhtw
|
5a1b94f45b
|
Remove redundant Dashboardpage and load correct one in Users Landingpage
|
2026-04-08 14:27:56 +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 |
|
|
Harald Bamberger
|
b2538075ee
|
use STV_TAGS_ENABLED config when preparing sql statement for students list to query tags only if enabled
|
2026-04-07 10:35:06 +02:00 |
|
|
Werner Masik
|
5c463c0866
|
add vordienstzeit to lohnguide
|
2026-04-06 22:25:13 +02:00 |
|
|
chfhtw
|
7eb888d2e3
|
rename apps/Dashboard/Fhc to apps/Cis
|
2026-04-03 11:19:38 +02:00 |
|
|
chfhtw
|
26f67b6798
|
rename apps/Cis to apps/Cis/Menu
|
2026-04-03 11:16:19 +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
|
00e019d6fe
|
cleanup db data
|
2026-03-26 15:21:41 +01:00 |
|
|
Harald Bamberger
|
5b0c115b10
|
Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin
|
2026-03-25 17:06:52 +01:00 |
|
|
Harald Bamberger
|
6fbb09eb6e
|
group or clause
|
2026-03-25 16:32:43 +01:00 |
|
|
chfhtw
|
d37fac0ff7
|
cleanup api calls to dashboard board
|
2026-03-25 16:12:17 +01:00 |
|
|
chfhtw
|
91d656ff60
|
remove unnecessary function
|
2026-03-25 16:11:52 +01:00 |
|
|
Harald Bamberger
|
5139c3e44e
|
use array_replace_recursive instead of array_merge_recursive to prevent two scalar values being merged to an array
|
2026-03-25 15:15:05 +01:00 |
|
|
Harald Bamberger
|
627a52e3d1
|
Merge branch 'master' into feature-70376/Lohnguide
|
2026-03-25 09:36:27 +01:00 |
|
|
chfhtw
|
e3093bdf3f
|
get magic funktionen (Mitarbeiter, Student) as dashboard presets
|
2026-03-24 15:15:36 +01:00 |
|
|
chfhtw
|
b11d8d056a
|
get access rights from permissionlib
|
2026-03-24 15:15:12 +01:00 |
|