filippodb
/
LocalCDN-Firefox-Chrome-Brave
mirror of https://codeberg.org/nobody/LocalCDN.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed: Add up CDNs and Frameworks over day/month/year boundaries (#74)

This commit is contained in:
nobody 2020-08-10 18:04:50 +02:00
parent 16f0ef8aed
commit b94c815f32
No known key found for this signature in database
GPG Key ID: 8F6DE3D614FCFD7A
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pages/statistics/statistics.js
View File

@ -68,25 +68,42 @@ statistics._generateTable = function (data, type) {
};
statistics._filterAndSortData = function () {
let tmpCDNs, tmpFrameworks;
tmpCDNs = {};
tmpFrameworks = {};
// Purge
statistics._dataSortedCDNs = {};
statistics._dataSortedFrameworks = {};
statistics._dateRange.forEach(function (entry) {
if (entry in statistics._data) {
statistics._dataSortedCDNs = Object.assign(statistics._dataSortedCDNs, statistics._data[entry]['cdns']);
statistics._dataSortedFrameworks = Object.assign(statistics._dataSortedFrameworks, statistics._data[entry]['frameworks']);
statistics._mergeObjects(statistics._data[entry]['cdns'], tmpCDNs);
statistics._mergeObjects(statistics._data[entry]['frameworks'], tmpFrameworks);
}
});
statistics._dataSortedCDNs = Object.entries(statistics._dataSortedCDNs).sort((a, b) => b[1] - a[1]);
statistics._dataSortedFrameworks = Object.entries(statistics._dataSortedFrameworks).sort((a, b) => b[1] - a[1]);
statistics._dataSortedCDNs = Object.entries(tmpCDNs).sort((a, b) => b[1] - a[1]);
statistics._dataSortedFrameworks = Object.entries(tmpFrameworks).sort((a, b) => b[1] - a[1]);
};
statistics._mergeObjects = function (obj, arr) {
for (let [key, value] of Object.entries(obj)) {
// If CDN/Framework exists, add it, otherwise create new one
if (arr[key]) {
arr[key] += value;
} else {
arr[key] = value;
}
}
};
statistics._setDateRange = function () {
let today = new Date();
let from = new Date();
let days;
let type = statistics._dateUnit;
let today, from, days, type;
today = new Date();
from = new Date();
type = statistics._dateUnit;
// Purge
statistics._dateRange = [];
@ -115,9 +132,11 @@ statistics._setDateRange = function () {
statistics._determineInjections = function () {
// NOTE: Differences between CDNs and frameworks possible.
// CDN can be contacted without loading a framework.
let sum = 0;
let days = 0;
let avg = 0;
let sum, days, avg;
sum = 0;
days = 0;
avg = 0;
statistics._dataOverview = [];
statistics._dateRange.forEach(function (entry) {