lims_interface/lims_analysis_sheet: remove order by sequence

This commit is contained in:
Adrián Bernardi 2020-06-02 13:15:10 -03:00
parent 9c42dc7d3f
commit 157a66cb5e
4 changed files with 3 additions and 30 deletions

View File

@ -185,28 +185,6 @@ class Data(metaclass=PoolMeta):
super(Data, cls).__post_setup__()
cls._fields = NewAdapter()
@classmethod
def create(cls, vlist):
vlist = [x.copy() for x in vlist]
count = {}
for values in vlist:
if 'sequence' in values:
continue
if not values['compilation'] in count:
count[values['compilation']] = 0
count[values['compilation']] += 1
values['sequence'] = (
cls.get_last_sequence(values['compilation']) +
count[values['compilation']])
return super(Data, cls).create(vlist)
@classmethod
def get_last_sequence(cls, compilation_id):
last = cls.search([('compilation', '=', compilation_id)],
order=[('sequence', 'DESC')], limit=1)
sequence = last and last[0].sequence or 0
return sequence
def set_field(self, value, field):
cursor = Transaction().connection.cursor()
try:

View File

@ -7,7 +7,7 @@ import formulas
import schedula
from itertools import chain
from trytond.model import ModelSQL, ModelView, fields, sequence_ordered
from trytond.model import ModelSQL, ModelView, fields
from trytond.pool import Pool, PoolMeta
from trytond.transaction import Transaction
from trytond.tools import cursor_dict
@ -74,9 +74,6 @@ class Adapter:
obj = fields.Many2One('lims.interface.compilation', 'Compilation')
obj.name = 'compilation'
res['compilation'] = obj
obj = fields.Integer('Sequence')
obj.name = 'sequence'
res['sequence'] = obj
obj = fields.Many2One('lims.notebook.line', 'Notebook Line')
obj.name = 'notebook_line'
obj.readonly = True
@ -164,7 +161,7 @@ class ModelAccess(metaclass=PoolMeta):
mode)
class Data(sequence_ordered(), ModelSQL, ModelView):
class Data(ModelSQL, ModelView):
'Lims Interface Data'
__name__ = 'lims.interface.data'
@ -314,7 +311,6 @@ class Data(sequence_ordered(), ModelSQL, ModelView):
fields_names = [
'compilation',
'sequence',
'notebook_line',
]
for field in table.fields_:

View File

@ -425,7 +425,7 @@ class Interface(Workflow, ModelSQL, ModelView):
def get_tree_view(self):
fields = self._get_fields_tree_view()
xml = ('<?xml version="1.0"?>\n'
'<tree sequence="sequence" editable="bottom">\n'
'<tree editable="bottom">\n'
'%s\n'
'</tree>') % ('\n'.join(fields))
return {

View File

@ -51,7 +51,6 @@ class Table(ModelSQL, ModelView):
('create_date', fields.Timestamp),
('write_date', fields.Timestamp),
('compilation', fields.Integer),
('sequence', fields.Integer),
('notebook_line', fields.Integer),
]:
sql_type = field._sql_type