From 91c0f3239198238a615a25b17189fcae307bfbd6 Mon Sep 17 00:00:00 2001 From: Johannes Alneberg Date: Thu, 13 Jun 2024 10:50:53 +0200 Subject: [PATCH] Change the data to Data as well --- daily_read/config.py | 2 +- daily_read/daily_report.py | 4 ++-- tests/conftest.py | 2 +- tests/test_order_portal.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/daily_read/config.py b/daily_read/config.py index af9354d..d1c8c05 100644 --- a/daily_read/config.py +++ b/daily_read/config.py @@ -25,6 +25,6 @@ def __init__(self, env_file_path): 2: "Reception Control Finished", 3: "Library QC Finished", 4: "All Samples Sequenced", - 5: "All Raw data Delivered", + 5: "All Raw Data Delivered", } self.STATUS_PRIORITY_REV = {v: k for k, v in self.STATUS_PRIORITY.items()} diff --git a/daily_read/daily_report.py b/daily_read/daily_report.py index 668ef39..6955391 100644 --- a/daily_read/daily_report.py +++ b/daily_read/daily_report.py @@ -15,7 +15,7 @@ STATUS_ICONS = { - "All Raw data Delivered": "cloud-download", + "All Raw Data Delivered": "cloud-download", "All Samples Sequenced": "body-text", "Library QC Finished": "check2-all", "Reception Control Finished": "check2", @@ -23,7 +23,7 @@ } STATUS_DESCRIPTIONS = { - "All Raw data Delivered": "The data has been made available through NGIs delivery system.", + "All Raw Data Delivered": "The data has been made available through NGIs delivery system.", "All Samples Sequenced": "Sequencing (including potential resequencing) of all samples has been finished.", "Library QC Finished": "Library QC is a quality control of the sequencing library produced either by NGI or supplied by you, depending on the type of project.", "Reception Control Finished": "Reception Control consists of NGI staff measuring e.g. concentration and volume for the samples received.", diff --git a/tests/conftest.py b/tests/conftest.py index dd9246c..bf6b7b5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -26,7 +26,7 @@ "2023-06-15": ["Samples Received"], "2023-06-28": ["Reception Control Finished", "Library QC Finished"], "2023-07-28": ["All Samples Sequenced"], - "2023-07-29": ["All Raw data Delivered"], + "2023-07-29": ["All Raw Data Delivered"], }, "internal_id": "P123455", "internal_name": "D.Dummysson_23_02", diff --git a/tests/test_order_portal.py b/tests/test_order_portal.py index e776cb9..14cc3b3 100644 --- a/tests/test_order_portal.py +++ b/tests/test_order_portal.py @@ -161,7 +161,7 @@ def test_get_and_process_orders_closed(data_repo_full, mock_project_data_record, assert op.all_orders[1]["identifier"] == order_id modified_orders = op.process_orders(config_values.STATUS_PRIORITY_REV) - assert modified_orders[orderer]["delete_report_for"]["All Raw data Delivered"][0] == data_master.data[order_id] + assert modified_orders[orderer]["delete_report_for"]["All Raw Data Delivered"][0] == data_master.data[order_id] def test_get_and_process_orders_mult_reports(data_repo_full, mock_project_data_record, get_env_file_path):