diff --git a/bemas/models/models_objectclass.py b/bemas/models/models_objectclass.py
index 92845cd9..f77e721a 100644
--- a/bemas/models/models_objectclass.py
+++ b/bemas/models/models_objectclass.py
@@ -12,7 +12,8 @@
from toolbox.constants_vars import standard_validators, personennamen_validators, \
d3_regex, d3_message, email_message, hausnummer_regex, hausnummer_message, \
postleitzahl_regex, postleitzahl_message, rufnummer_regex, rufnummer_message
-from bemas.utils import LOG_ACTIONS, concat_address, shorten_string
+from toolbox.utils import concat_address
+from bemas.utils import LOG_ACTIONS, shorten_string
from .base import GeometryObjectclass, Objectclass
from .functions import store_complaint_search_content
from .models_codelist import Sector, Status, TypeOfEvent, TypeOfImmission
diff --git a/bemas/utils.py b/bemas/utils.py
index 7875b5bc..34b882f4 100644
--- a/bemas/utils.py
+++ b/bemas/utils.py
@@ -19,28 +19,6 @@
}
-def concat_address(street=None, house_number=None, postal_code=None, place=None):
- """
- concats passed address string parts and returns address string
-
- :param street: street name
- :param house_number: house number
- :param postal_code: postal code
- :param place: place
- :return: address string
- """
- first_part = (street + ' ' if street else '') + (house_number if house_number else '')
- second_part = (postal_code + ' ' if postal_code else '') + (place if place else '')
- if first_part and second_part:
- return first_part.strip() + ', ' + second_part.strip()
- elif first_part:
- return first_part.strip()
- elif second_part:
- return second_part.strip()
- else:
- return None
-
-
def format_date_datetime(value, time_string_only=False):
"""
formats date or datetime and returns appropriate date, datetime or time string
diff --git a/datenmanagement/models/constants_vars.py b/datenmanagement/models/constants_vars.py
index 619a8a4d..e6f345e2 100644
--- a/datenmanagement/models/constants_vars.py
+++ b/datenmanagement/models/constants_vars.py
@@ -2,6 +2,10 @@
# validators
#
+bevollmaechtigte_bezirksschornsteinfeger_bezirk_regex = r'^[A-Z]{3}-[0-9]{2}$'
+bevollmaechtigte_bezirksschornsteinfeger_bezirk_message = 'Der Bezirk Nummer ' + str(
- getattr(value, foreign_model_attribute_for_text)) + ' '
- # format numbers
- elif self.columns_with_number and column in self.columns_with_number:
- if isinstance(value, Decimal) or match(r"^[0-9]+\.[0-9]+$", str(value)):
- data = localize_number(Decimal(str(value)))
- else:
- data = value
- # format dates
- elif self.columns_with_date and column in self.columns_with_date:
- data = datetime.strptime(str(value), '%Y-%m-%d').strftime('%d.%m.%Y')
- # format datetimes
- elif self.columns_with_datetime and column in self.columns_with_datetime:
- datetimestamp_str = sub(r'([+-][0-9]{2}):', '\\1', str(value))
- datetimestamp = datetime.strptime(datetimestamp_str, '%Y-%m-%d %H:%M:%S%z').\
- replace(tzinfo=timezone.utc).astimezone(ZoneInfo(settings.TIME_ZONE))
- datetimestamp_str = datetimestamp.strftime('%d.%m.%Y, %H:%M:%S Uhr')
- data = datetimestamp_str
- # handle highlight flags
- elif self.column_as_highlight_flag and column == self.column_as_highlight_flag:
- data = 'ja
'
- # handle photo files
- elif column == 'foto':
- try:
- data = ('')
- if self.thumbs:
- data += ' ' + str(
+ getattr(value, foreign_model_attribute_for_text)) + ' '
+ # format numbers
+ elif self.columns_with_number and column in self.columns_with_number:
+ if isinstance(value, Decimal) or match(r"^[0-9]+\.[0-9]+$", str(value)):
+ data = localize_number(Decimal(str(value)))
else:
- data += 'Link zum ' + (
- ('PDF' if column == 'pdf' else 'Dokument')) + ' '
- except ValueError:
- pass
- # format Boolean ``True``
- elif value is True:
- data = 'ja'
- # format Boolean ``False``
- elif value is False:
- data = 'nein'
- # format lists
- elif type(value) in [list, tuple]:
- data = ', '.join(map(str, value))
- # format external links
- elif isinstance(value, str) and value.startswith('http'):
- data = ('' +
- value + ' ')
- # format colors
- elif isinstance(value, str) and match(r"^#[a-f0-9]{6}$", value, IGNORECASE):
- data = '
'
- # take all other values as they are
- else:
- data = escape(value)
- item_data.append(data)
+ data = value
+ # format dates
+ elif self.columns_with_date and column in self.columns_with_date:
+ data = datetime.strptime(str(value), '%Y-%m-%d').strftime('%d.%m.%Y')
+ # format datetimes
+ elif self.columns_with_datetime and column in self.columns_with_datetime:
+ datetimestamp_str = sub(r'([+-][0-9]{2}):', '\\1', str(value))
+ datetimestamp = datetime.strptime(datetimestamp_str, '%Y-%m-%d %H:%M:%S%z').\
+ replace(tzinfo=timezone.utc).astimezone(ZoneInfo(settings.TIME_ZONE))
+ datetimestamp_str = datetimestamp.strftime('%d.%m.%Y, %H:%M:%S Uhr')
+ data = datetimestamp_str
+ # handle highlight flags
+ elif self.column_as_highlight_flag and column == self.column_as_highlight_flag:
+ data = 'ja
'
+ # handle photo files
+ elif column == 'foto':
+ try:
+ data = ('')
+ if self.thumbs:
+ data += ' '
+ except ValueError:
+ pass
+ # handle PDF files
+ elif column == 'dokument' or column == 'pdf':
+ try:
+ data = 'Link zum ' + (
+ ('PDF' if column == 'pdf' else 'Dokument')) + ' '
+ except ValueError:
+ pass
+ # format Boolean ``True``
+ elif value is True:
+ data = 'ja'
+ # format Boolean ``False``
+ elif value is False:
+ data = 'nein'
+ # format lists
+ elif type(value) in [list, tuple]:
+ data = ', '.join(map(str, value))
+ # format external links
+ elif isinstance(value, str) and value.startswith('http'):
+ data = ('' +
+ value + ' ')
+ # format colors
+ elif isinstance(value, str) and match(r"^#[a-f0-9]{6}$", value, IGNORECASE):
+ data = '
'
+ # take all other values as they are
+ else:
+ data = escape(value)
+ item_data.append(data)
+ # handle address strings
+ else:
+ # append address string once
+ # instead of appending individual strings for all address related values
+ item_data.append(self.model.objects.get(pk=item_pk).address())
# append links for updating, viewing and/or deleting
if self.model_is_editable:
links = ''
@@ -212,7 +220,18 @@ def ordering(self, qs):
elif self.request.GET.get('order[0][column]') is not None:
order_column = self.request.GET.get('order[0][column]')
order_dir = self.request.GET.get('order[0][dir]', None)
- column_names = list(self.columns.keys())
+ column_names = []
+ # careful here!
+ # use the same clauses as in prepare_results() above since otherwise,
+ # the wrong order columns could be choosed
+ address_handled = False
+ for column in self.columns:
+ # all columns except address strings!
+ if not column == 'anschrift':
+ column_names.append(column)
+ # handle address strings
+ else:
+ column_names.append('anschrift_strasse')
column_name = column_names[int(order_column) - 1]
directory = '-' if order_dir is not None and order_dir == 'desc' else ''
return qs.order_by(directory + column_name)
diff --git a/toolbox/constants_vars.py b/toolbox/constants_vars.py
index 1b109f98..f78e184d 100644
--- a/toolbox/constants_vars.py
+++ b/toolbox/constants_vars.py
@@ -51,7 +51,7 @@
postleitzahl_message = 'Die Postleitzahl