Pass through the calculated dimensions to the template

docs/Changelog.rst

@@ -1,6 +1,7 @@
 1.0.3 (unreleased)
 ------------------
 
+- #34: Pass through the calculated dimensions to the template
 - #33: Include D3JS and support for Range Graphs
 - #32: Added language selector
 - #31: Fix sort order of uniquified items

src/senaite/impress/ajax.py

@@ -146,6 +146,9 @@ def ajax_render_reports(self, *args):
         # update the request form with the parsed json data
         data = self.get_json()
 
+        paperformat = data.get("format", "A4")
+        orientation = data.get("orientation", "portrait")
+
         # Create a collection of the requested UIDs
         collection = self.get_collection(data.get("items"))
 
@@ -162,12 +165,18 @@ def ajax_render_reports(self, *args):
         for client_uid, collection in grouped_by_client.items():
             # render multi report
             if is_multi_template:
-                html = self.render_multi_report(collection, template)
+                html = self.render_multi_report(collection,
+                                                template,
+                                                paperformat=paperformat,
+                                                orientation=orientation)
                 htmls.append(html)
             else:
                 # render single report
                 for model in collection:
-                    html = self.render_report(model, template)
+                    html = self.render_report(model,
+                                              template,
+                                              paperformat=paperformat,
+                                              orientation=orientation)
                     htmls.append(html)
 
         return "\n".join(htmls)

src/senaite/impress/analysisrequest/reportview.py

@@ -252,16 +252,18 @@ def __init__(self, model, request):
         self.model = model
         self.request = request
 
-    def render(self, template):
-        context = self.get_template_context(self.model)
+    def render(self, template, **kw):
+        context = self.get_template_context(self.model, **kw)
         template = Template(template).safe_substitute(context)
         return SINGLE_TEMPLATE.safe_substitute(context, template=template)
 
-    def get_template_context(self, model):
-        return {
+    def get_template_context(self, model, **kw):
+        context = {
             "uids": model.UID(),
             "client_uid": model.getClientUID(),
         }
+        context.update(kw)
+        return context
 
 
 class MultiReportView(ReportView):
@@ -275,19 +277,21 @@ def __init__(self, collection, request):
         self.collection = collection
         self.request = request
 
-    def render(self, template):
+    def render(self, template, **kw):
         """Wrap the template and render
         """
-        context = self.get_template_context(self.collection)
+        context = self.get_template_context(self.collection, **kw)
         template = Template(template).safe_substitute(context)
         return MULTI_TEMPLATE.safe_substitute(context, template=template)
 
-    def get_template_context(self, collection):
+    def get_template_context(self, collection, **kw):
         if not collection:
             return {}
         uids = map(lambda m: m.uid, collection)
         client_uid = collection[0].getClientUID()
-        return {
+        context = {
             "uids": ",".join(uids),
             "client_uid": client_uid,
         }
+        context.update(kw)
+        return context

src/senaite/impress/publishview.py

@@ -160,27 +160,35 @@ def get_report_type(self):
         # any other content type as well.
         return self.request.form.get("type", "AnalysisRequest")
 
-    def render_report(self, model, template, **kw):
+    def render_report(self, model, template, paperformat, orientation, **kw):
         """Render a SuperModel to HTML
         """
         _type = self.get_report_type()
         # Query the controller view as a multi-adapter to allow 3rd party
         # overriding with a browser layer
         view = getMultiAdapter((model, self.request), IReportView, name=_type)
-        return view.render(self.read_template(template, view, **kw))
+        # pass through the calculated dimensions to the template
+        dimensions = self.calculate_dimensions(paperformat, orientation)
+        template = self.read_template(template, view, **dimensions)
+        return view.render(
+            template, paperformat=paperformat, orientation=orientation, **kw)
 
-    def render_multi_report(self, collection, template, **kw):
+    def render_multi_report(self, collection, template, paperformat, orientation, **kw):  # noqa
         """Render multiple SuperModels to HTML
         """
         _type = self.get_report_type()
         # Query the controller view as a multi-adapter to allow 3rd party
         # overriding with a browser layer
         view = getMultiAdapter(
             (collection, self.request), IMultiReportView, name=_type)
-        return view.render(self.read_template(template, view, **kw))
-
-    def get_print_css(self, paperformat="A4", orientation="portrait"):
-        """Returns the generated print CSS for the given format/orientation
+        # pass through the calculated dimensions to the template
+        dimensions = self.calculate_dimensions(paperformat, orientation)
+        template = self.read_template(template, view, **dimensions)
+        return view.render(
+            template, paperformat=paperformat, orientation=orientation, **kw)
+
+    def calculate_dimensions(self, paperformat="A4", orientation="portrait"):
+        """Calculate the page and content dimensions
         """
         pf = self.get_paperformat(paperformat)
 
@@ -201,15 +209,21 @@ def get_print_css(self, paperformat="A4", orientation="portrait"):
         content_height = page_height - margin_top - margin_bottom
 
         # prepare the substitution context
-        context = pf.copy()
-        context.update({
+        dimensions = pf.copy()
+        dimensions.update({
             "page_width": page_width,
             "page_height": page_height,
             "content_width": content_width,
             "content_height": content_height,
         })
+        return dimensions
 
-        return CSS.safe_substitute(context)
+    def get_print_css(self, paperformat="A4", orientation="portrait"):
+        """Returns the generated print CSS for the given format/orientation
+        """
+        dimensions = self.calculate_dimensions(
+            paperformat=paperformat, orientation=orientation)
+        return CSS.safe_substitute(dimensions)
 
     def get_paperformat(self, paperformat):
         """Return the paperformat dictionary
@@ -286,7 +300,7 @@ def get_report_template(self, template=None):
 
     def read_template(self, template, instance, **kw):
         if self.is_page_template(template):
-            template = ViewPageTemplateFile(template, **kw)(instance)
+            template = ViewPageTemplateFile(template)(instance, **kw)
         else:
             with open(template, "r") as template:
                 template = template.read()

src/senaite/impress/reportview.py

@@ -20,5 +20,5 @@ def __init__(self, *args, **kwargs):
         # needed for template rendering
         self.context = api.get_portal()
 
-    def render(self, template):
+    def render(self, template, **kw):
         raise NotImplemented("Must be implemented by subclass")

src/senaite/impress/static/js/src/publish.coffee

@@ -209,8 +209,9 @@ class PublishController extends React.Component
       if name == "template"
         # reload HTML and Preview if the template changed
         return @loadReports()
-      # reload only the Preview
-      return @loadPreview()
+      # N.B. we always render now the full reports, so that the template can
+      #      handle the changed dimensions of the paperformat and orientation
+      return @loadReports()
 
 
   isMultiReport: ->