|
@@ -242,6 +242,7 @@ class AdminService extends CrudService {
|
|
const obj = { date: d, money: 0 };
|
|
const obj = { date: d, money: 0 };
|
|
if (r) obj.money = r.money;
|
|
if (r) obj.money = r.money;
|
|
result.push(obj);
|
|
result.push(obj);
|
|
|
|
+ if (type === 'day') break;
|
|
}
|
|
}
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
@@ -306,9 +307,8 @@ class AdminService extends CrudService {
|
|
getDefaultRange(type) {
|
|
getDefaultRange(type) {
|
|
let result;
|
|
let result;
|
|
if (type === 'day') {
|
|
if (type === 'day') {
|
|
- const start = moment().startOf('day').format(this.tf);
|
|
|
|
- const end = moment(start).add(1, 'day').subtract(1, 'second')
|
|
|
|
- .format(this.tf);
|
|
|
|
|
|
+ const start = moment().startOf('day').format(`${this.tf}`);
|
|
|
|
+ const end = moment(start).add(1, 'day').format(`${this.tf}`);
|
|
result = [ start, end ];
|
|
result = [ start, end ];
|
|
} else if (type === 'week') {
|
|
} else if (type === 'week') {
|
|
const start = moment().startOf('week').format(this.tf);
|
|
const start = moment().startOf('week').format(this.tf);
|