From 3431e8b759dbdaf40cc04b538c58decec4c08147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Bernardi?= <abernardi@kalenislims.com>
Date: Wed, 20 May 2020 18:14:41 -0300
Subject: [PATCH] lims_industry: Results Report: show precedent results

---
 lims/results_report.py                        |   6 +-
 ...ults_report_version_detail_sample_form.xml |  18 ++-
 lims_industry/__init__.py                     |   3 +
 lims_industry/locale/es.po                    |  40 ++++++
 lims_industry/notebook.py                     |   6 +-
 lims_industry/results_report.py               | 117 ++++++++++++++++++
 lims_industry/results_report.xml              |  22 ++++
 lims_industry/tryton.cfg                      |   1 +
 ...esults_report_version_detail_line_list.xml |   8 ++
 ...ults_report_version_detail_sample_form.xml |  21 ++++
 10 files changed, 225 insertions(+), 17 deletions(-)
 create mode 100644 lims_industry/results_report.py
 create mode 100644 lims_industry/results_report.xml
 create mode 100644 lims_industry/view/results_report_version_detail_line_list.xml
 create mode 100644 lims_industry/view/results_report_version_detail_sample_form.xml

diff --git a/lims/results_report.py b/lims/results_report.py
index 215eeeca..b0e1a8f6 100644
--- a/lims/results_report.py
+++ b/lims/results_report.py
@@ -875,7 +875,7 @@ class ResultsReportVersionDetailSample(ModelSQL, ModelView):
         result = {}
         for name in names:
             result[name] = {}
-            if name in ('product_type', 'matrix'):
+            if cls._fields[name]._type == 'many2one':
                 for s in samples:
                     field = getattr(s.notebook, name, None)
                     result[name][s.id] = field.id if field else None
@@ -994,9 +994,7 @@ class ResultsReportVersionDetailLine(ModelSQL, ModelView):
         result = {}
         for name in names:
             result[name] = {}
-            if name in ('notebook', 'party', 'analysis', 'laboratory',
-                    'method', 'device', 'initial_unit', 'final_unit',
-                    'product_type', 'matrix'):
+            if cls._fields[name]._type == 'many2one':
                 for d in details:
                     field = getattr(d.notebook_line, name, None)
                     result[name][d.id] = field.id if field else None
diff --git a/lims/view/results_report_version_detail_sample_form.xml b/lims/view/results_report_version_detail_sample_form.xml
index cd6d8bac..8114e7c8 100644
--- a/lims/view/results_report_version_detail_sample_form.xml
+++ b/lims/view/results_report_version_detail_sample_form.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0"?>
-<form>
-    <group id="notebook" colspan="4" col="6">
-        <label name="notebook"/>
-        <field name="notebook"/>
-        <label name="product_type"/>
-        <field name="product_type"/>
-        <label name="matrix"/>
-        <field name="matrix"/>
-    </group>
-    <notebook>
+<form col="6">
+    <label name="notebook"/>
+    <field name="notebook"/>
+    <label name="product_type"/>
+    <field name="product_type"/>
+    <label name="matrix"/>
+    <field name="matrix"/>
+    <notebook colspan="6">
         <page id="lines" string="Lines">
             <field name="notebook_lines"/>
         </page>
diff --git a/lims_industry/__init__.py b/lims_industry/__init__.py
index 77fcf1f4..03ad0cf2 100644
--- a/lims_industry/__init__.py
+++ b/lims_industry/__init__.py
@@ -7,6 +7,7 @@ from . import industry
 from . import analysis
 from . import sample
 from . import notebook
+from . import results_report
 from . import party
 from . import task
 
@@ -34,6 +35,8 @@ def register():
         sample.CreateSampleStart,
         sample.EditSampleStart,
         notebook.Notebook,
+        results_report.ResultsReportVersionDetailSample,
+        results_report.ResultsReportVersionDetailLine,
         party.Party,
         party.Address,
         task.AdministrativeTaskTemplate,
diff --git a/lims_industry/locale/es.po b/lims_industry/locale/es.po
index fede5e08..ff00c183 100644
--- a/lims_industry/locale/es.po
+++ b/lims_industry/locale/es.po
@@ -334,6 +334,42 @@ msgctxt "field:lims.product.type,attribute_set:"
 msgid "Attribute Set"
 msgstr "Conjunto de atributos"
 
+msgctxt "field:lims.results_report.version.detail.line,precedent1_result:"
+msgid "Precedent 1"
+msgstr "Antecedente 1"
+
+msgctxt "field:lims.results_report.version.detail.line,precedent2_result:"
+msgid "Precedent 2"
+msgstr "Antecedente 2"
+
+msgctxt "field:lims.results_report.version.detail.line,precedent3_result:"
+msgid "Precedent 3"
+msgstr "Antecedente 3"
+
+msgctxt "field:lims.results_report.version.detail.sample,component:"
+msgid "Component"
+msgstr "Componente"
+
+msgctxt "field:lims.results_report.version.detail.sample,equipment:"
+msgid "Equipment"
+msgstr "Equipo"
+
+msgctxt "field:lims.results_report.version.detail.sample,plant:"
+msgid "Plant"
+msgstr "Planta"
+
+msgctxt "field:lims.results_report.version.detail.sample,precedent1:"
+msgid "Precedent 1"
+msgstr "Antecedente 1"
+
+msgctxt "field:lims.results_report.version.detail.sample,precedent2:"
+msgid "Precedent 2"
+msgstr "Antecedente 2"
+
+msgctxt "field:lims.results_report.version.detail.sample,precedent3:"
+msgid "Precedent 3"
+msgstr "Antecedente 3"
+
 msgctxt "field:lims.sample,attributes_domain:"
 msgid "Attributes domain"
 msgstr "Dominio para Atributos"
@@ -826,6 +862,10 @@ msgctxt "view:lims.plant:"
 msgid "General"
 msgstr "General"
 
+msgctxt "view:lims.results_report.version.detail.sample:"
+msgid "Precedents"
+msgstr "Antecedentes"
+
 msgctxt "view:lims.sample:"
 msgid "Industry"
 msgstr "Industria"
diff --git a/lims_industry/notebook.py b/lims_industry/notebook.py
index 5311aca9..e5b9161b 100644
--- a/lims_industry/notebook.py
+++ b/lims_industry/notebook.py
@@ -12,8 +12,8 @@ class Notebook(metaclass=PoolMeta):
     __name__ = 'lims.notebook'
 
     plant = fields.Function(fields.Many2One('lims.plant', 'Plant'),
-        'get_sample_field')
+        'get_sample_field', searcher='search_sample_field')
     equipment = fields.Function(fields.Many2One('lims.equipment', 'Equipment'),
-        'get_sample_field')
+        'get_sample_field', searcher='search_sample_field')
     component = fields.Function(fields.Many2One('lims.component', 'Component'),
-        'get_sample_field')
+        'get_sample_field', searcher='search_sample_field')
diff --git a/lims_industry/results_report.py b/lims_industry/results_report.py
new file mode 100644
index 00000000..5420df53
--- /dev/null
+++ b/lims_industry/results_report.py
@@ -0,0 +1,117 @@
+# This file is part of lims_industry module for Tryton.
+# The COPYRIGHT file at the top level of this repository contains
+# the full copyright notices and license terms.
+
+from trytond.model import fields
+from trytond.pool import Pool, PoolMeta
+from trytond.pyson import Eval
+from trytond.i18n import gettext
+
+__all__ = ['ResultsReportVersionDetailSample',
+    'ResultsReportVersionDetailLine']
+
+
+class ResultsReportVersionDetailSample(metaclass=PoolMeta):
+    __name__ = 'lims.results_report.version.detail.sample'
+
+    plant = fields.Function(fields.Many2One('lims.plant', 'Plant'),
+        'get_notebook_field')
+    equipment = fields.Function(fields.Many2One('lims.equipment', 'Equipment'),
+        'get_notebook_field')
+    component = fields.Function(fields.Many2One('lims.component', 'Component'),
+        'get_notebook_field')
+    precedent1 = fields.Many2One('lims.notebook', 'Precedent 1',
+        domain=[('component', '=', Eval('component'))],
+        depends=['component'])
+    precedent2 = fields.Many2One('lims.notebook', 'Precedent 2',
+        domain=[('component', '=', Eval('component'))],
+        depends=['component'])
+    precedent3 = fields.Many2One('lims.notebook', 'Precedent 3',
+        domain=[('component', '=', Eval('component'))],
+        depends=['component'])
+
+
+class ResultsReportVersionDetailLine(metaclass=PoolMeta):
+    __name__ = 'lims.results_report.version.detail.line'
+
+    precedent1_result = fields.Function(fields.Char('Precedent 1'),
+        'get_precedent_result')
+    precedent2_result = fields.Function(fields.Char('Precedent 2'),
+        'get_precedent_result')
+    precedent3_result = fields.Function(fields.Char('Precedent 3'),
+        'get_precedent_result')
+
+    @classmethod
+    def get_precedent_result(cls, details, names):
+        result = {}
+        for name in names:
+            result[name] = {}
+            if name == 'precedent1_result':
+                for d in details:
+                    result[name][d.id] = cls._get_precedent_result(
+                        d.detail_sample.precedent1, d)
+            elif name == 'precedent2_result':
+                for d in details:
+                    result[name][d.id] = cls._get_precedent_result(
+                        d.detail_sample.precedent2, d)
+            else:  # name == 'precedent3_result':
+                for d in details:
+                    result[name][d.id] = cls._get_precedent_result(
+                        d.detail_sample.precedent3, d)
+        return result
+
+    @classmethod
+    def _get_precedent_result(cls, precedent, line):
+        pool = Pool()
+        NotebookLine = pool.get('lims.notebook.line')
+
+        if not precedent:
+            return None
+        precedent_line = NotebookLine.search([
+            ('notebook', '=', precedent),
+            ('analysis', '=', line.notebook_line.analysis),
+            ('accepted', '=', True),
+            ])
+        if not precedent_line:
+            return None
+        return cls._get_result(precedent_line[0])
+
+    @classmethod
+    def _get_result(cls, notebook_line):
+        literal_result = notebook_line.literal_result
+        result = notebook_line.result
+        decimals = notebook_line.decimals
+        result_modifier = notebook_line.result_modifier
+
+        res = ''
+        if literal_result:
+            res = literal_result
+        else:
+            if result:
+                res = round(float(result), decimals)
+                if decimals == 0:
+                    res = int(res)
+            else:
+                res = ''
+
+            if result_modifier == 'eq':
+                res = res
+            elif result_modifier == 'low':
+                res = gettext('lims.msg_quantification_limit', loq=res)
+            elif result_modifier == 'd':
+                res = gettext('lims.msg_d')
+            elif result_modifier == 'nd':
+                res = gettext('lims.msg_nd')
+            elif result_modifier == 'ni':
+                res = ''
+            elif result_modifier == 'pos':
+                res = gettext('lims.msg_pos')
+            elif result_modifier == 'neg':
+                res = gettext('lims.msg_neg')
+            elif result_modifier == 'pre':
+                res = gettext('lims.msg_pre')
+            elif result_modifier == 'abs':
+                res = gettext('lims.msg_abs')
+            else:
+                res = result_modifier
+        return res
diff --git a/lims_industry/results_report.xml b/lims_industry/results_report.xml
new file mode 100644
index 00000000..7923f74c
--- /dev/null
+++ b/lims_industry/results_report.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<tryton>
+    <data>
+
+<!-- Results Report Version Detail Sample -->
+
+        <record model="ir.ui.view" id="results_report_version_detail_sample_view_form">
+            <field name="model">lims.results_report.version.detail.sample</field>
+            <field name="inherit" ref="lims.lims_results_report_version_detail_sample_view_form"/>
+            <field name="name">results_report_version_detail_sample_form</field>
+        </record>
+
+<!-- Results Report Version Detail Line -->
+
+        <record model="ir.ui.view" id="results_report_version_detail_line_view_list">
+            <field name="model">lims.results_report.version.detail.line</field>
+            <field name="inherit" ref="lims.lims_results_report_version_detail_line_view_list"/>
+            <field name="name">results_report_version_detail_line_list</field>
+        </record>
+
+    </data>
+</tryton>
diff --git a/lims_industry/tryton.cfg b/lims_industry/tryton.cfg
index 3d2a9be4..ce2eae4f 100644
--- a/lims_industry/tryton.cfg
+++ b/lims_industry/tryton.cfg
@@ -7,5 +7,6 @@ xml:
     industry.xml
     analysis.xml
     sample.xml
+    results_report.xml
     party.xml
     message.xml
diff --git a/lims_industry/view/results_report_version_detail_line_list.xml b/lims_industry/view/results_report_version_detail_line_list.xml
new file mode 100644
index 00000000..5b5bcff9
--- /dev/null
+++ b/lims_industry/view/results_report_version_detail_line_list.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/tree/field[@name='comments']" position="after">
+        <field name="precedent1_result"/>
+        <field name="precedent2_result"/>
+        <field name="precedent3_result"/>
+    </xpath>
+</data>
diff --git a/lims_industry/view/results_report_version_detail_sample_form.xml b/lims_industry/view/results_report_version_detail_sample_form.xml
new file mode 100644
index 00000000..9e768091
--- /dev/null
+++ b/lims_industry/view/results_report_version_detail_sample_form.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/field[@name='matrix']" position="after">
+        <label name="plant"/>
+        <field name="plant"/>
+        <label name="equipment"/>
+        <field name="equipment"/>
+        <label name="component"/>
+        <field name="component"/>
+    </xpath>
+    <xpath expr="/form/notebook/page[@id='lines']" position="after">
+        <page id="precedents" col="6" string="Precedents">
+            <label name="precedent1"/>
+            <field name="precedent1"/>
+            <label name="precedent2"/>
+            <field name="precedent2"/>
+            <label name="precedent3"/>
+            <field name="precedent3"/>
+        </page>
+    </xpath>
+</data>