From b4a8cb415e1f6168a1f48f6f0aadc7355347bb06 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Mon, 9 May 2016 13:16:09 +0530 Subject: [PATCH] FIX: remove category filter from page view reports --- .../javascripts/admin/controllers/admin-reports.js.es6 | 2 +- app/models/report.rb | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 index 61b46740ace..1d4dac7e644 100644 --- a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 @@ -28,7 +28,7 @@ export default Ember.Controller.extend({ @computed('model.type') showCategoryOptions(modelType) { - return !modelType.match(/_private_messages$/); + return !modelType.match(/_private_messages$/) && !modelType.match(/^page_view_/); }, @computed('model.type') diff --git a/app/models/report.rb b/app/models/report.rb index ecb7c27f3b0..d5751ad3159 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -66,11 +66,8 @@ class Report ApplicationRequest.where(req_type: ApplicationRequest.req_types[filter]) end - filtered_results = data - filtered_results = data.filtered_results.where(category_id: report.category_id) if report.category_id - report.data = [] - filtered_results.where('date >= ? AND date <= ?', report.start_date.to_date, report.end_date.to_date) + data.where('date >= ? AND date <= ?', report.start_date.to_date, report.end_date.to_date) .order(date: :asc) .group(:date) .sum(:count) @@ -79,7 +76,7 @@ class Report end report.total = data.sum(:count) - report.prev30Days = filtered_results.where('date >= ? AND date <= ?', + report.prev30Days = data.where('date >= ? AND date <= ?', (report.start_date - 31.days).to_date, (report.end_date - 31.days).to_date ) .sum(:count)