Increment 180510 (#10)

* Add Case section with OnsetDate and Symptoms in Results report (#9)
senaite · May 10, 2018 · df7a487 · df7a487
1 parent 0426274
commit df7a487
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -6,6 +6,7 @@ Changelog
 
 **CARPHA**
 
+- CAR #9 Add Onset Date and Symptoms in AR report
 - CAR #7 Add CARPHA Logo (banner + reports)
 - CAR #6 Hide menstrual status widget in Case's Add/Edit view
 - CAR #5 Display Diseases in Provisional Diagnosis widget, without ICD defaults

diff --git a/bika/health/browser/analysisrequest/templates/reports/default.css b/bika/health/browser/analysisrequest/templates/reports/default.css
@@ -79,18 +79,21 @@
 #report #section-summary table tr td,
 #report #section-patient table tr td,
 #report #section-sample table tr td,
+#report #section-batch table tr td,
 #report #section-results table tr td,
 #report #section-qcresults table tr td {
     padding-left:5px;
 }
 #report #section-summary tr td,
+#report #section-batch table tr td,
 #report #section-patient table tr td,
 #report #section-sample table tr td {
     border-left-width: 0px;
     border-bottom:1px solid #ccc;
 }
 #report #section-summary tr td.label,
 #report #section-patient table tr td.label,
+#report #section-batch table tr td.label,
 #report #section-sample table tr td.label {
     width:60mm;
 }

diff --git a/bika/health/browser/analysisrequest/templates/reports/default.pt b/bika/health/browser/analysisrequest/templates/reports/default.pt
@@ -158,6 +158,10 @@
                 <span tal:condition="python:patient and patient.getBirthDateEstimated() or ''">(estimated)</span>
             </td>
         </tr>
+        <tr>
+            <td class="label" i18n:translate="">Sample Received</td>
+            <td tal:content="python:view.ulocalized_time(ar_obj.getDateReceived(), long_format=1)"></td>
+        </tr>
         <tr tal:define="pids python:patient and patient.getPatientIdentifiers() or []"
             tal:condition="pids">
             <td class="label" i18n:translate="">Patient Identifiers</td>
@@ -210,7 +214,30 @@
         </tr>
     </table>
 </div>
-
+<div id="section-batch" tal:condition="python:batch_obj">
+    <h1 i18n:translate="">Case information</h1>
+    <table>
+    <tal:onset_date define="value python: batch_obj.getField('OnsetDate') or None;
+                            value python: value and value.get(batch_obj) or None;
+                            value python: value and view.ulocalized_time(value, long_format=0) or None;"
+                    condition="value">
+        <tr>
+            <td class="label" i18n:translate="">Onset Date</td>
+            <td tal:content="value"></td>
+        </tr>
+    </tal:onset_date>
+    <tal:symptoms define="value python: batch_obj.getField('Symptoms') or None;
+                          value python: value and value.get(batch_obj) or list();
+                          value python: list(set([sym.get('Title','') for sym in value]));
+                          value python: ', '.join(value);"
+                    condition="value">
+        <tr>
+            <td class="label" i18n:translate="">Symptoms</td>
+            <td tal:content="value"></td>
+        </tr>
+    </tal:symptoms>
+    </table>
+</div>
 <!-- Sample Information section -->
 <div id="section-sample">
     <h1 i18n:translate="">Sample Information</h1>