| {% trans 'Checked' %} |
- {% if intervention.checked_on is None %}
+ {% if intervention.checked is None %}
{% fa5_icon 'star' 'far' %}
{% else %}
-
+
{% fa5_icon 'star' %}
{% endif %}
@@ -107,12 +107,12 @@
| {% trans 'Recorded' %} |
- {% if intervention.recorded_on is None %}
+ {% if intervention.recorded is None %}
{% fa5_icon 'bookmark' 'far' %}
{% else %}
-
+
{% fa5_icon 'bookmark' %}
{% endif %}
@@ -120,11 +120,11 @@
|
| {% trans 'Registration date' %} |
- {{intervention.registration_date|default_if_none:""}} |
+ {{intervention.legal.registration_date|default_if_none:""}} |
| {% trans 'Binding on' %} |
- {{intervention.binding_on|default_if_none:""}} |
+ {{intervention.legal.binding_on|default_if_none:""}} |
| {% trans 'Last modified' %} |
diff --git a/konova/admin.py b/konova/admin.py
index 6fc31b76..e53a7fa3 100644
--- a/konova/admin.py
+++ b/konova/admin.py
@@ -7,7 +7,7 @@ Created on: 22.07.21
"""
from django.contrib import admin
-from konova.models import Geometry, Document
+from konova.models import Geometry, Document, Deadline
class GeometryAdmin(admin.ModelAdmin):
@@ -28,5 +28,15 @@ class DocumentAdmin(admin.ModelAdmin):
]
+class DeadlineAdmin(admin.ModelAdmin):
+ list_display = [
+ "id",
+ "type",
+ "date",
+ "comment",
+ ]
+
+
admin.site.register(Geometry, GeometryAdmin)
admin.site.register(Document, DocumentAdmin)
+admin.site.register(Deadline, DeadlineAdmin)
diff --git a/konova/enums.py b/konova/enums.py
index cabb9788..f2209350 100644
--- a/konova/enums.py
+++ b/konova/enums.py
@@ -47,3 +47,17 @@ class ServerMessageImportance(BaseEnum):
DEFAULT = "DEFAULT"
INFO = "INFO"
WARNING = "WARNING"
+
+
+class UserActionLogEntryEnum(BaseEnum):
+ """
+ Defines different possible user actions for UserActionLogEntry
+ """
+ CHECKED = "Checked"
+ RECORDED = "Recorded"
+
+
+class DeadlineTypeEnum(BaseEnum):
+ MAINTAIN = "Maintain"
+ CONTROL = "Control"
+ OTHER = "Other"
\ No newline at end of file
diff --git a/konova/models.py b/konova/models.py
index 0d4d79a7..e47764f7 100644
--- a/konova/models.py
+++ b/konova/models.py
@@ -12,17 +12,27 @@ from django.contrib.auth.models import User
from django.contrib.gis.db.models import MultiPolygonField
from django.db import models
+from konova.enums import DeadlineTypeEnum
from konova.settings import DEFAULT_SRID
-class BaseResource(models.Model):
+class UuidModel(models.Model):
"""
- A basic resource model, which defines attributes for every derived model
+ Encapsules identifying via uuid
"""
id = models.UUIDField(
primary_key=True,
default=uuid.uuid4,
)
+
+ class Meta:
+ abstract = True
+
+
+class BaseResource(UuidModel):
+ """
+ A basic resource model, which defines attributes for every derived model
+ """
created_on = models.DateTimeField(auto_now_add=True, null=True)
created_by = models.ForeignKey(User, null=True, on_delete=models.SET_NULL, related_name="+")
@@ -50,8 +60,9 @@ class Deadline(BaseResource):
"""
Defines a deadline, which can be used to define dates with a semantic meaning
"""
- type = models.CharField(max_length=500, null=True, blank=True)
+ type = models.CharField(max_length=255, null=True, blank=True, choices=DeadlineTypeEnum.as_choices(drop_empty_choice=True))
date = models.DateField(null=True, blank=True)
+ comment = models.CharField(max_length=1000, null=True, blank=True)
def __str__(self):
return self.type
diff --git a/konova/views.py b/konova/views.py
index df11a1e0..e857d092 100644
--- a/konova/views.py
+++ b/konova/views.py
@@ -78,7 +78,7 @@ def home_view(request: HttpRequest):
next_version=None,
)
user_comps = comps.filter(
- users__in=[user]
+ intervention__users__in=[user]
)
eco_accs = EcoAccount.objects.filter(
deleted_on=None,
diff --git a/user/admin.py b/user/admin.py
index fb8a5d68..9a633e77 100644
--- a/user/admin.py
+++ b/user/admin.py
@@ -1,6 +1,6 @@
from django.contrib import admin
-from user.models import UserNotification, KonovaUserExtension
+from user.models import UserNotification, KonovaUserExtension, UserActionLogEntry
class UserNotificationAdmin(admin.ModelAdmin):
@@ -17,5 +17,15 @@ class KonovaUserExtensionAdmin(admin.ModelAdmin):
]
+class UserActionLogEntryAdmin(admin.ModelAdmin):
+ list_display = [
+ "id",
+ "user",
+ "timestamp",
+ "action",
+ ]
+
+
admin.site.register(UserNotification, UserNotificationAdmin)
admin.site.register(KonovaUserExtension, KonovaUserExtensionAdmin)
+admin.site.register(UserActionLogEntry, UserActionLogEntryAdmin)
\ No newline at end of file
diff --git a/user/models.py b/user/models.py
index 428b4f5b..588bf2f1 100644
--- a/user/models.py
+++ b/user/models.py
@@ -1,6 +1,9 @@
+import uuid
+
from django.contrib.auth.models import User
from django.db import models
+from konova.enums import UserActionLogEntryEnum
from user.enums import UserNotificationEnum
@@ -36,3 +39,27 @@ class KonovaUserExtension(models.Model):
"""
user = models.OneToOneField(User, on_delete=models.CASCADE)
notifications = models.ManyToManyField(UserNotification, related_name="+")
+
+
+class UserActionLogEntry(models.Model):
+ """ Wraps a user action log entry
+
+ Can be used for workflow related attributes like checking or recording.
+
+ """
+ id = models.UUIDField(
+ primary_key=True,
+ default=uuid.uuid4,
+ )
+ user = models.ForeignKey(User, related_name='+', on_delete=models.CASCADE, help_text="Performing user")
+ timestamp = models.DateTimeField(auto_now_add=True, help_text="Timestamp of performed action")
+ action = models.CharField(
+ max_length=255,
+ null=True,
+ blank=True,
+ help_text="Short name for performed action - optional",
+ choices=UserActionLogEntryEnum.as_choices(drop_empty_choice=True),
+ )
+
+ def __str__(self):
+ return "{} | {} | {}".format(self.user.username, self.timestamp, self.action)
\ No newline at end of file
|