1faab59716
Merge branch 'feature-55992/FHC4_Studierendenverwaltung_Messaging' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231
2025-05-21 13:34:34 +02:00
1ac6e50784
Merge branch 'feature-55991/FHC4_Studierendenverwaltung_Gruppen' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231
2025-05-21 13:30:07 +02:00
5ed1bae456
Merge branch 'master' into feature-61231/FHC4_Studierendenverwaltung_Aufnahmetermine
2025-05-21 13:26:47 +02:00
c861278aa8
Merge branch 'master' into feature-61230/FHC4_Studierendenverwaltung_LVTermine
2025-05-21 13:26:14 +02:00
2297055949
Merge branch 'master' into feature-61229/FHC4_Studierendenverwaltung_GemeinsameStudien
2025-05-21 13:25:36 +02:00
bf3127d518
Merge branch 'master' into feature-60875/FHC4_Studierendenverwaltung_Anrechnungen
2025-05-21 13:24:52 +02:00
10f731f2e2
Merge branch 'master' into feature-60874/FHC4_Studierendenverwaltung_Dokumente
2025-05-21 13:24:08 +02:00
b498da8603
Merge branch 'master' into feature-55992/FHC4_Studierendenverwaltung_Messaging
2025-05-21 13:18:43 +02:00
a2b77411cb
Merge branch 'master' into feature-55991/FHC4_Studierendenverwaltung_Gruppen
2025-05-21 10:47:48 +02:00
7d4fda4fe6
Merge branch 'master' into feature-55354/Studierendenverwaltung_Karteireiter_Archiv
2025-05-21 10:46:31 +02:00
d1c2cf8e64
Merge branch 'master' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren
2025-05-19 13:22:05 +02:00
df108482eb
update(Dashboard additionalRow): opens tooltip when hovering over the button to add a now line to the dashboard grid
2025-05-19 09:09:48 +02:00
382006aa8b
Projektarbeit Studierendenverwaltung: now possible to save and edit Projektbetreuer
2025-05-16 13:37:21 +02:00
233e768aad
copy Function files to component
2025-05-09 09:11:33 +02:00
9d4568e15e
client side placementtest handling, filtering Dropdowns placementtests, Phrases, show future Placementtests, open Reihungstestverwaltung
2025-05-08 09:58:08 +02:00
2ee7742ada
Merge branch 'master' into feature-25999/C4_cleanup
2025-05-05 16:56:00 +02:00
d791a6d3ef
phrasen & change email template name to under 32 characters long
2025-04-29 15:03:10 +02:00
38424bc875
serientermin anlegen mitarbeiter; deadline overview mitarbeiter;
2025-04-29 14:36:40 +02:00
bf0cd8e8e3
actions new, update and delete aufnahmetermine
2025-04-25 16:15:27 +02:00
a5ab2f1381
match abgabetool_detail student/mitarbeiter look&feel; WIP terminserie, zweitbetreuer logic etc
2025-04-25 14:30:12 +02:00
54e8a855f4
Merge branch 'master' into feature-25999/C4_cleanup
...
# Conflicts:
# public/js/apps/Dashboard/Fhc.js
# public/js/components/Cis/Cms/Content.js
# public/js/components/Cis/Cms/News.js
# public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
# public/js/components/Cis/Mylv/LvUebersicht.js
# public/js/components/Cis/Stundenplan/Stundenplan.js
# public/js/components/DashboardWidget/Ampel.js
# public/js/components/DashboardWidget/News.js
# public/js/components/DashboardWidget/Stundenplan.js
# public/js/components/DashboardWidget/Url.js
# system/phrasesupdate.php
2025-04-25 10:58:02 +02:00
2ab01132b1
show List Admission Dates
2025-04-24 16:30:50 +02:00
e28067259b
WIP Abgabetool Mitarbeiter DetailComponent
2025-04-23 13:59:31 +02:00
854223a2d7
Merge master into feature-60874/FHC4_Studierendenverwaltung_Dokumente
2025-04-23 13:37:31 +02:00
d780b472a6
Merge master into feature-60875/FHC4_Studierendenverwaltung_Anrechnungen
2025-04-23 11:11:35 +02:00
b9bd0e53d8
merge master into feature-55992/FHC4_Studierendenverwaltung_Messaging
2025-04-22 14:58:56 +02:00
2b9805aeb3
merge master into feature-55991/FHC4_Studierendenverwaltung_Gruppen
2025-04-22 13:58:27 +02:00
2d87663841
basic structure for Tab Admission Dates
2025-04-22 13:35:31 +02:00
0c95dbad1f
update(Dashboard Section description): adds phrases for the description of general/custom/other sections
2025-04-22 11:40:58 +02:00
47917e42c3
compare datetime timestamp for n-workdays ago calculation; more eager check on change of kontrollzeiten/termine if they match a termin; added missing phrase; fetch uploaddatum in same format as von/bis for entschuldigungen so date headerfilter can work as intended; zugangscode zeitlich abgelaufen show error message;
2025-04-17 12:07:54 +02:00
59f83c33b0
Merge branch 'master' into feature-55354/Studierendenverwaltung_Karteireiter_Archiv
2025-04-16 15:24:59 +02:00
3f607ec241
phrasen
2025-04-15 18:03:51 +02:00
af30a3408c
add switch stundenplan, excel export, phrases
2025-04-15 14:22:39 +02:00
1888c51a48
master gemerged
...
phrase bugfix
2025-04-15 11:09:59 +02:00
ad93a0a84c
Merge branch 'refs/heads/master' into feature-54827/internationalisierungsmassnahmen_optimierungen
2025-04-15 11:09:05 +02:00
6b6ec311c7
Merge branch 'master' into feature-56330/Digi-Anw-Feedback
2025-04-14 15:23:31 +02:00
8218c915d5
anw phrasen
2025-04-14 15:14:49 +02:00
419c199e84
new Tab GemeinsameStudien
2025-04-09 11:06:50 +02:00
d75e26f8ae
add basis framework for lv dates
2025-04-07 14:46:36 +02:00
1991418931
New tab Dokumente
2025-04-03 16:54:56 +02:00
8a7290359a
Merge branch 'master' into feature-56033/Beurteilungsformulare_neue_Kategorien_ab_SS2025
2025-04-01 10:52:04 +02:00
ba806c13fb
assistenz edit entschuldigung modal for editing von/bis date (on open excuse notes) & textarea for notiz - which is still limited to 255 characters; added student semester column to assistenz table; removed column width constraints & layout changed to fitData, persistence option is TRUE now; WIP von/bis/uplaoddate headerfilter; automatically send email to students on entschuldigungn status changed; added minimum time range for Kontrolle to be at least the length of 1 teaching unit(per config) - currently 45minutes; start new kontrolle modal more clearly shows when time & date values have been read from stundenplan; increased qr degeneration timer from 200 to 5000ms to avoid "missed" checkins due to network time; lektor can retrieve all entschuldigungen ranges & statuses of students when hovering their row; lektor can show anw qr window seperately now; into externalzuordnung admin/person_id fix in deleteEntschuldigung; moved fetch semesterinfo into global setup; fixed some vue template warnings;
2025-03-27 17:15:37 +01:00
392c15da77
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
2025-03-27 09:32:59 +01:00
b18b3b62a7
Merge remote-tracking branch 'origin/feature-40953/LV-Template_Uebersichtsseite' into feature-40953/LV-Template_Uebersichtsseite
...
# Conflicts:
# system/phrasesupdate.php
2025-03-20 13:29:49 +01:00
2a4f1af69f
Added phrase lizenzkategorie to Softwarebereitstellung app
2025-03-20 11:41:47 +01:00
b8417869b5
Added phrase lizenzkategorie to Softwarebereitstellung app
2025-03-20 11:18:26 +01:00
b75c9cc524
portation of tab Anrechnungen
...
- switch version edit / non edit in config
2025-03-20 11:16:05 +01:00
2759bb0309
cis4 abgabetool student uploads/signature check/emails working; TODO: - testing with diff users, styling & mobile layout;
2025-03-19 15:57:08 +01:00
a0ce635c7e
Refactor and Cleanup
...
- adapt tabulator and queries for remote pagination
- use formatterParams for messageStati to enable phrase logic
- adapt logic for mitarbeiter_uid
- refactor logic to use new Page, new Tab and newDiv with one child component
- add phrases
2025-03-12 15:04:37 +01:00
669752dd90
WIP cis4 abgabetool student
2025-03-12 13:41:01 +01:00
Harald Bamberger