Andreas Österreicher
5949527ee2
Merge branch 'master' into bug-56209/is_valid_date_vs_isValidDate
2026-03-03 11:07:18 +01:00
Johann Hoffmann
56a6aa993e
getMitarbeiterProjektarbeiten safeguard in case a person without any assigned betreuungen opens the page for some reason to avoid nasty confusing sql error messages from querying with empty parameters
2026-03-03 10:52:12 +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
aa2334afe7
sammelmail button betreuer page; fix notenOpt retrieval in setDetailComponent for Betreuer when reopening detailView; $emit("paUpdated") after savingTermin/deletingTermin to update projektarbeit in overview table aswell;
2026-02-26 17:58:48 +01:00
ma0068
c127c0900e
refactor dropdown for pruefer, add localStorage for formVariables, add multiactions for adding new finalexam
2026-02-25 14:28:41 +01:00
Johann Hoffmann
379880aef8
filter paabgabe uploads from newOrChanged job, since uploading a file still writes updateamum/updatevon fields -> compare student_uid with updatevon; when logging new paabgabe termine insert the whole paabgabe object into the logs, not just the result id;
2026-02-25 13:10:30 +01:00
Johann Hoffmann
16186bbee8
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
2026-02-25 11:09:50 +01:00
Harald Bamberger
7680a5c773
add bpk to api output if authuser has permission
2026-02-24 17:19:49 +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
ma0068
fc01fa045e
add and use variable semester_berechnet for using ausbildungssemester in status interessent
2026-02-23 13:44:33 +01:00
Paolo
356a5fb51b
Merge branch 'master' into bug-56209/is_valid_date_vs_isValidDate
2026-02-23 13:03:06 +01:00
ma0068
2681a85fa5
Studium.php added fallback if no lehrverband found for semester
2026-02-20 11:05:57 +01:00
ma0068
9a0716af44
Studium.php added fallback if no lehrverband found for semester
2026-02-20 09:18:48 +01:00
Johann Hoffmann
4b1a9fe892
avoid loading paabgaben a 2nd time for mitarbeiter; extracted getDateStyleClass from components;
2026-02-19 17:33:41 +01:00
ma0068
dc642cfbe7
merge master into cis40_2026-02-rc
2026-02-19 16:44:01 +01:00
Harald Bamberger
f2d49e02a7
Merge branch 'master' into vv_und_studvw_2026_02_rc4
2026-02-19 09:49:44 +01:00
Alexei Karpenko
fa7a125727
Studierendenverwaltung archivieren: error message when no studentlehrverband found
2026-02-18 21:18:57 +01:00
Johann Hoffmann
90c845899f
explicitely set deadline to end of day to achieve the desired "valid until 23:59" logic, instead of just moving the deadline by one day; endupload deadline is now optional by defining it as a "nachreichen möglich" aka non fixtermin;
2026-02-18 11:15:59 +01:00
Johann Hoffmann
a6daa7bf0c
all abgabetool datepickers use date format via format="dd.MM.yyyy" instead of :format="formatDate" to enable text-input + autoapply; backend deadline datetime check for endupload;
2026-02-17 17:32:11 +01:00
Alexei Karpenko
c58674d133
Projektarbeiten cancelVertrag permission check bugfix (added array_column to get oes)
2026-02-17 15:15:30 +01:00
Harald Bamberger
a9b343646e
Merge branch 'master' into vv_und_studvw_2026_02_rc4
2026-02-13 10:49:09 +01:00
Johann Hoffmann
701ccadff3
approveGrades phrase with counter; computed maxAntritte by config settings; block illegal pruefung creation in frontend (backend was already working);
2026-02-12 13:56:56 +01:00
Harald Bamberger
ed170645df
use plsql function public.get_rolle_prestudent instead of local sql
2026-02-12 11:27:50 +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
decd514b22
WIP improving notenimport with punktefeature
2026-02-09 09:50:22 +01:00
ma0068
1cd332115b
Changes Vertragsverwaltung
...
- refactor from Tabulator 5 to Tabulator 6
- not reloading contract list after changes of Status or Detail to keep row selection
- Start reselection of current row
2026-02-06 10:38:29 +01:00
Johann Hoffmann
6cf7093293
testing/implementing more config flags; dont select on certain cols; certain cols only available with certain flags;
2026-02-05 16:49:26 +01:00
ma0068
464f04b254
merge studvw_2026_02_rc4 in vv_und_studvw_2026_02_rc4
2026-02-05 11:57:03 +01:00
Johann Hoffmann
1eda652fba
remove old code
2026-02-04 17:34:21 +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
ma0068
fc0fdc7909
Merge branch 'studvw_2026-02_rc4' of github.com:FH-Complete/FHC-Core into studvw_2026-02_rc4
2026-02-04 11:34:19 +01:00
ma0068
3053289146
Filter: change type filter Active, change position filter item, default values All Buchungstypen
2026-02-04 11:33:54 +01:00
Andreas Österreicher
023c2a10be
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
2026-02-04 10:21:17 +01:00
Johann Hoffmann
40c79158f7
punkte feature basically finished; WIP testing & import rewrite
2026-02-03 17:38:33 +01:00
Harald Bamberger
f4f645b103
Merge branch 'master' into cis40_2026-02_rc
2026-02-03 17:17:09 +01:00
Harald Bamberger
f6b13c0bdf
Merge branch 'master' into studvw_2026-02_rc4
2026-02-03 17:16:42 +01:00
Harald Bamberger
87ff7acef0
use absoluteJsImportUrl helper instead of APP_ROOT constant to build js components file path
2026-02-03 14:27:02 +01:00
Harald Bamberger
37395b70f6
Merge branch 'feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe' into cis40_2026-02_rc
2026-02-03 11:56:16 +01:00
Harald Bamberger
a65cb3b03c
Merge branch 'bug-69145/Cis4_Studiengaenge_Studentenansicht_Vertiefungen_weggefiltert' into cis40_2026-02_rc
2026-02-03 11:50:10 +01:00
Harald Bamberger
69749da331
Merge branch 'master' into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader
2026-02-03 11:46:19 +01:00
Johann Hoffmann
054663ee00
WIP punkte
2026-02-03 11:34:59 +01:00
Harald Bamberger
9ae9feb9ea
Merge branch 'bug-69548/FHC4_Studierendenverwaltung_Aufnahmetermine_Gesamtnote_berechnen' into studvw_2026-02_rc4
2026-02-03 10:48:06 +01:00
Harald Bamberger
d0faba03a2
Merge branch 'feature-39571/Studierendenverwaltung_CoreNotizcontroller' into studvw_2026-02_rc4
2026-02-03 10:43:39 +01:00
Andreas Österreicher
3e1b9865b1
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
2026-02-03 10:33:54 +01:00
Harald Bamberger
85a10e27cc
fix setFirstStudent if GENERATE_ALIAS_STUDENT is false
2026-02-02 17:59:15 +01:00
ma0068
779641e8e7
Merge branch 'master' into bug-69145/Cis4_Studiengaenge_Studentenansicht_Vertiefungen_weggefiltert
2026-02-02 17:11:28 +01:00