diff --git a/app/controllers/basil_controller.rb b/app/controllers/basil_controller.rb index a73758d6..c994f85d 100644 --- a/app/controllers/basil_controller.rb +++ b/app/controllers/basil_controller.rb @@ -65,6 +65,7 @@ class BasilController < ApplicationController # Feedback today @feedback_today = BasilFeedback.where('updated_at > ?', 24.hours.ago) + .order(:score_adjustment) .group(:score_adjustment) .count @emoji_counts_today = @feedback_today.map do |score, count| @@ -80,7 +81,9 @@ class BasilController < ApplicationController end # Feedback all time - @feedback_all_time = BasilFeedback.group(:score_adjustment).count + @feedback_all_time = BasilFeedback.order(:score_adjustment) + .group(:score_adjustment) + .count days_since_start = (Date.current - BasilFeedback.minimum(:updated_at).to_date) days_since_start = 1 if days_since_start.zero? # no dividing by 0 lol diff --git a/app/views/basil/help_rate.html.erb b/app/views/basil/help_rate.html.erb index 4967a4c1..64fd7f83 100644 --- a/app/views/basil/help_rate.html.erb +++ b/app/views/basil/help_rate.html.erb @@ -68,6 +68,7 @@
Feedback for Basil
<%= form_for commission.basil_feedbacks.find_or_initialize_by(user: current_user), url: basil_feedback_path(commission.job_id), method: :POST, remote: true do |f| %> + <% f.object.score_adjustment = nil if !f.object.persisted? %>
<%= - area_chart @commissions.group_by_day(:created_at), + area_chart @commissions.order(:created_at).group_by_day(:created_at).map { |date, count| [date.to_date, count] }, colors: ['#9C27B0', '#2196F3'], title: 'Images created per day' %>