Harald Bamberger
579a55a00d
fix nested ternary operators
2026-09-17 14:18:10 +02:00
Andreas Österreicher
0a00caa1e4
Merge branch 'feature-82683/lvverwaltung_zusaetzliche_spalten_bei_lehrenden'
2026-09-17 14:00:07 +02:00
ma0048
c90f7a31bb
columns hinzugefuegt: insertvon/updatevon insertamum/updateamum
2026-09-11 12:03:06 +02:00
Andreas Österreicher
e32691994c
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
2026-08-26 08:21:30 +02:00
Harald Bamberger
6d641bbd06
pass in uid by reference
2026-08-24 13:56:55 +02:00
Harald Bamberger
9bf5bc2ad9
more generic bugfix, to use studentlehrverband only with date_range for the same studiensemester_kurzbz
2026-08-24 07:26:12 +02:00
Harald Bamberger
75d2cabdbe
bugfix lv-plan
2026-08-20 15:10:26 +02:00
Cristina
0f843db33d
Merge branch 'master' into epic/LVEvaluierung-Neu
2026-08-19 13:34:53 +02:00
Harald Bamberger
8d9113d5c8
Merge branch 'master' into feature-77666/Details_anzeigen_der_Valorisierung_pro_Person
2026-08-19 08:06:16 +02:00
Cristina
5e15d4b219
Add Distinct to getLeitung in Studiengang_model.php
...
Avoid multiple records for same active STGL.
e.g. double entries
2026-08-18 16:51:39 +02:00
Johann Hoffmann
46f8d0d07d
remove all remaining projektarbeit-lehreinheit joins across the codebase;
...
master merge reverted the LE removal in Projektarbeit_model -> re-applied that fix and went through every file that touches tbl_projektarbeit to find remaining issues.
Projektarbeit_model, stv Projektarbeit controller, Vertrag_model, vertrag.class, lehrauftragsliste_gst.xls.php, zeitaufzeichnung.class.php, sammelzeugnis.rdf.php, zeugnis.rdf.php, projektarbeit.rdf.php,
lehrauftrag.xml.php, personal_lektorenohnelehrauftrag.php, personal_generateverwendung.php
tbl_lehreinheit joins remain in tbl_lehreinheitmitarbeiter contexts where lehreinheit_id is always set.
2026-08-12 18:05:45 +02:00
Harald Bamberger
c81b5338de
Merge branch 'master' into feature-78292/dv_gehaltsbestandteil_ersteinstufung
2026-08-12 11:39:49 +02:00
Johann Hoffmann
9274743df3
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
...
# Conflicts:
# application/controllers/api/frontend/v1/Abgabe.php
# application/controllers/api/frontend/v1/stv/Projektarbeit.php
# application/models/education/Projektarbeit_model.php
# public/css/Studentenverwaltung.css
# public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
# public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
# public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
# public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
2026-08-12 11:26:51 +02:00
Werner Masik
d66fe72cc9
add field for salary adaption type (Ersteinstufung, indiv. Erhöhung, ..)
2026-08-11 11:18:36 +02:00
ma0068
31bae9b693
use function getStgAndDetails instead of getStgAndSem
2026-08-11 09:48:17 +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
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
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
Alexei Karpenko
c5c29df6cc
Gehaltsbestandteil, Gehaltsbestandteil_model: added gehaltstyp_bezeichnung
2026-07-14 20:51:41 +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