mirror of
https://github.com/elisspace/FxLifeSheet.git
synced 2026-08-29 15:44:00 +00:00
Add all-time average to API
This commit is contained in:
2
web.js
2
web.js
@@ -188,10 +188,12 @@ function updateOverviewTable() {
|
||||
queryToUse += "(SELECT ROUND(AVG(value::numeric), 4) FROM raw_data WHERE timestamp > " + monthTimestamp + " AND key='" + key + "') as " + key + "Month,";
|
||||
queryToUse += "(SELECT ROUND(AVG(value::numeric), 4) FROM raw_data WHERE timestamp > " + quarterTimestamp + " AND key='" + key + "') as " + key + "Quarter,";
|
||||
queryToUse += "(SELECT ROUND(AVG(value::numeric), 4) FROM raw_data WHERE timestamp > " + yearTimestamp + " AND key='" + key + "') as " + key + "Year,";
|
||||
queryToUse += "(SELECT ROUND(AVG(value::numeric), 4) FROM raw_data WHERE key='" + key + "') as " + key + "AllTime,";
|
||||
queryToUse += "(SELECT COUNT(value::numeric) FROM raw_data WHERE timestamp > " + weekTimestamp + " AND key='" + key + "') as " + key + "WeekCount,";
|
||||
queryToUse += "(SELECT COUNT(value::numeric) FROM raw_data WHERE timestamp > " + monthTimestamp + " AND key='" + key + "') as " + key + "MonthCount,";
|
||||
queryToUse += "(SELECT COUNT(value::numeric) FROM raw_data WHERE timestamp > " + quarterTimestamp + " AND key='" + key + "') as " + key + "QuarterCount,";
|
||||
queryToUse += "(SELECT COUNT(value::numeric) FROM raw_data WHERE timestamp > " + yearTimestamp + " AND key='" + key + "') as " + key + "YearCount";
|
||||
queryToUse += "(SELECT COUNT(value::numeric) FROM raw_data WHERE key='" + key + "') as " + key + "AllTimeCount";
|
||||
if (i != keysForDashboard.length - 1) {
|
||||
queryToUse += ",";
|
||||
}
|
||||
|
||||
2
web.ts
2
web.ts
@@ -236,10 +236,12 @@ function updateOverviewTable() {
|
||||
queryToUse += `(SELECT ROUND(AVG(value::numeric), 4) FROM raw_data WHERE timestamp > ${monthTimestamp} AND key='${key}') as ${key}Month,`;
|
||||
queryToUse += `(SELECT ROUND(AVG(value::numeric), 4) FROM raw_data WHERE timestamp > ${quarterTimestamp} AND key='${key}') as ${key}Quarter,`;
|
||||
queryToUse += `(SELECT ROUND(AVG(value::numeric), 4) FROM raw_data WHERE timestamp > ${yearTimestamp} AND key='${key}') as ${key}Year,`;
|
||||
queryToUse += `(SELECT ROUND(AVG(value::numeric), 4) FROM raw_data WHERE key='${key}') as ${key}AllTime,`;
|
||||
queryToUse += `(SELECT COUNT(value::numeric) FROM raw_data WHERE timestamp > ${weekTimestamp} AND key='${key}') as ${key}WeekCount,`;
|
||||
queryToUse += `(SELECT COUNT(value::numeric) FROM raw_data WHERE timestamp > ${monthTimestamp} AND key='${key}') as ${key}MonthCount,`;
|
||||
queryToUse += `(SELECT COUNT(value::numeric) FROM raw_data WHERE timestamp > ${quarterTimestamp} AND key='${key}') as ${key}QuarterCount,`;
|
||||
queryToUse += `(SELECT COUNT(value::numeric) FROM raw_data WHERE timestamp > ${yearTimestamp} AND key='${key}') as ${key}YearCount`;
|
||||
queryToUse += `(SELECT COUNT(value::numeric) FROM raw_data WHERE key='${key}') as ${key}AllTimeCount`;
|
||||
|
||||
if (i != keysForDashboard.length - 1) {
|
||||
queryToUse += ",";
|
||||
|
||||
Reference in New Issue
Block a user