diff --git a/frontend/app/scripts/directives/dashboard/counter.js b/frontend/app/scripts/directives/dashboard/counter.js index d443007389..c6e827f9ba 100644 --- a/frontend/app/scripts/directives/dashboard/counter.js +++ b/frontend/app/scripts/directives/dashboard/counter.js @@ -70,7 +70,21 @@ return; } - var filters = (scope.options.filters || []).concat(item.serie.filters || []); + var timeFrameFilter = []; + if(scope.filter) { + timeFrameFilter.push({ + field: scope.filter._between._field, + type: 'date', + value: { + from: moment(scope.filter._between._from), + to: moment(scope.filter._between._to) + } + }); + } + + var filters = (scope.options.filters || []) + .concat(item.serie.filters || []) + .concat(timeFrameFilter || []); $q.resolve(GlobalSearchSrv.saveSection(scope.options.entity, { search: filters.length === 0 ? '*' : null, diff --git a/frontend/app/scripts/directives/dashboard/donut.js b/frontend/app/scripts/directives/dashboard/donut.js index 6b0e2f0d52..5db1dff091 100644 --- a/frontend/app/scripts/directives/dashboard/donut.js +++ b/frontend/app/scripts/directives/dashboard/donut.js @@ -93,7 +93,21 @@ value: GlobalSearchSrv.buildDefaultFilterValue(fieldDef, d) }; - var filters = (scope.options.filters || []).concat([data]); + var timeFrameFilter = []; + if(scope.filter) { + timeFrameFilter.push({ + field: scope.filter._between._field, + type: 'date', + value: { + from: moment(scope.filter._between._from), + to: moment(scope.filter._between._to) + } + }); + } + + var filters = (scope.options.filters || []) + .concat([data]) + .concat(timeFrameFilter); $q.resolve(GlobalSearchSrv.saveSection(scope.options.entity, { search: null,