diff --git a/africanlii/resources.py b/africanlii/resources.py index 1ccc8bb0e..1222126fc 100644 --- a/africanlii/resources.py +++ b/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() diff --git a/africanlii/static/images/cso-agp-logo-horizontal.png b/africanlii/static/images/cso-agp-logo-horizontal.png index d1b0041a8..40b14b921 100644 Binary files a/africanlii/static/images/cso-agp-logo-horizontal.png and b/africanlii/static/images/cso-agp-logo-horizontal.png differ diff --git a/africanlii/static/images/eu_logo.jpg b/africanlii/static/images/eu_logo.jpg index 3fa6491d1..cfe8d8a83 100644 Binary files a/africanlii/static/images/eu_logo.jpg and b/africanlii/static/images/eu_logo.jpg differ diff --git a/africanlii/static/images/indigo-trust-logo.jpg b/africanlii/static/images/indigo-trust-logo.jpg index 76c2083e4..0266c4f96 100644 Binary files a/africanlii/static/images/indigo-trust-logo.jpg and b/africanlii/static/images/indigo-trust-logo.jpg differ diff --git a/africanlii/templates/africanlii/_ratification_table.html b/africanlii/templates/africanlii/_ratification_table.html index 59ad95387..84398be4f 100644 --- a/africanlii/templates/africanlii/_ratification_table.html +++ b/africanlii/templates/africanlii/_ratification_table.html @@ -4,9 +4,9 @@

{% trans 'Ratified documents' %}

{% trans 'Title' %} + {% trans 'Signature Date' %} {% trans 'Ratification Date' %} {% trans 'Deposit Date' %} - {% trans 'Signature Date' %} @@ -15,9 +15,9 @@

{% trans 'Ratified documents' %}

{{ ratification_country.ratification.work.title }} + {{ ratification_country.signature_date.isoformat }} {{ ratification_country.ratification_date.isoformat }} {{ ratification_country.deposit_date.isoformat }} - {{ ratification_country.signature_date.isoformat }} {% endfor %} diff --git a/liiweb/static/images/banner-small.jpg b/liiweb/static/images/banner-small.jpg new file mode 100644 index 000000000..7ac329464 Binary files /dev/null and b/liiweb/static/images/banner-small.jpg differ diff --git a/liiweb/templates/liiweb/home.html b/liiweb/templates/liiweb/home.html index feb73ab1d..f6198f5e8 100644 --- a/liiweb/templates/liiweb/home.html +++ b/liiweb/templates/liiweb/home.html @@ -8,6 +8,9 @@ {% block hero-img %} {{ APP_NAME }} {% endblock %} diff --git a/peachjam/migrations/0092_documentcontent_content_xml.py b/peachjam/migrations/0092_documentcontent_content_xml.py new file mode 100644 index 000000000..d929f0213 --- /dev/null +++ b/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"), + ), + ] diff --git a/peachjam/models/core_document_model.py b/peachjam/models/core_document_model.py index 0cba8f42e..e329c1e5a 100644 --- a/peachjam/models/core_document_model.py +++ b/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.""" diff --git a/peachjam/pipelines.py b/peachjam/pipelines.py index 38fabe8eb..0b16ec971 100644 --- a/peachjam/pipelines.py +++ b/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", diff --git a/peachjam/static/images/laws-africa-logo-horizontal-white.png b/peachjam/static/images/laws-africa-logo-horizontal-white.png index 699976553..6e01d5ecb 100644 Binary files a/peachjam/static/images/laws-africa-logo-horizontal-white.png and b/peachjam/static/images/laws-africa-logo-horizontal-white.png differ diff --git a/peachjam/static/images/laws-africa-logo-horizontal.png b/peachjam/static/images/laws-africa-logo-horizontal.png index cb9cf684a..fd22762b7 100644 Binary files a/peachjam/static/images/laws-africa-logo-horizontal.png and b/peachjam/static/images/laws-africa-logo-horizontal.png differ diff --git a/peachjam/static/images/laws-africa-logo.png b/peachjam/static/images/laws-africa-logo.png index 5051f558f..e57a5730a 100644 Binary files a/peachjam/static/images/laws-africa-logo.png and b/peachjam/static/images/laws-africa-logo.png differ diff --git a/peachjam/templates/peachjam/_ratifications.html b/peachjam/templates/peachjam/_ratifications.html index 11f70cfe7..5b54784a5 100644 --- a/peachjam/templates/peachjam/_ratifications.html +++ b/peachjam/templates/peachjam/_ratifications.html @@ -15,18 +15,18 @@ {% trans 'Country' %} + {% trans 'Signature Date' %} {% trans 'Ratification Date' %} {% trans 'Deposit Date' %} - {% trans 'Signature Date' %} {% for ratification in ratification.countries.all %} {{ ratification.country.name }} + {{ ratification.signature_date.isoformat }} {{ ratification.ratification_date.isoformat }} {{ ratification.deposit_date.isoformat }} - {{ ratification.signature_date.isoformat }} {% endfor %}