blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 08:34:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature-34543/UX_Template' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp

Browse Source 
# Conflicts:
#	system/filtersupdate.php
This commit is contained in:
Johann Hoffmann
2024-02-15 14:16:33 +01:00
parent c6d4c34cad caa7ad6cc4
commit afa00caa4c
25 changed files with 7344 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/filtersupdate.php
+15 -22
View File
@@ -1281,35 +1281,28 @@ $filters = array(
),
array(
'app' => 'core',
'dataset_name' => 'AnwesenheitenByLektor',
'filter_kurzbz' => 'anwByLektor',
'description' => '{AnwesenheitenByLektor}',
'sort' => 2,
'dataset_name' => 'anrechnungTableData',
'filter_kurzbz' => 'AnrechnungTable',
'description' => '{Alle Anrechnungen}',
'sort' => 1,
'default_filter' => true,
'filter' => '
{
"name": "Anwesenheiten By Lektor",
"name": "AnrechnungTable",
"columns": [
{"name": "Vorname"},
{"name": "Nachname"},
{"name": "Aktuelles Datum"},
{"name": "Summe"}
{"name": "studiengang_kz"},
{"name": "stg_bezeichnung"},
{"name": "studiensemester_kurzbz"},
{"name": "student"},
{"name": "lv_bezeichnung"},
{"name": "dokument_bezeichnung"},
{"name": "anmerkung_student"},
{"name": "status_kurzbz"}
],
"filters": [
{
"name": "Aktuelles Datum",
"operation": "ncontains",
"condition": "anw"
},
{
"name": "Aktuelles Datum",
"operation": "contains",
"condition": "abw"
}
]
"filters": []
}
',
'oe_kurzbz' => null,
'oe_kurzbz' => null
)
);
system/phrasesupdate.php
+60
View File
@@ -11354,6 +11354,26 @@ Any unusual occurrences
)
)
),
array(
'app' => 'core',
'category' => 'anrechnung',
'phrase' => 'anrechnung',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Anrechnung',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'Exemption',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'anrechnung',
@@ -24135,6 +24155,46 @@ array(
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'global',
'phrase' => 'geloescht',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Gelöscht',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'Deleted',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'global',
'phrase' => 'aenderungGespeichert',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Änderung gespeichert',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'Saved changes',
'description' => '',
'insertvon' => 'system'
)
)
)
);