From 2bc164bd2ed5b3b64af993d991555e5844ffe069 Mon Sep 17 00:00:00 2001
From: Daniel O'Connor <daniel.oconnor@gmail.com>
Date: Sun, 7 Sep 2025 07:59:51 +0000
Subject: [PATCH] Render history

---
 app/controllers/gardens_controller.rb   | 1 +
 app/controllers/plantings_controller.rb | 1 +
 app/views/gardens/_previously.haml      | 5 +++++
 app/views/plantings/show.html.haml      | 6 +++++-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb
index 7bbf05f7b..3d50dfa03 100644
--- a/app/controllers/gardens_controller.rb
+++ b/app/controllers/gardens_controller.rb
@@ -20,6 +20,7 @@ class GardensController < DataController
   def show
     @current_plantings = @garden.plantings.current.where.not(failed: true).includes(:crop, :owner).order(planted_at: :desc)
     @current_activities = @garden.activities.current.includes(:owner).order(created_at: :desc)
+    @finished_activities = @garden.activities.finished.includes(:owner).order(created_at: :desc)
     @finished_plantings = @garden.plantings.finished.includes(:crop)
     @suggested_companions = Crop.approved.where(
       id: CropCompanion.where(crop_a_id: @current_plantings.select(:crop_id)).select(:crop_b_id)
diff --git a/app/controllers/plantings_controller.rb b/app/controllers/plantings_controller.rb
index 07a73cbce..c123fb869 100644
--- a/app/controllers/plantings_controller.rb
+++ b/app/controllers/plantings_controller.rb
@@ -37,6 +37,7 @@ class PlantingsController < DataController
     @photos = @planting.photos.includes(:owner).order(date_taken: :desc)
     @harvests = Harvest.search(where: { planting_id: @planting.id })
     @current_activities = @planting.activities.current.includes(:owner).order(created_at: :desc)
+    @finished_activities = @planting.activities.finished.includes(:owner).order(created_at: :desc)
     @matching_seeds = matching_seeds
     @crop = @planting.crop
 
diff --git a/app/views/gardens/_previously.haml b/app/views/gardens/_previously.haml
index c0c8d9968..8da1fa25b 100644
--- a/app/views/gardens/_previously.haml
+++ b/app/views/gardens/_previously.haml
@@ -16,3 +16,8 @@
   .col-md-12
     %p Nothing has been planted here.
 
+- if @finished_activities&.size&.positive?
+  %h2 Finished activities in garden
+  .index-cards
+    - @finished_activities.each do |activity|
+      = render "activities/card", activity: activity
\ No newline at end of file
diff --git a/app/views/plantings/show.html.haml b/app/views/plantings/show.html.haml
index 9841b8329..21a6d0635 100644
--- a/app/views/plantings/show.html.haml
+++ b/app/views/plantings/show.html.haml
@@ -89,7 +89,11 @@
           - else
             .col-md-12
               %p Nothing is currently planned here.
-
+      - if @finished_activities&.size&.positive?
+        %h2 Finished activities for planting
+        .index-cards
+          - @finished_activities.each do |activity|
+            = render "activities/card", activity: activity
 
     .col-md-4.col-xs-12
       = render @planting.crop