compensation/views.py

@@ -26,9 +26,9 @@ def index_view(request: HttpRequest):
         A rendered view
     """
     template = "generic_index.html"
+    user = request.user
     compensations = Compensation.objects.filter(
-        deleted=None,  # only show those which are not deleted individually
+        deleted=None,
-        intervention__deleted=None,  # and don't show the ones whose intervention has been deleted
     )
     table = CompensationTable(
         request=request,
@@ -42,14 +42,12 @@ def index_view(request: HttpRequest):
 
 
 @login_required
-@default_group_required
 def new_view(request: HttpRequest):
     # ToDo
     pass
 
 
 @login_required
-@default_group_required
 def edit_view(request: HttpRequest, id: str):
     # ToDo
     pass
@@ -108,14 +106,12 @@ def account_index_view(request: HttpRequest):
 
 
 @login_required
-@default_group_required
 def account_new_view(request: HttpRequest):
     # ToDo
     pass
 
 
 @login_required
-@default_group_required
 def account_edit_view(request: HttpRequest, id: str):
     # ToDo
     pass
@@ -134,7 +130,6 @@ def account_remove_view(request: HttpRequest, id: str):
 
 
 @login_required
-@default_group_required
 def new_payment_view(request: HttpRequest, intervention_id: str):
     """ Renders a modal view for adding new payments
 
@@ -173,7 +168,6 @@ def new_payment_view(request: HttpRequest, intervention_id: str):
 
 
 @login_required
-@default_group_required
 def payment_remove_view(request: HttpRequest, id: str):
     """ Renders a modal view for removing payments
 
@@ -193,7 +187,6 @@ def payment_remove_view(request: HttpRequest, id: str):
 
 
 @login_required
-@default_group_required
 def withdraw_remove_view(request: HttpRequest, id: str, withdraw_id: str):
     """ Renders a modal view for removing withdraws
 

intervention/forms.py

@@ -18,8 +18,7 @@ from intervention.models import Intervention
 from konova.enums import UserActionLogEntryEnum
 from konova.forms import BaseForm, BaseModalForm
 from konova.models import Document
-from konova.settings import DEFAULT_LAT, DEFAULT_LON, DEFAULT_ZOOM, ZB_GROUP, ETS_GROUP
+from konova.settings import DEFAULT_LAT, DEFAULT_LON, DEFAULT_ZOOM
-from konova.utils.user_checks import in_group
 from organisation.models import Organisation
 from user.models import UserActionLogEntry
 
@@ -294,22 +293,18 @@ class ShareInterventionForm(BaseModalForm):
         )
 
         # Initialize users field
-        # Remove field if user is not in registration or conservation group
+        users = self.instance.users.all()
-        if not in_group(self.request.user, ZB_GROUP) and not in_group(self.request.user, ETS_GROUP):
+        choices = []
-            del self.fields["users"]
+        for n in users:
-        else:
+            choices.append(
-            users = self.instance.users.all()
+                (n.id, n.username)
-            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
             )
+        self.fields["users"].choices = choices
+        u_ids = list(users.values_list("id", flat=True))
+        self.initialize_form_field(
+            "users",
+            u_ids
+        )
 
     def save(self):
         accessing_users = User.objects.filter(

intervention/models.py

@@ -143,9 +143,13 @@ class Intervention(BaseObject):
             )
             for com in coms:
                 com.deleted = action
+                #com.deleted_on = _now
+                #com.deleted_by = _user
                 com.save()
 
             self.deleted = action
+            #self.deleted_on = _now
+            #self.deleted_by = _user
             self.save()
 
     @staticmethod
@@ -207,7 +211,7 @@ class Intervention(BaseObject):
             self.identifier = new_id
         super().save(*args, **kwargs)
 
-    def is_shared_with(self, user: User):
+    def has_access(self, user: User):
         """ Access check
 
         Checks whether a given user has access to this intervention

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

@@ -10,14 +10,12 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
                     <a href="{% url 'compensation:new' %}" title="{% trans 'Add new compensation' %}">
                         <button class="btn btn-outline-default">
                             {% fa5_icon 'plus' %}
                             {% fa5_icon 'leaf' %}
                         </button>
                     </a>
-                    {% endif %}
                 </div>
             </div>
         </div>
@@ -47,11 +45,9 @@
                 </td>
                 <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' %}">
                         {% fa5_icon 'trash' %}
                     </button>
-                {% endif %}
                 </td>
             </tr>
             {% endfor %}

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

@@ -10,12 +10,10 @@
             </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 'intervention:new-doc' intervention.id %}" title="{% trans 'Add new document' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'file' %}
                     </button>
-                    {% endif %}
                 </div>
             </div>
         </div>
@@ -45,11 +43,9 @@
                 </td>
                 <td class="align-middle">{{ doc.comment }}</td>
                 <td>
-                    {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'doc-remove' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
                     </button>
-                    {% endif %}
                 </td>
             </tr>
             {% endfor %}

intervention/templates/intervention/detail/includes/eco-account-withdraws.html

@@ -10,14 +10,12 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
                     <a href="{% url 'compensation:new' %}" title="{% trans 'Add new withdraw' %}">
                         <button class="btn btn-outline-default">
                             {% fa5_icon 'plus' %}
                             {% fa5_icon 'tree' %}
                         </button>
                     </a>
-                    {% endif %}
                 </div>
             </div>
         </div>
@@ -47,11 +45,9 @@
                 </td>
                 <td class="align-middle">{{ withdraw.amount|floatformat:2 }} %</td>
                 <td>
-                    {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:withdraw-remove' withdraw.account.id withdraw.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Withdraw' %}">
                         {% fa5_icon 'trash' %}
                     </button>
-                    {% endif %}
                 </td>
             </tr>
             {% endfor %}

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

@@ -10,12 +10,10 @@
             </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:pay-new' intervention.id %}" title="{% trans 'Add new payment' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'money-bill-wave' %}
                     </button>
-                    {% endif %}
                 </div>
             </div>
         </div>
@@ -49,11 +47,9 @@
                 <td class="align-middle">{{ pay.due_on }}</td>
                 <td class="align-middle">{{ pay.comment }}</td>
                 <td>
-                    {% 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' %}">
                         {% fa5_icon 'trash' %}
                     </button>
-                    {% endif %}
                 </td>
             </tr>
             {% endfor %}

intervention/templates/intervention/detail/view.html

@@ -27,30 +27,26 @@
                 <button class="btn btn-default btn-modal mr-2" title="{% trans 'Share' %}" data-form-url="{% url 'intervention:share-create' intervention.id %}">
                     {% fa5_icon 'share-alt' %}
                 </button>
-                {% if is_zb_member %}
                 <a href="{% url 'home' %}" class="mr-2">
                     <button class="btn btn-default" title="{% trans 'Run check' %}">
                         {% fa5_icon 'star' %}
                     </button>
                 </a>
-                {% endif %}
-                {% if is_ets_member %}
                 <a href="{% url 'home' %}" class="mr-2">
                     <button class="btn btn-default" title="{% trans 'Record' %}">
                         {% fa5_icon 'bookmark' %}
                     </button>
                 </a>
-                {% endif %}
-                {% if is_default_member %}
                 <a href="{% url 'home' %}" class="mr-2">
                     <button class="btn btn-default" title="{% trans 'Edit' %}">
                         {% fa5_icon 'edit' %}
                     </button>
                 </a>
-                <button class="btn btn-default btn-modal" data-form-url="{% url 'intervention:remove' intervention.id %}" title="{% trans 'Delete' %}">
+                <a href="{% url 'home' %}" class="mr-2">
-                    {% fa5_icon 'trash' %}
+                    <button class="btn btn-default" title="{% trans 'Delete' %}">
-                </button>
+                        {% fa5_icon 'trash' %}
-                {% endif %}
+                    </button>
+                </a>
                 {% endif %}
             </div>
         </div>
@@ -138,14 +134,6 @@
                             {% endwith %}
                         </td>
                     </tr>
-                    <tr>
-                        <th scope="row">{% trans 'Shared with' %}</th>
-                        <td class="align-middle">
-                            {% for user in intervention.users.all %}
-                                {% include 'user/includes/contact_modal_button.html' %}
-                            {% endfor %}
-                        </td>
-                    </tr>
                 </table>
             </div>
         </div>

intervention/views.py

@@ -9,9 +9,8 @@ from intervention.models import Intervention
 from intervention.tables import InterventionTable
 from konova.contexts import BaseContext
 from konova.decorators import *
-from konova.forms import SimpleGeomForm, NewDocumentForm, RemoveModalForm
+from konova.forms import RemoveForm, SimpleGeomForm, NewDocumentForm
 from konova.utils.message_templates import FORM_INVALID
-from konova.utils.user_checks import in_group
 
 
 @login_required
@@ -46,7 +45,6 @@ def index_view(request: HttpRequest):
 
 
 @login_required
-@default_group_required
 def new_view(request: HttpRequest):
     """
     Renders a view for a new intervention creation
@@ -132,8 +130,7 @@ def open_view(request: HttpRequest, id: str):
     compensations = intervention.compensations.filter(
         deleted=None,
     )
-    _user = request.user
+    has_access = intervention.has_access(user=request.user)
-    is_data_shared = intervention.is_shared_with(user=_user)
 
     geom_form = SimpleGeomForm(
         instance=intervention
@@ -142,14 +139,11 @@ def open_view(request: HttpRequest, id: str):
     context = {
         "intervention": intervention,
         "compensations": compensations,
-        "has_access": is_data_shared,
+        "has_access": has_access,
         "geom_form": geom_form,
-        "is_default_member": in_group(_user, _(DEFAULT_GROUP)),
-        "is_zb_member": in_group(_user, _(ZB_GROUP)),
-        "is_ets_member": in_group(_user, _(ETS_GROUP)),
     }
 
-    if not is_data_shared:
+    if not has_access:
         messages.info(request, _("Remember: This data has not been shared with you, yet. This means you can only read but can not edit or perform any actions like running a check or recording."))
 
     context = BaseContext(request, context).context
@@ -186,7 +180,6 @@ def edit_view(request: HttpRequest, id: str):
 
 
 @login_required
-@default_group_required
 def remove_view(request: HttpRequest, id: str):
     """ Renders a remove view for this intervention
 
@@ -197,14 +190,21 @@ def remove_view(request: HttpRequest, id: str):
     Returns:
 
     """
+    template = "konova/form.html"
     obj = Intervention.objects.get(id=id)
-    identifier = obj.identifier
+
-    form = RemoveModalForm(request.POST or None, instance=obj, user=request.user)
+    # ToDo
-    return form.process_request(
+
-        request,
+    form = RemoveForm(
-        _("{} removed").format(identifier),
+        object_to_remove=obj,
-        redirect_url=reverse("intervention:index")
+        remove_post_url=reverse("intervention:remove", args=(id,)),
+        cancel_url=reverse("intervention:index"),
     )
+    context = {
+        "form": form,
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
 
 
 @login_required
@@ -226,7 +226,7 @@ def share_view(request: HttpRequest, id: str, token: str):
     # Check tokens
     if intervention.access_token == token:
         # Send different messages in case user has already been added to list of sharing users
-        if intervention.is_shared_with(user):
+        if intervention.has_access(user):
             messages.info(
                 request,
                 _("{} has already been shared with you").format(intervention.identifier)
@@ -258,6 +258,7 @@ def create_share_view(request: HttpRequest, id: str):
     Returns:
 
     """
+    user = request.user
     intervention = get_object_or_404(Intervention, id=id)
     form = ShareInterventionForm(request.POST or None, instance=intervention, request=request)
     if request.method == "POST":

konova/forms.py

@@ -200,7 +200,7 @@ class RemoveModalForm(BaseModalForm):
             # If the class does not provide restorable delete functionality, we must delete the entry finally
             self.instance.delete()
 
-    def process_request(self, request: HttpRequest, msg_success: str = _("Object removed"), msg_error: str = FORM_INVALID, redirect_url: str = None):
+    def process_request(self, request: HttpRequest, msg_success: str = _("Object removed"), msg_error: str = FORM_INVALID):
         """ Generic processing of request
 
         Wraps the request processing logic, so we don't need the same code everywhere a RemoveModalForm is being used
@@ -213,7 +213,6 @@ class RemoveModalForm(BaseModalForm):
         Returns:
 
         """
-        redirect_url = redirect_url if redirect_url is not None else request.META.get("HTTP_REFERER", "home")
         template = self.template
         if request.method == "POST":
             if self.is_valid():
@@ -222,13 +221,13 @@ class RemoveModalForm(BaseModalForm):
                     request,
                     msg_success
                 )
-                return redirect(redirect_url)
+                return redirect(request.META.get("HTTP_REFERER", "home"))
             else:
                 messages.info(
                     request,
                     msg_error
                 )
-                return redirect(redirect_url)
+                return redirect(request.META.get("HTTP_REFERER", "home"))
         elif request.method == "GET":
             context = {
                 "form": self,

konova/models.py

@@ -8,6 +8,7 @@ Created on: 17.11.20
 import os
 import uuid
 
+from django.contrib.auth.models import User
 from django.contrib.gis.db.models import MultiPolygonField
 from django.db import models
 
@@ -34,6 +35,8 @@ class BaseResource(UuidModel):
     A basic resource model, which defines attributes for every derived model
     """
     created = models.ForeignKey(UserActionLogEntry, on_delete=models.SET_NULL, null=True, blank=True, related_name='+')
+    #created_on = models.DateTimeField(auto_now_add=True, null=True)
+    #created_by = models.ForeignKey(User, null=True, on_delete=models.SET_NULL, related_name="+")
 
     class Meta:
         abstract = True
@@ -48,6 +51,8 @@ class BaseObject(BaseResource):
     identifier = models.CharField(max_length=1000, null=True, blank=True)
     title = models.CharField(max_length=1000, null=True, blank=True)
     deleted = models.ForeignKey(UserActionLogEntry, on_delete=models.SET_NULL, null=True, blank=True, related_name='+')
+    #deleted_on = models.DateTimeField(null=True, blank=True)
+    #deleted_by = models.ForeignKey(User, null=True, blank=True, on_delete=models.SET_NULL, related_name="+")
     comment = models.TextField(null=True, blank=True)
 
     class Meta:

konova/utils/user_checks.py

@@ -5,7 +5,6 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 02.07.21
 
 """
-from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.models import User
 
 
@@ -19,6 +18,4 @@ def in_group(user: User, group: str) -> bool:
     Returns:
         bool
     """
-    return user.groups.filter(
+    return group in user.groups.values("name")
-        name=_(group)
-    )

locale/de/LC_MESSAGES/django.po

@@ -324,7 +324,7 @@ msgstr "Ökokonto Abbuchungen"
 
 #: intervention/templates/intervention/detail/includes/eco-account-withdraws.html:13
 msgid "Add new withdraw"
-msgstr "Neue Abbuchung hinzufügen"
+msgstr ""
 
 #: intervention/templates/intervention/detail/includes/eco-account-withdraws.html:28
 msgid "Account Identifier"