From e2bdbeff23fd566074f5adc322ba1fa8720cc795 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 4 Feb 2024 05:18:57 +0000 Subject: [PATCH] Parse date --- app/views/plantings/index.ics.erb | 4 +++- spec/requests/plantings_spec.rb | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/views/plantings/index.ics.erb b/app/views/plantings/index.ics.erb index c5f44b445..818384021 100644 --- a/app/views/plantings/index.ics.erb +++ b/app/views/plantings/index.ics.erb @@ -29,8 +29,10 @@ cal.description = "Plantings by #{@owner.login_name}" cal.add_event(event) if finish_date && finish_date > Date.today + predicted_date = Date.parse(planting['first_harvest_predicted_at']) if planting['first_harvest_predicted_at'] + todo = Icalendar::Todo.new - todo.dtstart = planting['first_harvest_predicted_at'] || finish_date || Date.today + todo.dtstart = predicted_date || finish_date || Date.today todo.due = finish_date todo.summary = "Harvest #{planting['crop_name']}" diff --git a/spec/requests/plantings_spec.rb b/spec/requests/plantings_spec.rb index 0c485de11..ff5bc511b 100644 --- a/spec/requests/plantings_spec.rb +++ b/spec/requests/plantings_spec.rb @@ -14,13 +14,15 @@ describe "Plantings" do context "with a member" do before do @member = create(:interesting_member) - @predictable_planting = create(:predictable_planting, owner: @member) + + @predictable_planting = create(:predictable_planting, owner: @member, planted_at: 1.days.ago, days_to_first_harvest: 10, days_to_last_harvest: 20) + @predictable_planting.crop.update(median_days_to_first_harvest: 10) + @seedling_planting = create(:seedling_planting, owner: @member) @seed_planting = create(:seed_planting, owner: @member) @finished_planting = create(:finished_planting, owner: @member) @annual_planting = create(:annual_planting, owner: @member) @perennial_planting = create(:perennial_planting, owner: @member) - Planting.reindex end