francois/HowBadIsMyBatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renaming 'Life Threatening Illnesses' to 'Life-Threatening Illnesses'

Browse Source
This commit is contained in:
Frank Knoll
2024-04-23 22:42:25 +02:00
parent dd01d7cd18
commit 9ae5ed354b
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/AdverseReactionReportsChartView.js
View File

@@ -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'
}]

4
docs/BatchCodeTableInitializer.js
View File

@@ -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;

2
docs/batchCodes.html
View File

@@ -57,7 +57,7 @@
<th>Adverse Reaction Reports</th>
<th>Deaths</th>
<th>Disabilities</th>
<th>Life Threatening Illnesses</th>
<th>Life-Threatening Illnesses</th>
<th>Hospitalizations</th>
<th>Company</th>
<th>Severe reports</th>

2
src/BatchCodeTableFactory.py
View File

@@ -20,7 +20,7 @@ class BatchCodeTableFactory:
'Adverse Reaction Reports',
'Deaths',
'Disabilities',
'Life Threatening Illnesses',
'Life-Threatening Illnesses',
'Hospitalizations',
'Company',
'Severe reports',

12
src/BatchCodeTableFactoryTest.py
View File

@@ -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)

2
src/BatchCodeTableIntoHistogramDescriptionTableMerger.py
View File

@@ -27,7 +27,7 @@ class BatchCodeTableIntoHistogramDescriptionTableMerger:
'Adverse Reaction Reports',
'Deaths',
'Disabilities',
'Life Threatening Illnesses',
'Life-Threatening Illnesses',
'Hospitalizations',
'Company'
]]

4
src/BatchCodeTableIntoHistogramDescriptionTableMergerTest.py
View File

@@ -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': [

2
src/BatchCodeTablePersister.py
View File

@@ -16,7 +16,7 @@ def createGlobalBatchCodeTable(deleteEntriesWithADRsLessThanOrEqual, minADRsForL
'Adverse Reaction Reports',
'Deaths',
'Disabilities',
'Life Threatening Illnesses',
'Life-Threatening Illnesses',
'Hospitalizations',
'Company',
'Severe reports',

4
src/SummationTableFactory.py
View File

@@ -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'