Commit Graph

3277 Commits

Author SHA1 Message Date
Johann Hoffmann b57fe4839b update tooltip phrase + keyversion 2026-07-06 15:15:02 +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 0007460428 phrasen archaeology; selectionCheckFlat on flatTable; 2026-06-29 13:58:02 +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
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 138c80c97a Merge branch 'master' into cis40_2026-02_rc 2026-06-26 15:15:47 +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 70368525e0 readded phrasen that went missing in https://github.com/FH-Complete/FHC-Core/commit/22eed92c86925101a9445c1bfbe4bf5037b9a114 2026-06-22 11:47:38 +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
Johann Hoffmann 2b06de8ecb Merge remote-tracking branch 'origin/master' into feature-76657/AbgabetoolFinetuning 2026-06-16 11:59:53 +02:00
Johann Hoffmann 7c594bc4f9 stv added back the old 'save betreuer' button as it makes sense for finishing a single betreuer form and then continuing with editing the projektarbeit form user will get used to it 100%; updated some gendering phrases from StudentIn -> Student*In because thats apparently the current way to do it; 2026-06-12 12:55:06 +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 66e1e6ad8a studierendenbereich phrasenkey change so it gets inserted as a new phrase and not ignored like our phrasesupdate.php tends to do 2026-06-01 15:59:38 +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
Andreas Österreicher 30b8a406a5 Merge branch 'feature-75888/reihungstest_mehrfachdurchfuehrung' into rc_reihungstest 2026-06-01 09:10:35 +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
Harald Bamberger 178c854941 Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning 2026-05-26 07:59:17 +02:00
Harald Bamberger 449537ef77 Merge branch 'master' into cis40_2026-02_rc 2026-05-18 07:26:37 +02:00
Harald Bamberger 12d8c8447b Merge branch 'feature-68957/CIS4_Dashboard_Bookmark_Widget_Sort_Tags' into cis40_2026-02_rc 2026-05-13 21:10:27 +02:00
Harald Bamberger 905cd46942 add condition converting column tbl_bookmark.tag to jsonb 2026-05-13 21:09:18 +02:00
Harald Bamberger 17772c3738 Merge branch 'master' into feature-70376/Lohnguide 2026-05-13 11:15:07 +02:00
Johann Hoffmann a5d343268f fix deselect condition on filtered datasets; added new phrases for confirm & edit dialog; fixed emailSplitter phrasen & confirm; fixed modal fullscreen button alignment & color; 2026-05-06 16:49:35 +02:00
Johann Hoffmann 9e061de9bd fix deselect condition on filtered datasets; added new phrases for confirm & edit dialog; 2026-05-06 15:26:02 +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
Harald Bamberger 453fc209b8 Merge branch 'master' into cis40_2026-02_rc 2026-05-05 08:53:07 +02:00
Andreas Österreicher a04d2acb86 Fixed Blank on Phrase for Abgabetool 2026-05-04 10:49:33 +02:00
Werner Masik 58a921b500 changed lohnguide kommentar data type to text 2026-04-30 09:47:12 +02:00
Johann Hoffmann f51d0f72c6 setSelectedFields() method in filter cmpt to keep custom persistence with visible fields; distinct titles assistenz/betreuer page; fix select logic to respect the possibility of dataset being filtered; beurteilungsnotiz required if note of that termin is negative; multiselect filter on qgate status columns + persistence of those; WIP switching mode to flat table showing all abgabetermine of all projektarbeiten to multi edit/delete/whatever with them selected 2026-04-28 17:27:19 +02:00
Johann Hoffmann df369c7149 Merge branch 'feature-75996/AbgabetoolFeedbackSprint247' into feature-76657/AbgabetoolFinetuning 2026-04-27 16:11:11 +02:00
Johann Hoffmann b16194701c c4noZuordnungBetreuerStudent more elaborate statement that maybe the login has expired and to please log in again. happens if getAuthUid returns null but the user is still on the site; error message now also displays the uid values used to check for student zuordnung; removed the $student_uid post/get parameter from every method to isolate the issue; 2026-04-27 16:00:55 +02:00
chfhtw 736e91224e show phrase instead of content for bookmark widget in admin mode 2026-04-27 15:43:58 +02:00
Johann Hoffmann b18ce08578 c4noZuordnungBetreuerStudent more elaborate statement that maybe the login has expired and to please log in again. happens if getAuthUid returns null but the user is still on the site; 2026-04-27 11:15:59 +02:00
Harald Bamberger 1cf3c18841 Merge branch 'feature-68530/Dashboard_Cleanup_Admin' into cis40_2026-02_rc 2026-04-23 16:34:59 +02:00
chfhtw 011e93720e phrasen dashboard 2026-04-23 15:08:42 +02:00
Harald Bamberger e984425e36 Merge branch 'feature-68530/Dashboard_Cleanup_Admin' into cis40_2026-02_rc 2026-04-23 12:09:09 +02:00
Harald Bamberger ab4039dbbd Merge branch 'feature-69105/CIS4_MeineLVs_AnzeigeZeugnisnote_Und_Durchschnitt' into cis40_2026-02_rc 2026-04-23 11:24:37 +02:00
Harald Bamberger 2c1702a20b Merge branch 'feature-68957/CIS4_Dashboard_Bookmark_Widget_Sort_Tags' into cis40_2026-02_rc 2026-04-23 11:19:17 +02:00
Harald Bamberger 72a5f35b0e Merge branch 'feature-62450/Studium_Phrasen' into cis40_2026-02_rc 2026-04-23 11:16:16 +02:00
Harald Bamberger 2dd5a95232 Merge branch 'master' into cis40_2026-02_rc 2026-04-23 10:41:41 +02:00