refactoring
This commit is contained in:
@@ -31,12 +31,12 @@ class BatchcodeByCountryBarChart {
|
|||||||
labels: barChartDescription.countries,
|
labels: barChartDescription.countries,
|
||||||
datasets: [
|
datasets: [
|
||||||
{
|
{
|
||||||
label: `known (${this.#dateRange2str(barChartDescription['date range known'])})`,
|
label: `Known (${this.#dateRange2str(barChartDescription['date range known'])})`,
|
||||||
data: barChartDescription["frequencies before deletion"]
|
data: barChartDescription["Adverse Reaction Reports known"]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: `guessed (${this.#dateRange2str(barChartDescription['date range guessed'])})`,
|
label: `Guessed (${this.#dateRange2str(barChartDescription['date range guessed'])})`,
|
||||||
data: barChartDescription["frequencies guessed"]
|
data: barChartDescription["Adverse Reaction Reports guessed"]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -8,8 +8,8 @@ class CountryCountsByBatchcodeTable2BarChartDescriptionTableConverter:
|
|||||||
columns =
|
columns =
|
||||||
{
|
{
|
||||||
'COUNTRY': 'countries',
|
'COUNTRY': 'countries',
|
||||||
'COUNTRY_COUNT_BY_VAX_LOT Clicked': 'frequencies guessed',
|
'COUNTRY_COUNT_BY_VAX_LOT Clicked': 'Adverse Reaction Reports guessed',
|
||||||
'COUNTRY_COUNT_BY_VAX_LOT Before Deletion': 'frequencies before deletion'
|
'COUNTRY_COUNT_BY_VAX_LOT Before Deletion': 'Adverse Reaction Reports known'
|
||||||
})
|
})
|
||||||
.groupby('VAX_LOT')
|
.groupby('VAX_LOT')
|
||||||
.apply(lambda countryCountsTable: countryCountsTable.to_dict('list'))
|
.apply(lambda countryCountsTable: countryCountsTable.to_dict('list'))
|
||||||
|
|||||||
@@ -30,16 +30,16 @@ class CountryCountsByBatchcodeTable2BarChartDescriptionTableConverterTest(unitte
|
|||||||
data = [
|
data = [
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
'countries': ['Germany', 'Hungary'],
|
'countries': ['Germany', 'Hungary'],
|
||||||
'frequencies guessed': [10, 15],
|
'Adverse Reaction Reports guessed': [10, 15],
|
||||||
'frequencies before deletion': [20, 30]
|
'Adverse Reaction Reports known': [20, 30]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
'countries': ['Germany'],
|
'countries': ['Germany'],
|
||||||
'frequencies guessed': [70],
|
'Adverse Reaction Reports guessed': [70],
|
||||||
'frequencies before deletion': [80]
|
'Adverse Reaction Reports known': [80]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
|
|||||||
Reference in New Issue
Block a user