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

Merge branch 'master' into 4-support-import-from-mysql

parents 27d479a8 a567021e
No related branches found
No related tags found
1 merge request!13Resolve "Support import from MySQL"
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 616 additions and 384 deletions
README.rst
+ 2
− 2
View file @ 1eefb1c7
......@@ -17,9 +17,9 @@ Licence
::
Copyright © 2018, 2019, 2020 Jonathan Weth <wethjo@katharineum.de>
Copyright © 2018, 2019 Frank Poetzsch-Heffter <p-h@katharineum.de>
Copyright © 2018, 2019 Jonathan Weth <wethjo@katharineum.de>
Copyright © 2019 Dominik George <dominik.george@teckids.org>
Copyright © 2019, 2020 Dominik George <dominik.george@teckids.org>
Copyright © 2019 Julian Leucker <leuckeju@katharineum.de>
Copyright © 2019 mirabilos <thorsten.glaser@teckids.org>
Copyright © 2019 Tom Teichler <tom.teichler@teckids.org>
......
aleksis/apps/untis/apps.py
+ 14
− 1
View file @ 1eefb1c7
......@@ -3,4 +3,17 @@ from aleksis.core.util.apps import AppConfig
class UntisConfig(AppConfig):
name = "aleksis.apps.untis"
verbose_name = "AlekSIS - Untis interface"
verbose_name = "AlekSIS — UNTIS interface"
urls = {
"Repository": "https://edugit.org/AlekSIS/official/AlekSIS-App-Untis/",
}
licence = "EUPL-1.2+"
copyright = (
([2018, 2019, 2020], "Jonathan Weth", "wethjo@katharineum.de"),
([2018, 2019], "Frank Poetzsch-Heffter", "p-h@katharineum.de"),
([2019, 2020], "Dominik George", "dominik.george@teckids.org"),
([2019], "Julian Leucker", "leuckeju@katharineum.de"),
([2019], "mirabilos", "thorsten.glaser@teckids.org"),
([2019], "Tom Teichler", "tom.teichler@teckids.org"),
)
aleksis/apps/untis/locale/ar/LC_MESSAGES/django.po
+ 14
− 18
View file @ 1eefb1c7
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-15 14:10+0200\n"
"POT-Creation-Date: 2020-04-01 13:25+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -23,7 +23,7 @@ msgstr ""
msgid "Untis XML export"
msgstr ""
#: management/commands/untis_import.py:10
#: management/commands/untis_import.py:9
msgid "Path to Untis XML export file"
msgstr ""
......@@ -31,25 +31,25 @@ msgstr ""
msgid "Units import"
msgstr ""
#: templates/untis/untis_import.html:6
#: templates/untis/untis_import.html:8 templates/untis/untis_import.html:9
msgid "Import Untis data"
msgstr ""
#: templates/untis/untis_import.html:13
#: templates/untis/untis_import.html:14
msgid ""
"\n"
" Untis provides a function for exporting all data as an XML file.\n"
" "
" Untis provides a function for exporting all data as an XML file.\n"
" "
msgstr ""
#: templates/untis/untis_import.html:19
#: templates/untis/untis_import.html:21
msgid ""
"\n"
" Newly imported data will be valid as of tomorrow.\n"
" "
msgstr ""
#: templates/untis/untis_import.html:22
#: templates/untis/untis_import.html:24
msgid ""
"\n"
" The effective dates of all existing lessons will be set to end\n"
......@@ -57,7 +57,7 @@ msgid ""
" "
msgstr ""
#: templates/untis/untis_import.html:26
#: templates/untis/untis_import.html:28
msgid ""
"\n"
" The effective dates of all newly imported lessons will be set to\n"
......@@ -65,7 +65,7 @@ msgid ""
" "
msgstr ""
#: templates/untis/untis_import.html:30
#: templates/untis/untis_import.html:32
msgid ""
"\n"
" Teachers, rooms, subjects and classes and periods will be updated in "
......@@ -73,26 +73,22 @@ msgid ""
" "
msgstr ""
#: templates/untis/untis_import.html:41
msgid "Process"
msgstr ""
#: util.py:68
#: util.py:78
#, python-format
msgid "Class %s"
msgstr ""
#: util.py:81
#: util.py:92
#, python-format
msgid "Could not set class teacher of %(class)s to %(teacher)s."
msgstr ""
#: util.py:130
#: util.py:153
#, python-format
msgid "Invalid list of classes: %s"
msgstr ""
#: util.py:138
#: util.py:161
#, python-format
msgid "Failed to import lesson: Teacher %s does not exist."
msgstr ""
aleksis/apps/untis/locale/de_DE/LC_MESSAGES/django.po
+ 22
− 18
View file @ 1eefb1c7
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-15 14:10+0200\n"
"POT-Creation-Date: 2020-04-01 13:25+0200\n"
"PO-Revision-Date: 2019-09-15 13:40+0000\n"
"Last-Translator: Tom Teichler <tom.teichler@teckids.org>\n"
"Language-Team: German <https://translate.edugit.org/projects/aleksis-sis/"
......@@ -23,7 +23,7 @@ msgstr ""
msgid "Untis XML export"
msgstr "Untis-XML-Export"
#: management/commands/untis_import.py:10
#: management/commands/untis_import.py:9
msgid "Path to Untis XML export file"
msgstr "Pfad zur Untis-XML-Exportdatei"
......@@ -31,22 +31,27 @@ msgstr "Pfad zur Untis-XML-Exportdatei"
msgid "Units import"
msgstr "Untis-Import"
#: templates/untis/untis_import.html:6
#: templates/untis/untis_import.html:8 templates/untis/untis_import.html:9
msgid "Import Untis data"
msgstr "Untis-Daten importieren"
#: templates/untis/untis_import.html:13
#: templates/untis/untis_import.html:14
#, fuzzy
#| msgid ""
#| "\n"
#| " Untis provides a function for exporting all data as an XML file.\n"
#| " "
msgid ""
"\n"
" Untis provides a function for exporting all data as an XML file.\n"
" "
" Untis provides a function for exporting all data as an XML file.\n"
" "
msgstr ""
"\n"
" Untis bietet eine Funktion zum Exportieren aller Daten als XML-"
"Datei.\n"
" "
#: templates/untis/untis_import.html:19
#: templates/untis/untis_import.html:21
msgid ""
"\n"
" Newly imported data will be valid as of tomorrow.\n"
......@@ -56,7 +61,7 @@ msgstr ""
" Neu importierte Daten sind ab morgen gültig.\n"
" "
#: templates/untis/untis_import.html:22
#: templates/untis/untis_import.html:24
msgid ""
"\n"
" The effective dates of all existing lessons will be set to end\n"
......@@ -68,7 +73,7 @@ msgstr ""
" heute.\n"
" "
#: templates/untis/untis_import.html:26
#: templates/untis/untis_import.html:28
msgid ""
"\n"
" The effective dates of all newly imported lessons will be set to\n"
......@@ -80,7 +85,7 @@ msgstr ""
" startet morgen.\n"
" "
#: templates/untis/untis_import.html:30
#: templates/untis/untis_import.html:32
msgid ""
"\n"
" Teachers, rooms, subjects and classes and periods will be updated in "
......@@ -92,31 +97,30 @@ msgstr ""
"aktualisiert.\n"
" "
#: templates/untis/untis_import.html:41
msgid "Process"
msgstr "Importieren"
#: util.py:68
#: util.py:78
#, python-format
msgid "Class %s"
msgstr "Klasse %s"
#: util.py:81
#: util.py:92
#, python-format
msgid "Could not set class teacher of %(class)s to %(teacher)s."
msgstr ""
"Der Klassenlehrer von %(class)s konnte nicht auf %(teacher)s gesetzt werden."
#: util.py:130
#: util.py:153
#, python-format
msgid "Invalid list of classes: %s"
msgstr "Ungültige Liste von Klassen: %s"
#: util.py:138
#: util.py:161
#, python-format
msgid "Failed to import lesson: Teacher %s does not exist."
msgstr "Fehler beim Importieren der Stunde: Lehrer %s existiert nicht."
#~ msgid "Process"
#~ msgstr "Importieren"
#~ msgid "AlekSIS - Untis interface"
#~ msgstr "AlekSIS - Untis-Schnittstelle"
......
aleksis/apps/untis/locale/fr/LC_MESSAGES/django.po
+ 14
− 18
View file @ 1eefb1c7
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-15 14:10+0200\n"
"POT-Creation-Date: 2020-04-01 13:25+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -22,7 +22,7 @@ msgstr ""
msgid "Untis XML export"
msgstr ""
#: management/commands/untis_import.py:10
#: management/commands/untis_import.py:9
msgid "Path to Untis XML export file"
msgstr ""
......@@ -30,25 +30,25 @@ msgstr ""
msgid "Units import"
msgstr ""
#: templates/untis/untis_import.html:6
#: templates/untis/untis_import.html:8 templates/untis/untis_import.html:9
msgid "Import Untis data"
msgstr ""
#: templates/untis/untis_import.html:13
#: templates/untis/untis_import.html:14
msgid ""
"\n"
" Untis provides a function for exporting all data as an XML file.\n"
" "
" Untis provides a function for exporting all data as an XML file.\n"
" "
msgstr ""
#: templates/untis/untis_import.html:19
#: templates/untis/untis_import.html:21
msgid ""
"\n"
" Newly imported data will be valid as of tomorrow.\n"
" "
msgstr ""
#: templates/untis/untis_import.html:22
#: templates/untis/untis_import.html:24
msgid ""
"\n"
" The effective dates of all existing lessons will be set to end\n"
......@@ -56,7 +56,7 @@ msgid ""
" "
msgstr ""
#: templates/untis/untis_import.html:26
#: templates/untis/untis_import.html:28
msgid ""
"\n"
" The effective dates of all newly imported lessons will be set to\n"
......@@ -64,7 +64,7 @@ msgid ""
" "
msgstr ""
#: templates/untis/untis_import.html:30
#: templates/untis/untis_import.html:32
msgid ""
"\n"
" Teachers, rooms, subjects and classes and periods will be updated in "
......@@ -72,26 +72,22 @@ msgid ""
" "
msgstr ""
#: templates/untis/untis_import.html:41
msgid "Process"
msgstr ""
#: util.py:68
#: util.py:78
#, python-format
msgid "Class %s"
msgstr ""
#: util.py:81
#: util.py:92
#, python-format
msgid "Could not set class teacher of %(class)s to %(teacher)s."
msgstr ""
#: util.py:130
#: util.py:153
#, python-format
msgid "Invalid list of classes: %s"
msgstr ""
#: util.py:138
#: util.py:161
#, python-format
msgid "Failed to import lesson: Teacher %s does not exist."
msgstr ""
aleksis/apps/untis/locale/la/LC_MESSAGES/django.po 0 → 100644
+ 92
− 0
View file @ 1eefb1c7
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-01 13:25+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: forms.py:6
msgid "Untis XML export"
msgstr ""
#: management/commands/untis_import.py:9
msgid "Path to Untis XML export file"
msgstr ""
#: menus.py:6
msgid "Units import"
msgstr ""
#: templates/untis/untis_import.html:8 templates/untis/untis_import.html:9
msgid "Import Untis data"
msgstr ""
#: templates/untis/untis_import.html:14
msgid ""
"\n"
" Untis provides a function for exporting all data as an XML file.\n"
" "
msgstr ""
#: templates/untis/untis_import.html:21
msgid ""
"\n"
" Newly imported data will be valid as of tomorrow.\n"
" "
msgstr ""
#: templates/untis/untis_import.html:24
msgid ""
"\n"
" The effective dates of all existing lessons will be set to end\n"
" today.\n"
" "
msgstr ""
#: templates/untis/untis_import.html:28
msgid ""
"\n"
" The effective dates of all newly imported lessons will be set to\n"
" start tomorrow.\n"
" "
msgstr ""
#: templates/untis/untis_import.html:32
msgid ""
"\n"
" Teachers, rooms, subjects and classes and periods will be updated in "
"place.\n"
" "
msgstr ""
#: util.py:78
#, python-format
msgid "Class %s"
msgstr ""
#: util.py:92
#, python-format
msgid "Could not set class teacher of %(class)s to %(teacher)s."
msgstr ""
#: util.py:153
#, python-format
msgid "Invalid list of classes: %s"
msgstr ""
#: util.py:161
#, python-format
msgid "Failed to import lesson: Teacher %s does not exist."
msgstr ""
aleksis/apps/untis/locale/nb_NO/LC_MESSAGES/django.po
+ 14
− 18
View file @ 1eefb1c7
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-15 14:10+0200\n"
"POT-Creation-Date: 2020-04-01 13:25+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -21,7 +21,7 @@ msgstr ""
msgid "Untis XML export"
msgstr ""
#: management/commands/untis_import.py:10
#: management/commands/untis_import.py:9
msgid "Path to Untis XML export file"
msgstr ""
......@@ -29,25 +29,25 @@ msgstr ""
msgid "Units import"
msgstr ""
#: templates/untis/untis_import.html:6
#: templates/untis/untis_import.html:8 templates/untis/untis_import.html:9
msgid "Import Untis data"
msgstr ""
#: templates/untis/untis_import.html:13
#: templates/untis/untis_import.html:14
msgid ""
"\n"
" Untis provides a function for exporting all data as an XML file.\n"
" "
" Untis provides a function for exporting all data as an XML file.\n"
" "
msgstr ""
#: templates/untis/untis_import.html:19
#: templates/untis/untis_import.html:21
msgid ""
"\n"
" Newly imported data will be valid as of tomorrow.\n"
" "
msgstr ""
#: templates/untis/untis_import.html:22
#: templates/untis/untis_import.html:24
msgid ""
"\n"
" The effective dates of all existing lessons will be set to end\n"
......@@ -55,7 +55,7 @@ msgid ""
" "
msgstr ""
#: templates/untis/untis_import.html:26
#: templates/untis/untis_import.html:28
msgid ""
"\n"
" The effective dates of all newly imported lessons will be set to\n"
......@@ -63,7 +63,7 @@ msgid ""
" "
msgstr ""
#: templates/untis/untis_import.html:30
#: templates/untis/untis_import.html:32
msgid ""
"\n"
" Teachers, rooms, subjects and classes and periods will be updated in "
......@@ -71,26 +71,22 @@ msgid ""
" "
msgstr ""
#: templates/untis/untis_import.html:41
msgid "Process"
msgstr ""
#: util.py:68
#: util.py:78
#, python-format
msgid "Class %s"
msgstr ""
#: util.py:81
#: util.py:92
#, python-format
msgid "Could not set class teacher of %(class)s to %(teacher)s."
msgstr ""
#: util.py:130
#: util.py:153
#, python-format
msgid "Invalid list of classes: %s"
msgstr ""
#: util.py:138
#: util.py:161
#, python-format
msgid "Failed to import lesson: Teacher %s does not exist."
msgstr ""
aleksis/apps/untis/locale/tr_TR/LC_MESSAGES/django.po
+ 14
− 18
View file @ 1eefb1c7
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-15 14:10+0200\n"
"POT-Creation-Date: 2020-04-01 13:25+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -21,7 +21,7 @@ msgstr ""
msgid "Untis XML export"
msgstr ""
#: management/commands/untis_import.py:10
#: management/commands/untis_import.py:9
msgid "Path to Untis XML export file"
msgstr ""
......@@ -29,25 +29,25 @@ msgstr ""
msgid "Units import"
msgstr ""
#: templates/untis/untis_import.html:6
#: templates/untis/untis_import.html:8 templates/untis/untis_import.html:9
msgid "Import Untis data"
msgstr ""
#: templates/untis/untis_import.html:13
#: templates/untis/untis_import.html:14
msgid ""
"\n"
" Untis provides a function for exporting all data as an XML file.\n"
" "
" Untis provides a function for exporting all data as an XML file.\n"
" "
msgstr ""
#: templates/untis/untis_import.html:19
#: templates/untis/untis_import.html:21
msgid ""
"\n"
" Newly imported data will be valid as of tomorrow.\n"
" "
msgstr ""
#: templates/untis/untis_import.html:22
#: templates/untis/untis_import.html:24
msgid ""
"\n"
" The effective dates of all existing lessons will be set to end\n"
......@@ -55,7 +55,7 @@ msgid ""
" "
msgstr ""
#: templates/untis/untis_import.html:26
#: templates/untis/untis_import.html:28
msgid ""
"\n"
" The effective dates of all newly imported lessons will be set to\n"
......@@ -63,7 +63,7 @@ msgid ""
" "
msgstr ""
#: templates/untis/untis_import.html:30
#: templates/untis/untis_import.html:32
msgid ""
"\n"
" Teachers, rooms, subjects and classes and periods will be updated in "
......@@ -71,26 +71,22 @@ msgid ""
" "
msgstr ""
#: templates/untis/untis_import.html:41
msgid "Process"
msgstr ""
#: util.py:68
#: util.py:78
#, python-format
msgid "Class %s"
msgstr ""
#: util.py:81
#: util.py:92
#, python-format
msgid "Could not set class teacher of %(class)s to %(teacher)s."
msgstr ""
#: util.py:130
#: util.py:153
#, python-format
msgid "Invalid list of classes: %s"
msgstr ""
#: util.py:138
#: util.py:161
#, python-format
msgid "Failed to import lesson: Teacher %s does not exist."
msgstr ""
aleksis/apps/untis/templates/untis/xml_import.html
+ 1
− 1
View file @ 1eefb1c7
......@@ -4,7 +4,7 @@
{% load material_form i18n %}
{% block browser_title %}{% blocktrans %}Import Untis data via XML{% endblocktrans %}{% endblock %}
{% block page_title %}{% blocktrans %}Import Untis data via XML{% endblocktrans %}{% endblock %}
{% block content %}
......
poetry.lock
+ 429
− 290
View file @ 1eefb1c7
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment