Harald Bamberger
efc8fa1eeb
Merge branch 'master' into feature-83444/lvverwaltung_suche_nach_le_und_lv_inkl_router
2026-10-06 10:27:46 +02:00
Andreas Österreicher
0a00caa1e4
Merge branch 'feature-82683/lvverwaltung_zusaetzliche_spalten_bei_lehrenden'
2026-09-17 14:00:07 +02:00
ma0048
2ffaf36270
suche fuer lehreinheiten und lehrveranstaltungen in der lvverwaltung
2026-09-15 15:46:48 +02:00
ma0048
c90f7a31bb
columns hinzugefuegt: insertvon/updatevon insertamum/updateamum
2026-09-11 12:03:06 +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
ma0068
31bae9b693
use function getStgAndDetails instead of getStgAndSem
2026-08-11 09:48:17 +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
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
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
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
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
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
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
Johann Hoffmann
7628ebc9ca
remove unnecessary LE join in diplomasupplement.xml.php; fix studiensemester_kurzbz col datatype in dbupdate script; stv projektarbeit dropdown selection also by studienplan of current prestudent_status history entry
2026-04-01 16:05:51 +02:00
Johann Hoffmann
2c4574d93b
form input bugfix where 2 inputs where needed for select elements after invalid validation; Abgabetool Download Latest Action; WIP stv projektarbeit details/betreuer considerations; WIP adding le_id -> lva_id & sem_kurzbz to FAS code;
2026-03-10 16:45:15 +01:00
Johann Hoffmann
2fde630971
adjust abgabetool queries Studentenverwaltung Projektarbeit Tab: lehreinheit required -> lehreinheit optional, lehrveranstaltung & studiensemester_kurbz required; changed occurences of the typo "Studiensemster" rigorously;
2026-03-09 15:25:44 +01:00
Johann Hoffmann
fce5ee7a16
adjust abgabetool queries lehreinheit -> lehrveranstaltung table; always redraw with scrollX/Y preserve in abgabetool
2026-03-09 11:24:17 +01:00
Cristina
c57eb1b8de
Adapted method getLvLeitung: filter Dummy and allow only active Benutzer/Person
2026-03-02 11:00:05 +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
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
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
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
Harald Bamberger