diff --git a/docs/AdverseReactionReportsChartView.js b/docs/AdverseReactionReportsChartView.js
index ece06047a5a..84e0a676af9 100644
--- a/docs/AdverseReactionReportsChartView.js
+++ b/docs/AdverseReactionReportsChartView.js
@@ -33,7 +33,7 @@ class AdverseReactionReportsChartView {
'Deaths',
'Disabilities',
'Life Threatening Illnesses',
- 'Hospitalization',
+ 'Hospitalizations',
'Other Adverse Events'
],
datasets: [{
@@ -43,8 +43,8 @@ class AdverseReactionReportsChartView {
ADRDescr['Deaths'],
ADRDescr['Disabilities'],
ADRDescr['Life Threatening Illnesses'],
- ADRDescr['Hospitalization'],
- ADRDescr['Adverse Reaction Reports'] - (ADRDescr['Deaths'] + ADRDescr['Disabilities'] + ADRDescr['Life Threatening Illnesses'] + ADRDescr['Hospitalization'])
+ 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 923ac8e966a..6348592a217 100644
--- a/docs/BatchCodeTableInitializer.js
+++ b/docs/BatchCodeTableInitializer.js
@@ -50,7 +50,7 @@ class BatchCodeTableInitializer {
this.#getColumnIndex('Deaths'),
this.#getColumnIndex('Disabilities'),
this.#getColumnIndex('Life Threatening Illnesses'),
- this.#getColumnIndex('Hospitalization'),
+ this.#getColumnIndex('Hospitalizations'),
this.#getColumnIndex('Severe reports'),
this.#getColumnIndex('Lethality')
]
@@ -110,7 +110,7 @@ class BatchCodeTableInitializer {
return 3;
case 'Life Threatening Illnesses':
return 4;
- case 'Hospitalization':
+ case 'Hospitalizations':
return 5;
case 'Company':
return 6;
diff --git a/docs/batchCodes.html b/docs/batchCodes.html
index bbe633725e3..50597e6b3e6 100644
--- a/docs/batchCodes.html
+++ b/docs/batchCodes.html
@@ -58,7 +58,7 @@
| Deaths |
Disabilities |
Life Threatening Illnesses |
- Hospitalization |
+ Hospitalizations |
Company |
Severe reports |
Lethality |
diff --git a/src/BatchCodeTableFactory.py b/src/BatchCodeTableFactory.py
index 6b0739c4569..c438e14a8ac 100644
--- a/src/BatchCodeTableFactory.py
+++ b/src/BatchCodeTableFactory.py
@@ -21,7 +21,7 @@ class BatchCodeTableFactory:
'Deaths',
'Disabilities',
'Life Threatening Illnesses',
- 'Hospitalization',
+ 'Hospitalizations',
'Company',
'Severe reports',
'Lethality'
diff --git a/src/BatchCodeTableFactoryTest.py b/src/BatchCodeTableFactoryTest.py
index 005bafec71f..65b42fbd41a 100644
--- a/src/BatchCodeTableFactoryTest.py
+++ b/src/BatchCodeTableFactoryTest.py
@@ -28,11 +28,11 @@ class BatchCodeTableFactoryTest(unittest.TestCase):
# Then
assert_frame_equal(
- batchCodeTable[['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life Threatening Illnesses', 'Hospitalization', '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', 'Hospitalization', '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]],
+ 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(
[
'030L20B',
@@ -62,12 +62,12 @@ class BatchCodeTableFactoryTest(unittest.TestCase):
# Then
assert_frame_equal(
- batchCodeTable[['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life Threatening Illnesses', 'Hospitalization', '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', 'Hospitalization', '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]],
+ 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]],
index = pd.Index(
[
'016M20A',
@@ -98,9 +98,9 @@ class BatchCodeTableFactoryTest(unittest.TestCase):
# Then
assert_frame_equal(
- batchCodeTable[['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life Threatening Illnesses', 'Hospitalization', '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', 'Hospitalization', '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 b7676e59a11..ada8a6b8cf7 100644
--- a/src/BatchCodeTableIntoHistogramDescriptionTableMerger.py
+++ b/src/BatchCodeTableIntoHistogramDescriptionTableMerger.py
@@ -28,7 +28,7 @@ class BatchCodeTableIntoHistogramDescriptionTableMerger:
'Deaths',
'Disabilities',
'Life Threatening Illnesses',
- 'Hospitalization',
+ 'Hospitalizations',
'Company'
]]
diff --git a/src/BatchCodeTableIntoHistogramDescriptionTableMergerTest.py b/src/BatchCodeTableIntoHistogramDescriptionTableMergerTest.py
index 1e2697a86c2..f53b3f2ba8e 100644
--- a/src/BatchCodeTableIntoHistogramDescriptionTableMergerTest.py
+++ b/src/BatchCodeTableIntoHistogramDescriptionTableMergerTest.py
@@ -33,8 +33,8 @@ class BatchCodeTableIntoHistogramDescriptionTableMergerTest(unittest.TestCase):
data = ['1808982']))
batchCodeTable = TestHelper.createDataFrame(
- columns = ['Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life Threatening Illnesses', 'Hospitalization', 'Company', 'Severe reports', 'Lethality'],
- data = [ [2, 1, 2, 2, 3, 'MODERNA', 2/2 * 100, np.nan]],
+ 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',
data = ['1808982']))
@@ -54,7 +54,7 @@ class BatchCodeTableIntoHistogramDescriptionTableMergerTest(unittest.TestCase):
'Deaths': 1,
'Disabilities': 2,
'Life Threatening Illnesses': 2,
- 'Hospitalization': 3,
+ 'Hospitalizations': 3,
'Company': 'MODERNA',
'histograms': [
{
diff --git a/src/BatchCodeTablePersister.py b/src/BatchCodeTablePersister.py
index 624b0d9d119..69fd74d0b71 100644
--- a/src/BatchCodeTablePersister.py
+++ b/src/BatchCodeTablePersister.py
@@ -17,7 +17,7 @@ def createGlobalBatchCodeTable(deleteEntriesWithADRsLessThanOrEqual, minADRsForL
'Deaths',
'Disabilities',
'Life Threatening Illnesses',
- 'Hospitalization',
+ 'Hospitalizations',
'Company',
'Severe reports',
'Lethality'
diff --git a/src/SummationTableFactory.py b/src/SummationTableFactory.py
index 5492fc096ff..77df286f3d4 100644
--- a/src/SummationTableFactory.py
+++ b/src/SummationTableFactory.py
@@ -9,7 +9,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'),
- 'Hospitalization': pd.NamedAgg(column = 'HOSPITAL', aggfunc = 'sum'),
+ 'Hospitalizations': pd.NamedAgg(column = 'HOSPITAL', aggfunc = 'sum'),
'Disabilities': pd.NamedAgg(column = 'DISABLE', aggfunc = 'sum'),
'Severities': pd.NamedAgg(column = 'SEVERE', aggfunc = 'sum')
})
@@ -21,7 +21,7 @@ class SummationTableFactory:
'Deaths',
'Disabilities',
'Life Threatening Illnesses',
- 'Hospitalization',
+ 'Hospitalizations',
'Severe reports',
'Lethality'
]]
diff --git a/src/help.txt b/src/help.txt
index f555c44eed6..f2c610ac34a 100644
--- a/src/help.txt
+++ b/src/help.txt
@@ -21,23 +21,6 @@ jupyter notebook
FK-FIXME:
FK-TODO:
-- add HOSPITAL, 'Hospitalization':
- see: L_THREAT, 'Life Threatening Illnesses'
- + BatchCodeTableFactoryTest
- + DataFrameFilterTest
- + SevereColumnAdder
- + SummationTableFactory
- + VaersDescrReaderTest
- + VaersDescrReader
-
- + AdverseReactionReportsChartView
- + batchCodes.html
- + BatchCodeTableInitializer
- + BatchCodeTableFactory
- + BatchCodeTableIntoHistogramDescriptionTableMergerTest
- + BatchCodeTableIntoHistogramDescriptionTableMerger
- + BatchCodeTablePersister.py
-
anacron job:
sudo cp src/intensivstationen_howbadismybatch.sh /etc/cron.daily/intensivstationen_howbadismybatch