Merge pull request #1611 from laws-africa/portion-popups

provision popups

peachjam/helpers.py

@@ -70,3 +70,11 @@ def to_python(self, value):
     def to_url(self, value):
         # invalid values will raise ValueError which will raise NoReverseMatch
         return datetime.strptime(value, "%Y-%m-%d").date().strftime("%Y-%m-%d")
+
+
+def parse_utf8_html(html):
+    """Parse html assuming utf8 encoding and return lxml tree."""
+    import lxml.html
+
+    parser = lxml.html.HTMLParser(encoding="utf-8")
+    return lxml.html.fromstring(html, parser=parser)

peachjam/templates/peachjam/document_popup.html

@@ -1,23 +1,31 @@
 {% load i18n %}
 <div class="document-popup-content">
-  <div class="mb-2">
-    <div>
-      {% block title %}
-        <b>{{ document.title }}</b>
-        {% block title-badges %}
-          {% if document.metadata_json.repealed %}
-            <span class="badge bg-danger">{% trans 'repealed' %}</span>
-          {% endif %}
+  {% if portion_html %}
+    {% block portion %}
+      <la-akoma-ntoso frbr-expression-uri="{{ document.expression_frbr_uri }}">
+      {{ portion_html|safe }}
+      </la-akoma-ntoso>
+    {% endblock %}
+  {% else %}
+    <div class="mb-2">
+      <div>
+        {% block title %}
+          <b>{{ document.title }}</b>
+          {% block title-badges %}
+            {% if document.metadata_json.repealed %}
+              <span class="badge bg-danger">{% trans 'repealed' %}</span>
+            {% endif %}
+          {% endblock %}
         {% endblock %}
+      </div>
+      {% block citation %}
+        {% if document.citation %}
+          <div>
+            <i>{{ document.citation }}</i>
+          </div>
+        {% endif %}
       {% endblock %}
     </div>
-    {% block citation %}
-      {% if document.citation %}
-        <div>
-          <i>{{ document.citation }}</i>
-        </div>
-      {% endif %}
-    {% endblock %}
-  </div>
-  {% block date %}<div>{{ document.date }}</div>{% endblock %}
+    {% block date %}<div>{{ document.date }}</div>{% endblock %}
+  {% endif %}
 </div>

peachjam/views/widgets.py

@@ -1,8 +1,10 @@
+import lxml.html
+from cobalt.uri import FrbrUri
 from django.http import Http404
 from django.utils.translation import get_language
 from django.views.generic import DetailView
 
-from peachjam.helpers import add_slash
+from peachjam.helpers import add_slash, parse_utf8_html
 from peachjam.models import CoreDocument
 
 
@@ -14,9 +16,39 @@ class DocumentPopupView(DetailView):
     template_name = "peachjam/document_popup.html"
 
     def get_object(self, *args, **kwargs):
-        obj = self.model.objects.best_for_frbr_uri(
-            add_slash(self.kwargs.get("frbr_uri")), get_language()
-        )[0]
+        try:
+            frbr_uri = FrbrUri.parse(add_slash(self.kwargs["frbr_uri"]))
+        except ValueError:
+            raise Http404()
+
+        self.portion = frbr_uri.portion
+        frbr_uri.portion = None
+        if frbr_uri.expression_date:
+            uri = frbr_uri.expression_uri()
+        else:
+            uri = frbr_uri.work_uri()
+
+        obj = self.model.objects.best_for_frbr_uri(uri, get_language())[0]
         if not obj:
             raise Http404()
         return obj
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        if self.portion:
+            if not (self.object.content_html and self.object.content_html_is_akn):
+                raise Http404()
+
+            # try to find the portion within the object
+            try:
+                tree = parse_utf8_html(self.object.content_html)
+                elems = tree.xpath(f'//*[@id="{self.portion}"]')
+                if elems:
+                    context["portion_html"] = lxml.html.tostring(
+                        elems[0], encoding="unicode"
+                    )
+            except ValueError:
+                raise Http404()
+
+        return context