lims, lims_planning_automatic: adds Simplified Automatic Planning
This commit is contained in:
Adrián Bernardi
parent
8509d76740
commit
72e40b6011
|
|
@ -18,5 +18,9 @@
|
|||
<field name="headquarters"/>
|
||||
<group col="-1" colspan="2" id="checkboxes">
|
||||
</group>
|
||||
<field name="cv_corrections" colspan="4"/>
|
||||
<notebook>
|
||||
<page name="cv_corrections">
|
||||
<field name="cv_corrections" colspan="4"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@ class Laboratory(metaclass=PoolMeta):
|
|||
__name__ = 'lims.laboratory'
|
||||
|
||||
automatic_planning = fields.Boolean('Automatic Planning')
|
||||
automatic_planning_simplified = fields.Boolean(
|
||||
'Simplified Automatic Planning')
|
||||
|
||||
|
||||
class NotebookRule(metaclass=PoolMeta):
|
||||
|
|
|
|||
|
|
@ -6,6 +6,10 @@ msgctxt "field:lims.laboratory,automatic_planning:"
|
|||
msgid "Automatic Planning"
|
||||
msgstr "Planificación Automática"
|
||||
|
||||
msgctxt "field:lims.laboratory,automatic_planning_simplified:"
|
||||
msgid "Simplified Automatic Planning"
|
||||
msgstr "Planificación Automática Simplificada"
|
||||
|
||||
msgctxt "field:lims.planification,automatic:"
|
||||
msgid "Automatic"
|
||||
msgstr "Automática"
|
||||
|
|
|
|||
|
|
@ -67,6 +67,10 @@ class Planification(metaclass=PoolMeta):
|
|||
laboratories = Laboratory.search([('automatic_planning', '=', True)])
|
||||
for laboratory in laboratories:
|
||||
|
||||
if laboratory.automatic_planning_simplified:
|
||||
cls.automatic_plan_simplified(laboratory, entries, tests)
|
||||
continue
|
||||
|
||||
clause = [
|
||||
('laboratory', '=', laboratory),
|
||||
('plannable', '=', True),
|
||||
|
|
@ -100,3 +104,109 @@ class Planification(metaclass=PoolMeta):
|
|||
res.append(planification)
|
||||
|
||||
return res
|
||||
|
||||
@classmethod
|
||||
def automatic_plan_simplified(cls, laboratory, entries=None, tests=None):
|
||||
cursor = Transaction().connection.cursor()
|
||||
pool = Pool()
|
||||
NotebookLine = pool.get('lims.notebook.line')
|
||||
Notebook = pool.get('lims.notebook')
|
||||
Fraction = pool.get('lims.fraction')
|
||||
Sample = pool.get('lims.sample')
|
||||
EntryDetailAnalysis = pool.get('lims.entry.detail.analysis')
|
||||
Analysis = pool.get('lims.analysis')
|
||||
Date = pool.get('ir.date')
|
||||
NotebookLineProfessional = pool.get(
|
||||
'lims.notebook.line-laboratory.professional')
|
||||
try:
|
||||
AnalysisSheet = pool.get('lims.analysis_sheet')
|
||||
except KeyError:
|
||||
analysis_sheet_activated = False
|
||||
else:
|
||||
analysis_sheet_activated = True
|
||||
|
||||
sql_select = 'SELECT nl.id, ad.id '
|
||||
sql_from = (
|
||||
'FROM "' + NotebookLine._table + '" nl '
|
||||
'INNER JOIN "' + Analysis._table + '" an '
|
||||
'ON an.id = nl.analysis '
|
||||
'INNER JOIN "' + EntryDetailAnalysis._table + '" ad '
|
||||
'ON ad.id = nl.analysis_detail '
|
||||
'INNER JOIN "' + Notebook._table + '" nb '
|
||||
'ON nb.id = nl.notebook '
|
||||
'INNER JOIN "' + Fraction._table + '" fr '
|
||||
'ON fr.id = nb.fraction '
|
||||
'INNER JOIN "' + Sample._table + '" sa '
|
||||
'ON sa.id = fr.sample ')
|
||||
sql_where = (
|
||||
'WHERE ad.plannable = TRUE '
|
||||
'AND nl.start_date IS NULL '
|
||||
'AND nl.annulled = FALSE '
|
||||
'AND nl.laboratory = %s '
|
||||
'AND an.behavior != \'internal_relation\' ')
|
||||
|
||||
if entries:
|
||||
sql_where += 'AND sa.entry IN (%s) ' % ', '.join(
|
||||
str(e.id) for e in entries)
|
||||
if tests:
|
||||
sql_where += 'AND fr.sample IN (%s) ' % ', '.join(
|
||||
str(t.sample.id) for t in tests)
|
||||
|
||||
sql_order = 'ORDER BY nb.fraction ASC'
|
||||
|
||||
with Transaction().set_user(0):
|
||||
cursor.execute(sql_select + sql_from + sql_where + sql_order,
|
||||
(laboratory.id,))
|
||||
res = cursor.fetchall()
|
||||
if not res:
|
||||
return
|
||||
|
||||
notebook_lines, detail_analyses = set(), set()
|
||||
for x in res:
|
||||
notebook_lines.add(x[0])
|
||||
detail_analyses.add(x[1])
|
||||
|
||||
lines = NotebookLine.browse(list(notebook_lines))
|
||||
details = EntryDetailAnalysis.browse(list(detail_analyses))
|
||||
|
||||
start_date = Date.today()
|
||||
professional_id = laboratory.default_laboratory_professional.id
|
||||
|
||||
NotebookLine.write(lines, {'start_date': start_date})
|
||||
|
||||
EntryDetailAnalysis.write(details, {'state': 'planned'})
|
||||
|
||||
notebook_lines_ids = ', '.join(str(nl_id) for nl_id in notebook_lines)
|
||||
cursor.execute('DELETE FROM "' +
|
||||
NotebookLineProfessional._table + '" '
|
||||
'WHERE notebook_line IN (' + notebook_lines_ids + ')')
|
||||
NotebookLineProfessional.create([{
|
||||
'notebook_line': nl_id,
|
||||
'professional': professional_id,
|
||||
} for nl_id in notebook_lines])
|
||||
|
||||
if analysis_sheet_activated:
|
||||
|
||||
date_time = datetime.combine(start_date, datetime.now().time())
|
||||
|
||||
analysis_sheets = {}
|
||||
for nl in lines:
|
||||
template_id = nl.get_analysis_sheet_template()
|
||||
if not template_id:
|
||||
continue
|
||||
key = (template_id, professional_id)
|
||||
if key not in analysis_sheets:
|
||||
analysis_sheets[key] = []
|
||||
analysis_sheets[key].append(nl)
|
||||
|
||||
for key, values in analysis_sheets.items():
|
||||
sheet = AnalysisSheet()
|
||||
sheet.template = key[0]
|
||||
sheet.compilation = sheet.get_new_compilation(
|
||||
{'date_time': date_time})
|
||||
sheet.professional = key[1]
|
||||
sheet.laboratory = laboratory.id
|
||||
sheet.save()
|
||||
sheet.create_lines(values)
|
||||
|
||||
return res
|
||||
|
|
|
|||
|
|
@ -4,4 +4,10 @@
|
|||
<label name="automatic_planning"/>
|
||||
<field name="automatic_planning"/>
|
||||
</xpath>
|
||||
<xpath expr="/form/notebook" position="inside">
|
||||
<page name="automatic_planning">
|
||||
<label name="automatic_planning_simplified"/>
|
||||
<field name="automatic_planning_simplified"/>
|
||||
</page>
|
||||
</xpath>
|
||||
</data>
|
||||
|
|
|
|||
Loading…
Reference in New Issue