README added, first try at signing commits.

README.md

@@ -1 +1,6 @@
-# VDeployment2
+# vgui-cicd
+
+There are examples for importing text in the "Documentation"-directory. Actual documentation follows.
+
+Documentation on Confluence so far.
+This commit should be signed.

VorgabenUI/settings-docker.py

@@ -38,7 +38,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'standards',
+    'dokumente',
     'abschnitte',
     'stichworte',
     'mptt',

VorgabenUI/settings.py

@@ -43,7 +43,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'standards',
+    'dokumente',
     'abschnitte',
     'stichworte',
     'referenzen',

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"),

argocd/deployment.yaml

@@ -18,14 +18,14 @@ spec:
         fsGroupChangePolicy: "OnRootMismatch"
       initContainers:
         - name: loader
-          image: git.baumann.gr/adebaumann/vgui-data-loader:0.5
+          image: git.baumann.gr/adebaumann/vui-data-loader:0.6
           command: [ "sh","-c","cp -n preload/preload.sqlite3 /data/db.sqlite3; chown -R 999:999 /data; ls -la /data; sleep 10; exit 0" ]
           volumeMounts:
             - name: data
               mountPath: /data
       containers:
         - name: web
-          image: git.baumann.gr/adebaumann/vui:0.929
+          image: git.baumann.gr/adebaumann/vui:0.930
           imagePullPolicy: Always
           ports:
             - containerPort: 8000

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'

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,

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')),
+                ('autoren', models.ManyToManyField(related_name='verfasste_dokumente', to='dokumente.person')),
-                ('dokumententyp', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='standards.dokumententyp')),
+                ('dokumententyp', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='dokumente.dokumententyp')),
-                ('pruefende', models.ManyToManyField(related_name='gepruefte_dokumente', to='standards.person')),
+                ('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')),
+                ('autoren', models.ManyToManyField(to='dokumente.person')),
-                ('dokument', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='changelog', to='standards.standard')),
+                ('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')),
+                ('dokument', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='vorgaben', to='dokumente.standard')),
-                ('referenzen', models.ManyToManyField(blank=True, to='standards.referenz')),
+                ('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={

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',

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 = [

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 = [

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 = [

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 = [

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 = [

dokumente/templates/standards/standard_list.html

@@ -2,10 +2,10 @@
 {% block content %}
 <h1>Standards Informatiksicherheit</h1>
 <ul>
-  {% for standard in standards %}
+  {% for dokument in dokumente %}
     <li>
-      <a href="{% url 'standard_detail' nummer=standard.nummer %}">
+      <a href="{% url 'standard_detail' nummer=dokument.nummer %}">
-        {{ standard.nummer }} – {{ standard.name }}
+        {{ dokument.nummer }} – {{ dokument.name }}
       </a>
     </li>
   {% endfor %}

dokumente/views.py

@@ -9,9 +9,9 @@ calendar=parsedatetime.Calendar()
 
 
 def standard_list(request):
-    standards = Dokument.objects.all()
+    dokumente = Dokument.objects.all()
     return render(request, 'standards/standard_list.html',
-                  {'standards': standards}
+                  {'dokumente': dokumente}
                   )
 
 

pages/templates/base.html

@@ -16,7 +16,7 @@
   </button>
   <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
     <div class="navbar-nav">
-      <a class="nav-item nav-link active" href="/standards">Standards</a>
+      <a class="nav-item nav-link active" href="/dokumente">Standards</a>
       <a class="nav-item nav-link" href="/referenzen">Referenzen</a>
       <a class="nav-item nav-link" href="/stichworte">Stichworte</a>
       <a class="nav-item nav-link" href="/search">Suche</a>
@@ -28,6 +28,6 @@
     <div class="flex-fill">{% block content %}Main Content{% endblock %}</div>
     <div class="col-md-2">{% block sidebar_right %}{% endblock %}</div>
 </div>
-<div>VorgabenUI v0.930</div>
+<div>VorgabenUI v0.931</div>
 </body>
 </html>

pages/templates/startseite.html

@@ -3,7 +3,7 @@
 <h1>Vorgaben Informatiksicherheit BIT</h1>
 <h2>Aktuell erfasste Standards</h2>
 <ul>
-    {% for standard in standards %}
+    {% for standard in dokumente %}
     <li><a href="{% url 'standard_detail' nummer=standard.nummer %}">{{ standard }}</a></li>
     {% endfor %}
 </ul>

pages/views.py

@@ -1,31 +1,31 @@
 from django.shortcuts import render
 from abschnitte.utils import render_textabschnitte
-from standards.models import Dokument, VorgabeLangtext, VorgabeKurztext, Geltungsbereich
+from dokumente.models import Dokument, VorgabeLangtext, VorgabeKurztext, Geltungsbereich
 from itertools import groupby
 import datetime
+import pprint
 
 def startseite(request):
     standards=list(Dokument.objects.all())
-    return render(request, 'startseite.html', {"standards":standards,})
+    return render(request, 'startseite.html', {"dokumente":standards,})
 
 def search(request):
     if request.method == "GET":
         return render(request, 'search.html')
     elif request.method == "POST":
         suchbegriff=request.POST.get("q")
-        areas=request.POST.getlist("suchbereich[]")
         result= {"all": {}}
         qs = VorgabeKurztext.objects.filter(inhalt__contains=suchbegriff).exclude(abschnitt__gueltigkeit_bis__lt=datetime.date.today())
         result["kurztext"] = {k: [o.abschnitt for o in g] for k, g in groupby(qs, key=lambda o: o.abschnitt.dokument)}
         qs = VorgabeLangtext.objects.filter(inhalt__contains=suchbegriff).exclude(abschnitt__gueltigkeit_bis__lt=datetime.date.today())
         result['langtext']=  {k: [o.abschnitt for o in g] for k, g in groupby(qs, key=lambda o: o.abschnitt.dokument)}
+        for r in result.keys():
+            for s in result[r].keys():
+                result["all"][s] = set(result[r][s])
         result["geltungsbereich"]={}
         geltungsbereich=set(list([x.geltungsbereich for x in Geltungsbereich.objects.filter(inhalt__contains=suchbegriff)]))
         for s in geltungsbereich:
             result["geltungsbereich"][s]=render_textabschnitte(s.geltungsbereich_set.order_by("order"))
-        for r in result.keys():
+        pprint.pp (result)
-            for s in result[r].keys():
-                result["all"][s] = set(result[r][s])
-        print (result)
         return render(request,"results.html",{"suchbegriff":suchbegriff,"resultat":result})