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
8adc1c8bcc
not showing moodle events in other users' lv plans
2026-07-08 11:41:58 +02:00
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
6a16fb7515
Betreuerart wird Übergeben damit Zweitbetreuer keine Termine erstellen können
2026-07-07 14:33:29 +02:00
0fd938e85c
Merge branch 'master' into feature/76688-general-tabulator-issues_76776-localization
2026-07-07 11:08:19 +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
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
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
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
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
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
90b8788c93
Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning
2026-06-18 14:46:05 +02:00
c125130dcb
Merge branch 'cis40_2026-02_rc' into cis40_2026-02_rc_abgabetool_finetuning
2026-06-18 14:38:42 +02:00
eb9c882fe9
Merge branch 'master' into cis40_2026-02_rc
2026-06-18 08:48:52 +02:00
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
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
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
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
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
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
c75e1f9416
WIP
2026-06-05 10:12:03 +02:00
d0d590ff89
block the change of paabgabetyp if the termin has an upload associated (abgabedatum !== null) or has a note; TODO: block the same in multiedit!
2026-06-01 12:56:55 +02:00
60e36bb4b9
change updateProjektarbeit call so that the abgabedatum actually only gets set when doing the endupload and not also when zusatzdaten are being edited, which can certainly be an earlier or even later date;
2026-06-01 11:30:36 +02:00
9ec876fc27
Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning
2026-05-29 13:32:15 +02:00
ae71517ceb
expanded title validation in frontend aswell before validation for the same patterns in backend just in case; phrasen alert messages & use backend response instead of frontend validated title
2026-05-29 11:47:46 +02:00
004bcc43c3
merged stv saveProjektarbeit/saveBetreuer buttons; benoten button for betreuer is now a table action button; remove viewData.uid and call student_uid via authinfo endpoint; digital signature info links in student abgabetool; show projektarbeit note in overview inside the accordions content aswell as flex-end in the header; smaller vertical padding on all abgabetool modals from 3rem to 1.5 rem aka py-5 to py-4;
2026-05-29 09:50:37 +02:00
6d79288f33
Merge remote-tracking branch 'origin/master' into feature-76657/AbgabetoolFinetuning
...
# Conflicts:
# system/phrasesupdate.php
2026-05-27 16:11:33 +02:00
2eb2c36d5b
replace + in email helpers with spaces; configs for title edit, multi edit table & confetti on endupload; empty student projektarbeiten check; only show dropdown labels on large displays; new phrasen & phrasen fixes;
2026-05-26 17:06:39 +02:00
9ac9804563
implement first version of collision checks
2026-05-26 14:09:58 +02:00
22eed92c86
Merge branch 'feature-75838/UXImproveProjektarbeitSTVSprint247' into feature-76657/AbgabetoolFinetuning
2026-05-26 12:58:57 +02:00
97e7e5b641
keine projektarbeiten vorhanden mit leerem array initilisieren
2026-05-26 09:12:00 +02:00
178c854941
Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning
2026-05-26 07:59:17 +02:00
24a0e74281
Fix: prevent duplicate entries
2026-05-21 12:27:55 +02:00
e59bd51333
modified getPhrases endpoint: replaced get w/ post, replaced query params w/ payload
2026-05-19 16:35:22 +02:00
239eaa90e9
separate endpoint for generic tabulator phrases with cacheable response
2026-05-19 16:27:54 +02:00
d3ceed32c6
compacting all events in mobile monthly lv plan
2026-05-07 15:15:50 +02:00
229882e8d8
Merge branch 'cis40_2026-02_rc' of github.com:FH-Complete/FHC-Core into cis40_2026-02_rc
2026-05-07 13:19:49 +02:00
90e933de00
Merge branch 'master' into cis40_2026-02_rc
2026-05-06 17:35:28 +02:00
d0adf2dfc3
improved assistenz subqueries for zweitbetreuer infos by using common table expression instead of 8 subqueries; adapted splitMailsHelper function to take in body parameter to set default email text by parameter; dateStyles adapted so "in 12 days" also applies to termine without uploads; titleEdit modal in student & studentDetail component; send email to relevant assistenzen & projektarbeit betreuer about change from old to new title; 2nd flat table in AbgabetoolAssistenz that provides a list of all projektarbeittermine so it can be filtered & multiselected; multi delete & multi edit on these selected termine; tried to introduce a media query for zoomed in desktop users that shrinks fontsize and tabulator rows/cells; standard assistenz table column definitions have sensible minWidths & most columns are default invisible; fancy multiselect headerfilter on qualitygate 1/2 status column; actually figured out a vue watcher race codnition triggering loadProjektarbeiten twice unnecessarily; added a reload Button in case one observes a faulty reactivity somewhere in the table; fancy multiselect headerfilter on termin status column for flat table; Preselect current Semester & autoapply Filter for it; WIP refine new table & hunt for bugz; WIP working on the exact custom select handler Handling with filtered datasets; fixed root element style on legacy php view for abgabetool in old cis; WIP define more accurate allowed to delete & allowed to Edit conditions for abgabetermine -> currently benotet quality gates can be edited/deleted!!!!!
2026-05-06 13:46:26 +02:00
57e901be27
other_lv_plan permission on reservations
2026-05-06 13:41:16 +02:00
b6e1bb06f3
implemented tabulator localization
2026-05-06 10:54:18 +02:00
b7e48633ab
Merge branch 'master' into bug-76146/studvw_karteireiter_dokumente_akzeptiert_eintraege_ohne_vorhandenes_dokument
2026-05-05 13:33:38 +02:00
453fc209b8
Merge branch 'master' into cis40_2026-02_rc
2026-05-05 08:53:07 +02:00
cb60ddcc94
Merge branch 'master' into feature-62607/konto_oh_beitrag_betrag_aus_eigener_tabelle
2026-05-04 15:41:52 +02:00
af8814468f
Merge branch 'feature-76669/optimizing-menu-load' into cis40_2026-02_rc
2026-04-30 07:43:56 +02:00
2227c3ecf1
Merge branch 'feature-76671/moving-avg-grade-calc-to-backend' into cis40_2026-02_rc
2026-04-30 07:33:42 +02:00
57597dac29
- added reservierungen
...
- added updatemails
- added reservierungssync
- updated status kurzbz
- reservierung renderer for tempus
2026-04-28 20:17:50 +02:00
5592b69dc0
Merge branch 'cis40_2026-02_rc' into feature-76669/optimizing-menu-load
2026-04-28 13:00:27 +02:00
ma0048