Merge pull request '121_Deferred_parcel_loading' (#128) from 121_Deferred_parcel_loading into master

Reviewed-on: SGD-Nord/konova#128

analysis/templates/analysis/reports/detail.html

@@ -3,11 +3,11 @@
 
 {% block body %}
     <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <h3>{% trans 'Evaluation report' %} {{office.long_name}}</h3>
             <h5>{% trans 'From' %} {{report.date_from.date}} {% trans 'to' %} {{report.date_to.date}}</h5>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <div class="d-flex justify-content-end">
                 <div class="dropdown">
                     <div class="btn btn" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">

api/tests/v1/create/test_api_create.py

@@ -109,8 +109,8 @@ class APIV1CreateTestCase(BaseAPIV1TestCase):
         Returns:
 
         """
-        self.intervention.share_with(self.superuser)
-        self.eco_account.share_with(self.superuser)
+        self.intervention.share_with_user(self.superuser)
+        self.eco_account.share_with_user(self.superuser)
 
         url = reverse("api:v1:deduction")
         json_file_path = "api/tests/v1/create/deduction_create_post_body.json"

api/tests/v1/delete/test_api_delete.py

@@ -57,7 +57,7 @@ class APIV1DeleteTestCase(BaseAPIV1TestCase):
 
         """
         test_intervention = self.create_dummy_intervention()
-        test_intervention.share_with(self.superuser)
+        test_intervention.share_with_user(self.superuser)
         url = reverse("api:v1:intervention", args=(str(test_intervention.id),))
         self._test_delete_object(test_intervention, url)
 
@@ -68,7 +68,7 @@ class APIV1DeleteTestCase(BaseAPIV1TestCase):
 
         """
         test_comp = self.create_dummy_compensation()
-        test_comp.share_with(self.superuser)
+        test_comp.share_with_user(self.superuser)
         url = reverse("api:v1:compensation", args=(str(test_comp.id),))
         self._test_delete_object(test_comp, url)
 
@@ -79,7 +79,7 @@ class APIV1DeleteTestCase(BaseAPIV1TestCase):
 
         """
         test_acc = self.create_dummy_eco_account()
-        test_acc.share_with(self.superuser)
+        test_acc.share_with_user(self.superuser)
         url = reverse("api:v1:ecoaccount", args=(str(test_acc.id),))
         self._test_delete_object(test_acc, url)
 
@@ -90,7 +90,7 @@ class APIV1DeleteTestCase(BaseAPIV1TestCase):
 
         """
         test_ema = self.create_dummy_ema()
-        test_ema.share_with(self.superuser)
+        test_ema.share_with_user(self.superuser)
         url = reverse("api:v1:ema", args=(str(test_ema.id),))
         self._test_delete_object(test_ema, url)
 
@@ -101,7 +101,7 @@ class APIV1DeleteTestCase(BaseAPIV1TestCase):
 
         """
         test_deduction = self.create_dummy_deduction()
-        test_deduction.intervention.share_with(self.superuser)
+        test_deduction.intervention.share_with_user(self.superuser)
         url = reverse("api:v1:deduction", args=(str(test_deduction.id),))
 
         response = self._run_delete_request(url)

api/tests/v1/get/test_api_get.py

@@ -36,7 +36,12 @@ class APIV1GetTestCase(BaseAPIV1TestCase):
         """
         response = self._run_get_request(url)
         content = json.loads(response.content)
-        geojson = content[str(obj.id)]
+        self.assertIn("rpp", content)
+        self.assertIn("p", content)
+        self.assertIn("next", content)
+        self.assertIn("results", content)
+        paginated_content = content["results"]
+        geojson = paginated_content[str(obj.id)]
         self.assertEqual(response.status_code, 200, msg=response.content)
         return geojson
 
@@ -59,7 +64,7 @@ class APIV1GetTestCase(BaseAPIV1TestCase):
         Returns:
 
         """
-        self.intervention.share_with(self.superuser)
+        self.intervention.share_with_user(self.superuser)
         url = reverse("api:v1:intervention", args=(str(self.intervention.id),))
         geojson = self._test_get_object(self.intervention, url)
         self._assert_geojson_format(geojson)
@@ -80,13 +85,33 @@ class APIV1GetTestCase(BaseAPIV1TestCase):
         except KeyError as e:
             self.fail(e)
 
+    def test_get_shared(self):
+        """ Tests api GET on shared info of the intervention
+
+        Returns:
+
+        """
+        self.intervention.share_with_user(self.superuser)
+        self.intervention.share_with_team(self.team)
+        url = reverse("api:v1:intervention-share", args=(str(self.intervention.id),))
+        response = self._run_get_request(url)
+        content = json.loads(response.content)
+        self.assertIn("users", content)
+        self.assertIn(self.superuser.username, content["users"])
+        self.assertEqual(1, len(content["users"]))
+        self.assertIn("teams", content)
+        self.assertEqual(1, len(content["teams"]))
+        for team in content["teams"]:
+            self.assertEqual(team["id"], str(self.team.id))
+            self.assertEqual(team["name"], self.team.name)
+
     def test_get_compensation(self):
         """ Tests api GET
 
         Returns:
 
         """
-        self.intervention.share_with(self.superuser)
+        self.intervention.share_with_user(self.superuser)
         self.compensation.intervention = self.intervention
         self.compensation.save()
 
@@ -114,7 +139,7 @@ class APIV1GetTestCase(BaseAPIV1TestCase):
         Returns:
 
         """
-        self.eco_account.share_with(self.superuser)
+        self.eco_account.share_with_user(self.superuser)
 
         url = reverse("api:v1:ecoaccount", args=(str(self.eco_account.id),))
         geojson = self._test_get_object(self.eco_account, url)
@@ -143,7 +168,7 @@ class APIV1GetTestCase(BaseAPIV1TestCase):
         Returns:
 
         """
-        self.ema.share_with(self.superuser)
+        self.ema.share_with_user(self.superuser)
 
         url = reverse("api:v1:ema", args=(str(self.ema.id),))
         geojson = self._test_get_object(self.ema, url)
@@ -167,7 +192,7 @@ class APIV1GetTestCase(BaseAPIV1TestCase):
         Returns:
 
         """
-        self.deduction.intervention.share_with(self.superuser)
+        self.deduction.intervention.share_with_user(self.superuser)
 
         url = reverse("api:v1:deduction", args=(str(self.deduction.id),))
         _json = self._test_get_object(self.deduction, url)

api/tests/v1/share/test_api_sharing.py

@@ -12,15 +12,17 @@ class BaseAPIV1TestCase(BaseTestCase):
     def setUpTestData(cls):
         super().setUpTestData()
 
-        cls.superuser.get_API_token()
-        cls.superuser.api_token.is_active = True
-        cls.superuser.api_token.save()
-        default_group = cls.groups.get(name=DEFAULT_GROUP)
-        cls.superuser.groups.add(default_group)
+    def setUp(self) -> None:
+        super().setUp()
+        self.superuser.get_API_token()
+        self.superuser.api_token.is_active = True
+        self.superuser.api_token.save()
+        default_group = self.groups.get(name=DEFAULT_GROUP)
+        self.superuser.groups.add(default_group)
 
-        cls.header_data = {
-            "HTTP_ksptoken": cls.superuser.api_token.token,
-            "HTTP_kspuser": cls.superuser.username,
+        self.header_data = {
+            "HTTP_ksptoken": self.superuser.api_token.token,
+            "HTTP_kspuser": self.superuser.username,
         }
 
 

api/tests/v1/update/intervention_share_update_put_body.json

@@ -0,0 +1,8 @@
+{
+    "users": [
+        "CHANGE_ME"
+    ],
+    "teams": [
+        "CHANGE_ME"
+    ]
+}

api/tests/v1/update/test_api_update.py

@@ -52,7 +52,7 @@ class APIV1UpdateTestCase(BaseAPIV1TestCase):
         Returns:
 
         """
-        self.intervention.share_with(self.superuser)
+        self.intervention.share_with_user(self.superuser)
         modified_on = self.intervention.modified
         url = reverse("api:v1:intervention", args=(str(self.intervention.id),))
         json_file_path = "api/tests/v1/update/intervention_update_put_body.json"
@@ -79,7 +79,7 @@ class APIV1UpdateTestCase(BaseAPIV1TestCase):
         """
         self.compensation.intervention = self.intervention
         self.compensation.save()
-        self.intervention.share_with(self.superuser)
+        self.intervention.share_with_user(self.superuser)
 
         modified_on = self.compensation.modified
         url = reverse("api:v1:compensation", args=(str(self.compensation.id),))
@@ -108,7 +108,7 @@ class APIV1UpdateTestCase(BaseAPIV1TestCase):
         Returns:
 
         """
-        self.eco_account.share_with(self.superuser)
+        self.eco_account.share_with_user(self.superuser)
 
         modified_on = self.eco_account.modified
         url = reverse("api:v1:ecoaccount", args=(str(self.eco_account.id),))
@@ -139,7 +139,7 @@ class APIV1UpdateTestCase(BaseAPIV1TestCase):
         Returns:
 
         """
-        self.ema.share_with(self.superuser)
+        self.ema.share_with_user(self.superuser)
 
         modified_on = self.ema.modified
         url = reverse("api:v1:ema", args=(str(self.ema.id),))
@@ -168,8 +168,8 @@ class APIV1UpdateTestCase(BaseAPIV1TestCase):
         Returns:
 
         """
-        self.deduction.intervention.share_with(self.superuser)
-        self.deduction.account.share_with(self.superuser)
+        self.deduction.intervention.share_with_user(self.superuser)
+        self.deduction.account.share_with_user(self.superuser)
 
         url = reverse("api:v1:deduction", args=(str(self.deduction.id),))
         json_file_path = "api/tests/v1/update/deduction_update_put_body.json"
@@ -184,3 +184,24 @@ class APIV1UpdateTestCase(BaseAPIV1TestCase):
         self.assertEqual(put_body["intervention"], str(self.deduction.intervention.id))
         self.assertEqual(put_body["eco_account"], str(self.deduction.account.id))
         self.assertEqual(put_body["surface"], self.deduction.surface)
+
+    def test_update_share_intervention(self):
+        self.intervention.share_with_user(self.superuser)
+        url = reverse("api:v1:intervention-share", args=(str(self.intervention.id),))
+        json_file_path = "api/tests/v1/update/intervention_share_update_put_body.json"
+        with open(json_file_path) as json_file:
+            put_body = json.load(fp=json_file)
+            put_body["users"] = [self.user.username]
+            put_body["teams"] = [self.team.name]
+
+        self.assertFalse(self.intervention.is_shared_with(self.user))
+        self.assertEqual(0, self.intervention.shared_teams.count())
+
+        response = self._run_update_request(url, put_body)
+        self.assertEqual(response.status_code, 200, msg=response.content)
+        self.intervention.refresh_from_db()
+
+        self.assertEqual(1, self.intervention.shared_teams.count())
+        self.assertEqual(2, self.intervention.shared_users.count())
+        self.assertEqual(self.team.name, self.intervention.shared_teams.first().name)
+        self.assertTrue(self.intervention.is_shared_with(self.user))

api/utils/serializer/serializer.py

@@ -10,6 +10,7 @@ from abc import abstractmethod
 
 from django.contrib.gis import geos
 from django.contrib.gis.geos import GEOSGeometry
+from django.core.paginator import Paginator
 
 from konova.utils.message_templates import DATA_UNSHARED
 
@@ -19,6 +20,10 @@ class AbstractModelAPISerializer:
     lookup = None
     properties_data = None
 
+    rpp = None
+    page_number = None
+    paginator = None
+
     class Meta:
         abstract = True
 
@@ -80,9 +85,12 @@ class AbstractModelAPISerializer:
         Returns:
             serialized_data (dict)
         """
-        entries = self.model.objects.filter(**self.lookup)
+        entries = self.model.objects.filter(**self.lookup).order_by("id")
+        self.paginator = Paginator(entries, self.rpp)
+        requested_entries = self.paginator.page(self.page_number)
+
         serialized_data = {}
-        for entry in entries:
+        for entry in requested_entries.object_list:
             serialized_data[str(entry.id)] = self._model_to_geo_json(entry)
         return serialized_data
 

api/utils/serializer/v1/serializer.py

@@ -367,7 +367,9 @@ class AbstractCompensationAPISerializerV1Mixin:
         """
         actions = []
         for entry in actions_data:
-            action = entry["action"]
+            action_types = [
+                self._konova_code_from_json(e, CODELIST_COMPENSATION_ACTION_ID) for e in entry["action_types"]
+            ]
             action_details = [
                 self._konova_code_from_json(e, CODELIST_COMPENSATION_ACTION_DETAIL_ID) for e in entry["action_details"]
             ]
@@ -384,7 +386,7 @@ class AbstractCompensationAPISerializerV1Mixin:
             # If this exact data is already existing, we do not create it new. Instead put it's id in the list of
             # entries, we will use to set the new actions
             action_entry = obj.actions.filter(
-                action_type__atom_id=action,
+                action_type__in=action_types,
                 amount=amount,
                 unit=unit,
                 comment=comment,
@@ -396,13 +398,13 @@ class AbstractCompensationAPISerializerV1Mixin:
             else:
                 # Create and add id to list
                 action_entry = CompensationAction.objects.create(
-                    action_type=self._konova_code_from_json(action, CODELIST_COMPENSATION_ACTION_ID),
                     amount=amount,
                     unit=unit,
                     comment=comment,
                 )
                 actions.append(action_entry.id)
 
+            action_entry.action_type.set(action_types)
             action_entry.action_type_details.set(action_details)
         obj.actions.set(actions)
         return obj
@@ -438,7 +440,9 @@ class AbstractCompensationAPISerializerV1Mixin:
         """
         return [
             {
-                "action": self._konova_code_to_json(entry.action_type),
+                "action_types": [
+                    self._konova_code_to_json(action) for action in entry.action_type.all()
+                ],
                 "action_details": [
                     self._konova_code_to_json(detail) for detail in entry.action_type_details.all()
                 ],

api/views/v1/views.py

@@ -21,7 +21,6 @@ class AbstractAPIViewV1(AbstractAPIView):
     """ Holds general serialization functions for API v1
 
     """
-    serializer = None
 
     def __init__(self, *args, **kwargs):
         self.lookup = {
@@ -45,11 +44,17 @@ class AbstractAPIViewV1(AbstractAPIView):
             response (JsonResponse)
         """
         try:
+            self.rpp = int(request.GET.get("rpp", self.rpp))
+            self.page_number = int(request.GET.get("p", self.page_number))
+
+            self.serializer.rpp = self.rpp
+            self.serializer.page_number = self.page_number
+
             self.serializer.prepare_lookup(id, self.user)
             data = self.serializer.fetch_and_serialize()
         except Exception as e:
-            return self.return_error_response(e, 500)
-        return JsonResponse(data)
+            return self._return_error_response(e, 500)
+        return self._return_response(request, data)
 
     def post(self, request: HttpRequest):
         """ Handles the POST request
@@ -67,7 +72,7 @@ class AbstractAPIViewV1(AbstractAPIView):
             body = json.loads(body)
             created_id = self.serializer.create_model_from_json(body, self.user)
         except Exception as e:
-            return self.return_error_response(e, 500)
+            return self._return_error_response(e, 500)
         return JsonResponse({"id": created_id})
 
     def put(self, request: HttpRequest, id=None):
@@ -87,7 +92,7 @@ class AbstractAPIViewV1(AbstractAPIView):
             body = json.loads(body)
             updated_id = self.serializer.update_model_from_json(id, body, self.user)
         except Exception as e:
-            return self.return_error_response(e, 500)
+            return self._return_error_response(e, 500)
         return JsonResponse({"id": updated_id})
 
     def delete(self, request: HttpRequest, id=None):
@@ -104,7 +109,7 @@ class AbstractAPIViewV1(AbstractAPIView):
         try:
             success = self.serializer.delete_entry(id, self.user)
         except Exception as e:
-            return self.return_error_response(e, 500)
+            return self._return_error_response(e, 500)
         return JsonResponse(
             {
                 "success": success,

api/views/views.py

@@ -19,7 +19,7 @@ from ema.models import Ema
 from intervention.models import Intervention
 from konova.utils.message_templates import DATA_UNSHARED
 from konova.utils.user_checks import is_default_group_only
-from user.models import User
+from user.models import User, Team
 
 
 class AbstractAPIView(View):
@@ -31,10 +31,22 @@ class AbstractAPIView(View):
 
     """
     user = None
+    serializer = None
+    rpp = 5  # Results per page default
+    page_number = 1  # Page number default
 
     class Meta:
         abstract = True
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.response_body_base = {
+            "rpp": None,
+            "p": None,
+            "next": None,
+            "results": None
+        }
+
     @csrf_exempt
     def dispatch(self, request, *args, **kwargs):
         try:
@@ -42,13 +54,14 @@ class AbstractAPIView(View):
             ksp_token = request.headers.get(KSP_TOKEN_HEADER_IDENTIFIER, None)
             ksp_user = request.headers.get(KSP_USER_HEADER_IDENTIFIER, None)
             self.user = APIUserToken.get_user_from_token(ksp_token, ksp_user)
+            request.user = self.user
             if not self.user.is_default_user():
                 raise PermissionError("Default permissions required")
         except PermissionError as e:
-            return self.return_error_response(e, 403)
+            return self._return_error_response(e, 403)
         return super().dispatch(request, *args, **kwargs)
 
-    def return_error_response(self, error, status_code=500):
+    def _return_error_response(self, error, status_code=500):
         """ Returns an error as JsonReponse
 
         Args:
@@ -68,6 +81,31 @@ class AbstractAPIView(View):
             status=status_code
         )
 
+    def _return_response(self, request: HttpRequest, data):
+        """ Returns all important data into a response object
+
+        Args:
+            request (HttpRequest): The incoming request
+            data (dict): The serialized data
+
+        Returns:
+            response (JsonResponse): The response to be returned
+        """
+        response = self.response_body_base
+        next_page = self.page_number + 1
+        next_page = next_page if next_page in self.serializer.paginator.page_range else None
+        if next_page is not None:
+            next_url = request.build_absolute_uri(
+                request.path + f"?rpp={self.rpp}&p={next_page}"
+            )
+        else:
+            next_url = None
+        response["rpp"] = self.rpp
+        response["p"] = self.page_number
+        response["next"] = next_url
+        response["results"] = data
+        return JsonResponse(response)
+
 
 class InterventionCheckAPIView(AbstractAPIView):
 
@@ -82,14 +120,14 @@ class InterventionCheckAPIView(AbstractAPIView):
             response (JsonResponse)
         """
         if not self.user.is_zb_user():
-            return self.return_error_response("Permission not granted", 403)
+            return self._return_error_response("Permission not granted", 403)
         try:
             obj = Intervention.objects.get(
                 id=id,
                 users__in=[self.user]
             )
         except Exception as e:
-            return self.return_error_response(e)
+            return self._return_error_response(e)
 
         all_valid, check_details = self.run_quality_checks(obj)
 
@@ -160,13 +198,21 @@ class AbstractModelShareAPIView(AbstractAPIView):
         """
         try:
             users = self._get_shared_users_of_object(id)
+            teams = self._get_shared_teams_of_object(id)
         except Exception as e:
-            return self.return_error_response(e)
+            return self._return_error_response(e)
 
         data = {
             "users": [
                 user.username for user in users
-            ]
+            ],
+            "teams": [
+                {
+                    "id": team.id,
+                    "name": team.name,
+                }
+                for team in teams
+            ],
         }
 
         return JsonResponse(data)
@@ -185,7 +231,7 @@ class AbstractModelShareAPIView(AbstractAPIView):
         try:
             success = self._process_put_body(request.body, id)
         except Exception as e:
-            return self.return_error_response(e)
+            return self._return_error_response(e)
         data = {
             "success": success,
         }
@@ -220,6 +266,22 @@ class AbstractModelShareAPIView(AbstractAPIView):
         users = obj.shared_users
         return users
 
+    def _get_shared_teams_of_object(self, id) -> QuerySet:
+        """ Check permissions and get the teams
+
+        Args:
+            id (str): The object's id
+
+        Returns:
+            users (QuerySet)
+        """
+        obj = self.model.objects.get(
+            id=id
+        )
+        self._check_user_has_shared_access(obj)
+        teams = obj.shared_teams
+        return teams
+
     def _process_put_body(self, body: bytes, id: str):
         """ Reads the body data, performs validity checks and sets the new users
 
@@ -233,19 +295,26 @@ class AbstractModelShareAPIView(AbstractAPIView):
         obj = self.model.objects.get(id=id)
         self._check_user_has_shared_access(obj)
 
-        new_users = json.loads(body.decode("utf-8"))
-        new_users = new_users.get("users", [])
+        content = json.loads(body.decode("utf-8"))
+        new_users = content.get("users", [])
         if len(new_users) == 0:
             raise ValueError("Shared user list must not be empty!")
+        new_teams = content.get("teams", [])
 
         # Eliminate duplicates
         new_users = list(dict.fromkeys(new_users))
+        new_teams = list(dict.fromkeys(new_teams))
 
         # Make sure each of these names exist as a user
         new_users_objs = []
         for user in new_users:
             new_users_objs.append(User.objects.get(username=user))
 
+        # Make sure each of these names exist as a user
+        new_teams_objs = []
+        for team_name in new_teams:
+            new_teams_objs.append(Team.objects.get(name=team_name))
+
         if is_default_group_only(self.user):
             # Default only users are not allowed to remove other users from having access. They can only add new ones!
             new_users_to_be_added = User.objects.filter(
@@ -254,7 +323,16 @@ class AbstractModelShareAPIView(AbstractAPIView):
                 id__in=obj.shared_users
             )
             new_users_objs = obj.shared_users.union(new_users_to_be_added)
-        obj.share_with_list(new_users_objs)
+
+            new_teams_to_be_added = Team.objects.filter(
+                name__in=new_teams
+            ).exclude(
+                id__in=obj.shared_teams
+            )
+            new_teams_objs = obj.shared_teams.union(new_teams_to_be_added)
+
+        obj.share_with_user_list(new_users_objs)
+        obj.share_with_team_list(new_teams_objs)
         return True
 
 

codelist/models.py

@@ -65,6 +65,26 @@ class KonovaCode(models.Model):
             ret_val += ", " + self.parent.long_name
         return ret_val
 
+    def add_children(self):
+        """ Adds all children (resurcively until leaf) as .children to the KonovaCode
+
+        Returns:
+            code (KonovaCode): The manipulated KonovaCode instance
+        """
+        if self.is_leaf:
+            return None
+
+        children = KonovaCode.objects.filter(
+            code_lists__in=self.code_lists.all(),
+            parent=self
+        ).order_by(
+            "long_name"
+        )
+        self.children = children
+        for child in children:
+            child.add_children()
+        return self
+
 
 class KonovaCodeList(models.Model):
     """

codelist/settings.py

@@ -13,7 +13,8 @@ CODELIST_BASE_URL = "https://codelisten.naturschutz.rlp.de/repository/referenzli
 CODELIST_INTERVENTION_HANDLER_ID = 903  # CLMassnahmeträger
 CODELIST_CONSERVATION_OFFICE_ID = 907  # CLNaturschutzbehörden
 CODELIST_REGISTRATION_OFFICE_ID = 1053  # CLZulassungsbehörden
-CODELIST_BIOTOPES_ID = 974  # CL_EIV_Biotoptypen
+CODELIST_BIOTOPES_ID = 654  # CL_Biotoptypen
+CODELIST_AFTER_STATE_BIOTOPES__ID = 974  # CL-KSP_ZielBiotoptypen - USAGE HAS BEEN DROPPED IN 2022 IN FAVOR OF 654
 CODELIST_BIOTOPES_EXTRA_CODES_ID = 975  # CLZusatzbezeichnung
 CODELIST_LAW_ID = 1048  # CLVerfahrensrecht
 CODELIST_PROCESS_TYPE_ID = 44382  # CLVerfahrenstyp

compensation/admin.py

@@ -3,6 +3,8 @@ from django.contrib import admin
 from compensation.models import Compensation, CompensationAction, CompensationState, Payment, \
     EcoAccountDeduction, EcoAccount
 from konova.admin import BaseObjectAdmin, BaseResourceAdmin
+from konova.utils.message_templates import COMPENSATION_REMOVED_TEMPLATE
+from user.models import UserAction
 
 
 class AbstractCompensationAdmin(BaseObjectAdmin):
@@ -42,6 +44,17 @@ class CompensationAdmin(AbstractCompensationAdmin):
             "intervention",
         ]
 
+    def restore_deleted_data(self, request, queryset):
+        super().restore_deleted_data(request, queryset)
+
+        for entry in queryset:
+            # Remove delete log entry from related intervention log history
+            logs = entry.intervention.log.filter(
+                action=UserAction.EDITED,
+                comment=COMPENSATION_REMOVED_TEMPLATE.format(entry.identifier)
+            )
+            logs.delete()
+
 
 class EcoAccountAdmin(AbstractCompensationAdmin):
     list_display = [

compensation/filters.py

@@ -59,8 +59,9 @@ class CheckboxCompensationTableFilter(CheckboxTableFilter):
         """
         if not value:
             return queryset.filter(
-                intervention__users__in=[self.user],  # requesting user has access
-            )
+                Q(intervention__users__in=[self.user]) |  # requesting user has access
+                Q(intervention__teams__users__in=[self.user])
+            ).distinct()
         else:
             return queryset
 
@@ -127,24 +128,6 @@ class CheckboxEcoAccountTableFilter(CheckboxTableFilter):
         )
     )
 
-    def filter_show_all(self, queryset, name, value) -> QuerySet:
-        """ Filters queryset depending on value of 'show_all' setting
-
-        Args:
-            queryset ():
-            name ():
-            value ():
-
-        Returns:
-
-        """
-        if not value:
-            return queryset.filter(
-                users__in=[self.user],  # requesting user has access
-            )
-        else:
-            return queryset
-
     def filter_only_show_unrecorded(self, queryset, name, value) -> QuerySet:
         """ Filters queryset depending on value of 'show_recorded' setting
 

compensation/forms/forms.py

@@ -18,7 +18,7 @@ from compensation.models import Compensation, EcoAccount
 from intervention.inputs import GenerateInput
 from intervention.models import Intervention, Responsibility, Legal
 from konova.forms import BaseForm, SimpleGeomForm
-from konova.utils.message_templates import EDITED_GENERAL_DATA
+from konova.utils.message_templates import EDITED_GENERAL_DATA, COMPENSATION_ADDED_TEMPLATE
 from user.models import UserActionLogEntry
 
 
@@ -200,35 +200,49 @@ class NewCompensationForm(AbstractCompensationForm, CEFCompensationFormMixin, Co
         self.initialize_form_field("identifier", identifier)
         self.fields["identifier"].widget.attrs["url"] = reverse_lazy("compensation:new-id")
 
+    def __create_comp(self, user, geom_form) -> Compensation:
+        """ Creates the compensation from form data
+
+        Args:
+            user (User): The performing user
+            geom_form (SimpleGeomForm): The geometry form
+
+        Returns:
+            comp (Compensation): The compensation object
+        """
+        # Fetch data from cleaned POST values
+        identifier = self.cleaned_data.get("identifier", None)
+        title = self.cleaned_data.get("title", None)
+        intervention = self.cleaned_data.get("intervention", None)
+        is_cef = self.cleaned_data.get("is_cef", None)
+        is_coherence_keeping = self.cleaned_data.get("is_coherence_keeping", None)
+        comment = self.cleaned_data.get("comment", None)
+
+        # Create log entry
+        action = UserActionLogEntry.get_created_action(user)
+        # Process the geometry form
+        geometry = geom_form.save(action)
+
+        # Finally create main object
+        comp = Compensation.objects.create(
+            identifier=identifier,
+            title=title,
+            intervention=intervention,
+            created=action,
+            is_cef=is_cef,
+            is_coherence_keeping=is_coherence_keeping,
+            geometry=geometry,
+            comment=comment,
+        )
+
+        # Add the log entry to the main objects log list
+        comp.log.add(action)
+        return comp
+
     def save(self, user: User, geom_form: SimpleGeomForm):
         with transaction.atomic():
-            # Fetch data from cleaned POST values
-            identifier = self.cleaned_data.get("identifier", None)
-            title = self.cleaned_data.get("title", None)
-            intervention = self.cleaned_data.get("intervention", None)
-            is_cef = self.cleaned_data.get("is_cef", None)
-            is_coherence_keeping = self.cleaned_data.get("is_coherence_keeping", None)
-            comment = self.cleaned_data.get("comment", None)
-
-            # Create log entry
-            action = UserActionLogEntry.get_created_action(user)
-            # Process the geometry form
-            geometry = geom_form.save(action)
-
-            # Finally create main object
-            comp = Compensation.objects.create(
-                identifier=identifier,
-                title=title,
-                intervention=intervention,
-                created=action,
-                is_cef=is_cef,
-                is_coherence_keeping=is_coherence_keeping,
-                geometry=geometry,
-                comment=comment,
-            )
-
-            # Add the log entry to the main objects log list
-            comp.log.add(action)
+            comp = self.__create_comp(user, geom_form)
+            comp.intervention.mark_as_edited(user, edit_comment=COMPENSATION_ADDED_TEMPLATE.format(comp.identifier))
         return comp
 
 
@@ -339,13 +353,13 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
         super().__init__(*args, **kwargs)
         self.form_title = _("New Eco-Account")
 
-        self.action_url = reverse("compensation:acc-new")
-        self.cancel_redirect = reverse("compensation:acc-index")
+        self.action_url = reverse("compensation:acc:new")
+        self.cancel_redirect = reverse("compensation:acc:index")
 
         tmp = EcoAccount()
         identifier = tmp.generate_new_identifier()
         self.initialize_form_field("identifier", identifier)
-        self.fields["identifier"].widget.attrs["url"] = reverse_lazy("compensation:acc-new-id")
+        self.fields["identifier"].widget.attrs["url"] = reverse_lazy("compensation:acc:new-id")
         self.fields["title"].widget.attrs["placeholder"] = _("Eco-Account XY; Location ABC")
 
     def save(self, user: User, geom_form: SimpleGeomForm):
@@ -386,7 +400,7 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
                 comment=comment,
                 legal=legal
             )
-            acc.share_with(user)
+            acc.share_with_user(user)
 
             # Add the log entry to the main objects log list
             acc.log.add(action)
@@ -402,8 +416,8 @@ class EditEcoAccountForm(NewEcoAccountForm):
         super().__init__(*args, **kwargs)
         self.form_title = _("Edit Eco-Account")
 
-        self.action_url = reverse("compensation:acc-edit", args=(self.instance.id,))
-        self.cancel_redirect = reverse("compensation:acc-detail", args=(self.instance.id,))
+        self.action_url = reverse("compensation:acc:edit", args=(self.instance.id,))
+        self.cancel_redirect = reverse("compensation:acc:detail", args=(self.instance.id,))
 
         # Initialize form data
         reg_date = self.instance.legal.registration_date

compensation/forms/modalForms.py

@@ -17,11 +17,12 @@ from codelist.models import KonovaCode
 from codelist.settings import CODELIST_BIOTOPES_ID, CODELIST_COMPENSATION_ACTION_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID, \
     CODELIST_COMPENSATION_ACTION_DETAIL_ID
 from compensation.models import CompensationDocument, EcoAccountDocument
+from intervention.inputs import CompensationActionTreeCheckboxSelectMultiple
 from konova.contexts import BaseContext
-from konova.forms import BaseModalForm, NewDocumentForm
+from konova.forms import BaseModalForm, NewDocumentModalForm, RemoveModalForm
 from konova.models import DeadlineType
-from konova.utils.message_templates import FORM_INVALID, ADDED_COMPENSATION_STATE, ADDED_DEADLINE, \
-    ADDED_COMPENSATION_ACTION
+from konova.utils.message_templates import FORM_INVALID, ADDED_COMPENSATION_STATE, \
+    ADDED_COMPENSATION_ACTION, PAYMENT_EDITED, COMPENSATION_STATE_EDITED, COMPENSATION_ACTION_EDITED, DEADLINE_EDITED
 
 
 class NewPaymentForm(BaseModalForm):
@@ -100,10 +101,53 @@ class NewPaymentForm(BaseModalForm):
 
     def save(self):
         pay = self.instance.add_payment(self)
-        self.instance.mark_as_edited(self.user, self.request)
         return pay
 
 
+class EditPaymentModalForm(NewPaymentForm):
+    """ Form handling edit for Payment
+
+    """
+    payment = None
+
+    def __init__(self, *args, **kwargs):
+        self.payment = kwargs.pop("payment", None)
+        super().__init__(*args, **kwargs)
+        self.form_title = _("Edit payment")
+        form_date = {
+            "amount": self.payment.amount,
+            "due": str(self.payment.due_on),
+            "comment": self.payment.comment,
+        }
+        self.load_initial_data(form_date, disabled_fields=[])
+
+    def save(self):
+        payment = self.payment
+        payment.amount = self.cleaned_data.get("amount", None)
+        payment.due_on = self.cleaned_data.get("due", None)
+        payment.comment = self.cleaned_data.get("comment", None)
+        payment.save()
+        self.instance.mark_as_edited(self.user, self.request, edit_comment=PAYMENT_EDITED)
+        return payment
+
+
+class RemovePaymentModalForm(RemoveModalForm):
+    """ Removing modal form for Payment
+
+    Can be used for anything, where removing shall be confirmed by the user a second time.
+
+    """
+    payment = None
+
+    def __init__(self, *args, **kwargs):
+        payment = kwargs.pop("payment", None)
+        self.payment = payment
+        super().__init__(*args, **kwargs)
+
+    def save(self):
+        self.instance.remove_payment(self)
+
+
 class NewStateModalForm(BaseModalForm):
     """ Form handling state related input
 
@@ -219,6 +263,64 @@ class NewStateModalForm(BaseModalForm):
             raise NotImplementedError
 
 
+class EditCompensationStateModalForm(NewStateModalForm):
+    state = None
+
+    def __init__(self, *args, **kwargs):
+        self.state = kwargs.pop("state", None)
+        super().__init__(*args, **kwargs)
+        self.form_title = _("Edit state")
+        form_data = {
+            "biotope_type": self.state.biotope_type,
+            "biotope_extra": self.state.biotope_type_details.all(),
+            "surface": self.state.surface,
+        }
+        self.load_initial_data(form_data)
+
+    def save(self, is_before_state: bool = False):
+        state = self.state
+        state.biotope_type = self.cleaned_data.get("biotope_type", None)
+        state.biotope_type_details.set(self.cleaned_data.get("biotope_extra", []))
+        state.surface = self.cleaned_data.get("surface", None)
+        state.save()
+        self.instance.mark_as_edited(self.user, self.request, edit_comment=COMPENSATION_STATE_EDITED)
+        return state
+
+
+class RemoveCompensationStateModalForm(RemoveModalForm):
+    """ Removing modal form for CompensationState
+
+    Can be used for anything, where removing shall be confirmed by the user a second time.
+
+    """
+    state = None
+
+    def __init__(self, *args, **kwargs):
+        state = kwargs.pop("state", None)
+        self.state = state
+        super().__init__(*args, **kwargs)
+
+    def save(self):
+        self.instance.remove_state(self)
+
+
+class RemoveCompensationActionModalForm(RemoveModalForm):
+    """ Removing modal form for CompensationAction
+
+    Can be used for anything, where removing shall be confirmed by the user a second time.
+
+    """
+    action = None
+
+    def __init__(self, *args, **kwargs):
+        action = kwargs.pop("action", None)
+        self.action = action
+        super().__init__(*args, **kwargs)
+
+    def save(self):
+        self.instance.remove_action(self)
+
+
 class NewDeadlineModalForm(BaseModalForm):
     """ Form handling deadline related input
 
@@ -271,7 +373,30 @@ class NewDeadlineModalForm(BaseModalForm):
 
     def save(self):
         deadline = self.instance.add_deadline(self)
-        self.instance.mark_as_edited(self.user, self.request, ADDED_DEADLINE)
+        return deadline
+
+
+class EditDeadlineModalForm(NewDeadlineModalForm):
+    deadline = None
+
+    def __init__(self, *args, **kwargs):
+        self.deadline = kwargs.pop("deadline", None)
+        super().__init__(*args, **kwargs)
+        self.form_title = _("Edit deadline")
+        form_data = {
+            "type": self.deadline.type,
+            "date": str(self.deadline.date),
+            "comment": self.deadline.comment,
+        }
+        self.load_initial_data(form_data)
+
+    def save(self):
+        deadline = self.deadline
+        deadline.type = self.cleaned_data.get("type", None)
+        deadline.date = self.cleaned_data.get("date", None)
+        deadline.comment = self.cleaned_data.get("comment", None)
+        deadline.save()
+        self.instance.mark_as_edited(self.user, self.request, edit_comment=DEADLINE_EDITED)
         return deadline
 
 
@@ -284,22 +409,13 @@ class NewActionModalForm(BaseModalForm):
 
     """
     from compensation.models import UnitChoices
-    action_type = forms.ModelChoiceField(
+    action_type = forms.MultipleChoiceField(
         label=_("Action Type"),
         label_suffix="",
         required=True,
-        help_text=_("Select the action type"),
-        queryset=KonovaCode.objects.filter(
-            is_archived=False,
-            is_leaf=True,
-            code_lists__in=[CODELIST_COMPENSATION_ACTION_ID],
-        ),
-        widget=autocomplete.ModelSelect2(
-            url="codes-compensation-action-autocomplete",
-            attrs={
-                "data-placeholder": _("Action"),
-            }
-        ),
+        help_text=_("An action can consist of multiple different action types. All the selected action types are expected to be performed according to the amount and unit below on this form."),
+        choices=[],
+        widget=CompensationActionTreeCheckboxSelectMultiple(),
     )
     action_type_details = forms.ModelMultipleChoiceField(
         label=_("Action Type detail"),
@@ -346,10 +462,9 @@ class NewActionModalForm(BaseModalForm):
     )
     comment = forms.CharField(
         required=False,
-        max_length=200,
         label=_("Comment"),
         label_suffix=_(""),
-        help_text=_("Additional comment, maximum {} letters").format(200),
+        help_text=_("Additional comment"),
         widget=forms.Textarea(
             attrs={
                 "rows": 5,
@@ -362,6 +477,16 @@ class NewActionModalForm(BaseModalForm):
         super().__init__(*args, **kwargs)
         self.form_title = _("New action")
         self.form_caption = _("Insert data for the new action")
+        choices =KonovaCode.objects.filter(
+            code_lists__in=[CODELIST_COMPENSATION_ACTION_ID],
+            is_archived=False,
+            is_leaf=True,
+        ).values_list("id", flat=True)
+        choices = [
+            (choice, choice)
+            for choice in choices
+        ]
+        self.fields["action_type"].choices = choices
 
     def save(self):
         action = self.instance.add_action(self)
@@ -369,9 +494,37 @@ class NewActionModalForm(BaseModalForm):
         return action
 
 
-class NewCompensationDocumentForm(NewDocumentForm):
+class EditCompensationActionModalForm(NewActionModalForm):
+    action = None
+
+    def __init__(self, *args, **kwargs):
+        self.action = kwargs.pop("action", None)
+        super().__init__(*args, **kwargs)
+        self.form_title = _("Edit action")
+        form_data = {
+            "action_type": list(self.action.action_type.values_list("id", flat=True)),
+            "action_type_details": self.action.action_type_details.all(),
+            "amount": self.action.amount,
+            "unit": self.action.unit,
+            "comment": self.action.comment,
+        }
+        self.load_initial_data(form_data)
+
+    def save(self):
+        action = self.action
+        action.action_type.set(self.cleaned_data.get("action_type", []))
+        action.action_type_details.set(self.cleaned_data.get("action_type_details", []))
+        action.amount = self.cleaned_data.get("amount", None)
+        action.unit = self.cleaned_data.get("unit", None)
+        action.comment = self.cleaned_data.get("comment", None)
+        action.save()
+        self.instance.mark_as_edited(self.user, self.request, edit_comment=COMPENSATION_ACTION_EDITED)
+        return action
+
+
+class NewCompensationDocumentModalForm(NewDocumentModalForm):
     document_model = CompensationDocument
 
 
-class NewEcoAccountDocumentForm(NewDocumentForm):
+class NewEcoAccountDocumentModalForm(NewDocumentModalForm):
     document_model = EcoAccountDocument

compensation/managers.py

@@ -8,17 +8,6 @@ Created on: 14.10.21
 from django.db import models
 
 
-class CompensationActionManager(models.Manager):
-    """ Holds default db fetch setting for this model type
-
-    """
-    def get_queryset(self):
-        return super().get_queryset().select_related(
-            "action_type",
-            "action_type__parent"
-        )
-
-
 class CompensationStateManager(models.Manager):
     """ Holds default db fetch setting for this model type
 

compensation/migrations/0004_auto_20220210_1402.py

@@ -0,0 +1,42 @@
+# Generated by Django 3.1.3 on 2022-02-10 13:02
+
+from django.db import migrations, models
+
+
+def migrate_actions(apps, schema_editor):
+    CompensationAction = apps.get_model('compensation', 'CompensationAction')
+    actions = CompensationAction.objects.all()
+
+    for action in actions:
+        action_type = action.action_type or []
+        action.action_type_tmp.set([action_type])
+        action.save()
+
+        if not action.action_type_tmp.count() > 0:
+            raise ValueError("Migration of actions did not work! Stoped before data loss!")
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('codelist', '0001_initial'),
+        ('compensation', '0003_auto_20220202_0846'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='compensationaction',
+            name='action_type_tmp',
+            field=models.ManyToManyField(blank=True, limit_choices_to={'code_lists__in': [1026], 'is_archived': False, 'is_selectable': True}, related_name='_compensationaction_action_type_+', to='codelist.KonovaCode'),
+        ),
+        migrations.RunPython(migrate_actions),
+        migrations.RemoveField(
+            model_name='compensationaction',
+            name='action_type',
+        ),
+        migrations.RenameField(
+            model_name='compensationaction',
+            old_name='action_type_tmp',
+            new_name='action_type',
+        )
+    ]

compensation/migrations/0005_auto_20220218_0917.py

@@ -0,0 +1,46 @@
+# Generated by Django 3.1.3 on 2022-02-18 08:17
+
+from django.db import migrations, models, transaction
+import django.db.models.deletion
+
+from codelist.settings import CODELIST_BIOTOPES_ID, CODELIST_AFTER_STATE_BIOTOPES__ID
+
+
+def migrate_entries_974_to_654(apps, schema_editor):
+    CompensationState = apps.get_model("compensation", "CompensationState")
+    KonovaCode = apps.get_model("codelist", "KonovaCode")
+    all_states = CompensationState.objects.all()
+
+    with transaction.atomic():
+        for state in all_states:
+            code_from_654 = KonovaCode.objects.get(
+                short_name=state.biotope_type.short_name,
+                code_lists__in=[CODELIST_BIOTOPES_ID],
+                is_archived=False,
+                is_leaf=True,
+            )
+            state.biotope_type = code_from_654
+            state.save()
+
+    old_list_states = CompensationState.objects.filter(
+        biotope_type__code_lists__in=[CODELIST_AFTER_STATE_BIOTOPES__ID]
+    )
+    if old_list_states.count() > 0:
+        raise Exception("Still unmigrated values!")
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('codelist', '0001_initial'),
+        ('compensation', '0004_auto_20220210_1402'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_entries_974_to_654),
+        migrations.AlterField(
+            model_name='compensationstate',
+            name='biotope_type',
+            field=models.ForeignKey(blank=True, limit_choices_to={'code_lists__in': [654], 'is_archived': False, 'is_selectable': True}, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='codelist.konovacode'),
+        ),
+    ]

compensation/migrations/0006_ecoaccount_teams.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.1.3 on 2022-02-18 09:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0003_team'),
+        ('compensation', '0005_auto_20220218_0917'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ecoaccount',
+            name='teams',
+            field=models.ManyToManyField(help_text='Teams having access (data shared with)', to='user.Team'),
+        ),
+    ]

compensation/models/action.py

@@ -10,7 +10,6 @@ from django.utils.translation import gettext_lazy as _
 
 from codelist.models import KonovaCode
 from codelist.settings import CODELIST_COMPENSATION_ACTION_ID, CODELIST_COMPENSATION_ACTION_DETAIL_ID
-from compensation.managers import CompensationActionManager
 from konova.models import BaseResource
 
 
@@ -30,10 +29,8 @@ class CompensationAction(BaseResource):
     """
     Compensations include actions like planting trees, refreshing rivers and so on.
     """
-    action_type = models.ForeignKey(
+    action_type = models.ManyToManyField(
         KonovaCode,
-        on_delete=models.SET_NULL,
-        null=True,
         blank=True,
         limit_choices_to={
             "code_lists__in": [CODELIST_COMPENSATION_ACTION_ID],
@@ -56,10 +53,8 @@ class CompensationAction(BaseResource):
     unit = models.CharField(max_length=100, null=True, blank=True, choices=UnitChoices.choices)
     comment = models.TextField(blank=True, null=True, help_text="Additional comment")
 
-    objects = CompensationActionManager()
-
     def __str__(self):
-        return f"{self.action_type} | {self.amount} {self.unit}"
+        return f"{self.action_type.all()} | {self.amount} {self.unit}"
 
     @property
     def unit_humanize(self):

compensation/models/compensation.py

@@ -8,7 +8,7 @@ Created on: 16.11.21
 import shutil
 
 from django.contrib import messages
-from user.models import User
+from user.models import User, Team
 from django.db import models, transaction
 from django.db.models import QuerySet, Sum
 from django.http import HttpRequest
@@ -20,7 +20,9 @@ from compensation.utils.quality import CompensationQualityChecker
 from konova.models import BaseObject, AbstractDocument, Deadline, generate_document_file_upload_path, \
     GeoReferencedMixin
 from konova.settings import DEFAULT_SRID_RLP, LANIS_LINK_TEMPLATE
-from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION
+from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION, COMPENSATION_REMOVED_TEMPLATE, \
+    DOCUMENT_REMOVED_TEMPLATE, COMPENSATION_EDITED_TEMPLATE, DEADLINE_REMOVED, ADDED_DEADLINE, \
+    COMPENSATION_ACTION_REMOVED, COMPENSATION_STATE_REMOVED, INTERVENTION_HAS_REVOCATIONS_TEMPLATE
 from user.models import UserActionLogEntry
 
 
@@ -60,7 +62,6 @@ class AbstractCompensation(BaseObject, GeoReferencedMixin):
         user = form.user
         with transaction.atomic():
             created_action = UserActionLogEntry.get_created_action(user)
-            edited_action = UserActionLogEntry.get_edited_action(user, _("Added deadline"))
 
             deadline = Deadline.objects.create(
                 type=form_data["type"],
@@ -69,12 +70,26 @@ class AbstractCompensation(BaseObject, GeoReferencedMixin):
                 created=created_action,
             )
 
-            self.modified = edited_action
             self.save()
-            self.log.add(edited_action)
             self.deadlines.add(deadline)
+            self.mark_as_edited(user, edit_comment=ADDED_DEADLINE)
             return deadline
 
+    def remove_deadline(self, form):
+        """ Removes a deadline from the abstract compensation
+
+        Args:
+            form (RemoveDeadlineModalForm): The form holding all relevant data
+
+        Returns:
+
+        """
+        deadline = form.deadline
+        user = form.user
+        with transaction.atomic():
+            deadline.delete()
+            self.mark_as_edited(user, edit_comment=DEADLINE_REMOVED)
+
     def add_action(self, form) -> CompensationAction:
         """ Adds a new action to the compensation
 
@@ -89,17 +104,32 @@ class AbstractCompensation(BaseObject, GeoReferencedMixin):
         with transaction.atomic():
             user_action = UserActionLogEntry.get_created_action(user)
             comp_action = CompensationAction.objects.create(
-                action_type=form_data["action_type"],
                 amount=form_data["amount"],
                 unit=form_data["unit"],
                 comment=form_data["comment"],
                 created=user_action,
             )
+            comp_action.action_type.set(form_data.get("action_type", []))
             comp_action_details = form_data["action_type_details"]
             comp_action.action_type_details.set(comp_action_details)
             self.actions.add(comp_action)
             return comp_action
 
+    def remove_action(self, form):
+        """ Removes a CompensationAction from the abstract compensation
+
+        Args:
+            form (RemoveCompensationActionModalForm): The form holding all relevant data
+
+        Returns:
+
+        """
+        action = form.action
+        user = form.user
+        with transaction.atomic():
+            action.delete()
+            self.mark_as_edited(user, edit_comment=COMPENSATION_ACTION_REMOVED)
+
     def add_state(self, form, is_before_state: bool) -> CompensationState:
         """ Adds a new compensation state to the compensation
 
@@ -124,6 +154,21 @@ class AbstractCompensation(BaseObject, GeoReferencedMixin):
                 self.after_states.add(state)
             return state
 
+    def remove_state(self, form):
+        """ Removes a CompensationState from the abstract compensation
+
+        Args:
+            form (RemoveCompensationStateModalForm): The form holding all relevant data
+
+        Returns:
+
+        """
+        state = form.state
+        user = form.user
+        with transaction.atomic():
+            state.delete()
+            self.mark_as_edited(user, edit_comment=COMPENSATION_STATE_REMOVED)
+
     def get_surface_after_states(self) -> float:
         """ Calculates the compensation's/account's surface
 
@@ -235,6 +280,11 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin):
             self.identifier = self.generate_new_identifier()
         super().save(*args, **kwargs)
 
+    def mark_as_deleted(self, user, send_mail: bool = True):
+        super().mark_as_deleted(user, send_mail)
+        if user is not None:
+            self.intervention.mark_as_edited(user, edit_comment=COMPENSATION_REMOVED_TEMPLATE.format(self.identifier))
+
     def is_shared_with(self, user: User):
         """ Access check
 
@@ -249,7 +299,7 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin):
         # Compensations inherit their shared state from the interventions
         return self.intervention.is_shared_with(user)
 
-    def share_with(self, user: User):
+    def share_with_user(self, user: User):
         """ Adds user to list of shared access users
 
         Args:
@@ -258,10 +308,9 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin):
         Returns:
 
         """
-        if not self.intervention.is_shared_with(user):
-            self.intervention.users.add(user)
+        self.intervention.users.add(user)
 
-    def share_with_list(self, user_list: list):
+    def share_with_user_list(self, user_list: list):
         """ Sets the list of shared access users
 
         Args:
@@ -272,6 +321,28 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin):
         """
         self.intervention.users.set(user_list)
 
+    def share_with_team(self, team: Team):
+        """ Adds team to list of shared access teams
+
+        Args:
+            team (Team): The team to be added to the object
+
+        Returns:
+
+        """
+        self.intervention.teams.add(team)
+
+    def share_with_team_list(self, team_list: list):
+        """ Sets the list of shared access teams
+
+        Args:
+            team_list (list): The teams to be added to the object
+
+        Returns:
+
+        """
+        self.intervention.teams.set(team_list)
+
     @property
     def shared_users(self) -> QuerySet:
         """ Shortcut for fetching the users which have shared access on this object
@@ -281,27 +352,14 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin):
         """
         return self.intervention.users.all()
 
-    def get_LANIS_link(self) -> str:
-        """ Generates a link for LANIS depending on the geometry
+    @property
+    def shared_teams(self) -> QuerySet:
+        """ Shortcut for fetching the teams which have shared access on this object
 
         Returns:
-
+            users (QuerySet)
         """
-        try:
-            geom = self.geometry.geom.transform(DEFAULT_SRID_RLP, clone=True)
-            x = geom.centroid.x
-            y = geom.centroid.y
-            zoom_lvl = 16
-        except AttributeError:
-            # If no geometry has been added, yet.
-            x = 1
-            y = 1
-            zoom_lvl = 6
-        return LANIS_LINK_TEMPLATE.format(
-            zoom_lvl,
-            x,
-            y,
-        )
+        return self.intervention.teams.all()
 
     def get_documents(self) -> QuerySet:
         """ Getter for all documents of a compensation
@@ -326,7 +384,9 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin):
         Returns:
 
         """
-        self.intervention.mark_as_edited(user, request, edit_comment, reset_recorded)
+        self.intervention.unrecord(user, request)
+        action = super().mark_as_edited(user, edit_comment=edit_comment)
+        return action
 
     def is_ready_for_publish(self) -> bool:
         """ Not inherited by RecordableObjectMixin
@@ -338,6 +398,26 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin):
         """
         return self.intervention.is_ready_for_publish()
 
+    def set_status_messages(self, request: HttpRequest):
+        """ Setter for different information that need to be rendered
+
+        Adds messages to the given HttpRequest
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+            request (HttpRequest): The modified request
+        """
+        if self.intervention.legal.revocations.exists():
+            messages.error(
+                request,
+                INTERVENTION_HAS_REVOCATIONS_TEMPLATE.format(self.intervention.legal.revocations.count()),
+                extra_tags="danger",
+            )
+        super().set_status_messages(request)
+        return request
+
 
 class CompensationDocument(AbstractDocument):
     """
@@ -353,7 +433,7 @@ class CompensationDocument(AbstractDocument):
         max_length=1000,
     )
 
-    def delete(self, *args, **kwargs):
+    def delete(self, user=None, *args, **kwargs):
         """
         Custom delete functionality for CompensationDocuments.
         Removes the folder from the file system if there are no further documents for this entry.
@@ -375,6 +455,9 @@ class CompensationDocument(AbstractDocument):
             folder_path = self.file.path.split("/")[:-1]
             folder_path = "/".join(folder_path)
 
+        if user:
+            self.instance.mark_as_edited(user, edit_comment=DOCUMENT_REMOVED_TEMPLATE.format(self.title))
+
         # Remove the file itself
         super().delete(*args, **kwargs)
 

compensation/models/eco_account.py

@@ -7,10 +7,12 @@ Created on: 16.11.21
 """
 import shutil
 
-from user.models import User
+from django.urls import reverse
+
+from konova.utils.message_templates import DEDUCTION_REMOVED, DOCUMENT_REMOVED_TEMPLATE
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
-from django.db import models, transaction
+from django.db import models
 from django.db.models import Sum, QuerySet
 from django.utils.translation import gettext_lazy as _
 
@@ -20,7 +22,6 @@ from compensation.utils.quality import EcoAccountQualityChecker
 from konova.models import ShareableObjectMixin, RecordableObjectMixin, AbstractDocument, BaseResource, \
     generate_document_file_upload_path
 from konova.settings import DEFAULT_SRID_RLP, LANIS_LINK_TEMPLATE
-from user.models import UserActionLogEntry
 
 
 class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMixin):
@@ -122,28 +123,6 @@ class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMix
 
         return ret_val_total, ret_val_relative
 
-    def get_LANIS_link(self) -> str:
-        """ Generates a link for LANIS depending on the geometry
-
-        Returns:
-
-        """
-        try:
-            geom = self.geometry.geom.transform(DEFAULT_SRID_RLP, clone=True)
-            x = geom.centroid.x
-            y = geom.centroid.y
-            zoom_lvl = 16
-        except AttributeError:
-            # If no geometry has been added, yet.
-            x = 1
-            y = 1
-            zoom_lvl = 6
-        return LANIS_LINK_TEMPLATE.format(
-            zoom_lvl,
-            x,
-            y,
-        )
-
     def quality_check(self) -> EcoAccountQualityChecker:
         """ Quality check
 
@@ -165,34 +144,6 @@ class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMix
         )
         return docs
 
-    def add_deduction(self, form):
-        """ Adds a new deduction to the intervention
-
-        Args:
-            form (NewDeductionModalForm): The form holding the data
-
-        Returns:
-
-        """
-        form_data = form.cleaned_data
-        user = form.user
-
-        with transaction.atomic():
-            # Create log entry
-            user_action_create = UserActionLogEntry.get_created_action(user)
-            user_action_edit = UserActionLogEntry.get_edited_action(user)
-            self.log.add(user_action_edit)
-            self.modified = user_action_edit
-            self.save()
-
-            deduction = EcoAccountDeduction.objects.create(
-                intervention=form_data["intervention"],
-                account=self,
-                surface=form_data["surface"],
-                created=user_action_create,
-            )
-        return deduction
-
     def is_ready_for_publish(self) -> bool:
         """ Checks whether the data passes all constraints for being publishable
 
@@ -203,6 +154,14 @@ class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMix
         is_ready = is_recorded
         return is_ready
 
+    def get_share_link(self):
+        """ Returns the share url for the object
+
+        Returns:
+
+        """
+        return reverse("compensation:acc:share", args=(self.id, self.access_token))
+
 
 class EcoAccountDocument(AbstractDocument):
     """
@@ -218,7 +177,7 @@ class EcoAccountDocument(AbstractDocument):
         max_length=1000,
     )
 
-    def delete(self, *args, **kwargs):
+    def delete(self, user=None, *args, **kwargs):
         """
         Custom delete functionality for EcoAccountDocuments.
         Removes the folder from the file system if there are no further documents for this entry.
@@ -240,6 +199,9 @@ class EcoAccountDocument(AbstractDocument):
             folder_path = self.file.path.split("/")[:-1]
             folder_path = "/".join(folder_path)
 
+        if user:
+            self.instance.mark_as_edited(user, edit_comment=DOCUMENT_REMOVED_TEMPLATE.format(self.title))
+
         # Remove the file itself
         super().delete(*args, **kwargs)
 
@@ -285,3 +247,9 @@ class EcoAccountDeduction(BaseResource):
 
     def __str__(self):
         return "{} of {}".format(self.surface, self.account)
+
+    def delete(self, user=None, *args, **kwargs):
+        if user is not None:
+            self.intervention.mark_as_edited(user, edit_comment=DEDUCTION_REMOVED)
+            self.account.mark_as_edited(user, edit_comment=DEDUCTION_REMOVED)
+        super().delete(*args, **kwargs)

compensation/models/payment.py

@@ -10,6 +10,8 @@ from django.db import models
 
 from intervention.models import Intervention
 from konova.models import BaseResource
+from konova.utils.message_templates import PAYMENT_REMOVED
+from user.models import UserActionLogEntry
 
 
 class Payment(BaseResource):

compensation/models/state.py

@@ -6,11 +6,13 @@ Created on: 16.11.21
 
 """
 from django.db import models
+from django.db.models import Q
 
 from codelist.models import KonovaCode
 from codelist.settings import CODELIST_BIOTOPES_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID
 from compensation.managers import CompensationStateManager
 from konova.models import UuidModel
+from konova.utils.message_templates import COMPENSATION_STATE_REMOVED
 
 
 class CompensationState(UuidModel):

compensation/tables.py

@@ -31,6 +31,11 @@ class CompensationTable(BaseTable, TableRenderMixin):
         orderable=True,
         accessor="title",
     )
+    d = tables.Column(
+        verbose_name=_("Parcel gmrkng"),
+        orderable=True,
+        accessor="geometry",
+    )
     c = tables.Column(
         verbose_name=_("Checked"),
         orderable=True,
@@ -80,14 +85,17 @@ class CompensationTable(BaseTable, TableRenderMixin):
         Returns:
 
         """
-        html = ""
-        html += self.render_link(
-            tooltip=_("Open {}").format(_("Compensation")),
-            href=reverse("compensation:detail", args=(record.id,)),
-            txt=value,
-            new_tab=False,
+        context = {
+            "tooltip": _("Open {}").format(_("Intervention")),
+            "content": value,
+            "url": reverse("compensation:detail", args=(record.id,)),
+            "has_revocations": record.intervention.legal.revocations.exists()
+        }
+        html = render_to_string(
+            "table/revocation_warning_col.html",
+            context
         )
-        return format_html(html)
+        return html
 
     def render_c(self, value, record: Compensation):
         """ Renders the checked column for a compensation
@@ -115,6 +123,28 @@ class CompensationTable(BaseTable, TableRenderMixin):
         )
         return format_html(html)
 
+    def render_d(self, value, record: Compensation):
+        """ Renders the parcel district column for a compensation
+
+        Args:
+            value (str): The geometry
+            record (Compensation): The compensation record
+
+        Returns:
+
+        """
+        parcels = value.get_underlying_parcels().values_list(
+            "gmrkng",
+            flat=True
+        ).distinct()
+        html = render_to_string(
+            "table/gmrkng_col.html",
+            {
+                "entries": parcels
+            }
+        )
+        return html
+
     def render_r(self, value, record: Compensation):
         """ Renders the registered column for a compensation
 
@@ -173,10 +203,20 @@ class EcoAccountTable(BaseTable, TableRenderMixin):
         orderable=True,
         accessor="title",
     )
+    d = tables.Column(
+        verbose_name=_("Parcel gmrkng"),
+        orderable=True,
+        accessor="geometry",
+    )
     av = tables.Column(
         verbose_name=_("Available"),
         orderable=True,
         empty_values=[],
+        attrs={
+            "th": {
+                "class": "w-20",
+            }
+        }
     )
     r = tables.Column(
         verbose_name=_("Recorded"),
@@ -201,7 +241,7 @@ class EcoAccountTable(BaseTable, TableRenderMixin):
 
     def __init__(self,  request: HttpRequest, *args, **kwargs):
         self.title = _("Eco Accounts")
-        self.add_new_url = reverse("compensation:acc-new")
+        self.add_new_url = reverse("compensation:acc:new")
         qs = kwargs.get("queryset", None)
         self.filter = EcoAccountTableFilter(
             user=request.user,
@@ -224,7 +264,7 @@ class EcoAccountTable(BaseTable, TableRenderMixin):
         html = ""
         html += self.render_link(
             tooltip=_("Open {}").format(_("Eco-account")),
-            href=reverse("compensation:acc-detail", args=(record.id,)),
+            href=reverse("compensation:acc:detail", args=(record.id,)),
             txt=value,
             new_tab=False,
         )
@@ -244,6 +284,28 @@ class EcoAccountTable(BaseTable, TableRenderMixin):
         html = render_to_string("konova/widgets/progressbar.html", {"value": value_relative})
         return format_html(html)
 
+    def render_d(self, value, record: Compensation):
+        """ Renders the parcel district column for a compensation
+
+        Args:
+            value (str): The geometry
+            record (Compensation): The compensation record
+
+        Returns:
+
+        """
+        parcels = value.get_underlying_parcels().values_list(
+            "gmrkng",
+            flat=True
+        ).distinct()
+        html = render_to_string(
+            "table/gmrkng_col.html",
+            {
+                "entries": parcels
+            }
+        )
+        return html
+
     def render_r(self, value, record: EcoAccount):
         """ Renders the recorded column for an eco account
 

compensation/templates/compensation/detail/compensation/includes/actions.html

@@ -1,4 +1,5 @@
-{% load i18n l10n fontawesome_5 humanize %}
+{% load i18n l10n fontawesome_5 humanize ksp_filters %}
+
 <div id="actions" class="card">
     <div class="card-header rlp-r">
         <div class="row">
@@ -20,16 +21,13 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="" scope="col">
                     {% trans 'Action type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Action type details' %}
-                </th>
                 <th scope="col">
                     {% trans 'Amount' context 'Compensation' %}
                 </th>
@@ -37,8 +35,10 @@
                     {% trans 'Comment' %}
                 </th>
                 {% if is_default_member and has_access %}
-                <th scope="col">
-                    {% trans 'Action' %}
+                <th class="w-10" scope="col">
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
                 {% endif %}
             </tr>
@@ -46,18 +46,28 @@
             <tbody>
             {% for action in actions %}
             <tr>
-                <td class="align-middle">
-                    {{ action.action_type }}
-                </td>
-                <td class="align-middle">
+                <td class="">
+                    {% for type in action.action_type.all %}
+                    <div> {{type.parent.parent.long_name}} {% fa5_icon 'angle-right' %} {{type.parent.long_name}} {% fa5_icon 'angle-right' %} {{type.long_name}} </div>
+                    <hr>
+                    {% endfor %}
                     {% for detail in action.action_type_details.all %}
-                        <div class="mb-2" title="{{detail}}">{{detail.long_name}}</div>
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
+                    {% empty %}
+                        <span class="badge badge-pill rlp-r-outline" title="{% trans 'No action type details' %}">{% trans 'No action type details' %}</span>
                     {% endfor %}
                 </td>
-                <td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
-                <td class="align-middle">{{ action.comment|default_if_none:"" }}</td>
-                <td class="align-middle">
+                <td class="">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
+                <td class="">
+                    <div class="scroll-150">
+                        {{ action.comment }}
+                    </div>
+                </td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
+                    <button data-form-url="{% url 'compensation:action-edit' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit action' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
                     <button data-form-url="{% url 'compensation:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
                         {% fa5_icon 'trash' %}
                     </button>

compensation/templates/compensation/detail/compensation/includes/deadlines.html

@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -34,8 +34,10 @@
                     {% trans 'Comment' %}
                 </th>
                 {% if is_default_member and has_access %}
-                    <th scope="col">
-                        {% trans 'Action' %}
+                    <th class="w-10" scope="col">
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -47,10 +49,17 @@
                     {% trans deadline.type_humanized %}
                 </td>
                 <td class="align-middle">{{ deadline.date|default_if_none:"---" }}</td>
-                <td class="align-middle">{{ deadline.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ deadline.comment }}
+                    </div>
+                </td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'deadline-remove' deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
+                    <button data-form-url="{% url 'compensation:deadline-edit' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit deadline' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
+                    <button data-form-url="{% url 'compensation:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}

compensation/templates/compensation/detail/compensation/includes/documents.html

@@ -20,19 +20,24 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
                 <th scope="col">
                     {% trans 'Title' %}
                 </th>
+                <th scope="col">
+                    {% trans 'Created on' %}
+                </th>
                 <th scope="col">
                     {% trans 'Comment' %}
                 </th>
                 {% if is_default_member and has_access %}
-                    <th scope="col">
-                        {% trans 'Action' %}
+                    <th class="w-10" scope="col">
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -41,14 +46,24 @@
             {% for doc in obj.documents.all %}
             <tr>
                 <td class="align-middle">
-                    <a href="{% url 'compensation:get-doc' doc.id %}">
+                    <a href="{% url 'compensation:get-doc' obj.id doc.id %}">
                         {{ doc.title }}
                     </a>
                 </td>
-                <td class="align-middle">{{ doc.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    {{ doc.date_of_creation }}
+                </td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ doc.comment }}
+                    </div>
+                </td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
+                    <button data-form-url="{% url 'compensation:edit-doc' obj.id doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit document' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
+                    <button data-form-url="{% url 'compensation:remove-doc' obj.id doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}

compensation/templates/compensation/detail/compensation/includes/states-after.html

@@ -20,27 +20,26 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states > sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states > sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
                 {% if is_default_member and has_access %}
-                <th scope="col">
-                    {% trans 'Action' %}
+                <th class="w-10" scope="col">
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
                 {% endif %}
             </tr>
@@ -48,19 +47,21 @@
             <tbody>
             {% for state in after_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
-                </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
+                <td>
+                    <span>{{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})</span>
+                    <br>
+                    {% for detail in state.biotope_type_details.all %}
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
+                    {% empty %}
+                        <span class="badge badge-pill rlp-r-outline" title="{% trans 'No biotope type details' %}">{% trans 'No biotope type details' %}</span>
                     {% endfor %}
                 </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
+                    <button data-form-url="{% url 'compensation:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
                     <button data-form-url="{% url 'compensation:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>

compensation/templates/compensation/detail/compensation/includes/states-before.html

@@ -20,27 +20,26 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states < sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states < sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
                 {% if is_default_member and has_access %}
-                <th scope="col">
-                    {% trans 'Action' %}
+                <th class="w-10" scope="col">
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
                 {% endif %}
             </tr>
@@ -48,19 +47,21 @@
             <tbody>
             {% for state in before_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
-                </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
+                <td>
+                    <span>{{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})</span>
+                    <br>
+                    {% for detail in state.biotope_type_details.all %}
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
+                    {% empty %}
+                        <span class="badge badge-pill rlp-r-outline" title="{% trans 'No biotope type details' %}">{% trans 'No biotope type details' %}</span>
                     {% endfor %}
                 </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
+                    <button data-form-url="{% url 'compensation:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
                     <button data-form-url="{% url 'compensation:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>

compensation/templates/compensation/detail/compensation/view.html

@@ -2,6 +2,7 @@
 {% load i18n l10n static fontawesome_5 humanize ksp_filters %}
 
 {% block head %}
+
     {% comment %}
         dal documentation (django-autocomplete-light) states using form.media for adding needed scripts.
         This does not work properly with modal forms, as the scripts are not loaded properly inside the modal.
@@ -14,16 +15,16 @@
 {% block body %}
 
     <div id="detail-header" class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <h3>{% trans 'Compensation' %}<br> {{obj.identifier}}</h3>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             {% include 'compensation/detail/compensation/includes/controls.html' %}
         </div>
     </div>
     <hr>
     <div id="data" class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <div class="table-container">
                 <table class="table table-hover">
                     <tr>
@@ -97,6 +98,10 @@
                     <tr>
                         <th scope="row">{% trans 'Shared with' %}</th>
                         <td class="align-middle">
+                            {% for team in obj.intervention.teams.all %}
+                                {% include 'user/includes/team_data_modal_button.html' %}
+                            {% endfor %}
+                            <hr>
                             {% for user in obj.intervention.users.all %}
                                 {% include 'user/includes/contact_modal_button.html' %}
                             {% endfor %}
@@ -105,39 +110,42 @@
                 </table>
             </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            <div class="row">
-                {% include 'map/geom_form.html' %}
-            </div>
-            <div class="row">
-                {% include 'konova/includes/parcels.html' %}
-            </div>
-            <div class="row">
-                {% include 'konova/includes/comment_card.html' %}
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+            <div class="col">
+                <div class="row">
+                    {% include 'map/geom_form.html' %}
+                </div>
+                <div class="row">
+                    {% include 'konova/includes/parcels.html' %}
+                </div>
+                <div class="row">
+                    {% include 'konova/includes/comment_card.html' %}
+                </div>
             </div>
         </div>
     </div>
     <hr>
-
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/compensation/includes/states-before.html' %}
+    <div id="related_data">
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'compensation/detail/compensation/includes/states-before.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'compensation/detail/compensation/includes/states-after.html' %}
+            </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/compensation/includes/states-after.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'compensation/detail/compensation/includes/actions.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'compensation/detail/compensation/includes/deadlines.html' %}
+            </div>
         </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/compensation/includes/actions.html' %}
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/compensation/includes/deadlines.html' %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/compensation/includes/documents.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'compensation/detail/compensation/includes/documents.html' %}
+            </div>
         </div>
     </div>
 

compensation/templates/compensation/detail/eco_account/includes/actions.html

@@ -1,4 +1,4 @@
-{% load i18n l10n fontawesome_5 humanize %}
+{% load i18n l10n fontawesome_5 humanize ksp_filters %}
 <div id="actions" class="card">
     <div class="card-header rlp-r">
         <div class="row">
@@ -11,7 +11,7 @@
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
                     {% if is_default_member and has_access  %}
-                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-action' obj.id %}" title="{% trans 'Add new action' %}">
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-action' obj.id %}" title="{% trans 'Add new action' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'seedling' %}
                     </button>
@@ -20,25 +20,24 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="" scope="col">
                     {% trans 'Action type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Action type details' %}
-                </th>
                 <th scope="col">
                     {% trans 'Amount' context 'Compensation' %}
                 </th>
                 <th scope="col">
                     {% trans 'Comment' %}
                 </th>
-                {% if default_member and has_access %}
-                    <th scope="col">
-                        {% trans 'Action' %}
+                {% if is_default_member and has_access %}
+                    <th class="w-10" scope="col">
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -46,19 +45,29 @@
             <tbody>
             {% for action in actions %}
             <tr>
-                <td class="align-middle">
-                    {{ action.action_type }}
-                </td>
-                <td class="align-middle">
+                <td class="">
+                    {% for type in action.action_type.all %}
+                    <div> {{type.parent.parent.long_name}} {% fa5_icon 'angle-right' %} {{type.parent.long_name}} {% fa5_icon 'angle-right' %} {{type.long_name}} </div>
+                    <hr>
+                    {% endfor %}
                     {% for detail in action.action_type_details.all %}
-                        <div class="mb-2" title="{{detail}}">{{detail.long_name}}</div>
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
+                    {% empty %}
+                        <span class="badge badge-pill rlp-r-outline" title="{% trans 'No action type details' %}">{% trans 'No action type details' %}</span>
                     {% endfor %}
                 </td>
-                <td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
-                <td class="align-middle">{{ action.comment|default_if_none:"" }}</td>
-                <td class="align-middle">
+                <td class="">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
+                <td class="">
+                    <div class="scroll-150">
+                        {{ action.comment }}
+                    </div>
+                </td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc-action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
+                    <button data-form-url="{% url 'compensation:acc:action-edit' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit action' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
+                    <button data-form-url="{% url 'compensation:acc:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}

compensation/templates/compensation/detail/eco_account/includes/controls.html

@@ -6,36 +6,36 @@
             LANIS
         </button>
     </a>
-    <a href="{% url 'compensation:acc-report' obj.id %}" target="_blank" class="mr-2">
+    <a href="{% url 'compensation:acc:report' obj.id %}" target="_blank" class="mr-2">
         <button class="btn btn-default" title="{% trans 'Public report' %}">
             {% fa5_icon 'file-alt' %}
         </button>
     </a>
     {% if has_access %}
-        <button class="btn btn-default btn-modal mr-2" title="{% trans 'Share' %}" data-form-url="{% url 'compensation:share-create' obj.id %}">
+        <button class="btn btn-default btn-modal mr-2" title="{% trans 'Share' %}" data-form-url="{% url 'compensation:acc:share-create' obj.id %}">
             {% fa5_icon 'share-alt' %}
         </button>
         {% if is_ets_member %}
             {% if obj.recorded %}
-                <button class="btn btn-default btn-modal mr-2" title="{% trans 'Unrecord' %}" data-form-url="{% url 'compensation:acc-record' obj.id %}">
+                <button class="btn btn-default btn-modal mr-2" title="{% trans 'Unrecord' %}" data-form-url="{% url 'compensation:acc:record' obj.id %}">
                     {% fa5_icon 'bookmark' 'far' %}
                 </button>
             {% else %}
-                <button class="btn btn-default btn-modal mr-2" title="{% trans 'Record' %}" data-form-url="{% url 'compensation:acc-record' obj.id %}">
+                <button class="btn btn-default btn-modal mr-2" title="{% trans 'Record' %}" data-form-url="{% url 'compensation:acc:record' obj.id %}">
                     {% fa5_icon 'bookmark' %}
                 </button>
             {% endif %}
         {% endif %}
         {% if is_default_member %}
-        <a href="{% url 'compensation:acc-edit' obj.id %}" class="mr-2">
+        <a href="{% url 'compensation:acc:edit' obj.id %}" class="mr-2">
             <button class="btn btn-default" title="{% trans 'Edit' %}">
                 {% fa5_icon 'edit' %}
             </button>
         </a>
-        <button class="btn btn-default btn-modal mr-2" data-form-url="{% url 'compensation:acc-log' obj.id %}" title="{% trans 'Show log' %}">
+        <button class="btn btn-default btn-modal mr-2" data-form-url="{% url 'compensation:acc:log' obj.id %}" title="{% trans 'Show log' %}">
             {% fa5_icon 'history' %}
         </button>
-        <button class="btn btn-default btn-modal" data-form-url="{% url 'compensation:acc-remove' obj.id %}" title="{% trans 'Delete' %}">
+        <button class="btn btn-default btn-modal" data-form-url="{% url 'compensation:acc:remove' obj.id %}" title="{% trans 'Delete' %}">
             {% fa5_icon 'trash' %}
         </button>
         {% endif %}

compensation/templates/compensation/detail/eco_account/includes/deadlines.html

@@ -11,7 +11,7 @@
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
                     {% if is_default_member and has_access  %}
-                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-deadline' obj.id %}" title="{% trans 'Add new deadline' %}">
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-deadline' obj.id %}" title="{% trans 'Add new deadline' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'calendar-check' %}
                     </button>
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -33,8 +33,10 @@
                 <th scope="col">
                     {% trans 'Comment' %}
                 </th>
-                <th scope="col">
-                    {% trans 'Action' %}
+                <th class="w-10" scope="col">
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
@@ -45,10 +47,17 @@
                     {% trans deadline.type_humanized %}
                 </td>
                 <td class="align-middle">{{ deadline.date|default_if_none:"---" }}</td>
-                <td class="align-middle">{{ deadline.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ deadline.comment }}
+                    </div>
+                </td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'deadline-remove' deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
+                    <button data-form-url="{% url 'compensation:acc:deadline-edit' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit deadline' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
+                    <button data-form-url="{% url 'compensation:acc:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}

compensation/templates/compensation/detail/eco_account/includes/deductions.html

@@ -10,8 +10,8 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
-                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-deduction' obj.id %}" title="{% trans 'Add new deduction' %}">
+                    {% if is_default_member and obj.recorded %}
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-deduction' obj.id %}" title="{% trans 'Add new deduction' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'tree' %}
                     </button>
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -36,8 +36,10 @@
                 <th scope="col">
                     {% trans 'Created' %}
                 </th>
-                <th scope="col">
-                    {% trans 'Action' %}
+                <th class="w-10" scope="col">
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
@@ -58,9 +60,12 @@
                 </td>
                 <td class="align-middle">{{ deduction.surface|floatformat:2|intcomma }} m²</td>
                 <td class="align-middle">{{ deduction.created.timestamp|default_if_none:""|naturalday}}</td>
-                <td>
-                    {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc-remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Deduction' %}">
+                <td class="align-middle float-right">
+                    {% if is_default_member and has_access or is_default_member and user in deduction.intervention.shared_users  %}
+                    <button data-form-url="{% url 'compensation:acc:edit-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit Deduction' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
+                    <button data-form-url="{% url 'compensation:acc:remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Deduction' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}

compensation/templates/compensation/detail/eco_account/includes/documents.html

@@ -11,7 +11,7 @@
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
                     {% if is_default_member and has_access  %}
-                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-doc' obj.id %}" title="{% trans 'Add new document' %}">
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-doc' obj.id %}" title="{% trans 'Add new document' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'file' %}
                     </button>
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -28,10 +28,15 @@
                     {% trans 'Title' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Comment' %}
+                    {% trans 'Created on' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    {% trans 'Comment' %}
+                </th>
+                <th class="w-10" scope="col">
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
@@ -39,14 +44,24 @@
             {% for doc in obj.documents.all %}
             <tr>
                 <td class="align-middle">
-                    <a href="{% url 'compensation:acc-get-doc' doc.id %}">
+                    <a href="{% url 'compensation:acc:get-doc' obj.id doc.id %}">
                         {{ doc.title }}
                     </a>
                 </td>
-                <td class="align-middle">{{ doc.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    {{ doc.date_of_creation }}
+                </td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ doc.comment }}
+                    </div>
+                </td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc-remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
+                    <button data-form-url="{% url 'compensation:acc:edit-doc' obj.id doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit document' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
+                    <button data-form-url="{% url 'compensation:acc:remove-doc' obj.id doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}

compensation/templates/compensation/detail/eco_account/includes/states-after.html

@@ -11,7 +11,7 @@
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
                     {% if is_default_member and has_access  %}
-                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-state' obj.id %}" title="{% trans 'Add new state after' %}">
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-state' obj.id %}" title="{% trans 'Add new state after' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'layer-group' %}
                     </button>
@@ -20,27 +20,26 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states > sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states > sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
                 {% if is_default_member and has_access %}
-                <th scope="col">
-                    {% trans 'Action' %}
+                <th class="w-10" scope="col">
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
                 {% endif %}
             </tr>
@@ -48,20 +47,22 @@
             <tbody>
             {% for state in after_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
-                </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
+                <td>
+                    <span>{{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})</span>
+                    <br>
+                    {% for detail in state.biotope_type_details.all %}
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
+                    {% empty %}
+                        <span class="badge badge-pill rlp-r-outline" title="{% trans 'No biotope type details' %}">{% trans 'No biotope type details' %}</span>
                     {% endfor %}
                 </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc-state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                    <button data-form-url="{% url 'compensation:acc:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
+                    <button data-form-url="{% url 'compensation:acc:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}

compensation/templates/compensation/detail/eco_account/includes/states-before.html

@@ -11,7 +11,7 @@
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
                     {% if is_default_member and has_access  %}
-                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-state' obj.id %}?before=true" title="{% trans 'Add new state before' %}">
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-state' obj.id %}?before=true" title="{% trans 'Add new state before' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'layer-group' %}
                     </button>
@@ -20,27 +20,26 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states < sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states < sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
                 {% if is_default_member and has_access %}
-                <th scope="col">
-                    {% trans 'Action' %}
+                <th class="w-10" scope="col">
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
                 {% endif %}
             </tr>
@@ -48,20 +47,22 @@
             <tbody>
             {% for state in before_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
-                </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
+                <td>
+                    <span>{{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})</span>
+                    <br>
+                    {% for detail in state.biotope_type_details.all %}
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
+                    {% empty %}
+                        <span class="badge badge-pill rlp-r-outline" title="{% trans 'No biotope type details' %}">{% trans 'No biotope type details' %}</span>
                     {% endfor %}
                 </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc-state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                    <button data-form-url="{% url 'compensation:acc:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
+                    <button data-form-url="{% url 'compensation:acc:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}

compensation/templates/compensation/detail/eco_account/view.html

@@ -2,6 +2,7 @@
 {% load i18n l10n static fontawesome_5 humanize %}
 
 {% block head %}
+
     {% comment %}
         dal documentation (django-autocomplete-light) states using form.media for adding needed scripts.
         This does not work properly with modal forms, as the scripts are not loaded properly inside the modal.
@@ -14,16 +15,16 @@
 {% block body %}
 
     <div id="detail-header" class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <h3>{% trans 'Eco-account' %}<br> {{obj.identifier}}</h3>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             {% include 'compensation/detail/eco_account/includes/controls.html' %}
         </div>
     </div>
     <hr>
     <div id="data" class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <div class="table-container">
                 <table class="table table-hover">
                     <tr>
@@ -80,6 +81,10 @@
                     <tr>
                         <th scope="row">{% trans 'Shared with' %}</th>
                         <td class="align-middle">
+                            {% for team in obj.teams.all %}
+                                {% include 'user/includes/team_data_modal_button.html' %}
+                            {% endfor %}
+                            <hr>
                             {% for user in obj.users.all %}
                                 {% include 'user/includes/contact_modal_button.html' %}
                             {% endfor %}
@@ -88,7 +93,7 @@
                 </table>
             </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <div class="row">
                 {% include 'map/geom_form.html' %}
             </div>
@@ -102,28 +107,30 @@
     </div>
     <hr>
 
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/eco_account/includes/states-before.html' %}
+    <div id="related_data">
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'compensation/detail/eco_account/includes/states-before.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'compensation/detail/eco_account/includes/states-after.html' %}
+            </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/eco_account/includes/states-after.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'compensation/detail/eco_account/includes/actions.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'compensation/detail/eco_account/includes/deadlines.html' %}
+            </div>
         </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/eco_account/includes/actions.html' %}
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/eco_account/includes/deadlines.html' %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/eco_account/includes/documents.html' %}
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/eco_account/includes/deductions.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'compensation/detail/eco_account/includes/documents.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'compensation/detail/eco_account/includes/deductions.html' %}
+            </div>
         </div>
     </div>
 

compensation/templates/compensation/report/compensation/report.html

@@ -3,7 +3,7 @@
 
 {% block body %}
 <div class="row">
-    <div class="col-sm-12 col-md-12 col-lg-6">
+    <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
         <h3>{% trans 'Report' %}</h3>
         <h4>{{obj.identifier}}</h4>
         <div class="table-container">
@@ -33,7 +33,7 @@
         {% include 'compensation/detail/compensation/includes/states-after.html' %}
         {% include 'compensation/detail/compensation/includes/actions.html' %}
     </div>
-    <div class="col-sm-12 col-md-12 col-lg-6">
+    <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
         <div class="row">
             {% include 'map/geom_form.html' %}
         </div>

compensation/templates/compensation/report/eco_account/report.html

@@ -3,7 +3,7 @@
 
 {% block body %}
 <div class="row">
-    <div class="col-sm-12 col-md-12 col-lg-6">
+    <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
         <h3>{% trans 'Report' %}</h3>
         <h4>{{obj.identifier}}</h4>
         <div class="table-container">
@@ -20,10 +20,6 @@
                         <th scope="row">{% trans 'Conservation office file number' %}</th>
                         <td class="align-middle">{{obj.responsible.conservation_file_number|default_if_none:""}}</td>
                     </tr>
-                    <tr>
-                        <th scope="row">{% trans 'Action handler' %}</th>
-                        <td class="align-middle">{{obj.responsible.handler|default_if_none:""}}</td>
-                    </tr>
                     <tr>
                         <th scope="row">{% trans 'Deductions for' %}</th>
                         <td class="align-middle">
@@ -50,7 +46,7 @@
         {% include 'compensation/detail/compensation/includes/states-after.html' %}
         {% include 'compensation/detail/compensation/includes/actions.html' %}
     </div>
-    <div class="col-sm-12 col-md-12 col-lg-6">
+    <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
         <div class="row">
             {% include 'map/geom_form.html' %}
         </div>

compensation/tests/compensation/__init__.py

@@ -0,0 +1,7 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: michel.peltriaux@sgdnord.rlp.de
+Created on: 07.02.22
+
+"""

compensation/tests/compensation/test_views.py

@@ -0,0 +1,248 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: michel.peltriaux@sgdnord.rlp.de
+Created on: 07.02.22
+
+"""
+from django.test.client import Client
+from django.urls import reverse
+
+from konova.models import Deadline, DeadlineType
+from konova.settings import DEFAULT_GROUP
+from konova.tests.test_views import BaseViewTestCase
+
+
+class CompensationViewTestCase(BaseViewTestCase):
+    """
+    These tests focus on proper returned views depending on the user's groups privileges and login status
+
+    """
+
+    @classmethod
+    def setUpTestData(cls) -> None:
+        super().setUpTestData()
+        
+    def setUp(self) -> None:
+        super().setUp()
+        state = self.create_dummy_states()
+        self.compensation.before_states.set([state])
+        self.compensation.after_states.set([state])
+
+        action = self.create_dummy_action()
+        self.compensation.actions.set([action])
+
+        self.deadline = Deadline.objects.get_or_create(
+            type=DeadlineType.FINISHED,
+            date="2020-01-01",
+            comment="TESTDEADDLINECOMMENT"
+        )[0]
+        self.compensation.deadlines.add(self.deadline)
+
+        # Prepare urls
+        self.index_url = reverse("compensation:index", args=())
+        self.new_url = reverse("compensation:new", args=(self.intervention.id,))
+        self.new_id_url = reverse("compensation:new-id", args=())
+        self.detail_url = reverse("compensation:detail", args=(self.compensation.id,))
+        self.log_url = reverse("compensation:log", args=(self.compensation.id,))
+        self.edit_url = reverse("compensation:edit", args=(self.compensation.id,))
+        self.remove_url = reverse("compensation:remove", args=(self.compensation.id,))
+        self.report_url = reverse("compensation:report", args=(self.compensation.id,))
+        self.state_new_url = reverse("compensation:new-state", args=(self.compensation.id,))
+        self.action_new_url = reverse("compensation:new-action", args=(self.compensation.id,))
+        self.deadline_new_url = reverse("compensation:new-deadline", args=(self.compensation.id,))
+        self.deadline_edit_url = reverse("compensation:deadline-edit", args=(self.compensation.id, self.deadline.id))
+        self.deadline_remove_url = reverse("compensation:deadline-remove", args=(self.compensation.id, self.deadline.id))
+        self.new_doc_url = reverse("compensation:new-doc", args=(self.compensation.id,))
+
+        self.state_remove_url = reverse("compensation:state-remove", args=(self.compensation.id, self.comp_state.id,))
+        self.action_remove_url = reverse("compensation:action-remove", args=(self.compensation.id, self.comp_action.id,))
+
+    def test_anonymous_user(self):
+        """ Check correct status code for all requests
+
+        Assumption: User not logged in
+
+        Returns:
+
+        """
+        client = Client()
+
+        success_urls = [
+            self.report_url,
+        ]
+        fail_urls = [
+            self.index_url,
+            self.detail_url,
+            self.new_url,
+            self.new_id_url,
+            self.log_url,
+            self.edit_url,
+            self.remove_url,
+            self.state_new_url,
+            self.action_new_url,
+            self.deadline_new_url,
+            self.deadline_edit_url,
+            self.deadline_remove_url,
+            self.state_remove_url,
+            self.action_remove_url,
+            self.new_doc_url,
+        ]
+
+        self.assert_url_success(client, success_urls)
+        self.assert_url_fail(client, fail_urls)
+
+    def test_logged_in_no_groups_shared(self):
+        """ Check correct status code for all requests
+
+        Assumption: User logged in and has no groups and data is shared
+
+        Returns:
+
+        """
+        client = Client()
+        client.login(username=self.superuser.username, password=self.superuser_pw)
+        self.superuser.groups.set([])
+        self.intervention.share_with_user_list([self.superuser])
+
+        # Since the user has no groups, it does not matter that data has been shared. There SHOULD not be any difference
+        # to a user without access, since the important permissions are missing
+        success_urls = [
+            self.index_url,
+            self.detail_url,
+            self.report_url,
+        ]
+        fail_urls = [
+            self.new_url,
+            self.new_id_url,
+            self.log_url,
+            self.edit_url,
+            self.remove_url,
+            self.state_new_url,
+            self.action_new_url,
+            self.deadline_new_url,
+            self.deadline_edit_url,
+            self.deadline_remove_url,
+            self.state_remove_url,
+            self.action_remove_url,
+            self.new_doc_url,
+        ]
+
+        self.assert_url_success(client, success_urls)
+        self.assert_url_fail(client, fail_urls)
+
+    def test_logged_in_no_groups_unshared(self):
+        """ Check correct status code for all requests
+
+        Assumption: User logged in and has no groups and data is not shared
+
+        Returns:
+
+        """
+        client = Client()
+        client.login(username=self.superuser.username, password=self.superuser_pw)
+        self.superuser.groups.set([])
+        # Sharing is inherited by base intervention for compensation. Therefore configure the interventions share state
+        self.intervention.share_with_user_list([])
+
+        # Since the user has no groups, it does not matter that data is unshared. There SHOULD not be any difference
+        # to a user having shared access, since all important permissions are missing
+        success_urls = [
+            self.index_url,
+            self.detail_url,
+            self.report_url,
+        ]
+        fail_urls = [
+            self.new_url,
+            self.new_id_url,
+            self.log_url,
+            self.edit_url,
+            self.remove_url,
+            self.state_new_url,
+            self.action_new_url,
+            self.deadline_new_url,
+            self.deadline_edit_url,
+            self.deadline_remove_url,
+            self.state_remove_url,
+            self.action_remove_url,
+            self.new_doc_url,
+        ]
+
+        self.assert_url_success(client, success_urls)
+        self.assert_url_fail(client, fail_urls)
+
+    def test_logged_in_default_group_shared(self):
+        """ Check correct status code for all requests
+
+        Assumption: User logged in, is default group member and data is shared
+        --> Default group necessary since all base functionalities depend on this group membership
+
+        Returns:
+
+        """
+        client = Client()
+        client.login(username=self.superuser.username, password=self.superuser_pw)
+        group = self.groups.get(name=DEFAULT_GROUP)
+        self.superuser.groups.set([group])
+        # Sharing is inherited by base intervention for compensation. Therefore configure the interventions share state
+        self.intervention.share_with_user_list([self.superuser])
+
+        success_urls = [
+            self.index_url,
+            self.detail_url,
+            self.report_url,
+            self.new_url,
+            self.new_id_url,
+            self.edit_url,
+            self.state_new_url,
+            self.action_new_url,
+            self.deadline_new_url,
+            self.deadline_edit_url,
+            self.deadline_remove_url,
+            self.state_remove_url,
+            self.action_remove_url,
+            self.new_doc_url,
+            self.log_url,
+            self.remove_url,
+        ]
+        self.assert_url_success(client, success_urls)
+
+    def test_logged_in_default_group_unshared(self):
+        """ Check correct status code for all requests
+
+        Assumption: User logged in, is default group member and data is NOT shared
+        --> Default group necessary since all base functionalities depend on this group membership
+
+        Returns:
+
+        """
+        client = Client()
+        client.login(username=self.superuser.username, password=self.superuser_pw)
+        group = self.groups.get(name=DEFAULT_GROUP)
+        self.superuser.groups.set([group])
+        # Sharing is inherited by base intervention for compensation. Therefore configure the interventions share state
+        self.intervention.share_with_user_list([])
+
+        success_urls = [
+            self.index_url,
+            self.detail_url,
+            self.report_url,
+            self.new_id_url,
+        ]
+        fail_urls = [
+            self.new_url,
+            self.edit_url,
+            self.state_new_url,
+            self.action_new_url,
+            self.deadline_new_url,
+            self.deadline_edit_url,
+            self.deadline_remove_url,
+            self.state_remove_url,
+            self.action_remove_url,
+            self.new_doc_url,
+            self.log_url,
+            self.remove_url,
+        ]
+        self.assert_url_fail(client, fail_urls)
+        self.assert_url_success(client, success_urls)
+

compensation/tests/compensation/test_workflow.py

@@ -2,7 +2,7 @@
 Author: Michel Peltriaux
 Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
 Contact: michel.peltriaux@sgdnord.rlp.de
-Created on: 11.11.21
+Created on: 07.02.22
 
 """
 import datetime
@@ -11,7 +11,7 @@ from django.contrib.gis.geos import MultiPolygon
 from django.urls import reverse
 
 from compensation.models import Compensation
-from konova.settings import ETS_GROUP, ZB_GROUP
+from konova.settings import ZB_GROUP, ETS_GROUP
 from konova.tests.test_views import BaseWorkflowTestCase
 from user.models import UserAction
 
@@ -21,17 +21,18 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
     def setUpTestData(cls):
         super().setUpTestData()
 
-        # Give the user shared access to the dummy intervention -> inherits the access to the compensation
-        cls.intervention.share_with(cls.superuser)
-
-        # Make sure the intervention itself would be fine with valid data
-        cls.intervention = cls.fill_out_intervention(cls.intervention)
-
-        # Make sure the compensation is linked to the intervention
-        cls.intervention.compensations.set([cls.compensation])
-
     def setUp(self) -> None:
         super().setUp()
+
+        # Give the user shared access to the dummy intervention -> inherits the access to the compensation
+        self.intervention.share_with_user(self.superuser)
+
+        # Make sure the intervention itself would be fine with valid data
+        self.intervention = self.fill_out_intervention(self.intervention)
+
+        # Make sure the compensation is linked to the intervention
+        self.intervention.compensations.set([self.compensation])
+        
         # Delete all existing compensations, which might be created by tests
         Compensation.objects.all().delete()
 
@@ -55,6 +56,7 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
             "geom": test_geom.geojson,
             "intervention": self.intervention.id,
         }
+        pre_creation_intervention_log_count = self.intervention.log.count()
 
         # Preserve the current number of intervention's compensations
         num_compensations = self.intervention.compensations.count()
@@ -66,6 +68,13 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
         self.assertEqual(new_compensation.identifier, test_id)
         self.assertEqual(new_compensation.title, test_title)
         self.assert_equal_geometries(new_compensation.geometry.geom, test_geom)
+        self.assertEqual(new_compensation.log.count(), 1)
+
+        # Expect logs to be set
+        self.assertEqual(pre_creation_intervention_log_count + 1, self.intervention.log.count())
+        self.assertEqual(new_compensation.log.count(), 1)
+        self.assertEqual(self.intervention.log.first().action, UserAction.EDITED)
+        self.assertEqual(new_compensation.log.first().action, UserAction.CREATED)
 
     def test_new_from_intervention(self):
         """ Test the creation of a compensation from a given intervention
@@ -83,6 +92,7 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
             "title": test_title,
             "geom": test_geom.geojson,
         }
+        pre_creation_intervention_log_count = self.intervention.log.count()
 
         # Preserve the current number of intervention's compensations
         num_compensations = self.intervention.compensations.count()
@@ -95,6 +105,12 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
         self.assertEqual(new_compensation.title, test_title)
         self.assert_equal_geometries(new_compensation.geometry.geom, test_geom)
 
+        # Expect logs to be set
+        self.assertEqual(new_compensation.log.count(), 1)
+        self.assertEqual(new_compensation.log.first().action, UserAction.CREATED)
+        self.assertEqual(pre_creation_intervention_log_count + 1, self.intervention.log.count())
+        self.assertEqual(self.intervention.log.first().action, UserAction.EDITED)
+
     def test_edit(self):
         """ Checks that the editing of a compensation works
 
@@ -103,6 +119,7 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
         """
         url = reverse("compensation:edit", args=(self.compensation.id,))
         self.compensation = self.fill_out_compensation(self.compensation)
+        pre_edit_log_count = self.compensation.log.count()
 
         new_title = self.create_dummy_string()
         new_identifier = self.create_dummy_string()
@@ -138,6 +155,10 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
 
         self.assert_equal_geometries(self.compensation.geometry.geom, new_geometry)
 
+        # Expect logs to be set
+        self.assertEqual(pre_edit_log_count + 1, self.compensation.log.count())
+        self.assertEqual(self.compensation.log.first().action, UserAction.EDITED)
+
     def test_checkability(self):
         """
         This tests if the checkability of the compensation (which is defined by the linked intervention's checked
@@ -152,6 +173,8 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
         # Add proper privilege for the user
         self.superuser.groups.add(self.groups.get(name=ZB_GROUP))
 
+        pre_check_log_count = self.compensation.log.count()
+
         # Prepare url and form data
         url = reverse("intervention:check", args=(self.intervention.id,))
         post_data = {
@@ -186,6 +209,7 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
 
         # Expect the user action to be in the log
         self.assertIn(checked, self.compensation.log.all())
+        self.assertEqual(pre_check_log_count + 1, self.compensation.log.count())
 
     def test_recordability(self):
         """
@@ -200,6 +224,7 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
         """
         # Add proper privilege for the user
         self.superuser.groups.add(self.groups.get(name=ETS_GROUP))
+        pre_record_log_count = self.compensation.log.count()
 
         # Prepare url and form data
         record_url = reverse("intervention:record", args=(self.intervention.id,))
@@ -234,62 +259,5 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
 
         # Expect the user action to be in the log
         self.assertIn(recorded, self.compensation.log.all())
-
-
-class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
-    @classmethod
-    def setUpTestData(cls):
-        super().setUpTestData()
-
-        # Add user to conservation office group and give shared access to the account
-        cls.superuser.groups.add(cls.groups.get(name=ETS_GROUP))
-        cls.eco_account.share_with_list([cls.superuser])
-
-    def test_deductability(self):
-        """
-        This tests the deductability of an eco account.
-
-        An eco account should only be deductible if it is recorded.
-
-        Returns:
-
-        """
-        # Give user shared access to the dummy intervention, which will be needed here
-        self.intervention.share_with(self.superuser)
-
-        # Prepare data for deduction creation
-        deduct_url = reverse("compensation:acc-new-deduction", args=(self.eco_account.id,))
-        test_surface = 10.00
-        post_data = {
-            "surface": test_surface,
-            "account": self.id,
-            "intervention": self.intervention.id,
-        }
-        # Perform request --> expect to fail
-        self.client_user.post(deduct_url, post_data)
-
-        # Expect that no deduction has been created
-        self.assertEqual(0, self.eco_account.deductions.count())
-        self.assertEqual(0, self.intervention.deductions.count())
-
-        # Now mock the eco account as it would be recorded (with invalid data)
-        # Make sure the deductible surface is high enough for the request
-        self.eco_account.set_recorded(self.superuser)
-        self.eco_account.refresh_from_db()
-        self.eco_account.deductable_surface = test_surface + 1.00
-        self.eco_account.save()
-        self.assertIsNotNone(self.eco_account.recorded)
-        self.assertGreater(self.eco_account.deductable_surface, test_surface)
-
-        # Rerun the request
-        self.client_user.post(deduct_url, post_data)
-
-        # Expect that the deduction has been created
-        self.assertEqual(1, self.eco_account.deductions.count())
-        self.assertEqual(1, self.intervention.deductions.count())
-        deduction = self.eco_account.deductions.first()
-        self.assertEqual(deduction.surface, test_surface)
-        self.assertEqual(deduction.account, self.eco_account)
-        self.assertEqual(deduction.intervention, self.intervention)
-
+        self.assertEqual(pre_record_log_count + 1, self.compensation.log.count())
 

compensation/tests/ecoaccount/__init__.py

@@ -0,0 +1,7 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: michel.peltriaux@sgdnord.rlp.de
+Created on: 07.02.22
+
+"""

compensation/tests/ecoaccount/test_views.py

@@ -0,0 +1,229 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: michel.peltriaux@sgdnord.rlp.de
+Created on: 27.10.21
+
+"""
+from django.urls import reverse
+from django.test import Client
+
+from compensation.tests.compensation.test_views import CompensationViewTestCase
+from konova.models import DeadlineType, Deadline
+from konova.settings import DEFAULT_GROUP
+
+
+class EcoAccountViewTestCase(CompensationViewTestCase):
+    """
+    These tests focus on proper returned views depending on the user's groups privileges and login status
+
+    EcoAccounts can inherit the same tests used for compensations.
+
+    """
+    comp_state = None
+    comp_action = None
+
+    @classmethod
+    def setUpTestData(cls) -> None:
+        super().setUpTestData()
+        
+    def setUp(self) -> None:
+        super().setUp()
+        state = self.create_dummy_states()
+        self.eco_account.before_states.set([state])
+        self.eco_account.after_states.set([state])
+
+        action = self.create_dummy_action()
+        self.eco_account.actions.set([action])
+
+        # Prepare urls
+        self.index_url = reverse("compensation:acc:index", args=())
+        self.new_url = reverse("compensation:acc:new", args=())
+        self.new_id_url = reverse("compensation:acc:new-id", args=())
+        self.detail_url = reverse("compensation:acc:detail", args=(self.eco_account.id,))
+        self.log_url = reverse("compensation:acc:log", args=(self.eco_account.id,))
+        self.edit_url = reverse("compensation:acc:edit", args=(self.eco_account.id,))
+        self.remove_url = reverse("compensation:acc:remove", args=(self.eco_account.id,))
+        self.report_url = reverse("compensation:acc:report", args=(self.eco_account.id,))
+
+        self.state_new_url = reverse("compensation:acc:new-state", args=(self.eco_account.id,))
+        self.state_edit_url = reverse("compensation:acc:state-edit", args=(self.eco_account.id, self.comp_state.id))
+        self.state_remove_url = reverse("compensation:acc:state-remove", args=(self.eco_account.id, self.comp_state.id,))
+
+        self.action_new_url = reverse("compensation:acc:new-action", args=(self.eco_account.id,))
+        self.action_edit_url = reverse("compensation:acc:action-edit", args=(self.eco_account.id, self.comp_action.id))
+        self.action_remove_url = reverse("compensation:acc:action-remove", args=(self.eco_account.id, self.comp_action.id,))
+
+        self.deadline = Deadline.objects.get_or_create(
+            type=DeadlineType.FINISHED,
+            date="2020-01-01",
+            comment="DEADLINE COMMENT"
+        )[0]
+        self.eco_account.deadlines.add(self.deadline)
+
+        self.deadline_new_url = reverse("compensation:acc:new-deadline", args=(self.eco_account.id,))
+        self.deadline_edit_url = reverse("compensation:acc:deadline-edit", args=(self.eco_account.id, self.deadline.id))
+        self.deadline_remove_url = reverse("compensation:acc:deadline-remove", args=(self.eco_account.id, self.deadline.id))
+
+        self.new_doc_url = reverse("compensation:acc:new-doc", args=(self.eco_account.id,))
+
+    def test_logged_in_no_groups_shared(self):
+        """ Check correct status code for all requests
+
+        Assumption: User logged in and has no groups and data is shared
+
+        Returns:
+
+        """
+        client = Client()
+        client.login(username=self.superuser.username, password=self.superuser_pw)
+        self.superuser.groups.set([])
+        self.eco_account.share_with_user_list([self.superuser])
+
+        # Since the user has no groups, it does not matter that data has been shared. There SHOULD not be any difference
+        # to a user without access, since the important permissions are missing
+        success_urls = [
+            self.index_url,
+            self.detail_url,
+            self.report_url,
+        ]
+        fail_urls = [
+            self.new_url,
+            self.new_id_url,
+            self.log_url,
+            self.edit_url,
+            self.remove_url,
+            self.state_new_url,
+            self.state_edit_url,
+            self.state_remove_url,
+            self.action_new_url,
+            self.action_edit_url,
+            self.action_remove_url,
+            self.deadline_new_url,
+            self.deadline_edit_url,
+            self.deadline_remove_url,
+            self.new_doc_url,
+        ]
+
+        self.assert_url_success(client, success_urls)
+        self.assert_url_fail(client, fail_urls)
+
+    def test_logged_in_no_groups_unshared(self):
+        """ Check correct status code for all requests
+
+        Assumption: User logged in and has no groups and data is shared
+
+        Returns:
+
+        """
+        client = Client()
+        client.login(username=self.superuser.username, password=self.superuser_pw)
+        self.superuser.groups.set([])
+        self.eco_account.share_with_user_list([])
+
+        # Since the user has no groups, it does not matter that data is unshared. There SHOULD not be any difference
+        # to a user having shared access, since all important permissions are missing
+        success_urls = [
+            self.index_url,
+            self.detail_url,
+            self.report_url,
+        ]
+        fail_urls = [
+            self.new_url,
+            self.new_id_url,
+            self.log_url,
+            self.edit_url,
+            self.remove_url,
+            self.state_new_url,
+            self.state_edit_url,
+            self.state_remove_url,
+            self.action_new_url,
+            self.action_edit_url,
+            self.action_remove_url,
+            self.deadline_new_url,
+            self.deadline_edit_url,
+            self.deadline_remove_url,
+            self.new_doc_url,
+        ]
+
+        self.assert_url_success(client, success_urls)
+        self.assert_url_fail(client, fail_urls)
+
+    def test_logged_in_default_group_shared(self):
+        """ Check correct status code for all requests
+
+        Assumption: User logged in, is default group member and data is shared
+        --> Default group necessary since all base functionalities depend on this group membership
+
+        Returns:
+
+        """
+        client = Client()
+        client.login(username=self.superuser.username, password=self.superuser_pw)
+        group = self.groups.get(name=DEFAULT_GROUP)
+        self.superuser.groups.set([group])
+        # Sharing is inherited by base intervention for compensation. Therefore configure the interventions share state
+        self.eco_account.share_with_user_list([self.superuser])
+
+        success_urls = [
+            self.index_url,
+            self.detail_url,
+            self.report_url,
+            self.new_url,
+            self.new_id_url,
+            self.edit_url,
+            self.state_new_url,
+            self.state_edit_url,
+            self.state_remove_url,
+            self.action_new_url,
+            self.action_edit_url,
+            self.action_remove_url,
+            self.new_doc_url,
+            self.deadline_new_url,
+            self.deadline_edit_url,
+            self.deadline_remove_url,
+            self.log_url,
+            self.remove_url,
+        ]
+        self.assert_url_success(client, success_urls)
+
+    def test_logged_in_default_group_unshared(self):
+        """ Check correct status code for all requests
+
+        Assumption: User logged in, is default group member and data is NOT shared
+        --> Default group necessary since all base functionalities depend on this group membership
+
+        Returns:
+
+        """
+        client = Client()
+        client.login(username=self.superuser.username, password=self.superuser_pw)
+        group = self.groups.get(name=DEFAULT_GROUP)
+        self.superuser.groups.set([group])
+        self.eco_account.share_with_user_list([])
+
+        success_urls = [
+            self.index_url,
+            self.detail_url,
+            self.report_url,
+            self.new_id_url,
+            self.new_url,
+        ]
+        fail_urls = [
+            self.edit_url,
+            self.state_new_url,
+            self.state_edit_url,
+            self.state_remove_url,
+            self.action_new_url,
+            self.action_edit_url,
+            self.action_remove_url,
+            self.new_doc_url,
+            self.log_url,
+            self.remove_url,
+            self.deadline_new_url,
+            self.deadline_edit_url,
+            self.deadline_remove_url,
+        ]
+        self.assert_url_fail(client, fail_urls)
+        self.assert_url_success(client, success_urls)
+

compensation/tests/ecoaccount/test_workflow.py

@@ -0,0 +1,304 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: michel.peltriaux@sgdnord.rlp.de
+Created on: 11.11.21
+
+"""
+import datetime
+
+from django.contrib.gis.geos import MultiPolygon
+from django.core.exceptions import ObjectDoesNotExist
+from django.urls import reverse
+
+from compensation.models import EcoAccount, EcoAccountDeduction
+from konova.settings import ETS_GROUP, DEFAULT_GROUP
+from konova.tests.test_views import BaseWorkflowTestCase
+from user.models import UserAction
+
+
+class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
+
+    def setUp(self) -> None:
+        super().setUp()
+        # Add user to conservation office group and give shared access to the account
+        self.superuser.groups.add(self.groups.get(name=DEFAULT_GROUP))
+        self.superuser.groups.add(self.groups.get(name=ETS_GROUP))
+        self.eco_account.share_with_user_list([self.superuser])
+
+    def test_new(self):
+        """ Test the creation of an EcoAccount
+
+        Returns:
+
+        """
+        # Prepare url and form data to be posted
+        new_url = reverse("compensation:acc:new")
+        test_id = self.create_dummy_string()
+        test_title = self.create_dummy_string()
+        test_geom = self.create_dummy_geometry()
+        test_deductable_surface = 1000
+        test_conservation_office = self.get_conservation_office_code()
+        post_data = {
+            "identifier": test_id,
+            "title": test_title,
+            "geom": test_geom.geojson,
+            "deductable_surface": test_deductable_surface,
+            "conservation_office": test_conservation_office.id
+        }
+        self.client_user.post(new_url, post_data)
+
+        try:
+            acc = EcoAccount.objects.get(
+                identifier=test_id
+            )
+        except ObjectDoesNotExist:
+            self.fail(msg="EcoAccount not created")
+
+        self.assertEqual(acc.identifier, test_id)
+        self.assertEqual(acc.title, test_title)
+        self.assert_equal_geometries(acc.geometry.geom, test_geom)
+        self.assertEqual(acc.log.count(), 1)
+
+        # Expect logs to be set
+        self.assertEqual(acc.log.count(), 1)
+        self.assertEqual(acc.log.first().action, UserAction.CREATED)
+
+    def test_edit(self):
+        """ Checks that the editing of an EcoAccount works
+
+        Returns:
+
+        """
+        self.eco_account.share_with_user(self.superuser)
+
+        url = reverse("compensation:acc:edit", args=(self.eco_account.id,))
+        pre_edit_log_count = self.eco_account.log.count()
+
+        new_title = self.create_dummy_string()
+        new_identifier = self.create_dummy_string()
+        new_comment = self.create_dummy_string()
+        new_geometry = MultiPolygon(srid=4326)  # Create an empty geometry
+        test_conservation_office = self.get_conservation_office_code()
+        test_deductable_surface = 10005
+
+        check_on_elements = {
+            self.eco_account.title: new_title,
+            self.eco_account.identifier: new_identifier,
+            self.eco_account.comment: new_comment,
+            self.eco_account.deductable_surface: test_deductable_surface,
+        }
+        for k, v in check_on_elements.items():
+            self.assertNotEqual(k, v)
+
+        post_data = {
+            "identifier": new_identifier,
+            "title": new_title,
+            "comment": new_comment,
+            "geom": new_geometry.geojson,
+            "surface": test_deductable_surface,
+            "conservation_office": test_conservation_office.id
+        }
+        self.client_user.post(url, post_data)
+        self.eco_account.refresh_from_db()
+
+        check_on_elements = {
+            self.eco_account.title: new_title,
+            self.eco_account.identifier: new_identifier,
+            self.eco_account.deductable_surface: test_deductable_surface,
+            self.eco_account.comment: new_comment,
+        }
+
+        for k, v in check_on_elements.items():
+            self.assertEqual(k, v)
+
+        self.assert_equal_geometries(self.eco_account.geometry.geom, new_geometry)
+
+        # Expect logs to be set
+        self.assertEqual(pre_edit_log_count + 1, self.eco_account.log.count())
+        self.assertEqual(self.eco_account.log.first().action, UserAction.EDITED)
+
+    def test_recordability(self):
+        """
+        This tests if the recordability of the EcoAccount is triggered by the quality of it's data (e.g. not all fields filled)
+
+        Returns:
+
+        """
+        # Add proper privilege for the user
+        self.eco_account.share_with_user(self.superuser)
+        pre_record_log_count = self.eco_account.log.count()
+
+        # Prepare url and form data
+        record_url = reverse("compensation:acc:record", args=(self.eco_account.id,))
+        post_data = {
+            "confirm": True,
+        }
+        self.eco_account.refresh_from_db()
+
+        # Make sure the account is not recorded
+        self.assertIsNone(self.eco_account.recorded)
+
+        # Run the request --> expect fail, since the account is not valid, yet
+        self.client_user.post(record_url, post_data)
+
+        # Check that the account is still not recorded
+        self.assertIsNone(self.eco_account.recorded)
+
+        # Now fill out the data for an ecoaccount
+        self.eco_account = self.fill_out_eco_account(self.eco_account)
+
+        # Rerun the request
+        self.client_user.post(record_url, post_data)
+
+        # Expect the EcoAccount now to be recorded
+        # Attention: We can only test the date part of the timestamp,
+        # since the delay in microseconds would lead to fail
+        self.eco_account.refresh_from_db()
+        recorded = self.eco_account.recorded
+        self.assertIsNotNone(recorded)
+        self.assertEqual(self.superuser, recorded.user)
+        self.assertEqual(UserAction.RECORDED, recorded.action)
+        self.assertEqual(datetime.date.today(), recorded.timestamp.date())
+
+        # Expect the user action to be in the log
+        self.assertIn(recorded, self.eco_account.log.all())
+        self.assertEqual(pre_record_log_count + 1, self.eco_account.log.count())
+
+    def test_new_deduction(self):
+        """
+        This tests the deductability of an eco account.
+
+        An eco account should only be deductible if it is recorded.
+
+        Returns:
+
+        """
+        # Give user shared access to the dummy intervention, which will be needed here
+        self.intervention.share_with_user(self.superuser)
+        pre_deduction_acc_log_count = self.eco_account.log.count()
+        pre_deduction_int_log_count = self.intervention.log.count()
+
+        # Prepare data for deduction creation
+        deduct_url = reverse("compensation:acc:new-deduction", args=(self.eco_account.id,))
+        test_surface = 10.00
+        post_data = {
+            "surface": test_surface,
+            "account": self.eco_account.id,
+            "intervention": self.intervention.id,
+        }
+        # Perform request --> expect to fail
+        self.client_user.post(deduct_url, post_data)
+
+        # Expect that no deduction has been created
+        self.assertEqual(0, self.eco_account.deductions.count())
+        self.assertEqual(0, self.intervention.deductions.count())
+        self.assertEqual(pre_deduction_acc_log_count, 0)
+        self.assertEqual(pre_deduction_int_log_count, 0)
+
+        # Now mock the eco account as it would be recorded (with invalid data)
+        # Make sure the deductible surface is high enough for the request
+        self.eco_account.set_recorded(self.superuser)
+        self.eco_account.refresh_from_db()
+        self.eco_account.deductable_surface = test_surface + 1.00
+        self.eco_account.save()
+        self.assertIsNotNone(self.eco_account.recorded)
+        self.assertGreater(self.eco_account.deductable_surface, test_surface)
+        # Expect the recorded entry in the log
+        self.assertEqual(pre_deduction_acc_log_count + 1, self.eco_account.log.count())
+        self.assertTrue(self.eco_account.log.first().action == UserAction.RECORDED)
+
+        # Rerun the request
+        self.client_user.post(deduct_url, post_data)
+
+        # Expect that the deduction has been created
+        self.assertEqual(1, self.eco_account.deductions.count())
+        self.assertEqual(1, self.intervention.deductions.count())
+        deduction = self.eco_account.deductions.first()
+        self.assertEqual(deduction.surface, test_surface)
+        self.assertEqual(deduction.account, self.eco_account)
+        self.assertEqual(deduction.intervention, self.intervention)
+
+        # Expect entries in the log
+        self.assertEqual(pre_deduction_acc_log_count + 2, self.eco_account.log.count())
+        self.assertTrue(self.eco_account.log.first().action == UserAction.EDITED)
+        self.assertEqual(pre_deduction_int_log_count + 1, self.intervention.log.count())
+        self.assertTrue(self.intervention.log.first().action == UserAction.EDITED)
+
+    def test_edit_deduction(self):
+        test_surface = self.eco_account.get_available_rest()[0]
+        self.eco_account.set_recorded(self.superuser)
+        self.intervention.share_with_user(self.superuser)
+        self.eco_account.refresh_from_db()
+        self.assertTrue(self.superuser, self.intervention.is_shared_with(self.superuser))
+
+        deduction = EcoAccountDeduction.objects.create(
+            intervention=self.intervention,
+            account=self.eco_account,
+            surface=0
+        )
+        self.assertEqual(1, self.intervention.deductions.count())
+        self.assertEqual(1, self.eco_account.deductions.count())
+
+        # Prepare url and form data to be posted
+        new_url = reverse("compensation:acc:edit-deduction", args=(self.eco_account.id, deduction.id))
+        post_data = {
+            "intervention": deduction.intervention.id,
+            "account": deduction.account.id,
+            "surface": test_surface,
+        }
+        pre_edit_intervention_log_count = self.intervention.log.count()
+        pre_edit_account_log_count = self.eco_account.log.count()
+        num_deductions_intervention = self.intervention.deductions.count()
+        num_deductions_account = self.eco_account.deductions.count()
+
+        self.client_user.post(new_url, post_data)
+
+        self.intervention.refresh_from_db()
+        self.eco_account.refresh_from_db()
+        deduction.refresh_from_db()
+
+        self.assertEqual(num_deductions_intervention, self.intervention.deductions.count())
+        self.assertEqual(num_deductions_account, self.eco_account.deductions.count())
+        self.assertEqual(deduction.surface, test_surface)
+
+        # Expect logs to be set
+        self.assertEqual(pre_edit_intervention_log_count + 1, self.intervention.log.count())
+        self.assertEqual(pre_edit_account_log_count + 1, self.eco_account.log.count())
+        self.assertEqual(self.intervention.log.first().action, UserAction.EDITED)
+        self.assertEqual(self.eco_account.log.first().action, UserAction.EDITED)
+
+    def test_remove_deduction(self):
+        intervention = self.deduction.intervention
+        account = self.deduction.account
+
+        # Prepare url and form data to be posted
+        new_url = reverse("compensation:acc:remove-deduction", args=(account.id, self.deduction.id))
+        post_data = {
+            "confirm": True,
+        }
+
+        intervention.share_with_user(self.superuser)
+        account.share_with_user(self.superuser)
+
+        pre_edit_intervention_log_count = intervention.log.count()
+        pre_edit_account_log_count = account.log.count()
+        num_deductions_intervention = intervention.deductions.count()
+        num_deductions_account = account.deductions.count()
+
+        self.client_user.post(new_url, post_data)
+
+        intervention.refresh_from_db()
+        account.refresh_from_db()
+
+        self.assertEqual(num_deductions_intervention - 1, intervention.deductions.count())
+        self.assertEqual(num_deductions_account - 1, account.deductions.count())
+
+        # Expect logs to be set
+        self.assertEqual(pre_edit_intervention_log_count + 1, intervention.log.count())
+        self.assertEqual(pre_edit_account_log_count + 1, account.log.count())
+        self.assertEqual(intervention.log.first().action, UserAction.EDITED)
+        self.assertEqual(account.log.first().action, UserAction.EDITED)

compensation/tests/payment/__init__.py

@@ -0,0 +1,7 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: michel.peltriaux@sgdnord.rlp.de
+Created on: 09.02.22
+
+"""

compensation/tests/payment/test_views.py

@@ -0,0 +1,156 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: michel.peltriaux@sgdnord.rlp.de
+Created on: 09.02.22
+
+"""
+from django.urls import reverse
+from django.test.client import Client
+
+from compensation.models import Payment
+from konova.settings import DEFAULT_GROUP
+from konova.tests.test_views import BaseViewTestCase
+
+
+class PaymentViewTestCase(BaseViewTestCase):
+
+    @classmethod
+    def setUpTestData(cls) -> None:
+        super().setUpTestData()
+
+    def setUp(self) -> None:
+        super().setUp()
+        self.payment = Payment.objects.get_or_create(
+            intervention=self.intervention,
+            amount=1,
+            due_on="2020-01-01",
+            comment="Testcomment"
+        )[0]
+
+        self.new_url = reverse("compensation:pay:new", args=(self.intervention.id,))
+        self.edit_url = reverse("compensation:pay:edit", args=(self.intervention.id, self.payment.id))
+        self.remove_url = reverse("compensation:pay:remove", args=(self.intervention.id, self.payment.id))
+
+    def test_anonymous_user(self):
+        """ Check correct status code for all requests
+
+        Assumption: User not logged in
+
+        Returns:
+
+        """
+        client = Client()
+
+        success_urls = [
+        ]
+        fail_urls = [
+            self.new_url,
+            self.edit_url,
+            self.remove_url,
+        ]
+
+        self.assert_url_success(client, success_urls)
+        self.assert_url_fail(client, fail_urls)
+
+    def test_logged_in_no_groups_shared(self):
+        """ Check correct status code for all requests
+
+        Assumption: User logged in and has no groups and data is shared
+
+        Returns:
+
+        """
+        client = Client()
+        client.login(username=self.superuser.username, password=self.superuser_pw)
+        self.superuser.groups.set([])
+        self.intervention.share_with_user_list([self.superuser])
+
+        # Since the user has no groups, it does not matter that data has been shared. There SHOULD not be any difference
+        # to a user without access, since the important permissions are missing
+        success_urls = [
+        ]
+        fail_urls = [
+            self.new_url,
+            self.edit_url,
+            self.remove_url,
+        ]
+
+        self.assert_url_success(client, success_urls)
+        self.assert_url_fail(client, fail_urls)
+
+    def test_logged_in_no_groups_unshared(self):
+        """ Check correct status code for all requests
+
+        Assumption: User logged in and has no groups and data is not shared
+
+        Returns:
+
+        """
+        client = Client()
+        client.login(username=self.superuser.username, password=self.superuser_pw)
+        self.superuser.groups.set([])
+        # Sharing is inherited by base intervention for compensation. Therefore configure the interventions share state
+        self.intervention.share_with_user_list([])
+
+        # Since the user has no groups, it does not matter that data is unshared. There SHOULD not be any difference
+        # to a user having shared access, since all important permissions are missing
+        success_urls = [
+        ]
+        fail_urls = [
+            self.new_url,
+            self.edit_url,
+            self.remove_url,
+        ]
+
+        self.assert_url_success(client, success_urls)
+        self.assert_url_fail(client, fail_urls)
+
+    def test_logged_in_default_group_shared(self):
+        """ Check correct status code for all requests
+
+        Assumption: User logged in, is default group member and data is shared
+        --> Default group necessary since all base functionalities depend on this group membership
+
+        Returns:
+
+        """
+        client = Client()
+        client.login(username=self.superuser.username, password=self.superuser_pw)
+        group = self.groups.get(name=DEFAULT_GROUP)
+        self.superuser.groups.set([group])
+        # Sharing is inherited by base intervention for compensation. Therefore configure the interventions share state
+        self.intervention.share_with_user_list([self.superuser])
+
+        success_urls = [
+            self.new_url,
+            self.edit_url,
+            self.remove_url,
+        ]
+        self.assert_url_success(client, success_urls)
+
+    def test_logged_in_default_group_unshared(self):
+        """ Check correct status code for all requests
+
+        Assumption: User logged in, is default group member and data is NOT shared
+        --> Default group necessary since all base functionalities depend on this group membership
+
+        Returns:
+
+        """
+        client = Client()
+        client.login(username=self.superuser.username, password=self.superuser_pw)
+        group = self.groups.get(name=DEFAULT_GROUP)
+        self.superuser.groups.set([group])
+        # Sharing is inherited by base intervention for compensation. Therefore configure the interventions share state
+        self.intervention.share_with_user_list([])
+
+        success_urls = [
+        ]
+        fail_urls = [
+            self.new_url,
+            self.edit_url,
+            self.remove_url,
+        ]
+        self.assert_url_fail(client, fail_urls)
+        self.assert_url_success(client, success_urls)

compensation/tests/payment/test_workflow.py

@@ -0,0 +1,127 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: michel.peltriaux@sgdnord.rlp.de
+Created on: 09.02.22
+
+"""
+from django.core.exceptions import ObjectDoesNotExist
+from django.urls import reverse
+
+from compensation.models import Payment
+from konova.tests.test_views import BaseWorkflowTestCase
+from user.models import UserAction
+
+
+class PaymentWorkflowTestCase(BaseWorkflowTestCase):
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
+
+    def setUp(self) -> None:
+        super().setUp()
+        # Give the user shared access to the dummy intervention
+        self.intervention.share_with_user(self.superuser)
+
+        self.payment = Payment.objects.get_or_create(
+            intervention=self.intervention,
+            amount=1,
+            due_on="2020-01-01",
+            comment="Testcomment"
+        )[0]
+
+    def test_new(self):
+        """ Test the creation of a payment
+
+        Returns:
+
+        """
+        # Prepare url and form data to be posted
+        new_url = reverse("compensation:pay:new", args=(self.intervention.id,))
+        test_amount = 12345
+        test_due_on = "1970-01-01"
+        test_comment = self.create_dummy_string()
+        post_data = {
+            "amount": test_amount,
+            "due": test_due_on,
+            "comment": test_comment,
+        }
+        pre_creation_intervention_log_count = self.intervention.log.count()
+        num_payments = self.intervention.payments.count()
+
+        self.client_user.post(new_url, post_data)
+
+        self.intervention.refresh_from_db()
+
+        self.assertEqual(num_payments + 1, self.intervention.payments.count())
+        new_payment = self.intervention.payments.get(amount=test_amount)
+        self.assertEqual(new_payment.amount, test_amount)
+        self.assertEqual(str(new_payment.due_on), test_due_on)
+        self.assertEqual(new_payment.comment, test_comment)
+
+        # Expect logs to be set
+        self.assertEqual(pre_creation_intervention_log_count + 1, self.intervention.log.count())
+        self.assertEqual(self.intervention.log.first().action, UserAction.EDITED)
+
+    def test_edit(self):
+        """ Test edit of a payment
+
+        Returns:
+
+        """
+        # Prepare url and form data to be posted
+        new_url = reverse("compensation:pay:edit", args=(self.intervention.id, self.payment.id))
+        test_amount = self.payment.amount * 2
+        test_due_on = "1970-01-01"
+        test_comment = self.create_dummy_string()
+        post_data = {
+            "amount": test_amount,
+            "due": test_due_on,
+            "comment": test_comment,
+        }
+        pre_edit_intervention_log_count = self.intervention.log.count()
+        num_payments = self.intervention.payments.count()
+
+        self.client_user.post(new_url, post_data)
+
+        self.intervention.refresh_from_db()
+        self.payment.refresh_from_db()
+
+        self.assertEqual(num_payments, self.intervention.payments.count())
+        self.assertEqual(self.payment.amount, test_amount)
+        self.assertEqual(str(self.payment.due_on), test_due_on)
+        self.assertEqual(self.payment.comment, test_comment)
+
+        # Expect logs to be set
+        self.assertEqual(pre_edit_intervention_log_count + 1, self.intervention.log.count())
+        self.assertEqual(self.intervention.log.first().action, UserAction.EDITED)
+
+    def test_remove(self):
+        """ Test remove of a payment
+
+        Returns:
+
+        """
+        # Prepare url and form data to be posted
+        new_url = reverse("compensation:pay:remove", args=(self.intervention.id, self.payment.id))
+        post_data = {
+            "confirm": True,
+        }
+        pre_remove_intervention_log_count = self.intervention.log.count()
+        num_payments = self.intervention.payments.count()
+
+        self.client_user.post(new_url, post_data)
+
+        self.intervention.refresh_from_db()
+        try:
+            self.payment.refresh_from_db()
+            self.fail(msg="Payment still exists after delete")
+        except ObjectDoesNotExist:
+            pass
+
+        self.assertEqual(num_payments - 1, self.intervention.payments.count())
+
+        # Expect logs to be set
+        self.assertEqual(pre_remove_intervention_log_count + 1, self.intervention.log.count())
+        self.assertEqual(self.intervention.log.first().action, UserAction.EDITED)
+

compensation/tests/test_views.py

@@ -1,406 +0,0 @@
-"""
-Author: Michel Peltriaux
-Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
-Contact: michel.peltriaux@sgdnord.rlp.de
-Created on: 27.10.21
-
-"""
-from django.urls import reverse
-from django.test import Client
-
-from konova.settings import DEFAULT_GROUP
-from konova.tests.test_views import BaseViewTestCase
-
-
-class CompensationViewTestCase(BaseViewTestCase):
-    """
-    These tests focus on proper returned views depending on the user's groups privileges and login status
-
-    """
-
-    @classmethod
-    def setUpTestData(cls) -> None:
-        super().setUpTestData()
-        state = cls.create_dummy_states()
-        cls.compensation.before_states.set([state])
-        cls.compensation.after_states.set([state])
-
-        action = cls.create_dummy_action()
-        cls.compensation.actions.set([action])
-
-        # Prepare urls
-        cls.index_url = reverse("compensation:index", args=())
-        cls.new_url = reverse("compensation:new", args=(cls.intervention.id,))
-        cls.new_id_url = reverse("compensation:new-id", args=())
-        cls.detail_url = reverse("compensation:detail", args=(cls.compensation.id,))
-        cls.log_url = reverse("compensation:log", args=(cls.compensation.id,))
-        cls.edit_url = reverse("compensation:edit", args=(cls.compensation.id,))
-        cls.remove_url = reverse("compensation:remove", args=(cls.compensation.id,))
-        cls.report_url = reverse("compensation:report", args=(cls.compensation.id,))
-        cls.state_new_url = reverse("compensation:new-state", args=(cls.compensation.id,))
-        cls.action_new_url = reverse("compensation:new-action", args=(cls.compensation.id,))
-        cls.deadline_new_url = reverse("compensation:new-deadline", args=(cls.compensation.id,))
-        cls.new_doc_url = reverse("compensation:new-doc", args=(cls.compensation.id,))
-
-        cls.state_remove_url = reverse("compensation:state-remove", args=(cls.compensation.id, cls.comp_state.id,))
-        cls.action_remove_url = reverse("compensation:action-remove", args=(cls.compensation.id, cls.comp_action.id,))
-
-    def test_anonymous_user(self):
-        """ Check correct status code for all requests
-
-        Assumption: User not logged in
-
-        Returns:
-
-        """
-        client = Client()
-
-        success_urls = [
-            self.report_url,
-        ]
-        fail_urls = [
-            self.index_url,
-            self.detail_url,
-            self.new_url,
-            self.new_id_url,
-            self.log_url,
-            self.edit_url,
-            self.remove_url,
-            self.state_new_url,
-            self.action_new_url,
-            self.deadline_new_url,
-            self.state_remove_url,
-            self.action_remove_url,
-            self.new_doc_url,
-        ]
-
-        self.assert_url_success(client, success_urls)
-        self.assert_url_fail(client, fail_urls)
-
-    def test_logged_in_no_groups_shared(self):
-        """ Check correct status code for all requests
-
-        Assumption: User logged in and has no groups and data is shared
-
-        Returns:
-
-        """
-        client = Client()
-        client.login(username=self.superuser.username, password=self.superuser_pw)
-        self.superuser.groups.set([])
-        self.intervention.share_with_list([self.superuser])
-
-        # Since the user has no groups, it does not matter that data has been shared. There SHOULD not be any difference
-        # to a user without access, since the important permissions are missing
-        success_urls = [
-            self.index_url,
-            self.detail_url,
-            self.report_url,
-        ]
-        fail_urls = [
-            self.new_url,
-            self.new_id_url,
-            self.log_url,
-            self.edit_url,
-            self.remove_url,
-            self.state_new_url,
-            self.action_new_url,
-            self.deadline_new_url,
-            self.state_remove_url,
-            self.action_remove_url,
-            self.new_doc_url,
-        ]
-
-        self.assert_url_success(client, success_urls)
-        self.assert_url_fail(client, fail_urls)
-
-    def test_logged_in_no_groups_unshared(self):
-        """ Check correct status code for all requests
-
-        Assumption: User logged in and has no groups and data is shared
-
-        Returns:
-
-        """
-        client = Client()
-        client.login(username=self.superuser.username, password=self.superuser_pw)
-        self.superuser.groups.set([])
-        # Sharing is inherited by base intervention for compensation. Therefore configure the interventions share state
-        self.intervention.share_with_list([])
-
-        # Since the user has no groups, it does not matter that data is unshared. There SHOULD not be any difference
-        # to a user having shared access, since all important permissions are missing
-        success_urls = [
-            self.index_url,
-            self.detail_url,
-            self.report_url,
-        ]
-        fail_urls = [
-            self.new_url,
-            self.new_id_url,
-            self.log_url,
-            self.edit_url,
-            self.remove_url,
-            self.state_new_url,
-            self.action_new_url,
-            self.deadline_new_url,
-            self.state_remove_url,
-            self.action_remove_url,
-            self.new_doc_url,
-        ]
-
-        self.assert_url_success(client, success_urls)
-        self.assert_url_fail(client, fail_urls)
-
-    def test_logged_in_default_group_shared(self):
-        """ Check correct status code for all requests
-
-        Assumption: User logged in, is default group member and data is shared
-        --> Default group necessary since all base functionalities depend on this group membership
-
-        Returns:
-
-        """
-        client = Client()
-        client.login(username=self.superuser.username, password=self.superuser_pw)
-        group = self.groups.get(name=DEFAULT_GROUP)
-        self.superuser.groups.set([group])
-        # Sharing is inherited by base intervention for compensation. Therefore configure the interventions share state
-        self.intervention.share_with_list([self.superuser])
-
-        success_urls = [
-            self.index_url,
-            self.detail_url,
-            self.report_url,
-            self.new_url,
-            self.new_id_url,
-            self.edit_url,
-            self.state_new_url,
-            self.action_new_url,
-            self.deadline_new_url,
-            self.state_remove_url,
-            self.action_remove_url,
-            self.new_doc_url,
-            self.log_url,
-            self.remove_url,
-        ]
-        self.assert_url_success(client, success_urls)
-
-    def test_logged_in_default_group_unshared(self):
-        """ Check correct status code for all requests
-
-        Assumption: User logged in, is default group member and data is NOT shared
-        --> Default group necessary since all base functionalities depend on this group membership
-
-        Returns:
-
-        """
-        client = Client()
-        client.login(username=self.superuser.username, password=self.superuser_pw)
-        group = self.groups.get(name=DEFAULT_GROUP)
-        self.superuser.groups.set([group])
-        # Sharing is inherited by base intervention for compensation. Therefore configure the interventions share state
-        self.intervention.share_with_list([])
-
-        success_urls = [
-            self.index_url,
-            self.detail_url,
-            self.report_url,
-            self.new_id_url,
-        ]
-        fail_urls = [
-            self.new_url,
-            self.edit_url,
-            self.state_new_url,
-            self.action_new_url,
-            self.deadline_new_url,
-            self.state_remove_url,
-            self.action_remove_url,
-            self.new_doc_url,
-            self.log_url,
-            self.remove_url,
-        ]
-        self.assert_url_fail(client, fail_urls)
-        self.assert_url_success(client, success_urls)
-
-
-class EcoAccountViewTestCase(CompensationViewTestCase):
-    """
-    These tests focus on proper returned views depending on the user's groups privileges and login status
-
-    EcoAccounts can inherit the same tests used for compensations.
-
-    """
-    comp_state = None
-    comp_action = None
-
-    @classmethod
-    def setUpTestData(cls) -> None:
-        super().setUpTestData()
-        state = cls.create_dummy_states()
-        cls.eco_account.before_states.set([state])
-        cls.eco_account.after_states.set([state])
-
-        action = cls.create_dummy_action()
-        cls.eco_account.actions.set([action])
-
-        # Prepare urls
-        cls.index_url = reverse("compensation:acc-index", args=())
-        cls.new_url = reverse("compensation:acc-new", args=())
-        cls.new_id_url = reverse("compensation:acc-new-id", args=())
-        cls.detail_url = reverse("compensation:acc-detail", args=(cls.eco_account.id,))
-        cls.log_url = reverse("compensation:acc-log", args=(cls.eco_account.id,))
-        cls.edit_url = reverse("compensation:acc-edit", args=(cls.eco_account.id,))
-        cls.remove_url = reverse("compensation:acc-remove", args=(cls.eco_account.id,))
-        cls.report_url = reverse("compensation:acc-report", args=(cls.eco_account.id,))
-        cls.state_new_url = reverse("compensation:acc-new-state", args=(cls.eco_account.id,))
-        cls.action_new_url = reverse("compensation:acc-new-action", args=(cls.eco_account.id,))
-        cls.deadline_new_url = reverse("compensation:acc-new-deadline", args=(cls.eco_account.id,))
-        cls.new_doc_url = reverse("compensation:acc-new-doc", args=(cls.eco_account.id,))
-        cls.state_remove_url = reverse("compensation:acc-state-remove", args=(cls.eco_account.id, cls.comp_state.id,))
-        cls.action_remove_url = reverse("compensation:acc-action-remove", args=(cls.eco_account.id, cls.comp_action.id,))
-
-    def test_logged_in_no_groups_shared(self):
-        """ Check correct status code for all requests
-
-        Assumption: User logged in and has no groups and data is shared
-
-        Returns:
-
-        """
-        client = Client()
-        client.login(username=self.superuser.username, password=self.superuser_pw)
-        self.superuser.groups.set([])
-        self.eco_account.share_with_list([self.superuser])
-
-        # Since the user has no groups, it does not matter that data has been shared. There SHOULD not be any difference
-        # to a user without access, since the important permissions are missing
-        success_urls = [
-            self.index_url,
-            self.detail_url,
-            self.report_url,
-        ]
-        fail_urls = [
-            self.new_url,
-            self.new_id_url,
-            self.log_url,
-            self.edit_url,
-            self.remove_url,
-            self.state_new_url,
-            self.action_new_url,
-            self.deadline_new_url,
-            self.state_remove_url,
-            self.action_remove_url,
-            self.new_doc_url,
-        ]
-
-        self.assert_url_success(client, success_urls)
-        self.assert_url_fail(client, fail_urls)
-
-    def test_logged_in_no_groups_unshared(self):
-        """ Check correct status code for all requests
-
-        Assumption: User logged in and has no groups and data is shared
-
-        Returns:
-
-        """
-        client = Client()
-        client.login(username=self.superuser.username, password=self.superuser_pw)
-        self.superuser.groups.set([])
-        self.eco_account.share_with_list([])
-
-        # Since the user has no groups, it does not matter that data is unshared. There SHOULD not be any difference
-        # to a user having shared access, since all important permissions are missing
-        success_urls = [
-            self.index_url,
-            self.detail_url,
-            self.report_url,
-        ]
-        fail_urls = [
-            self.new_url,
-            self.new_id_url,
-            self.log_url,
-            self.edit_url,
-            self.remove_url,
-            self.state_new_url,
-            self.action_new_url,
-            self.deadline_new_url,
-            self.state_remove_url,
-            self.action_remove_url,
-            self.new_doc_url,
-        ]
-
-        self.assert_url_success(client, success_urls)
-        self.assert_url_fail(client, fail_urls)
-
-    def test_logged_in_default_group_shared(self):
-        """ Check correct status code for all requests
-
-        Assumption: User logged in, is default group member and data is shared
-        --> Default group necessary since all base functionalities depend on this group membership
-
-        Returns:
-
-        """
-        client = Client()
-        client.login(username=self.superuser.username, password=self.superuser_pw)
-        group = self.groups.get(name=DEFAULT_GROUP)
-        self.superuser.groups.set([group])
-        # Sharing is inherited by base intervention for compensation. Therefore configure the interventions share state
-        self.eco_account.share_with_list([self.superuser])
-
-        success_urls = [
-            self.index_url,
-            self.detail_url,
-            self.report_url,
-            self.new_url,
-            self.new_id_url,
-            self.edit_url,
-            self.state_new_url,
-            self.action_new_url,
-            self.deadline_new_url,
-            self.state_remove_url,
-            self.action_remove_url,
-            self.new_doc_url,
-            self.log_url,
-            self.remove_url,
-        ]
-        self.assert_url_success(client, success_urls)
-
-    def test_logged_in_default_group_unshared(self):
-        """ Check correct status code for all requests
-
-        Assumption: User logged in, is default group member and data is NOT shared
-        --> Default group necessary since all base functionalities depend on this group membership
-
-        Returns:
-
-        """
-        client = Client()
-        client.login(username=self.superuser.username, password=self.superuser_pw)
-        group = self.groups.get(name=DEFAULT_GROUP)
-        self.superuser.groups.set([group])
-        self.eco_account.share_with_list([])
-
-        success_urls = [
-            self.index_url,
-            self.detail_url,
-            self.report_url,
-            self.new_id_url,
-            self.new_url,
-        ]
-        fail_urls = [
-            self.edit_url,
-            self.state_new_url,
-            self.action_new_url,
-            self.deadline_new_url,
-            self.state_remove_url,
-            self.action_remove_url,
-            self.new_doc_url,
-            self.log_url,
-            self.remove_url,
-        ]
-        self.assert_url_fail(client, fail_urls)
-        self.assert_url_success(client, success_urls)
-

compensation/urls/compensation.py

@@ -18,16 +18,24 @@ urlpatterns = [
     path('<id>/log', log_view, name='log'),
     path('<id>/edit', edit_view, name='edit'),
     path('<id>/remove', remove_view, name='remove'),
+
     path('<id>/state/new', state_new_view, name='new-state'),
-    path('<id>/action/new', action_new_view, name='new-action'),
+    path('<id>/state/<state_id>/edit', state_edit_view, name='state-edit'),
     path('<id>/state/<state_id>/remove', state_remove_view, name='state-remove'),
+
+    path('<id>/action/new', action_new_view, name='new-action'),
+    path('<id>/action/<action_id>/edit', action_edit_view, name='action-edit'),
     path('<id>/action/<action_id>/remove', action_remove_view, name='action-remove'),
+
     path('<id>/deadline/new', deadline_new_view, name="new-deadline"),
+    path('<id>/deadline/<deadline_id>/edit', deadline_edit_view, name='deadline-edit'),
+    path('<id>/deadline/<deadline_id>/remove', deadline_remove_view, name='deadline-remove'),
     path('<id>/report', report_view, name='report'),
 
     # Documents
     path('<id>/document/new/', new_document_view, name='new-doc'),
-    path('document/<doc_id>', get_document_view, name='get-doc'),
-    path('document/<doc_id>/remove/', remove_document_view, name='remove-doc'),
+    path('<id>/document/<doc_id>', get_document_view, name='get-doc'),
+    path('<id>/document/<doc_id>/remove/', remove_document_view, name='remove-doc'),
+    path('<id>/document/<doc_id>/edit/', edit_document_view, name='edit-doc'),
 
 ]

compensation/urls/eco_account.py

@@ -8,31 +8,42 @@ Created on: 24.08.21
 from django.urls import path
 from compensation.views.eco_account import *
 
+app_name = "acc"
 urlpatterns = [
-    path("", index_view, name="acc-index"),
-    path('new/', new_view, name='acc-new'),
-    path('new/id', new_id_view, name='acc-new-id'),
-    path('<id>', detail_view, name='acc-detail'),
-    path('<id>/log', log_view, name='acc-log'),
-    path('<id>/record', record_view, name='acc-record'),
-    path('<id>/report', report_view, name='acc-report'),
-    path('<id>/edit', edit_view, name='acc-edit'),
-    path('<id>/remove', remove_view, name='acc-remove'),
-    path('<id>/state/new', state_new_view, name='acc-new-state'),
-    path('<id>/action/new', action_new_view, name='acc-new-action'),
-    path('<id>/state/<state_id>/remove', state_remove_view, name='acc-state-remove'),
-    path('<id>/action/<action_id>/remove', action_remove_view, name='acc-action-remove'),
-    path('<id>/deadline/new', deadline_new_view, name="acc-new-deadline"),
+    path("", index_view, name="index"),
+    path('new/', new_view, name='new'),
+    path('new/id', new_id_view, name='new-id'),
+    path('<id>', detail_view, name='detail'),
+    path('<id>/log', log_view, name='log'),
+    path('<id>/record', record_view, name='record'),
+    path('<id>/report', report_view, name='report'),
+    path('<id>/edit', edit_view, name='edit'),
+    path('<id>/remove', remove_view, name='remove'),
+
+    path('<id>/state/new', state_new_view, name='new-state'),
+    path('<id>/state/<state_id>/edit', state_edit_view, name='state-edit'),
+    path('<id>/state/<state_id>/remove', state_remove_view, name='state-remove'),
+
+    path('<id>/action/new', action_new_view, name='new-action'),
+    path('<id>/action/<action_id>/edit', action_edit_view, name='action-edit'),
+    path('<id>/action/<action_id>/remove', action_remove_view, name='action-remove'),
+
+    path('<id>/deadline/new', deadline_new_view, name="new-deadline"),
+    path('<id>/deadline/<deadline_id>/edit', deadline_edit_view, name='deadline-edit'),
+    path('<id>/deadline/<deadline_id>/remove', deadline_remove_view, name='deadline-remove'),
+
     path('<id>/share/<token>', share_view, name='share'),
     path('<id>/share', create_share_view, name='share-create'),
 
     # Documents
-    path('<id>/document/new/', new_document_view, name='acc-new-doc'),
-    path('document/<doc_id>', get_document_view, name='acc-get-doc'),
-    path('document/<doc_id>/remove/', remove_document_view, name='acc-remove-doc'),
+    path('<id>/document/new/', new_document_view, name='new-doc'),
+    path('<id>/document/<doc_id>', get_document_view, name='get-doc'),
+    path('<id>/document/<doc_id>/edit', edit_document_view, name='edit-doc'),
+    path('<id>/document/<doc_id>/remove/', remove_document_view, name='remove-doc'),
 
     # Eco-account deductions
-    path('<id>/remove/<deduction_id>', deduction_remove_view, name='acc-remove-deduction'),
-    path('<id>/deduct/new', new_deduction_view, name='acc-new-deduction'),
+    path('<id>/deduction/<deduction_id>/remove', deduction_remove_view, name='remove-deduction'),
+    path('<id>/deduction/<deduction_id>/edit', deduction_edit_view, name='edit-deduction'),
+    path('<id>/deduct/new', new_deduction_view, name='new-deduction'),
 
 ]

compensation/urls/payment.py

@@ -8,7 +8,9 @@ Created on: 24.08.21
 from django.urls import path
 from compensation.views.payment import *
 
+app_name = "pay"
 urlpatterns = [
-    path('<intervention_id>/new', new_payment_view, name='pay-new'),
-    path('<id>/remove', payment_remove_view, name='pay-remove'),
+    path('<id>/new', new_payment_view, name='new'),
+    path('<id>/remove/<payment_id>', payment_remove_view, name='remove'),
+    path('<id>/edit/<payment_id>', payment_edit_view, name='edit'),
 ]

compensation/urls/urls.py

@@ -10,6 +10,6 @@ from django.urls import path, include
 app_name = "compensation"
 urlpatterns = [
     path("", include("compensation.urls.compensation")),
-    path("acc/", include("compensation.urls.eco_account")),
-    path("pay/", include("compensation.urls.payment")),
+    path("acc/", include("compensation.urls.eco_account", namespace="acc")),
+    path("pay/", include("compensation.urls.payment", namespace="pay")),
 ]

compensation/views/compensation.py

@@ -6,18 +6,23 @@ from django.utils.translation import gettext_lazy as _
 
 from compensation.forms.forms import NewCompensationForm, EditCompensationForm
 from compensation.forms.modalForms import NewStateModalForm, NewDeadlineModalForm, NewActionModalForm, \
-    NewCompensationDocumentForm
+    NewCompensationDocumentModalForm, RemoveCompensationActionModalForm, RemoveCompensationStateModalForm, \
+    EditCompensationStateModalForm, EditCompensationActionModalForm, EditDeadlineModalForm
 from compensation.models import Compensation, CompensationState, CompensationAction, CompensationDocument
 from compensation.tables import CompensationTable
 from intervention.models import Intervention
 from konova.contexts import BaseContext
 from konova.decorators import *
-from konova.forms import RemoveModalForm, SimpleGeomForm
+from konova.forms import RemoveModalForm, SimpleGeomForm, RemoveDeadlineModalForm, EditDocumentModalForm
+from konova.models import Deadline
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import get_document, remove_document
 from konova.utils.generators import generate_qr_code
 from konova.utils.message_templates import FORM_INVALID, IDENTIFIER_REPLACED, DATA_UNSHARED_EXPLANATION, \
-    CHECKED_RECORDED_RESET
+    CHECKED_RECORDED_RESET, COMPENSATION_ADDED_TEMPLATE, COMPENSATION_REMOVED_TEMPLATE, DOCUMENT_ADDED, \
+    COMPENSATION_STATE_REMOVED, COMPENSATION_STATE_ADDED, COMPENSATION_ACTION_REMOVED, COMPENSATION_ACTION_ADDED, \
+    DEADLINE_ADDED, DEADLINE_REMOVED, DOCUMENT_EDITED, COMPENSATION_STATE_EDITED, COMPENSATION_ACTION_EDITED, \
+    DEADLINE_EDITED
 from konova.utils.user_checks import in_group
 
 
@@ -78,7 +83,7 @@ def new_view(request: HttpRequest, intervention_id: str = None):
                         comp.identifier
                     )
                 )
-            messages.success(request, _("Compensation {} added").format(comp.identifier))
+            messages.success(request, COMPENSATION_ADDED_TEMPLATE.format(comp.identifier))
             return redirect("compensation:detail", id=comp.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger",)
@@ -255,7 +260,7 @@ def remove_view(request: HttpRequest, id: str):
     form = RemoveModalForm(request.POST or None, instance=comp, request=request)
     return form.process_request(
         request=request,
-        msg_success=_("Compensation removed"),
+        msg_success=COMPENSATION_REMOVED_TEMPLATE.format(comp.identifier),
         redirect_url=reverse("compensation:index"),
     )
 
@@ -273,54 +278,52 @@ def new_document_view(request: HttpRequest, id: str):
 
     """
     comp = get_object_or_404(Compensation, id=id)
-    form = NewCompensationDocumentForm(request.POST or None, request.FILES or None, instance=comp, request=request)
+    form = NewCompensationDocumentModalForm(request.POST or None, request.FILES or None, instance=comp, request=request)
     return form.process_request(
         request,
-        msg_success=_("Document added")
+        msg_success=DOCUMENT_ADDED,
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
 @login_required
 @default_group_required
-def get_document_view(request: HttpRequest, doc_id: str):
+@shared_access_required(Compensation, "id")
+def get_document_view(request: HttpRequest, id: str, doc_id: str):
     """ Returns the document as downloadable file
 
     Wraps the generic document fetcher function from konova.utils.
 
     Args:
         request (HttpRequest): The incoming request
+        id (str): The compensation id
         doc_id (str): The document id
 
     Returns:
 
     """
+    comp = get_object_or_404(Compensation, id=id)
     doc = get_object_or_404(CompensationDocument, id=doc_id)
-    user = request.user
-    instance = doc.instance
-    # File download only possible if related instance is shared with user
-    if not instance.users.filter(id=user.id):
-        messages.info(
-            request,
-            DATA_UNSHARED
-        )
-        return redirect("compensation:detail", id=instance.id)
     return get_document(doc)
 
 
 @login_required
 @default_group_required
-def remove_document_view(request: HttpRequest, doc_id: str):
+@shared_access_required(Compensation, "id")
+def remove_document_view(request: HttpRequest, id: str, doc_id: str):
     """ Removes the document from the database and file system
 
     Wraps the generic functionality from konova.utils.
 
     Args:
         request (HttpRequest): The incoming request
+        id (str): The compensation id
         doc_id (str): The document id
 
     Returns:
 
     """
+    comp = get_object_or_404(Compensation, id=id)
     doc = get_object_or_404(CompensationDocument, id=doc_id)
     return remove_document(
         request,
@@ -328,6 +331,32 @@ def remove_document_view(request: HttpRequest, doc_id: str):
     )
 
 
+@login_required
+@default_group_required
+@shared_access_required(Compensation, "id")
+def edit_document_view(request: HttpRequest, id: str, doc_id: str):
+    """ Removes the document from the database and file system
+
+    Wraps the generic functionality from konova.utils.
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation id
+        doc_id (str): The document id
+
+    Returns:
+
+    """
+    comp = get_object_or_404(Compensation, id=id)
+    doc = get_object_or_404(CompensationDocument, id=doc_id)
+    form = EditDocumentModalForm(request.POST or None, request.FILES or None, instance=comp, document=doc, request=request)
+    return form.process_request(
+        request,
+        DOCUMENT_EDITED,
+        reverse("compensation:detail", args=(id,)) + "#related_data"
+    )
+
+
 @login_required
 @default_group_required
 @shared_access_required(Compensation, "id")
@@ -345,7 +374,8 @@ def state_new_view(request: HttpRequest, id: str):
     form = NewStateModalForm(request.POST or None, instance=comp, request=request)
     return form.process_request(
         request,
-        msg_success=_("State added")
+        msg_success=COMPENSATION_STATE_ADDED,
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -366,7 +396,32 @@ def action_new_view(request: HttpRequest, id: str):
     form = NewActionModalForm(request.POST or None, instance=comp, request=request)
     return form.process_request(
         request,
-        msg_success=_("Action added")
+        msg_success=COMPENSATION_ACTION_ADDED,
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@default_group_required
+@shared_access_required(Compensation, "id")
+def action_edit_view(request: HttpRequest, id: str, action_id: str):
+    """ Renders a form for editing actions for a compensation
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+        action_id (str): The action's id
+
+    Returns:
+
+    """
+    comp = get_object_or_404(Compensation, id=id)
+    action = get_object_or_404(CompensationAction, id=action_id)
+    form = EditCompensationActionModalForm(request.POST or None, instance=comp, action=action, request=request)
+    return form.process_request(
+        request,
+        msg_success=COMPENSATION_ACTION_EDITED,
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -387,7 +442,56 @@ def deadline_new_view(request: HttpRequest, id: str):
     form = NewDeadlineModalForm(request.POST or None, instance=comp, request=request)
     return form.process_request(
         request,
-        msg_success=_("Deadline added")
+        msg_success=DEADLINE_ADDED,
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@default_group_required
+@shared_access_required(Compensation, "id")
+def deadline_edit_view(request: HttpRequest, id: str, deadline_id: str):
+    """ Renders a form for editing deadlines from a compensation
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+        deadline_id (str): The deadline's id
+
+    Returns:
+
+    """
+    comp = get_object_or_404(Compensation, id=id)
+    deadline = get_object_or_404(Deadline, id=deadline_id)
+    form = EditDeadlineModalForm(request.POST or None, instance=comp, deadline=deadline, request=request)
+    return form.process_request(
+        request,
+        msg_success=DEADLINE_EDITED,
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@default_group_required
+@shared_access_required(Compensation, "id")
+def deadline_remove_view(request: HttpRequest, id: str, deadline_id: str):
+    """ Renders a form for removing deadlines from a compensation
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+        deadline_id (str): The deadline's id
+
+    Returns:
+
+    """
+    comp = get_object_or_404(Compensation, id=id)
+    deadline = get_object_or_404(Deadline, id=deadline_id)
+    form = RemoveDeadlineModalForm(request.POST or None, instance=comp, deadline=deadline, request=request)
+    return form.process_request(
+        request,
+        msg_success=DEADLINE_REMOVED,
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -405,11 +509,37 @@ def state_remove_view(request: HttpRequest, id: str, state_id: str):
     Returns:
 
     """
+    comp = get_object_or_404(Compensation, id=id)
     state = get_object_or_404(CompensationState, id=state_id)
-    form = RemoveModalForm(request.POST or None, instance=state, request=request)
+    form = RemoveCompensationStateModalForm(request.POST or None, instance=comp, state=state, request=request)
     return form.process_request(
         request,
-        msg_success=_("State removed")
+        msg_success=COMPENSATION_STATE_REMOVED,
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@default_group_required
+@shared_access_required(Compensation, "id")
+def state_edit_view(request: HttpRequest, id: str, state_id: str):
+    """ Renders a form for editing a compensation state
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+        state_id (str): The state's id
+
+    Returns:
+
+    """
+    comp = get_object_or_404(Compensation, id=id)
+    state = get_object_or_404(CompensationState, id=state_id)
+    form = EditCompensationStateModalForm(request.POST or None, instance=comp, state=state, request=request)
+    return form.process_request(
+        request,
+        msg_success=COMPENSATION_STATE_EDITED,
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -427,11 +557,13 @@ def action_remove_view(request: HttpRequest, id: str, action_id: str):
     Returns:
 
     """
+    comp = get_object_or_404(Compensation, id=id)
     action = get_object_or_404(CompensationAction, id=action_id)
-    form = RemoveModalForm(request.POST or None, instance=action, request=request)
+    form = RemoveCompensationActionModalForm(request.POST or None, instance=comp, action=action, request=request)
     return form.process_request(
         request,
-        msg_success=_("Action removed")
+        msg_success=COMPENSATION_ACTION_REMOVED,
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
     )
 
 

compensation/views/eco_account.py

@@ -16,20 +16,26 @@ from django.shortcuts import render, get_object_or_404, redirect
 
 from compensation.forms.forms import NewEcoAccountForm, EditEcoAccountForm
 from compensation.forms.modalForms import NewStateModalForm, NewActionModalForm, NewDeadlineModalForm, \
-    NewEcoAccountDocumentForm
+    NewEcoAccountDocumentModalForm, RemoveCompensationActionModalForm, RemoveCompensationStateModalForm, \
+    EditCompensationStateModalForm, EditCompensationActionModalForm, EditDeadlineModalForm
 from compensation.models import EcoAccount, EcoAccountDocument, CompensationState, CompensationAction
 from compensation.tables import EcoAccountTable
-from intervention.forms.modalForms import NewDeductionModalForm, ShareModalForm
+from intervention.forms.modalForms import NewDeductionModalForm, ShareModalForm, RemoveEcoAccountDeductionModalForm, \
+    EditEcoAccountDeductionModalForm
 from konova.contexts import BaseContext
 from konova.decorators import any_group_check, default_group_required, conservation_office_group_required, \
     shared_access_required
-from konova.forms import RemoveModalForm, SimpleGeomForm, NewDocumentForm, RecordModalForm
+from konova.forms import RemoveModalForm, SimpleGeomForm, NewDocumentModalForm, RecordModalForm, \
+    RemoveDeadlineModalForm, EditDocumentModalForm
+from konova.models import Deadline
 from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import get_document, remove_document
 from konova.utils.generators import generate_qr_code
 from konova.utils.message_templates import IDENTIFIER_REPLACED, FORM_INVALID, DATA_UNSHARED, DATA_UNSHARED_EXPLANATION, \
-    CANCEL_ACC_RECORDED_OR_DEDUCTED
+    CANCEL_ACC_RECORDED_OR_DEDUCTED, DEDUCTION_REMOVED, DEDUCTION_ADDED, DOCUMENT_ADDED, COMPENSATION_STATE_REMOVED, \
+    COMPENSATION_STATE_ADDED, COMPENSATION_ACTION_REMOVED, COMPENSATION_ACTION_ADDED, DEADLINE_ADDED, DEADLINE_REMOVED, \
+    DEDUCTION_EDITED, DOCUMENT_EDITED, COMPENSATION_STATE_EDITED, COMPENSATION_ACTION_EDITED, DEADLINE_EDITED
 from konova.utils.user_checks import in_group
 
 
@@ -89,7 +95,7 @@ def new_view(request: HttpRequest):
                     )
                 )
             messages.success(request, _("Eco-Account {} added").format(acc.identifier))
-            return redirect("compensation:acc-detail", id=acc.id)
+            return redirect("compensation:acc:detail", id=acc.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger",)
     else:
@@ -147,7 +153,7 @@ def edit_view(request: HttpRequest, id: str):
             # The data form takes the geom form for processing, as well as the performing user
             acc = data_form.save(request.user, geom_form)
             messages.success(request, _("Eco-Account {} edited").format(acc.identifier))
-            return redirect("compensation:acc-detail", id=acc.id)
+            return redirect("compensation:acc:detail", id=acc.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger",)
     else:
@@ -254,19 +260,18 @@ def remove_view(request: HttpRequest, id: str):
         user = request.user
         if not in_group(user, ETS_GROUP):
             messages.info(request, CANCEL_ACC_RECORDED_OR_DEDUCTED)
-            return redirect("compensation:acc-detail", id=id)
+            return redirect("compensation:acc:detail", id=id)
 
     form = RemoveModalForm(request.POST or None, instance=acc, request=request)
     return form.process_request(
         request=request,
         msg_success=_("Eco-account removed"),
-        redirect_url=reverse("compensation:acc-index"),
+        redirect_url=reverse("compensation:acc:index"),
     )
 
 
 @login_required
 @default_group_required
-@shared_access_required(EcoAccount, "id")
 def deduction_remove_view(request: HttpRequest, id: str, deduction_id: str):
     """ Renders a modal view for removing deductions
 
@@ -281,13 +286,45 @@ def deduction_remove_view(request: HttpRequest, id: str, deduction_id: str):
     acc = get_object_or_404(EcoAccount, id=id)
     try:
         eco_deduction = acc.deductions.get(id=deduction_id)
+        if not eco_deduction.intervention.is_shared_with(request.user):
+            raise ObjectDoesNotExist()
     except ObjectDoesNotExist:
         raise Http404("Unknown deduction")
 
-    form = RemoveModalForm(request.POST or None, instance=eco_deduction, request=request)
+    form = RemoveEcoAccountDeductionModalForm(request.POST or None, instance=acc, deduction=eco_deduction, request=request)
     return form.process_request(
         request=request,
-        msg_success=_("Deduction removed")
+        msg_success=DEDUCTION_REMOVED,
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@default_group_required
+def deduction_edit_view(request: HttpRequest, id: str, deduction_id: str):
+    """ Renders a modal view for editing deductions
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The eco account's id
+        deduction_id (str): The deduction's id
+
+    Returns:
+
+    """
+    acc = get_object_or_404(EcoAccount, id=id)
+    try:
+        eco_deduction = acc.deductions.get(id=deduction_id)
+        if not eco_deduction.intervention.is_shared_with(request.user):
+            raise ObjectDoesNotExist
+    except ObjectDoesNotExist:
+        raise Http404("Unknown deduction")
+
+    form = EditEcoAccountDeductionModalForm(request.POST or None, instance=acc, deduction=eco_deduction, request=request)
+    return form.process_request(
+        request=request,
+        msg_success=DEDUCTION_EDITED,
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -357,7 +394,8 @@ def state_new_view(request: HttpRequest, id: str):
     form = NewStateModalForm(request.POST or None, instance=acc, request=request)
     return form.process_request(
         request,
-        msg_success=_("State added")
+        msg_success=COMPENSATION_STATE_ADDED,
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -378,7 +416,8 @@ def action_new_view(request: HttpRequest, id: str):
     form = NewActionModalForm(request.POST or None, instance=acc, request=request)
     return form.process_request(
         request,
-        msg_success=_("Action added")
+        msg_success=COMPENSATION_ACTION_ADDED,
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -396,11 +435,37 @@ def state_remove_view(request: HttpRequest, id: str, state_id: str):
     Returns:
 
     """
+    acc = get_object_or_404(EcoAccount, id=id)
     state = get_object_or_404(CompensationState, id=state_id)
-    form = RemoveModalForm(request.POST or None, instance=state, request=request)
+    form = RemoveCompensationStateModalForm(request.POST or None, instance=acc, state=state, request=request)
     return form.process_request(
         request,
-        msg_success=_("State removed")
+        msg_success=COMPENSATION_STATE_REMOVED,
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@default_group_required
+@shared_access_required(EcoAccount, "id")
+def state_edit_view(request: HttpRequest, id: str, state_id: str):
+    """ Renders a form for editing a compensation state
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+        state_id (str): The state's id
+
+    Returns:
+
+    """
+    acc = get_object_or_404(EcoAccount, id=id)
+    state = get_object_or_404(CompensationState, id=state_id)
+    form = EditCompensationStateModalForm(request.POST or None, instance=acc, state=state, request=request)
+    return form.process_request(
+        request,
+        msg_success=COMPENSATION_STATE_EDITED,
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -418,11 +483,85 @@ def action_remove_view(request: HttpRequest, id: str, action_id: str):
     Returns:
 
     """
+    acc = get_object_or_404(EcoAccount, id=id)
     action = get_object_or_404(CompensationAction, id=action_id)
-    form = RemoveModalForm(request.POST or None, instance=action, request=request)
+    form = RemoveCompensationActionModalForm(request.POST or None, instance=acc, action=action, request=request)
     return form.process_request(
         request,
-        msg_success=_("Action removed")
+        msg_success=COMPENSATION_ACTION_REMOVED,
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@default_group_required
+@shared_access_required(EcoAccount, "id")
+def action_edit_view(request: HttpRequest, id: str, action_id: str):
+    """ Renders a form for editing a compensation action
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+        id (str): The action's id
+
+    Returns:
+
+    """
+    acc = get_object_or_404(EcoAccount, id=id)
+    action = get_object_or_404(CompensationAction, id=action_id)
+    form = EditCompensationActionModalForm(request.POST or None, instance=acc, action=action, request=request)
+    return form.process_request(
+        request,
+        msg_success=COMPENSATION_ACTION_EDITED,
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@default_group_required
+@shared_access_required(EcoAccount, "id")
+def deadline_edit_view(request: HttpRequest, id: str, deadline_id: str):
+    """ Renders a form for editing deadlines from a compensation
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+        deadline_id (str): The deadline's id
+
+    Returns:
+
+    """
+    comp = get_object_or_404(EcoAccount, id=id)
+    deadline = get_object_or_404(Deadline, id=deadline_id)
+    form = EditDeadlineModalForm(request.POST or None, instance=comp, deadline=deadline, request=request)
+    return form.process_request(
+        request,
+        msg_success=DEADLINE_EDITED,
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@default_group_required
+@shared_access_required(EcoAccount, "id")
+def deadline_remove_view(request: HttpRequest, id: str, deadline_id: str):
+    """ Renders a form for removing deadlines from a compensation
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+        deadline_id (str): The deadline's id
+
+    Returns:
+
+    """
+    comp = get_object_or_404(EcoAccount, id=id)
+    deadline = get_object_or_404(Deadline, id=deadline_id)
+    form = RemoveDeadlineModalForm(request.POST or None, instance=comp, deadline=deadline, request=request)
+    return form.process_request(
+        request,
+        msg_success=DEADLINE_REMOVED,
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -443,7 +582,8 @@ def deadline_new_view(request: HttpRequest, id: str):
     form = NewDeadlineModalForm(request.POST or None, instance=acc, request=request)
     return form.process_request(
         request,
-        msg_success=_("Deadline added")
+        msg_success=DEADLINE_ADDED,
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -460,55 +600,78 @@ def new_document_view(request: HttpRequest, id: str):
 
     """
     acc = get_object_or_404(EcoAccount, id=id)
-    form = NewEcoAccountDocumentForm(request.POST or None, request.FILES or None, instance=acc, request=request)
+    form = NewEcoAccountDocumentModalForm(request.POST or None, request.FILES or None, instance=acc, request=request)
     return form.process_request(
         request,
-        msg_success=_("Document added")
+        msg_success=DOCUMENT_ADDED,
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data",
     )
 
 
 @login_required
 @default_group_required
-def get_document_view(request: HttpRequest, doc_id: str):
+@shared_access_required(EcoAccount, "id")
+def get_document_view(request: HttpRequest, id:str, doc_id: str):
     """ Returns the document as downloadable file
 
     Wraps the generic document fetcher function from konova.utils.
 
     Args:
         request (HttpRequest): The incoming request
+        id (str): The account id
         doc_id (str): The document id
 
     Returns:
 
     """
+    acc = get_object_or_404(EcoAccount, id=id)
     doc = get_object_or_404(EcoAccountDocument, id=doc_id)
-    user = request.user
-    instance = doc.instance
-    # File download only possible if related instance is shared with user
-    if not instance.users.filter(id=user.id):
-        messages.info(
-            request,
-            DATA_UNSHARED
-        )
-        return redirect("compensation:acc-detail", id=instance.id)
     return get_document(doc)
 
 
 @login_required
 @default_group_required
 @shared_access_required(EcoAccount, "id")
-def remove_document_view(request: HttpRequest, doc_id: str):
+def edit_document_view(request: HttpRequest, id: str, doc_id: str):
     """ Removes the document from the database and file system
 
     Wraps the generic functionality from konova.utils.
 
     Args:
         request (HttpRequest): The incoming request
+        id (str): The account id
         doc_id (str): The document id
 
     Returns:
 
     """
+    acc = get_object_or_404(EcoAccount, id=id)
+    doc = get_object_or_404(EcoAccountDocument, id=doc_id)
+    form = EditDocumentModalForm(request.POST or None, request.FILES or None, instance=acc, document=doc, request=request)
+    return form.process_request(
+        request,
+        DOCUMENT_EDITED,
+        reverse("compensation:acc:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@default_group_required
+@shared_access_required(EcoAccount, "id")
+def remove_document_view(request: HttpRequest, id: str, doc_id: str):
+    """ Removes the document from the database and file system
+
+    Wraps the generic functionality from konova.utils.
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The account id
+        doc_id (str): The document id
+
+    Returns:
+
+    """
+    acc = get_object_or_404(EcoAccount, id=id)
     doc = get_object_or_404(EcoAccountDocument, id=doc_id)
     return remove_document(
         request,
@@ -518,7 +681,6 @@ def remove_document_view(request: HttpRequest, doc_id: str):
 
 @login_required
 @default_group_required
-@shared_access_required(EcoAccount, "id")
 def new_deduction_view(request: HttpRequest, id: str):
     """ Renders a modal form view for creating deductions
 
@@ -530,10 +692,13 @@ def new_deduction_view(request: HttpRequest, id: str):
 
     """
     acc = get_object_or_404(EcoAccount, id=id)
+    if not acc.recorded:
+        raise Http404()
     form = NewDeductionModalForm(request.POST or None, instance=acc, request=request)
     return form.process_request(
         request,
-        msg_success=_("Deduction added")
+        msg_success=DEDUCTION_ADDED,
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -631,8 +796,8 @@ def share_view(request: HttpRequest, id: str, token: str):
                 request,
                 _("{} has been shared with you").format(obj.identifier)
             )
-            obj.share_with(user)
-        return redirect("compensation:acc-detail", id=id)
+            obj.share_with_user(user)
+        return redirect("compensation:acc:detail", id=id)
     else:
         messages.error(
             request,

compensation/views/payment.py

@@ -5,54 +5,86 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 09.08.21
 
 """
+from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.decorators import login_required
 from django.http import HttpRequest
 from django.shortcuts import get_object_or_404
 
-from compensation.forms.modalForms import NewPaymentForm
+from compensation.forms.modalForms import NewPaymentForm, RemovePaymentModalForm, EditPaymentModalForm
 from compensation.models import Payment
 from intervention.models import Intervention
-from konova.decorators import default_group_required
+from konova.decorators import default_group_required, shared_access_required
 from konova.forms import RemoveModalForm
+from konova.utils.message_templates import PAYMENT_ADDED, PAYMENT_REMOVED, PAYMENT_EDITED
 
 
 @login_required
 @default_group_required
-def new_payment_view(request: HttpRequest, intervention_id: str):
+@shared_access_required(Intervention, "id")
+def new_payment_view(request: HttpRequest, id: str):
     """ Renders a modal view for adding new payments
 
     Args:
         request (HttpRequest): The incoming request
-        intervention_id (str): The intervention's id for which a new payment shall be added
+        id (str): The intervention's id for which a new payment shall be added
 
     Returns:
 
     """
-    intervention = get_object_or_404(Intervention, id=intervention_id)
+    intervention = get_object_or_404(Intervention, id=id)
     form = NewPaymentForm(request.POST or None, instance=intervention, request=request)
     return form.process_request(
         request,
-        msg_success=_("Payment added")
+        msg_success=PAYMENT_ADDED,
+        redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data"
     )
 
 
 @login_required
 @default_group_required
-def payment_remove_view(request: HttpRequest, id: str):
+@shared_access_required(Intervention, "id")
+def payment_remove_view(request: HttpRequest, id: str, payment_id: str):
     """ Renders a modal view for removing payments
 
     Args:
         request (HttpRequest): The incoming request
-        id (str): The payment's id
+        id (str): The intervention's id
+        payment_id (str): The payment's id
 
     Returns:
 
     """
-    payment = get_object_or_404(Payment, id=id)
-    form = RemoveModalForm(request.POST or None, instance=payment, request=request)
+    intervention = get_object_or_404(Intervention, id=id)
+    payment = get_object_or_404(Payment, id=payment_id)
+    form = RemovePaymentModalForm(request.POST or None, instance=intervention, payment=payment, request=request)
     return form.process_request(
         request=request,
-        msg_success=_("Payment removed"),
+        msg_success=PAYMENT_REMOVED,
+        redirect_url=reverse("intervention:detail", args=(payment.intervention_id,)) + "#related_data"
+    )
+
+
+@login_required
+@default_group_required
+@shared_access_required(Intervention, "id")
+def payment_edit_view(request: HttpRequest, id: str, payment_id: str):
+    """ Renders a modal view for editing payments
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The intervention's id
+        payment_id (str): The payment's id
+
+    Returns:
+
+    """
+    intervention = get_object_or_404(Intervention, id=id)
+    payment = get_object_or_404(Payment, id=payment_id)
+    form = EditPaymentModalForm(request.POST or None, instance=intervention, payment=payment, request=request)
+    return form.process_request(
+        request=request,
+        msg_success=PAYMENT_EDITED,
+        redirect_url=reverse("intervention:detail", args=(payment.intervention_id,)) + "#related_data"
     )
 

ema/forms.py

@@ -15,7 +15,7 @@ from django.utils.translation import gettext_lazy as _
 from compensation.forms.forms import AbstractCompensationForm, CompensationResponsibleFormMixin
 from ema.models import Ema, EmaDocument
 from intervention.models import Responsibility
-from konova.forms import SimpleGeomForm, NewDocumentForm
+from konova.forms import SimpleGeomForm, NewDocumentModalForm
 from user.models import UserActionLogEntry
 
 
@@ -80,7 +80,7 @@ class NewEmaForm(AbstractCompensationForm, CompensationResponsibleFormMixin):
             )
 
             # Add the creating user to the list of shared users
-            acc.share_with(user)
+            acc.share_with_user(user)
 
             # Add the log entry to the main objects log list
             acc.log.add(action)
@@ -150,5 +150,5 @@ class EditEmaForm(NewEmaForm):
         return self.instance
 
 
-class NewEmaDocumentForm(NewDocumentForm):
+class NewEmaDocumentModalForm(NewDocumentModalForm):
     document_model = EmaDocument

ema/migrations/0003_ema_teams.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.1.3 on 2022-02-18 09:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0003_team'),
+        ('ema', '0002_auto_20220114_0936'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ema',
+            name='teams',
+            field=models.ManyToManyField(help_text='Teams having access (data shared with)', to='user.Team'),
+        ),
+    ]

ema/models/ema.py

@@ -11,13 +11,14 @@ from django.contrib import messages
 from django.db import models
 from django.db.models import QuerySet
 from django.http import HttpRequest
+from django.urls import reverse
 
 from compensation.models import AbstractCompensation
 from ema.managers import EmaManager
 from ema.utils.quality import EmaQualityChecker
 from konova.models import AbstractDocument, generate_document_file_upload_path, RecordableObjectMixin, ShareableObjectMixin
 from konova.settings import DEFAULT_SRID_RLP, LANIS_LINK_TEMPLATE
-from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION
+from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION, DOCUMENT_REMOVED_TEMPLATE
 
 
 class Ema(AbstractCompensation, ShareableObjectMixin, RecordableObjectMixin):
@@ -50,28 +51,6 @@ class Ema(AbstractCompensation, ShareableObjectMixin, RecordableObjectMixin):
             self.identifier = new_id
         super().save(*args, **kwargs)
 
-    def get_LANIS_link(self) -> str:
-        """ Generates a link for LANIS depending on the geometry
-
-        Returns:
-
-        """
-        try:
-            geom = self.geometry.geom.transform(DEFAULT_SRID_RLP, clone=True)
-            x = geom.centroid.x
-            y = geom.centroid.y
-            zoom_lvl = 16
-        except AttributeError:
-            # If no geometry has been added, yet.
-            x = 1
-            y = 1
-            zoom_lvl = 6
-        return LANIS_LINK_TEMPLATE.format(
-            zoom_lvl,
-            x,
-            y,
-        )
-
     def quality_check(self) -> EmaQualityChecker:
         """ Quality check
 
@@ -119,6 +98,14 @@ class Ema(AbstractCompensation, ShareableObjectMixin, RecordableObjectMixin):
         is_ready = is_recorded
         return is_ready
 
+    def get_share_link(self):
+        """ Returns the share url for the object
+
+        Returns:
+
+        """
+        return reverse("ema:share", args=(self.id, self.access_token))
+
 
 class EmaDocument(AbstractDocument):
     """
@@ -134,7 +121,7 @@ class EmaDocument(AbstractDocument):
         max_length=1000,
     )
 
-    def delete(self, *args, **kwargs):
+    def delete(self, user=None, *args, **kwargs):
         """
         Custom delete functionality for EcoAccountDocuments.
         Removes the folder from the file system if there are no further documents for this entry.
@@ -156,6 +143,9 @@ class EmaDocument(AbstractDocument):
             folder_path = self.file.path.split("/")[:-1]
             folder_path = "/".join(folder_path)
 
+        if user:
+            self.instance.mark_as_edited(user, edit_comment=DOCUMENT_REMOVED_TEMPLATE.format(self.title))
+
         # Remove the file itself
         super().delete(*args, **kwargs)
 

ema/tables.py

@@ -6,6 +6,7 @@ Created on: 19.08.21
 
 """
 from django.http import HttpRequest
+from django.template.loader import render_to_string
 from django.utils.html import format_html
 from django.utils.timezone import localtime
 from django.utils.translation import gettext_lazy as _
@@ -34,6 +35,11 @@ class EmaTable(BaseTable, TableRenderMixin):
         orderable=True,
         accessor="title",
     )
+    d = tables.Column(
+        verbose_name=_("Parcel gmrkng"),
+        orderable=True,
+        accessor="geometry",
+    )
     r = tables.Column(
         verbose_name=_("Recorded"),
         orderable=True,
@@ -87,6 +93,29 @@ class EmaTable(BaseTable, TableRenderMixin):
         )
         return format_html(html)
 
+    def render_d(self, value, record: Ema):
+        """ Renders the parcel district column for a ema
+
+        Args:
+            value (str): The geometry
+            record (Ema): The ema record
+
+        Returns:
+
+        """
+        parcels = value.get_underlying_parcels().values_list(
+            "gmrkng",
+            flat=True
+        ).distinct()
+        html = render_to_string(
+            "table/gmrkng_col.html",
+            {
+                "entries": parcels
+            }
+        )
+        return html
+
+
     def render_r(self, value, record: Ema):
         """ Renders the registered column for a EMA
 

ema/templates/ema/detail/includes/actions.html

@@ -1,4 +1,4 @@
-{% load i18n l10n fontawesome_5 humanize %}
+{% load i18n l10n fontawesome_5 humanize ksp_filters %}
 <div id="actions" class="card">
     <div class="card-header rlp-r">
         <div class="row">
@@ -20,42 +20,51 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
                 <th class="w-25" scope="col">
                     {% trans 'Action type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Action type details' %}
-                </th>
                 <th scope="col">
                     {% trans 'Amount' context 'Compensation' %}
                 </th>
                 <th scope="col">
                     {% trans 'Comment' %}
                 </th>
-                <th scope="col">
-                    {% trans 'Action' %}
+                <th class="w-10" scope="col">
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
             <tbody>
             {% for action in obj.actions.all %}
             <tr>
-                <td class="align-middle">
-                    {{ action.action_type }}
-                </td>
-                <td class="align-middle">
+                <td class="">
+                    {% for type in action.action_type.all %}
+                    <div> {{type.parent.parent.long_name}} {% fa5_icon 'angle-right' %} {{type.parent.long_name}} {% fa5_icon 'angle-right' %} {{type.long_name}} </div>
+                    <hr>
+                    {% endfor %}
                     {% for detail in action.action_type_details.all %}
-                        <div class="mb-2" title="{{detail}}">{{detail.long_name}}</div>
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
+                    {% empty %}
+                        <span class="badge badge-pill rlp-r-outline" title="{% trans 'No action type details' %}">{% trans 'No action type details' %}</span>
                     {% endfor %}
                 </td>
-                <td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
-                <td class="align-middle">{{ action.comment|default_if_none:"" }}</td>
-                <td class="align-middle">
+                <td class="">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
+                <td class="">
+                    <div class="scroll-150">
+                        {{ action.comment }}
+                    </div>
+                </td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
+                    <button data-form-url="{% url 'ema:action-edit' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit action' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
                     <button data-form-url="{% url 'ema:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
                         {% fa5_icon 'trash' %}
                     </button>

ema/templates/ema/detail/includes/deadlines.html

@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -33,8 +33,10 @@
                 <th scope="col">
                     {% trans 'Comment' %}
                 </th>
-                <th scope="col">
-                    {% trans 'Action' %}
+                <th class="w-10" scope="col">
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
@@ -45,10 +47,17 @@
                     {% trans deadline.type_humanized %}
                 </td>
                 <td class="align-middle">{{ deadline.date|default_if_none:"---" }}</td>
-                <td class="align-middle">{{ deadline.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ deadline.comment }}
+                    </div>
+                </td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'deadline-remove' deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
+                    <button data-form-url="{% url 'ema:deadline-edit' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit deadline' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
+                    <button data-form-url="{% url 'ema:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}

ema/templates/ema/detail/includes/documents.html

@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -28,10 +28,15 @@
                     {% trans 'Title' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Comment' %}
+                    {% trans 'Created on' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    {% trans 'Comment' %}
+                </th>
+                <th class="w-10" scope="col">
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
@@ -39,14 +44,24 @@
             {% for doc in obj.documents.all %}
             <tr>
                 <td class="align-middle">
-                    <a href="{% url 'ema:get-doc' doc.id %}">
+                    <a href="{% url 'ema:get-doc' obj.id doc.id %}">
                         {{ doc.title }}
                     </a>
                 </td>
-                <td class="align-middle">{{ doc.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    {{ doc.date_of_creation }}
+                </td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ doc.comment }}
+                    </div>
+                </td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'ema:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
+                    <button data-form-url="{% url 'ema:edit-doc' obj.id doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit document' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
+                    <button data-form-url="{% url 'ema:remove-doc' obj.id doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}

ema/templates/ema/detail/includes/states-after.html

@@ -20,45 +20,46 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states > sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states > sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
-                <th scope="col">
-                    {% trans 'Action' %}
+                <th class="w-10" scope="col">
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
             <tbody>
             {% for state in after_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
-                </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
+                <td>
+                    <span>{{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})</span>
+                    <br>
+                    {% for detail in state.biotope_type_details.all %}
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
+                    {% empty %}
+                        <span class="badge badge-pill rlp-r-outline" title="{% trans 'No biotope type details' %}">{% trans 'No biotope type details' %}</span>
                     {% endfor %}
                 </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
+                    <button data-form-url="{% url 'ema:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
                     <button data-form-url="{% url 'ema:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>

ema/templates/ema/detail/includes/states-before.html

@@ -20,45 +20,46 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states < sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states < sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
-                <th scope="col">
-                    {% trans 'Action' %}
+                <th class="w-10" scope="col">
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
             <tbody>
             {% for state in before_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
-                </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
+                <td>
+                    <span>{{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})</span>
+                    <br>
+                    {% for detail in state.biotope_type_details.all %}
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
+                    {% empty %}
+                        <span class="badge badge-pill rlp-r-outline" title="{% trans 'No biotope type details' %}">{% trans 'No biotope type details' %}</span>
                     {% endfor %}
                 </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
+                    <button data-form-url="{% url 'ema:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
                     <button data-form-url="{% url 'ema:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>

ema/templates/ema/detail/view.html

@@ -14,16 +14,16 @@
 {% block body %}
 
     <div id="detail-header" class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <h3>{% trans 'Payment funded compensation' %} <br> {{obj.identifier}}</h3>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             {% include 'ema/detail/includes/controls.html' %}
         </div>
     </div>
     <hr>
     <div id="data" class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <div class="table-container">
                 <table class="table table-hover">
                     <tr>
@@ -74,6 +74,10 @@
                     <tr>
                         <th scope="row">{% trans 'Shared with' %}</th>
                         <td class="align-middle">
+                            {% for team in obj.teams.all %}
+                                {% include 'user/includes/team_data_modal_button.html' %}
+                            {% endfor %}
+                            <hr>
                             {% for user in obj.users.all %}
                                 {% include 'user/includes/contact_modal_button.html' %}
                             {% endfor %}
@@ -82,7 +86,7 @@
                 </table>
             </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <div class="row">
             {% include 'map/geom_form.html' %}
             </div>
@@ -95,26 +99,27 @@
         </div>
     </div>
     <hr>
-
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'ema/detail/includes/states-before.html' %}
+    <div id="related_data">
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'ema/detail/includes/states-before.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'ema/detail/includes/states-after.html' %}
+            </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'ema/detail/includes/states-after.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'ema/detail/includes/actions.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'ema/detail/includes/deadlines.html' %}
+            </div>
         </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'ema/detail/includes/actions.html' %}
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'ema/detail/includes/deadlines.html' %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'ema/detail/includes/documents.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'ema/detail/includes/documents.html' %}
+            </div>
         </div>
     </div>
 

ema/templates/ema/report/report.html

@@ -3,7 +3,7 @@
 
 {% block body %}
 <div class="row">
-    <div class="col-sm-12 col-md-12 col-lg-6">
+    <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
         <h3>{% trans 'Report' %}</h3>
         <h4>{{obj.identifier}}</h4>
         <div class="table-container">
@@ -20,10 +20,6 @@
                         <th scope="row">{% trans 'Conservation office file number' %}</th>
                         <td class="align-middle">{{obj.responsible.conservation_file_number|default_if_none:""}}</td>
                     </tr>
-                    <tr>
-                        <th scope="row">{% trans 'Action handler' %}</th>
-                        <td class="align-middle">{{obj.responsible.handler|default_if_none:""}}</td>
-                    </tr>
                     <tr>
                         <th scope="row">{% trans 'Last modified' %}</th>
                         <td class="align-middle">
@@ -37,7 +33,7 @@
         {% include 'compensation/detail/compensation/includes/states-after.html' %}
         {% include 'compensation/detail/compensation/includes/actions.html' %}
     </div>
-    <div class="col-sm-12 col-md-12 col-lg-6">
+    <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
         <div class="row">
             {% include 'map/geom_form.html' %}
         </div>

ema/tests/test_views.py

@@ -5,14 +5,15 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 26.10.21
 
 """
+
 from django.db.models import Q
 from django.urls import reverse
 from django.test.client import Client
 
-from compensation.tests.test_views import CompensationViewTestCase
+from compensation.tests.compensation.test_views import CompensationViewTestCase
 from ema.models import Ema
 from intervention.models import Responsibility
-from konova.models import Geometry
+from konova.models import Geometry, Deadline, DeadlineType
 from konova.settings import DEFAULT_GROUP, ETS_GROUP
 from user.models import UserActionLogEntry
 
@@ -30,42 +31,57 @@ class EmaViewTestCase(CompensationViewTestCase):
     def setUpTestData(cls) -> None:
         super().setUpTestData()
 
+    def setUp(self) -> None:
+        super().setUp()
         # Create dummy data and related objects, like states or actions
-        cls.create_dummy_data()
-        state = cls.create_dummy_states()
-        action = cls.create_dummy_action()
-        cls.ema.before_states.set([state])
-        cls.ema.after_states.set([state])
-        cls.ema.actions.set([action])
+        self.create_dummy_data()
+        state = self.create_dummy_states()
+        action = self.create_dummy_action()
+        self.ema.before_states.set([state])
+        self.ema.after_states.set([state])
+        self.ema.actions.set([action])
 
         # Prepare urls
-        cls.index_url = reverse("ema:index", args=())
-        cls.new_url = reverse("ema:new", args=())
-        cls.new_id_url = reverse("ema:new-id", args=())
-        cls.detail_url = reverse("ema:detail", args=(cls.ema.id,))
-        cls.log_url = reverse("ema:log", args=(cls.ema.id,))
-        cls.edit_url = reverse("ema:edit", args=(cls.ema.id,))
-        cls.remove_url = reverse("ema:remove", args=(cls.ema.id,))
-        cls.share_url = reverse("ema:share", args=(cls.ema.id, cls.ema.access_token,))
-        cls.share_create_url = reverse("ema:share-create", args=(cls.ema.id,))
-        cls.record_url = reverse("ema:record", args=(cls.ema.id,))
-        cls.report_url = reverse("ema:report", args=(cls.ema.id,))
-        cls.new_doc_url = reverse("ema:new-doc", args=(cls.ema.id,))
-        cls.state_new_url = reverse("ema:new-state", args=(cls.ema.id,))
-        cls.action_new_url = reverse("ema:new-action", args=(cls.ema.id,))
-        cls.deadline_new_url = reverse("ema:new-deadline", args=(cls.ema.id,))
-        cls.state_remove_url = reverse("ema:state-remove", args=(cls.ema.id, state.id,))
-        cls.action_remove_url = reverse("ema:action-remove", args=(cls.ema.id, action.id,))
+        self.index_url = reverse("ema:index", args=())
+        self.new_url = reverse("ema:new", args=())
+        self.new_id_url = reverse("ema:new-id", args=())
+        self.detail_url = reverse("ema:detail", args=(self.ema.id,))
+        self.log_url = reverse("ema:log", args=(self.ema.id,))
+        self.edit_url = reverse("ema:edit", args=(self.ema.id,))
+        self.remove_url = reverse("ema:remove", args=(self.ema.id,))
+        self.share_url = reverse("ema:share", args=(self.ema.id, self.ema.access_token,))
+        self.share_create_url = reverse("ema:share-create", args=(self.ema.id,))
+        self.record_url = reverse("ema:record", args=(self.ema.id,))
+        self.report_url = reverse("ema:report", args=(self.ema.id,))
+        self.new_doc_url = reverse("ema:new-doc", args=(self.ema.id,))
 
-    @classmethod
-    def create_dummy_data(cls):
+        self.state_new_url = reverse("ema:new-state", args=(self.ema.id,))
+        self.state_edit_url = reverse("ema:state-edit", args=(self.ema.id, state.id))
+        self.state_remove_url = reverse("ema:state-remove", args=(self.ema.id, state.id,))
+
+        self.action_new_url = reverse("ema:new-action", args=(self.ema.id,))
+        self.action_edit_url = reverse("ema:action-edit", args=(self.ema.id, action.id))
+        self.action_remove_url = reverse("ema:action-remove", args=(self.ema.id, action.id,))
+
+        self.deadline = Deadline.objects.get_or_create(
+            type=DeadlineType.FINISHED,
+            date="2020-01-01",
+            comment="TESTCOMMENT",
+        )[0]
+        self.ema.deadlines.add(self.deadline)
+
+        self.deadline_new_url = reverse("ema:new-deadline", args=(self.ema.id,))
+        self.deadline_edit_url = reverse("ema:deadline-edit", args=(self.ema.id, self.deadline.id))
+        self.deadline_remove_url = reverse("ema:deadline-remove", args=(self.ema.id, self.deadline.id))
+
+    def create_dummy_data(self):
         # Create dummy data
         # Create log entry
-        action = UserActionLogEntry.get_created_action(cls.superuser)
+        action = UserActionLogEntry.get_created_action(self.superuser)
         # Create responsible data object
         responsibility_data = Responsibility.objects.create()
         geometry = Geometry.objects.create()
-        cls.ema = Ema.objects.create(
+        self.ema = Ema.objects.create(
             identifier="TEST",
             title="Test_title",
             created=action,
@@ -94,7 +110,7 @@ class EmaViewTestCase(CompensationViewTestCase):
 
         # Sharing does not have any effect in here, since the default group will prohibit further functionality access
         # to this user
-        self.ema.share_with_list([self.superuser])
+        self.ema.share_with_user_list([self.superuser])
 
         success_urls = [
             self.index_url,
@@ -106,10 +122,14 @@ class EmaViewTestCase(CompensationViewTestCase):
             self.new_id_url,
             self.edit_url,
             self.state_new_url,
-            self.action_new_url,
-            self.deadline_new_url,
             self.state_remove_url,
+            self.state_edit_url,
+            self.deadline_new_url,
+            self.deadline_edit_url,
+            self.deadline_remove_url,
+            self.action_edit_url,
             self.action_remove_url,
+            self.action_new_url,
             self.new_doc_url,
             self.log_url,
             self.remove_url,
@@ -140,7 +160,7 @@ class EmaViewTestCase(CompensationViewTestCase):
 
         # Sharing does not have any effect in here, since the default group will prohibit further functionality access
         # to this user
-        self.ema.share_with_list([])
+        self.ema.share_with_user_list([])
 
         success_urls = [
             self.index_url,
@@ -152,10 +172,14 @@ class EmaViewTestCase(CompensationViewTestCase):
             self.new_id_url,
             self.edit_url,
             self.state_new_url,
-            self.action_new_url,
-            self.deadline_new_url,
+            self.state_edit_url,
             self.state_remove_url,
+            self.action_new_url,
+            self.action_edit_url,
             self.action_remove_url,
+            self.deadline_new_url,
+            self.deadline_edit_url,
+            self.deadline_remove_url,
             self.new_doc_url,
             self.log_url,
             self.remove_url,
@@ -179,7 +203,7 @@ class EmaViewTestCase(CompensationViewTestCase):
         groups = self.groups.filter(Q(name=ETS_GROUP)|Q(name=DEFAULT_GROUP))
         self.superuser.groups.set(groups)
         # Sharing is inherited by base intervention for compensation. Therefore configure the interventions share state
-        self.ema.share_with_list([self.superuser])
+        self.ema.share_with_user_list([self.superuser])
 
         success_urls = [
             self.index_url,
@@ -189,9 +213,13 @@ class EmaViewTestCase(CompensationViewTestCase):
             self.new_id_url,
             self.edit_url,
             self.state_new_url,
-            self.action_new_url,
-            self.deadline_new_url,
+            self.state_edit_url,
             self.state_remove_url,
+            self.deadline_new_url,
+            self.deadline_edit_url,
+            self.deadline_remove_url,
+            self.action_new_url,
+            self.action_edit_url,
             self.action_remove_url,
             self.new_doc_url,
             self.log_url,
@@ -215,7 +243,7 @@ class EmaViewTestCase(CompensationViewTestCase):
         groups = self.groups.filter(Q(name=ETS_GROUP)|Q(name=DEFAULT_GROUP))
         self.superuser.groups.set(groups)
         # Sharing is inherited by base intervention for compensation. Therefore configure the interventions share state
-        self.ema.share_with_list([])
+        self.ema.share_with_user_list([])
 
         success_urls = [
             self.index_url,
@@ -227,9 +255,13 @@ class EmaViewTestCase(CompensationViewTestCase):
         fail_urls = [
             self.edit_url,
             self.state_new_url,
-            self.action_new_url,
-            self.deadline_new_url,
+            self.state_edit_url,
             self.state_remove_url,
+            self.deadline_new_url,
+            self.deadline_edit_url,
+            self.deadline_remove_url,
+            self.action_new_url,
+            self.action_edit_url,
             self.action_remove_url,
             self.new_doc_url,
             self.log_url,

ema/tests/test_workflow.py

@@ -0,0 +1,165 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: michel.peltriaux@sgdnord.rlp.de
+Created on: 08.02.22
+
+"""
+import datetime
+
+from django.contrib.gis.geos import MultiPolygon
+from django.core.exceptions import ObjectDoesNotExist
+from django.urls import reverse
+
+from ema.models import Ema
+from konova.settings import ETS_GROUP
+from konova.tests.test_views import BaseWorkflowTestCase
+from user.models import UserAction
+
+
+class EmaWorkflowTestCase(BaseWorkflowTestCase):
+    ema = None
+
+    @classmethod
+    def setUpTestData(cls) -> None:
+        super().setUpTestData()
+
+    def setUp(self) -> None:
+        super().setUp()
+        # Create a fresh dummy (non-valid) compensation before each test
+        self.ema = self.create_dummy_ema()
+
+    def test_new(self):
+        """ Test the creation of an Ema
+
+        Returns:
+
+        """
+        self.superuser.groups.add(self.groups.get(name=ETS_GROUP))
+        # Prepare url and form data to be posted
+        new_url = reverse("ema:new")
+        test_id = self.create_dummy_string()
+        test_title = self.create_dummy_string()
+        test_geom = self.create_dummy_geometry()
+        test_conservation_office = self.get_conservation_office_code()
+        post_data = {
+            "identifier": test_id,
+            "title": test_title,
+            "geom": test_geom.geojson,
+            "conservation_office": test_conservation_office.id
+        }
+        self.client_user.post(new_url, post_data)
+
+        try:
+            ema = Ema.objects.get(
+                identifier=test_id
+            )
+        except ObjectDoesNotExist:
+            self.fail(msg="Ema not created")
+
+        self.assertEqual(ema.identifier, test_id)
+        self.assertEqual(ema.title, test_title)
+        self.assert_equal_geometries(ema.geometry.geom, test_geom)
+        self.assertEqual(ema.log.count(), 1)
+
+        # Expect logs to be set
+        self.assertEqual(ema.log.count(), 1)
+        self.assertEqual(ema.log.first().action, UserAction.CREATED)
+
+    def test_edit(self):
+        """ Checks that the editing of an Ema works
+
+        Returns:
+
+        """
+        self.superuser.groups.add(self.groups.get(name=ETS_GROUP))
+        self.ema.users.add(self.superuser)
+        url = reverse("ema:edit", args=(self.ema.id,))
+        self.ema = self.fill_out_ema(self.ema)
+        pre_edit_log_count = self.ema.log.count()
+
+        new_title = self.create_dummy_string()
+        new_identifier = self.create_dummy_string()
+        new_comment = self.create_dummy_string()
+        new_geometry = MultiPolygon(srid=4326)  # Create an empty geometry
+        test_conservation_office = self.get_conservation_office_code()
+
+        check_on_elements = {
+            self.ema.title: new_title,
+            self.ema.identifier: new_identifier,
+            self.ema.comment: new_comment,
+        }
+        for k, v in check_on_elements.items():
+            self.assertNotEqual(k, v)
+
+        post_data = {
+            "identifier": new_identifier,
+            "title": new_title,
+            "comment": new_comment,
+            "geom": new_geometry.geojson,
+            "conservation_office": test_conservation_office.id
+        }
+        self.client_user.post(url, post_data)
+        self.ema.refresh_from_db()
+
+        check_on_elements = {
+            self.ema.title: new_title,
+            self.ema.identifier: new_identifier,
+            self.ema.comment: new_comment,
+        }
+
+        for k, v in check_on_elements.items():
+            self.assertEqual(k, v)
+
+        self.assert_equal_geometries(self.ema.geometry.geom, new_geometry)
+
+        # Expect logs to be set
+        self.assertEqual(pre_edit_log_count + 1, self.ema.log.count())
+        self.assertEqual(self.ema.log.first().action, UserAction.EDITED)
+
+    def test_recordability(self):
+        """
+        This tests if the recordability of the Ema is triggered by the quality of it's data (e.g. not all fields filled)
+
+        Returns:
+
+        """
+        # Add proper privilege for the user
+        self.superuser.groups.add(self.groups.get(name=ETS_GROUP))
+        self.ema.users.add(self.superuser)
+        pre_record_log_count = self.ema.log.count()
+
+        # Prepare url and form data
+        record_url = reverse("ema:record", args=(self.ema.id,))
+        post_data = {
+            "confirm": True,
+        }
+
+        # Make sure the ema is not recorded
+        self.assertIsNone(self.ema.recorded)
+
+        # Run the request --> expect fail, since the Ema is not valid, yet
+        self.client_user.post(record_url, post_data)
+
+        # Check that the Ema is still not recorded
+        self.assertIsNone(self.ema.recorded)
+
+        # Now fill out the data for a compensation
+        self.ema = self.fill_out_ema(self.ema)
+
+        # Rerun the request
+        self.client_user.post(record_url, post_data)
+
+        # Expect the Ema now to be recorded
+        # Attention: We can only test the date part of the timestamp,
+        # since the delay in microseconds would lead to fail
+        self.ema.refresh_from_db()
+        recorded = self.ema.recorded
+        self.assertIsNotNone(recorded)
+        self.assertEqual(self.superuser, recorded.user)
+        self.assertEqual(UserAction.RECORDED, recorded.action)
+        self.assertEqual(datetime.date.today(), recorded.timestamp.date())
+
+        # Expect the user action to be in the log
+        self.assertIn(recorded, self.ema.log.all())
+        self.assertEqual(pre_record_log_count + 1, self.ema.log.count())

ema/urls.py

@@ -19,18 +19,26 @@ urlpatterns = [
     path('<id>/remove', remove_view, name='remove'),
     path('<id>/record', record_view, name='record'),
     path('<id>/report', report_view, name='report'),
+
     path('<id>/state/new', state_new_view, name='new-state'),
-    path('<id>/action/new', action_new_view, name='new-action'),
     path('<id>/state/<state_id>/remove', state_remove_view, name='state-remove'),
+    path('<id>/state/<state_id>/edit', state_edit_view, name='state-edit'),
+
+    path('<id>/action/new', action_new_view, name='new-action'),
+    path('<id>/action/<action_id>/edit', action_edit_view, name='action-edit'),
     path('<id>/action/<action_id>/remove', action_remove_view, name='action-remove'),
+
     path('<id>/deadline/new', deadline_new_view, name="new-deadline"),
+    path('<id>/deadline/<deadline_id>/edit', deadline_edit_view, name='deadline-edit'),
+    path('<id>/deadline/<deadline_id>/remove', deadline_remove_view, name='deadline-remove'),
+
     path('<id>/share/<token>', share_view, name='share'),
     path('<id>/share', create_share_view, name='share-create'),
 
     # Documents
-    # Document remove route can be found in konova/urls.py
     path('<id>/document/new/', document_new_view, name='new-doc'),
-    path('document/<doc_id>', get_document_view, name='get-doc'),
-    path('document/<doc_id>/remove/', remove_document_view, name='remove-doc'),
+    path('<id>/document/<doc_id>', get_document_view, name='get-doc'),
+    path('<id>/document/<doc_id>/edit/', edit_document_view, name='edit-doc'),
+    path('<id>/document/<doc_id>/remove/', remove_document_view, name='remove-doc'),
 
 ]

ema/views.py

@@ -6,20 +6,27 @@ from django.shortcuts import render, get_object_or_404, redirect
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
-from compensation.forms.modalForms import NewStateModalForm, NewActionModalForm, NewDeadlineModalForm
+from compensation.forms.modalForms import NewStateModalForm, NewActionModalForm, NewDeadlineModalForm, \
+    RemoveCompensationActionModalForm, RemoveCompensationStateModalForm, EditCompensationStateModalForm, \
+    EditCompensationActionModalForm, EditDeadlineModalForm
 from compensation.models import CompensationAction, CompensationState
-from ema.forms import NewEmaForm, EditEmaForm, NewEmaDocumentForm
+from ema.forms import NewEmaForm, EditEmaForm, NewEmaDocumentModalForm
 from ema.tables import EmaTable
 from intervention.forms.modalForms import ShareModalForm
 from konova.contexts import BaseContext
 from konova.decorators import conservation_office_group_required, shared_access_required
 from ema.models import Ema, EmaDocument
-from konova.forms import RemoveModalForm, SimpleGeomForm, RecordModalForm
+from konova.forms import RemoveModalForm, SimpleGeomForm, RecordModalForm, RemoveDeadlineModalForm, \
+    EditDocumentModalForm
+from konova.models import Deadline
 from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import get_document, remove_document
 from konova.utils.generators import generate_qr_code
-from konova.utils.message_templates import IDENTIFIER_REPLACED, FORM_INVALID, DATA_UNSHARED, DATA_UNSHARED_EXPLANATION
+from konova.utils.message_templates import IDENTIFIER_REPLACED, FORM_INVALID, DATA_UNSHARED, DATA_UNSHARED_EXPLANATION, \
+    DOCUMENT_ADDED, COMPENSATION_STATE_REMOVED, COMPENSATION_STATE_ADDED, COMPENSATION_ACTION_REMOVED, \
+    COMPENSATION_ACTION_ADDED, DEADLINE_ADDED, DEADLINE_REMOVED, DOCUMENT_EDITED, COMPENSATION_STATE_EDITED, \
+    COMPENSATION_ACTION_EDITED, DEADLINE_EDITED
 from konova.utils.user_checks import in_group
 
 
@@ -290,7 +297,8 @@ def state_new_view(request: HttpRequest, id: str):
     form = NewStateModalForm(request.POST or None, instance=ema, request=request)
     return form.process_request(
         request,
-        msg_success=_("State added")
+        msg_success=COMPENSATION_STATE_ADDED,
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -311,7 +319,32 @@ def action_new_view(request: HttpRequest, id: str):
     form = NewActionModalForm(request.POST or None, instance=ema, request=request)
     return form.process_request(
         request,
-        msg_success=_("Action added")
+        msg_success=COMPENSATION_ACTION_ADDED,
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@conservation_office_group_required
+@shared_access_required(Ema, "id")
+def action_edit_view(request: HttpRequest, id: str, action_id: str):
+    """ Renders a form for editing an actions for an EMA
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The EMA's id
+        action_id (str): The action id
+
+    Returns:
+
+    """
+    ema = get_object_or_404(Ema, id=id)
+    action = get_object_or_404(CompensationAction, id=action_id)
+    form = EditCompensationActionModalForm(request.POST or None, instance=ema, action=action, request=request)
+    return form.process_request(
+        request,
+        msg_success=COMPENSATION_ACTION_EDITED,
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -332,7 +365,8 @@ def deadline_new_view(request: HttpRequest, id: str):
     form = NewDeadlineModalForm(request.POST or None, instance=ema, request=request)
     return form.process_request(
         request,
-        msg_success=_("Deadline added")
+        msg_success=DEADLINE_ADDED,
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -349,54 +383,78 @@ def document_new_view(request: HttpRequest, id: str):
 
     """
     ema = get_object_or_404(Ema, id=id)
-    form = NewEmaDocumentForm(request.POST or None, request.FILES or None, instance=ema, request=request)
+    form = NewEmaDocumentModalForm(request.POST or None, request.FILES or None, instance=ema, request=request)
     return form.process_request(
         request,
-        msg_success=_("Document added")
+        msg_success=DOCUMENT_ADDED,
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
 @login_required
 @conservation_office_group_required
-def get_document_view(request: HttpRequest, doc_id: str):
+@shared_access_required(Ema, "id")
+def get_document_view(request: HttpRequest, id: str, doc_id: str):
     """ Returns the document as downloadable file
 
     Wraps the generic document fetcher function from konova.utils.
 
     Args:
         request (HttpRequest): The incoming request
+        id (str): The EMA id
         doc_id (str): The document id
 
     Returns:
 
     """
+    ema = get_object_or_404(Ema, id=id)
     doc = get_object_or_404(EmaDocument, id=doc_id)
-    user = request.user
-    instance = doc.instance
-    # File download only possible if related instance is shared with user
-    if not instance.users.filter(id=user.id):
-        messages.info(
-            request,
-            DATA_UNSHARED
-        )
-        return redirect("ema:detail", id=instance.id)
     return get_document(doc)
 
 
 @login_required
 @conservation_office_group_required
-def remove_document_view(request: HttpRequest, doc_id: str):
+@shared_access_required(Ema, "id")
+def edit_document_view(request: HttpRequest, id: str, doc_id: str):
     """ Removes the document from the database and file system
 
     Wraps the generic functionality from konova.utils.
 
     Args:
         request (HttpRequest): The incoming request
+        id (str): The EMA id
         doc_id (str): The document id
 
     Returns:
 
     """
+    ema = get_object_or_404(Ema, id=id)
+    doc = get_object_or_404(EmaDocument, id=doc_id)
+    form = EditDocumentModalForm(request.POST or None, request.FILES or None, instance=ema, document=doc, request=request)
+    return form.process_request(
+        request,
+        DOCUMENT_EDITED,
+        reverse("ema:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@conservation_office_group_required
+@shared_access_required(Ema, "id")
+def remove_document_view(request: HttpRequest, id:str, doc_id: str):
+    """ Removes the document from the database and file system
+
+    Wraps the generic functionality from konova.utils.
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The EMA id
+        doc_id (str): The document id
+
+    Returns:
+
+    """
+    ema = get_object_or_404(Ema, id=id)
     doc = get_object_or_404(EmaDocument, id=doc_id)
     return remove_document(
         request,
@@ -418,11 +476,37 @@ def state_remove_view(request: HttpRequest, id: str, state_id: str):
     Returns:
 
     """
+    ema = get_object_or_404(Ema, id=id)
     state = get_object_or_404(CompensationState, id=state_id)
-    form = RemoveModalForm(request.POST or None, instance=state, request=request)
+    form = RemoveCompensationStateModalForm(request.POST or None, instance=ema, state=state, request=request)
     return form.process_request(
         request,
-        msg_success=_("State removed")
+        msg_success=COMPENSATION_STATE_REMOVED,
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@conservation_office_group_required
+@shared_access_required(Ema, "id")
+def state_edit_view(request: HttpRequest, id: str, state_id: str):
+    """ Renders a form for editing an EMA state
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The ema id
+        state_id (str): The state's id
+
+    Returns:
+
+    """
+    ema = get_object_or_404(Ema, id=id)
+    state = get_object_or_404(CompensationState, id=state_id)
+    form = EditCompensationStateModalForm(request.POST or None, instance=ema, state=state, request=request)
+    return form.process_request(
+        request,
+        msg_success=COMPENSATION_STATE_EDITED,
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -440,11 +524,13 @@ def action_remove_view(request: HttpRequest, id: str, action_id: str):
     Returns:
 
     """
+    ema = get_object_or_404(Ema, id=id)
     action = get_object_or_404(CompensationAction, id=action_id)
-    form = RemoveModalForm(request.POST or None, instance=action, request=request)
+    form = RemoveCompensationActionModalForm(request.POST or None, instance=ema, action=action, request=request)
     return form.process_request(
         request,
-        msg_success=_("Action removed")
+        msg_success=COMPENSATION_ACTION_REMOVED,
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -535,7 +621,7 @@ def share_view(request: HttpRequest, id: str, token: str):
                 request,
                 _("{} has been shared with you").format(obj.identifier)
             )
-            obj.share_with(user)
+            obj.share_with_user(user)
         return redirect("ema:detail", id=id)
     else:
         messages.error(
@@ -564,4 +650,52 @@ def create_share_view(request: HttpRequest, id: str):
     return form.process_request(
         request,
         msg_success=_("Share settings updated")
+    )
+
+
+@login_required
+@conservation_office_group_required
+@shared_access_required(Ema, "id")
+def deadline_edit_view(request: HttpRequest, id: str, deadline_id: str):
+    """ Renders a form for editing deadlines from a compensation
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+        deadline_id (str): The deadline's id
+
+    Returns:
+
+    """
+    ema = get_object_or_404(Ema, id=id)
+    deadline = get_object_or_404(Deadline, id=deadline_id)
+    form = EditDeadlineModalForm(request.POST or None, instance=ema, deadline=deadline, request=request)
+    return form.process_request(
+        request,
+        msg_success=DEADLINE_EDITED,
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@conservation_office_group_required
+@shared_access_required(Ema, "id")
+def deadline_remove_view(request: HttpRequest, id: str, deadline_id: str):
+    """ Renders a form for removing deadlines from a compensation
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+        deadline_id (str): The deadline's id
+
+    Returns:
+
+    """
+    ema = get_object_or_404(Ema, id=id)
+    deadline = get_object_or_404(Deadline, id=deadline_id)
+    form = RemoveDeadlineModalForm(request.POST or None, instance=ema, deadline=deadline, request=request)
+    return form.process_request(
+        request,
+        msg_success=DEADLINE_REMOVED,
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )

intervention/forms/forms.py

@@ -7,6 +7,8 @@ Created on: 02.12.20
 """
 from dal import autocomplete
 from django import forms
+
+from konova.utils.message_templates import EDITED_GENERAL_DATA
 from user.models import User
 from django.db import transaction
 from django.urls import reverse, reverse_lazy
@@ -251,7 +253,7 @@ class NewInterventionForm(BaseForm):
             intervention.log.add(action)
 
             # Add the performing user as the first user having access to the data
-            intervention.share_with(user)
+            intervention.share_with_user(user)
         return intervention
 
 
@@ -333,7 +335,7 @@ class EditInterventionForm(NewInterventionForm):
             self.instance.responsible.conservation_file_number = conservation_file_number
             self.instance.responsible.save()
 
-            user_action = UserActionLogEntry.get_edited_action(user)
+            user_action = self.instance.mark_as_edited(user, edit_comment=EDITED_GENERAL_DATA)
 
             geometry = geom_form.save(user_action)
             self.instance.geometry = geometry
@@ -347,8 +349,5 @@ class EditInterventionForm(NewInterventionForm):
             self.instance.modified = user_action
             self.instance.save()
 
-            # Uncheck and unrecord intervention due to changed data
-            self.instance.mark_as_edited(user)
-
         return self.instance
 

intervention/forms/modalForms.py

@@ -6,16 +6,20 @@ Created on: 27.09.21
 
 """
 from dal import autocomplete
-from user.models import User
+from django.core.exceptions import ObjectDoesNotExist
+
+from konova.utils.message_templates import DEDUCTION_ADDED, REVOCATION_ADDED, DEDUCTION_REMOVED, DEDUCTION_EDITED, \
+    REVOCATION_EDITED, ENTRY_REMOVE_MISSING_PERMISSION
+from user.models import User, Team
+from user.models import UserActionLogEntry
 from django.db import transaction
 from django import forms
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
-from compensation.models import EcoAccount
+from compensation.models import EcoAccount, EcoAccountDeduction
 from intervention.inputs import TextToClipboardInput
-from intervention.models import Intervention, InterventionDocument
-from konova.forms import BaseModalForm, NewDocumentForm
+from intervention.models import Intervention, InterventionDocument, RevocationDocument
+from konova.forms import BaseModalForm, NewDocumentModalForm, RemoveModalForm
 from konova.utils.general import format_german_float
 from konova.utils.user_checks import is_default_group_only
 
@@ -33,7 +37,21 @@ class ShareModalForm(BaseModalForm):
             }
         )
     )
-    user_select = forms.ModelMultipleChoiceField(
+    teams = forms.ModelMultipleChoiceField(
+        label=_("Add team to share with"),
+        label_suffix="",
+        help_text=_("Multiple selection possible - You can only select teams which do not already have access."),
+        required=False,
+        queryset=Team.objects.all(),
+        widget=autocomplete.ModelSelect2Multiple(
+            url="share-team-autocomplete",
+            attrs={
+                "data-placeholder": _("Click for selection"),
+                "data-minimum-input-length": 3,
+            },
+        ),
+    )
+    users = forms.ModelMultipleChoiceField(
         label=_("Add user to share with"),
         label_suffix="",
         help_text=_("Multiple selection possible - You can only select users which do not already have access. Enter the full username."),
@@ -45,21 +63,8 @@ class ShareModalForm(BaseModalForm):
                 "data-placeholder": _("Click for selection"),
                 "data-minimum-input-length": 3,
             },
-            forward=["users"]
         ),
     )
-    users = forms.MultipleChoiceField(
-        label=_("Shared with"),
-        label_suffix="",
-        required=True,
-        help_text=_("Remove check to remove access for this user"),
-        widget=forms.CheckboxSelectMultiple(
-            attrs={
-                "class": "list-unstyled",
-            }
-        ),
-        choices=[]
-    )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -73,6 +78,48 @@ class ShareModalForm(BaseModalForm):
 
         self._init_fields()
 
+    def _user_team_valid(self):
+        """ Checks whether users and teams have been removed by the user and if the user is allowed to do so or not
+
+        Returns:
+
+        """
+        users = self.cleaned_data.get("users", User.objects.none())
+        teams = self.cleaned_data.get("teams", Team.objects.none())
+
+        _is_valid = True
+        if is_default_group_only(self.user):
+            shared_users = self.instance.shared_users
+            shared_teams = self.instance.shared_teams
+
+            shared_users_are_removed = not set(shared_users).issubset(users)
+            shared_teams_are_removed = not set(shared_teams).issubset(teams)
+
+            if shared_users_are_removed:
+                self.add_error(
+                    "users",
+                    ENTRY_REMOVE_MISSING_PERMISSION
+                )
+                _is_valid = False
+            if shared_teams_are_removed:
+                self.add_error(
+                    "teams",
+                    ENTRY_REMOVE_MISSING_PERMISSION
+                )
+                _is_valid = False
+        return _is_valid
+
+    def is_valid(self):
+        """ Extended validity check
+
+        Returns:
+
+        """
+        super_valid = super().is_valid()
+        user_team_valid = self._user_team_valid()
+        _is_valid = super_valid and user_team_valid
+        return _is_valid
+
     def _init_fields(self):
         """ Wraps initializing of fields
 
@@ -80,43 +127,21 @@ class ShareModalForm(BaseModalForm):
 
         """
         # Initialize share_link field
-        url_name = f"{self.instance._meta.app_label}:share"
-        self.share_link = self.request.build_absolute_uri(
-            reverse(url_name, args=(self.instance.id, self.instance.access_token,))
-        )
+        share_link = self.instance.get_share_link()
+        self.share_link = self.request.build_absolute_uri(share_link)
         self.initialize_form_field(
             "url",
             self.share_link
         )
 
-        # Initialize users field
-        # Disable field if user is not in registration or conservation group
-        if is_default_group_only(self.request.user):
-            self.disable_form_field("users")
-
-        self._add_user_choices_to_field()
-
-    def _add_user_choices_to_field(self):
-        """ Transforms the instance's sharing users into a list for the form field
-
-        Returns:
-
-        """
-        users = self.instance.users.all()
-        choices = []
-        for n in users:
-            choices.append(
-                (n.id, n.username)
-            )
-        self.fields["users"].choices = choices
-        u_ids = list(users.values_list("id", flat=True))
-        self.initialize_form_field(
-            "users",
-            u_ids
-        )
+        form_data = {
+            "teams": self.instance.teams.all(),
+            "users": self.instance.users.all(),
+        }
+        self.load_initial_data(form_data)
 
     def save(self):
-        self.instance.update_sharing_user(self)
+        self.instance.update_shared_access(self)
 
 
 class NewRevocationModalForm(BaseModalForm):
@@ -158,6 +183,7 @@ class NewRevocationModalForm(BaseModalForm):
             }
         )
     )
+    document_model = RevocationDocument
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -169,10 +195,51 @@ class NewRevocationModalForm(BaseModalForm):
 
     def save(self):
         revocation = self.instance.add_revocation(self)
-        self.instance.mark_as_edited(self.user, self.request)
+        self.instance.mark_as_edited(self.user, self.request, edit_comment=REVOCATION_ADDED)
         return revocation
 
 
+class EditRevocationModalForm(NewRevocationModalForm):
+    revocation = None
+
+    def __init__(self, *args, **kwargs):
+        self.revocation = kwargs.pop("revocation", None)
+        super().__init__(*args, **kwargs)
+        self.form_title = _("Edit revocation")
+        try:
+            doc = self.revocation.document.file
+        except ObjectDoesNotExist:
+            doc = None
+        form_data = {
+            "date": str(self.revocation.date),
+            "file": doc,
+            "comment": self.revocation.comment,
+        }
+        self.load_initial_data(form_data)
+
+    def save(self):
+        revocation = self.instance.edit_revocation(self)
+        self.instance.mark_as_edited(self.user, self.request, edit_comment=REVOCATION_EDITED)
+        return revocation
+
+
+class RemoveRevocationModalForm(RemoveModalForm):
+    """ Removing modal form for Revocation
+
+    Can be used for anything, where removing shall be confirmed by the user a second time.
+
+    """
+    revocation = None
+
+    def __init__(self, *args, **kwargs):
+        revocation = kwargs.pop("revocation", None)
+        self.revocation = revocation
+        super().__init__(*args, **kwargs)
+
+    def save(self):
+        self.instance.remove_revocation(self)
+
+
 class CheckModalForm(BaseModalForm):
     """ The modal form for running a check on interventions and their compensations
 
@@ -224,7 +291,9 @@ class CheckModalForm(BaseModalForm):
         Returns:
 
         """
-        comps = self.instance.compensations.all()
+        comps = self.instance.compensations.filter(
+            deleted=None,
+        )
         comps_valid = True
         for comp in comps:
             checker = comp.quality_check()
@@ -333,6 +402,21 @@ class NewDeductionModalForm(BaseModalForm):
         else:
             raise NotImplementedError
 
+    def _get_available_surface(self, acc):
+        """ Calculates how much available surface is left on the account
+
+        Args:
+            acc (EcoAccount):
+
+        Returns:
+
+        """
+        # Calculate valid surface
+        deductable_surface = acc.deductable_surface
+        sum_surface_deductions = acc.get_deductions_surface()
+        rest_surface = deductable_surface - sum_surface_deductions
+        return rest_surface
+
     def is_valid(self):
         """ Custom validity check
 
@@ -351,10 +435,7 @@ class NewDeductionModalForm(BaseModalForm):
             )
             return False
 
-        # Calculate valid surface
-        deductable_surface = acc.deductable_surface
-        sum_surface_deductions = acc.get_deductions_surface()
-        rest_surface = deductable_surface - sum_surface_deductions
+        rest_surface = self._get_available_surface(acc)
         form_surface = float(self.cleaned_data["surface"])
         is_valid_surface = form_surface <= rest_surface
         if not is_valid_surface:
@@ -368,11 +449,100 @@ class NewDeductionModalForm(BaseModalForm):
             )
         return is_valid_surface and super_result
 
+    def __create_deduction(self):
+        """ Creates the deduction
+
+        Returns:
+
+        """
+        with transaction.atomic():
+            user_action_create = UserActionLogEntry.get_created_action(self.user)
+            deduction = EcoAccountDeduction.objects.create(
+                intervention=self.cleaned_data["intervention"],
+                account=self.cleaned_data["account"],
+                surface=self.cleaned_data["surface"],
+                created=user_action_create,
+            )
+        return deduction
+
     def save(self):
-        deduction = self.instance.add_deduction(self)
-        self.instance.mark_as_edited(self.user, self.request, reset_recorded=False)
+        deduction = self.__create_deduction()
+        self.cleaned_data["intervention"].mark_as_edited(self.user, edit_comment=DEDUCTION_ADDED)
+        self.cleaned_data["account"].mark_as_edited(self.user, edit_comment=DEDUCTION_ADDED)
         return deduction
 
 
-class NewInterventionDocumentForm(NewDocumentForm):
+class EditEcoAccountDeductionModalForm(NewDeductionModalForm):
+    deduction = None
+
+    def __init__(self, *args, **kwargs):
+        self.deduction = kwargs.pop("deduction", None)
+        super().__init__(*args, **kwargs)
+        self.form_title = _("Edit Deduction")
+        form_data = {
+            "account": self.deduction.account,
+            "intervention": self.deduction.intervention,
+            "surface": self.deduction.surface,
+        }
+        self.load_initial_data(form_data)
+
+    def _get_available_surface(self, acc):
+        rest_surface = super()._get_available_surface(acc)
+        # Increase available surface by the currently deducted surface, so we can 'deduct' the same amount again or
+        # increase the surface only a little, which will still be valid.
+        # Example: 200 m² left, 500 m² deducted. Entering 700 m² would fail if we would not add the 500 m² to the available
+        # surface again.
+        rest_surface += self.deduction.surface
+        return rest_surface
+
+    def save(self):
+        deduction = self.deduction
+        form_account = self.cleaned_data.get("account", None)
+        form_intervention = self.cleaned_data.get("intervention", None)
+        current_account = deduction.account
+        current_intervention = deduction.intervention
+
+
+        # If account or intervention has been changed, we put that change in the logs just as if the deduction has
+        # been removed for this entry. Act as if the deduction is newly created for the new entries
+        if current_account != form_account:
+            current_account.mark_as_edited(self.user, self.request, edit_comment=DEDUCTION_REMOVED)
+            form_account.mark_as_edited(self.user, self.request, edit_comment=DEDUCTION_ADDED)
+        else:
+            current_account.mark_as_edited(self.user, self.request, edit_comment=DEDUCTION_EDITED)
+
+        if current_intervention != form_intervention:
+            current_intervention.mark_as_edited(self.user, self.request, edit_comment=DEDUCTION_REMOVED)
+            form_intervention.mark_as_edited(self.user, self.request, edit_comment=DEDUCTION_ADDED)
+        else:
+            current_intervention.mark_as_edited(self.user, self.request, edit_comment=DEDUCTION_EDITED)
+
+        deduction.account = form_account
+        deduction.intervention = self.cleaned_data.get("intervention", None)
+        deduction.surface = self.cleaned_data.get("surface", None)
+        deduction.save()
+        return deduction
+
+
+class RemoveEcoAccountDeductionModalForm(RemoveModalForm):
+    """ Removing modal form for EcoAccountDeduction
+
+    Can be used for anything, where removing shall be confirmed by the user a second time.
+
+    """
+    deduction = None
+
+    def __init__(self, *args, **kwargs):
+        deduction = kwargs.pop("deduction", None)
+        self.deduction = deduction
+        super().__init__(*args, **kwargs)
+
+    def save(self):
+        with transaction.atomic():
+            self.deduction.intervention.mark_as_edited(self.user, edit_comment=DEDUCTION_REMOVED)
+            self.deduction.account.mark_as_edited(self.user, edit_comment=DEDUCTION_REMOVED)
+            self.deduction.delete()
+
+
+class NewInterventionDocumentModalForm(NewDocumentModalForm):
     document_model = InterventionDocument

intervention/inputs.py

@@ -1,4 +1,6 @@
 from django import forms
+from codelist.models import KonovaCode
+from codelist.settings import CODELIST_COMPENSATION_ACTION_ID
 
 
 class DummyFilterInput(forms.HiddenInput):
@@ -30,3 +32,51 @@ class GenerateInput(forms.TextInput):
 
     """
     template_name = "konova/widgets/generate-content-input.html"
+
+
+class TreeCheckboxSelectMultiple(forms.CheckboxSelectMultiple):
+    """ Provides multiple selection of parent-child data
+
+    """
+    template_name = "konova/widgets/checkbox-tree-select.html"
+
+    class meta:
+        abstract = True
+
+
+class KonovaCodeTreeCheckboxSelectMultiple(TreeCheckboxSelectMultiple):
+    """ Provides multiple selection of KonovaCodes
+
+    """
+    filter = None
+
+    def __init__(self, *args, **kwargs):
+        self.code_list = kwargs.pop("code_list", None)
+        self.filter = kwargs.pop("filter", {})
+        super().__init__(*args, **kwargs)
+
+    def get_context(self, name, value, attrs):
+        context = super().get_context(name, value, attrs)
+        codes = KonovaCode.objects.filter(
+            **self.filter,
+        )
+        codes = [
+            parent_code.add_children()
+            for parent_code in codes
+        ]
+        context["codes"] = codes
+        return context
+
+
+class CompensationActionTreeCheckboxSelectMultiple(KonovaCodeTreeCheckboxSelectMultiple):
+    """ Provides multiple selection of CompensationActions
+
+    """
+    filter = None
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.filter = {
+            "code_lists__in": [CODELIST_COMPENSATION_ACTION_ID],
+            "parent": None,
+        }

intervention/migrations/0003_intervention_teams.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.1.3 on 2022-02-18 09:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0003_team'),
+        ('intervention', '0002_auto_20220114_0936'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='intervention',
+            name='teams',
+            field=models.ManyToManyField(help_text='Teams having access (data shared with)', to='user.Team'),
+        ),
+    ]

intervention/models/intervention.py

@@ -8,6 +8,9 @@ Created on: 15.11.21
 import shutil
 
 from django.contrib import messages
+from django.core.exceptions import ObjectDoesNotExist
+from django.db.models.fields.files import FieldFile
+from django.urls import reverse
 from django.utils import timezone
 
 from user.models import User
@@ -15,7 +18,6 @@ from django.db import models, transaction
 from django.db.models import QuerySet
 from django.http import HttpRequest
 
-from compensation.models import EcoAccountDeduction
 from intervention.managers import InterventionManager
 from intervention.models.legal import Legal
 from intervention.models.responsibility import Responsibility
@@ -25,7 +27,8 @@ from konova.models import generate_document_file_upload_path, AbstractDocument,
     ShareableObjectMixin, \
     RecordableObjectMixin, CheckableObjectMixin, GeoReferencedMixin
 from konova.settings import LANIS_LINK_TEMPLATE, LANIS_ZOOM_LUT, DEFAULT_SRID_RLP
-from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION
+from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION, DOCUMENT_REMOVED_TEMPLATE, \
+    PAYMENT_REMOVED, PAYMENT_ADDED, REVOCATION_REMOVED, INTERVENTION_HAS_REVOCATIONS_TEMPLATE
 from user.models import UserActionLogEntry
 
 
@@ -99,34 +102,6 @@ class Intervention(BaseObject, ShareableObjectMixin, RecordableObjectMixin, Chec
         checker.run_check()
         return checker
 
-    def get_LANIS_link(self) -> str:
-        """ Generates a link for LANIS depending on the geometry
-
-        Returns:
-
-        """
-        try:
-            geom = self.geometry.geom.transform(DEFAULT_SRID_RLP, clone=True)
-            x = geom.centroid.x
-            y = geom.centroid.y
-            area = int(geom.envelope.area)
-            z_l = 16
-            for k_area, v_zoom in LANIS_ZOOM_LUT.items():
-                if k_area < area:
-                    z_l = v_zoom
-                    break
-            zoom_lvl = z_l
-        except (AttributeError, IndexError) as e:
-            # If no geometry has been added, yet.
-            x = 1
-            y = 1
-            zoom_lvl = 6
-        return LANIS_LINK_TEMPLATE.format(
-            zoom_lvl,
-            x,
-            y,
-        )
-
     def get_documents(self) -> (QuerySet, QuerySet):
         """ Getter for all documents of an intervention
 
@@ -195,6 +170,7 @@ class Intervention(BaseObject, ShareableObjectMixin, RecordableObjectMixin, Chec
                 comment=form_data.get("comment", None),
                 intervention=self,
             )
+            self.mark_as_edited(user, form.request, edit_comment=PAYMENT_ADDED)
         return pay
 
     def add_revocation(self, form):
@@ -228,27 +204,55 @@ class Intervention(BaseObject, ShareableObjectMixin, RecordableObjectMixin, Chec
                 )
         return revocation
 
-    def add_deduction(self, form):
-        """ Adds a new deduction to the intervention
+    def edit_revocation(self, form):
+        """ Updates a revocation of the intervention
 
         Args:
-            form (NewDeductionModalForm): The form holding the data
+            form (EditRevocationModalForm): The form holding the data
 
         Returns:
 
         """
         form_data = form.cleaned_data
-        user = form.user
+        file = form_data.get("file", None)
+
+        revocation = form.revocation
+        revocation.date = form_data.get("date", None)
+        revocation.comment = form_data.get("comment", None)
 
         with transaction.atomic():
-            user_action_create = UserActionLogEntry.get_created_action(user)
-            deduction = EcoAccountDeduction.objects.create(
-                intervention=self,
-                account=form_data["account"],
-                surface=form_data["surface"],
-                created=user_action_create,
-            )
-        return deduction
+            try:
+                revocation.document.date_of_creation = revocation.date
+                revocation.document.comment = revocation.comment
+                if not isinstance(file, FieldFile):
+                    revocation.document.replace_file(file)
+                revocation.document.save()
+            except ObjectDoesNotExist:
+                revocation.document = RevocationDocument.objects.create(
+                    title="revocation_of_{}".format(self.identifier),
+                    date_of_creation=revocation.date,
+                    comment=revocation.comment,
+                    file=file,
+                    instance=revocation
+                )
+            revocation.save()
+
+        return revocation
+
+    def remove_revocation(self, form):
+        """ Removes a revocation from the intervention
+
+        Args:
+            form (RemoveRevocationModalForm): The form holding all relevant data
+
+        Returns:
+
+        """
+        revocation = form.revocation
+        user = form.user
+        with transaction.atomic():
+            revocation.delete()
+            self.mark_as_edited(user, request=form.request, edit_comment=REVOCATION_REMOVED)
 
     def mark_as_edited(self, performing_user: User, request: HttpRequest = None, edit_comment: str = None, reset_recorded: bool = True):
         """ In case the object or a related object changed, internal processes need to be started, such as
@@ -263,9 +267,12 @@ class Intervention(BaseObject, ShareableObjectMixin, RecordableObjectMixin, Chec
         Returns:
 
         """
-        super().mark_as_edited(performing_user, request, edit_comment, reset_recorded)
+        action = super().mark_as_edited(performing_user, edit_comment=edit_comment)
+        if reset_recorded:
+            self.unrecord(performing_user, request)
         if self.checked:
             self.set_unchecked()
+        return action
 
     def set_status_messages(self, request: HttpRequest):
         """ Setter for different information that need to be rendered
@@ -278,6 +285,13 @@ class Intervention(BaseObject, ShareableObjectMixin, RecordableObjectMixin, Chec
         Returns:
             request (HttpRequest): The modified request
         """
+        # Inform user about revocation
+        if self.legal.revocations.exists():
+            messages.error(
+                request,
+                INTERVENTION_HAS_REVOCATIONS_TEMPLATE.format(self.legal.revocations.count()),
+                extra_tags="danger",
+            )
         if not self.is_shared_with(request.user):
             messages.info(request, DATA_UNSHARED_EXPLANATION)
         request = self.set_geometry_conflict_message(request)
@@ -299,6 +313,29 @@ class Intervention(BaseObject, ShareableObjectMixin, RecordableObjectMixin, Chec
                    and is_free_of_revocations
         return is_ready
 
+    def get_share_link(self):
+        """ Returns the share url for the object
+
+        Returns:
+
+        """
+        return reverse("intervention:share", args=(self.id, self.access_token))
+
+    def remove_payment(self, form):
+        """ Removes a Payment from the intervention
+
+        Args:
+            form (RemovePaymentModalForm): The form holding all relevant data
+
+        Returns:
+
+        """
+        payment = form.payment
+        user = form.user
+        with transaction.atomic():
+            payment.delete()
+            self.mark_as_edited(user, request=form.request, edit_comment=PAYMENT_REMOVED)
+
 
 class InterventionDocument(AbstractDocument):
     """
@@ -314,7 +351,7 @@ class InterventionDocument(AbstractDocument):
         max_length=1000,
     )
 
-    def delete(self, *args, **kwargs):
+    def delete(self, user=None, *args, **kwargs):
         """
         Custom delete functionality for InterventionDocuments.
         Removes the folder from the file system if there are no further documents for this entry.
@@ -336,6 +373,9 @@ class InterventionDocument(AbstractDocument):
             folder_path = self.file.path.split("/")[:-1]
             folder_path = "/".join(folder_path)
 
+        if user:
+            self.instance.mark_as_edited(user, edit_comment=DOCUMENT_REMOVED_TEMPLATE.format(self.title))
+
         # Remove the file itself
         super().delete(*args, **kwargs)
 

intervention/models/revocation.py

@@ -9,7 +9,10 @@ Created on: 15.11.21
 import shutil
 
 from django.contrib.gis.db import models
+from django.core.exceptions import ObjectDoesNotExist
+
 from konova.models import BaseResource, AbstractDocument, generate_document_file_upload_path
+from konova.utils.message_templates import REVOCATION_REMOVED
 
 
 class Revocation(BaseResource):
@@ -22,10 +25,18 @@ class Revocation(BaseResource):
 
     def delete(self, *args, **kwargs):
         # Make sure related objects are being removed as well
-        if self.document:
+        try:
             self.document.delete(*args, **kwargs)
+        except ObjectDoesNotExist:
+            # No file to delete
+            pass
+
         super().delete()
 
+    @property
+    def intervention(self):
+        return self.legal.intervention
+
 
 class RevocationDocument(AbstractDocument):
     """

intervention/tables.py

@@ -6,6 +6,7 @@ Created on: 01.12.20
 
 """
 from django.http import HttpRequest
+from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.html import format_html
 from django.utils.timezone import localtime
@@ -29,6 +30,11 @@ class InterventionTable(BaseTable, TableRenderMixin):
         orderable=True,
         accessor="title",
     )
+    d = tables.Column(
+        verbose_name=_("Parcel gmrkng"),
+        orderable=True,
+        accessor="geometry",
+    )
     c = tables.Column(
         verbose_name=_("Checked"),
         orderable=True,
@@ -41,12 +47,6 @@ class InterventionTable(BaseTable, TableRenderMixin):
         empty_values=[],
         accessor="recorded",
     )
-    rev = tables.Column(
-        verbose_name=_("Revocation"),
-        orderable=True,
-        empty_values=[],
-        accessor="legal__revocation",
-    )
     e = tables.Column(
         verbose_name=_("Editable"),
         orderable=True,
@@ -84,14 +84,17 @@ class InterventionTable(BaseTable, TableRenderMixin):
         Returns:
 
         """
-        html = ""
-        html += self.render_link(
-            tooltip=_("Open {}").format(_("Intervention")),
-            href=reverse("intervention:detail", args=(record.id,)),
-            txt=value,
-            new_tab=False,
+        context = {
+            "tooltip": _("Open {}").format(_("Intervention")),
+            "content": value,
+            "url": reverse("intervention:detail", args=(record.id,)),
+            "has_revocations": record.legal.revocations.exists()
+        }
+        html = render_to_string(
+            "table/revocation_warning_col.html",
+            context
         )
-        return format_html(html)
+        return html
 
     def render_c(self, value, record: Intervention):
         """ Renders the checked column for an intervention
@@ -117,6 +120,28 @@ class InterventionTable(BaseTable, TableRenderMixin):
         )
         return format_html(html)
 
+    def render_d(self, value, record: Intervention):
+        """ Renders the parcel district column for an intervention
+
+        Args:
+            value (str): The intervention geometry
+            record (Intervention): The intervention record
+
+        Returns:
+
+        """
+        parcels = value.get_underlying_parcels().values_list(
+            "gmrkng",
+            flat=True
+        ).distinct()
+        html = render_to_string(
+            "table/gmrkng_col.html",
+            {
+                "entries": parcels
+            }
+        )
+        return html
+
     def render_r(self, value, record: Intervention):
         """ Renders the recorded column for an intervention
 
@@ -162,28 +187,3 @@ class InterventionTable(BaseTable, TableRenderMixin):
         )
         return format_html(html)
 
-    def render_rev(self, value, record: Intervention):
-        """ Renders the revocation column for an intervention
-
-        Args:
-            value (str): The revocation value
-            record (Intervention): The intervention record
-
-        Returns:
-
-        """
-        html = ""
-        exists = value is not None
-        tooltip = _("No revocation")
-        if exists:
-            _date = value.date
-            added_ts = localtime(value.created.timestamp)
-            added_ts = added_ts.strftime(DEFAULT_DATE_TIME_FORMAT)
-            on = _date.strftime(DEFAULT_DATE_FORMAT)
-            tooltip = _("Revocation from {}, added on {} by {}").format(on, added_ts, value.created.user)
-        html += self.render_stop(
-            tooltip=tooltip,
-            icn_filled=exists,
-        )
-        return format_html(html)
-

intervention/templates/intervention/detail/includes/compensations.html

@@ -22,19 +22,21 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th scope="col">
+                <th class="w-25" scope="col">
                     {% trans 'Identifier' %}
                 </th>
                 <th scope="col">
                     {% trans 'Title' %}
                 </th>
                 {% if is_default_member and has_access %}
-                    <th scope="col">
-                        {% trans 'Action' %}
+                    <th class="w-10" scope="col">
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -50,7 +52,7 @@
                 <td class="align-middle">{{ comp.title }}</td>
                 <td>
                 {% if is_default_member and has_access %}
-                    <button data-form-url="{% url 'compensation:remove' comp.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove compensation' %}">
+                    <button data-form-url="{% url 'intervention:remove-compensation' obj.id comp.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove compensation' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                 {% endif %}

intervention/templates/intervention/detail/includes/deductions.html

@@ -11,7 +11,7 @@
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
                     {% if is_default_member and has_access  %}
-                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'intervention:acc-new-deduction' obj.id %}" title="{% trans 'Add new deduction' %}">
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'intervention:new-deduction' obj.id %}" title="{% trans 'Add new deduction' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'tree' %}
                     </button>
@@ -20,11 +20,11 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th scope="col">
+                <th class="w-25" scope="col">
                     {% trans 'Account Identifier' %}
                 </th>
                 <th scope="col">
@@ -34,8 +34,10 @@
                     {% trans 'Created' %}
                 </th>
                 {% if is_default_member and has_access %}
-                    <th scope="col">
-                        {% trans 'Action' %}
+                    <th class="w-10" scope="col">
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -44,7 +46,7 @@
             {% for deduction in obj.deductions.all %}
             <tr {% if deduction.account.deleted %}class="align-middle alert-danger" title="{% trans 'Eco-account deleted! Deduction invalid!' %}" {% elif not deduction.account.recorded %}class="align-middle alert-danger" title="{% trans 'Eco-account not recorded! Deduction invalid!' %}"  {% endif %}>
                 <td class="align-middle">
-                    <a href="{% url 'compensation:acc-detail' deduction.account.id %}">
+                    <a href="{% url 'compensation:acc:detail' deduction.account.id %}">
                         {% if deduction.account.deleted or not deduction.account.recorded %}
                         {% fa5_icon 'exclamation-triangle' %}
                         {% endif %}
@@ -53,9 +55,12 @@
                 </td>
                 <td class="align-middle">{{ deduction.surface|floatformat:2|intcomma }} m²</td>
                 <td class="align-middle">{{ deduction.created.timestamp|default_if_none:""|naturalday}}</td>
-                <td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc-remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Deduction' %}">
+                    <button data-form-url="{% url 'intervention:edit-deduction' obj.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit Deduction' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
+                    <button data-form-url="{% url 'intervention:remove-deduction' obj.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Deduction' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}

intervention/templates/intervention/detail/includes/documents.html

@@ -20,19 +20,24 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
                 <th scope="col">
                     {% trans 'Title' %}
                 </th>
+                <th scope="col">
+                    {% trans 'Created on' %}
+                </th>
                 <th scope="col">
                     {% trans 'Comment' %}
                 </th>
                 {% if is_default_member and has_access %}
-                    <th scope="col">
-                        {% trans 'Action' %}
+                    <th class="w-10" scope="col">
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -40,15 +45,27 @@
             <tbody>
             {% for doc in obj.documents.all %}
             <tr>
-                <td class="align-middle">
-                    <a href="{% url 'intervention:get-doc' doc.id %}">
+                <td>
+                    <a href="{% url 'intervention:get-doc' obj.id doc.id %}">
                         {{ doc.title }}
                     </a>
                 </td>
-                <td class="align-middle">{{ doc.comment }}</td>
                 <td>
+                    <div class="scroll-150">
+                        {{ doc.date_of_creation }}
+                    </div>
+                </td>
+                <td>
+                    <div class="scroll-150">
+                        {{ doc.comment }}
+                    </div>
+                </td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'intervention:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
+                    <button data-form-url="{% url 'intervention:edit-doc' obj.id doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit document' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
+                    <button data-form-url="{% url 'intervention:remove-doc' obj.id doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}

intervention/templates/intervention/detail/includes/payments.html

@@ -11,7 +11,7 @@
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
                     {% if is_default_member and has_access  %}
-                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:pay-new' obj.id %}" title="{% trans 'Add new payment' %}">
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:pay:new' obj.id %}" title="{% trans 'Add new payment' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'money-bill-wave' %}
                     </button>
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -30,12 +30,14 @@
                 <th scope="col">
                     {% trans 'Due on' %}
                 </th>
-                <th scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Comment' %}
                 </th>
                 {% if is_default_member and has_access %}
-                    <th scope="col">
-                        {% trans 'Action' %}
+                    <th class="w-10" scope="col">
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -47,10 +49,17 @@
                     {{ pay.amount|floatformat:2 }} €
                 </td>
                 <td class="align-middle">{{ pay.due_on|default_if_none:"---" }}</td>
-                <td class="align-middle">{{ pay.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ pay.comment }}
+                    </div>
+                </td>
+                <td class="align-middle float-right">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:pay-remove' pay.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove payment' %}">
+                    <button data-form-url="{% url 'compensation:pay:edit' obj.id pay.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit payment' %}">
+                        {% fa5_icon 'edit' %}
+                    </button>
+                    <button data-form-url="{% url 'compensation:pay:remove' obj.id pay.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove payment' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}

intervention/templates/intervention/detail/includes/revocation.html

@@ -23,7 +23,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -37,8 +37,10 @@
                     {% trans 'Comment' %}
                 </th>
                 {% if is_default_member and has_access %}
-                    <th scope="col">
-                        {% trans 'Action' %}
+                    <th class="w-10" scope="col">
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -56,10 +58,17 @@
                             </a>
                         {% endif %}
                     </td>
-                    <td class="align-middle">{{ rev.comment }}</td>
-                    <td>
+                    <td class="align-middle">
+                        <div class="scroll-150">
+                            {{ rev.comment }}
+                        </div>
+                    </td>
+                    <td class="align-middle float-right">
                         {% if is_default_member and has_access  %}
-                        <button data-form-url="{% url 'intervention:remove-revocation' rev.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove revocation' %}">
+                        <button data-form-url="{% url 'intervention:edit-revocation' obj.id rev.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit revocation' %}">
+                            {% fa5_icon 'edit' %}
+                        </button>
+                        <button data-form-url="{% url 'intervention:remove-revocation' obj.id rev.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove revocation' %}">
                             {% fa5_icon 'trash' %}
                         </button>
                         {% endif %}

intervention/templates/intervention/detail/view.html

@@ -14,16 +14,16 @@
 {% block body %}
 
     <div id="detail-header" class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <h3>{% trans 'Intervention' %}<br> {{obj.identifier}}</h3>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             {% include 'intervention/detail/includes/controls.html' %}
         </div>
     </div>
     <hr>
     <div id="data" class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <div class="table-container">
                 <table class="table table-hover">
                     <tr {% if not obj.title %}class="alert alert-danger" title="{% trans 'Missing' %}" {% endif %}>
@@ -114,6 +114,10 @@
                     <tr>
                         <th scope="row">{% trans 'Shared with' %}</th>
                         <td class="align-middle">
+                            {% for team in obj.teams.all %}
+                                {% include 'user/includes/team_data_modal_button.html' %}
+                            {% endfor %}
+                            <hr>
                             {% for user in obj.users.all %}
                                 {% include 'user/includes/contact_modal_button.html' %}
                             {% endfor %}
@@ -122,7 +126,7 @@
                 </table>
             </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <div class="row">
                 {% include 'map/geom_form.html' %}
             </div>
@@ -136,27 +140,29 @@
     </div>
     <hr>
 
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'intervention/detail/includes/compensations.html' %}
+    <div id="related_data">
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'intervention/detail/includes/compensations.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'intervention/detail/includes/payments.html' %}
+            </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'intervention/detail/includes/payments.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'intervention/detail/includes/deductions.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'intervention/detail/includes/revocation.html' %}
+            </div>
         </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'intervention/detail/includes/deductions.html' %}
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'intervention/detail/includes/revocation.html' %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'intervention/detail/includes/documents.html' %}
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+                {% include 'intervention/detail/includes/documents.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+            </div>
         </div>
     </div>
 

intervention/templates/intervention/report/report.html

@@ -3,7 +3,7 @@
 
 {% block body %}
 <div class="row">
-    <div class="col-sm-12 col-md-12 col-lg-6">
+    <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
         <h3>{% trans 'Report' %}</h3>
         <h4>{{obj.identifier}}</h4>
         <div class="table-container">
@@ -41,10 +41,6 @@
                         <th scope="row">{% trans 'Conservation office file number' %}</th>
                         <td class="align-middle">{{obj.responsible.conservation_file_number|default_if_none:""}}</td>
                     </tr>
-                    <tr>
-                        <th scope="row">{% trans 'Intervention handler' %}</th>
-                        <td class="align-middle">{{obj.responsible.handler|default_if_none:""}}</td>
-                    </tr>
                     <tr>
                         <th scope="row">{% trans 'Compensations' %}</th>
                         <td class="align-middle">
@@ -62,7 +58,7 @@
                         <th scope="row">{% trans 'Deductions of eco-accounts' %}</th>
                         <td class="align-middle">
                             {% for deduction in deductions %}
-                                <a href="{% url 'compensation:acc-report' deduction.account.id %}">
+                                <a href="{% url 'compensation:acc:report' deduction.account.id %}">
                                     {{deduction.account.identifier}} - {{deduction.account.title}}
                                 </a>
                                 <br>
@@ -96,7 +92,7 @@
             </table>
         </div>
     </div>
-    <div class="col-sm-12 col-md-12 col-lg-6">
+    <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
         <div class="row">
             {% include 'map/geom_form.html' %}
         </div>

intervention/tests/test_views.py

@@ -10,6 +10,7 @@ from django.test import Client
 from django.contrib.auth.models import Group
 from django.urls import reverse
 
+from intervention.models import Revocation
 from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
 from konova.tests.test_views import BaseViewTestCase
 
@@ -20,19 +21,34 @@ class InterventionViewTestCase(BaseViewTestCase):
     def setUpTestData(cls) -> None:
         super().setUpTestData()
 
+    def setUp(self) -> None:
+        super().setUp()
         # Prepare urls
-        cls.index_url = reverse("intervention:index", args=())
-        cls.new_url = reverse("intervention:new", args=())
-        cls.new_id_url = reverse("intervention:new-id", args=())
-        cls.detail_url = reverse("intervention:detail", args=(cls.intervention.id,))
-        cls.log_url = reverse("intervention:log", args=(cls.intervention.id,))
-        cls.edit_url = reverse("intervention:edit", args=(cls.intervention.id,))
-        cls.remove_url = reverse("intervention:remove", args=(cls.intervention.id,))
-        cls.share_url = reverse("intervention:share", args=(cls.intervention.id, cls.intervention.access_token,))
-        cls.share_create_url = reverse("intervention:share-create", args=(cls.intervention.id,))
-        cls.run_check_url = reverse("intervention:check", args=(cls.intervention.id,))
-        cls.record_url = reverse("intervention:record", args=(cls.intervention.id,))
-        cls.report_url = reverse("intervention:report", args=(cls.intervention.id,))
+        self.index_url = reverse("intervention:index", args=())
+        self.new_url = reverse("intervention:new", args=())
+        self.new_id_url = reverse("intervention:new-id", args=())
+        self.detail_url = reverse("intervention:detail", args=(self.intervention.id,))
+        self.log_url = reverse("intervention:log", args=(self.intervention.id,))
+        self.edit_url = reverse("intervention:edit", args=(self.intervention.id,))
+        self.remove_url = reverse("intervention:remove", args=(self.intervention.id,))
+        self.share_url = reverse("intervention:share", args=(self.intervention.id, self.intervention.access_token,))
+        self.share_create_url = reverse("intervention:share-create", args=(self.intervention.id,))
+        self.run_check_url = reverse("intervention:check", args=(self.intervention.id,))
+        self.record_url = reverse("intervention:record", args=(self.intervention.id,))
+        self.report_url = reverse("intervention:report", args=(self.intervention.id,))
+
+        self.deduction.intervention = self.intervention
+        self.deduction.save()
+        self.deduction_new_url = reverse("intervention:new-deduction", args=(self.intervention.id,))
+        self.deduction_edit_url = reverse("intervention:edit-deduction", args=(self.intervention.id, self.deduction.id,))
+        self.deduction_remove_url = reverse("intervention:remove-deduction", args=(self.intervention.id, self.deduction.id))
+
+        self.revocation = Revocation.objects.create(
+            legal=self.intervention.legal
+        )
+        self.revocation_new_url = reverse("intervention:new-revocation", args=(self.intervention.id,))
+        self.revocation_edit_url = reverse("intervention:edit-revocation", args=(self.intervention.id, self.revocation.id))
+        self.revocation_remove_url = reverse("intervention:remove-revocation", args=(self.intervention.id, self.revocation.id))
 
     def test_views_anonymous_user(self):
         """ Check correct status code for all requests
@@ -61,6 +77,12 @@ class InterventionViewTestCase(BaseViewTestCase):
             self.share_create_url: f"{login_redirect_base}{self.share_create_url}",
             self.run_check_url: f"{login_redirect_base}{self.run_check_url}",
             self.record_url: f"{login_redirect_base}{self.record_url}",
+            self.deduction_new_url: f"{login_redirect_base}{self.deduction_new_url}",
+            self.deduction_edit_url: f"{login_redirect_base}{self.deduction_edit_url}",
+            self.deduction_remove_url: f"{login_redirect_base}{self.deduction_remove_url}",
+            self.revocation_new_url: f"{login_redirect_base}{self.revocation_new_url}",
+            self.revocation_edit_url: f"{login_redirect_base}{self.revocation_edit_url}",
+            self.revocation_remove_url: f"{login_redirect_base}{self.revocation_remove_url}",
         }
 
         self.assert_url_success(client, success_urls)
@@ -96,6 +118,12 @@ class InterventionViewTestCase(BaseViewTestCase):
             self.share_create_url,
             self.run_check_url,
             self.record_url,
+            self.revocation_new_url,
+            self.revocation_edit_url,
+            self.revocation_remove_url,
+            self.deduction_new_url,
+            self.deduction_edit_url,
+            self.deduction_remove_url,
         ]
 
         self.assert_url_success(client, success_urls)
@@ -116,7 +144,7 @@ class InterventionViewTestCase(BaseViewTestCase):
         # Add user to default group
         default_group = Group.objects.get(name=DEFAULT_GROUP)
         self.superuser.groups.set([default_group])
-        self.intervention.share_with_list([self.superuser])
+        self.intervention.share_with_user_list([self.superuser])
 
         success_urls = [
             self.index_url,
@@ -128,6 +156,12 @@ class InterventionViewTestCase(BaseViewTestCase):
             self.edit_url,
             self.remove_url,
             self.share_create_url,
+            self.revocation_new_url,
+            self.revocation_edit_url,
+            self.revocation_remove_url,
+            self.deduction_new_url,
+            self.deduction_edit_url,
+            self.deduction_remove_url,
         ]
         fail_urls = [
             self.run_check_url,
@@ -156,7 +190,7 @@ class InterventionViewTestCase(BaseViewTestCase):
         # Add user to default group
         default_group = Group.objects.get(name=DEFAULT_GROUP)
         self.superuser.groups.set([default_group])
-        self.intervention.share_with_list([])
+        self.intervention.share_with_user_list([])
 
         success_urls = [
             self.index_url,
@@ -172,6 +206,12 @@ class InterventionViewTestCase(BaseViewTestCase):
             self.remove_url,
             self.share_create_url,
             self.log_url,
+            self.revocation_new_url,
+            self.revocation_edit_url,
+            self.revocation_remove_url,
+            self.deduction_new_url,
+            self.deduction_edit_url,
+            self.deduction_remove_url,
         ]
         success_urls_redirect = {
             self.share_url: self.detail_url
@@ -196,7 +236,7 @@ class InterventionViewTestCase(BaseViewTestCase):
         # Add user to zb group
         zb_group = self.groups.get(name=ZB_GROUP)
         self.superuser.groups.set([zb_group])
-        self.intervention.share_with_list([self.superuser])
+        self.intervention.share_with_user_list([self.superuser])
 
         success_urls = [
             self.index_url,
@@ -212,6 +252,12 @@ class InterventionViewTestCase(BaseViewTestCase):
             self.remove_url,
             self.share_create_url,
             self.record_url,
+            self.revocation_new_url,
+            self.revocation_edit_url,
+            self.revocation_remove_url,
+            self.deduction_new_url,
+            self.deduction_edit_url,
+            self.deduction_remove_url,
         ]
         success_urls_redirect = {
             self.share_url: self.detail_url
@@ -236,7 +282,7 @@ class InterventionViewTestCase(BaseViewTestCase):
         # Add user to zb group
         zb_group = self.groups.get(name=ZB_GROUP)
         self.superuser.groups.set([zb_group])
-        self.intervention.share_with_list([])
+        self.intervention.share_with_user_list([])
 
         success_urls = [
             self.index_url,
@@ -252,6 +298,12 @@ class InterventionViewTestCase(BaseViewTestCase):
             self.share_create_url,
             self.record_url,
             self.run_check_url,
+            self.revocation_new_url,
+            self.revocation_edit_url,
+            self.revocation_remove_url,
+            self.deduction_new_url,
+            self.deduction_edit_url,
+            self.deduction_remove_url,
         ]
         success_urls_redirect = {
             self.share_url: self.detail_url
@@ -276,7 +328,7 @@ class InterventionViewTestCase(BaseViewTestCase):
         # Add user to ets group
         ets_group = Group.objects.get(name=ETS_GROUP)
         self.superuser.groups.set([ets_group])
-        self.intervention.share_with_list([self.superuser])
+        self.intervention.share_with_user_list([self.superuser])
 
         success_urls = [
             self.index_url,
@@ -292,6 +344,12 @@ class InterventionViewTestCase(BaseViewTestCase):
             self.remove_url,
             self.share_create_url,
             self.run_check_url,
+            self.revocation_new_url,
+            self.revocation_edit_url,
+            self.revocation_remove_url,
+            self.deduction_new_url,
+            self.deduction_edit_url,
+            self.deduction_remove_url,
         ]
         success_urls_redirect = {
             self.share_url: self.detail_url
@@ -316,7 +374,7 @@ class InterventionViewTestCase(BaseViewTestCase):
         # Add user to default group
         ets_group = Group.objects.get(name=ETS_GROUP)
         self.superuser.groups.set([ets_group])
-        self.intervention.share_with_list([])
+        self.intervention.share_with_user_list([])
 
         success_urls = [
             self.index_url,
@@ -332,6 +390,12 @@ class InterventionViewTestCase(BaseViewTestCase):
             self.remove_url,
             self.share_create_url,
             self.run_check_url,
+            self.revocation_new_url,
+            self.revocation_edit_url,
+            self.revocation_remove_url,
+            self.deduction_new_url,
+            self.deduction_edit_url,
+            self.deduction_remove_url,
         ]
         # Define urls where a redirect to a specific location is the proper response
         success_urls_redirect = {

intervention/tests/test_workflow.py

@@ -30,7 +30,7 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
         super().setUp()
         # Recreate a new (bare minimum) intervention before each test
         self.intervention = self.create_dummy_intervention()
-        self.intervention.share_with(self.superuser)
+        self.intervention.share_with_user(self.superuser)
 
     def test_new(self):
         """
@@ -74,6 +74,9 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
             self.assertEqual(obj.identifier, test_id)
             self.assertEqual(obj.title, test_title)
             self.assert_equal_geometries(obj.geometry.geom, test_geom)
+            self.assertEqual(1, obj.log.count())
+            self.assertEqual(obj.log.first().action, UserAction.CREATED)
+            self.assertEqual(obj.log.first().user, self.superuser)
         except ObjectDoesNotExist:
             # Fail if there is no such object
             self.fail()
@@ -210,11 +213,13 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
         # Attention: Despite the fact, this url refers to a compensation app route, we test it here for the interventions.
         # Reason: A payment is some kind of compensation for an intervention. Therefore it lives inside the compensation app.
         # BUT: Payments are added on the intervention detail page. Therefore it's part of a regular intervention workflow.
-        new_payment_url = reverse("compensation:pay-new", args=(self.intervention.id,))
+        new_payment_url = reverse("compensation:pay:new", args=(self.intervention.id,))
 
         # Make sure there are no payments on the intervention, yet
         self.assertEqual(0, self.intervention.payments.count())
 
+        pre_payment_logs_count = self.intervention.log.count()
+
         # Create form data to be sent to the url
         test_amount = 10.00
         test_due = "2021-01-01"
@@ -239,6 +244,10 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
         self.assertEqual(payment.amount, test_amount)
         self.assertEqual(payment.due_on, datetime.date.fromisoformat(test_due))
         self.assertEqual(payment.comment, test_comment)
+
+        # Make sure a log entry has been created
+        self.assertEqual(self.intervention.log.first().action, UserAction.EDITED)
+        self.assertEqual(pre_payment_logs_count + 1, self.intervention.log.count())
         return payment
 
     def subtest_delete_payment(self, payment: Payment):
@@ -250,8 +259,10 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
         Returns:
 
         """
+        pre_payment_logs_count = self.intervention.log.count()
+
         # Create removing url for the payment
-        remove_url = reverse("compensation:pay-remove", args=(payment.id,))
+        remove_url = reverse("compensation:pay:remove", args=(self.intervention.id, payment.id,))
         post_data = {
             "confirm": True,
         }
@@ -266,6 +277,11 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
         # Now make sure the intervention has no payments anymore
         self.assertEqual(0, self.intervention.payments.count())
 
+        # Make sure a log entry has been created
+        self.assertEqual(self.intervention.log.first().action, UserAction.EDITED)
+        self.assertEqual(self.intervention.log.first().user, self.superuser)
+        self.assertEqual(pre_payment_logs_count + 1, self.intervention.log.count())
+
     def test_payments(self):
         """
         Checks a 'normal' case of adding a payment.
@@ -287,7 +303,6 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
         Reasons for failing are:
             * EcoAccount does not provide enough 'deductable_surface'
             * EcoAccount is not recorded (not "approved"), yet
-            * EcoAccount is not shared with performing user
 
         Args:
             new_url (str): The url to send the post data to
@@ -299,7 +314,6 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
         # Before running fail positive tests, we need to have an account in a (normally) fine working state
         self.assertIsNotNone(self.eco_account.recorded)  # -> is recorded
         self.assertGreater(self.eco_account.deductable_surface, test_surface)  # -> has more deductable surface than we need
-        self.assertIn(self.superuser, self.eco_account.users.all())  # -> is shared with the performing user
 
         # Count the number of already existing deductions in total and for the account for later comparison
         num_deductions = self.eco_account.deductions.count()
@@ -317,20 +331,11 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
         self.assertEqual(num_deductions, self.eco_account.deductions.count())
         self.assertEqual(num_deductions_total, EcoAccountDeduction.objects.count())
 
-        # Now restore the deductable surface to a valid size back again but remove the user from the shared list
+        # Now restore the deductable surface to a valid size back again
         self.eco_account.deductable_surface = test_surface + 100.00
-        self.eco_account.share_with_list([])
         self.eco_account.save()
 
-        # Now perform the (expected) failing request (again)
-        self.client_user.post(new_url, post_data)
-
-        # Expect no changes at all, since the account is not shared
-        self.assertEqual(num_deductions, self.eco_account.deductions.count())
-        self.assertEqual(num_deductions_total, EcoAccountDeduction.objects.count())
-
-        # Restore the sharing but remove the recording state
-        self.eco_account.share_with_list([self.superuser])
+        # Remove the recording state
         self.eco_account.recorded.delete()
         self.eco_account.refresh_from_db()
         self.eco_account.save()
@@ -353,12 +358,14 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
         Returns:
 
         """
+        pre_deduction_logs_count = self.intervention.log.count()
+
         # Prepare the account for a working situation (enough deductable surface, recorded and shared)
         self.eco_account.deductable_surface = 10000.00
         if self.eco_account.recorded is None:
             rec_action = UserActionLogEntry.get_recorded_action(self.superuser)
             self.eco_account.recorded = rec_action
-        self.eco_account.share_with_list([self.superuser])
+        self.eco_account.share_with_user_list([self.superuser])
         self.eco_account.save()
         num_all_deducs = EcoAccountDeduction.objects.count()
 
@@ -376,6 +383,11 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
         )
         self.assertEqual(deduction.surface, test_surface)
 
+        # Make sure a log entry has been created
+        self.assertEqual(self.intervention.log.first().action, UserAction.EDITED)
+        self.assertEqual(self.intervention.log.first().user, self.superuser)
+        self.assertEqual(pre_deduction_logs_count + 1, self.intervention.log.count())
+
         # Return deduction for further usage in tests
         return deduction
 
@@ -390,7 +402,7 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
 
         """
         # Create the url for creating a new deduction
-        new_url = reverse("compensation:acc-new-deduction", args=(self.eco_account.id,))
+        new_url = reverse("compensation:acc:new-deduction", args=(self.eco_account.id,))
 
         # Prepare the form data
         test_surface = 100.00
@@ -414,8 +426,10 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
         Returns:
 
         """
+        pre_delete_logs_count = self.intervention.log.count()
+
         # Prepare url for deleting of this deduction
-        delete_url = reverse("compensation:acc-remove-deduction", args=(self.eco_account.id, deduction.id,))
+        delete_url = reverse("compensation:acc:remove-deduction", args=(self.eco_account.id, deduction.id,))
         post_data = {
             "confirm": True
         }
@@ -433,6 +447,11 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
         # Expect the deduction to be totally gone
         self.assert_object_is_deleted(deduction)
 
+        # Make sure a log entry has been created
+        self.assertEqual(self.intervention.log.first().action, UserAction.EDITED)
+        self.assertEqual(self.intervention.log.first().user, self.superuser)
+        self.assertEqual(pre_delete_logs_count + 1, self.intervention.log.count())
+
     def test_deduction(self):
         """
         Checks a 'normal case of adding a deduction.

intervention/urls.py

@@ -9,7 +9,8 @@ from django.urls import path
 
 from intervention.views import index_view, new_view, detail_view, edit_view, remove_view, new_document_view, share_view, \
     create_share_view, remove_revocation_view, new_revocation_view, check_view, log_view, new_deduction_view, \
-    record_view, remove_document_view, get_document_view, get_revocation_view, new_id_view, report_view
+    record_view, remove_document_view, get_document_view, get_revocation_view, new_id_view, report_view, \
+    remove_deduction_view, remove_compensation_view, edit_deduction_view, edit_revocation_view, edit_document_view
 
 app_name = "intervention"
 urlpatterns = [
@@ -26,16 +27,23 @@ urlpatterns = [
     path('<id>/record', record_view, name='record'),
     path('<id>/report', report_view, name='report'),
 
+    # Compensations
+    path('<id>/compensation/<comp_id>/remove', remove_compensation_view, name='remove-compensation'),
+
     # Documents
     path('<id>/document/new/', new_document_view, name='new-doc'),
-    path('document/<doc_id>', get_document_view, name='get-doc'),
-    path('document/<doc_id>/remove/', remove_document_view, name='remove-doc'),
+    path('<id>/document/<doc_id>', get_document_view, name='get-doc'),
+    path('<id>/document/<doc_id>/remove/', remove_document_view, name='remove-doc'),
+    path('<id>/document/<doc_id>/edit/', edit_document_view, name='edit-doc'),
 
     # Deductions
-    path('<id>/deduction/new', new_deduction_view, name='acc-new-deduction'),
+    path('<id>/deduction/new', new_deduction_view, name='new-deduction'),
+    path('<id>/deduction/<deduction_id>/edit', edit_deduction_view, name='edit-deduction'),
+    path('<id>/deduction/<deduction_id>/remove', remove_deduction_view, name='remove-deduction'),
 
     # Revocation routes
     path('<id>/revocation/new', new_revocation_view, name='new-revocation'),
-    path('revocation/<id>/remove', remove_revocation_view, name='remove-revocation'),
+    path('<id>/revocation/<revocation_id>/edit', edit_revocation_view, name='edit-revocation'),
+    path('<id>/revocation/<revocation_id>/remove', remove_revocation_view, name='remove-revocation'),
     path('revocation/<doc_id>', get_revocation_view, name='get-doc-revocation'),
 ]

intervention/utils/quality.py

@@ -89,7 +89,10 @@ class InterventionQualityChecker(AbstractQualityChecker):
         Returns:
 
         """
-        c_comps = self.obj.compensations.count()
+        comps = self.obj.compensations.filter(
+            deleted=None
+        )
+        c_comps = comps.count()
         c_pays = self.obj.payments.count()
         c_deducs = self.obj.deductions.count()
         c_all = c_comps + c_pays + c_deducs

intervention/views.py

@@ -1,21 +1,24 @@
 from django.contrib.auth.decorators import login_required
+from django.core.exceptions import ObjectDoesNotExist
 from django.utils.translation import gettext_lazy as _
-from django.http import HttpRequest, JsonResponse
+from django.http import HttpRequest, JsonResponse, Http404
 from django.shortcuts import render
 
 from intervention.forms.forms import NewInterventionForm, EditInterventionForm
 from intervention.forms.modalForms import ShareModalForm, NewRevocationModalForm, \
-    CheckModalForm, NewDeductionModalForm, NewInterventionDocumentForm
+    CheckModalForm, NewDeductionModalForm, NewInterventionDocumentModalForm, RemoveEcoAccountDeductionModalForm, \
+    RemoveRevocationModalForm, EditEcoAccountDeductionModalForm, EditRevocationModalForm
 from intervention.models import Intervention, Revocation, InterventionDocument, RevocationDocument
 from intervention.tables import InterventionTable
 from konova.contexts import BaseContext
 from konova.decorators import *
-from konova.forms import SimpleGeomForm, RemoveModalForm, RecordModalForm
+from konova.forms import SimpleGeomForm, RemoveModalForm, RecordModalForm, EditDocumentModalForm
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import remove_document, get_document
 from konova.utils.generators import generate_qr_code
 from konova.utils.message_templates import INTERVENTION_INVALID, FORM_INVALID, IDENTIFIER_REPLACED, \
-    CHECKED_RECORDED_RESET
+    CHECKED_RECORDED_RESET, DEDUCTION_REMOVED, DEDUCTION_ADDED, REVOCATION_ADDED, REVOCATION_REMOVED, \
+    COMPENSATION_REMOVED_TEMPLATE, DOCUMENT_ADDED, DEDUCTION_EDITED, REVOCATION_EDITED, DOCUMENT_EDITED
 from konova.utils.user_checks import in_group
 
 
@@ -126,10 +129,11 @@ def new_document_view(request: HttpRequest, id: str):
 
     """
     intervention = get_object_or_404(Intervention, id=id)
-    form = NewInterventionDocumentForm(request.POST or None, request.FILES or None, instance=intervention, request=request)
+    form = NewInterventionDocumentModalForm(request.POST or None, request.FILES or None, instance=intervention, request=request)
     return form.process_request(
         request,
-        msg_success=_("Document added")
+        msg_success=DOCUMENT_ADDED,
+        redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -157,48 +161,44 @@ def get_revocation_view(request: HttpRequest, doc_id: str):
         return redirect("intervention:detail", id=doc.instance.id)
     return get_document(doc)
 
-
 @login_required
 @default_group_required
-def get_document_view(request: HttpRequest, doc_id: str):
+@shared_access_required(Intervention, "id")
+def get_document_view(request: HttpRequest, id: str, doc_id: str):
     """ Returns the document as downloadable file
 
     Wraps the generic document fetcher function from konova.utils.
 
     Args:
         request (HttpRequest): The incoming request
+        id (str): The intervention id
         doc_id (str): The document id
 
     Returns:
 
     """
+    intervention = get_object_or_404(Intervention, id=id)
     doc = get_object_or_404(InterventionDocument, id=doc_id)
-    user = request.user
-    instance = doc.instance
-    # File download only possible if related instance is shared with user
-    if not instance.users.filter(id=user.id):
-        messages.info(
-            request,
-            DATA_UNSHARED
-        )
-        return redirect("intervention:detail", id=instance.id)
     return get_document(doc)
 
 
 @login_required
 @default_group_required
-def remove_document_view(request: HttpRequest, doc_id: str):
+@shared_access_required(Intervention, "id")
+def remove_document_view(request: HttpRequest, id: str, doc_id: str):
     """ Removes the document from the database and file system
 
     Wraps the generic functionality from konova.utils.
 
     Args:
         request (HttpRequest): The incoming request
+        id (str): The intervention id
         doc_id (str): The document id
 
     Returns:
 
     """
+    intervention = get_object_or_404(Intervention, id=id)
     doc = get_object_or_404(InterventionDocument, id=doc_id)
     return remove_document(
         request,
@@ -206,6 +206,32 @@ def remove_document_view(request: HttpRequest, doc_id: str):
     )
 
 
+@login_required
+@default_group_required
+@shared_access_required(Intervention, "id")
+def edit_document_view(request: HttpRequest, id: str, doc_id: str):
+    """ Removes the document from the database and file system
+
+    Wraps the generic functionality from konova.utils.
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The intervention id
+        doc_id (str): The document id
+
+    Returns:
+
+    """
+    intervention = get_object_or_404(Intervention, id=id)
+    doc = get_object_or_404(InterventionDocument, id=doc_id)
+    form = EditDocumentModalForm(request.POST or None, request.FILES or None, instance=intervention, document=doc, request=request)
+    return form.process_request(
+        request,
+        DOCUMENT_EDITED,
+        redirect_url=reverse("intervention:detail", args=(intervention.id,)) + "#related_data"
+    )
+
+
 @login_required
 @any_group_check
 def detail_view(request: HttpRequest, id: str):
@@ -241,14 +267,6 @@ def detail_view(request: HttpRequest, id: str):
 
     parcels = intervention.get_underlying_parcels()
 
-    # Inform user about revocation
-    if intervention.legal.revocations.exists():
-        messages.error(
-            request,
-            _("This intervention has {} revocations").format(intervention.legal.revocations.count()),
-            extra_tags="danger",
-        )
-
     context = {
         "obj": intervention,
         "compensations": compensations,
@@ -337,21 +355,51 @@ def remove_view(request: HttpRequest, id: str):
 
 @login_required
 @default_group_required
-def remove_revocation_view(request: HttpRequest, id: str):
-    """ Renders a remove view for a revocation
+@shared_access_required(Intervention, "id")
+def edit_revocation_view(request: HttpRequest, id: str, revocation_id: str):
+    """ Renders a edit view for a revocation
 
     Args:
         request (HttpRequest): The incoming request
-        id (str): The revocation's id as string
+        id (str): The intervention's id as string
+        revocation_id (str): The revocation's id as string
 
     Returns:
 
     """
-    obj = Revocation.objects.get(id=id)
-    form = RemoveModalForm(request.POST or None, instance=obj, request=request)
+    intervention = get_object_or_404(Intervention, id=id)
+    revocation = get_object_or_404(Revocation, id=revocation_id)
+
+    form = EditRevocationModalForm(request.POST or None, request.FILES or None, instance=intervention, revocation=revocation, request=request)
     return form.process_request(
         request,
-        _("Revocation removed"),
+        REVOCATION_EDITED,
+        redirect_url=reverse("intervention:detail", args=(intervention.id,)) + "#related_data"
+    )
+
+
+@login_required
+@default_group_required
+@shared_access_required(Intervention, "id")
+def remove_revocation_view(request: HttpRequest, id: str, revocation_id: str):
+    """ Renders a remove view for a revocation
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The intervention's id as string
+        revocation_id (str): The revocation's id as string
+
+    Returns:
+
+    """
+    intervention = get_object_or_404(Intervention, id=id)
+    revocation = get_object_or_404(Revocation, id=revocation_id)
+
+    form = RemoveRevocationModalForm(request.POST or None, instance=intervention, revocation=revocation, request=request)
+    return form.process_request(
+        request,
+        REVOCATION_REMOVED,
+        redirect_url=reverse("intervention:detail", args=(intervention.id,)) + "#related_data"
     )
 
 
@@ -384,7 +432,7 @@ def share_view(request: HttpRequest, id: str, token: str):
                 request,
                 _("{} has been shared with you").format(intervention.identifier)
             )
-            intervention.share_with(user)
+            intervention.share_with_user(user)
         return redirect("intervention:detail", id=id)
     else:
         messages.error(
@@ -455,7 +503,8 @@ def new_revocation_view(request: HttpRequest, id: str):
     form = NewRevocationModalForm(request.POST or None, request.FILES or None, instance=intervention, request=request)
     return form.process_request(
         request,
-        msg_success=_("Revocation added")
+        msg_success=REVOCATION_ADDED,
+        redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -502,7 +551,64 @@ def new_deduction_view(request: HttpRequest, id: str):
     form = NewDeductionModalForm(request.POST or None, instance=intervention, request=request)
     return form.process_request(
         request,
-        msg_success=_("Deduction added")
+        msg_success=DEDUCTION_ADDED,
+        redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data",
+    )
+
+
+@login_required
+@default_group_required
+@shared_access_required(Intervention, "id")
+def remove_deduction_view(request: HttpRequest, id: str, deduction_id: str):
+    """ Renders a modal view for removing deductions
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The intervention's id
+        deduction_id (str): The deduction's id
+
+    Returns:
+
+    """
+    intervention = get_object_or_404(Intervention, id=id)
+    try:
+        eco_deduction = intervention.deductions.get(id=deduction_id)
+    except ObjectDoesNotExist:
+        raise Http404("Unknown deduction")
+
+    form = RemoveEcoAccountDeductionModalForm(request.POST or None, instance=intervention, deduction=eco_deduction, request=request)
+    return form.process_request(
+        request=request,
+        msg_success=DEDUCTION_REMOVED,
+        redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@default_group_required
+@shared_access_required(Intervention, "id")
+def edit_deduction_view(request: HttpRequest, id: str, deduction_id: str):
+    """ Renders a modal view for removing deductions
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The intervention's id
+        deduction_id (str): The deduction's id
+
+    Returns:
+
+    """
+    intervention = get_object_or_404(Intervention, id=id)
+    try:
+        eco_deduction = intervention.deductions.get(id=deduction_id)
+    except ObjectDoesNotExist:
+        raise Http404("Unknown deduction")
+
+    form = EditEcoAccountDeductionModalForm(request.POST or None, instance=intervention, deduction=eco_deduction, request=request)
+    return form.process_request(
+        request=request,
+        msg_success=DEDUCTION_EDITED,
+        redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -530,6 +636,31 @@ def record_view(request: HttpRequest, id: str):
     )
 
 
+def remove_compensation_view(request:HttpRequest, id: str, comp_id: str):
+    """ Renders a modal view for removing the compensation
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+
+    Returns:
+
+    """
+    intervention = get_object_or_404(Intervention, id=id)
+    try:
+        comp = intervention.compensations.get(
+            id=comp_id
+        )
+    except ObjectDoesNotExist:
+        raise Http404("Unknown compensation")
+    form = RemoveModalForm(request.POST or None, instance=comp, request=request)
+    return form.process_request(
+        request=request,
+        msg_success=COMPENSATION_REMOVED_TEMPLATE.format(comp.identifier),
+        redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data",
+    )
+
+
 def report_view(request:HttpRequest, id: str):
     """ Renders the public report view
 

konova/admin.py

@@ -8,6 +8,8 @@ Created on: 22.07.21
 from django.contrib import admin
 
 from konova.models import Geometry, Deadline, GeometryConflict, Parcel, District
+from konova.utils.message_templates import COMPENSATION_REMOVED_TEMPLATE
+from user.models import UserAction
 
 
 class GeometryAdmin(admin.ModelAdmin):
@@ -78,6 +80,9 @@ class BaseObjectAdmin(BaseResourceAdmin):
         "identifier",
         "title",
     ]
+    actions = [
+        "restore_deleted_data"
+    ]
 
     def get_fields(self, request, obj=None):
         return super().get_fields(request, obj) + ["deleted"]
@@ -87,6 +92,14 @@ class BaseObjectAdmin(BaseResourceAdmin):
             "deleted",
         ]
 
+    def restore_deleted_data(self, request, queryset):
+        queryset = queryset.filter(
+            deleted__isnull=False
+        )
+        for entry in queryset:
+            entry.deleted.delete()
+
+
 
 # Outcommented for a cleaner admin backend on production
 #admin.site.register(Geometry, GeometryAdmin)

konova/autocompletes.py

@@ -5,8 +5,13 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 07.12.20
 
 """
+import collections
+
 from dal_select2.views import Select2QuerySetView, Select2GroupQuerySetView
-from user.models import User
+from django.core.exceptions import ImproperlyConfigured
+
+from konova.utils.message_templates import UNGROUPED
+from user.models import User, Team
 from django.db.models import Q
 
 from codelist.models import KonovaCode
@@ -20,7 +25,7 @@ from intervention.models import Intervention
 class EcoAccountAutocomplete(Select2QuerySetView):
     """ Autocomplete for ecoAccount entries
 
-    Only returns entries that are accessible for the requesting user and already are recorded
+    Only returns entries that are already recorded and not deleted
 
     """
     def get_queryset(self):
@@ -29,14 +34,14 @@ class EcoAccountAutocomplete(Select2QuerySetView):
         qs = EcoAccount.objects.filter(
             deleted=None,
             recorded__isnull=False,
-            users__in=[self.request.user],
         ).order_by(
             "identifier"
         )
         if self.q:
             qs = qs.filter(
-                identifier__icontains=self.q
-            )
+                Q(identifier__icontains=self.q) |
+                Q(title__icontains=self.q)
+            ).distinct()
         return qs
 
 
@@ -57,32 +62,47 @@ class InterventionAutocomplete(Select2QuerySetView):
         )
         if self.q:
             qs = qs.filter(
-                identifier__icontains=self.q
-            )
+                Q(identifier__icontains=self.q) |
+                Q(title__icontains=self.q)
+            ).distinct()
         return qs
 
 
 class ShareUserAutocomplete(Select2QuerySetView):
-    """ Autocomplete for intervention entries
+    """ Autocomplete for share with single users
 
-    Only returns entries that are accessible for the requesting user
 
     """
     def get_queryset(self):
         if self.request.user.is_anonymous:
             return User.objects.none()
-        exclude_user_ids = self.forwarded.get("users", [])
-        _exclude = {"id__in": exclude_user_ids}
-        qs = User.objects.all().exclude(
-            **_exclude
-        ).order_by(
-            "username"
-        )
+        qs = User.objects.all()
         if self.q:
             # Due to privacy concerns only a full username match will return the proper user entry
             qs = qs.filter(
-                username=self.q
+                Q(username=self.q) |
+                Q(email=self.q)
+            ).distinct()
+        qs = qs.order_by("username")
+        return qs
+
+
+class ShareTeamAutocomplete(Select2QuerySetView):
+    """ Autocomplete for share with teams
+
+    """
+    def get_queryset(self):
+        if self.request.user.is_anonymous:
+            return Team.objects.none()
+        qs = Team.objects.all()
+        if self.q:
+            # Due to privacy concerns only a full username match will return the proper user entry
+            qs = qs.filter(
+                name__icontains=self.q
             )
+        qs = qs.order_by(
+            "name"
+        )
         return qs
 
 
@@ -136,6 +156,8 @@ class KonovaCodeAutocomplete(Select2GroupQuerySetView):
                 q_or |= Q(short_name__icontains=keyword)
                 q_or |= Q(parent__long_name__icontains=keyword)
                 q_or |= Q(parent__short_name__icontains=keyword)
+                q_or |= Q(parent__parent__long_name__icontains=keyword)
+                q_or |= Q(parent__parent__short_name__icontains=keyword)
                 _filter.add(q_or, Q.AND)
             qs = qs.filter(_filter).distinct()
         return qs
@@ -178,7 +200,7 @@ class CompensationActionDetailCodeAutocomplete(KonovaCodeAutocomplete):
 
     def order_by(self, qs):
         return qs.order_by(
-            "parent__long_name"
+            "long_name"
         )
 
 
@@ -211,6 +233,41 @@ class BiotopeCodeAutocomplete(KonovaCodeAutocomplete):
     def get_result_label(self, result):
         return f"{result.long_name} ({result.short_name})"
 
+    def get_results(self, context):
+        """Return the options grouped by a common related model.
+
+        Raises ImproperlyConfigured if self.group_by_name is not configured
+        """
+        if not self.group_by_related:
+            raise ImproperlyConfigured("Missing group_by_related.")
+
+        super_groups = collections.OrderedDict()
+
+        object_list = context['object_list']
+
+        for result in object_list:
+            group = result.parent if result.parent else None
+            group_name = f"{group.long_name} ({group.short_name})" if group else UNGROUPED
+            super_group = result.parent.parent if result.parent else None
+            super_group_name = f"{super_group.long_name} ({super_group.short_name})" if super_group else UNGROUPED
+            super_groups.setdefault(super_group_name, {})
+            super_groups[super_group_name].setdefault(group_name, [])
+            super_groups[super_group_name][group_name].append(result)
+
+        return [{
+            'id': None,
+            'text': super_group,
+            'children': [{
+                "id": None,
+                "text": group,
+                "children": [{
+                    'id': self.get_result_value(result),
+                    'text': self.get_result_label(result),
+                    'selected_text': self.get_selected_result_label(result),
+                } for result in results]
+            } for group, results in groups.items()]
+        } for super_group, groups in super_groups.items()]
+
 
 class BiotopeExtraCodeAutocomplete(KonovaCodeAutocomplete):
     """
@@ -236,7 +293,7 @@ class BiotopeExtraCodeAutocomplete(KonovaCodeAutocomplete):
             qs (QuerySet): The ordered queryset
         """
         return qs.order_by(
-            "parent__long_name",
+            "long_name",
         )
 
     def get_result_label(self, result):
@@ -281,6 +338,11 @@ class RegistrationOfficeCodeAutocomplete(KonovaCodeAutocomplete):
         self.c = CODELIST_REGISTRATION_OFFICE_ID
         super().__init__(*args, **kwargs)
 
+    def order_by(self, qs):
+        return qs.order_by(
+            "parent__long_name"
+        )
+
 
 class ConservationOfficeCodeAutocomplete(KonovaCodeAutocomplete):
     """
@@ -294,4 +356,4 @@ class ConservationOfficeCodeAutocomplete(KonovaCodeAutocomplete):
         super().__init__(*args, **kwargs)
 
     def get_result_label(self, result):
-        return f"{result.long_name} ({result.short_name})"
+        return f"{result.long_name} ({result.short_name})"

konova/filters/mixins.py

@@ -185,7 +185,7 @@ class GeoReferencedTableFilterMixin(django_filters.FilterSet):
 
         """
         matching_districts = District.objects.filter(
-            krs=value
+            krs__icontains=value
         )
         matching_parcels = Parcel.objects.filter(
             district__in=matching_districts
@@ -209,7 +209,7 @@ class GeoReferencedTableFilterMixin(django_filters.FilterSet):
         Returns:
 
         """
-        queryset = self._filter_parcel_reference(queryset, name, value, "gmrkng__istartswith")
+        queryset = self._filter_parcel_reference(queryset, name, value, "gmrkng__icontains")
         return queryset
 
     def filter_parcel(self, queryset, name, value) -> QuerySet:
@@ -297,8 +297,9 @@ class ShareableTableFilterMixin(django_filters.FilterSet):
         """
         if not value:
             return queryset.filter(
-                users__in=[self.user],  # requesting user has access
-            )
+                Q(users__in=[self.user]) |  # requesting user has access
+                Q(teams__users__in=[self.user])
+            ).distinct()
         else:
             return queryset
 

konova/forms.py

@@ -12,6 +12,8 @@ from bootstrap_modal_forms.forms import BSModalForm
 from bootstrap_modal_forms.utils import is_ajax
 from django import forms
 from django.contrib import messages
+from django.db.models.fields.files import FieldFile
+
 from user.models import User
 from django.contrib.gis.forms import OSMWidget, MultiPolygonField
 from django.contrib.gis.geos import MultiPolygon
@@ -21,10 +23,10 @@ from django.shortcuts import render
 from django.utils.translation import gettext_lazy as _
 
 from konova.contexts import BaseContext
-from konova.models import BaseObject, Geometry, RecordableObjectMixin
+from konova.models import BaseObject, Geometry, RecordableObjectMixin, AbstractDocument
 from konova.settings import DEFAULT_SRID
 from konova.tasks import celery_update_parcels
-from konova.utils.message_templates import FORM_INVALID
+from konova.utils.message_templates import FORM_INVALID, FILE_TYPE_UNSUPPORTED, FILE_SIZE_TOO_LARGE, DOCUMENT_EDITED
 from user.models import UserActionLogEntry
 
 
@@ -87,7 +89,7 @@ class BaseForm(forms.Form):
         """
         self.fields[field].widget.attrs["placeholder"] = val
 
-    def load_initial_data(self, form_data: dict, disabled_fields: list):
+    def load_initial_data(self, form_data: dict, disabled_fields: list = None):
         """ Initializes form data from instance
 
         Inserts instance data into form and disables form fields
@@ -99,8 +101,9 @@ class BaseForm(forms.Form):
             return
         for k, v in form_data.items():
             self.initialize_form_field(k, v)
-        for field in disabled_fields:
-            self.disable_form_field(field)
+        if disabled_fields:
+            for field in disabled_fields:
+                self.disable_form_field(field)
 
     def add_widget_html_class(self, field: str, cls: str):
         """ Adds a HTML class string to the widget of a field
@@ -330,7 +333,24 @@ class RemoveModalForm(BaseModalForm):
             self.instance.delete()
 
 
-class NewDocumentForm(BaseModalForm):
+class RemoveDeadlineModalForm(RemoveModalForm):
+    """ Removing modal form for deadlines
+
+    Can be used for anything, where removing shall be confirmed by the user a second time.
+
+    """
+    deadline = None
+
+    def __init__(self, *args, **kwargs):
+        deadline = kwargs.pop("deadline", None)
+        self.deadline = deadline
+        super().__init__(*args, **kwargs)
+
+    def save(self):
+        self.instance.remove_deadline(self)
+
+
+class NewDocumentModalForm(BaseModalForm):
     """ Modal form for new documents
 
     """
@@ -402,18 +422,22 @@ class NewDocumentForm(BaseModalForm):
 
         _file = self.cleaned_data.get("file", None)
 
+        if _file is None or isinstance(_file, FieldFile):
+            # FieldFile declares that no new file has been uploaded and we do not need to check on the file again
+            return super_valid
+
         mime_type_valid = self.document_model.is_mime_type_valid(_file)
         if not mime_type_valid:
             self.add_error(
                 "file",
-                _("Unsupported file type")
+                FILE_TYPE_UNSUPPORTED
             )
 
         file_size_valid = self.document_model.is_file_size_valid(_file)
         if not file_size_valid:
             self.add_error(
                 "file",
-                _("File too large")
+                FILE_SIZE_TOO_LARGE
             )
 
         file_valid = mime_type_valid and file_size_valid
@@ -440,6 +464,40 @@ class NewDocumentForm(BaseModalForm):
             return doc
 
 
+class EditDocumentModalForm(NewDocumentModalForm):
+    document = None
+    document_model = AbstractDocument
+
+    def __init__(self, *args, **kwargs):
+        self.document = kwargs.pop("document", None)
+        super().__init__(*args, **kwargs)
+        self.form_title = _("Edit document")
+        form_data = {
+            "title": self.document.title,
+            "comment": self.document.comment,
+            "creation_date": str(self.document.date_of_creation),
+            "file": self.document.file,
+        }
+        self.load_initial_data(form_data)
+
+
+    def save(self):
+        with transaction.atomic():
+            document = self.document
+            file = self.cleaned_data.get("file", None)
+
+            document.title = self.cleaned_data.get("title", None)
+            document.comment = self.cleaned_data.get("comment", None)
+            document.date_of_creation = self.cleaned_data.get("creation_date", None)
+            if not isinstance(file, FieldFile):
+                document.replace_file(file)
+            document.save()
+
+            self.instance.mark_as_edited(self.user, self.request, edit_comment=DOCUMENT_EDITED)
+
+            return document
+
+
 class RecordModalForm(BaseModalForm):
     """ Modal form for recording data
 
@@ -515,7 +573,9 @@ class RecordModalForm(BaseModalForm):
         Returns:
 
         """
-        comps = self.instance.compensations.all()
+        comps = self.instance.compensations.filter(
+            deleted=None,
+        )
         comps_valid = True
         for comp in comps:
             checker = comp.quality_check()

konova/migrations/0003_auto_20220208_1801.py

@@ -0,0 +1,54 @@
+# Generated by Django 3.1.3 on 2022-02-08 17:01
+
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+def migrate_parcels(apps, schema_editor):
+    Geometry = apps.get_model('konova', 'Geometry')
+    SpatialIntersection = apps.get_model('konova', 'SpatialIntersection')
+
+    all_geoms = Geometry.objects.all()
+    for geom in all_geoms:
+        SpatialIntersection.objects.bulk_create([
+            SpatialIntersection(geometry=geom, parcel=parcel)
+            for parcel in geom.parcels.all()
+        ])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('konova', '0002_auto_20220114_0936'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SpatialIntersection',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('calculated_on', models.DateTimeField(auto_now_add=True, null=True)),
+                ('geometry', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='konova.geometry')),
+                ('parcel', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='konova.parcel')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.RunPython(migrate_parcels),
+        migrations.AddField(
+            model_name='parcel',
+            name='geometries_tmp',
+            field=models.ManyToManyField(blank=True, related_name='parcels', through='konova.SpatialIntersection', to='konova.Geometry'),
+        ),
+        migrations.RemoveField(
+            model_name='parcel',
+            name='geometries',
+        ),
+        migrations.RenameField(
+            model_name='parcel',
+            old_name='geometries_tmp',
+            new_name='geometries',
+        ),
+    ]

konova/migrations/0004_auto_20220209_0839.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.1.3 on 2022-02-09 07:39
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('konova', '0003_auto_20220208_1801'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='SpatialIntersection',
+            new_name='ParcelIntersection',
+        ),
+    ]