ma0068
9a592047a0
merge feature-70747/Zeitsperren_auf_VueJs_Portieren into feature-77941/CIS_MA_Zeitsperren_Portieren
2026-08-18 13:54:02 +02:00
ma0068
e6947a3246
merge master into feature-77941/CIS_MA_Zeitsperren_Portieren
2026-08-18 12:04:28 +02:00
ma0068
31bae9b693
use function getStgAndDetails instead of getStgAndSem
2026-08-11 09:48:17 +02:00
ma0068
0a46bf52dd
- neue funktion loadZeitsperrenforUid
...
– route für maUid
- Zeitsperren als Cis-App
– link für Zeitsperren maUid in Mitarbeiterprofil
- component ZeitsperrenMitarbeiterUid
- Dropdown oes:show only active Oes
2026-08-04 08:00:40 +02:00
Harald Bamberger
e9fc0629f5
Merge branch 'feature/76688-general-tabulator-issues_77080-persistence' into studvw_lvvw_2026_08_rc_77973
2026-08-03 16:06:34 +02:00
Harald Bamberger
6f0279d451
Merge branch 'master' into feature/76688-general-tabulator-issues_77080-persistence
2026-08-03 14:58:07 +02:00
Harald Bamberger
9f68fe6b3b
Merge branch 'feature-77973/StudVw-Feedback_Finetuning_bhmod' into studvw_lvvw_2026_08_rc
2026-08-03 11:18:34 +02:00
Harald Bamberger
3d728fd884
Merge branch 'master' into studvw_lvvw_2026_08_rc
2026-07-31 15:51:35 +02:00
chfhtw
2b4aef5633
Merge branch 'feature-77417/studvw-tags-formatter-and-header-filter' into studvw_lvvw_2026_08_rc
2026-07-31 12:52:29 +02:00
Harald Bamberger
69048f8f48
bugfix semester calculation between semesters
2026-07-31 09:51:04 +02:00
ma0068
96b4210d21
refactor backend
...
css file for showing inactive items in dropdown
fix missing view for vertretung zeitsperren
sticky top for header
2026-07-30 15:29:15 +02:00
Harald Bamberger
aa52c32d40
Merge branch 'feature-77372/lv_verwaltung_release_fine_tuning' into studvw_lvvw_2026_08_rc
2026-07-28 15:50:06 +02:00
adisposkofh
89ea4187fa
merged master into
2026-07-27 15:58:08 +02:00
ma0068
e876b9e4ab
Zeitsperren Mitarbeiter - add component to Vertragsverwaltung
2026-07-24 13:11:40 +02:00
ma0068
68292b60af
add Tags Incoming and Preabbrecher
2026-07-20 17:36:54 +02:00
Harald Bamberger
6c25a3b262
Merge branch 'feature-77537/Studvw_Feedback' into studvw_2026_05_rc_tags
2026-07-17 11:38:46 +02:00
Harald Bamberger
1f6c9e865b
Merge branch 'bug-77392/StudVW_Dokumente_Nachreichlogik_fehlendeBezeichnung' into studvw_2026_05_rc_tags
2026-07-17 11:30:23 +02:00
ma0048
b21900d006
Merge remote-tracking branch 'origin/feature-70656/lvverwaltung_gruppen_im_baum_und_drag_and_drop' into feature-77372/lv_verwaltung_release_fine_tuning
2026-07-15 11:27:48 +02:00
ma0048
012571d070
Merge remote-tracking branch 'origin/feature-69453/lv_verwaltung_karteireiter_noten' into feature-77372/lv_verwaltung_release_fine_tuning
...
# Conflicts:
# public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
# public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
2026-07-15 09:43:53 +02:00
ma0048
a2d10ae09d
Merge remote-tracking branch 'origin/feature-69454/lvverwaltung_karteireiter_lv_termine' into feature-77372/lv_verwaltung_release_fine_tuning
...
# Conflicts:
# application/controllers/api/frontend/v1/LvPlan.php
# public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
2026-07-15 09:32:03 +02:00
ma0048
c233902fe2
Merge remote-tracking branch 'origin/feature-70746/lvverwaltung_lektorentausch' into feature-77372/lv_verwaltung_release_fine_tuning
...
# Conflicts:
# application/libraries/LektorLib.php
2026-07-15 09:20:57 +02:00
ma0048
0ec2c8c543
Merge remote-tracking branch 'origin/bug-69492/bug_lvverwaltung_doppelte_eintraege' into feature-77372/lv_verwaltung_release_fine_tuning
2026-07-15 09:17:29 +02:00
Harald Bamberger
d4929c8e22
Merge branch 'studvw_2026_05_rc_tags' into feature-77537/Studvw_Feedback
2026-07-14 10:52:31 +02:00
Harald Bamberger
194b74e390
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
2026-07-14 10:52:05 +02:00
Harald Bamberger
ee70e43bfb
Merge branch 'master' into studvw_2026_05_rc
2026-07-14 10:51:40 +02:00
Harald Bamberger
f8d8d501ca
Merge branch 'studvw_2026_05_rc_tags' into feature-77537/Studvw_Feedback
2026-07-13 14:42:54 +02:00
Harald Bamberger
7e6d670d82
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
2026-07-13 14:32:51 +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
b5e65cf072
Merge branch 'master' into studvw_2026_05_rc
2026-07-08 16:42:04 +02:00
Ivymaster
6c550372a3
add definable tag column in modified helpers
2026-07-07 15:49:16 +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
Cristina
335753be8c
Adapted Lvevaluierung Mail texte "Evaluierungszeitfenster" instead of "Evaluationszeitraum"
2026-07-06 12:19:28 +02:00
Ivymaster
69b19562f4
BUG: add issue fix for tag ordering
2026-06-30 10:27:16 +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
d680c3aa2b
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
2026-06-26 15:17:02 +02:00
Harald Bamberger
d98bdb9745
Merge branch 'master' into studvw_2026_05_rc
2026-06-26 15:16:37 +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
ma0068
f751df55b6
update query isPrestudentOutgoing to show only outgoing
2026-06-25 13:27:17 +02:00
ma0068
d5ee6f9cc2
adapt query for outgoing students
2026-06-24 15:48:04 +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
ma0068
21886e30a3
refactor query getUnacceptedDocuments
2026-06-22 08:50:10 +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
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
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
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
ma0068