changeset 5719:1e412a2adb3c

Check both for imaging request and its context in report. Thanks, Mathias!
author Luis Falcon <falcon@gnuhealth.org>
date Tue, 04 Apr 2023 18:40:34 +0100
parents 324f7ae87cb6
children f84268489e52
files tryton/health_imaging/report/imaging_study_report.fodt
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/tryton/health_imaging/report/imaging_study_report.fodt
+++ b/tryton/health_imaging/report/imaging_study_report.fodt
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <office:document xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- <office:meta><meta:initial-creator>lfm </meta:initial-creator><meta:creation-date>2011-06-15T19:12:18</meta:creation-date><dc:date>2023-04-03T18:01:59.859179490</dc:date><meta:editing-duration>P11DT15H21M16S</meta:editing-duration><meta:editing-cycles>482</meta:editing-cycles><meta:generator>LibreOffice/7.4.4.2$FreeBSD_X86_64 LibreOffice_project/40$Build-2</meta:generator><meta:document-statistic meta:table-count="3" meta:image-count="0" meta:object-count="0" meta:page-count="1" meta:paragraph-count="37" meta:word-count="103" meta:character-count="1362" meta:non-whitespace-character-count="1286"/></office:meta>
+ <office:meta><meta:initial-creator>lfm </meta:initial-creator><meta:creation-date>2011-06-15T19:12:18</meta:creation-date><dc:date>2023-04-04T18:33:53.051208304</dc:date><meta:editing-duration>P12DT15H53M9S</meta:editing-duration><meta:editing-cycles>483</meta:editing-cycles><meta:generator>LibreOffice/7.4.4.2$FreeBSD_X86_64 LibreOffice_project/40$Build-2</meta:generator><meta:document-statistic meta:table-count="3" meta:image-count="0" meta:object-count="0" meta:page-count="1" meta:paragraph-count="37" meta:word-count="105" meta:character-count="1389" meta:non-whitespace-character-count="1311"/></office:meta>
  <office:settings>
   <config:config-item-set config:name="ooo:view-settings">
-   <config:config-item config:name="ViewAreaTop" config:type="long">212</config:config-item>
+   <config:config-item config:name="ViewAreaTop" config:type="long">7832</config:config-item>
    <config:config-item config:name="ViewAreaLeft" config:type="long">0</config:config-item>
    <config:config-item config:name="ViewAreaWidth" config:type="long">25204</config:config-item>
    <config:config-item config:name="ViewAreaHeight" config:type="long">10705</config:config-item>
@@ -13,12 +13,12 @@
    <config:config-item-map-indexed config:name="Views">
     <config:config-item-map-entry>
      <config:config-item config:name="ViewId" config:type="string">view2</config:config-item>
-     <config:config-item config:name="ViewLeft" config:type="long">18101</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">4750</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">12427</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">10052</config:config-item>
      <config:config-item config:name="VisibleLeft" config:type="long">0</config:config-item>
-     <config:config-item config:name="VisibleTop" config:type="long">212</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="long">7832</config:config-item>
      <config:config-item config:name="VisibleRight" config:type="long">25202</config:config-item>
-     <config:config-item config:name="VisibleBottom" config:type="long">10915</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">18535</config:config-item>
      <config:config-item config:name="ZoomType" config:type="short">0</config:config-item>
      <config:config-item config:name="ViewLayoutColumns" config:type="short">1</config:config-item>
      <config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item>
@@ -1394,7 +1394,7 @@
       <text:p text:style-name="P141"><text:span text:style-name="T53">Study</text:span><text:span text:style-name="T52">: </text:span><text:span text:style-name="T54"><text:placeholder text:placeholder-type="text">&lt;interpretation.requested_test.rec_name if interpretation.requested_test else &apos;&apos;&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tabla1.C2" table:number-columns-spanned="2" office:value-type="string">
-      <text:p text:style-name="P195">Context: <text:span text:style-name="T29"><text:placeholder text:placeholder-type="text">&lt;interpretation.request.context.rec_name if interpretation.request.context else &apos;&apos;&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P195">Context: <text:span text:style-name="T29"><text:placeholder text:placeholder-type="text">&lt;interpretation.request.context.rec_name if interpretation.request and interpretation.request.context else &apos;&apos;&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
      <table:covered-table-cell/>
     </table:table-row>