Commit Graph

414 Commits

Author SHA1 Message Date
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 2227c3ecf1 Merge branch 'feature-76671/moving-avg-grade-calc-to-backend' into cis40_2026-02_rc 2026-04-30 07:33:42 +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
adisposkofh f780553773 moved avg grade calcs to backend 2026-04-24 15:55:03 +02:00
Harald Bamberger 1dd9ff0daf Merge branch 'feature-76385/mobile-optimization-lv-plan' into cis40_2026-02_rc 2026-04-23 16:33:24 +02:00
Harald Bamberger ff876afbb3 Merge branch 'feature-76464/reworking-use-of-controller-viewdata' into cis40_2026-02_rc 2026-04-23 14:20:19 +02:00
adisposkofh 2eb58e3346 reworked how 'compactible event types' are defined 2026-04-23 11:43:25 +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 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 f6747713a1 Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4 2026-04-20 11:13:14 +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 e90019cdd8 Merge branch 'master' into feature-68610/CIS4_Projektabgabe 2026-04-20 09:30:54 +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 917a9ee707 minor fix 2026-04-16 15:55:43 +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
Harald Bamberger f121f9b5a2 deactivate pagination - since potentially msg threads are not shown completely 2026-04-16 11:23:57 +02:00
adisposkofh 7daaf79fcc implemented permission for viewing other users' lv plans 2026-04-13 15:44:09 +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
chfhtw 1951cd6fa8 split/rename dashboard api factories 2026-03-24 16:08:02 +01:00
chfhtw aeb5d40840 rename api endpoints 2026-03-24 15:14:39 +01:00
chfhtw 2fc392c084 refactor dashboards Preset->addWidgets to (single) Preset->addWidget 2026-03-23 16:05:22 +01:00
chfhtw 9cff50fa3b extract preset logic from dashboard admin api 2026-03-23 15:44:42 +01:00
chfhtw 1972b461e7 replace controllers/dashboard/Config.php with controllers/api/frontend/v1/dashboard/User.php & controllers/api/frontend/v1/dashboard/DashboardAdmin.php 2026-03-23 11:21:15 +01:00
chfhtw e957926a4d replace controllers/dashboard/Widget.php with controllers/api/frontend/v1/dashboard/Widget.php 2026-03-23 10:57:43 +01:00
Harald Bamberger 14a8e2f001 Funktionen fett schreiben, die schon presets hinterlegt haben, demo aus views und Controller namen entfernen, preview hinzufuegen 2026-03-18 15:48:57 +01:00
Harald Bamberger 7c1762d467 Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin 2026-03-18 09:20:53 +01:00
Johann Hoffmann 2dd732b924 Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
# Conflicts:
#	application/views/CisRouterView/CisRouterView.php
2026-02-27 10:38:24 +01:00
ma0068 dc642cfbe7 merge master into cis40_2026-02-rc 2026-02-19 16:44:01 +01:00
Harald Bamberger 006393704c Merge branch 'master' into vv_und_studvw_2026_02_rc4 2026-02-17 12:17:15 +01:00
Harald Bamberger 4825c75b5d revert changes made in commit b1a1cdf235 2026-02-17 12:11:37 +01:00
Harald Bamberger a9b343646e Merge branch 'master' into vv_und_studvw_2026_02_rc4 2026-02-13 10:49:09 +01:00
ma0068 464f04b254 merge studvw_2026_02_rc4 in vv_und_studvw_2026_02_rc4 2026-02-05 11:57:03 +01:00
Johann Hoffmann cc302ed5a1 lazyload signatur status for assistenz view to avoid worst case loading times due to 50 x 30mb signatur server payload 2026-02-04 17:32:17 +01:00
Johann Hoffmann 17f11fa871 Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4
# Conflicts:
#	application/controllers/api/frontend/v1/Lehre.php
#	application/models/education/Lehrveranstaltung_model.php
#	application/models/education/Note_model.php
#	application/views/CisRouterView/CisRouterView.php
#	public/js/api/factory/studiensemester.js
#	public/js/components/Bootstrap/Offcanvas.js
#	public/js/components/Overlay/FhcOverlay.js
2026-02-04 15:40:34 +01:00
Johann Hoffmann 40c79158f7 punkte feature basically finished; WIP testing & import rewrite 2026-02-03 17:38:33 +01:00
Harald Bamberger 37395b70f6 Merge branch 'feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe' into cis40_2026-02_rc 2026-02-03 11:56:16 +01:00
Harald Bamberger 69749da331 Merge branch 'master' into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader 2026-02-03 11:46:19 +01:00
Johann Hoffmann 81eee814e9 yellow dropdown styling only on editable tabulator colums for note_vorschlag; fetch note for punkte for notenvorschlag and pruefungsnote if certain config is set; added debounce helper file/function; WIP persisting punkte in backend 2026-02-02 17:07:16 +01:00
ma0068 b9eaac18b0 merge Master into feature-39571/Studierendenverwaltung_CoreNotizcontroller 2026-02-02 16:21:47 +01:00
ma0068 c34ffedb42 Autocomplete Field Vertretung
Form with ISO fields for hours
Admin functionality for seeing Timelocks of uid in route
Backend with CI-Validations
Phrases
2026-01-21 10:59:16 +01:00
ma0068 b5382b1bdf Form and Start Backend 2026-01-15 15:39:42 +01:00
Johann Hoffmann eb15d6b841 getStudentConfig Api Method; moodle link config entry; write abgabetool termin noten into header; uniform getDateStyleClass logic in all 3 views; WIP refining AbgabetoolJob; 2026-01-14 16:57:57 +01:00