blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-24 10:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature-75469/LeOptional4Projektarbeit

Browse Source 
# Conflicts:
#	application/controllers/api/frontend/v1/Abgabe.php
#	public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
#	public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
#	public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
#	public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
#	system/phrasesupdate.php
This commit is contained in:
Johann Hoffmann
2026-03-16 12:36:30 +01:00
parent a7d925a177 96745525f1
commit 5d7281e470
147 changed files with 8369 additions and 2424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/filtersupdate.php
+93 -36
View File
@@ -1418,14 +1418,14 @@ $filters = array(
{"name": "PersonId"},
{"name": "Vorname"},
{"name": "Nachname"},
{"name": "EMail"},
{"name": "Unternehmen"},
{"name": "Vertragsart"},
{"name": "DV_von"},
{"name": "DV_bis"},
{"name": "Wochenstunden"},
{"name": "WS_von"},
{"name": "WS_bis"},
{"name": "EMail"},
{"name": "Unternehmen"},
{"name": "Vertragsart"},
{"name": "DV_von"},
{"name": "DV_bis"},
{"name": "Wochenstunden"},
{"name": "WS_von"},
{"name": "WS_bis"},
{"name": "Standardkostenstelle"},
{"name": "DV_status"}
],
@@ -1456,14 +1456,14 @@ $filters = array(
{"name": "PersonId"},
{"name": "Vorname"},
{"name": "Nachname"},
{"name": "EMail"},
{"name": "Unternehmen"},
{"name": "Vertragsart"},
{"name": "DV_von"},
{"name": "DV_bis"},
{"name": "Wochenstunden"},
{"name": "WS_von"},
{"name": "WS_bis"},
{"name": "EMail"},
{"name": "Unternehmen"},
{"name": "Vertragsart"},
{"name": "DV_von"},
{"name": "DV_bis"},
{"name": "Wochenstunden"},
{"name": "WS_von"},
{"name": "WS_bis"},
{"name": "Standardkostenstelle"},
{"name": "DV_status"}
],
@@ -1494,14 +1494,14 @@ $filters = array(
{"name": "PersonId"},
{"name": "Vorname"},
{"name": "Nachname"},
{"name": "EMail"},
{"name": "Unternehmen"},
{"name": "Vertragsart"},
{"name": "DV_von"},
{"name": "DV_bis"},
{"name": "Wochenstunden"},
{"name": "WS_von"},
{"name": "WS_bis"},
{"name": "EMail"},
{"name": "Unternehmen"},
{"name": "Vertragsart"},
{"name": "DV_von"},
{"name": "DV_bis"},
{"name": "Wochenstunden"},
{"name": "WS_von"},
{"name": "WS_bis"},
{"name": "Standardkostenstelle"},
{"name": "DV_status"}
],
@@ -1532,14 +1532,14 @@ $filters = array(
{"name": "PersonId"},
{"name": "Vorname"},
{"name": "Nachname"},
{"name": "EMail"},
{"name": "Unternehmen"},
{"name": "Vertragsart"},
{"name": "DV_von"},
{"name": "DV_bis"},
{"name": "Wochenstunden"},
{"name": "WS_von"},
{"name": "WS_bis"},
{"name": "EMail"},
{"name": "Unternehmen"},
{"name": "Vertragsart"},
{"name": "DV_von"},
{"name": "DV_bis"},
{"name": "Wochenstunden"},
{"name": "WS_von"},
{"name": "WS_bis"},
{"name": "Standardkostenstelle"},
{"name": "DV_status"}
],
@@ -1570,10 +1570,10 @@ $filters = array(
{"name": "PersonId"},
{"name": "Vorname"},
{"name": "Nachname"},
{"name": "Unternehmen"},
{"name": "Vertragsart"},
{"name": "DV_von"},
{"name": "DV_bis"},
{"name": "Unternehmen"},
{"name": "Vertragsart"},
{"name": "DV_von"},
{"name": "DV_bis"},
{"name": "Disziplinaere_Zuordnung"},
{"name": "DV_status"}
],
@@ -1581,6 +1581,63 @@ $filters = array(
}',
'oe_kurzbz' => null,
),
array(
'app' => 'core',
'dataset_name' => 'vertragsverwaltung',
'filter_kurzbz' => 'VertragsverwaltungAktiv',
'description' => '{Aktive Mitarbeiter}',
'sort' => 1,
'default_filter' => true,
'filter' => '
{
"name": "Aktive Mitarbeiter",
"columns": [
{"name": "uid"},
{"name": "person_id"},
{"name": "nachname"},
{"name": "vorname"},
{"name": "aktiv"},
{"name": "gebdatum"},
{"name": "unternehmen"},
{"name": "vertragsarten"},
{"name": "ids"}
],
"filters": [
{
"name": "aktiv",
"option": "",
"operation": "equal",
"condition": "true"
}
]
}',
'oe_kurzbz' => null,
),
array(
'app' => 'core',
'dataset_name' => 'vertragsverwaltung',
'filter_kurzbz' => 'VertragsverwaltungAlle',
'description' => '{Alle Mitarbeiter}',
'sort' => 1,
'default_filter' => false,
'filter' => '
{
"name": "Alle Mitarbeiter",
"columns": [
{"name": "uid"},
{"name": "person_id"},
{"name": "nachname"},
{"name": "vorname"},
{"name": "aktiv"},
{"name": "gebdatum"},
{"name": "unternehmen"},
{"name": "vertragsarten"},
{"name": "ids"}
],
"filters": []
}',
'oe_kurzbz' => null,
),
);
// Loop through the filters array
system/phrasesupdate.php
+1036 -4
View File
File diff suppressed because it is too large Load Diff