Johann Hoffmann
f817527ab9
fix faulty master merge conflicts; adapted getTermine & getPaAbgaben in Paabgabe_model.php; reordered created hook in ProjektabgabeUebersicht.js to start loading phrasen immediately;
2026-09-24 11:50:00 +02:00
Johann Hoffmann
754e619e30
Merge branch 'master' into feature-83650/cis40_2026-05_ma_rc_LE_optional_4_PA_fix
...
# Conflicts:
# application/models/education/Projektarbeit_model.php
# public/js/apps/Cis/Cis.js
# public/js/components/Cis/Compat.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2026-09-24 11:25:31 +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
Harald Bamberger
cabda4cc35
Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc
2026-08-20 08:13:30 +02:00
Harald Bamberger
16166db31a
Merge branch 'feature-77048/CIS4_MA_Widget_Studstatus' into cis40_2026-05_ma_rc
2026-08-20 07:46:02 +02:00
Harald Bamberger
7910cf3055
Merge branch 'master' into cis40_2026-05_ma_rc
2026-08-13 17:36:38 +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
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
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
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
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
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
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
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
38447e2217
Merge branch 'master' into cis40_2026-05_ma_rc
2026-07-08 15:36:34 +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
Harald Bamberger
3f257af006
Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc
2026-07-03 14:35:20 +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
0411befe8d
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
2026-06-26 15:16:18 +02:00
Harald Bamberger
a23d079001
Merge branch 'master' into feature-54628/studstatus_einzelne_ablaeufe_aktivieren_deaktivieren
2026-06-26 14:07:14 +02:00
Johann Hoffmann
8bf18b0d37
prüfung/notenimport enabled per config + adapt notenliste.xls.php highlighting as per config; check if higher antritt prüfungen exist when editing existing ones (changing grades is not allowed, dates inbetween the other 2 antritt termine allowed); prüfungstermine with entschuldigt note are being preserved since the whole series can have 1max; frozen columns selection dropdown + 4 columns freezable (selector, uid, vorname, nachname) -> setting saved in local storage; better mirroring of new pruefung studenten dropdown with actual table sort + update the label there to be uid + name aswell; fixed the note_vorschlag select input cell; table sort doesnt clear selection; show the NotenlisteLinks.js in import modal and filter it based on LE selection;
2026-06-26 12:52:18 +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
Harald Bamberger
7e141f73d3
Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc
2026-06-24 15:52:01 +02:00
Johann Hoffmann
49d61342c2
lv_id & sem_kurzbz are now optional route params; defer loading of LehreinheitenModule.js; fetch orgform for lva dropdown; added selected|filtered|total count to table; dropdowns have responsive labels now; left aligned columns with text; AuthInfo Api for uid; tableLayout without WidthGrow, fixed rowHeight at 30 for now; selectAll + filter interaction fixed; load studiensemester similar to abgabetool; clearFilter fix on LE deselect; modal formatting & loading toggle;
2026-06-23 18:59:36 +02:00
Johann Hoffmann
be0943f1ba
Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4
2026-06-22 18:12:29 +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
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
fe8cf9bc83
new widget CIS4 MA Widget
...
- db-update for new widget studstatus
- different view for stgL and stgA
- update phrases
2026-06-11 15:34:45 +02:00
Johann Hoffmann
61349c7ca3
show updated/inserted by/at on every abgabetermin in mitarbeiter detail view;
2026-06-05 12:15:11 +02:00
Johann Hoffmann
c75e1f9416
WIP
2026-06-05 10:12:03 +02:00
Johann Hoffmann
870c36e76b
Merge remote-tracking branch 'origin/master' into feature-75469/LeOptional4Projektarbeit
...
# Conflicts:
# system/dbupdate_3.4.php
2026-05-20 16:22:31 +02:00
Harald Bamberger
d56d1bc2bd
Merge branch 'feature-69187/CIS_MA_Pruefungsprotokolle' into cis40_2026-05_ma_rc
2026-05-19 16:17:35 +02:00
Harald Bamberger
45eca862ac
use table alias
2026-05-19 16:17:14 +02:00
Harald Bamberger
9f738f4871
Merge branch 'feature-69187/CIS_MA_Pruefungsprotokolle' into cis40_2026-05_ma_rc
2026-05-19 16:11:37 +02:00
Harald Bamberger
3533a3fd4b
add missing comma
2026-05-19 16:11:08 +02:00
Johann Hoffmann
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
Harald Bamberger
c3ef487a6f
Merge branch 'feature-76148/MyLvaMA' into cis40_2026-05_ma_rc
2026-05-04 17:59:51 +02:00
Harald Bamberger
ac0eddf4c7
Merge branch 'feature-69187/CIS_MA_Pruefungsprotokolle' into cis40_2026-05_ma_rc
2026-05-04 17:05:36 +02:00
Harald Bamberger
e373e797f4
Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc
2026-05-04 17:01:44 +02:00
Harald Bamberger
382244035b
Merge branch 'feature-68610/CIS4_Projektabgabe' into cis40_2026-05_ma_rc
2026-05-04 16:09:33 +02:00
Johann Hoffmann