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
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
bdc4782e9d
Merge branch 'master' into epic/LV-Evaluierung_STG-KF-Datenaggregation
2026-07-08 18:54:02 +02:00
33b05e9df5
Abfrage für PersonID entfernt da sonst Zweitbetreuer/Erstbetreuer nicht geladen werden
2026-07-07 14:10:55 +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
335753be8c
Adapted Lvevaluierung Mail texte "Evaluierungszeitfenster" instead of "Evaluationszeitraum"
2026-07-06 12:19:28 +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
a8f472ca6c
Merge branch 'cis40_2026-02_rc' into cis40_2026-02_rc_abgabetool_finetuning
2026-06-26 15:18:42 +02:00
138c80c97a
Merge branch 'master' into cis40_2026-02_rc
2026-06-26 15:15:47 +02:00
a23d079001
Merge branch 'master' into feature-54628/studstatus_einzelne_ablaeufe_aktivieren_deaktivieren
2026-06-26 14:07:14 +02:00
a595daa9b4
Merge branch 'master' into feature-71393/studierendenstatus_unterbrecher_ablehnungsgrund_in_den_emailtext_integrieren
2026-06-26 11:50:12 +02:00
3094772150
also added missing erstbetreuer arten to getProjektbetreuerEmail
2026-06-22 13:56:36 +02:00
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
90b8788c93
Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning
2026-06-18 14:46:05 +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
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
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
61349c7ca3
show updated/inserted by/at on every abgabetermin in mitarbeiter detail view;
2026-06-05 12:15:11 +02:00
c75e1f9416
WIP
2026-06-05 10:12:03 +02:00
178c854941
Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning
2026-05-26 07:59:17 +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
57597dac29
- added reservierungen
...
- added updatemails
- added reservierungssync
- updated status kurzbz
- reservierung renderer for tempus
2026-04-28 20:17:50 +02:00
dfe05cbfa8
make tagsArrayAC a computed and rename it to availableTags
2026-04-27 10:03:36 +02:00
5798e960a2
Use config update for widgets as intended instead of a proprietary solution
2026-04-27 09:37:17 +02:00
e984425e36
Merge branch 'feature-68530/Dashboard_Cleanup_Admin' into cis40_2026-02_rc
2026-04-23 12:09:09 +02:00
2c1702a20b
Merge branch 'feature-68957/CIS4_Dashboard_Bookmark_Widget_Sort_Tags' into cis40_2026-02_rc
2026-04-23 11:19:17 +02:00
076ae15abd
Merge branch 'bug-75998/menuepunkt_fallback_wenn_die_sprache_nicht_uebereinstimmt' into cis40_2026-02_rc
2026-04-23 11:03:44 +02:00
2dd5a95232
Merge branch 'master' into cis40_2026-02_rc
2026-04-23 10:41:41 +02:00
85043e57db
added missing parenthesis
2026-04-21 17:00:07 +02:00
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
1a37273a9e
Merge branch 'feature-63349/Cis_Menu_Aktiv_Flag' into cis40_2026-02_rc
2026-04-20 18:08:46 +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
6e103480cc
Merge branch 'master' into feature-63349/Cis_Menu_Aktiv_Flag
2026-04-20 16:00:28 +02:00
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
6cc09969dd
Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin
2026-04-20 10:45:20 +02:00
98a10a2f55
Merge branch 'feature-69389/AbmeldungSTGL_Anzeige_mit_Studiengangskuerzel'
2026-04-17 12:37:49 +02:00
e48b94b858
studiengangskuerzel statt kurzbzlang
2026-04-17 12:35:55 +02:00
1c2491385f
Merge branch 'master' into feature-68957/CIS4_Dashboard_Bookmark_Widget_Sort_Tags
2026-04-17 10:38:00 +02:00
70ebe34f1f
merge develop into -- manual conflict resolution
2026-04-16 16:09:03 +02:00
ba543448ae
Merge branch 'bug-76260/StudVW_Messages_TinyMCE_Cursor_Jumping_TextInput'
2026-04-16 11:26:32 +02:00
f121f9b5a2
deactivate pagination - since potentially msg threads are not shown completely
2026-04-16 11:23:57 +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
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
386cc779bf
Merge branch 'master' into epic-56039/LV-Evaluierung
2026-04-02 15:49:20 +02:00
3f53c5feba
Added: method getKFLByUID to get Kompetenzfeldleitung by UID
2026-04-02 14:23:59 +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
Ivymaster