diff --git a/VorgabenUI/settings-docker.py b/VorgabenUI/settings-docker.py index 1467329..43bb54b 100644 --- a/VorgabenUI/settings-docker.py +++ b/VorgabenUI/settings-docker.py @@ -38,7 +38,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'standards', + 'dokumente', 'abschnitte', 'stichworte', 'mptt', diff --git a/VorgabenUI/settings.py b/VorgabenUI/settings.py index 11a2ae7..63407ea 100644 --- a/VorgabenUI/settings.py +++ b/VorgabenUI/settings.py @@ -43,7 +43,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'standards', + 'dokumente', 'abschnitte', 'stichworte', 'referenzen', diff --git a/VorgabenUI/urls.py b/VorgabenUI/urls.py index 4ce78ac..209a1b9 100644 --- a/VorgabenUI/urls.py +++ b/VorgabenUI/urls.py @@ -19,7 +19,7 @@ from django.urls import include, path, re_path from django.conf import settings from django.conf.urls.static import static from diagramm_proxy.views import DiagrammProxyView -import standards.views +import dokumente.views import pages.views import referenzen.views @@ -28,7 +28,7 @@ admin.site.site_header="Autorenumgebung" urlpatterns = [ path('',pages.views.startseite), path('search/',pages.views.search), - path('standards/', include("standards.urls")), + path('dokumente/', include("dokumente.urls")), path('autorenumgebung/', admin.site.urls), path('stichworte/', include("stichworte.urls")), path('referenzen/', referenzen.views.tree, name="referenz_tree"), diff --git a/data/db.sqlite3 b/data/db.sqlite3 index 9e2b480..84c0e93 100644 Binary files a/data/db.sqlite3 and b/data/db.sqlite3 differ diff --git a/standards/__init__.py b/dokumente/__init__.py similarity index 100% rename from standards/__init__.py rename to dokumente/__init__.py diff --git a/standards/admin.py b/dokumente/admin.py similarity index 100% rename from standards/admin.py rename to dokumente/admin.py diff --git a/standards/apps.py b/dokumente/apps.py similarity index 84% rename from standards/apps.py rename to dokumente/apps.py index 4e49793..5d5c0e0 100644 --- a/standards/apps.py +++ b/dokumente/apps.py @@ -3,4 +3,4 @@ from django.apps import AppConfig class standardsConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'standards' + name = 'dokumente' diff --git a/standards/management/commands/import-document.py b/dokumente/management/commands/import-document.py similarity index 99% rename from standards/management/commands/import-document.py rename to dokumente/management/commands/import-document.py index a4256e2..42cc19d 100755 --- a/standards/management/commands/import-document.py +++ b/dokumente/management/commands/import-document.py @@ -4,7 +4,7 @@ from pathlib import Path from django.core.management.base import BaseCommand, CommandError from django.utils import timezone -from standards.models import ( +from dokumente.models import ( Dokument, Dokumententyp, Thema, diff --git a/standards/migrations/0001_initial.py b/dokumente/migrations/0001_initial.py similarity index 90% rename from standards/migrations/0001_initial.py rename to dokumente/migrations/0001_initial.py index 2a7fc01..a36340c 100644 --- a/standards/migrations/0001_initial.py +++ b/dokumente/migrations/0001_initial.py @@ -53,7 +53,7 @@ class Migration(migrations.Migration): ('rght', models.PositiveIntegerField(editable=False)), ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)), ('level', models.PositiveIntegerField(editable=False)), - ('oberreferenz', mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='unterreferenzen', to='standards.referenz')), + ('oberreferenz', mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='unterreferenzen', to='dokumente.referenz')), ], options={ 'verbose_name_plural': 'Referenzen', @@ -65,7 +65,7 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('inhalt', models.TextField(blank=True, null=True)), ('abschnitttyp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='abschnitte.abschnitttyp')), - ('erklaerung', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='standards.referenz')), + ('erklaerung', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dokumente.referenz')), ], options={ 'verbose_name': 'Erklärung', @@ -80,9 +80,9 @@ class Migration(migrations.Migration): ('gueltigkeit_bis', models.DateField(blank=True, null=True)), ('signatur_cso', models.CharField(blank=True, max_length=255)), ('anhaenge', models.TextField(blank=True)), - ('autoren', models.ManyToManyField(related_name='verfasste_dokumente', to='standards.person')), - ('dokumententyp', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='standards.dokumententyp')), - ('pruefende', models.ManyToManyField(related_name='gepruefte_dokumente', to='standards.person')), + ('autoren', models.ManyToManyField(related_name='verfasste_dokumente', to='dokumente.person')), + ('dokumententyp', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='dokumente.dokumententyp')), + ('pruefende', models.ManyToManyField(related_name='gepruefte_dokumente', to='dokumente.person')), ], options={ 'verbose_name': 'Standard', @@ -95,7 +95,7 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('inhalt', models.TextField(blank=True, null=True)), ('abschnitttyp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='abschnitte.abschnitttyp')), - ('geltungsbereich', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='standards.standard')), + ('geltungsbereich', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dokumente.standard')), ], options={ 'verbose_name': 'Geltungsbereichs-Abschnitt', @@ -108,8 +108,8 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('datum', models.DateField()), ('aenderung', models.TextField()), - ('autoren', models.ManyToManyField(to='standards.person')), - ('dokument', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='changelog', to='standards.standard')), + ('autoren', models.ManyToManyField(to='dokumente.person')), + ('dokument', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='changelog', to='dokumente.standard')), ], ), migrations.CreateModel( @@ -120,10 +120,10 @@ class Migration(migrations.Migration): ('titel', models.CharField(max_length=255)), ('gueltigkeit_von', models.DateField()), ('gueltigkeit_bis', models.DateField(blank=True, null=True)), - ('dokument', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='vorgaben', to='standards.standard')), - ('referenzen', models.ManyToManyField(blank=True, to='standards.referenz')), + ('dokument', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='vorgaben', to='dokumente.standard')), + ('referenzen', models.ManyToManyField(blank=True, to='dokumente.referenz')), ('stichworte', models.ManyToManyField(blank=True, to='stichworte.stichwort')), - ('thema', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='standards.thema')), + ('thema', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='dokumente.thema')), ], options={ 'verbose_name_plural': 'Vorgaben', @@ -134,7 +134,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('frage', models.CharField(max_length=255)), - ('vorgabe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checklistenfragen', to='standards.vorgabe')), + ('vorgabe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checklistenfragen', to='dokumente.vorgabe')), ], options={ 'verbose_name_plural': 'Fragen für Checkliste', @@ -145,7 +145,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('inhalt', models.TextField(blank=True, null=True)), - ('abschnitt', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='standards.vorgabe')), + ('abschnitt', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dokumente.vorgabe')), ('abschnitttyp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='abschnitte.abschnitttyp')), ], options={ @@ -158,7 +158,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('inhalt', models.TextField(blank=True, null=True)), - ('abschnitt', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='standards.vorgabe')), + ('abschnitt', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dokumente.vorgabe')), ('abschnitttyp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='abschnitte.abschnitttyp')), ], options={ diff --git a/standards/migrations/0002_einleitung.py b/dokumente/migrations/0002_einleitung.py similarity index 90% rename from standards/migrations/0002_einleitung.py rename to dokumente/migrations/0002_einleitung.py index ca4c5a0..692098d 100644 --- a/standards/migrations/0002_einleitung.py +++ b/dokumente/migrations/0002_einleitung.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('abschnitte', '0001_initial'), - ('standards', '0001_initial'), + ('dokumente', '0001_initial'), ] operations = [ @@ -18,7 +18,7 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('inhalt', models.TextField(blank=True, null=True)), ('abschnitttyp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='abschnitte.abschnitttyp')), - ('einleitung', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='standards.standard')), + ('einleitung', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dokumente.standard')), ], options={ 'verbose_name': 'Einleitungs-Abschnitt', diff --git a/standards/migrations/0003_einleitung_order_geltungsbereich_order_and_more.py b/dokumente/migrations/0003_einleitung_order_geltungsbereich_order_and_more.py similarity index 96% rename from standards/migrations/0003_einleitung_order_geltungsbereich_order_and_more.py rename to dokumente/migrations/0003_einleitung_order_geltungsbereich_order_and_more.py index fe55d74..b69fe01 100644 --- a/standards/migrations/0003_einleitung_order_geltungsbereich_order_and_more.py +++ b/dokumente/migrations/0003_einleitung_order_geltungsbereich_order_and_more.py @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('standards', '0002_einleitung'), + ('dokumente', '0002_einleitung'), ] operations = [ diff --git a/standards/migrations/0004_remove_referenzerklaerung_erklaerung_and_more.py b/dokumente/migrations/0004_remove_referenzerklaerung_erklaerung_and_more.py similarity index 92% rename from standards/migrations/0004_remove_referenzerklaerung_erklaerung_and_more.py rename to dokumente/migrations/0004_remove_referenzerklaerung_erklaerung_and_more.py index 3231390..b2a0d3d 100644 --- a/standards/migrations/0004_remove_referenzerklaerung_erklaerung_and_more.py +++ b/dokumente/migrations/0004_remove_referenzerklaerung_erklaerung_and_more.py @@ -7,7 +7,7 @@ class Migration(migrations.Migration): dependencies = [ ('referenzen', '0001_initial'), - ('standards', '0003_einleitung_order_geltungsbereich_order_and_more'), + ('dokumente', '0003_einleitung_order_geltungsbereich_order_and_more'), ] operations = [ diff --git a/standards/migrations/0005_vorgabe_relevanz.py b/dokumente/migrations/0005_vorgabe_relevanz.py similarity index 86% rename from standards/migrations/0005_vorgabe_relevanz.py rename to dokumente/migrations/0005_vorgabe_relevanz.py index 5a31180..e9bf11c 100644 --- a/standards/migrations/0005_vorgabe_relevanz.py +++ b/dokumente/migrations/0005_vorgabe_relevanz.py @@ -7,7 +7,7 @@ class Migration(migrations.Migration): dependencies = [ ('rollen', '0001_initial'), - ('standards', '0004_remove_referenzerklaerung_erklaerung_and_more'), + ('dokumente', '0004_remove_referenzerklaerung_erklaerung_and_more'), ] operations = [ diff --git a/standards/migrations/0006_rename_standard_dokument_alter_dokument_options.py b/dokumente/migrations/0006_rename_standard_dokument_alter_dokument_options.py similarity index 90% rename from standards/migrations/0006_rename_standard_dokument_alter_dokument_options.py rename to dokumente/migrations/0006_rename_standard_dokument_alter_dokument_options.py index 9ba4ece..50838b4 100644 --- a/standards/migrations/0006_rename_standard_dokument_alter_dokument_options.py +++ b/dokumente/migrations/0006_rename_standard_dokument_alter_dokument_options.py @@ -6,7 +6,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('standards', '0005_vorgabe_relevanz'), + ('dokumente', '0005_vorgabe_relevanz'), ] operations = [ diff --git a/standards/migrations/0007_alter_changelog_options_and_more.py b/dokumente/migrations/0007_alter_changelog_options_and_more.py similarity index 93% rename from standards/migrations/0007_alter_changelog_options_and_more.py rename to dokumente/migrations/0007_alter_changelog_options_and_more.py index 2004c2d..7b325c7 100644 --- a/standards/migrations/0007_alter_changelog_options_and_more.py +++ b/dokumente/migrations/0007_alter_changelog_options_and_more.py @@ -6,7 +6,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('standards', '0006_rename_standard_dokument_alter_dokument_options'), + ('dokumente', '0006_rename_standard_dokument_alter_dokument_options'), ] operations = [ diff --git a/standards/migrations/__init__.py b/dokumente/migrations/__init__.py similarity index 100% rename from standards/migrations/__init__.py rename to dokumente/migrations/__init__.py diff --git a/standards/models.py b/dokumente/models.py similarity index 100% rename from standards/models.py rename to dokumente/models.py diff --git a/standards/templates/standards/standard_checkliste.html b/dokumente/templates/standards/standard_checkliste.html similarity index 100% rename from standards/templates/standards/standard_checkliste.html rename to dokumente/templates/standards/standard_checkliste.html diff --git a/standards/templates/standards/standard_detail.html b/dokumente/templates/standards/standard_detail.html similarity index 100% rename from standards/templates/standards/standard_detail.html rename to dokumente/templates/standards/standard_detail.html diff --git a/standards/templates/standards/standard_detail_barebones.html b/dokumente/templates/standards/standard_detail_barebones.html similarity index 100% rename from standards/templates/standards/standard_detail_barebones.html rename to dokumente/templates/standards/standard_detail_barebones.html diff --git a/standards/templates/standards/standard_list.html b/dokumente/templates/standards/standard_list.html similarity index 100% rename from standards/templates/standards/standard_list.html rename to dokumente/templates/standards/standard_list.html diff --git a/standards/tests.py b/dokumente/tests.py similarity index 100% rename from standards/tests.py rename to dokumente/tests.py diff --git a/standards/urls.py b/dokumente/urls.py similarity index 100% rename from standards/urls.py rename to dokumente/urls.py diff --git a/standards/views.py b/dokumente/views.py similarity index 98% rename from standards/views.py rename to dokumente/views.py index 2cd35bc..604aa1f 100644 --- a/standards/views.py +++ b/dokumente/views.py @@ -11,7 +11,7 @@ calendar=parsedatetime.Calendar() def standard_list(request): standards = Dokument.objects.all() return render(request, 'standards/standard_list.html', - {'standards': standards} + {'dokumente': standards} ) diff --git a/pages/templates/base.html b/pages/templates/base.html index c6ab4cb..c911bb0 100644 --- a/pages/templates/base.html +++ b/pages/templates/base.html @@ -16,7 +16,7 @@