Commit Graph

1372 Commits

Author SHA1 Message Date
Harald Bamberger f8d8d501ca Merge branch 'studvw_2026_05_rc_tags' into feature-77537/Studvw_Feedback 2026-07-13 14:42:54 +02:00
Harald Bamberger 7e6d670d82 Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags 2026-07-13 14:32:51 +02:00
Harald Bamberger b5e65cf072 Merge branch 'master' into studvw_2026_05_rc 2026-07-08 16:42:04 +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
Harald Bamberger 0fd938e85c Merge branch 'master' into feature/76688-general-tabulator-issues_76776-localization 2026-07-07 11:08:19 +02:00
ma0068 093e3d5c97 enable deletion of zgv and zgv master date with null and empty string 2026-06-30 15:43:19 +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
ma0068 ecd6588ead edit default permissions: in core controller admin, in stv controller admin and assistance 2026-06-25 12:56:35 +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 eb9c882fe9 Merge branch 'master' into cis40_2026-02_rc 2026-06-18 08:48:52 +02:00
Harald Bamberger 245d0d3369 Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags 2026-06-17 17:15:37 +02:00
Harald Bamberger d3d04c5a77 Merge branch 'master' into studvw_2026_05_rc 2026-06-17 14:44:25 +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 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 c75e1f9416 WIP 2026-06-05 10:12:03 +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
Harald Bamberger 9ec876fc27 Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning 2026-05-29 13:32:15 +02:00
Johann Hoffmann ae71517ceb expanded title validation in frontend aswell before validation for the same patterns in backend just in case; phrasen alert messages & use backend response instead of frontend validated title 2026-05-29 11:47:46 +02:00
Johann Hoffmann 004bcc43c3 merged stv saveProjektarbeit/saveBetreuer buttons; benoten button for betreuer is now a table action button; remove viewData.uid and call student_uid via authinfo endpoint; digital signature info links in student abgabetool; show projektarbeit note in overview inside the accordions content aswell as flex-end in the header; smaller vertical padding on all abgabetool modals from 3rem to 1.5 rem aka py-5 to py-4; 2026-05-29 09:50:37 +02:00
Johann Hoffmann 6d79288f33 Merge remote-tracking branch 'origin/master' into feature-76657/AbgabetoolFinetuning
# Conflicts:
#	system/phrasesupdate.php
2026-05-27 16:11:33 +02:00
Johann Hoffmann 2eb2c36d5b replace + in email helpers with spaces; configs for title edit, multi edit table & confetti on endupload; empty student projektarbeiten check; only show dropdown labels on large displays; new phrasen & phrasen fixes; 2026-05-26 17:06:39 +02:00
Johann Hoffmann 22eed92c86 Merge branch 'feature-75838/UXImproveProjektarbeitSTVSprint247' into feature-76657/AbgabetoolFinetuning 2026-05-26 12:58:57 +02:00
Harald Bamberger 57eec98604 Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags 2026-05-26 09:38:06 +02:00
Harald Bamberger 1561aa55b7 correct model path 2026-05-26 09:37:49 +02:00
Harald Bamberger 97e7e5b641 keine projektarbeiten vorhanden mit leerem array initilisieren 2026-05-26 09:12:00 +02:00
Harald Bamberger 178c854941 Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning 2026-05-26 07:59:17 +02:00
adisposkofh e59bd51333 modified getPhrases endpoint: replaced get w/ post, replaced query params w/ payload 2026-05-19 16:35:22 +02:00
adisposkofh 239eaa90e9 separate endpoint for generic tabulator phrases with cacheable response 2026-05-19 16:27:54 +02:00
Harald Bamberger ef2f9630a9 Merge branch 'feature-75959/StudVw_Automatische_Tags' into studvw_2026_05_rc_tags 2026-05-19 10:22:28 +02:00
Harald Bamberger 4d3c73c78f add join condition for notizzuordung via prestudent_id only 2026-05-19 10:21:56 +02:00
Harald Bamberger ca8fe5bd19 Merge branch 'feature-75959/StudVw_Automatische_Tags' into studvw_2026_05_rc_tags 2026-05-18 17:27:06 +02:00
ma0068 e5ae400686 Tab Abschlusspruefung: use searchPersons instead of Mitarbeiter and refactor Label for dropdown 2026-05-13 17:38:39 +02:00
ma0068 dbcacdddd6 add tagFilter for semester to students endpoint, add decoding jsonResult in Tags 2026-05-11 13:18:56 +02:00
Harald Bamberger 8b2ef4e832 Merge branch 'master' into feature-75959/StudVw_Automatische_Tags 2026-05-11 10:54:26 +02:00
adisposkofh d3ceed32c6 compacting all events in mobile monthly lv plan 2026-05-07 15:15:50 +02:00
adisposkofh 229882e8d8 Merge branch 'cis40_2026-02_rc' of github.com:FH-Complete/FHC-Core into cis40_2026-02_rc 2026-05-07 13:19:49 +02:00
Harald Bamberger 90e933de00 Merge branch 'master' into cis40_2026-02_rc 2026-05-06 17:35:28 +02:00
Harald Bamberger 8ce67a4726 Merge branch 'master' into studvw_2026_05_rc 2026-05-06 17:35:05 +02:00
Harald Bamberger bcfdf1e05c Merge branch 'feature-75838/UXImproveProjektarbeitSTVSprint247' into studvw_2026_05_rc 2026-05-06 17:33:33 +02:00