 Harald Bamberger
|
3f257af006
|
Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc
|
2026-07-03 14:35:20 +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 |
|
|
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 |
|
|
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
|
85043e57db
|
added missing parenthesis
|
2026-04-21 17:00:07 +02:00 |
|
|
Johann Hoffmann
|
194de7b4e7
|
change lva fetch to select semesterstunden from a seperate aggregation subquery since they used to be listed by LE but current view should only show LVA to have the correct amounts displayed
|
2026-04-21 15:29:45 +02:00 |
|
|
Johann Hoffmann
|
5beddbccb4
|
changed the where clause to a simpler = CURRENT_DATE comparison -> works the same if the job runs daily and fetches updates of one day/date; has to be changed back in case we want to find updates in a range larger than 1 day in an interval larger than 1 day;
|
2026-04-21 14:18:45 +02:00 |
|
|
Harald Bamberger
|
f6747713a1
|
Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
|
2026-04-20 11:13:14 +02:00 |
|
|
Johann Hoffmann
|
3a646ffe77
|
adapt AbgabeJob relevant queries so they compare with the pgsql date function CURRENT_DATE instead of NOW() to avoid the cutoff from uploads the happened "yesterday but more than 24 hours ago"; also added another "abgabedatum < CURRENT_DATE" condition, to avoid sending this exact case as updates 2 days in a row;
|
2026-04-20 11:06:06 +02:00 |
|
|
Johann Hoffmann
|
ccd8d5f871
|
WIP alternative table representation of Cis4 MyLv page for teachers assigned to a lot of different degree programs -> cards layout would result in a lot of fluff & scroll; finalized getMultipleLvMenu() functionality in LvMenu.php controller to avoid http request overhead; deleted phrasen mixin from old components since this is a plugin bound to the apps globalConfigince some time already; Allow to switch layout similar to calendar modes -> need to further adapt old component structure to resuse lvmenu data
|
2026-04-20 10:28:49 +02:00 |
|
|
Harald Bamberger
|
bd47ad2b8c
|
Merge branch 'master' into feature-69187/CIS_MA_Pruefungsprotokolle
|
2026-04-20 09:48:34 +02:00 |
|
|
Harald Bamberger
|
e90019cdd8
|
Merge branch 'master' into feature-68610/CIS4_Projektabgabe
|
2026-04-20 09:30:54 +02:00 |
|
|
Johann Hoffmann
|
be508c99ea
|
fetch & show lva semesterstunden in cards template in footer area
|
2026-04-16 11:59:10 +02:00 |
|
|
Johann Hoffmann
|
ac44b36b59
|
cis4 myLv employee functionality implemented; wrote new query fetching studiensemester an employee in which he had assigned lehraufträge; afterwards fetch all lva by employee uid and sem_kurzbz so they fit in the existing component structure; MyLv/Lvs/SS2026 etc now also returns a 'student' | 'employee' string based on path taken inside the controller to aid vue components in rendering useful information and avoiding senseless fetch requests -> e.g. employees cant have grades on lva they are teaching; added component names for sanity when using vuedevtools;
|
2026-04-07 16:07:10 +02:00 |
|
|
Cristina
|
386cc779bf
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2026-04-02 15:49:20 +02:00 |
|
|
Cristina
|
c57eb1b8de
|
Adapted method getLvLeitung: filter Dummy and allow only active Benutzer/Person
|
2026-03-02 11:00:05 +01:00 |
|
|
Johann Hoffmann
|
2dd732b924
|
Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
# Conflicts:
# application/views/CisRouterView/CisRouterView.php
|
2026-02-27 10:38:24 +01:00 |
|
|
Johann Hoffmann
|
1e827fffee
|
additional erstbetreuer/zweitbetreuer name parts fetch & columns default invisible, columns next/prev termin header filter & custom sort func, list header filter for qgate 1/2 status assistenz & mitarbeiter, change all "Assessor" and "Assesor" phrasen to "Reviewer"
|
2026-02-24 15:58:44 +01:00 |
|
|
ma0048
|
3578e01838
|
unterbrecher ablehnungsgrund anzeigen
|
2026-02-23 08:47:36 +01:00 |
|
|
Johann Hoffmann
|
5558f6fc17
|
Signatur Sammelmail Job an Assistenz
|
2026-02-20 12:20:26 +01:00 |
|
|
Johann Hoffmann
|
67838eb630
|
load projektarbeit.note correctly for mitarbeiter; evaluate projektarbeit termin editability correctly and define a notenarray which does NOT count (currently "Nicht beurteilt" & "Noch nicht eingetragen"). such rules apply for betreuer, assistenz is allowed to do whatever they want since we never defined an actual business process anywhere and people do whatever they want anyways
|
2026-02-11 13:39:23 +01:00 |
|
|
Johann Hoffmann
|
34555504df
|
Notenfreigabe email template insert in dbupdate3.4; notenvorschlag übernehmen cellHandler adjustment; WIP testing pruefungen & pruefungs config
|
2026-02-11 10:20:53 +01:00 |
|
|
Johann Hoffmann
|
d1f5220925
|
notenschluessel availability check; WIP lvgesamtnote model method that actually fetches the notenvorschlag without join over zeugnisnote;
|
2026-02-10 12:57:38 +01:00 |
|
|
Johann Hoffmann
|
6da19585ff
|
optional sammelmail buttons assistenz abgabetool
|
2026-02-09 13:45:01 +01:00 |
|
|
Johann Hoffmann
|
cc302ed5a1
|
lazyload signatur status for assistenz view to avoid worst case loading times due to 50 x 30mb signatur server payload
|
2026-02-04 17:32:17 +01:00 |
|
|
Johann Hoffmann
|
17f11fa871
|
Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4
# Conflicts:
# application/controllers/api/frontend/v1/Lehre.php
# application/models/education/Lehrveranstaltung_model.php
# application/models/education/Note_model.php
# application/views/CisRouterView/CisRouterView.php
# public/js/api/factory/studiensemester.js
# public/js/components/Bootstrap/Offcanvas.js
# public/js/components/Overlay/FhcOverlay.js
|
2026-02-04 15:40:34 +01:00 |
|
|
Johann Hoffmann
|
d774335bcf
|
assistenz view query now also checks for betreuerart_kurzbz ("Erstbegutachter", "Begutachter", "Betreuer", "Erstbetreuer", "Senatsvorsitz") instead of only ("Erstbegutachter", "Begutachter")
|
2026-02-03 12:35:06 +01:00 |
|
|
Johann Hoffmann
|
054663ee00
|
WIP punkte
|
2026-02-03 11:34:59 +01:00 |
|
|
Johann Hoffmann
|
709aba5783
|
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
# Conflicts:
# application/models/organisation/Studiengang_model.php
|
2026-01-26 15:06:22 +01:00 |
|
|
Johann Hoffmann
|
4d97127539
|
remove Abgabedatum column from Assistenz/Betreuer update sammelmail. Keep it for UPLOADS sammelmail since it is relevant there; defined relevant_types in abgabetool config to filter for in the sammelmail for each role student/assistenz/betreuer; block saving/deleting/uploading ui components when projektarbeit has a note, since this indicates that the project is over;
|
2026-01-21 14:05:31 +01:00 |
|
|
Cristina
|
9b90e0edde
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2026-01-20 10:53:36 +01:00 |
|
|
Johann Hoffmann
|
9a07e7c804
|
wrote Studiengang_model.php -> getAssistenzForStudiengangKZ() that does just that but is not used currently since we retrieve assistenz in AbgabetoolJob.php via oe_kurzbz; added new getAssistenzForOE() method in Organisationseinheit_model; added new job "notifyAssistenzAboutChangedAbgaben" that does just that to AbgabetoolJob.php; removed console.log/debugger statements in cis4 code;
|
2026-01-19 16:12:54 +01:00 |
|
|
Johann Hoffmann
|
c3f7f7223a
|
add student name info to betreuer sammelemail jobs table; WIP adapting same logic for assistenz;
|
2026-01-16 11:59:46 +01:00 |
|
|
Harald Bamberger
|
c720c46125
|
education/Projektarbeit_model: fix missing from-clause entry for table tbl_projektarbeit error - ticket#6059687
|
2026-01-15 16:28:38 +01:00 |
|
|
Cristina
|
6512ad0f1c
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2026-01-13 13:38:04 +01:00 |
|
|
Johann Hoffmann
|
954c55ba3e
|
finetuning
|
2026-01-12 17:06:35 +01:00 |
|
|
Johann Hoffmann
|
957da460a6
|
shorter passwort freigabe text; loadCisConfig for Benotungstool via api; anw% in notentable via event; WIP incorporating CIS config into actual noten logic;
|
2025-12-18 15:24:08 +01:00 |
|
|
Andreas Österreicher
|
47e3c83909
|
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
|
2025-12-18 12:25:05 +01:00 |
|