diff --git a/docs/AdverseReactionReportsChartView.js b/docs/AdverseReactionReportsChartView.js index 84e0a676af9..59d027ec5d8 100644 --- a/docs/AdverseReactionReportsChartView.js +++ b/docs/AdverseReactionReportsChartView.js @@ -32,7 +32,7 @@ class AdverseReactionReportsChartView { labels: [ 'Deaths', 'Disabilities', - 'Life Threatening Illnesses', + 'Life-Threatening Illnesses', 'Hospitalizations', 'Other Adverse Events' ], @@ -42,9 +42,9 @@ class AdverseReactionReportsChartView { data: [ ADRDescr['Deaths'], ADRDescr['Disabilities'], - ADRDescr['Life Threatening Illnesses'], + ADRDescr['Life-Threatening Illnesses'], ADRDescr['Hospitalizations'], - ADRDescr['Adverse Reaction Reports'] - (ADRDescr['Deaths'] + ADRDescr['Disabilities'] + ADRDescr['Life Threatening Illnesses'] + ADRDescr['Hospitalizations']) + ADRDescr['Adverse Reaction Reports'] - (ADRDescr['Deaths'] + ADRDescr['Disabilities'] + ADRDescr['Life-Threatening Illnesses'] + ADRDescr['Hospitalizations']) ], backgroundColor: '#1a73e8' }] diff --git a/docs/BatchCodeTableInitializer.js b/docs/BatchCodeTableInitializer.js index 6348592a217..2df5161221e 100644 --- a/docs/BatchCodeTableInitializer.js +++ b/docs/BatchCodeTableInitializer.js @@ -49,7 +49,7 @@ class BatchCodeTableInitializer { this.#getColumnIndex('Adverse Reaction Reports'), this.#getColumnIndex('Deaths'), this.#getColumnIndex('Disabilities'), - this.#getColumnIndex('Life Threatening Illnesses'), + this.#getColumnIndex('Life-Threatening Illnesses'), this.#getColumnIndex('Hospitalizations'), this.#getColumnIndex('Severe reports'), this.#getColumnIndex('Lethality') @@ -108,7 +108,7 @@ class BatchCodeTableInitializer { return 2; case 'Disabilities': return 3; - case 'Life Threatening Illnesses': + case 'Life-Threatening Illnesses': return 4; case 'Hospitalizations': return 5; diff --git a/docs/batchCodes.html b/docs/batchCodes.html index 50597e6b3e6..fbe9cab3099 100644 --- a/docs/batchCodes.html +++ b/docs/batchCodes.html @@ -57,7 +57,7 @@ Adverse Reaction Reports Deaths Disabilities - Life Threatening Illnesses + Life-Threatening Illnesses Hospitalizations Company Severe reports diff --git a/src/BatchCodeTableFactory.py b/src/BatchCodeTableFactory.py index c438e14a8ac..98cabf9ced6 100644 --- a/src/BatchCodeTableFactory.py +++ b/src/BatchCodeTableFactory.py @@ -20,7 +20,7 @@ class BatchCodeTableFactory: 'Adverse Reaction Reports', 'Deaths', 'Disabilities', - 'Life Threatening Illnesses', + 'Life-Threatening Illnesses', 'Hospitalizations', 'Company', 'Severe reports', diff --git a/src/BatchCodeTableFactoryTest.py b/src/BatchCodeTableFactoryTest.py index 65b42fbd41a..0e4eff2af76 100644 --- a/src/BatchCodeTableFactoryTest.py +++ b/src/BatchCodeTableFactoryTest.py @@ -28,9 +28,9 @@ class BatchCodeTableFactoryTest(unittest.TestCase): # Then assert_frame_equal( - batchCodeTable[['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life Threatening Illnesses', 'Hospitalizations', 'Company', 'Severe reports', 'Lethality']], + batchCodeTable[['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life-Threatening Illnesses', 'Hospitalizations', 'Company', 'Severe reports', 'Lethality']], TestHelper.createDataFrame( - columns = ['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life Threatening Illnesses', 'Hospitalizations', 'Company', 'Severe reports', 'Lethality'], + columns = ['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life-Threatening Illnesses', 'Hospitalizations', 'Company', 'Severe reports', 'Lethality'], data = [ [2, 1, 2, 2, 0, 'MODERNA', 2/2 * 100, 1/2 * 100], [1, 0, 0, 0, 1, 'MODERNA', 0/1 * 100, 0/1 * 100]], index = pd.Index( @@ -62,9 +62,9 @@ class BatchCodeTableFactoryTest(unittest.TestCase): # Then assert_frame_equal( - batchCodeTable[['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life Threatening Illnesses', 'Hospitalizations', 'Company', 'Severe reports', 'Lethality']], + batchCodeTable[['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life-Threatening Illnesses', 'Hospitalizations', 'Company', 'Severe reports', 'Lethality']], TestHelper.createDataFrame( - columns = ['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life Threatening Illnesses', 'Hospitalizations', 'Company', 'Severe reports', 'Lethality'], + columns = ['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life-Threatening Illnesses', 'Hospitalizations', 'Company', 'Severe reports', 'Lethality'], data = [ [1, 1, 0, 0, 0, 'PFIZER\BIONTECH', 1/1 * 100, 1/1 * 100], [2, 1, 2, 2, 2, 'MODERNA', 2/2 * 100, 1/2 * 100], [1, 0, 0, 0, 0, 'MODERNA', 0/1 * 100, 0/1 * 100]], @@ -98,9 +98,9 @@ class BatchCodeTableFactoryTest(unittest.TestCase): # Then assert_frame_equal( - batchCodeTable[['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life Threatening Illnesses', 'Hospitalizations', 'Company', 'Severe reports', 'Lethality']], + batchCodeTable[['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life-Threatening Illnesses', 'Hospitalizations', 'Company', 'Severe reports', 'Lethality']], TestHelper.createDataFrame( - columns = ['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life Threatening Illnesses', 'Hospitalizations', 'Company', 'Severe reports', 'Lethality'], + columns = ['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life-Threatening Illnesses', 'Hospitalizations', 'Company', 'Severe reports', 'Lethality'], data = [ ], index = pd.Index([], name = 'VAX_LOT')), check_dtype = False) diff --git a/src/BatchCodeTableIntoHistogramDescriptionTableMerger.py b/src/BatchCodeTableIntoHistogramDescriptionTableMerger.py index ada8a6b8cf7..50eb8f09662 100644 --- a/src/BatchCodeTableIntoHistogramDescriptionTableMerger.py +++ b/src/BatchCodeTableIntoHistogramDescriptionTableMerger.py @@ -27,7 +27,7 @@ class BatchCodeTableIntoHistogramDescriptionTableMerger: 'Adverse Reaction Reports', 'Deaths', 'Disabilities', - 'Life Threatening Illnesses', + 'Life-Threatening Illnesses', 'Hospitalizations', 'Company' ]] diff --git a/src/BatchCodeTableIntoHistogramDescriptionTableMergerTest.py b/src/BatchCodeTableIntoHistogramDescriptionTableMergerTest.py index f53b3f2ba8e..767c7d7e7c7 100644 --- a/src/BatchCodeTableIntoHistogramDescriptionTableMergerTest.py +++ b/src/BatchCodeTableIntoHistogramDescriptionTableMergerTest.py @@ -33,7 +33,7 @@ class BatchCodeTableIntoHistogramDescriptionTableMergerTest(unittest.TestCase): data = ['1808982'])) batchCodeTable = TestHelper.createDataFrame( - columns = ['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life Threatening Illnesses', 'Hospitalizations', 'Company', 'Severe reports', 'Lethality'], + columns = ['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life-Threatening Illnesses', 'Hospitalizations', 'Company', 'Severe reports', 'Lethality'], data = [ [2, 1, 2, 2, 3, 'MODERNA', 2/2 * 100, np.nan]], index = pd.Index( name = 'VAX_LOT', @@ -53,7 +53,7 @@ class BatchCodeTableIntoHistogramDescriptionTableMergerTest(unittest.TestCase): 'Adverse Reaction Reports': 2, 'Deaths': 1, 'Disabilities': 2, - 'Life Threatening Illnesses': 2, + 'Life-Threatening Illnesses': 2, 'Hospitalizations': 3, 'Company': 'MODERNA', 'histograms': [ diff --git a/src/BatchCodeTablePersister.py b/src/BatchCodeTablePersister.py index 69fd74d0b71..1a45d214afb 100644 --- a/src/BatchCodeTablePersister.py +++ b/src/BatchCodeTablePersister.py @@ -16,7 +16,7 @@ def createGlobalBatchCodeTable(deleteEntriesWithADRsLessThanOrEqual, minADRsForL 'Adverse Reaction Reports', 'Deaths', 'Disabilities', - 'Life Threatening Illnesses', + 'Life-Threatening Illnesses', 'Hospitalizations', 'Company', 'Severe reports', diff --git a/src/SummationTableFactory.py b/src/SummationTableFactory.py index 77df286f3d4..f53fc0e5f26 100644 --- a/src/SummationTableFactory.py +++ b/src/SummationTableFactory.py @@ -8,7 +8,7 @@ class SummationTableFactory: **{ 'Deaths': pd.NamedAgg(column = 'DIED', aggfunc = 'sum'), 'Adverse Reaction Reports': pd.NamedAgg(column = 'DIED', aggfunc = 'size'), - 'Life Threatening Illnesses': pd.NamedAgg(column = 'L_THREAT', aggfunc = 'sum'), + 'Life-Threatening Illnesses': pd.NamedAgg(column = 'L_THREAT', aggfunc = 'sum'), 'Hospitalizations': pd.NamedAgg(column = 'HOSPITAL', aggfunc = 'sum'), 'Disabilities': pd.NamedAgg(column = 'DISABLE', aggfunc = 'sum'), 'Severities': pd.NamedAgg(column = 'SEVERE', aggfunc = 'sum') @@ -20,7 +20,7 @@ class SummationTableFactory: 'Adverse Reaction Reports', 'Deaths', 'Disabilities', - 'Life Threatening Illnesses', + 'Life-Threatening Illnesses', 'Hospitalizations', 'Severe reports', 'Lethality'