 Harald Bamberger
|
38447e2217
|
Merge branch 'master' into cis40_2026-05_ma_rc
|
2026-07-08 15:36:34 +02:00 |
|
|
Harald Bamberger
|
2933a525c1
|
Merge branch '77804-exclude-moodle-from-other-lv-plan'
|
2026-07-08 14:48:28 +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
|
bbec7de8de
|
Merge branch 'master' of github.com:FH-Complete/FHC-Core
|
2026-07-08 14:38:42 +02:00 |
|
|
Harald Bamberger
|
1d14e58d8f
|
use current gender form
|
2026-07-08 14:33:02 +02:00 |
|
|
Harald Bamberger
|
db2beeb51f
|
Merge branch 'feature/76981-missing-mailing-lists'
|
2026-07-08 14:24:13 +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
|
fe195f4080
|
Cis App: define isMobile local since it is used in handleClick event handler
|
2026-07-08 10:53:40 +02:00 |
|
|
Harald Bamberger
|
c69bb9ccaa
|
Merge branch 'cis40_2026-02_rc_abgabetool_finetuning_76688'
|
2026-07-08 09:39:44 +02:00 |
|
|
Harald Bamberger
|
4889299dd9
|
remove unused file components/Cis/LvPlan/StgOrg_DEPR.js
|
2026-07-08 09:20:51 +02:00 |
|
|
Harald Bamberger
|
8f427344d0
|
remove currently unused package-lock.json
|
2026-07-08 09:15:25 +02:00 |
|
|
Harald Bamberger
|
0d6867799c
|
projektbetreuer tabulator select max 1 row
|
2026-07-08 09:06:14 +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
|
ac2a1147cc
|
do not show download links in OtherLvPlan and StgOrg LvPlan mode
|
2026-07-07 11:44:04 +02:00 |
|
|
Harald Bamberger
|
8d7fdb0254
|
Merge branch 'master' into cis40_2026-02_rc_abgabetool_finetuning
|
2026-07-07 11:15:53 +02:00 |
|
|
Harald Bamberger
|
0fd938e85c
|
Merge branch 'master' into feature/76688-general-tabulator-issues_76776-localization
|
2026-07-07 11:08:19 +02:00 |
|
|
Johann Hoffmann
|
b57fe4839b
|
update tooltip phrase + keyversion
|
2026-07-06 15:15:02 +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
|
7fac6062e5
|
Merge branch 'master' into cis40_2026-05_ma_rc
|
2026-07-03 14:27:45 +02:00 |
|
|
Harald Bamberger
|
044e29f557
|
Merge branch 'feature-77662/Absolventen_Zugriff_CIS4'
|
2026-07-01 14:47:52 +02:00 |
|
|
Harald Bamberger
|
d018ab18f8
|
use new Benotungstool for Links in LvMenu
|
2026-07-01 13:04:22 +02:00 |
|
|
Harald Bamberger
|
f5cdb0a2fb
|
add configs to define grace period and roles, add logic to benutzerberechtigungs class
|
2026-07-01 12:10:06 +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
|
787e5d0ee4
|
usage of $p.t('abgabetool/c4paatyp' + typKurzbz) instead of raw bezeichnung for abgabetyp in abgabeterminFormatter for nextTermin/prevTermin cells; added phrasen from feature-77384/ZweitbegutachterSpeichernFix branch;
|
2026-06-30 11:57:48 +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
|
0007460428
|
phrasen archaeology; selectionCheckFlat on flatTable;
|
2026-06-29 13:58:02 +02:00 |
|
|
Andreas Österreicher
|
8cc0462712
|
Merge branch 'bug-76560/Download_Notenlisten_einschraenken'
|
2026-06-29 13:33:04 +02:00 |
|
|
Paolo
|
4162305ac6
|
Improved the permissions check in the cis/private/lehre/notenliste.xls.php
|
2026-06-29 13:28:57 +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 |
|
|
Paolo
|
6508301526
|
Merge branch 'master' into bug-76560/Download_Notenlisten_einschraenken
|
2026-06-29 09:32:53 +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
|
97a88d1d0d
|
Merge branch 'feature-54628/studstatus_einzelne_ablaeufe_aktivieren_deaktivieren'
|
2026-06-26 15:07:04 +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
|
f13f6ff0cc
|
Merge branch 'feature-71393/studierendenstatus_unterbrecher_ablehnungsgrund_in_den_emailtext_integrieren'
|
2026-06-26 13:40:17 +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 |
|
|
Harald Bamberger
|
274262262a
|
iframe_content: only replace ../ to be able to use index.ci.php in menu entry
|
2026-06-24 15:35:31 +02:00 |
|
|
Johann Hoffmann
|
79c0f31ddc
|
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:51 +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 |
|