c9cdd4725a
Conflict resolved
2026-07-09 10:50:16 +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
4edec4df00
add changes for calendar flicker on event reload, and calendar scroll mods
2026-06-22 15:06:53 +02:00
273b1d3fe4
add resources conflict checker and extend tempus tests with it
2026-06-19 11:41:56 +02:00
de60d0d09e
Conflicts resolved
2026-06-15 12:47:29 +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
a7ddc0d348
Merge branch 'master' into feature-68298/Tempus_Grundstruktur-tests
2026-06-08 16:56:42 +02:00
55ba874bb0
Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-68298/Tempus_Grundstruktur-tests
2026-06-01 15:09:53 +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
bc7fc9611b
Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-68298/Tempus_Grundstruktur-tests
2026-06-01 14:09:50 +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
1ecf011ba2
Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-68298/Tempus_Grundstruktur-tests
2026-06-01 11:25:44 +02:00
e62848c773
added collision checks on creation
2026-06-01 11:18:53 +02:00
bccaf72399
Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-68298/Tempus_Grundstruktur-tests
2026-06-01 09:17:07 +02:00
d948251736
WIP: Tempus e2e tests
2026-05-27 10:29:13 +02:00
9ac9804563
implement first version of collision checks
2026-05-26 14:09:58 +02:00
24a0e74281
Fix: prevent duplicate entries
2026-05-21 12:27:55 +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
92a2053b42
Merge branch 'feature-40870/BUG_Studstatus_unpause_order_should_be_DESC'
2026-04-20 17:30:14 +02:00
6ce14a25d7
Merge branch 'master' into feature-70376/Lohnguide
2026-04-15 11:49:26 +02:00
7240b0c798
first version of history logic
2026-04-08 14:40:33 +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
6fbb09eb6e
group or clause
2026-03-25 16:32:43 +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
85a10e27cc
fix setFirstStudent if GENERATE_ALIAS_STUDENT is false
2026-02-02 17:59:15 +01:00
43a1d163a3
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
2026-01-20 09:21:47 +01:00
1ce362b66b
Removed forgotten error_log
2026-01-07 15:54:59 +01:00
c113c80862
fix calculation of next student matrikelnr aka personenkennzeichen and student uid
2025-12-22 21:11:05 +01:00
0616236e00
bugfix: ZGV Übernahme bei Interessentenanlage, bestehende ZGVs die null sind ausfiltern
2025-12-18 12:48:08 +01:00
50439ee6cc
Merge branch 'master' into feature-63468/Studierendenverwaltung_Neuanlage_von_Interessenten_ueberarbeiten
2025-12-09 11:37:57 +01:00
0b6dc34220
If docsbox queue is slow, the DocsboxLib can stop checking the queued document status and raise an error
2025-11-10 15:41:01 +01:00
4407310f40
Merge branch 'master' into feature-67484/lvverwaltung_finetunning
2025-10-20 11:33:43 +02:00
352fc53e74
Erster Prototyp für Tempus Neu DB und GUI
2025-10-20 11:01:50 +02:00
07bcbee11b
add Interessent: insertamum and insertvon when adding prestuden
2025-10-13 10:52:52 +02:00
e4943e0bb8
Merge branch 'feature-67550/CIS4_Profilupdate_Finetuning'
2025-10-07 16:22:09 +02:00
4054a0cfee
format Zutrittskarte Datum
2025-10-07 15:24:45 +02:00
Ivymaster