Skip to content
Snippets Groups Projects
Verified Commit f2eb713f authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Reformat

parent 3067565b
No related branches found
No related tags found
1 merge request!121Prepare release 3.0
include:
- project: "AlekSIS/official/AlekSIS"
file: /ci/general.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/prepare/lock.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/test/lint.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/test/test.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/test/security.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/build/dist.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/build/docs.yml
- project: "AlekSIS/official/AlekSIS"
file: "/ci/deploy/trigger_dist.yml"
- project: "AlekSIS/official/AlekSIS"
file: /ci/publish/pypi.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/deploy/pages.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/docker/image.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/general.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/prepare/lock.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/test/lint.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/test/test.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/test/security.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/build/dist.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/build/docs.yml
- project: "AlekSIS/official/AlekSIS"
file: "/ci/deploy/trigger_dist.yml"
- project: "AlekSIS/official/AlekSIS"
file: /ci/publish/pypi.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/deploy/pages.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/docker/image.yml
pedasos_teachers:
model: core.Person
verbose_name: 'Pedasos: Teachers'
verbose_name: "Pedasos: Teachers"
extra_args:
has_header_row: true
separator: "\t"
......@@ -15,7 +15,7 @@ pedasos_teachers:
- ignore
pedasos_classes:
model: core.Group
verbose_name: 'Pedasos: Classes'
verbose_name: "Pedasos: Classes"
extra_args:
has_header_row: true
separator: "\t"
......@@ -26,7 +26,7 @@ pedasos_classes:
- group_owner_short_name
pedasos_courses:
model: core.Group
verbose_name: 'Pedasos: Courses'
verbose_name: "Pedasos: Courses"
extra_args:
has_header_row: true
separator: "\t"
......@@ -38,7 +38,7 @@ pedasos_courses:
- group_owner_short_name
pedasos_students:
model: core.Person
verbose_name: 'Pedasos: Students'
verbose_name: "Pedasos: Students"
extra_args:
has_header_row: true
separator: "\t"
......@@ -84,7 +84,7 @@ pedasos_students:
- group_membership_short_name
pedasos_guardians_1:
model: core.Person
verbose_name: 'Pedasos: Guardians 1'
verbose_name: "Pedasos: Guardians 1"
extra_args:
has_header_row: true
separator: "\t"
......@@ -130,7 +130,7 @@ pedasos_guardians_1:
- ignore
pedasos_guardians_2:
model: core.Person
verbose_name: 'Pedasos: Guardians 2'
verbose_name: "Pedasos: Guardians 2"
extra_args:
has_header_row: true
separator: "\t"
......@@ -176,7 +176,7 @@ pedasos_guardians_2:
- ignore
schild_nrw_students:
model: core.Person
verbose_name: 'Schild-NRW: Students'
verbose_name: "Schild-NRW: Students"
extra_args:
has_header_row: true
separator: ;
......@@ -208,7 +208,7 @@ schild_nrw_students:
- phone_number
schild_nrw_teachers:
model: core.Person
verbose_name: 'Schild-NRW: Teachers'
verbose_name: "Schild-NRW: Teachers"
extra_args:
has_header_row: true
separator: ;
......
export default {
name: "csv",
path: "#",
component: () => import("aleksis.core/components/Parent.vue"),
meta: {
name: "csv",
path: "#",
component: () => import("aleksis.core/components/Parent.vue"),
meta: {
inMenu: true,
titleKey: "csv.menu_title",
icon: "mdi-swap-vertical",
permission: "csv_import.view_csv_menu_rule",
},
children: [
{
path: "import/",
component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
name: "csv.csvImport",
meta: {
inMenu: true,
titleKey: "csv.menu_title",
icon: "mdi-swap-vertical",
permission: "csv_import.view_csv_menu_rule",
titleKey: "csv.import.menu_title",
icon: "mdi-table-arrow-left",
permission: "csv_import.import_data_rule",
},
props: {
byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
},
},
children: [
{
path: "import/",
component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
name: "csv.csvImport",
meta: {
inMenu: true,
titleKey: "csv.import.menu_title",
icon: "mdi-table-arrow-left",
permission: "csv_import.import_data_rule",
},
props: {
byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
},
},
{
path: "templates/",
component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
name: "csv.importTemplates",
meta: {
inMenu: true,
titleKey: "csv.import_template.menu_title",
icon: "mdi-table-cog",
permission: "csv_import.view_importtemplate_rule"
},
props: {
byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
},
},
{
path: "templates/upload/",
component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
name: "csv.uploadImportTemplate",
props: {
byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
},
},
]
}
{
path: "templates/",
component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
name: "csv.importTemplates",
meta: {
inMenu: true,
titleKey: "csv.import_template.menu_title",
icon: "mdi-table-cog",
permission: "csv_import.view_importtemplate_rule",
},
props: {
byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
},
},
{
path: "templates/upload/",
component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
name: "csv.uploadImportTemplate",
props: {
byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
},
},
],
};
{
"csv": {
"menu_title": "CSV-Import",
"import": {
"menu_title": "CSV-Datei importieren"
},
"import_template": {
"menu_title": "Import-Vorlagen"
}
"csv": {
"menu_title": "CSV-Import",
"import": {
"menu_title": "CSV-Datei importieren"
},
"import_template": {
"menu_title": "Import-Vorlagen"
}
}
}
{
"csv": {
"menu_title": "CSV Import",
"import": {
"menu_title": "Import CSV File"
},
"import_template": {
"menu_title": "Import Templates"
}
"csv": {
"menu_title": "CSV Import",
"import": {
"menu_title": "Import CSV File"
},
"import_template": {
"menu_title": "Import Templates"
}
}
}
{
"csv": {
"import": {
"menu_title": "Импорт файла CSV"
},
"import_template": {
"menu_title": "Импортировать шаблоны"
},
"menu_title": "Импорт CSV"
}
"csv": {
"import": {
"menu_title": "Импорт файла CSV"
},
"import_template": {
"menu_title": "Импортировать шаблоны"
},
"menu_title": "Импорт CSV"
}
}
{
"csv": {
"menu_title": "Імпорт CSV",
"import_template": {
"menu_title": "Імпортувати шаблони"
},
"import": {
"menu_title": "Імпорт файлу CSV"
}
"csv": {
"menu_title": "Імпорт CSV",
"import_template": {
"menu_title": "Імпортувати шаблони"
},
"import": {
"menu_title": "Імпорт файлу CSV"
}
}
}
......@@ -14,5 +14,7 @@ upload_importtemplate_predicate = has_person & (
)
add_perm("csv_import.upload_importtemplate_rule", upload_importtemplate_predicate)
view_csv_menu_predicate = import_data_predicate | view_importtemplate_predicate | upload_importtemplate_predicate
view_csv_menu_predicate = (
import_data_predicate | view_importtemplate_predicate | upload_importtemplate_predicate
)
add_perm("csv_import.view_csv_menu_rule", view_csv_menu_predicate)
......@@ -169,7 +169,10 @@ def import_csv(
# Determine available fields for finding existing instances
get_dict = {}
match_field_priority = 0
for (column_name, field_type,) in sorted(
for (
column_name,
field_type,
) in sorted(
filter(lambda f: isinstance(f[1], MatchFieldType), field_types.items()),
key=lambda f: f[1].priority,
):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment