From 231dafd4e566e338e9a68234af55cc35ec4ebaf0 Mon Sep 17 00:00:00 2001
From: Andrew Brown <drusepth@gmail.com>
Date: Fri, 3 Mar 2023 10:25:12 -0800
Subject: [PATCH] don't check :| by default, other polish

---
 app/controllers/basil_controller.rb | 5 ++++-
 app/views/basil/help_rate.html.erb  | 1 +
 app/views/basil/stats.html.erb      | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

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 @@
               <div class="center" style="font-size: 0.9em"><strong>Feedback for Basil</strong></div>
               <div class="row">
                 <%= 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? %>
                   <div class="col s2 red lighten-3">
                     <label>
                       <%= f.radio_button :score_adjustment, '-2', { class: 'autosave-closest-form-on-change' } %>
diff --git a/app/views/basil/stats.html.erb b/app/views/basil/stats.html.erb
index 2f9ba9e0..47ff5c44 100644
--- a/app/views/basil/stats.html.erb
+++ b/app/views/basil/stats.html.erb
@@ -38,7 +38,7 @@
   </div>
   <div class="col s12 m8 l9">
     <%=
-      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'
       %>