e09fea72a4
add resources assignment to tempus kalender entries
2026-07-17 09:09:49 +02:00
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
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
a413ae17b8
suche und filter erweiterungen
2026-07-09 10:58:56 +02:00
e4f43cc820
Merge branch 'master' into feature/76981-missing-mailing-lists
2026-07-08 14:15:40 +02:00
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
138c80c97a
Merge branch 'master' into cis40_2026-02_rc
2026-06-26 15:15:47 +02:00
a595daa9b4
Merge branch 'master' into feature-71393/studierendenstatus_unterbrecher_ablehnungsgrund_in_den_emailtext_integrieren
2026-06-26 11:50:12 +02:00
eb9c882fe9
Merge branch 'master' into cis40_2026-02_rc
2026-06-18 08:48:52 +02:00
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
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
72692812ff
lecture collision check bug fix
2026-06-01 15:08:29 +02:00
80dabf5ce6
added join to hours for zeitsperren collision check
2026-06-01 14:28:27 +02:00
e4a1264072
fixed zeitsperren collision check
2026-06-01 13:59:50 +02:00
517f1a9d93
formatting
2026-06-01 13:39:59 +02:00
e62848c773
added collision checks on creation
2026-06-01 11:18:53 +02:00
9ac9804563
implement first version of collision checks
2026-05-26 14:09:58 +02:00
7f630f24d5
StundenplanLib: check array index access before
2026-05-26 07:54:41 +02:00
24a0e74281
Fix: prevent duplicate entries
2026-05-21 12:27:55 +02:00
449537ef77
Merge branch 'master' into cis40_2026-02_rc
2026-05-18 07:26:37 +02:00
0a4906c5ac
added course-specific mailing lists
2026-05-13 16:07:43 +02:00
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
d27071528f
revert change to comparision in markDirty Method
2026-05-13 11:16:18 +02:00
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
57597dac29
- added reservierungen
...
- added updatemails
- added reservierungssync
- updated status kurzbz
- reservierung renderer for tempus
2026-04-28 20:17:50 +02:00
e984425e36
Merge branch 'feature-68530/Dashboard_Cleanup_Admin' into cis40_2026-02_rc
2026-04-23 12:09:09 +02:00
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
d926e4165b
Merge branch 'master' into cis40_2026-02_rc
2026-04-20 17:52:24 +02:00
92a2053b42
Merge branch 'feature-40870/BUG_Studstatus_unpause_order_should_be_DESC'
2026-04-20 17:30:14 +02:00
6cc09969dd
Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin
2026-04-20 10:45:20 +02:00
70ebe34f1f
merge develop into -- manual conflict resolution
2026-04-16 16:09:03 +02:00
6ce14a25d7
Merge branch 'master' into feature-70376/Lohnguide
2026-04-15 11:49:26 +02:00
f1c3c8296f
implemented 'OtherLvPlan' to view other users' timetables
2026-04-13 10:41:41 +02:00
7240b0c798
first version of history logic
2026-04-08 14:40:33 +02:00
f06e59b362
Merge branch 'master' into feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe
2026-04-08 14:13:02 +02:00
5c463c0866
add vordienstzeit to lohnguide
2026-04-06 22:25:13 +02:00
ab5294de2f
stylingaenderungen
...
coursepicker umgebaut, keine backend suche mehr
hinzugefuegt:
- resizeHanlder funktion
- broadcastchannel postMessage "dropped"
- tbl_kalender_status column bezeichnung_mehrsprachig
- tbl_kalender_status column sort
2026-04-01 10:53:31 +02:00
8dd42361a0
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
# system/dbupdate_3.4.php
2026-03-30 09:18:31 +02:00
00e019d6fe
cleanup db data
2026-03-26 15:21:41 +01:00
5b0c115b10
Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin
2026-03-25 17:06:52 +01:00
6fbb09eb6e
group or clause
2026-03-25 16:32:43 +01:00
91d656ff60
remove unnecessary function
2026-03-25 16:11:52 +01:00
e990bb3d81
tempus pre-alpha version
2026-03-25 14:41:13 +01:00
e3093bdf3f
get magic funktionen (Mitarbeiter, Student) as dashboard presets
2026-03-24 15:15:36 +01:00
b11d8d056a
get access rights from permissionlib
2026-03-24 15:15:12 +01:00
f15fd40636
dashboardlib bug: array <=> stdclass
2026-03-23 15:41:32 +01:00
059b13938e
Merge branch 'master' into feature-70376/Lohnguide
2026-03-18 11:46:27 +01:00
5fbcf588ed
fix vertragsbestandteil lohnguide
2026-03-05 14:29:56 +01:00
e054f1222b
basic model and factory for lohnguide
2026-03-03 11:50:45 +01:00
d6108d816e
Merge branch 'master' into hotfix-69228/DOCSBOX
2026-02-23 14:28:54 +01:00
Ivymaster