Ivymaster
c9cdd4725a
Conflict resolved
2026-07-09 10:50:16 +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
1805fc643e
add bug fixes and test issue fixes
2026-06-24 17:59:55 +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
688f815178
BUG: add resovement for multiple ort import from old tempus per one kalendar item
2026-06-19 12:48:57 +02:00
Ivymaster
273b1d3fe4
add resources conflict checker and extend tempus tests with it
2026-06-19 11:41:56 +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
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
Andreas Österreicher
30b8a406a5
Merge branch 'feature-75888/reihungstest_mehrfachdurchfuehrung' into rc_reihungstest
2026-06-01 09:10:35 +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
ma0048
24a0e74281
Fix: prevent duplicate entries
2026-05-21 12:27:55 +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
Harald Bamberger
17772c3738
Merge branch 'master' into feature-70376/Lohnguide
2026-05-13 11:15:07 +02:00
Harald Bamberger
b7e48633ab
Merge branch 'master' into bug-76146/studvw_karteireiter_dokumente_akzeptiert_eintraege_ohne_vorhandenes_dokument
2026-05-05 13:33:38 +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
Harald Bamberger
cb60ddcc94
Merge branch 'master' into feature-62607/konto_oh_beitrag_betrag_aus_eigener_tabelle
2026-05-04 15:41:52 +02:00
Harald Bamberger
de2aabf00b
readd dokument preview link to api response
2026-05-04 09:30:16 +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
7427aa87ea
Merge branch 'feature-76545/findAbgabenNewOrUpdatedSinceByAbgabedatumFixTimestampDateComparison'
2026-04-21 17:01:04 +02:00
Johann Hoffmann
85043e57db
added missing parenthesis
2026-04-21 17:00:07 +02:00
Johann Hoffmann
5beddbccb4
changed the where clause to a simpler = CURRENT_DATE comparison -> works the same if the job runs daily and fetches updates of one day/date; has to be changed back in case we want to find updates in a range larger than 1 day in an interval larger than 1 day;
2026-04-21 14:18:45 +02:00
Harald Bamberger
92a2053b42
Merge branch 'feature-40870/BUG_Studstatus_unpause_order_should_be_DESC'
2026-04-20 17:30: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
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
ma0048
13e8a1a9f6
bug fixed + infocenter performance
2026-04-16 14:21:02 +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
Harald Bamberger
6ce14a25d7
Merge branch 'master' into feature-70376/Lohnguide
2026-04-15 11:49:26 +02:00
ma0048
21d80905a2
akzeptierte dokumente anzeigen, auch wenn kein dokument vorhanden ist
2026-04-13 13:04:46 +02:00
Andreas Österreicher
3a91b12f31
Merge branch 'epic-56039/LV-Evaluierung'
2026-04-13 10:39:00 +02:00
ma0048
7240b0c798
first version of history logic
2026-04-08 14:40:33 +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
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
ma0048
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
ma0048
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