Merge branch 'main' into authors-label-fix

africanlii/resources.py

@@ -37,7 +37,7 @@ def after_import_row(self, row, row_result, row_number=None, **kwargs):
             ratification=Ratification.objects.get(pk=row_result.object_id),
             country=row.get("country"),
             ratification_date=row.get("ratification_date"),
-            signature_date=row.get("deposit_date"),
-            deposit_date=row.get("signature_date"),
+            signature_date=row.get("signature_date"),
+            deposit_date=row.get("deposit_date"),
         )
         r.save()

africanlii/templates/africanlii/_ratification_table.html

@@ -4,9 +4,9 @@ <h2>{% trans 'Ratified documents' %}</h2>
   <thead>
     <tr>
       <th>{% trans 'Title' %}</th>
+      <th>{% trans 'Signature Date' %}</th>
       <th>{% trans 'Ratification Date' %}</th>
       <th>{% trans 'Deposit Date' %}</th>
-      <th>{% trans 'Signature Date' %}</th>
     </tr>
   </thead>
   <tbody>
@@ -15,9 +15,9 @@ <h2>{% trans 'Ratified documents' %}</h2>
         <td>
           <a href="{% url 'document_detail' frbr_uri=ratification_country.ratification.work.frbr_uri|strip_first_character %}">{{ ratification_country.ratification.work.title }}</a>
         </td>
+        <td>{{ ratification_country.signature_date.isoformat }}</td>
         <td>{{ ratification_country.ratification_date.isoformat }}</td>
         <td>{{ ratification_country.deposit_date.isoformat }}</td>
-        <td>{{ ratification_country.signature_date.isoformat }}</td>
       </tr>
     {% endfor %}
   </tbody>

liiweb/templates/liiweb/home.html

@@ -8,6 +8,9 @@
     {% block hero-img %}
       <img class="hero__background-img"
            src="{% static 'images/banner.jpg' %}"
+           srcset="{% static 'images/banner-small.jpg' %} 770w,
+                   {% static 'images/banner.jpg' %} 1920w"
+           sizes="100vw"
            alt="{{ APP_NAME }}"
            height="40"/>
     {% endblock %}

peachjam/migrations/0092_documentcontent_content_xml.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.16 on 2023-07-21 16:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peachjam", "0091_peachjamsettings_mailchimp_form_url"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="documentcontent",
+            name="content_xml",
+            field=models.TextField(blank=True, null=True, verbose_name="document XML"),
+        ),
+    ]

peachjam/models/core_document_model.py

@@ -5,7 +5,7 @@
 import tempfile
 
 import magic
-from cobalt.akn import datestring
+from cobalt.akn import StructuredDocument, datestring
 from cobalt.uri import FrbrUri
 from countries_plus.models import Country
 from django.conf import settings
@@ -813,11 +813,22 @@ class DocumentContent(models.Model):
     content_text = models.TextField(
         blank=True, null=True, verbose_name=_("document text")
     )
+    # option XML content of the document
+    content_xml = models.TextField(
+        blank=True, null=True, verbose_name=_("document XML")
+    )
 
     class Meta:
         verbose_name = _("document content")
         verbose_name_plural = _("document contents")
 
+    def akn_doc(self):
+        """Get a cobalt StructureDocument instance for this document's XML, assuming it is AKN XML."""
+        if self.content_xml:
+            return StructuredDocument.for_document_type(self.document.frbr_uri_doctype)(
+                self.content_xml
+            )
+
     @classmethod
     def update_or_create_for_document(cls, document):
         """Extract the content from a document, whatever its format is."""

peachjam/pipelines.py

@@ -5,6 +5,7 @@
 from docpipe.xmlutils import unwrap_element
 
 DOC_MIMETYPES = [
+    "application/vnd.oasis.opendocument.text",
     "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
     "application/msword",
     "application/rtf",

peachjam/templates/peachjam/_ratifications.html

@@ -15,18 +15,18 @@
   <thead>
     <tr>
       <th>{% trans 'Country' %}</th>
+      <th>{% trans 'Signature Date' %}</th>
       <th>{% trans 'Ratification Date' %}</th>
       <th>{% trans 'Deposit Date' %}</th>
-      <th>{% trans 'Signature Date' %}</th>
     </tr>
   </thead>
   <tbody>
     {% for ratification in ratification.countries.all %}
       <tr>
         <td>{{ ratification.country.name }}</td>
+        <td>{{ ratification.signature_date.isoformat }}</td>
         <td>{{ ratification.ratification_date.isoformat }}</td>
         <td>{{ ratification.deposit_date.isoformat }}</td>
-        <td>{{ ratification.signature_date.isoformat }}</td>
       </tr>
     {% endfor %}
   </tbody>