lims_analysis_sheet: Data: add wizard to verify results

This commit is contained in:
Adrián Bernardi 2020-03-24 17:50:45 -03:00
parent f0ac17a224
commit d3951c7d9a
4 changed files with 47 additions and 6 deletions

View file

@ -50,6 +50,7 @@ def register():
notebook.InternalRelationsCalc,
notebook.LineInternalRelationsCalc,
notebook.ResultsVerification,
notebook.LineResultsVerification,
notebook.EvaluateRules,
module='lims_analysis_sheet', type_='wizard')
Pool.register(

View file

@ -292,6 +292,10 @@ msgctxt "model:ir.action,name:wiz_analysis_sheet_data_repeat_analysis"
msgid "Repeat Analysis"
msgstr "02) Repetir análisis"
msgctxt "model:ir.action,name:wiz_analysis_sheet_data_results_verification"
msgid "Results Verification"
msgstr "04) Verificación de resultados"
msgctxt "model:ir.action,name:wiz_analysis_sheet_evaluate_rules"
msgid "Evaluate Rules"
msgstr "05) Evaluar Reglas de cuaderno"
@ -824,6 +828,16 @@ msgctxt "wizard_button:lims.analysis_sheet_data.repeat_analysis,start,repeat:"
msgid "Repeat"
msgstr "Repetir"
msgctxt ""
"wizard_button:lims.analysis_sheet_data.results_verification,start,end:"
msgid "Cancel"
msgstr "Cancelar"
msgctxt ""
"wizard_button:lims.analysis_sheet_data.results_verification,start,verify:"
msgid "Ok"
msgstr "Aceptar"
msgctxt "wizard_button:lims.planification.search_analysis_sheet,next,add:"
msgid "Add"
msgstr "Añadir"

View file

@ -16,7 +16,8 @@ from trytond.modules.lims.formula_parser import FormulaParser
__all__ = ['NotebookLine', 'AddControlStart', 'AddControl', 'LineAddControl',
'RepeatAnalysisStart', 'RepeatAnalysisStartLine', 'RepeatAnalysis',
'LineRepeatAnalysis', 'InternalRelationsCalc', 'LineInternalRelationsCalc',
'ResultsVerificationStart', 'ResultsVerification', 'EvaluateRules']
'ResultsVerificationStart', 'ResultsVerification',
'LineResultsVerification', 'EvaluateRules']
class NotebookLine(metaclass=PoolMeta):
@ -913,11 +914,13 @@ class ResultsVerification(Wizard):
])
verify = StateTransition()
def transition_check(self):
pool = Pool()
AnalysisSheet = pool.get('lims.analysis_sheet')
def _get_analysis_sheet_id(self):
return Transaction().context['active_id']
sheet_id = Transaction().context['active_id']
def transition_check(self):
AnalysisSheet = Pool().get('lims.analysis_sheet')
sheet_id = self._get_analysis_sheet_id()
sheet = AnalysisSheet(sheet_id)
if sheet.state in ('active', 'validated'):
@ -943,7 +946,7 @@ class ResultsVerification(Wizard):
Field = pool.get('lims.interface.table.field')
Data = pool.get('lims.interface.data')
sheet_id = Transaction().context['active_id']
sheet_id = self._get_analysis_sheet_id()
sheet = AnalysisSheet(sheet_id)
nl_result_field, = ModelField.search([
@ -1107,6 +1110,17 @@ class ResultsVerification(Wizard):
return gettext('lims.msg_out')
class LineResultsVerification(ResultsVerification):
'Results Verification'
__name__ = 'lims.analysis_sheet_data.results_verification'
def _get_analysis_sheet_id(self):
return Transaction().context['lims_analysis_sheet']
def end(self):
return 'reload'
class EvaluateRules(Wizard):
'Evaluate Rules'
__name__ = 'lims.analysis_sheet.evaluate_rules'

View file

@ -120,6 +120,18 @@
<field name="action" ref="wiz_analysis_sheet_results_verification"/>
</record>
<!-- Wizard Results Verification (from Data) -->
<record model="ir.action.wizard" id="wiz_analysis_sheet_data_results_verification">
<field name="name">Results Verification</field>
<field name="wiz_name">lims.analysis_sheet_data.results_verification</field>
</record>
<record model="ir.action.keyword" id="wiz_analysis_sheet_data_results_verification_keyword">
<field name="keyword">form_action</field>
<field name="model">lims.interface.data,-1</field>
<field name="action" ref="wiz_analysis_sheet_data_results_verification"/>
</record>
<!-- Wizard Evaluate Rules -->
<record model="ir.action.wizard" id="wiz_analysis_sheet_evaluate_rules">