Linkage improvement

* adds linking to submenus
* adds PaymentAdmin
* adds Meta class inheritance for tables

compensation/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from compensation.models import Compensation, CompensationAction, CompensationState, CompensationControl
+from compensation.models import Compensation, CompensationAction, CompensationState, CompensationControl, Payment
 
 
 class CompensationControlAdmin(admin.ModelAdmin):
@@ -37,8 +37,16 @@ class CompensationAdmin(admin.ModelAdmin):
         "created_on",
     ]
 
+class PaymentAdmin(admin.ModelAdmin):
+    list_display = [
+        "id",
+        "amount",
+        "due_on"
+    ]
+
 
 admin.site.register(Compensation, CompensationAdmin)
+admin.site.register(Payment, PaymentAdmin)
 admin.site.register(CompensationAction, CompensationActionAdmin)
 admin.site.register(CompensationState, CompensationStateAdmin)
 admin.site.register(CompensationControl, CompensationControlAdmin)

compensation/models.py

@@ -74,7 +74,6 @@ class Compensation(BaseObject):
     geometry = models.ForeignKey(Geometry, null=True, blank=True, on_delete=models.SET_NULL)
     documents = models.ManyToManyField("konova.Document", blank=True)
 
-
     @staticmethod
     def _generate_new_identifier() -> str:
         """ Generates a new identifier for the intervention object

compensation/tables.py

@@ -36,6 +36,9 @@ class CompensationTable(BaseTable):
         attrs={"td": {"class": "action-col"}}
     )
 
+    class Meta(BaseTable.Meta):
+        pass
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.title = _("Compensations")
@@ -86,6 +89,9 @@ class EcoAccountTable(BaseTable):
         attrs={"td": {"class": "action-col"}}
     )
 
+    class Meta(BaseTable.Meta):
+        pass
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.title = _("Eco Accounts")

compensation/views.py

@@ -21,7 +21,9 @@ def index_view(request: HttpRequest):
     """
     template = "generic_index.html"
     user = request.user
-    compensations = None # ToDo
+    compensations = Compensation.objects.filter(
+        deleted_on=None,
+    )
     table = CompensationTable(
         request=request,
         queryset=compensations
@@ -71,8 +73,7 @@ def account_index_view(request: HttpRequest):
     template = "generic_index.html"
     user = request.user
     eco_accounts = EcoAccount.objects.filter(
-        created_by=user,
-        is_deleted=False,
+        deleted_on=None,
     )
     table = EcoAccountTable(
         request=request,