New classes: source translation

Author: AlexanderWatzinger

config/model/classes/source.py

@@ -47,6 +47,7 @@
             'inverse': True,
             'multiple': True}},
     'display': {
+        'buttons': ['copy'],
         'form': {'insert_and_continue': True},
         'tabs': {
             'text': {},

config/model/classes/source_translation.py

@@ -0,0 +1,17 @@
+from flask_babel import lazy_gettext as _
+
+model = {
+    'attributes': {
+        'name': {'required': True},
+        'description': {'label': _('content'), 'annotated': True}},
+    'relations': {
+        'source': {
+            'class': 'source',
+            'property': 'P73',
+            'inverse': True,
+            'required': True,
+            'mode': 'direct'}},
+    'display': {
+        'form': {'insert_and_continue': True},
+        'tabs': {
+            'note': {}}}}

config/model/model.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from config.model.classes import source
+from config.model.classes import source, source_translation
 
 model: dict[str, Any] = {
     'acquisition': {
@@ -71,8 +71,7 @@
     'reference_system': {
         'attributes': {}},
     'source': source.model,
-    'source_translation': {
-        'attributes': {}},
+    'source_translation': source_translation.model,
     'stratigraphic_unit': {
         'attributes': {},
         'display': {'buttons': ['network']}},

openatlas/display/classes.py

@@ -9,8 +9,8 @@
 from openatlas.display.tab import Tab
 from openatlas.display.table import Table
 from openatlas.display.util import (
-    button, description, display_annotation_text_links, edit_link,
-    format_entity_date, get_base_table_data, get_file_path, link, remove_link)
+    button, description, edit_link, format_entity_date, get_base_table_data,
+    get_file_path, link, remove_link)
 from openatlas.display.util2 import is_authorized, uc_first
 from openatlas.models.entity import Entity
 from openatlas.models.reference_system import ReferenceSystem
@@ -272,23 +272,6 @@ def add_tabs(self) -> None:
                         class_name=name))]
 
 
-class SourceTranslationDisplay(BaseDisplay):
-
-    def add_button_copy(self) -> None:
-        pass
-
-    def add_crumbs(self) -> None:
-        self.crumbs = [
-            [_('source'), url_for('index', view='source')],
-            self.entity.get_linked_entity_safe('P73', True),
-            self.entity.name]
-
-    def description_html(self) -> str:
-        return description(
-            display_annotation_text_links(self.entity),
-            _('content'))
-
-
 class StratigraphicUnitDisplay(PlaceBaseDisplay):
 
     def add_button_others(self) -> None:

openatlas/display/display.py

@@ -47,6 +47,10 @@ def __init__(self, entity: Entity) -> None:
 
     def add_crumbs(self) -> None:
         self.crumbs = [link(self.entity, index=True)]
+        if self.entity.class_.name == 'source_translation':
+            self.crumbs = [
+                [_('source'), url_for('index', view='source')],
+                self.entity.get_linked_entity_safe('P73', True)]
         if self.structure:
             for super_ in self.structure['supers']:
                 self.crumbs.append(link(super_))
@@ -194,10 +198,11 @@ def add_buttons(self) -> None:
             self.add_button_sibling_pager()
 
     def add_button_copy(self) -> None:
-        self.buttons.append(
-            button(
-                _('copy'),
-                url_for('update', id_=self.entity.id, copy='copy_')))
+        if 'copy' in self.entity.class_.display['buttons']:
+            self.buttons.append(
+                button(
+                    _('copy'),
+                    url_for('update', id_=self.entity.id, copy='copy_')))
 
     def add_button_delete(self) -> None:
         if current_user.group == 'contributor':
@@ -248,7 +253,7 @@ def add_data(self) -> None:
         self.data.update(self.get_type_data())
         for name, relation in self.entity.class_.relations.items():
             if relation['mode'] == 'direct':
-                self.data[name] = [
+                self.data[relation['label']] = [
                     link(e) for e in self.entity.get_linked_entities(
                         relation['property'],
                         relation['class'],

openatlas/forms/entity_form.py

@@ -28,7 +28,7 @@ class Form(FlaskForm):
     add_name_fields(Form, entity)
     add_types(Form, entity.class_)
     add_relations(Form, entity, origin)
-    add_description(Form, entity)
+    add_description(Form, entity, origin)
     add_buttons(Form, entity)
     form: Any = Form(obj=entity)
     if request.method == 'GET' and entity.id:
@@ -62,7 +62,10 @@ def add_buttons(form: Any, entity: Entity) -> None:
         setattr(form, 'continue_', HiddenField())
 
 
-def add_description(form: Any, entity: Entity) -> None:
+def add_description(
+        form: Any,
+        entity: Entity,
+        origin: Optional[Entity] = None) -> None:
     if 'description' not in entity.class_.attributes:
         return
     if 'annotated' not in entity.class_.attributes['description']:
@@ -71,10 +74,20 @@ def add_description(form: Any, entity: Entity) -> None:
             'description',
             TextAreaField(_('description'), render_kw={'rows': 8}))
         return
-    text = ''
+    text = entity.get_annotated_text() if entity.id else ''
     linked_entities = []
-    if entity.id:
-        text = entity.get_annotated_text()
+    if entity.class_.name == 'source_translation':
+        if origin:
+            source = origin
+        else:
+            source = entity.get_linked_entity('P73', inverse=True)
+        linked_entities = [
+            {'id': e.id, 'name': e.name}
+            for e in source.get_linked_entities('P67')]
+    elif entity.id:
+        linked_entities = [
+            {'id': e.id, 'name': e.name}
+            for e in entity.get_linked_entities('P67')]
         for e in entity.get_linked_entities('P67'):
             linked_entities.append({'id': e.id, 'name': e.name})
     setattr(
@@ -165,7 +178,7 @@ def add_relations(form: Any, entity: Entity, origin: Entity | None) -> None:
                 TableField(
                     items,
                     selection,
-                    description=relation['description'],
+                    description=relation['tooltip'],
                     validators=validators))
 
 

openatlas/models/openatlas_class.py

@@ -168,4 +168,5 @@ def get_model(class_name: str) -> dict[str, Any]:
         relation['label'] = relation.get('label', name)
         relation['mode'] = relation.get('mode', 'tab')
         relation['selected'] = [] if relation['multiple'] else None
+        relation['tooltip'] = relation.get('tooltip', None)
     return data