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

render all quality price charts

Browse Source
This commit is contained in:
Oliver Boehlk
2020-04-19 18:40:03 +02:00
parent 47cd744fe2
commit 66d837f387
2 changed files with 63 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
backend/index.js
View File

@@ -16,6 +16,17 @@ var resourceList;
var serverStartupComplete = false;
function twoDigits(d) {
if (0 <= d && d < 10) return "0" + d.toString();
if (-10 < d && d < 0) return "-0" + (-1 * d).toString();
return d.toString();
}
Date.prototype.toMysqlFormat = function () {
return this.getFullYear() + "-" + twoDigits(1 + this.getMonth()) + "-" + twoDigits(this.getDate()) + " " + twoDigits(this.getHours()) + ":" + twoDigits(this.getMinutes()) + ":" + twoDigits(this.getSeconds());
};
async function loadData() {
var rL = await fetch("https://www.simcompanies.com/api/v3/en/encyclopedia/resources/");
resourceList = await rL.json();
@@ -48,11 +59,11 @@ app.get('/API/day', function (req, res) {
if (kind === -1) return res.send(mockDataDay);
if (kind >= 1 && kind <= 113) {
var dayend = new Date().toISOString().slice(0, 19).replace('T', ' ');
var dayend = new Date().toMysqlFormat();
var daybegin = new Date();
daybegin.setDate(daybegin.getDate() - 1);
daybegin = daybegin.toISOString().slice(0, 19).replace('T', ' ');
const querystring = `SELECT time, price, quality FROM marketv2 WHERE kind = ${kind} AND time > "${daybegin}" AND time < "${dayend}" ORDER BY quality, time`;
const querystring = `SELECT time, price, quality FROM marketv2 WHERE kind = ${kind} AND time > "${daybegin}" AND time < "${dayend}" ORDER BY time, quality`;
connection.query(querystring, function (error, results, fields) {
if (error) {
res.status(status.INTERNAL_SERVER_ERROR).send("database connection failed");

57
frontend/src/components/resourcechart/resourcechart.js
View File

@@ -11,13 +11,49 @@ export default function ResourceChart(props) {
const [data, setData] = React.useState(null);
let { id } = useParams();
const loadData = async () => {
let nextData = await fetch(`/simcompanies/API/day?kind=${id}`);
nextData = await nextData.json();
for (let i = 0; i < nextData.length; i++) {
nextData[i]["time"] = new Date(nextData[i]["time"]);
nextData[i]["time"] = nextData[i]["time"].toLocaleTimeString();
let dayData = await fetch(`/simcompanies/API/day?kind=${id}`);
let dataWithDate = await dayData.json();
let qualitySortedData = [];
for (let i = 0; i < dataWithDate.length; i++) {
if (i === 0) qualitySortedData.push(dataWithDate[i]);
else {
if (dataWithDate[i]["time"] === qualitySortedData[qualitySortedData.length - 1]["time"]) {
switch (dataWithDate[i].quality) {
case 0: break;
case 1:
qualitySortedData[qualitySortedData.length - 1]["q1"] = dataWithDate[i]["price"];
break;
case 2:
qualitySortedData[qualitySortedData.length - 1]["q2"] = dataWithDate[i]["price"];
break;
case 3:
qualitySortedData[qualitySortedData.length - 1]["q3"] = dataWithDate[i]["price"];
break;
case 4:
qualitySortedData[qualitySortedData.length - 1]["q4"] = dataWithDate[i]["price"];
break;
case 5:
qualitySortedData[qualitySortedData.length - 1]["q5"] = dataWithDate[i]["price"];
break;
case 6:
qualitySortedData[qualitySortedData.length - 1]["q6"] = dataWithDate[i]["price"];
break;
case 7:
qualitySortedData[qualitySortedData.length - 1]["q7"] = dataWithDate[i]["price"];
break;
}
} else {
qualitySortedData.push(dataWithDate[i]);
qualitySortedData[qualitySortedData.length - 1]["q0"] = qualitySortedData[qualitySortedData.length - 1]["price"];
}
}
}
setData(nextData)
for (let i = 0; i < qualitySortedData.length; i++) {
qualitySortedData[i]["time"] = new Date(qualitySortedData[i]["time"]);
qualitySortedData[i]["time"] = qualitySortedData[i]["time"].toLocaleTimeString();
}
console.log(qualitySortedData);
setData(qualitySortedData)
}
if (data === null) {
@@ -38,7 +74,14 @@ export default function ResourceChart(props) {
<YAxis domain={['datamin', 'datamax']} />
<Tooltip />
<Legend />
<Line type="monotone" dataKey="price" stroke="#8884d8" dot={false} />
<Line type="monotone" dataKey="q0" stroke="#8884d8" dot={false} />
<Line type="monotone" dataKey="q1" stroke="#000000" dot={false} />
<Line type="monotone" dataKey="q2" stroke="#82ca9d" dot={false} />
<Line type="monotone" dataKey="q3" stroke="#ff0066" dot={false} />
<Line type="monotone" dataKey="q4" stroke="#660066" dot={false} />
<Line type="monotone" dataKey="q5" stroke="#99cc00" dot={false} />
<Line type="monotone" dataKey="q6" stroke="#669999" dot={false} />
<Line type="monotone" dataKey="q7" stroke="#996633" dot={false} />
</LineChart>
);
}