Bereinigungsarbeiten im Code; kleinere Bugfixes

bemas/utils.py

@@ -3,7 +3,7 @@
 from django.contrib.auth.models import User
 from django.contrib.gis.db.models.fields import PointField as ModelPointField
 from django.contrib.gis.forms.fields import PointField as FormPointField
-from django.utils import timezone
+from django.utils import timezone as tz
 from zoneinfo import ZoneInfo
 
 
@@ -93,7 +93,7 @@ def get_complaint_status_change_deadline_date(format_date=False):
   :param format_date: format date?
   :return: complaint status change deadline date
   """
-  deadline_date = timezone.now() - timedelta(days=settings.BEMAS_STATUS_CHANGE_DEADLINE_DAYS)
+  deadline_date = tz.now() - timedelta(days=settings.BEMAS_STATUS_CHANGE_DEADLINE_DAYS)
   return deadline_date.strftime('%d.%m.%Y') if format_date else deadline_date
 
 

bemas/views/base.py

@@ -211,7 +211,7 @@ def prepare_results(self, qs):
                           '" title="Journalereignisse anzeigen"></i></a>'
           map_link = ''
           if issubclass(self.model, Complaint) or issubclass(self.model, Originator):
-            point = getattr(item, self.model._meta.model.BasemodelMeta.geometry_field)
+            point = getattr(item, self.model.BasemodelMeta.geometry_field)
             map_link = '<a class="ms-2" href="' + reverse('bemas:map')
             map_link += '?center=' + str(point.x) + ',' + str(point.y) + '">'
             map_link += '<i class="fas fa-' + get_icon_from_settings('show_on_map') + \

datenmanagement/models/base.py

@@ -24,15 +24,193 @@ class Meta:
     abstract = True
     managed = False
 
+  class BasemodelMeta:
+    # Boolean:
+    # shall this model generally be editable?
+    editable = True
+    # String:
+    # description of this model
+    description = None
+    # Boolean:
+    # shall this model (i.e. its geometries) be selectable as an additional overlay layer
+    # in the maps of all form views?
+    as_overlay = False
+    # Boolean:
+    # shall the form views of this model always be rendered in mobile mode?
+    forms_in_mobile_mode = False
+    # String:
+    # name of the model field of this model
+    # whose value shall appear in drop-down list map filters in map views
+    naming = None
+    # Dictionary:
+    # shall other models (as keys), each referencing this model
+    # with foreign key fields (as values), be used to provide corresponding links
+    # in the form views and in the table of the list view of this model?
+    associated_models = None
+    # List of strings:
+    # names of those model fields of this model
+    # which shall be rendered as read-only in the form views of this model
+    readonly_fields = None
+    # Dictionary:
+    # names of those model fields of this model (as keys)
+    # to which other models (as values) are assigned,
+    # whose values are to be used to fill corresponding selection lists
+    # in the form views of this model
+    choices_models_for_choices_fields = None
+    # String:
+    # name of a group of users which shall be used to fill the contact person field selection list
+    # in the form views of this model
+    group_with_users_for_choice_field = None
+    # List of strings:
+    # names of those model fields of this model
+    # which shall be equipped with additional foreign key links
+    # in the form views of this model
+    fields_with_foreign_key_to_linkify = None
+    # Dictionary:
+    # names of those model fields of this model (as keys)
+    # which shall be equipped with additional external links (as values)
+    # in the form views of this model
+    catalog_link_fields = None
+    # String:
+    # geometry type of this model
+    geometry_type = None
+    # String:
+    # text module for the deletion form view of this model
+    # (only relevant for models with foreign keys)
+    object_title = None
+    # String:
+    # title of the foreign key model field of this model
+    # (only relevant for models with foreign keys)
+    foreign_key_label = None
+    # String:
+    # address reference type of this model (i.e. address, street or quarter)
+    address_type = None
+    # Boolean:
+    # shall an address reference be mandatory for this model?
+    address_mandatory = False
+    # Boolean:
+    # shall thumbnails be created from uploaded photos for this model?
+    thumbs = False
+    # Boolean:
+    # shall it be possible to upload multiple photos for this model?
+    # if true, multiple datasets are created, i.e. one for each photo.
+    multi_foto_field = False
+    # Boolean:
+    # shall an upload field for a GeoJSON file be available in the form views of this model?
+    geojson_input = False
+    # Boolean:
+    # shall an upload field for a GPX file be available in the form views of this model?
+    gpx_input = False
+    # String:
+    # name of the model field of this model
+    # which shall be equipped with a postcode assignment function
+    # in the form views of this model
+    postcode_assigner = None
+    # Dictionary:
+    # names of those model fields of this model (as keys)
+    # which shall appear as columns in the table of the list view of this model
+    # in exactly this order, with their respective labels, i.e. column headers (as values)
+    list_fields = None
+    # List of strings:
+    # names of those model fields of this model appearing in ``list_fields``
+    # whose values are of a numeric data type and which must therefore be treated accordingly
+    # for sorting in the table of the list view of this model to work
+    list_fields_with_number = None
+    # List of strings:
+    # names of those model fields of this model appearing in ``list_fields``
+    # whose values are of data type date and which must therefore be treated accordingly
+    # for sorting in the table of the list view of this model to work
+    list_fields_with_date = None
+    # List of strings:
+    # names of those model fields of this model appearing in ``list_fields``
+    # whose values are of data type datetime and which must therefore be treated accordingly
+    # for sorting in the table of the list view of this model to work
+    list_fields_with_datetime = None
+    # Dictionary:
+    # names of those model fields appearing in ``list_fields`` (as keys)
+    # which are to be converted into names of foreign key model fields (as values)
+    # for the table of the list view so that they can also be found and displayed
+    # in the referenced table of the corresponding list view
+    list_fields_with_foreign_key = None
+    # String:
+    # Name des Boolean-Feldes, dessen Wert (falls ``True``) als Flag zum Highlighten
+    # entsprechender Zeilen in der Tabelle der Listenansicht herangezogen werden soll
+    list_highlight_flag = None
+    # Number:
+    # limit for individual map feature loading steps
+    # (i.e. maximum number of map features to be loaded in one step at once)
+    # in the map view of this model
+    heavy_load_limit = None
+    # String:
+    # name of the model field of this model
+    # which shall be used as the source for the map feature tooltips in the map view of this model
+    map_feature_tooltip_field = None
+    # List of strings:
+    # names of the model fields of this model
+    # whose values shall concatenated
+    # and as such be used as the source for the map feature tooltips in the map view of this model
+    map_feature_tooltip_fields = None
+    # Boolean:
+    # shall the one-click map filters defined in the map view template
+    # appear in the map view of this model?
+    map_one_click_filters = False
+    # List of strings:
+    # names of exactly two model fields of this model
+    # which shall appear as a deadline map filter in the map view of this model
+    # (always processed in pairs!)
+    map_deadlinefilter_fields = None
+    # Dictionary:
+    # names of those model fields of this model (as keys)
+    # which shall appear as interval/range map filters in the map view of this model
+    # in exactly this order, with their respective titles (as values)
+    # (always processed in pairs!)
+    map_rangefilter_fields = None
+    # Dictionary:
+    # names of those model fields of this model (as keys)
+    # which shall appear as map filters in the map view of this model
+    # in exactly this order, with their respective titles (as values)
+    map_filter_fields = None
+    # List of strings:
+    # names of those model fields of this model appearing in ``map_filter_fields``
+    # which shall appear as drop-down list map filters in the map view of this model
+    map_filter_fields_as_list = None
+    # List of strings:
+    # names of those model fields of this model appearing in ``map_filter_fields``
+    # which shall appear as checkbox-set map filters in the map view of this model
+    # (but these must not be the model fields from ``map_filter_fields``
+    # which are already multiple selection fields!)
+    map_filter_fields_as_checkbox = None
+    # Boolean:
+    # shall those model fields of this model appearing in ``map_filter_fields``
+    # which are of data type boolean
+    # appear as checkbox-set map filters in the map view of this model?
+    map_filter_boolean_fields_as_checkbox = False
+    # Dictionary:
+    # name of that model field of this model (as key)
+    # whose specific value (as value) shall ensure that all those objects
+    # that have exactly this specific value in this field
+    # do not initially appear on the map in the map view of this model
+    map_filter_hide_initial = None
+    # List of dictionaries:
+    # properties of WMS which shall be selectable as additional overlay layers
+    # in the maps of the form views of this model
+    additional_wms_layers = None
+    # List of dictionaries:
+    # properties of WFS which shall be selectable as additional overlay layers
+    # in the maps of the form views of this model
+    additional_wfs_featuretypes = None
+
 
 class Metamodel(Basemodel):
   """
   abstract model class for meta models
+  (i.e. non-editable data models)
   """
 
   class Meta(Basemodel.Meta):
     abstract = True
-    metamodel = True
+
+  class BasemodelMeta(Basemodel.BasemodelMeta):
     editable = False
 
 
@@ -43,7 +221,6 @@ class Codelist(Basemodel):
 
   class Meta(Basemodel.Meta):
     abstract = True
-    codelist = True
 
 
 #
@@ -64,10 +241,12 @@ class Art(Codelist):
 
   class Meta(Codelist.Meta):
     abstract = True
+    ordering = ['art']
+
+  class BasemodelMeta(Codelist.BasemodelMeta):
     list_fields = {
       'art': 'Art'
     }
-    ordering = ['art']
 
   def __str__(self):
     return self.art
@@ -87,10 +266,12 @@ class Befestigungsart(Codelist):
 
   class Meta(Codelist.Meta):
     abstract = True
+    ordering = ['befestigungsart']
+
+  class BasemodelMeta(Codelist.BasemodelMeta):
     list_fields = {
       'befestigungsart': 'Befestigungsart'
     }
-    ordering = ['befestigungsart']
 
   def __str__(self):
     return self.befestigungsart
@@ -110,10 +291,12 @@ class Material(Codelist):
 
   class Meta(Codelist.Meta):
     abstract = True
+    ordering = ['material']
+
+  class BasemodelMeta(Codelist.BasemodelMeta):
     list_fields = {
       'material': 'Material'
     }
-    ordering = ['material']
 
   def __str__(self):
     return self.material
@@ -133,10 +316,12 @@ class Schlagwort(Codelist):
 
   class Meta(Codelist.Meta):
     abstract = True
+    ordering = ['schlagwort']
+
+  class BasemodelMeta(Codelist.BasemodelMeta):
     list_fields = {
       'schlagwort': 'Schlagwort'
     }
-    ordering = ['schlagwort']
 
   def __str__(self):
     return self.schlagwort
@@ -156,10 +341,12 @@ class Status(Codelist):
 
   class Meta(Codelist.Meta):
     abstract = True
+    ordering = ['status']
+
+  class BasemodelMeta(Codelist.BasemodelMeta):
     list_fields = {
       'status': 'Status'
     }
-    ordering = ['status']
 
   def __str__(self):
     return self.status
@@ -179,10 +366,12 @@ class Typ(Codelist):
 
   class Meta(Codelist.Meta):
     abstract = True
+    ordering = ['typ']
+
+  class BasemodelMeta(Codelist.BasemodelMeta):
     list_fields = {
       'typ': 'Typ'
     }
-    ordering = ['typ']
 
   def __str__(self):
     return self.typ
@@ -213,4 +402,3 @@ class ComplexModel(SimpleModel):
 
   class Meta(SimpleModel.Meta):
     abstract = True
-    complex = True