Kalenis/kalenislims
2
1
Fork 1
mirror of https://github.com/Kalenis/kalenislims.git synced 2023-12-14 07:13:04 +01:00
Code Issues Projects Releases Wiki Activity

lims: services unplanned spreedsheet: code refactoring

Browse source
This commit is contained in:
Adrián Bernardi 2021-08-13 10:56:08 -03:00
parent 704957e5ba
commit 8c8b9a1da6
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lims/planification.py
View file

@ -6465,21 +6465,7 @@ class PendingServicesUnplannedSpreadsheet(Report):
else:
labs = [l.id for l in Laboratory.search([])]
clause = [
('plannable', '=', True),
('state', '=', 'unplanned'),
('analysis.behavior', '!=', 'internal_relation'),
('service.fraction.confirmed', '=', True),
]
if data['start_date']:
clause.append(
('service.confirmation_date', '>=', data['start_date']))
if data['end_date']:
clause.append(
('service.confirmation_date', '<=', data['end_date']))
if data['party']:
clause.append(('party', '=', data['party']))
clause = cls._get_details_clause(data)
objects = {}
with Transaction().set_user(0):
details = EntryDetailAnalysis.search(clause)
@ -6571,6 +6557,24 @@ class PendingServicesUnplannedSpreadsheet(Report):
report_context['objects'] = objects
return report_context
@classmethod
def _get_details_clause(cls, data):
clause = [
('plannable', '=', True),
('state', '=', 'unplanned'),
('analysis.behavior', '!=', 'internal_relation'),
('service.fraction.confirmed', '=', True),
]
if data['start_date']:
clause.append(
('service.confirmation_date', '>=', data['start_date']))
if data['end_date']:
clause.append(
('service.confirmation_date', '<=', data['end_date']))
if data['party']:
clause.append(('party', '=', data['party']))
return clause
@classmethod
def _get_estimated_waiting(cls, detail_id):
cursor = Transaction().connection.cursor()