Improved Stats on graphs page

app/controllers/application_controller.rb

@@ -3,8 +3,18 @@
 class ApplicationController < ActionController::Base
   include Pundit
 
+
+  before_action :configure_permitted_parameters, if: :devise_controller?
+
+
   rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
+  protected
+
+  def configure_permitted_parameters
+    devise_parameter_sanitizer.permit(:account_update, keys: [:people_in_household])
+  end
+
   private
 
   def authorize_user_pundit_rights(record)
@@ -19,4 +29,5 @@ def user_not_authorized(exception)
                       default: :default)
     redirect_to root_path
   end
+
 end

app/controllers/graphs_controller.rb

@@ -4,6 +4,7 @@ class GraphsController < ApplicationController
   before_action :authenticate_user!
 
   def index
+    @date = Date.today
     @graph_presenter = GraphPresenter.new(current_user.id)
   end
 end

app/models/user.rb

@@ -5,4 +5,6 @@ class User < ApplicationRecord
   # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :validatable
+
+  validates :people_in_household, numericality: { only_integer: true, greater_than: 0, less_than: 15 }
 end

app/views/devise/registrations/edit.haml

@@ -29,6 +29,10 @@
         %i (we need your current password to confirm your changes)
         = f.password_field :current_password, autocomplete: "current-password",
           class: 'form-control'
+      .form-group
+        = f.label :people_in_household
+        %i (Tell us the number of people contributing to your waste in order to properly compute your per capita stats)
+        = f.text_field :people_in_household, class: 'form-control'
     .card-footer
       = f.submit "Update", class: 'btn btn-success'
 

app/views/graphs/index.haml

@@ -11,17 +11,22 @@
 
 .card
   .card-header
-    %h3 The current per head values for garabe
+    %h3= "Monthly Statistics: #{@date.strftime("%B %Y")}"
   .card-body
     %table.table
       %thead
         %tr
-          %th Kind
-          %th per head/per month
+          %th.text-left Kind
+          %th.text-left Your household (total)
+          %th.text-left Your household (per person)
+          %th.text-right Average household (per person)
           %th Source
       %tbody
         - GraphPresenter::GARBAGE.each do |key, value|
+          - household_weight = Pile.where(user_id: current_user.id).where(kind: key).group("DATE_TRUNC('month', produced_at)").sum(:weight).values.first
           %tr
-            %td= key
+            %td.text-left= key
+            %td.text-left="#{household_weight}g"
+            %td.text-left="#{household_weight/current_user.people_in_household}g"
             %td.text-right= "#{value[:limit]} g"
-            %td= link_to value[:source]
+            %td= link_to 'Source', value[:source]

db/migrate/20210428202726_add_people_in_household_to_users.rb

@@ -0,0 +1,8 @@
+class AddPeopleInHouseholdToUsers < ActiveRecord::Migration[6.1]
+  def change
+    add_column :users, :people_in_household, :integer, default: 1
+    User.all.each do |user|
+      user.update_attribute(:people_in_household, 1)
+    end
+  end
+end