Merge pull request #395 from DefactoSoftware/hugo/fix-billables-memor…

…y-issue

[ready] Fix extreme memory usages on /billables for accounts with 7000+ billable entries

app/assets/stylesheets/_billables.scss

@@ -26,10 +26,8 @@
 
     max-width: 90em;
 
-    .submit-billable-entries {
-      @include media($laptop-screen) {
-        opacity: 0;
-      }
+    #submit-billable-entries-test {
+      opacity: .0;
     }
   }
 }

app/controllers/billables_controller.rb

@@ -1,12 +1,6 @@
 class BillablesController < ApplicationController
   def index
-    @hours_entries = Hour.query(entry_filter_or_default,
-                                [:user, :project, :category])
-    @mileages_entries = Mileage.query(entry_filter_or_default,
-                                      [:user, :project])
-
-    @billable_list = BillableList.new(@hours_entries, @mileages_entries)
-    @filters = EntryFilter.new(entry_filter_or_default)
+    @projects = projects_with_billable_entries
   end
 
   def bill_entries
@@ -22,7 +16,11 @@ def bill_entries
 
   private
 
-  def entry_filter_or_default
-    params[:entry_filter] || { billed: false }
+  def projects_with_billable_entries
+    billable_projects = Project.where(billable: true, archived: false)
+
+    billable_projects.select do |project|
+      project if project.has_billable_entries?
+    end
   end
 end

app/helpers/application_helper.rb

@@ -42,7 +42,7 @@ def current_locale
 
   def billable_entry_checkbox(entry, entry_type)
     if entry.billed
-      "√"
+      "✓"
     else
       tag(:input,
           type: "checkbox",
@@ -77,4 +77,9 @@ def easter?
     holiday = Holidays.on(Date.today, :nl)
     holiday[0][:name] == "Pasen" if holiday.any?
   end
+
+  def billable_hours_of(project)
+    Hour.includes(:category, :user, :project).
+      where(project: project, billed: false)
+  end
 end

app/models/project.rb

@@ -50,6 +50,11 @@ def budget_status
     budget - hours.sum(:value) if budget
   end
 
+  def has_billable_entries?
+    hours.exists?(billed: false) ||
+      mileages.exists?(billed: false)
+  end
+
   private
 
   def slug_source

app/views/billables/_hours_entries.html.haml

@@ -8,14 +8,12 @@
     %th= t("billables.table.category")
     %th= t("billables.table.hours")
     %th= t("billables.table.user")
-  - entries.each do |entry|
+  - billable_hours_of(project).each do |hour|
     %tr.info-row
-      %td=billable_entry_checkbox(entry, "hours")
-      %td=I18n.l (entry.date)
-      %td=entry.category.name
-      %td.center= entry.value
+      %td= billable_entry_checkbox(hour, "hours")
+      %td= I18n.l (hour.date)
+      %td= hour.category.name
+      %td.center= hour.value
       %td
-        = link_to entry.user do
-          = entry.user.full_name
-
-
+        = link_to hour.user do
+          = hour.user.full_name

app/views/billables/_mileages_entries.html.haml

@@ -8,12 +8,12 @@
     %th
     %th= t("entries.index.mileages")
     %th= t("billables.table.user")
-  - entries.each do |entry|
+  - project.mileages.where(billed: false).each do |mileage|
     %tr.info-row
-      %td=billable_entry_checkbox(entry, "mileages")
-      %td=I18n.l (entry.date)
+      %td= billable_entry_checkbox(mileage, "mileages")
+      %td= I18n.l (mileage.date)
       %td
-      %td.center= entry.value
+      %td.center= mileage.value
       %td
-        = link_to entry.user do
-          = entry.user.full_name
+        = link_to mileage.user do
+          = mileage.user.full_name

app/views/billables/index.html.haml

@@ -4,17 +4,14 @@
   %button{id: "submit-billable-entries", disabled: true}
     =t("billables.buttons.bill_selected")
 .billables
-  .sidebar
-    .container
-      = render partial: "filters", locals: { filter_url: billables_path }
   .outer
     %h1= t("billables.billable_entries")
-    - unless @hours_entries.any? || @mileages_entries.any?
-      .info
-        %p= t("info.no_billable_entries_html")
     = form_tag("/billables", method: "post", remote: true, id: "billable-entries-form", autocomplete: "off") do
-      - @billable_list.clients.each do |client|
-        %h1= client.name
-        = render "projects", projects: client.projects
-
-
+      - @projects.each do |project|
+        .container
+          %h1= project.name
+          - if project.hours.exists?(billed: false)
+            = render "hours_entries", project: project
+          - if project.mileages.exists?(billed: false)
+            = render "mileages_entries", project: project
+      %button#submit-billable-entries-test= t("billables.buttons.bill_selected")