 Harald Bamberger
|
cad23ef1ad
|
Merge branch 'master' into cis40_2026-05_ma_rc
|
2026-07-14 10:50:25 +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
|
38447e2217
|
Merge branch 'master' into cis40_2026-05_ma_rc
|
2026-07-08 15:36:34 +02:00 |
|
|
Harald Bamberger
|
5694ba7325
|
Merge branch 'master' into 77804-exclude-moodle-from-other-lv-plan
|
2026-07-08 14:45:15 +02:00 |
|
|
Harald Bamberger
|
e4f43cc820
|
Merge branch 'master' into feature/76981-missing-mailing-lists
|
2026-07-08 14:15:40 +02:00 |
|
|
adisposkofh
|
8adc1c8bcc
|
not showing moodle events in other users' lv plans
|
2026-07-08 11:41:58 +02:00 |
|
|
Harald Bamberger
|
5602c7091a
|
Merge branch 'feature/76688-general-tabulator-issues_76776-localization' into cis40_2026-02_rc_abgabetool_finetuning_76688
|
2026-07-08 07:17:24 +02:00 |
|
|
Andreas Österreicher
|
6a16fb7515
|
Betreuerart wird Übergeben damit Zweitbetreuer keine Termine erstellen können
|
2026-07-07 14:33:29 +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
|
0fd938e85c
|
Merge branch 'master' into feature/76688-general-tabulator-issues_76776-localization
|
2026-07-07 11:08:19 +02:00 |
|
|
Cristina
|
335753be8c
|
Adapted Lvevaluierung Mail texte "Evaluierungszeitfenster" instead of "Evaluationszeitraum"
|
2026-07-06 12:19:28 +02:00 |
|
|
Harald Bamberger
|
3f257af006
|
Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc
|
2026-07-03 14:35:20 +02:00 |
|
|
Harald Bamberger
|
d018ab18f8
|
use new Benotungstool for Links in LvMenu
|
2026-07-01 13:04:22 +02:00 |
|
|
Johann Hoffmann
|
d405296a14
|
also show email contact for zweitbetreuer in student page + distinguish them in the label in case of more than 1 betreuer;
|
2026-06-30 13:02:19 +02:00 |
|
|
Johann Hoffmann
|
6264006728
|
flat table selectAll Handler fix; call checkZuordnung just how we thoughtcrimed it in feature-76667/ProjektarbeitUploadZuordnungErrorMessage
|
2026-06-29 14:30:41 +02:00 |
|
|
Johann Hoffmann
|
8abb028f55
|
Merge branch 'feature-76667/ProjektarbeitUploadZuordnungErrorMessage' into cis40_2026-02_rc_abgabetool_finetuning
# Conflicts:
# application/controllers/api/frontend/v1/Abgabe.php
|
2026-06-29 13:21:14 +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
|
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 |
|
|
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 |
|
|
Harald Bamberger
|
7f9dcc43ad
|
add Compat iframe controller and component
|
2026-06-24 15:41:47 +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 |
|
|
Harald Bamberger
|
95e63f865c
|
add CIS4 Header and Footer to application/views/lehre/pruefungsprotokollUebersicht.php
|
2026-06-22 15:25:51 +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
|
715c9f77b8
|
added missing config BETREUER_SAMMELMAIL_BUTTON_STUDENT in getConfig Api Call; removed duplicate uid data field resulting from merge;
|
2026-06-22 11:17:14 +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 |
|
|
Harald Bamberger
|
c125130dcb
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-02_rc_abgabetool_finetuning
|
2026-06-18 14:38:42 +02:00 |
|
|
Harald Bamberger
|
164c11e10a
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
|
2026-06-18 13:20:25 +02:00 |
|
|
Harald Bamberger
|
eb9c882fe9
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-06-18 08:48:52 +02:00 |
|
|
Johann Hoffmann
|
2170d3e14a
|
numeric notensort in all tables; changed stv projektarbeit getNoten to only fetch active ones so stv and abgabetool use the same set of grades;
|
2026-06-16 15:17:40 +02:00 |
|
|
Johann Hoffmann
|
2b06de8ecb
|
Merge remote-tracking branch 'origin/master' into feature-76657/AbgabetoolFinetuning
|
2026-06-16 11:59:53 +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 |
|
|
chfhtw
|
f5d81e4a93
|
move prepareQuery (and addSelectPrioRel) into a library and make joins more flexible & change JOIN to LEFT JOIN for tbl_studentlehrverband (the actual bugfix) & change order of JOIN tbl_benutzergruppe in fetchStudents to speed up query
|
2026-06-12 09:53:59 +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 |
|
|
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 |
|
|
adisposkofh
|
1cff18112b
|
removed auto-ban on sunday room reservations
|
2026-06-02 11:09:13 +02:00 |
|
|
Johann Hoffmann
|
d0d590ff89
|
block the change of paabgabetyp if the termin has an upload associated (abgabedatum !== null) or has a note; TODO: block the same in multiedit!
|
2026-06-01 12:56:55 +02:00 |
|
|
Johann Hoffmann
|
60e36bb4b9
|
change updateProjektarbeit call so that the abgabedatum actually only gets set when doing the endupload and not also when zusatzdaten are being edited, which can certainly be an earlier or even later date;
|
2026-06-01 11:30:36 +02:00 |
|
|
Andreas Österreicher
|
30b8a406a5
|
Merge branch 'feature-75888/reihungstest_mehrfachdurchfuehrung' into rc_reihungstest
|
2026-06-01 09:10:35 +02:00 |
|
|
Harald Bamberger
|
6019489ef1
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
|
2026-05-29 13:38:58 +02:00 |
|
|
Harald Bamberger
|
9ec876fc27
|
Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning
|
2026-05-29 13:32:15 +02:00 |
|