App BEMAS: unbekannte Betreiberverhältnisse ausgezeichnet; Autocomple…

…tion-Selects an Bootstrap 5 angepasst

bemas/models/models_objectclass.py

@@ -443,7 +443,7 @@ def __str__(self):
     return str(self.sector) + operator + ' (' + shorten_string(self.description) + ')'
 
   def sector_and_operator(self):
-    operator = ''
+    operator = ' unbekannte Betreiberverhältnisse'
     if self.operator_organization:
       operator = ' (Betreiberin: ' + str(self.operator_organization) + ')'
     elif self.operator_person:

bemas/templates/bemas/generic-objectclass-form.html

@@ -19,6 +19,7 @@
     <link rel="stylesheet" type="text/css" href="{% static 'datenmanagement/css/form-desktop.css' %}">
   {% endif %}
   <link rel="stylesheet" type="text/css" href="{% static 'select2/select2.min.css' %}">
+  <link rel="stylesheet" type="text/css" href="{% static 'select2-bootstrap-5-theme/select2-bootstrap-5-theme.min.css' %}">
 {% endblock %}
 
 {% block scripts %}
@@ -250,13 +251,13 @@ <h2><i class="fas fa-{{ objectclass_name|lower|get_icon }}"></i> <em>{{ objectcl
         });
 
         // handle certain select fields: convert them to autocomplete fields
-        $('select#id_organization').select2();
-        $('select#id_person').select2();
-        $('select#id_operator_organization').select2();
-        $('select#id_operator_person').select2();
-        $('select#id_originator').select2();
-        $('select#id_complainers_organizations').select2();
-        $('select#id_complainers_persons').select2();
+        $('select#id_organization').select2({ theme: 'bootstrap-5' });
+        $('select#id_person').select2({ theme: 'bootstrap-5' });
+        $('select#id_operator_organization').select2({ theme: 'bootstrap-5' });
+        $('select#id_operator_person').select2({ theme: 'bootstrap-5' });
+        $('select#id_originator').select2({ theme: 'bootstrap-5' });
+        $('select#id_complainers_organizations').select2({ theme: 'bootstrap-5' });
+        $('select#id_complainers_persons').select2({ theme: 'bootstrap-5' });
 
         // currently not needed due to conversion of multiple select fields to autocomplete fields
         /* $('select[multiple]').each(function () {

bemas/templates/bemas/generic-objectclass-table.html

@@ -61,6 +61,8 @@ <h4 class="mt-3">
               {% endfor %}
               {% if objectclass_name == 'Organization' %}
                 <th class="no-sort">Ansprechpartner:in(nen)</th>
+              {% elif objectclass_name == 'Originator' %}
+                <th class="no-sort">Betreiberverhältnisse</th>
               {% elif objectclass_name == 'Complaint' %}
                 <th class="no-sort">Beschwerdeführung</th>
               {% endif %}

bemas/views/base.py

@@ -57,8 +57,13 @@ def prepare_results(self, qs):
         item_pk = getattr(item, self.model._meta.pk.name)
         address_handled = False
         for column in self.columns:
-          # handle non-geometry related fields and non-search content fields only!
-          if not is_geometry_field(column.__class__) and not column.name == 'search_content':
+          # handle non-geometry related fields, non-search content fields
+          # and non-operator related fields only!
+          if (
+              not is_geometry_field(column.__class__)
+              and not column.name == 'search_content'
+              and not column.name.startswith('operator_')
+          ):
             data = None
             value = getattr(item, column.name)
             # codelist specific column "icon"
@@ -139,6 +144,23 @@ def prepare_results(self, qs):
                 Contact, contact, contact.name_and_function()
               )
           item_data.append(data)
+        # object class originator:
+        # add column which lists operator(s)
+        elif issubclass(self.model, Originator):
+          data = ''
+          operator_organization = getattr(item, 'operator_organization')
+          if operator_organization:
+            data = generate_foreign_key_link_simplified(Organization, operator_organization)
+          operator_person = getattr(item, 'operator_person')
+          if operator_person:
+            data += '<br>' if operator_organization else ''
+            data += generate_foreign_key_link_simplified(Person, operator_person)
+          # designate anonymous complaint if necessary
+          if not data:
+            data = '<em><i class="fas fa-' + \
+                   get_icon_from_settings('originator_without_operator') + \
+                   '"></i> unbekannte Betreiberverhältnisse</em>'
+          item_data.append(data)
         # object class complaint:
         # add column which lists complainer(s)
         elif issubclass(self.model, Complaint):

bemas/views/functions.py

@@ -107,8 +107,13 @@ def add_table_context_elements(context, model, kwargs=None):
   address_handled = False
   for field in model._meta.fields:
     if not field.name.startswith('address_'):
-      # handle non-geometry related fields and non-search content fields only!
-      if not is_geometry_field(field.__class__) and not field.name == 'search_content':
+      # handle non-geometry related fields, non-search content fields
+      # and non-operator related fields only!
+      if (
+          not is_geometry_field(field.__class__)
+          and not field.name == 'search_content'
+          and not field.name.startswith('operator_')
+      ):
         column_titles.append(field.verbose_name)
     # handle addresses
     elif field.name.startswith('address_') and not address_handled:

datenwerft/settings.py

@@ -174,6 +174,7 @@
   ('proj4leaflet', BASE_DIR / 'node_modules/proj4leaflet/src'),
   ('select2', BASE_DIR / 'node_modules/select2/dist/css'),
   ('select2', BASE_DIR / 'node_modules/select2/dist/js'),
+  ('select2-bootstrap-5-theme', BASE_DIR / 'node_modules/select2-bootstrap-5-theme/dist'),
   ('wicket', BASE_DIR / 'node_modules/wicket'),
   ('hilfe', BASE_DIR / 'hilfe/build/html'),
   ('css', BASE_DIR / 'datenwerft/static/css'),
@@ -220,6 +221,7 @@
   'ok': 'circle-check',
   'organization': 'building',
   'originator': 'industry',
+  'originator_without_operator': 'question',
   'orphaned_data': 'ghost',
   'person': 'user',
   'save': 'floppy-disk',

package.json

@@ -14,6 +14,7 @@
     "proj4": "^2.9.0",
     "proj4leaflet": "^1.0.2",
     "select2": "^4.1.0-rc.0",
+    "select2-bootstrap-5-theme": "^1.3.0",
     "stylelint": "^14.16.1",
     "stylelint-config-standard": "^29.0.0",
     "wicket": "^1.3.8"