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

Vertragsverwaltung - Filter korrigiert fuer aktive und inaktive

Browse Source 
Mitarbeiter
This commit is contained in:
Andreas Österreicher
2025-09-05 12:45:39 +02:00
parent 1bb10ddeb1
commit 4099d91a1b
6 changed files with 157 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/filtersupdate.php
+74 -52
View File
@@ -1395,14 +1395,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"}
],
@@ -1433,14 +1433,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"}
],
@@ -1471,14 +1471,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"}
],
@@ -1509,14 +1509,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"}
],
@@ -1547,10 +1547,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"}
],
@@ -1561,38 +1561,60 @@ $filters = array(
array(
'app' => 'core',
'dataset_name' => 'vertragsverwaltung',
'filter_kurzbz' => 'Vertragsverwaltung',
'description' => '{Vertragsverwaltung}',
'filter_kurzbz' => 'VertragsverwaltungAktiv',
'description' => '{Aktive Mitarbeiter}',
'sort' => 1,
'default_filter' => true,
'filter' => '
{
"name": "MA Vertragsverwaltung (aktiv/all)",
"name": "Aktive Mitarbeiter",
"columns": [
{"name": "UID"},
{"name": "PersonId"},
{"name": "Nachname"},
{"name": "Vorname"},
{"name": "uid"},
{"name": "person_id"},
{"name": "nachname"},
{"name": "vorname"},
{"name": "aktiv"},
{"name": "Geburtsdatum"},
{"name": "Unternehmen"},
{"name": "Firma"},
{"name": "Vertragsarten"},
{"name": "IDs Dienstverhältnis"},
{"name": "email"},
{"name": "aktiv_status"}
{"name": "gebdatum"},
{"name": "unternehmen"},
{"name": "vertragsarten"},
{"name": "ids"}
],
"filters": [
{
"name": "aktiv_status",
"name": "aktiv",
"option": "",
"operation": "equal",
"condition": "aktiv"
"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