diff --git a/ema/templates/ema/detail/view.html b/ema/templates/ema/detail/view.html index 9ffce728..640711b2 100644 --- a/ema/templates/ema/detail/view.html +++ b/ema/templates/ema/detail/view.html @@ -50,6 +50,19 @@ {% trans 'Intervention handler' %} {{obj.responsible.handler|default_if_none:""}} + + {% trans 'Funded by' %} + + {% for funding in obj.fundings.all %} +
+ {{ funding.short_name}} +
+
+ {% empty %} + {% trans 'None' %} + {% endfor %} + + {% trans 'Last modified' %} diff --git a/intervention/admin.py b/intervention/admin.py index cf49bc39..de11ee27 100644 --- a/intervention/admin.py +++ b/intervention/admin.py @@ -31,7 +31,6 @@ class LegalAdmin(admin.ModelAdmin): list_display = [ "id", "process_type", - "law", "registration_date", "binding_date", ] diff --git a/intervention/models.py b/intervention/models.py index f4a7e739..3a8f7ac3 100644 --- a/intervention/models.py +++ b/intervention/models.py @@ -136,6 +136,7 @@ class RevocationDocument(AbstractDocument): # Folder seems to be missing already pass + class LegalData(UuidModel): """ Holds intervention legal data such as important dates, laws or responsible handler @@ -158,11 +159,9 @@ class LegalData(UuidModel): "is_archived": False, } ) - law = models.ForeignKey( + laws = models.ManyToManyField( KonovaCode, - on_delete=models.SET_NULL, null=True, - related_name="+", blank=True, limit_choices_to={ "code_lists__in": [CODELIST_LAW_ID], @@ -173,13 +172,6 @@ class LegalData(UuidModel): revocation = models.OneToOneField(Revocation, null=True, blank=True, help_text="Refers to 'Widerspruch am'", on_delete=models.SET_NULL) - def __str__(self): - return "{} | {} | {}".format( - self.process_type, - self.law, - self.id - ) - class Intervention(BaseObject): """ diff --git a/intervention/templates/intervention/detail/view.html b/intervention/templates/intervention/detail/view.html index ee0acc4e..a279013a 100644 --- a/intervention/templates/intervention/detail/view.html +++ b/intervention/templates/intervention/detail/view.html @@ -34,9 +34,14 @@ {% trans 'Process type' %} {{intervention.legal.process_type|default_if_none:""}} - + {% trans 'Law' %} - {{intervention.legal.law|default_if_none:""}} + + {% for law in intervention.legal.laws.all %} +
{{law.short_name}} - {{law.long_name}}
+
+ {% endfor %} + {% trans 'Registration office' %}