 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 |
|
|
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 |
|
|
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 |
|
|
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
|
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 |
|
|
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 |
|
|
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
|
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 |
|
|
Johann Hoffmann
|
85043e57db
|
added missing parenthesis
|
2026-04-21 17:00:07 +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 |
|
|
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 |
|