Merge pull request #76 from arthur-schnitzler/main

updates

apis_core/apis_entities/tests.py

@@ -416,3 +416,12 @@ def test_029_parse_date(self):
             for i, r in enumerate(results):
                 date_str = f"{r}"[:10]
                 self.assertEqual(date_str, x[1][i])
+
+    def test_030_clean_written_dates(self):
+        item = Person.objects.create(
+            start_date_written="1800<1812-01-04>", end_date_written="um 1900"
+        )
+        self.assertFalse("<" in item.clean_start_date_written())
+        self.assertFalse("<" in item.clean_end_date_written())
+        self.assertTrue("<" in item.start_date_written)
+        self.assertFalse("<" in item.end_date_written)

apis_core/apis_metainfo/models.py

@@ -174,6 +174,20 @@ def img_credit_label(self):
                 credit = "AKON"
         return credit
 
+    def clean_start_date_written(self):
+        clean_date = self.start_date_written
+        if self.start_date_written:
+            if "<" in self.start_date_written:
+                clean_date = self.start_date_written.split("<")[0]
+        return clean_date
+
+    def clean_end_date_written(self):
+        clean_date = self.end_date_written
+        if self.end_date_written:
+            if "<" in self.end_date_written:
+                clean_date = self.end_date_written.split("<")[0]
+        return clean_date
+
     @classmethod
     def get_listview_url(self):
         entity = self.__name__.lower()

apis_core/apis_tei/templates/apis_tei/birth_death.xml

@@ -10,7 +10,7 @@
       {% if object.start_end_date %}
         notAfter-iso="{{ object.start_end_date|date:'Y-m-d' }}"
       {% endif %}
-    >{{ object.start_date_written }}</date>
+    >{{ object.clean_start_date_written }}</date>
   {% for x in birth_rel %}
   {% if FULL %}
     <settlement key="{{ x.related_place.id }}">
@@ -48,7 +48,7 @@
       {% if object.end_end_date %}
         notAfter-iso="{{ object.end_end_date|date:'Y-m-d' }}"
       {% endif %}
-      >{{ object.end_date_written }}</date>
+      >{{ object.clean_end_date_written }}</date>
       {% for x in death_rel %}
       {% if FULL %}
       <settlement key="{{ x.related_place.id }}">

apis_core/apis_tei/templates/apis_tei/date.xml

@@ -1,5 +1,5 @@
 {% if object.start_date_written == object.end_date_written %}
-<date>{{ object.start_date_written }}</date>
+<date>{{ object.clean_start_date_written }}</date>
 {% elif object.start_date_written and object.end_date_written %}
 <date
       {% if object.start_start_date %}
@@ -8,7 +8,7 @@
       {% if object.end_date %}
         to-iso="{{ object.end_date|date:'Y-m-d' }}"
       {% endif %}
-    >{{ object.start_date_written }}  – {{ object.end_date_written }}</date>
+    >{{ object.clean_start_date_written }} – {{ object.clean_end_date_written }}</date>
 {% elif object.start_date_written %}
 <date
       {% if object.start_start_date %}
@@ -17,7 +17,7 @@
       {% if object.start_date %}
         when-iso="{{ object.start_date|date:'Y-m-d' }}"
       {% endif %}
-    >{{ object.start_date_written }}</date>
+    >{{ object.clean_start_date_written }}</date>
 {% elif object.end_date_written %}
 <date
       {% if object.end_date %}
@@ -26,6 +26,6 @@
       {% if object.end_end_date %}
         notAfter-iso="{{ object.end_end_date|date:'Y-m-d' }}"
       {% endif %}
-    >{{ object.end_date_written }}</date>
+    >{{ object.clean_end_date_written }}</date>
 {% else %}
 {% endif %}