From 09651687503ea6df3e2c9ada4778c00fd70d3158 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 19 Oct 2019 11:24:17 +1300
Subject: [PATCH] Group previous plantings by year

---
 app/controllers/gardens_controller.rb |  4 +---
 app/views/gardens/_previously.haml    | 13 +++++++++++++
 app/views/gardens/show.html.haml      | 12 +++---------
 3 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 app/views/gardens/_previously.haml

diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb
index 4fff56da5..d6f8680e6 100644
--- a/app/controllers/gardens_controller.rb
+++ b/app/controllers/gardens_controller.rb
@@ -20,9 +20,7 @@ class GardensController < ApplicationController
     @current_plantings = @garden.plantings.current
       .includes(:crop, :owner)
       .order(planted_at: :desc)
-    @finished_plantings = @garden.plantings.finished
-      .includes(:crop)
-      .order(finished_at: :desc)
+    @finished_plantings = @garden.plantings.finished.includes(:crop)
     respond_with(@garden)
   end
 
diff --git a/app/views/gardens/_previously.haml b/app/views/gardens/_previously.haml
new file mode 100644
index 000000000..0bb5bfb2b
--- /dev/null
+++ b/app/views/gardens/_previously.haml
@@ -0,0 +1,13 @@
+%h2 Previously planted in this garden
+
+- if @finished_plantings.size.positive?
+  - year = nil
+  - @finished_plantings.order(planted_at: :desc).each do |planting|
+    - if year != planting.planted_at.year
+      - year = planting.planted_at.year
+      %h4= year
+    = render "plantings/tiny",  planting: planting
+- else
+  .col-md-12
+    %p Nothing has been planted here.
+
diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml
index 8c0aa69d3..5ab477951 100644
--- a/app/views/gardens/show.html.haml
+++ b/app/views/gardens/show.html.haml
@@ -56,15 +56,9 @@
         - else
           .col-md-12
             %p Nothing is currently planted here.
-    %section
-      %h2 Previously planted in this garden
-      .index-cards
-        - if @finished_plantings.size.positive?
-          - @finished_plantings.each do |planting|
-            = render "plantings/tiny",  planting: planting
-        - else
-          .col-md-12
-            %p Nothing has been planted here.
+
+    %section= render 'previously'
+
   .col-md-3
     .card
       .card-image