From 135e61c68999447861133532a41fd7a5bf466231 Mon Sep 17 00:00:00 2001 From: Adri?n Bernardi Date: Thu, 31 Jan 2019 18:37:34 -0300 Subject: [PATCH] lims_instrument: "Load Results from File" wizard: validation refactoring --- lims_instrument/resultsimport.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/lims_instrument/resultsimport.py b/lims_instrument/resultsimport.py index 438750f1..052655b1 100644 --- a/lims_instrument/resultsimport.py +++ b/lims_instrument/resultsimport.py @@ -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