Merge pull request #572 from OnroerendErfgoed/feature/epic_406/532_tr…

…ee_frontend Feature/epic 406/532 tree frontend
OnroerendErfgoed · Jul 9, 2020 · 78bf8ce · 78bf8ce
2 parents bf93f65 + 1e69dbb
commit 78bf8ce
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 16 deletions.
diff --git a/atramhasis/routes.py b/atramhasis/routes.py
@@ -30,8 +30,8 @@ def includeme(config):
                      request_method="GET")
     config.add_route('search_result', pattern='/conceptschemes/{scheme_id}/c', accept='text/html')
     config.add_route('scheme_root', pattern='/conceptschemes/{scheme_id}/c/', accept='text/html')
-    config.add_route('scheme_tree', pattern='/conceptschemes/{scheme_id}/tree', accept='application/json')
     config.add_route('scheme_tree_html', pattern='/conceptschemes/{scheme_id}/tree', accept='text/html')
+    config.add_route('scheme_tree', pattern='/conceptschemes/{scheme_id}/tree', accept='application/json')
 
     config.add_route('search_result_export', pattern='/conceptschemes/{scheme_id}/c.csv')
     config.add_route('atramhasis.edit_conceptscheme', pattern='/conceptschemes/{scheme_id}',

diff --git a/atramhasis/static/css/schemetree.css b/atramhasis/static/css/schemetree.css
@@ -0,0 +1,8 @@
+/* line 1, ../scss/schemetree.scss */
+body {
+  font-family: Arial, Helvetica, sans-serif;
+}
+
+@page {
+  margin: 25mm;
+}
diff --git a/atramhasis/static/scss/schemetree.scss b/atramhasis/static/scss/schemetree.scss
@@ -0,0 +1,7 @@
+body {
+  font-family: Arial, Helvetica, sans-serif
+}
+
+@page {
+  margin: 25mm; // margin for each printed piece of paper
+}
diff --git a/atramhasis/templates/scheme_tree.jinja2 b/atramhasis/templates/scheme_tree.jinja2
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!--[if IE 9]><html class="lt-ie10" lang="en" > <![endif]-->
+<html class="no-js" lang="{{ request.locale_name }}" prefix="dcat: https://www.w3.org/TR/vocab-dcat/">
+
+{% set app_package = app_package|default('atramhasis', true) -%}
+{% set app_name = app_name|default('Atramhasis') %}
+{% set copyright_year = copyright_year|default('2016-2017') %}
+
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <link rel="stylesheet" href="{{request.static_path(app_package + ':static/css/schemetree.css')}}" />
+  <title>{{ app_name }}</title>
+</head>
+
+{% block content %}
+<div class="tree">
+  <section class="page">
+    <article>
+      {%- for item in tree recursive %}
+        <span>{{ '-  ' * (loop.depth-1) }} {{ item.label }}</span><br>
+        {%- if item.children -%}
+            {{ loop(item.children) }}
+        {%- endif %}
+      {%- endfor %}
+    </article>
+  </section>
+</div>
+{% endblock %}
diff --git a/atramhasis/views/views.py b/atramhasis/views/views.py
@@ -79,13 +79,6 @@ def home_view(self):
 
         return {'conceptschemes': conceptschemes}
 
-    @view_config(route_name='scheme_tree_html', renderer='scheme_tree.jinja2')
-    def scheme_tree_view(self):  # pragma: no cover
-        """
-        This view displays the print of a conceptscheme as a hierarchy
-        """
-        return {}
-
     @view_config(route_name='conceptschemes', renderer='atramhasis:templates/conceptschemes.jinja2')
     def conceptschemes_view(self):
         """
@@ -252,13 +245,17 @@ def results_csv(self):
             'filename': 'atramhasis_export'
         }
 
+    @view_config(route_name='scheme_tree_html', renderer='scheme_tree.jinja2')
     @view_config(route_name='scheme_tree', renderer='json', accept='application/json')
     def results_tree_json(self):
         scheme_id = self.request.matchdict['scheme_id']
         locale = self.request.locale_name
         dicts = self.get_results_tree(scheme_id, locale)
         if dicts:
-            return dicts
+            if 'text/html' not in self.request.accept:
+                return dicts
+            else:
+                return {'tree': dicts}
         else:
             return Response(status_int=404)
 

diff --git a/tests/test_functional.py b/tests/test_functional.py
@@ -518,6 +518,20 @@ def test_no_tree(self):
         self.assertEqual('404 Not Found', response.status)
 
 
+class HtmlTreeFunctionalTests(FunctionalTests):
+    def _get_default_headers(self):
+        return {'Accept': 'text/html'}
+
+    def test_tree(self):
+        response = self.testapp.get('/conceptschemes/GEOGRAPHY/tree?_LOCALE_=nl', headers=self._get_default_headers())
+        self.assertEqual('200 OK', response.status)
+        self.assertIn('text/html', response.headers['Content-Type'])
+
+    def test_no_tree(self):
+        response = self.testapp.get('/conceptschemes/FOO/tree?_LOCALE_=nl', headers=self._get_default_headers(),
+                                    status=404, expect_errors=True)
+        self.assertEqual('404 Not Found', response.status)
+
 class SkosFunctionalTests(FunctionalTests):
 
     def _get_default_headers(self):
@@ -553,11 +567,13 @@ def test_create_cache(self):
         invalidate_cache_response = self.testapp.get('/admin/tree/invalidate')
         self.assertEqual('200 OK', invalidate_cache_response.status)
 
-        tree_response = self.testapp.get('/conceptschemes/MATERIALS/tree?_LOCALE_=nl')
+        tree_response = self.testapp.get('/conceptschemes/MATERIALS/tree?_LOCALE_=nl',
+                                         headers=self._get_default_headers())
         self.assertEqual('200 OK', tree_response.status)
         self.assertIsNotNone(tree_response.json)
 
-        cached_tree_response = self.testapp.get('/conceptschemes/MATERIALS/tree?_LOCALE_=nl')
+        cached_tree_response = self.testapp.get('/conceptschemes/MATERIALS/tree?_LOCALE_=nl',
+                                                headers=self._get_default_headers())
         self.assertEqual('200 OK', cached_tree_response.status)
         self.assertIsNotNone(cached_tree_response.json)
 
@@ -568,18 +584,23 @@ def test_auto_invalidate_cache(self):
         invalidate_cache_response = self.testapp.get('/admin/tree/invalidate')
         self.assertEqual('200 OK', invalidate_cache_response.status)
 
-        tree_response = self.testapp.get('/conceptschemes/MATERIALS/tree?_LOCALE_=nl')
-        cached_tree_response = self.testapp.get('/conceptschemes/MATERIALS/tree?_LOCALE_=nl')
+        tree_response = self.testapp.get('/conceptschemes/MATERIALS/tree?_LOCALE_=nl',
+                                         headers=self._get_default_headers())
+        cached_tree_response = self.testapp.get('/conceptschemes/MATERIALS/tree?_LOCALE_=nl',
+                                                headers=self._get_default_headers())
         self.assertEqual(tree_response.json, cached_tree_response.json)
 
-        delete_response = self.testapp.delete('/conceptschemes/MATERIALS/c/31', headers=self._get_default_headers())
+        delete_response = self.testapp.delete('/conceptschemes/MATERIALS/c/31',
+                                              headers=self._get_default_headers())
         self.assertEqual('200 OK', delete_response.status)
         self.assertIsNotNone(delete_response.json['id'])
 
-        tree_response2 = self.testapp.get('/conceptschemes/MATERIALS/tree?_LOCALE_=nl')
+        tree_response2 = self.testapp.get('/conceptschemes/MATERIALS/tree?_LOCALE_=nl',
+                                          headers=self._get_default_headers())
         self.assertNotEqual(tree_response.json, tree_response2.json)
 
-        cached_tree_response2 = self.testapp.get('/conceptschemes/MATERIALS/tree?_LOCALE_=nl')
+        cached_tree_response2 = self.testapp.get('/conceptschemes/MATERIALS/tree?_LOCALE_=nl',
+                                                 headers=self._get_default_headers())
         self.assertEqual(tree_response2.json, cached_tree_response2.json)