Display custom comment for out of range results (senaite#142)

* Show range comment in results report * Better styling * Better text styling (2) * Changelog
nepaliemr · Sep 1, 2023 · 157d12a · 157d12a
1 parent f428c74
commit 157d12a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -1,6 +1,7 @@
 2.5.0 (unreleased)
 ------------------
 
+- #142 Display custom comment for out of range results
 - #141 Display reportable interim fields as result variables in results report
 - #140 Refactor report sections into separate components
 

diff --git a/src/senaite/impress/analysisrequest/templates/results.pt b/src/senaite/impress/analysisrequest/templates/results.pt
@@ -47,7 +47,7 @@
                     <span i18n:translate="">Range</span>
                   </th>
                   <th class="outofrange">
-                    <span i18n:translate=""></span>
+                    <span/>
                   </th>
                 </tr>
               </thead>
@@ -93,14 +93,26 @@
                       <span tal:content="python:'(RT)' if model.is_retest(analysis) else ''"></span>
                       <span tal:content="python:model.get_formatted_specs(analysis)">50 - 60</span>
                     </td>
-                    <td class="text-center align-middle">
-                      <span tal:condition="python:model.is_out_of_range(analysis)"
-                            class="font-weight-light">
-                        <span class="outofrange text-danger"
+
+                    <!-- Out of range column -->
+                    <td class="text-center align-middle"
+                        tal:define="out_of_range  python: model.is_out_of_range(analysis);
+                                    results_range python: analysis.getResultsRange();
+                                    comment       python: results_range.get('rangecomment');">
+                      <tal:out_of_range condition="out_of_range">
+
+                        <!-- Out of range symbol -->
+                        <span class="font-weight-light outofrange text-danger"
                               style="font-family:Lucida Console, Courier, monospace;"
                               tal:content="outofrange_symbol">
                         </span>
-                      </span>
+
+                        <!-- Out-of-range comment -->
+                        <span class="text-danger small"
+                              tal:condition="comment" tal:content="comment"/>
+
+                      </tal:out_of_range>
+
                     </td>
                   </tr>
                 </tal:analyses>