# NewEcoAccount EditEcoAccount view

* refactors new and edit eco account views from function to class based
* removes info message if checked intervention is altered and loses the current checked state
* updates comments/documentation
* removes code duplicates
* fixes display error where modal form was hidden behind menu bar of map client
* fixes bug where compensation could not be created directly from intervention

compensation/models/compensation.py

@@ -510,12 +510,6 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin, PikMixin):
 
         return retval
 
-    @property
-    def checked(self):
-        if self.intervention:
-            return self.intervention.checked
-        return None
-
 
 class CompensationDocument(AbstractDocument):
     """

compensation/urls/eco_account.py

@@ -8,8 +8,9 @@ Created on: 24.08.21
 from django.urls import path
 
 from compensation.autocomplete.eco_account import EcoAccountAutocomplete
-from compensation.views.eco_account.eco_account import new_view, edit_view, remove_view, \
-    EcoAccountIndexView, EcoAccountIdentifierGeneratorView, EcoAccountDetailView
+from compensation.views.eco_account.eco_account import remove_view, \
+    EcoAccountIndexView, EcoAccountIdentifierGeneratorView, EcoAccountDetailView, NewEcoAccountFormView, \
+    EditEcoAccountFormView
 from compensation.views.eco_account.log import EcoAccountLogView
 from compensation.views.eco_account.record import EcoAccountRecordView
 from compensation.views.eco_account.report import EcoAccountReportView
@@ -29,13 +30,13 @@ from compensation.views.eco_account.deduction import NewEcoAccountDeductionView,
 app_name = "acc"
 urlpatterns = [
     path("", EcoAccountIndexView.as_view(), name="index"),
-    path('new/', new_view, name='new'),
+    path('new/', NewEcoAccountFormView.as_view(), name='new'),
     path('new/id', EcoAccountIdentifierGeneratorView.as_view(), name='new-id'),
     path('<id>', EcoAccountDetailView.as_view(), name='detail'),
     path('<id>/log', EcoAccountLogView.as_view(), name='log'),
     path('<id>/record', EcoAccountRecordView.as_view(), name='record'),
     path('<id>/report', EcoAccountReportView.as_view(), name='report'),
-    path('<id>/edit', edit_view, name='edit'),
+    path('<id>/edit', EditEcoAccountFormView.as_view(), name='edit'),
     path('<id>/remove', remove_view, name='remove'),
     path('<id>/resub', EcoAccountResubmissionView.as_view(), name='resubmission-create'),
 

compensation/views/compensation/compensation.py

@@ -88,7 +88,7 @@ class EditCompensationFormView(BaseEditSpatialLocatedObjectFormView):
     _REDIRECT_URL = "compensation:detail"
 
     def _user_has_permission(self, user):
-        # User has to be an ets user
+        # User has to be a default user
         return user.is_default_user()
 
 

compensation/views/eco_account/eco_account.py

@@ -23,7 +23,8 @@ from konova.settings import ETS_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.message_templates import CANCEL_ACC_RECORDED_OR_DEDUCTED, RECORDED_BLOCKS_EDIT, FORM_INVALID, \
     IDENTIFIER_REPLACED, GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
-from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView
+from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView, BaseNewSpatialLocatedObjectFormView, \
+    BaseEditSpatialLocatedObjectFormView
 from konova.views.detail import BaseDetailView
 
 
@@ -40,6 +41,29 @@ class EcoAccountIndexView(LoginRequiredMixin, BaseIndexView):
         return qs
 
 
+class NewEcoAccountFormView(BaseNewSpatialLocatedObjectFormView):
+    _FORM_CLS = NewEcoAccountForm
+    _MODEL_CLS = EcoAccount
+    _TEMPLATE = "compensation/form/view.html"
+    _TAB_TITLE = _("New Eco-Account")
+    _REDIRECT_URL = "compensation:acc:detail"
+
+    def _user_has_permission(self, user):
+        # User has to be a default user
+        return user.is_default_user()
+
+
+class EditEcoAccountFormView(BaseEditSpatialLocatedObjectFormView):
+    _FORM_CLS = EditEcoAccountForm
+    _MODEL_CLS = EcoAccount
+    _TEMPLATE = "compensation/form/view.html"
+    _REDIRECT_URL = "compensation:acc:detail"
+
+    def _user_has_permission(self, user):
+        # User has to be a default user
+        return user.is_default_user()
+
+
 @login_required
 @default_group_required
 def new_view(request: HttpRequest):