Merge pull request #65 from arthur-schnitzler/main

updates
acdh-oeaw · Feb 2, 2024 · 126effd · 126effd
2 parents 6dc136f + f1e2d47
commit 126effd
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 5 deletions.
diff --git a/apis_core/apis_entities/list_view_person.py b/apis_core/apis_entities/list_view_person.py
@@ -27,7 +27,6 @@
     "end_end_date",
     "status",
     "source",
-    "references",
     "published",
     "tempentityclass_ptr",
     "review",
@@ -54,6 +53,11 @@ class PersonListFilter(MyBaseFilter):
         method="name_label_filter",
         help_text="eingegebene Zeichenkette muss im Vornamen, Nachnamem oder in einem Label enthalten sein",
     )
+    references = django_filters.CharFilter(
+        lookup_expr="icontains",
+        label="Referenzen",
+        help_text="eingegebene Zeichenkette muss im Textfeld 'Referenzen' enthalten sein",
+    )
     gender = django_filters.ChoiceFilter(
         choices=(("", "egal"), ("male", "männlich"), ("female", "weiblich"))
     )
@@ -166,6 +170,7 @@ def __init__(self, *args, **kwargs):
                     "birth_year",
                     "death_year",
                     "collection",
+                    "references",
                     css_id="more",
                 ),
                 AccordionGroup(

diff --git a/apis_core/apis_entities/list_view_work.py b/apis_core/apis_entities/list_view_work.py
@@ -56,7 +56,7 @@ class WorkListFilter(MyBaseFilter):
     references = django_filters.CharFilter(
         lookup_expr="icontains",
         label="Referenzen",
-        help_text="eingegebene Zeichenkette muss im Titel enthalten sein",
+        help_text="eingegebene Zeichenkette muss im Textfeld 'Referenzen' enthalten sein",
     )
     year_of_creation = django_filters.NumberFilter(
         field_name="start_date__year", label="Schöpfungsdatum", help_text="z.B. 1880"

diff --git a/browsing/templates/browsing/partials/column_selector.html b/browsing/templates/browsing/partials/column_selector.html
@@ -1,5 +1,5 @@
 {% if togglable_colums %}
-<label class="form-label pt-3" for="column_selector">Select additional columns:</label>
+<label class="form-label pt-3" for="column_selector">Weitere Spalten hinzufügen</label>
 <select class="form-control mb-3" multiple name="columns" id="column_selector">
     {% for key, value in togglable_colums.items %}
     {% if key == 'merge' and user.is_authenticated and enable_merge %}

diff --git a/issue__17_dataimports_part2.ipynb b/issue__17_dataimports_part2.ipynb
@@ -8,6 +8,7 @@
    "outputs": [],
    "source": [
     "from acdh_tei_pyutils.tei import TeiReader\n",
+    "from acdh_tei_pyutils.utils import get_xmlid, normalize_string\n",
     "from tqdm import tqdm\n",
     "from icecream import ic\n",
     "from normdata.utils import import_from_normdata"
@@ -87,7 +88,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "print(\"no import entities without normdata records\")"
+    "print(\"now import entities without normdata records\")"
    ]
   },
   {
@@ -168,6 +169,43 @@
    "id": "77e897d5",
    "metadata": {},
    "outputs": [],
+   "source": [
+    "for x in tqdm(doc.any_xpath(\".//tei:person[@xml:id][./tei:listBibl]\")):\n",
+    "    ref = []\n",
+    "    for y in x.xpath(\".//tei:bibl[./tei:biblScope]\", namespaces=nsmap):\n",
+    "        volume = y.xpath(\"./tei:biblScope[@unit='volume']\", namespaces=nsmap)[0].text\n",
+    "        page = y.xpath(\"./tei:biblScope[@unit='page']\", namespaces=nsmap)[0].text\n",
+    "        if volume.endswith(\".\"):\n",
+    "            volume = normalize_string(volume[:-1])\n",
+    "        try:\n",
+    "            page = f\"S. {normalize_string(page)}\"\n",
+    "        except AttributeError:\n",
+    "            continue\n",
+    "        quote = f\"{volume}, {page}.\"\n",
+    "        ref.append(quote)\n",
+    "    all_quotes = (\" *** \".join(ref))  \n",
+    "        \n",
+    "    hbtv_uri = get_xmlid(x)\n",
+    "    work_uri = f\"{bahr_url}{hbtv_uri}\"\n",
+    "    work = Uri.objects.get(uri=work_uri).entity.get_child_entity()\n",
+    "    orig_ref = work.references\n",
+    "    if orig_ref:\n",
+    "        if all_quotes in orig_ref:\n",
+    "            continue\n",
+    "    try:\n",
+    "        new_ref = orig_ref + \"\\n\" + all_quotes\n",
+    "    except TypeError:\n",
+    "        new_ref = \"\\n\" + all_quotes\n",
+    "    work.references = new_ref\n",
+    "    work.save()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "67ccffad",
+   "metadata": {},
+   "outputs": [],
    "source": []
   }
  ],

diff --git a/pmb/settings.py b/pmb/settings.py
@@ -24,7 +24,7 @@
 APIS_DETAIL_VIEWS_ALLOWED = True
 DJANGO_TABLES2_TEMPLATE = "django_tables2/bootstrap5.html"
 DJANGO_TABLES2_TABLE_ATTRS = {
-    "class": "table table-hover table-borderless",
+    "class": "table table-hover table-borderless table-relations",
 }
 # Application definition
 

diff --git a/static/css/style.css b/static/css/style.css
@@ -103,4 +103,10 @@ main {
 
 .table-borderless {
     border: none;
+}
+
+.table-relations th,
+.table-relations th
+ {
+    width: 25% !important;
 }