app/controllers/cohortly/reports_controller.rb in cohortly-0.0.5 vs app/controllers/cohortly/reports_controller.rb in cohortly-0.0.6
- old
+ new
@@ -1,12 +1,16 @@
class Cohortly::ReportsController < Cohortly::CohortlyController
def index
+ Cohortly::Metric.send :attr_accessor, :groups
@metric_search = Cohortly::Metric.new(params[:cohortly_metric])
tags = @metric_search.tags.any? ? @metric_search.tags : nil
- report_name = Cohortly::Metric.report_table_name(tags)
- unless Cohortly::Metric.database.collections.collect(&:name).include?( report_name )
- Cohortly::Metric.cohort_chart_for_tag(tags)
- end
- @report = Cohortly::Report.new( report_name )
+ groups = @metric_search.groups
+ @report_name = Cohortly::Metric.report_table_name(tags, groups, true)
+ # run this in background would be better
+ Cohortly::Metric.weekly_cohort_chart_for_tag(tags, groups)
+ @report = Cohortly::Report.new( tags, groups, true )
+ respond_to do |format|
+ format.html
+ format.js { render :json => @report }
+ end
end
-
end