|
@@ -637,11 +637,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
if(zone == 1) {
|
|
if(zone == 1) {
|
|
|
date.setMonth(date.getMonth() - 1);
|
|
date.setMonth(date.getMonth() - 1);
|
|
|
condition.dateFrom = date;
|
|
condition.dateFrom = date;
|
|
|
- condition.dateTo = null;
|
|
|
|
|
|
|
+ condition.dateTo = new Date();
|
|
|
} else if (zone == 6) {
|
|
} else if (zone == 6) {
|
|
|
date.setMonth(date.getMonth() - 6);
|
|
date.setMonth(date.getMonth() - 6);
|
|
|
condition.dateFrom = date;
|
|
condition.dateFrom = date;
|
|
|
- condition.dateTo = null;
|
|
|
|
|
|
|
+ condition.dateTo = new Date();
|
|
|
} else {
|
|
} else {
|
|
|
date.setMonth(date.getMonth() - 6)
|
|
date.setMonth(date.getMonth() - 6)
|
|
|
condition.dateFrom = null;
|
|
condition.dateFrom = null;
|