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

continuing

Browse Source
This commit is contained in:
frankknoll
2023-06-09 17:53:00 +02:00
parent 491f7828f9
commit b348de37ea
2 changed files with 142 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
docs/BatchCodeTableInitializer.js
View File

@@ -1,6 +1,7 @@
class BatchCodeTableInitializer { class BatchCodeTableInitializer {
#batchCodeTableElement; #batchCodeTableElement;
#barChartDescriptions;
constructor(batchCodeTableElement) { constructor(batchCodeTableElement) {
this.#batchCodeTableElement = batchCodeTableElement; this.#batchCodeTableElement = batchCodeTableElement;
@@ -8,6 +9,10 @@ class BatchCodeTableInitializer {
initialize() { initialize() {
const self = this; const self = this;
BarChartDescriptionsProvider
.getBarChartDescriptions()
.then(barChartDescriptions => {
this.#barChartDescriptions = barChartDescriptions;
this.#batchCodeTableElement.DataTable( this.#batchCodeTableElement.DataTable(
{ {
ajax: 'data/batchCodeTables/Global.json', ajax: 'data/batchCodeTables/Global.json',
@@ -43,17 +48,39 @@ class BatchCodeTableInitializer {
}, },
{ {
orderable: false, orderable: false,
targets: [this.#getColumnIndex('Batch'), this.#getColumnIndex('Company')] targets:
[
this.#getColumnIndex('Batch'),
this.#getColumnIndex('Company'),
this.#getColumnIndex('Countries')
]
}, },
{ {
render: (data, type, row) => { render: data => {
const numberInPercent = parseFloat(data); const numberInPercent = parseFloat(data);
return !isNaN(numberInPercent) ? numberInPercent.toFixed(2) + "%" : ''; return !isNaN(numberInPercent) ? numberInPercent.toFixed(2) + "%" : '';
}, },
targets: [this.#getColumnIndex('Severe reports'), this.#getColumnIndex('Lethality')] targets: [this.#getColumnIndex('Severe reports'), this.#getColumnIndex('Lethality')]
},
{
width: "1000px",
render: function (data, type, row, meta) {
return null;
},
createdCell: (cell, cellData, row, rowIndex, colIndex) => {
const batchcode = row[this.#getColumnIndex('Batch')];
if (batchcode in this.#barChartDescriptions) {
const barChartDescription = this.#barChartDescriptions[batchcode];
barChartDescription['batchcode'] = batchcode;
new BatchcodeByCountryBarChartView(cell).displayBatchcodeByCountryBarChart(barChartDescription);
}
},
className: "dt-head-center",
targets: [this.#getColumnIndex('Countries')]
} }
] ]
}); });
});
} }
#getColumnIndex(columnName) { #getColumnIndex(columnName) {
@@ -74,6 +101,8 @@ class BatchCodeTableInitializer {
return 6; return 6;
case 'Lethality': case 'Lethality':
return 7; return 7;
case 'Countries':
return 8;
} }
} }
} }

30
docs/batchCodes.html
View File

@@ -1,5 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta content="width=device-width, initial-scale=1.0" name="viewport" /> <meta content="width=device-width, initial-scale=1.0" name="viewport" />
@@ -17,15 +18,24 @@
<link href="https://cdn.datatables.net/1.13.1/css/jquery.dataTables.css" rel="stylesheet" type="text/css" /> <link href="https://cdn.datatables.net/1.13.1/css/jquery.dataTables.css" rel="stylesheet" type="text/css" />
<link href="batchCodeTable.css" rel="stylesheet" type="text/css" /> <link href="batchCodeTable.css" rel="stylesheet" type="text/css" />
<link href="forkMeOnGitHub.css" rel="stylesheet" type="text/css" /> <link href="forkMeOnGitHub.css" rel="stylesheet" type="text/css" />
<script crossorigin="anonymous" integrity="sha512-T5Bneq9hePRO8JR0S/0lQ7gdW+ceLThvC80UjwkMRz+8q+4DARVZ4dqKoyENC7FcYresjfJ6ubaOgIE35irf4w==" referrerpolicy="no-referrer" src="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/15.5.1/nouislider.min.js"></script> <script crossorigin="anonymous"
<link crossorigin="anonymous" href="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/15.5.1/nouislider.css" integrity="sha512-MKxcSu/LDtbIYHBNAWUQwfB3iVoG9xeMCm32QV5hZ/9lFaQZJVaXfz9aFa0IZExWzCpm7OWvp9zq9gVip/nLMg==" referrerpolicy="no-referrer" rel="stylesheet"/> integrity="sha512-T5Bneq9hePRO8JR0S/0lQ7gdW+ceLThvC80UjwkMRz+8q+4DARVZ4dqKoyENC7FcYresjfJ6ubaOgIE35irf4w=="
referrerpolicy="no-referrer"
src="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/15.5.1/nouislider.min.js"></script>
<link crossorigin="anonymous" href="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/15.5.1/nouislider.css"
integrity="sha512-MKxcSu/LDtbIYHBNAWUQwfB3iVoG9xeMCm32QV5hZ/9lFaQZJVaXfz9aFa0IZExWzCpm7OWvp9zq9gVip/nLMg=="
referrerpolicy="no-referrer" rel="stylesheet" />
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script charset="utf8" src="https://cdn.datatables.net/1.13.1/js/jquery.dataTables.min.js" type="text/javascript"></script> <script charset="utf8" src="https://cdn.datatables.net/1.13.1/js/jquery.dataTables.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/chart.js@4.2.0/dist/chart.umd.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/chart.js@4.2.0/dist/chart.umd.min.js"></script>
<script src="./Utils.js"></script> <script src="./Utils.js"></script>
<script src="./UIUtils.js"></script> <script src="./UIUtils.js"></script>
<script src="./ColumnSearch.js"></script> <script src="./ColumnSearch.js"></script>
<script src="./BatchCodeTableInitializer.js"></script> <script src="./BatchCodeTableInitializer.js"></script>
<script src="./BarChartDescriptionsProvider.js"></script>
<script src="./BatchcodeByCountryBarChartView.js"></script>
<script src="./BatchcodeByCountryBarChart.js"></script>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
const batchCodeTableInitializer = new BatchCodeTableInitializer($('#batchCodeTable')); const batchCodeTableInitializer = new BatchCodeTableInitializer($('#batchCodeTable'));
@@ -33,6 +43,7 @@
}); });
</script> </script>
</head> </head>
<body> <body>
<h1>Batch Codes of Coronavirus 2019 Vaccines</h1> <h1>Batch Codes of Coronavirus 2019 Vaccines</h1>
<table class="display" id="batchCodeTable"> <table class="display" id="batchCodeTable">
@@ -46,6 +57,7 @@
<th>Company</th> <th>Company</th>
<th>Severe reports</th> <th>Severe reports</th>
<th>Lethality</th> <th>Lethality</th>
<th>Countries</th>
</tr> </tr>
</thead> </thead>
</table> </table>
@@ -64,5 +76,17 @@
<template id="template-canvas"> <template id="template-canvas">
<canvas></canvas> <canvas></canvas>
</template> </template>
<template id="template-chartWithSlider">
<div class="chartWithSlider">
<div class="chartContainer">
<canvas class="canvas"></canvas>
</div>
<!-- FK-TODO: remove sliderContainer and slider -->
<div class="sliderContainer">
<div class="slider"></div>
</div>
</div>
</template>
</body> </body>
</html> </html>