Display reportable interim fields as result variables in results report

docs/Changelog.rst

@@ -1,6 +1,7 @@
 2.5.0 (unreleased)
 ------------------
 
+- #141 Display reportable interim fields as result variables in results report
 - #140 Refactor report sections into separate components
 
 

src/senaite/impress/analysisrequest/reportview.py

@@ -29,6 +29,7 @@
 from bika.lims import POINTS_OF_CAPTURE
 from bika.lims import api
 from bika.lims.interfaces import IInternalUse
+from bika.lims.utils.analysis import format_interim
 from bika.lims.workflow import getTransitionDate
 from Products.CMFPlone.i18nl10n import ulocalized_time
 from Products.CMFPlone.utils import safe_unicode
@@ -358,6 +359,31 @@ def is_model(self, obj):
         """
         return ISuperModel.providedBy(obj)
 
+    def get_result_variables(self, analysis, report_only=True):
+        """Returns the result variables (aka interim fields) from the given
+        analysis, with additional attributes formatted_result and
+        formatted_unit. If report_only is True, only result variables that are
+        flagged with attribute "report" are returned.
+
+        :param analysis: Analysis' object/supermodel/brain or UID
+        :param report_only: Only result variables flagged with 'report:True'
+        :returns: List of result variable items
+        """
+        items = []
+        obj = api.get_object(analysis)
+        interim_fields = obj.getInterimFields() or []
+        for interim_field in interim_fields:
+
+            # skip interim not fields flagged with report
+            if report_only and not interim_field.get("report", False):
+                continue
+
+            # apply formatting
+            item = format_interim(interim_field)
+            items.append(item)
+
+        return items
+
 
 class SingleReportView(ReportView):
     """View for Single Reports

src/senaite/impress/analysisrequest/templates/css.pt

@@ -28,6 +28,7 @@
    .report .section-header img.logo { height: 30px; margin: 20px 0; }
    .report .barcode-hri { margin-top: -0.25em; font-size: 8pt; }
    .report .section-results .methodtitle { font-size: 85%; }
+   .report .section-results .results_interims { font-size: 85%; }
    .report .section-footer table td { border: none; }
    .report .section-footer {
      position: fixed;

src/senaite/impress/analysisrequest/templates/results.pt

@@ -1,6 +1,7 @@
 <tal:t define="collection python:view.collection;
                accredited_symbol string:★;
-               outofrange_symbol string:⚠;"
+               outofrange_symbol string:⚠;
+               global results_interims python:[]"
        i18n:domain="senaite.impress">
 
   <tal:model repeat="model collection">
@@ -66,6 +67,14 @@
                       <span tal:condition="analysis/ScientificName">
                         <span class="font-italic" tal:content="analysis/title"></span>
                       </span>
+
+                      <tal:interim_fields
+                          define="interims python:view.get_result_variables(analysis)"
+                          condition="interims">
+                        <sup tal:define="dummy python:results_interims.append(interims)"
+                             tal:content="python: len(results_interims)"/>
+                      </tal:interim_fields>
+
                       <!-- Method -->
                       <div class="text-secondary methodtitle"
                            i18n:translate=""
@@ -106,6 +115,24 @@
                     </div>
                   </td>
                 </tr>
+                <tr tal:condition="results_interims">
+                  <td colspan="3">
+                    <ul class="list-unstyled results_interims">
+                      <li tal:repeat="interims results_interims" class="mt-2">
+                        <sup tal:content="repeat/interims/number"/>
+                        <tal:interims repeat="interim interims">
+                          <tal:interim>
+                            <br tal:condition="repeat/interim/index"/>
+                            <span tal:condition="repeat/interim/index" class="pl-2"/>
+                            <span tal:content="interim/title"/>:
+                            <span tal:content="interim/formatted_value"/>
+                            <span tal:content="interim/formatted_unit"/>
+                          </tal:interim>
+                        </tal:interims>
+                      </li>
+                    </ul>
+                  </td>
+                </tr>
               </tfoot>
             </table>
           </tal:categories_in_poc>