Some changes after code review; Deploying to Development
Some checks failed
SonarQube Scan / SonarQube Trigger (push) Has been cancelled
Build containers when image tags change / build-if-image-changed (., web, containers, main container, git.baumann.gr/adebaumann/vui) (push) Successful in 5s
Build containers when image tags change / build-if-image-changed (data-loader, loader, initContainers, init-container, git.baumann.gr/adebaumann/vui-data-loader) (push) Successful in 5s
SonarQube Scan / SonarQube Trigger (pull_request) Failing after 10s

This commit is contained in:
2026-01-20 10:17:29 +01:00
parent 18fac6e8b9
commit 996584ef68
12 changed files with 65 additions and 9 deletions

3
.gitignore vendored
View File

@@ -16,4 +16,5 @@ AGENT*.md
# Diagram cache directory # Diagram cache directory
media/diagram_cache/ media/diagram_cache/
.env .env
data/db.sqlite3 data/
dataremote/

View File

@@ -138,7 +138,7 @@ AUTH_PASSWORD_VALIDATORS = [
LANGUAGE_CODE = 'de-ch' LANGUAGE_CODE = 'de-ch'
TIME_ZONE = 'UTC' TIME_ZONE = 'Europe/Zurich'
USE_I18N = True USE_I18N = True

View File

@@ -25,7 +25,7 @@ spec:
mountPath: /data mountPath: /data
containers: containers:
- name: web - name: web
image: git.baumann.gr/adebaumann/vui:0.982 image: git.baumann.gr/adebaumann/vui:0.983
imagePullPolicy: Always imagePullPolicy: Always
securityContext: securityContext:
runAsUser: 99 runAsUser: 99

View File

@@ -12,7 +12,7 @@ class Dokumententyp(models.Model):
verantwortliche_ve = models.CharField(max_length=255) verantwortliche_ve = models.CharField(max_length=255)
def __str__(self): def __str__(self):
return self.name return str(self.name)
class Meta: class Meta:
verbose_name="Dokumententyp" verbose_name="Dokumententyp"
@@ -28,6 +28,7 @@ class Person(models.Model):
class Meta: class Meta:
verbose_name_plural="Personen" verbose_name_plural="Personen"
ordering = ['name'] ordering = ['name']
verbose_name="Person"
class Thema(models.Model): class Thema(models.Model):
name = models.CharField(max_length=100, primary_key=True) name = models.CharField(max_length=100, primary_key=True)
@@ -37,7 +38,7 @@ class Thema(models.Model):
return self.name return self.name
class Meta: class Meta:
verbose_name_plural="Themen" verbose_name_plural="Themen"
verbose_name="Thema"
class Dokument(models.Model): class Dokument(models.Model):
nummer = models.CharField(max_length=50, primary_key=True) nummer = models.CharField(max_length=50, primary_key=True)
@@ -49,7 +50,7 @@ class Dokument(models.Model):
gueltigkeit_bis = models.DateField(null=True, blank=True) gueltigkeit_bis = models.DateField(null=True, blank=True)
signatur_cso = models.CharField(max_length=255, blank=True) signatur_cso = models.CharField(max_length=255, blank=True)
anhaenge = models.TextField(blank=True) anhaenge = models.TextField(blank=True)
aktiv = models.BooleanField(blank=True) aktiv = models.BooleanField(blank=True,default=False)
def __str__(self): def __str__(self):
return f"{self.nummer} {self.name}" return f"{self.nummer} {self.name}"

View File

@@ -219,7 +219,7 @@
</p> </p>
</div> </div>
<div class="col-sm-6 text-right"> <div class="col-sm-6 text-right">
<p class="text-muted">Version {{ version|default:"0.980" }}</p> <p class="text-muted">Version {{ version|default:"0.983" }}</p>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -0,0 +1,17 @@
# Generated by Django 6.0.1 on 2026-01-20 08:57
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('referenzen', '0003_alter_referenzerklaerung_options'),
]
operations = [
migrations.AlterModelOptions(
name='referenz',
options={'verbose_name': 'Referenz', 'verbose_name_plural': 'Referenzen'},
),
]

View File

@@ -25,6 +25,7 @@ class Referenz(MPTTModel):
class Meta: class Meta:
verbose_name_plural="Referenzen" verbose_name_plural="Referenzen"
verbose_name="Referenz"
class Referenzerklaerung (Textabschnitt): class Referenzerklaerung (Textabschnitt):
erklaerung = models.ForeignKey(Referenz,on_delete=models.CASCADE) erklaerung = models.ForeignKey(Referenz,on_delete=models.CASCADE)

View File

@@ -9,7 +9,7 @@ def tree(request):
def detail(request, refid): def detail(request, refid):
referenz_item = Referenz.objects.get(id=refid) referenz_item = Referenz.objects.get_object_or_404(id=refid)
referenz_item.erklaerung = render_textabschnitte(referenz_item.referenzerklaerung_set.order_by("order")) referenz_item.erklaerung = render_textabschnitte(referenz_item.referenzerklaerung_set.order_by("order"))
referenz_item.children = list(referenz_item.get_descendants(include_self=True)) referenz_item.children = list(referenz_item.get_descendants(include_self=True))
for child in referenz_item.children: for child in referenz_item.children:

View File

@@ -0,0 +1,17 @@
# Generated by Django 6.0.1 on 2026-01-20 08:57
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('rollen', '0001_initial'),
]
operations = [
migrations.AlterModelOptions(
name='rolle',
options={'verbose_name': 'Rolle (für Relevanz)', 'verbose_name_plural': 'Rolleni (für Relevanz)'},
),
]

View File

@@ -9,9 +9,10 @@ class Rolle(models.Model):
return self.name return self.name
class Meta: class Meta:
verbose_name_plural="Rollen" verbose_name_plural="Rollen"
verbose_name="Rolle"
class RollenBeschreibung(Textabschnitt): class RollenBeschreibung(Textabschnitt):
abschnitt=models.ForeignKey(Rolle,on_delete=models.CASCADE) abschnitt=models.ForeignKey(Rolle,on_delete=models.CASCADE)
class Meta: class Meta:
verbose_name_plural="Rollenbeschreibung" verbose_name_plural="Rollenbeschreibung"
verbose_name="Rollenbeschreibungs-Abschnitt" verbose_name="Rollenbeschreibungs-Abschnitt"

View File

@@ -0,0 +1,17 @@
# Generated by Django 6.0.1 on 2026-01-20 08:57
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('stichworte', '0003_alter_stichworterklaerung_options'),
]
operations = [
migrations.AlterModelOptions(
name='stichwort',
options={'verbose_name': 'Stichwort', 'verbose_name_plural': 'Stichworte'},
),
]

View File

@@ -9,6 +9,7 @@ class Stichwort(models.Model):
class Meta: class Meta:
verbose_name_plural="Stichworte" verbose_name_plural="Stichworte"
verbose_name = "Stichwort"
class Stichworterklaerung (Textabschnitt): class Stichworterklaerung (Textabschnitt):
erklaerung = models.ForeignKey(Stichwort,on_delete=models.CASCADE) erklaerung = models.ForeignKey(Stichwort,on_delete=models.CASCADE)