 Johann Hoffmann
|
7c9bcb6fd2
|
Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4
# Conflicts:
# cis/private/lehre/notenliste.xls.php
# public/js/api/factory/studiensemester.js
# system/phrasesupdate.php
|
2026-09-15 14:44:45 +02:00 |
|
|
Johann Hoffmann
|
4399857f4a
|
WIP
|
2026-09-15 10:59:09 +02:00 |
|
|
Johann Hoffmann
|
3212800643
|
started extracting every meaningful/realistic decision in the grading workflow into configs; groups: exam date guard logic, grades/pruefungchain interactions, deadlines, role configuration & permission configurability, freigabe, import & display; lots of code bugfixes & general cleanup effort; WIP testing and finding bugs i introduced with this new & large configuration scheme;
|
2026-09-11 15:19:39 +02:00 |
|
|
Johann Hoffmann
|
6d2cbf4896
|
adapt import to also parse note.anmerkung (entschuldigt - en, nicht beurteilt - nb, etc) if configured; new config if the benotungstool is allowed to create kommissionelle prüfungen or if that is a job for assistenz in stv; coded a kommPruef as the last pruefungsattempt and not a special case so it follows the same ordering rules in the table; changed headers from "Antritte" to "Prüfungstermine" to keep the wording aligned with the domain objects definitions; tooltip explaining the current antritt while hovering over the badge (1,2,3-K) (maybe make the badges contents configurable?); changed the notenOption sort to resemble stv: order 1-5 by value and afterwards alphabetically; actually removed redundant configs for defining which noten count for antritte -> only go by bezeichnung and fetch the matching primary keys from each db as they can have mixed pk's; vorschlag übernehmen now upserts the first prüfungsattempt, aswell as the notenfreigabe(if no other pruefungen exist) which should fix the possibility of creating a pruefungseries that starts with termin2, vorschlag also carries a datepicker writing the date of that first prüfung but not the benotungsdatum -> that needs to stay the entry date since the freigabemechanismus hinges on it; added a flag handling the password inputs browser prompt to not appear on other inputs; WIP coming up with even more configurability in order to cover uncertain workflow this tool is supposed to represent;
|
2026-09-10 13:04:11 +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 |
|
|
Harald Bamberger
|
c81b5338de
|
Merge branch 'master' into feature-78292/dv_gehaltsbestandteil_ersteinstufung
|
2026-08-12 11:39:49 +02:00 |
|
|
Johann Hoffmann
|
97be497fda
|
refactored the core pruefungslogic to revolve around PruefungsverlaufLib.php instead of tbl_pruefungstyp which was highly inflexible for any adjustments. could be reused in Stv/Pruefungen aswell since there invalid inserts are very much possible; typen are still being used but are irrelevant for sequencing the attempts correctly; incorporated kommissionelle Pruefung into Gesamtnoteneingabe as the last possible antritt a student makes; updated cypress suites accordingly and added some ui tests aswell; documented usage in a readme_benotungstool.txt for the suite;
|
2026-08-11 17:35:06 +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 |
|
|
Johann Hoffmann
|
c9c92f82d3
|
WIP refactor
|
2026-08-06 10:33:46 +02:00 |
|
|
Johann Hoffmann
|
dba199b531
|
Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4
|
2026-08-04 15:31:19 +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 |
|
|
Johann Hoffmann
|
4e6a2d5218
|
Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
# Conflicts:
# application/config/routes.php
# application/controllers/api/frontend/v1/Lehre.php
# application/views/CisRouterView/CisRouterView.php
# cis/private/lehre/notenliste.xls.php
# public/js/api/factory/lehre.js
# public/js/apps/Cis/Cis.js
# public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
# public/js/helpers/StringHelpers.js
# system/phrasesupdate.php
|
2026-07-27 15:41:29 +02:00 |
|
|
Johann Hoffmann
|
32de4aac6b
|
assistenz recht & features gesamtnoteneingabe; load stg array for assistenzen to choose any lva from; added configurable datelimit for each semester with defaults as per upcoming prüfungsordnung;
|
2026-07-23 16:59: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 |
|
|
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 |
|