From cc1d3b4f43ec4ebebf193cacc3ee16ffb47ad21f Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Fri, 12 Jan 2018 08:07:38 +1300
Subject: [PATCH] Use predicted finish times to put current plantings on the
 timeline

---
 app/controllers/gardens_controller.rb | 11 ++++++++---
 app/views/gardens/show.html.haml      |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb
index d2aa8bfe0..a8f664b6d 100644
--- a/app/controllers/gardens_controller.rb
+++ b/app/controllers/gardens_controller.rb
@@ -61,10 +61,15 @@ class GardensController < ApplicationController
   def timeline
     @data = []
     @garden = Garden.find(params[:garden_id])
-    @garden.plantings.where.not(finished_at: nil)
-      .where.not(planted_at: nil)
+    @garden.plantings.where.not(planted_at: nil)
       .order(finished_at: :desc).each do |p|
-      @data << [p.crop.name, p.planted_at, p.finished_at]
+
+      finish = if p.finished_at.present?
+                 p.finished_at
+               else
+                 p.finish_predicted_at
+               end
+      @data << [p.crop.name, p.planted_at, finish] if finish.present?
     end
     render json: @data
   end
diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml
index c6c08b792..3928cfa58 100644
--- a/app/views/gardens/show.html.haml
+++ b/app/views/gardens/show.html.haml
@@ -40,7 +40,7 @@
     .row
       = timeline garden_timeline_path(@garden), adapter: "google"
 
-    %h3 What's planted here?
+    %h3 Current plantings in garden
     .row
       - if @current_plantings.size.positive?
         - @current_plantings.each do |planting|