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

prepare for new mockdata
All checks were successful
SimcoDash/simcompanies-dashboard/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Oliver Boehlk
2020-05-29 19:42:42 +02:00
parent 92e630f24f
commit 6c174948f8
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/index.js
View File

@@ -33,6 +33,9 @@ var sessionStore = new MySQLStore({
const mockDataDay = require('./mockdata-test/day.json'); const mockDataDay = require('./mockdata-test/day.json');
const mockDataWeek = require('./mockdata-test/week.json'); const mockDataWeek = require('./mockdata-test/week.json');
const mockDataMonth = require('./mockdata-test/month.json'); const mockDataMonth = require('./mockdata-test/month.json');
//const mockAmountDataDay = require('./mockdata-test/amountDay.json');
//const mockAmountDataWeek = require('./mockdata-test/amountWeek.json');
//const mockAmountDataMonth = require('./mockdata-test/amountMonth.json');
var resourceList; var resourceList;
const saltRounds = 13; const saltRounds = 13;
@@ -230,7 +233,7 @@ app.get('/API/amount/day', function (req, res) {
const kind = parseInt(req.query.kind); const kind = parseInt(req.query.kind);
if (Number.isInteger(kind)) { if (Number.isInteger(kind)) {
//Mock Data: //Mock Data:
if (kind === -1 || DEBUG) return res.send(mockDataDay); if (kind === -1 || DEBUG) return res.send(mockAmountDataDay);
if (kind >= 1 && kind <= 113) { if (kind >= 1 && kind <= 113) {
var dayend = new Date().toMysqlFormat(); var dayend = new Date().toMysqlFormat();
@@ -290,7 +293,7 @@ app.get('/API/amount/week', function (req, res) {
const kind = parseInt(req.query.kind); const kind = parseInt(req.query.kind);
if (Number.isInteger(kind)) { if (Number.isInteger(kind)) {
//Mock Data: //Mock Data:
if (kind === -1 || DEBUG) return res.send(mockDataWeek); if (kind === -1 || DEBUG) return res.send(mockAmountDataWeek);
if (kind >= 1 && kind <= 113) { if (kind >= 1 && kind <= 113) {
var day = new Date(); var day = new Date();
@@ -323,7 +326,7 @@ app.get('/API/price/month', function (req, res) {
const kind = parseInt(req.query.kind); const kind = parseInt(req.query.kind);
if (Number.isInteger(kind)) { if (Number.isInteger(kind)) {
//Mock Data: //Mock Data:
if (kind === -1 || DEBUG) return res.send(mockDataMonth); if (kind === -1 || DEBUG) return res.send(mockAmountDataMonth);
if (kind >= 1 && kind <= 113) { if (kind >= 1 && kind <= 113) {
var day = new Date(); var day = new Date();