Skip to content

Commit 322cacc

Browse files
committed
Added mortality percent. in Percentage distribution graphs(mouseover)
1 parent 68f7624 commit 322cacc

File tree

3 files changed

+21
-7
lines changed

3 files changed

+21
-7
lines changed

js/script.js

+19-5
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ const LABELS = {
116116
women: "Γυναίκες",
117117
cases: "Κρούσμ.",
118118
deaths: "Θάνατοι",
119-
serious: "Διασωλην."
119+
serious: "Διασ."
120120
},
121121
prefectures: {
122122
increasing: "αυξητική",
@@ -1164,15 +1164,19 @@ const init = () => {
11641164
tooltipItem.forEach(function(item, i){
11651165
total += item.xLabel;
11661166
});
1167-
11681167
return age + ": " + total + " " + suffix[LANG];
11691168
},
11701169
label: function(tooltipItem, data){
1170+
//mortality percentage
1171+
var percentage_suffix = "";
1172+
if(tooltipItem.datasetIndex == 1){
1173+
percentage_suffix = " ("+ ((data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index] / data.datasets[2].data[tooltipItem.index] * 100)).toFixed(1) + "%)";
1174+
}
11711175
let suffix = {
11721176
gr: "",
11731177
en: " cases"
11741178
};
1175-
return data.datasets[tooltipItem.datasetIndex].label + ": " + tooltipItem.value + suffix[LANG];
1179+
return data.datasets[tooltipItem.datasetIndex].label + ": " + tooltipItem.value + percentage_suffix + suffix[LANG];
11761180
}
11771181
}
11781182
},
@@ -1284,7 +1288,12 @@ const init = () => {
12841288
gr: "",
12851289
en: " cases"
12861290
};
1287-
return data.datasets[tooltipItem.datasetIndex].label + ": " + tooltipItem.value + suffix[LANG];
1291+
//mortality percentage
1292+
var percentage_suffix = "";
1293+
if(tooltipItem.datasetIndex == 1){
1294+
percentage_suffix = " ("+ ((data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index] / data.datasets[2].data[tooltipItem.index] * 100)).toFixed(1) + "%)";
1295+
}
1296+
return data.datasets[tooltipItem.datasetIndex].label + ": " + tooltipItem.value + percentage_suffix + suffix[LANG];
12881297
}
12891298
}
12901299
},
@@ -1396,7 +1405,12 @@ const init = () => {
13961405
gr: "",
13971406
en: " cases"
13981407
};
1399-
return data.datasets[tooltipItem.datasetIndex].label + ": " + tooltipItem.value + suffix[LANG];
1408+
//mortality percentage
1409+
var percentage_suffix = "";
1410+
if(tooltipItem.datasetIndex == 1){
1411+
percentage_suffix = " ("+ ((data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index] / data.datasets[2].data[tooltipItem.index] * 100)).toFixed(1) + "%)";
1412+
}
1413+
return data.datasets[tooltipItem.datasetIndex].label + ": " + tooltipItem.value + percentage_suffix + suffix[LANG];
14001414
}
14011415
}
14021416
},

js/script.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/mapsvg/css/mapsvg.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1551,6 +1551,6 @@ input[type="checkbox"].ios8-switch-lg:checked + label:after {
15511551
.mapsvg .label-bottom .mapsvg.label-ctrl{margin-bottom:10px;}
15521552
.mapsvg .info{padding:6px 8px;font:12px/14px Arial, Helvetica, sans-serif;background:white;background:rgba(255,255,255,0.8);box-shadow:0 0 15px rgba(0,0,0,0.2);border-radius:5px;}
15531553
.mapsvg .legend{text-align:left;line-height:18px;color:#555;}
1554-
.mapsvg .legend i{width:18px;height:18px;float:left;margin-right:8px;opacity:0.7;}
1554+
.mapsvg .legend i{width:1.2em;height:1.2em;float:left;margin-right:8px;opacity:0.7;}
15551555
.mapsvg .label-bottom2 {position: absolute; bottom:0;padding-left: 105px;font-size: 10px;white-space: nowrap;}
15561556
}

0 commit comments

Comments
 (0)