Merge pull request #52 from arthur-schnitzler/113-fix-json+net-render…

…er-for-same-same-relations 113 fix json+net renderer for same same relations
acdh-oeaw · Jan 24, 2024 · 8c76007 · 8c76007
2 parents 7393153 + 4927b2d
commit 8c76007
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 30 deletions.
diff --git a/apis_core/api_renderers.py b/apis_core/api_renderers.py
@@ -23,9 +23,9 @@ def render(self, data, media_type=None, renderer_context=None):
                     rel2 = re.match("^{}[a-z]*".format(r2), rel)
                     if rel2:
                         source = r
-                    elif r.endswith("A"):
+                    elif r.endswith("a"):
                         source = r
-                    elif r.endswith("B"):
+                    elif r.endswith("b"):
                         target = r
                     rel2 = re.match("^[a-z]*?{}$".format(r2), rel)
                     if rel2:

diff --git a/apis_core/apis_entities/templates/apis_entities/detail_views/entity_detail_generic.html b/apis_core/apis_entities/templates/apis_entities/detail_views/entity_detail_generic.html
@@ -53,7 +53,7 @@ <h2>
 
     <div class="row">
         <div class="col-md-5">
-            <h3 class="text-center">
+            <h4 class="text-left">
                 <a href="{{ object.get_api_url }}">
                     <i class="bi bi-database" title="zur API-Ansicht der Entität"></i>
                 </a>
@@ -115,7 +115,7 @@ <h3 class="text-center">
                 {% if object.start_date or object.end_date %}
                 <tr>
                     <th>
-                        Date
+                        Datum
                     </th>
                     <td>
                         {% if object.start_date_written %}
@@ -130,7 +130,7 @@ <h3 class="text-center">
                 {% if object.lat %}
                     <tr>
                         <th>
-                            Lat/Lng
+                            Länge/Breite
                         </th>
                         <td>
                             {{ object.lat }} / {{ object.lng }}
@@ -142,8 +142,8 @@ <h3 class="text-center">
             {% block info-metadata %}
                 <table class="table">
                     <tr>
-                        <th>
-                            Uri(s)
+                        <th class="left-width">
+                            URI
                         </th>
                         <td>
                             {% for x in object.uri_set.all %}
@@ -158,21 +158,20 @@ <h3 class="text-center">
                     {% if object.collection.all %}
                     <tr>
                         <th>
-                            Collection(s)
+                            Sammlungen
                         </th>
                         <td>
                             {% for x in object.collection.all %}
-                                <li>
-                                    {{ x }}
-                                </li>
+                                {{ x }}<br />
                             {% endfor %}
+
                         </td>
                     </tr>
                     {% endif %}
                     {% if object.notes %}
                         <tr>
                             <th>
-                                Notes
+                                Anmerkungen
                             </th>
                             <td>
                                 {{ object.notes }}
@@ -182,7 +181,7 @@ <h3 class="text-center">
                     {% if object.references %}
                         <tr>
                             <th>
-                                References
+                                Belege
                             </th>
                             <td>
                                 {{ object.references }}
@@ -195,13 +194,13 @@ <h3 class="text-center">
             {% endblock left-pane-additional %}
         </div>
         <div class="col-md-7">
-            <h3 class="text-center">Relations</h3>
+            <h3 class="text-center">Beziehungen</h3>
             {% block relations %}
                 {% for obj in right_card %}
                     {% if obj.1.data|length > 0 %}
                         <h4 > {{ obj.0 }}</h4>
 
-                        <div id="tab_{{ obj.2 }}" >
+                        <div id="tab_{{ obj.2 }}" style="margin-bottom: 50px;">
                             {% render_table obj.1 %}
                         </div>
                     {% endif %}

diff --git a/apis_core/apis_entities/templates/apis_entities/detail_views/person_detail.html b/apis_core/apis_entities/templates/apis_entities/detail_views/person_detail.html
@@ -3,7 +3,7 @@
     {% block info-table %}
     <table class="table">
         <tr>
-            <th>
+            <th class="left-width">
                 Name
             </th>
             <td>
@@ -13,7 +13,7 @@
         {% if no_merge_labels %}
         <tr>
             <th>
-                Alternative Namen
+                anderer Name
             </th>
             <td>
                 {% for x in no_merge_labels %}
@@ -44,7 +44,7 @@
         {% if object.start_date or object.end_date %}
         <tr>
             <th>
-                Lifespan
+                Lebensspanne
             </th>
             <td>
                 {% if object.start_date %}
@@ -59,7 +59,7 @@
         {% if object.profession.all %}
         <tr>
             <th>
-                Professions
+                Berufe
             </th>
             <td>
               {% for prof in object.profession.all %}

diff --git a/apis_core/apis_entities/tests.py b/apis_core/apis_entities/tests.py
@@ -290,12 +290,8 @@ def test_020_api_list_view(self):
             r = client.get(value)
             self.assertTrue(r.status_code, 200)
             if key.startswith("relation"):
-                try:
-                    r = client.get(f"{value}?format=json%2Bnet")
-                    self.assertTrue(r.status_code, 200)
-                except Exception as e:
-                    print(value, e)
-                    continue
+                r = client.get(f"{value}?format=json%2Bnet")
+                self.assertTrue(r.status_code, 200)
 
     def test_021_api_detail_view(self):
         item = Person.objects.last()

diff --git a/apis_core/entity_detail_generic.html b/apis_core/entity_detail_generic.html
@@ -64,7 +64,7 @@ <h2>
                 <div class="col-md-4">
                     <div class="card">
                         <div class="card-header">
-                            <h3>General Info</h3>
+                            <h3>Allgemein</h3>
                         </div>
                         <div class="card-body">
                             {% block info-table %}
@@ -88,7 +88,7 @@ <h3>General Info</h3>
                                 {% if object.start_date or object.end_date %}
                                 <tr>
                                     <th>
-                                        Date
+                                        Datum
                                     </th>
                                     <td>
                                         {% if object.start_date %}
@@ -143,7 +143,7 @@ <h2>Texts</h2>
             {% if object.text.all %}
                 <div class="card-body">
                     <legend>
-                        Texts
+                        Texte
                     </legend>
                     {% for x in object.text.all %}
                         <div class="card card-default">
@@ -160,7 +160,7 @@ <h4 class="card-title"> {{ x.kind }}</h4>
                 </div>
             {% else %}
                 <div class="card-body">
-                    <legend>No text provided for this {{entity}}</legend>
+                    <legend>Kein Text verfügbar für {{entity}}</legend>
                 </div>
             {% endif %}
         </div>

diff --git a/set_env_variables.sh b/set_env_variables.sh
@@ -1 +1 @@
-export $(grep -v '^#' .secret | xargs)
+export $(grep -v '^#' .env | xargs)
diff --git a/static/css/style.css b/static/css/style.css
@@ -100,3 +100,7 @@ main {
     margin-right: .75rem;
     margin-left: .75rem;
 }
+
+.left-width {
+    width: 100px;
+}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export $(grep -v '^#' .secret \| xargs)
		export $(grep -v '^#' .env \| xargs)