SimCompanies/dashboard
2
1
Fork 0
Code Issues 17 Pull Requests Releases Activity

change avg(price) to price

Browse Source
This commit is contained in:
Oliver Boehlk
2020-05-13 22:58:21 +02:00
parent 151e2b1dff
commit 66979947dd
3 changed files with 362 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/index.js
View File

@@ -221,10 +221,10 @@ app.get('/API/week', function (req, res) {
var querying = ""; var querying = "";
for (let i = 0; i < 7; i++) { for (let i = 0; i < 7; i++) {
let currentday = day.toMysqlFormat().split(" ")[0]; let currentday = day.toMysqlFormat().split(" ")[0];
querying += `SELECT "${currentday + " 21:00:00"}" as id,kind,quality,AVG(price) FROM marketv2 WHERE kind = 1 AND TIME > "${currentday} 18:00:00" AND TIME <= "${currentday} 23:59:59" GROUP BY kind,quality UNION `; querying += `SELECT "${currentday + " 21:00:00"}" as id,kind,quality,AVG(price) as price FROM marketv2 WHERE kind = 1 AND TIME > "${currentday} 18:00:00" AND TIME <= "${currentday} 23:59:59" GROUP BY kind,quality UNION `;
querying += `SELECT "${currentday + " 15:00:00"}" as id,kind,quality,AVG(price) FROM marketv2 WHERE kind = 1 AND TIME > "${currentday} 12:00:00" AND TIME <= "${currentday} 17:59:59" GROUP BY kind,quality UNION `; querying += `SELECT "${currentday + " 15:00:00"}" as id,kind,quality,AVG(price) as price FROM marketv2 WHERE kind = 1 AND TIME > "${currentday} 12:00:00" AND TIME <= "${currentday} 17:59:59" GROUP BY kind,quality UNION `;
querying += `SELECT "${currentday + " 09:00:00"}" as id,kind,quality,AVG(price) FROM marketv2 WHERE kind = 1 AND TIME > "${currentday} 6:00:00" AND TIME <= "${currentday} 11:59:59" GROUP BY kind,quality UNION `; querying += `SELECT "${currentday + " 09:00:00"}" as id,kind,quality,AVG(price) as price FROM marketv2 WHERE kind = 1 AND TIME > "${currentday} 6:00:00" AND TIME <= "${currentday} 11:59:59" GROUP BY kind,quality UNION `;
querying += `SELECT "${currentday + " 3:00:00"}" as id,kind,quality,AVG(price) FROM marketv2 WHERE kind = 1 AND TIME > "${currentday} 00:00:00" AND TIME <= "${currentday} 05:59:59" GROUP BY kind,quality ${i === 6 ? "" : "UNION"} `; querying += `SELECT "${currentday + " 3:00:00"}" as id,kind,quality,AVG(price) as price FROM marketv2 WHERE kind = 1 AND TIME > "${currentday} 00:00:00" AND TIME <= "${currentday} 05:59:59" GROUP BY kind,quality ${i === 6 ? "" : "UNION"} `;
day.setDate(day.getDate() - 1); day.setDate(day.getDate() - 1);
} }
connection.query(querying, function (error, results, fields) { connection.query(querying, function (error, results, fields) {
@@ -253,7 +253,7 @@ app.get('/API/month', function (req, res) {
var querying = ""; var querying = "";
for (let i = 0; i < 30; i++) { for (let i = 0; i < 30; i++) {
let currentday = day.toMysqlFormat().split(" ")[0]; let currentday = day.toMysqlFormat().split(" ")[0];
querying += `SELECT "${currentday}" as id,kind,quality,AVG(price) FROM marketv2 WHERE kind = 1 AND TIME >= "${currentday} 00:00:00" AND TIME <= "${currentday} 23:59:59" GROUP BY kind,quality ${i === 29 ? "" : "UNION"} `; querying += `SELECT "${currentday}" as id,kind,quality,AVG(price) as price FROM marketv2 WHERE kind = 1 AND TIME >= "${currentday} 00:00:00" AND TIME <= "${currentday} 23:59:59" GROUP BY kind,quality ${i === 29 ? "" : "UNION"} `;
day.setDate(day.getDate() - 1); day.setDate(day.getDate() - 1);
} }
connection.query(querying, function (error, results, fields) { connection.query(querying, function (error, results, fields) {

344
backend/mockdata-test/month.json
View File

File diff suppressed because it is too large Load Diff

370
backend/mockdata-test/week.json
View File

File diff suppressed because it is too large Load Diff