Merge branch 'dev'

This commit is contained in:
gregoirenovel 2018-08-27 18:01:19 +02:00
commit 243c1967f5

View file

@ -96,7 +96,7 @@ class StatsController < ApplicationController
totals = Feedback.where(created_at: 5.weeks.ago..Time.now).group_by_week(:created_at).count totals = Feedback.where(created_at: 5.weeks.ago..Time.now).group_by_week(:created_at).count
Feedback::rating.values.map do |rating| Feedback.ratings.values.map do |rating|
data = Feedback data = Feedback
.where(created_at: 5.weeks.ago..Time.now, rating: rating) .where(created_at: 5.weeks.ago..Time.now, rating: rating)
.group_by_week(:created_at) .group_by_week(:created_at)