adding Hospitalization for UI

2024-04-23 17:53:39 +02:00
parent ce175faa78
commit a2d4c356be
5 changed files with 87 additions and 71 deletions
--- a/docs/AdverseReactionReportsChartView.js
+++ b/docs/AdverseReactionReportsChartView.js
@@ -33,6 +33,7 @@ class AdverseReactionReportsChartView {
                'Deaths',
                'Disabilities',
                'Life Threatening Illnesses',
+                'Hospitalization',
                'Other Adverse Events'
            ],
            datasets: [{
@@ -42,7 +43,8 @@ class AdverseReactionReportsChartView {
                    ADRDescr['Deaths'],
                    ADRDescr['Disabilities'],
                    ADRDescr['Life Threatening Illnesses'],
-                    ADRDescr['Adverse Reaction Reports'] - (ADRDescr['Deaths'] + ADRDescr['Disabilities'] + ADRDescr['Life Threatening Illnesses'])
+                    ADRDescr['Hospitalization'],
+                    ADRDescr['Adverse Reaction Reports'] - (ADRDescr['Deaths'] + ADRDescr['Disabilities'] + ADRDescr['Life Threatening Illnesses'] + ADRDescr['Hospitalization'])
                ],
                backgroundColor: '#1a73e8'
            }]
--- a/docs/BatchCodeTableInitializer.js
+++ b/docs/BatchCodeTableInitializer.js
@@ -50,6 +50,7 @@ class BatchCodeTableInitializer {
                                this.#getColumnIndex('Deaths'),
                                this.#getColumnIndex('Disabilities'),
                                this.#getColumnIndex('Life Threatening Illnesses'),
+                                this.#getColumnIndex('Hospitalization'),
                                this.#getColumnIndex('Severe reports'),
                                this.#getColumnIndex('Lethality')
                            ]
@@ -109,14 +110,16 @@ class BatchCodeTableInitializer {
                return 3;
            case 'Life Threatening Illnesses':
                return 4;
-            case 'Company':
+            case 'Hospitalization':
                return 5;
-            case 'Severe reports':
+            case 'Company':
                return 6;
-            case 'Lethality':
+            case 'Severe reports':
                return 7;
-            case 'Countries':
+            case 'Lethality':
                return 8;
+            case 'Countries':
+                return 9;
        }
    }

--- a/docs/batchCodes.html
+++ b/docs/batchCodes.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+
 <head>
  <meta charset="utf-8" />
  <meta content="width=device-width, initial-scale=1.0" name="viewport" />
@@ -16,10 +17,16 @@
  <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="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>
-<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 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>
+  <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 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="./Utils.js"></script>
  <script src="./UIUtils.js"></script>
@@ -40,6 +47,7 @@
    });
  </script>
 </head>
+
 <body>
  <h1>Batch Codes of Coronavirus 2019 Vaccines</h1>
  <table class="display" id="batchCodeTable">
@@ -50,6 +58,7 @@
        <th>Deaths</th>
        <th>Disabilities</th>
        <th>Life Threatening Illnesses</th>
+        <th>Hospitalization</th>
        <th>Company</th>
        <th>Severe reports</th>
        <th>Lethality</th>
@@ -84,4 +93,5 @@
    </div>
  </template>
 </body>
+
 </html>
--- a/src/BatchCodeTablePersister.py
+++ b/src/BatchCodeTablePersister.py
@@ -17,6 +17,7 @@ def createGlobalBatchCodeTable(deleteEntriesWithADRsLessThanOrEqual, minADRsForL
            'Deaths',
            'Disabilities',
            'Life Threatening Illnesses',
+            'Hospitalization',
            'Company',
            'Severe reports',
            'Lethality'
--- a/src/help.txt
+++ b/src/help.txt
@@ -30,13 +30,13 @@ FK-TODO:
  + VaersDescrReaderTest
  + VaersDescrReader

-  - AdverseReactionReportsChartView
-  - batchCodes.html
-  - BatchCodeTableInitializer
+  + AdverseReactionReportsChartView
+  + batchCodes.html
+  + BatchCodeTableInitializer
  + BatchCodeTableFactory
  + BatchCodeTableIntoHistogramDescriptionTableMergerTest
  + BatchCodeTableIntoHistogramDescriptionTableMerger
-  - BatchCodeTablePersister.py
+  + BatchCodeTablePersister.py


 anacron job: