Kalenis
/
kalenislims
mirror of https://github.com/Kalenis/kalenislims.git
2
1
Fork 1
Code Issues Projects Releases Wiki Activity

lims_instrument: "Load Results from File" wizard: validation refactoring

This commit is contained in:
Adri?n Bernardi 2019-01-31 18:37:34 -03:00
parent 43cede2430
commit 135e61c689
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lims_instrument/resultsimport.py
View File

@ -474,24 +474,25 @@ class NotebookLoadResultsFile(Wizard):
outcome = 'OK'
if line.imported_result != '-1000.0':
line.result = line.imported_result
if (line.start_date and
line.start_date <= line.imported_end_date):
line.end_date = line.imported_end_date
else:
if not line.imported_end_date:
prevent_line = True
outcome = 'End date cannot be empty'
elif (line.imported_end_date and line.start_date and
line.start_date > line.imported_end_date):
prevent_line = True
outcome = 'End date cannot be lower than Start date'
if (line.start_date and
line.start_date <= line.imported_inj_date):
line.injection_date = line.imported_inj_date
elif (line.imported_inj_date and line.start_date and
line.start_date > line.imported_inj_date):
prevent_line = True
outcome = 'Injection date cannot be lower than Start date'
elif (line.imported_end_date and line.imported_inj_date and
line.imported_inj_date > line.imported_end_date):
prevent_line = True
outcome = 'Injection date cannot be upper than End date'
else:
prevent_line = True
outcome = ('Injection date cannot be lower than '
'Start date')
if line.imported_inj_date > line.imported_end_date:
prevent_line = True
outcome = ('Injection date cannot be upper than '
'End date')
line.result = line.imported_result
line.end_date = line.imported_end_date
line.injection_date = line.imported_inj_date
else:
line.result = None