Refactoring to konova

intervention/admin.py

@@ -7,11 +7,11 @@ class InterventionAdmin(admin.ModelAdmin):
     list_display = [
         "id",
         "title",
-        "type",
+        "process_type",
         "handler",
-        "created_on",
         "is_active",
-        "is_deleted",
+        "created_on",
+        "deleted_on",
     ]
 
 

intervention/models.py

@@ -10,10 +10,9 @@ from django.contrib.gis.db import models
 from django.utils.timezone import now
 
 from intervention.settings import INTERVENTION_IDENTIFIER_LENGTH, INTERVENTION_IDENTIFIER_TEMPLATE
-from konova.models import BaseObject
+from konova.models import BaseObject, Geometry
 from konova.utils.generators import generate_random_string
-from organisation.enums import RoleTypeEnum
-from process.models import Process
+from organisation.models import Organisation
 
 
 class Intervention(BaseObject):
@@ -22,21 +21,30 @@ class Intervention(BaseObject):
 
     A process consists of exactly one intervention and one or more compensation
     """
-    type = models.CharField(max_length=500, null=True, blank=True)
+    registration_office = models.ForeignKey(Organisation, on_delete=models.SET_NULL, null=True)
+    registration_file_number = models.CharField(max_length=1000, blank=True, null=True)
+    registration_date = models.DateTimeField(null=True, blank=True)
+
+    conservation_office = models.ForeignKey(Organisation, on_delete=models.SET_NULL, null=True)
+    conservations_file_number = models.CharField(max_length=1000, blank=True, null=True)
+
+    process_type = models.CharField(max_length=500, null=True, blank=True)
     law = models.CharField(max_length=500, null=True, blank=True)
     handler = models.CharField(max_length=500, null=True, blank=True)
-    data_provider = models.ForeignKey("organisation.Organisation", on_delete=models.SET_NULL, null=True, blank=True)
-    data_provider_detail = models.CharField(max_length=500, null=True, blank=True)
-    geometry = models.MultiPolygonField(null=True, blank=True)
-    process = models.OneToOneField("process.Process", on_delete=models.CASCADE, null=True, blank=True, related_name="intervention")
+    geometry = models.ForeignKey(Geometry, null=True, blank=True, on_delete=models.SET_NULL)
     documents = models.ManyToManyField("konova.Document", blank=True)
 
+    # Refers to "verzeichnen"
+    recorded_on = models.DateTimeField(default=None)
+    recorded_by = models.ForeignKey(User, null=True, blank=True, on_delete=models.SET_NULL)
+
+    # Holds which intervention is simply a newer version of this dataset
+    next_version = models.ForeignKey("Intervention", null=True, on_delete=models.DO_NOTHING)
+
     def __str__(self):
         return "{} by {}".format(self.type, self.handler)
 
     def delete(self, *args, **kwargs):
-        if self.process is not None:
-            self.process.delete()
         super().delete(*args, **kwargs)
 
     @staticmethod
@@ -62,30 +70,4 @@ class Intervention(BaseObject):
             while Intervention.objects.filter(identifier=new_id).exists():
                 new_id = self.__generate_new_identifier()
             self.identifier = new_id
-        super().save(*args, **kwargs)
-
-    @staticmethod
-    def get_role_objects(user: User, order_by: str = "-created_on") -> list:
-        """ Returns objects depending on the currently selected role of the user
-
-            * REGISTRATIONOFFICE
-                * User can see the processes where registration_office is set to the organisation of the currently selected role
-                * User can see self-created processes
-            * LICENSINGOFFICE
-                * same
-            * DATAPROVIDER
-                * User can see only self-created processes
-
-        Args:
-            user (User): The performing user
-            order_by (str): Order by which Process attribute
-
-        Returns:
-
-        """
-        role = user.current_role
-        if role is None:
-            return Intervention.objects.none()
-        processes = Process.get_role_objects(user, order_by)
-        interventions = [process.intervention for process in processes]
-        return interventions
+        super().save(*args, **kwargs)

intervention/views.py

@@ -15,7 +15,7 @@ from process.models import Process
 
 
 @login_required
-@resolve_user_role
+
 def index_view(request: HttpRequest):
     """
     Renders the index view for process
@@ -28,7 +28,7 @@ def index_view(request: HttpRequest):
     """
     template = "generic_index.html"
     user = request.user
-    interventions = Intervention.get_role_objects(user)
+    interventions = Intervention # ToDo
     table = InterventionTable(
         request=request,
         queryset=interventions