refactoring

This commit is contained in:
frankknoll
2023-10-15 10:35:32 +02:00
parent 5cc2b0c99f
commit b6c5a92b55
9 changed files with 23 additions and 12 deletions

15
docs/Dict2CsvConverter.js Normal file
View File

@@ -0,0 +1,15 @@
class Dict2CsvConverter {
static convertDict2CSV(dict) {
const { 'keys': columns, 'values': firstRow } = Utils.getKeysAlignedWithValues(dict);
return `${Dict2CsvConverter.#quoteValues(columns)}\n${firstRow}`;
}
static #quoteValues(values) {
return values.map(Dict2CsvConverter.#quoteValue);
}
static #quoteValue(value) {
return '"' + value + '"';
}
}

View File

@@ -26,6 +26,7 @@
<link href="gentelella/build/css/custom.css" rel="stylesheet" /> <link href="gentelella/build/css/custom.css" rel="stylesheet" />
<link href="forkMeOnGitHub.css" rel="stylesheet" type="text/css" /> <link href="forkMeOnGitHub.css" rel="stylesheet" type="text/css" />
<script src="./Utils.js"></script> <script src="./Utils.js"></script>
<script src="./Dict2CsvConverter.js"></script>
<script src="./UIUtils.js"></script> <script src="./UIUtils.js"></script>
<script src="./DataTablesFilter.js"></script> <script src="./DataTablesFilter.js"></script>
<script src="./NumberWithBarElementFactory.js"></script> <script src="./NumberWithBarElementFactory.js"></script>

View File

@@ -26,6 +26,7 @@
<link href="../gentelella/build/css/custom.css" rel="stylesheet" /> <link href="../gentelella/build/css/custom.css" rel="stylesheet" />
<link href="../forkMeOnGitHub.css" rel="stylesheet" type="text/css" /> <link href="../forkMeOnGitHub.css" rel="stylesheet" type="text/css" />
<script src="../Utils.js"></script> <script src="../Utils.js"></script>
<script src="../Dict2CsvConverter.js"></script>
<script src="../UIUtils.js"></script> <script src="../UIUtils.js"></script>
<script src="../NumberWithBarElementFactory.js"></script> <script src="../NumberWithBarElementFactory.js"></script>
<script src="./js/PageInitializer.js"></script> <script src="./js/PageInitializer.js"></script>

View File

@@ -26,15 +26,6 @@ class Utils {
} }
static convertDict2CSV(dict) { static convertDict2CSV(dict) {
const {'keys': columns, 'values': firstRow} = Utils.getKeysAlignedWithValues(dict); return Dict2CsvConverter.convertDict2CSV(dict);
return `${Utils.#quoteValues(columns)}\n${firstRow}`;
}
static #quoteValues(values) {
return values.map(Utils.#quoteValue);
}
static #quoteValue(value) {
return '"' + value + '"';
} }
} }

View File

@@ -12,6 +12,7 @@
<script charset="utf8" src="https://cdn.datatables.net/1.13.1/js/jquery.dataTables.min.js" <script charset="utf8" src="https://cdn.datatables.net/1.13.1/js/jquery.dataTables.min.js"
type="text/javascript"></script> type="text/javascript"></script>
<script src="./Utils.js"></script> <script src="./Utils.js"></script>
<script src="./Dict2CsvConverter.js"></script>
<script src="./UIUtils.js"></script> <script src="./UIUtils.js"></script>
<script src="./DataTablesFilter.js"></script> <script src="./DataTablesFilter.js"></script>
<script src="./VaccineDistributionByZipcodeTableInitializer.js"></script> <script src="./VaccineDistributionByZipcodeTableInitializer.js"></script>

View File

@@ -22,6 +22,7 @@
<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="./Dict2CsvConverter.js"></script>
<script src="./UIUtils.js"></script> <script src="./UIUtils.js"></script>
<script src="./DataTablesFilter.js"></script> <script src="./DataTablesFilter.js"></script>
<script src="./ColumnSearch.js"></script> <script src="./ColumnSearch.js"></script>

View File

@@ -23,6 +23,7 @@
integrity="sha512-MKxcSu/LDtbIYHBNAWUQwfB3iVoG9xeMCm32QV5hZ/9lFaQZJVaXfz9aFa0IZExWzCpm7OWvp9zq9gVip/nLMg==" integrity="sha512-MKxcSu/LDtbIYHBNAWUQwfB3iVoG9xeMCm32QV5hZ/9lFaQZJVaXfz9aFa0IZExWzCpm7OWvp9zq9gVip/nLMg=="
referrerpolicy="no-referrer" rel="stylesheet" /> referrerpolicy="no-referrer" rel="stylesheet" />
<script src="./Utils.js"></script> <script src="./Utils.js"></script>
<script src="./Dict2CsvConverter.js"></script>
<script src="./UIUtils.js"></script> <script src="./UIUtils.js"></script>
<script src="./IntensiveCareCapacitiesChartView.js"></script> <script src="./IntensiveCareCapacitiesChartView.js"></script>
<script src="./FreeBedsChartView.js"></script> <script src="./FreeBedsChartView.js"></script>

View File

@@ -11,7 +11,6 @@ QUnit.module('UtilsTest', function () {
const csv = Utils.convertDict2CSV(dict); const csv = Utils.convertDict2CSV(dict);
// Then // Then
const csvExpected = '"MM,R","VARCEL"\n26.17432376240791,10.549534724816644'; assert.equal(csv, '"MM,R","VARCEL"\n26.17432376240791,10.549534724816644');
assert.equal(csv, csvExpected);
}); });
}); });

View File

@@ -9,6 +9,7 @@
<meta content="width=device-width, initial-scale=1.0" name="viewport" /> <meta content="width=device-width, initial-scale=1.0" name="viewport" />
<title>Symptoms caused by Vaccines</title> <title>Symptoms caused by Vaccines</title>
<script src="../../docs/Utils.js"></script> <script src="../../docs/Utils.js"></script>
<script src="../../docs/Dict2CsvConverter.js"></script>
<script src="../../docs/UIUtils.js"></script> <script src="../../docs/UIUtils.js"></script>
<script src="../../docs/NumberWithBarElementFactory.js"></script> <script src="../../docs/NumberWithBarElementFactory.js"></script>
<script src="../../docs/SymptomsCausedByVaccines/js/PageInitializer.js"></script> <script src="../../docs/SymptomsCausedByVaccines/js/PageInitializer.js"></script>