Commit Graph
1079 Commits
Author SHA1 Message Date
Ivymaster f7762523f3 WIP: add first version of csv fetching endpoint for lvplans 2026-07-20 15:18:49 +02:00
Ivymaster 66c4488e8a WIP: add first version of ical fetching endpoint for lvplans 2026-07-20 13:44:55 +02:00
Ivymaster 9a5df8c003 WIP: add first version of ical fetching endpoint 2026-07-20 13:01:40 +02:00
Ivymaster bca9bf0b8d Conflicts resolved 2026-07-20 09:54:56 +02:00
Ivymaster e09fea72a4 add resources assignment to tempus kalender entries 2026-07-17 09:09:49 +02:00
ma0048 9abaf30ed3 Merge branch 'master' into feature-68298/Tempus_Grundstruktur
# Conflicts:
#	public/js/components/Calendar/Base/DragAndDrop.js
#	public/js/components/Calendar/Base/Grid/Line.js
#	public/js/composables/EventLoader.js
2026-07-15 15:48:44 +02:00
ma0048 81c16a3bf2 - wording angepasst lehreinheit -> lvteil
- Kollisionscheck an/aus wird angezeigt
- Shortcut für Ignore-Collision (F9) hinzugefuegt
- coursepicker:
 - design angepasst
 - favorisieren ermoeglicht
 - phrases
- bei lv immer alle raeume/lektoren/gruppen anzeigen unabhaengig vom filter
2026-07-15 14:58:41 +02:00
ma0048 a413ae17b8 suche und filter erweiterungen 2026-07-09 10:58:56 +02:00
Harald Bamberger e4f43cc820 Merge branch 'master' into feature/76981-missing-mailing-lists 2026-07-08 14:15:40 +02:00
Ivymaster a78fc177a5 add event teilnehmer extension for getting targeted lecturers events. add demo icons display in calDAV calendar exports 2026-07-07 14:30:23 +02:00
Ivymaster 4c1d88a054 add clearing of unused classes in lvplan caldav export lib 2026-07-07 13:42:54 +02:00
ma0048 8172df5782 - migration script:
- auf cli job geandert
 - bisdatum nicht mehr pflicht
 - mehrere orte werden uebernommen
 - mehrere gruppen werden uebernommen

- coursepicker
 - sortierung hinzugefuegt
 - multiweekverplanung ermoeglicht
 - offene stunden berechnungn hinzugefuegt

- roomcollision auf ort array geaendert

- keyboardshortcuts hinzugefuegt
2026-07-07 11:00:25 +02:00
Ivymaster 280df46d6d WIP: Second version of cal dav with new tempus structure 2026-07-06 18:17:23 +02:00
Ivymaster 3e17e99ce9 First version of cal dav with new tempus structure 2026-07-06 16:22:33 +02:00
Harald Bamberger 138c80c97a Merge branch 'master' into cis40_2026-02_rc 2026-06-26 15:15:47 +02:00
Harald Bamberger a595daa9b4 Merge branch 'master' into feature-71393/studierendenstatus_unterbrecher_ablehnungsgrund_in_den_emailtext_integrieren 2026-06-26 11:50:12 +02:00
Ivymaster 4edec4df00 add changes for calendar flicker on event reload, and calendar scroll mods 2026-06-22 15:06:53 +02:00
Ivymaster 273b1d3fe4 add resources conflict checker and extend tempus tests with it 2026-06-19 11:41:56 +02:00
Harald Bamberger eb9c882fe9 Merge branch 'master' into cis40_2026-02_rc 2026-06-18 08:48:52 +02:00
Ivymaster de60d0d09e Conflicts resolved 2026-06-15 12:47:29 +02:00
ma0048 6565399633 - added room suggestion priority
- return erro codes
- config for from/to without grid
- bug fixes and optimizations
2026-06-15 11:47:36 +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
Ivymaster a7ddc0d348 Merge branch 'master' into feature-68298/Tempus_Grundstruktur-tests 2026-06-08 16:56:42 +02:00
Ivymaster 55ba874bb0 Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-68298/Tempus_Grundstruktur-tests 2026-06-01 15:09:53 +02:00
ma0048 72692812ff lecture collision check bug fix 2026-06-01 15:08:29 +02:00
ma0048 80dabf5ce6 added join to hours for zeitsperren collision check 2026-06-01 14:28:27 +02:00
Ivymaster bc7fc9611b Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-68298/Tempus_Grundstruktur-tests 2026-06-01 14:09:50 +02:00
ma0048 e4a1264072 fixed zeitsperren collision check 2026-06-01 13:59:50 +02:00
ma0048 517f1a9d93 formatting 2026-06-01 13:39:59 +02:00
Ivymaster 1ecf011ba2 Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-68298/Tempus_Grundstruktur-tests 2026-06-01 11:25:44 +02:00
ma0048 e62848c773 added collision checks on creation 2026-06-01 11:18:53 +02:00
Ivymaster bccaf72399 Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-68298/Tempus_Grundstruktur-tests 2026-06-01 09:17:07 +02:00
Ivymaster d948251736 WIP: Tempus e2e tests 2026-05-27 10:29:13 +02:00
ma0048 9ac9804563 implement first version of collision checks 2026-05-26 14:09:58 +02:00
Harald Bamberger 7f630f24d5 StundenplanLib: check array index access before 2026-05-26 07:54:41 +02:00
ma0048 24a0e74281 Fix: prevent duplicate entries 2026-05-21 12:27:55 +02:00
Harald Bamberger 449537ef77 Merge branch 'master' into cis40_2026-02_rc 2026-05-18 07:26:37 +02:00
adisposkofh 0a4906c5ac added course-specific mailing lists 2026-05-13 16:07:43 +02:00
Harald Bamberger 68d97a5e97 handle case where old value or new value and not both are null explicitly in markDirty Method 2026-05-13 11:42:25 +02:00
Harald Bamberger d27071528f revert change to comparision in markDirty Method 2026-05-13 11:16:18 +02:00
Werner Masik 7f13c128f1 allow null value for vordienstzeit; changed comparison in markDirty to !== (because of 0 vs. null issue) 2026-05-04 20:35:51 +02:00
ma0048 57597dac29 - added reservierungen
- added updatemails
- added reservierungssync
- updated status kurzbz
- reservierung renderer for tempus
2026-04-28 20:17:50 +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 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 92a2053b42 Merge branch 'feature-40870/BUG_Studstatus_unpause_order_should_be_DESC' 2026-04-20 17:30:14 +02:00
Harald Bamberger 6cc09969dd Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin 2026-04-20 10:45:20 +02:00
adisposkofh 70ebe34f1f merge develop into -- manual conflict resolution 2026-04-16 16:09:03 +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