 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 |
|
|
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 |
|
|
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
|
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
|
22eed92c86
|
Merge branch 'feature-75838/UXImproveProjektarbeitSTVSprint247' into feature-76657/AbgabetoolFinetuning
|
2026-05-26 12:58:57 +02:00 |
|
|
Harald Bamberger
|
b7e48633ab
|
Merge branch 'master' into bug-76146/studvw_karteireiter_dokumente_akzeptiert_eintraege_ohne_vorhandenes_dokument
|
2026-05-05 13:33:38 +02:00 |
|
|
Harald Bamberger
|
cb60ddcc94
|
Merge branch 'master' into feature-62607/konto_oh_beitrag_betrag_aus_eigener_tabelle
|
2026-05-04 15:41:52 +02:00 |
|
|
ma0048
|
21d80905a2
|
akzeptierte dokumente anzeigen, auch wenn kein dokument vorhanden ist
|
2026-04-13 13:04:46 +02:00 |
|
|
Harald Bamberger
|
b2538075ee
|
use STV_TAGS_ENABLED config when preparing sql statement for students list to query tags only if enabled
|
2026-04-07 10:35:06 +02:00 |
|
|
Johann Hoffmann
|
aba4bc2909
|
merge projektarbeit details & betreuer form and handle several UX changes regarding formData of both
|
2026-03-19 11:12:14 +01:00 |
|
|
Harald Bamberger
|
5ce0232890
|
fix bug in archiv tab
|
2026-03-11 11:50:09 +01:00 |
|
|
Harald Bamberger
|
47b5eecb9b
|
Merge branch 'master' into vv_und_studvw_2026_02_rc4_ma0080
|
2026-03-04 18:57:13 +01:00 |
|
|
Harald Bamberger
|
77731ed559
|
Merge branch 'feature-68767/FHC4_Studierendenverwaltung_Details_4spaltig_ma0080' into vv_und_studvw_2026_02_rc4_ma0080
|
2026-03-03 13:46:29 +01:00 |
|
|
Andreas Österreicher
|
bcd8f11f35
|
Fixed Merge Problem
|
2026-03-03 11:26:18 +01:00 |
|
|
Harald Bamberger
|
7680a5c773
|
add bpk to api output if authuser has permission
|
2026-02-24 17:19:49 +01:00 |
|
|
Paolo
|
356a5fb51b
|
Merge branch 'master' into bug-56209/is_valid_date_vs_isValidDate
|
2026-02-23 13:03:06 +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
|
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 |
|
|
Harald Bamberger
|
ed170645df
|
use plsql function public.get_rolle_prestudent instead of local sql
|
2026-02-12 11:27:50 +01:00 |
|
|
ma0068
|
464f04b254
|
merge studvw_2026_02_rc4 in vv_und_studvw_2026_02_rc4
|
2026-02-05 11:57:03 +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 |
|
|
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
|
69749da331
|
Merge branch 'master' into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader
|
2026-02-03 11:46:19 +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 |
|
|
Harald Bamberger
|
85a10e27cc
|
fix setFirstStudent if GENERATE_ALIAS_STUDENT is false
|
2026-02-02 17:59:15 +01:00 |
|
|
ma0068
|
e689531224
|
merge master into bug-69548/FHC4_Studierendenverwaltung_Aufnahmetermine_Gesamtnote_berechnen
|
2026-02-02 16:31:13 +01:00 |
|
|
ma0068
|
b9eaac18b0
|
merge Master into feature-39571/Studierendenverwaltung_CoreNotizcontroller
|
2026-02-02 16:21:47 +01:00 |
|
|
Harald Bamberger
|
f1aa5382cf
|
check editZgv Permission for Stg and also check it in api function
|
2026-01-28 17:04:11 +01:00 |
|
|
Harald Bamberger
|
f867e60702
|
fix use of config FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE to override studiengang_kz in public.tbl_konto
|
2026-01-21 17:37:23 +01:00 |
|
|
Harald Bamberger
|
63aebde7f2
|
Merge branch 'bug-70906/FHC4_Archive_Dokument_Studienbestaetigung'
|
2026-01-15 18:01:25 +01:00 |
|
|
ma0068
|
62f5b66324
|
add missing parameters studiensemester and studiengang_kz for document Studienbestaetigung and StudienbestaetigungEnglish
|
2026-01-15 17:24:38 +01:00 |
|
|
Harald Bamberger
|
ef08e39449
|
api endpoint student: prevent storing an empty string as alias e.g. from StudVw Details Tab
|
2026-01-15 17:09:30 +01:00 |
|
|
Harald Bamberger
|
cf7e9921b5
|
change grades sort order
|
2025-12-15 16:11:46 +01:00 |
|
|
Harald Bamberger
|
11ff26d8e7
|
remove empty lines
|
2025-12-15 15:20:19 +01:00 |
|
|
Harald Bamberger
|
718272e8a1
|
remove empty line
|
2025-12-15 15:13:53 +01:00 |
|
|
Harald Bamberger
|
3f891179aa
|
move check for critical changes bis from frontend to backend
|
2025-12-15 15:12:49 +01:00 |
|
|
Harald Bamberger
|
afc3cd0131
|
Merge branch 'master' into feature-69877/StudVw_Status_GrundAndAnmerkungEditable
|
2025-12-15 13:53:28 +01:00 |
|
|
Harald Bamberger
|
5536408065
|
add property stg_kz to json of org_forms to prevent clearing tabulator when changing form a node with stg_kz property set to an orgform_node
|
2025-12-15 13:35:50 +01:00 |
|
|
Harald Bamberger
|
293a8625e4
|
change sort order in grades list api endpoint
|
2025-12-15 12:03:41 +01:00 |
|
|
Harald Bamberger
|
5266a6fe4d
|
Merge branch 'master' into feature-69877/StudVw_Status_GrundAndAnmerkungEditable
|
2025-12-12 16:28:35 +01:00 |
|
|
Harald Bamberger
|
61c859f2e1
|
Merge branch 'bugfix-69874/Dokument_Ausbildungsvertrag_ohneParamUid' into studvw_2025-12_rc3
|
2025-12-12 15:06:49 +01:00 |
|
|
ma0068
|
431ae8ddac
|
- make button edit editable
- set field anmerkung editable (like statusgrund and statusgrund)
- refactor function updateStatus to skip validation
- change phrases
|
2025-12-12 13:04:58 +01:00 |
|
|
ma0068
|
d91789aee5
|
Aufruf Ausbildungsvertrag mit Param prestudent-id
|
2025-12-11 16:20:09 +01:00 |
|
|
Harald Bamberger
|
d8766e8f7a
|
Merge branch 'feature-69065/Projektarbeiten_Firmen_verwalten' into studvw_2025-12_rc3
|
2025-12-11 16:06:28 +01:00 |
|
|
Harald Bamberger
|
a86d35f731
|
Merge branch 'master' into feature-69065/Projektarbeiten_Firmen_verwalten
|
2025-12-11 12:12:05 +01:00 |
|