diff --git a/analysis/settings.py b/analysis/settings.py index 74978d1..7eb022d 100644 --- a/analysis/settings.py +++ b/analysis/settings.py @@ -9,4 +9,4 @@ Created on: 19.10.21 # Defines the date of the legal publishing of the LKompVzVo from django.utils import timezone -LKOMPVZVO_PUBLISH_DATE = timezone.make_aware(timezone.datetime.fromisoformat("2018-06-16")) +LKOMPVZVO_PUBLISH_DATE = timezone.make_aware(timezone.datetime.fromisoformat("2018-06-16")).date() diff --git a/intervention/models/intervention.py b/intervention/models/intervention.py index 95491f2..fc8011c 100644 --- a/intervention/models/intervention.py +++ b/intervention/models/intervention.py @@ -13,6 +13,7 @@ from django.db.models.fields.files import FieldFile from django.urls import reverse from django.utils import timezone +from analysis.settings import LKOMPVZVO_PUBLISH_DATE from intervention.tasks import celery_export_to_egon from user.models import User from django.db import models, transaction @@ -325,13 +326,14 @@ class Intervention(BaseObject, """ now_date = timezone.now().date() binding_date = self.legal.binding_date + is_old_entry = binding_date < LKOMPVZVO_PUBLISH_DATE is_binding_date_ready = binding_date is not None and binding_date <= now_date is_recorded = self.recorded is not None is_free_of_revocations = not self.legal.revocations.exists() is_ready = is_binding_date_ready \ and is_recorded \ and is_free_of_revocations - return is_ready + return is_ready or is_old_entry def get_share_link(self): """ Returns the share url for the object diff --git a/intervention/views/report.py b/intervention/views/report.py index 663c293..3773495 100644 --- a/intervention/views/report.py +++ b/intervention/views/report.py @@ -17,7 +17,7 @@ from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER from konova.utils.generators import generate_qr_code -def report_view(request:HttpRequest, id: str): +def report_view(request: HttpRequest, id: str): """ Renders the public report view Args: