Johann Hoffmann
a5db0862d2
Merge branch 'feature-77588/AnwesenheitenSprint252' into demo
2026-10-01 12:23:01 +02:00
Johann Hoffmann
3dd9be5ea2
Merge branch 'master' into feature-78489/CMS_Admin_Vue
...
# Conflicts:
# system/phrasesupdate.php
2026-09-30 15:13:51 +02:00
Johann Hoffmann
791ae73627
Merge branch 'master' into feature-77588/AnwesenheitenSprint252
2026-09-28 12:35:40 +02:00
Johann Hoffmann
283865aa32
Merge remote-tracking branch 'origin/feature-76994/EntEditByStudentErrorFix' into feature-77588/AnwesenheitenSprint252
...
# Conflicts:
# system/phrasesupdate.php
2026-09-28 11:26:11 +02:00
Harald Bamberger
15c1da74a2
CisMenu: do not overwrite calculated url if menuitem is multiple times in menu tree
2026-09-23 16:09:42 +02:00
Harald Bamberger
d33b45d7cb
Merge branch 'bhdev_backport_compat'
2026-09-23 14:58:26 +02:00
Andreas Österreicher
2050f5ae65
Merge branch 'feature-75891/Electronic_Onboarding_Infocenter_Tool'
2026-09-23 11:14:01 +02:00
Andreas Österreicher
587e523990
Merge branch 'feature-67251/infocenter_zum_reihungstest_freigegeben_neue_spalte_eqk'
2026-09-23 11:03:20 +02:00
Andreas Österreicher
5ec1a1c54c
Merge branch 'feature-77686/infocentertool_status_setzen_fuer_zgv_pruefung_soll_message_ausloesen'
2026-09-23 10:56:54 +02:00
Harald Bamberger
8b44e4475b
Merge branch 'master' of github.com:FH-Complete/FHC-Core into bhdev_backport_compat
2026-09-22 16:51:34 +02:00
Harald Bamberger
d251987850
backport compat controller and component
2026-09-22 16:50:56 +02:00
Harald Bamberger
ba92eea7eb
studvw: fix lvtermine student_lehrverband
2026-09-22 14:09:51 +02:00
Harald Bamberger
50951dfdcf
anrechnungen: add pdf file extension to content disposition filename
2026-09-22 13:00:28 +02:00
Harald Bamberger
8eb27b194f
add target attribute to redirect content menu entries, use entry target attribute if set when rendering cis4 menu
2026-09-18 17:12:30 +02:00
Harald Bamberger
579a55a00d
fix nested ternary operators
2026-09-17 14:18:10 +02:00
Andreas Österreicher
0a00caa1e4
Merge branch 'feature-82683/lvverwaltung_zusaetzliche_spalten_bei_lehrenden'
2026-09-17 14:00:07 +02:00
Alexei Karpenko
0dadaece08
Merge branch 'master' into feature-75891/Electronic_Onboarding_Infocenter_Tool
2026-09-16 16:59:09 +02:00
Johann Hoffmann
69fd223358
fix load projektarbeit.studiensemester_kurzbz for fetchProjektarbeitById in order to query getDefaultStundensaetze successfully
2026-09-15 11:49:19 +02:00
Harald Bamberger
9c43374267
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
2026-09-15 07:53:10 +02:00
Harald Bamberger
6dfe292776
API LV: extend regex to allow studiengang_kz 0
2026-09-14 11:09:45 +02:00
ma0048
c90f7a31bb
columns hinzugefuegt: insertvon/updatevon insertamum/updateamum
2026-09-11 12:03:06 +02:00
Alexei Karpenko
073160dde4
Merge branch 'master' into feature-75891/Electronic_Onboarding_Infocenter_Tool
2026-09-10 20:08:08 +02:00
Andreas Österreicher
1bf2b707ef
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
2026-09-09 09:43:11 +02:00
Manuela Thamer
52f24645fb
update link StudVW
2026-09-08 14:23:59 +02:00
Johann Hoffmann
d1bd77efb9
enhanced tree filters: by template, date range, child count, content length, editor; hierarchy display mode for tree search results; removed clickstats to configurable tab behind admin berechtigung; added a cis4 preview iframe which builds content the same way cis4 would do, which resemble the cis4 stylesheets and the resolving of contentcomponents; block clickcounting for cis4 preview to not skew statistics; Children Tab is now a Hierarchy Tab which shows parents aswell; added drag&drop sort; Delete Tab shows existing references with db table name; content components got default cis4 styling; added tiefe parameter for recursive lookup of organisationseinheiten or dms groups; DMS query also checks user entitlement since there might be sensitive documents in reach if a high enough dms group would be chosen with a deep enough tiefe; version select has a shorthand mode for contents with large versioncount;
2026-09-08 11:42:39 +02:00
Andreas Österreicher
658c8d6bd4
Schreibberechtigungsprüfung bei Anrechnungen angepasst damit diese korrekt angezeigt wird wenn oe_kurzb nicht gleich der Kurzbz des Studiegangs ist
2026-09-03 08:44:10 +02:00
Andreas Österreicher
bf29faa5a7
Merge branch 'feature-82292/Cis4StudiumLVohneModulAnzeigen'
2026-09-02 15:20:28 +02:00
Johann Hoffmann
9f29a7798a
introduced dynamic cms content blocks, which can be predefined by adding another vue component to contentcomponents and following the catalog.js/components.js registration convention, which exists to avoid enabling the use of vue components inside content which where never designed for isolated use. contentcomponents could also be reused by traditional vue apps/components if need be; added the most used/requested dynamic content building blocks: OePersonen.js - all persons of a chosen OE; PersonKontakt.js - same but by uid; DmsListe.js - file links of a dms category; DmsDokumente.js - same but by dms_id; scan.js finds the divs inside cms contents tagged with "data-fhc-content" and teleports the actual vue component into the DOM structure of the rendered content. If there are issues/problems with the defined & allowed properties the component is skipped to avoid breaking pages with faulty configs; WIP testing edge cases with such vue content blocks and refining the feature idea in general;
2026-09-01 15:31:55 +02:00
chfhtw
cc9d1f983e
bugfix: missing call to getStudiensemesterKurzbz
2026-09-01 10:39:02 +02:00
Johann Hoffmann
09ee72bd50
fixed error paths in Auth_Controller for content since it has no terminateWithError; tree reloads only nodes affected instead of complete refetch; simplified url & language options; added fhcAlert toasts to api calls; some bugfixes; still pondering how to properly utilize generic placeholders in contents;
2026-08-28 13:28:15 +02:00
Johann Hoffmann
6af2c7e11a
improved content tabs behaviour all around; changed lock mechanism to 24 hour expiry if not manually unlocked; added rank by clicks (sourced from system.tbl_webservicelog) since timestamp filter feature in order to find out which contents are important; general UI improvements; a ton of phrasen; some code cleanup; WIP finetuning & revamping the content features themselves;
2026-08-27 17:57:39 +02:00
Johann Hoffmann
6d9ce91302
Merge remote-tracking branch 'origin/master' into feature-77588/AnwesenheitenSprint252
...
# Conflicts:
# system/phrasesupdate.php
2026-08-26 16:31:28 +02:00
Johann Hoffmann
57c48f2c4a
cis4 studium page dont filter away lehrveranstaltungen without a module and give them their own box in the ui;
2026-08-26 13:15:16 +02:00
Johann Hoffmann
1802f9d32c
cms admin first draft, needs a lot of polishing still;
2026-08-26 11:18:26 +02:00
Andreas Österreicher
e32691994c
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
2026-08-26 08:21:30 +02:00
Harald Bamberger
6d641bbd06
pass in uid by reference
2026-08-24 13:56:55 +02:00
Harald Bamberger
f84d12277d
remove debug code
2026-08-24 07:31:47 +02:00
Harald Bamberger
9bf5bc2ad9
more generic bugfix, to use studentlehrverband only with date_range for the same studiensemester_kurzbz
2026-08-24 07:26:12 +02:00
Harald Bamberger
75d2cabdbe
bugfix lv-plan
2026-08-20 15:10:26 +02:00
Harald Bamberger
7f3b4100ab
Merge branch 'master' into feature-78257/StudVW_Und_Tags_Finetuning
2026-08-19 15:07:07 +02:00
Cristina
0f843db33d
Merge branch 'master' into epic/LVEvaluierung-Neu
2026-08-19 13:34:53 +02:00
Harald Bamberger
55a6ec9d0d
fix handling of grundbetrag and betrag_valorisiert
2026-08-19 11:48:22 +02:00
Harald Bamberger
8d9113d5c8
Merge branch 'master' into feature-77666/Details_anzeigen_der_Valorisierung_pro_Person
2026-08-19 08:06:16 +02:00
Harald Bamberger
7ce81ad4bd
Merge branch 'feature-78292/dv_gehaltsbestandteil_ersteinstufung'
2026-08-19 07:57:07 +02:00
Cristina
5e15d4b219
Add Distinct to getLeitung in Studiengang_model.php
...
Avoid multiple records for same active STGL.
e.g. double entries
2026-08-18 16:51:39 +02:00
Harald Bamberger
92d27fc242
Merge branch 'master' into feature/78128-quick-copy-full-name-and-title
2026-08-18 14:52:41 +02:00
ma0068
afb8011347
bugfix manual rebuilding of Tag ZGV Missing
2026-08-13 12:57:49 +02:00
Johann Hoffmann
46f8d0d07d
remove all remaining projektarbeit-lehreinheit joins across the codebase;
...
master merge reverted the LE removal in Projektarbeit_model -> re-applied that fix and went through every file that touches tbl_projektarbeit to find remaining issues.
Projektarbeit_model, stv Projektarbeit controller, Vertrag_model, vertrag.class, lehrauftragsliste_gst.xls.php, zeitaufzeichnung.class.php, sammelzeugnis.rdf.php, zeugnis.rdf.php, projektarbeit.rdf.php,
lehrauftrag.xml.php, personal_lektorenohnelehrauftrag.php, personal_generateverwendung.php
tbl_lehreinheit joins remain in tbl_lehreinheitmitarbeiter contexts where lehreinheit_id is always set.
2026-08-12 18:05:45 +02:00
Harald Bamberger
6d5a4531e1
use tbl_studentlehrverband.semester instead of tbl_student.semester
2026-08-12 16:58:21 +02:00
ma0068
15beaa9be8
Merge branch 'feature-78257/StudVW_Und_Tags_Finetuning' of github.com:FH-Complete/FHC-Core into feature-78257/StudVW_Und_Tags_Finetuning
2026-08-12 12:42:10 +02:00
Johann Hoffmann