Andreas Österreicher
9067f0e00a
Merge branch 'master' into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader
2025-09-05 12:48:33 +02:00
Andreas Österreicher
4099d91a1b
Vertragsverwaltung - Filter korrigiert fuer aktive und inaktive
...
Mitarbeiter
2025-09-05 12:45:39 +02:00
Johann Hoffmann
49ca538381
student page redesign; wip mitarbeiter page + add new modal
2025-09-04 17:38:32 +02:00
Andreas Österreicher
6fb06397be
Merge branch 'master' into feature-63359/StV_API_error_clustering
2025-09-04 14:32:10 +02:00
Cristina
594333889d
Merge branch 'epic-56039/LV-Evaluierung_NEU' of https://github.com/FH-Complete/FHC-Core into epic-56039/LV-Evaluierung
...
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2025-09-03 15:14:53 +02:00
Johann Hoffmann
2c3754b33f
more tooltips so people can avoid reading the wiki
2025-09-03 13:51:41 +02:00
ma0068
1bb10ddeb1
refactor backend filter
2025-09-03 10:43:20 +02:00
Andreas Österreicher
eae7ac1f15
Merge branch 'master' into feature-47972/pruefungsverwaltung_ects_angabe
2025-09-03 06:53:07 +02:00
ma0068
e5cf417ac0
adapt headerFilter, remove frontend filter, add backend filter aktiv mitarbeiter
2025-09-02 20:29:23 +02:00
chfhtw
86641ea02d
StV: Lehrverband- & Special-groups
2025-09-02 16:06:04 +02:00
Alexei Karpenko
fc845ebf4e
Studierendenverwaltung Projektarbeit: separate saving of Projektarbeit and Betreuer, added action for editing Betreuer
2025-09-02 15:04:45 +02:00
Johann Hoffmann
a560c335b8
WIP responsive tabulator collapse abgabetool; paabgabe notiz column;
2025-09-02 13:35:42 +02:00
Johann Hoffmann
fa6d651b21
phrasen & permissionLib/Phrases reference $param in lvMenuBuild event
2025-09-01 16:48:24 +02:00
ma0068
ea85cce957
own controller detailHeader, bugfix loadDepartmentdata
2025-09-01 09:37:30 +02:00
ma0048
0d1cf2b043
autocomplete bei den kompatiblen lvs beruecksichtigen
2025-09-01 09:20:33 +02:00
Johann Hoffmann
1f0fe08b69
upload_required => allowed; hardcoded links => config; styling; endupload/qualgate logic; phrasen;
2025-08-29 14:15:20 +02:00
ma0048
34528bb014
iframe content hinzugefuegt
2025-08-29 13:19:00 +02:00
Andreas Österreicher
db61320b8c
Merge branch 'master' into feature-47972/pruefungsverwaltung_ects_angabe
2025-08-29 12:57:39 +02:00
ma0068
3a5c4444cb
Tab Archive: Documentdropdown for Printing
...
- define structure for single print array
- fill array with documents according to Fas Dropdown Drucken
- event for adding documents from extension/addons
2025-08-27 14:11:03 +02:00
ma0048
9a35ee5945
raum content im alten cis wieder auf tablesorter
2025-08-27 11:48:35 +02:00
ma0048
81bf016945
phrasesupdate
2025-08-27 09:43:27 +02:00
ma0048
1167251bdc
Merge branch 'refs/heads/feature-60973/komponente_fuer_lehrfaecherverteilung' into demo
...
# Conflicts:
# application/models/education/Lehrveranstaltung_model.php
# application/models/person/Notiz_model.php
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2025-08-27 09:29:50 +02:00
ma0048
407f62976c
Merge branch 'refs/heads/feature-63364/pep_self_overview' into demo
2025-08-27 09:23:36 +02:00
ma0048
26db68726a
Merge branch 'refs/heads/master' into demo
...
# Conflicts:
# application/models/education/Lehrveranstaltung_model.php
# application/models/organisation/Studienplan_model.php
# application/models/person/Notiz_model.php
# application/models/ressource/Mitarbeiter_model.php
# public/js/components/Stv/Studentenverwaltung.js
# public/js/components/Stv/Studentenverwaltung/Verband.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2025-08-27 09:22:35 +02:00
Johann Hoffmann
63390b192c
qualgate 1&2 dbupdate script, note fkey reference & upload required flag in paabgabe; noten api duplicate from notentool for now; WIP more emails; qualgates benotbar & saveable aswell as upload flag;
2025-08-26 17:15:37 +02:00
Johann Hoffmann
e97c26022f
Merge remote-tracking branch 'origin/master' into feature-61164/AbgabetoolQualityGates
2025-08-25 12:00:30 +02:00
Andreas Österreicher
1025a8b461
Removed Duplicate Phrase
2025-08-25 11:19:20 +02:00
Alexei Karpenko
ce9a4e2e09
Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren
2025-08-23 16:16:41 +02:00
Johann Hoffmann
483662726d
abgabetool api/controller refactor; quality gates dbupdate script; load types from backend instead of hardcoded; WIP email check for externe betreuer;
2025-08-22 14:40:58 +02:00
Johann Hoffmann
1e68eb0b90
berechtigungsprüfung 'lehre/benotungstool:rw' in Noten Controller; API Method documentation; removed addMeta statements; removed Tabulator Event logging;
2025-08-21 13:35:38 +02:00
Andreas Österreicher
703872adc9
Merge branch 'master' into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader
2025-08-20 11:14:40 +02:00
Johann Hoffmann
d6c7f16ceb
Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4
2025-08-19 13:43:23 +02:00
ma0048
d8d9521c9c
pep self overview hinzugefuegt
...
tag readonly modus
2025-08-19 10:49:21 +02:00
Johann Hoffmann
9707258e62
Merge remote-tracking branch 'origin/master' into feature-61592/AnwesenheitenFinetuning
...
# Conflicts:
# public/js/components/Bootstrap/Modal.js
# system/phrasesupdate.php
2025-08-19 09:43:30 +02:00
ma0048
eb8c3213df
- ects angabe bei der anmeldung
...
- tablesorter hinzugefuegt
- pruefungsort anderer raum moeglich (text)
- pruefungsanmeldungen nur noch studiensemester dropdown
- kompatible lvs vergleichen
2025-08-19 07:37:33 +02:00
chfhtw
42a81a4558
API error clustering
2025-08-18 13:06:59 +02:00
Harald Bamberger
e2d6e5d9c8
Merge branch 'master' into feature-39571/Studierendenverwaltung_CoreNotizcontroller
2025-08-14 18:38:04 +02:00
Harald Bamberger
b9e3c47be9
Merge branch 'master' into feature-62779/xul_abloese_haustechnik_schluesselverwaltung
2025-08-14 18:03:36 +02:00
Harald Bamberger
e7f58ca1ba
Merge branch 'master' into feature-62779/xul_abloese_haustechnik_schluesselverwaltung
2025-08-13 07:33:13 +02:00
Harald Bamberger
80f1edca8f
Merge branch 'master' into merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231
2025-08-11 15:25:16 +02:00
Johann Hoffmann
3c9db86df2
Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4
...
# Conflicts:
# application/config/routes.php
# application/controllers/api/frontend/v1/Lehre.php
# application/models/education/Lehrveranstaltung_model.php
# application/views/CisRouterView/CisRouterView.php
# public/js/apps/Dashboard/Fhc.js
# system/phrasesupdate.php
2025-08-07 15:17:10 +02:00
ma0048
2b7f56622c
Merge branch 'master' into feature-60973/komponente_fuer_lehrfaecherverteilung
...
# Conflicts:
# application/models/education/Lehrveranstaltung_model.php
# application/models/organisation/Studienplan_model.php
# application/models/person/Notiz_model.php
# application/models/ressource/Mitarbeiter_model.php
# public/js/components/Stv/Studentenverwaltung.js
# public/js/components/Stv/Studentenverwaltung/Verband.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2025-08-07 11:03:05 +02:00
Harald Bamberger
9ad2198b02
update phrase Stundenplan => LV-Plan, Feiertag => Ferien / Feiertag, Holiday => Holidays
2025-08-06 11:14:37 +02:00
chfhtw
c96db9f573
reworked StV favorites (only 1st tier version)
2025-08-06 11:06:57 +02:00
Johann Hoffmann
0605baf68f
capitalize tab phrases; style&phrase change for Attendance Check Date Datepicker; Picture col min width icrease so the title is readable in english;
2025-08-06 10:45:37 +02:00
Harald Bamberger
37b67641ef
Merge branch 'feature-40128/Mehrere_Suchergebnisse_für_selbe_Person' into rc1_FHC4_C4
2025-08-01 16:19:23 +02:00
Harald Bamberger
66caf47d98
Merge branch 'merge_C4_25999_61235_61730' into rc1_FHC4_C4
2025-08-01 15:54:22 +02:00
ma0068
1cb637cb7f
Tab Betriebsmittel: change type kaution to text, edit validations and add translations
2025-08-01 10:55:11 +02:00
Johann Hoffmann
913b218fca
phrasenupdate Stundenplan -> LV-Plan; tooltip update/remove;
2025-08-01 10:53:15 +02:00
Johann Hoffmann
e58bf3a8cf
WIP noten/pruefung import
2025-08-01 09:48:46 +02:00
Andreas Österreicher