Ivymaster
bfb29d472e
Conflict resolved
2026-07-16 13:46:10 +02:00
Harald Bamberger
c0b5f2f748
add permission to DetailHeader function for use in pv21
2026-07-16 12:58:00 +02:00
Ivymaster
829d50ef0a
WIP: Conflicts resolved
2026-07-09 15:37:21 +02:00
ma0048
a413ae17b8
suche und filter erweiterungen
2026-07-09 10:58:56 +02:00
Ivymaster
c9cdd4725a
Conflict resolved
2026-07-09 10:50:16 +02:00
Cristina
8548b93ddc
Added method getPreviousSameSemesterFrom in Studiensemester_model.php
...
Method returns the current study semester and the previous semesters of the same type (SS/WS).
2026-07-08 18:57:31 +02:00
Cristina
bdc4782e9d
Merge branch 'master' into epic/LV-Evaluierung_STG-KF-Datenaggregation
2026-07-08 18:54:02 +02:00
Harald Bamberger
5694ba7325
Merge branch 'master' into 77804-exclude-moodle-from-other-lv-plan
2026-07-08 14:45:15 +02:00
Harald Bamberger
e4f43cc820
Merge branch 'master' into feature/76981-missing-mailing-lists
2026-07-08 14:15:40 +02:00
adisposkofh
8adc1c8bcc
not showing moodle events in other users' lv plans
2026-07-08 11:41:58 +02:00
Harald Bamberger
5602c7091a
Merge branch 'feature/76688-general-tabulator-issues_76776-localization' into cis40_2026-02_rc_abgabetool_finetuning_76688
2026-07-08 07:17:24 +02:00
Andreas Österreicher
6a16fb7515
Betreuerart wird Übergeben damit Zweitbetreuer keine Termine erstellen können
2026-07-07 14:33:29 +02:00
Andreas Österreicher
33b05e9df5
Abfrage für PersonID entfernt da sonst Zweitbetreuer/Erstbetreuer nicht geladen werden
2026-07-07 14:10:55 +02:00
Harald Bamberger
0fd938e85c
Merge branch 'master' into feature/76688-general-tabulator-issues_76776-localization
2026-07-07 11:08:19 +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
Cristina
335753be8c
Adapted Lvevaluierung Mail texte "Evaluierungszeitfenster" instead of "Evaluationszeitraum"
2026-07-06 12:19:28 +02:00
Johann Hoffmann
d405296a14
also show email contact for zweitbetreuer in student page + distinguish them in the label in case of more than 1 betreuer;
2026-06-30 13:02:19 +02:00
Johann Hoffmann
6264006728
flat table selectAll Handler fix; call checkZuordnung just how we thoughtcrimed it in feature-76667/ProjektarbeitUploadZuordnungErrorMessage
2026-06-29 14:30:41 +02:00
Johann Hoffmann
8abb028f55
Merge branch 'feature-76667/ProjektarbeitUploadZuordnungErrorMessage' into cis40_2026-02_rc_abgabetool_finetuning
...
# Conflicts:
# application/controllers/api/frontend/v1/Abgabe.php
2026-06-29 13:21:14 +02:00
Johann Hoffmann
48798a9cee
zusatzdaten added to new getMitarbeiterProjektarbeiten implementation; fix assignment of noteBackend variable -> needed for benotet headers; WIP phrasen archeology
2026-06-29 13:07:11 +02:00
Harald Bamberger
a8f472ca6c
Merge branch 'cis40_2026-02_rc' into cis40_2026-02_rc_abgabetool_finetuning
2026-06-26 15:18:42 +02:00
Harald Bamberger
138c80c97a
Merge branch 'master' into cis40_2026-02_rc
2026-06-26 15:15:47 +02:00
Harald Bamberger
a23d079001
Merge branch 'master' into feature-54628/studstatus_einzelne_ablaeufe_aktivieren_deaktivieren
2026-06-26 14:07:14 +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
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
Johann Hoffmann
3094772150
also added missing erstbetreuer arten to getProjektbetreuerEmail
2026-06-22 13:56:36 +02:00
Johann Hoffmann
f0afcdd1c5
getMitarbeiterProjektarbeiten CTE primary_betreuer added missing Betreuerarten "Begutachter" and "Betreuer" aswell as where clause on person_id to avoid selecting every betreuer; import the correct dateFilter Headerfilter so manual input is working as intended;
2026-06-22 13:48:41 +02:00
Johann Hoffmann
715c9f77b8
added missing config BETREUER_SAMMELMAIL_BUTTON_STUDENT in getConfig Api Call; removed duplicate uid data field resulting from merge;
2026-06-22 11:17:14 +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
Harald Bamberger
90b8788c93
Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning
2026-06-18 14:46:05 +02:00
Harald Bamberger
c125130dcb
Merge branch 'cis40_2026-02_rc' into cis40_2026-02_rc_abgabetool_finetuning
2026-06-18 14:38:42 +02:00
Harald Bamberger
eb9c882fe9
Merge branch 'master' into cis40_2026-02_rc
2026-06-18 08:48:52 +02:00
Johann Hoffmann
2170d3e14a
numeric notensort in all tables; changed stv projektarbeit getNoten to only fetch active ones so stv and abgabetool use the same set of grades;
2026-06-16 15:17:40 +02:00
Johann Hoffmann
2b06de8ecb
Merge remote-tracking branch 'origin/master' into feature-76657/AbgabetoolFinetuning
2026-06-16 11:59:53 +02:00
Johann Hoffmann
263b04e67f
reworked assistenz timeline feature; now shows all projektarbeiten of associated student in a more compact form;
2026-06-15 14:37:47 +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
Johann Hoffmann
3f99a2ce81
can send zweitbetreuer token mail on demand from betreuer abgabetool detail buttons, if it is external zweitbetreuer without benutzer
2026-06-12 12:17:00 +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
Johann Hoffmann
e574998897
fetch both erst & zweitbetreuer in abgabetool betreueransicht; fix ProjektarbeitModel->getProjektbetreuerEmail by explicitely only querying erstbetreuer, which fixes rare cases where endupload crashes when the zweitbetreuer has no contact email as private mail AND randomly gets retrieved as first row by the query; fix race condition on the semester filter default value in assistenz view; block all edit/delete operations in flat table for any termin which already has a file uplaoded (abgabetermin != null) or has a note (due to quality gate), to avoid confusing UI implementations; fix STV Projektarbeit bug where betreuer form options where not loading correctly when editing existing projektarbeiten;
2026-06-11 17:10:33 +02:00
Ivymaster
a7ddc0d348
Merge branch 'master' into feature-68298/Tempus_Grundstruktur-tests
2026-06-08 16:56:42 +02:00
Johann Hoffmann
61349c7ca3
show updated/inserted by/at on every abgabetermin in mitarbeiter detail view;
2026-06-05 12:15:11 +02:00
Johann Hoffmann
c75e1f9416
WIP
2026-06-05 10:12:03 +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
Ivymaster