Project

General

Profile

Patch #6928 » 6928-Still-display-versions-which-are-due-today.patch

Holger Just, 2010-11-17 21:05

View differences:

app/helpers/application_helper.rb
167 167
  
168 168
  def due_date_distance_in_words(date)
169 169
    if date
170
      l((date < Date.today ? :label_roadmap_overdue : :label_roadmap_due_in), distance_of_date_in_words(Date.today, date))
170
      if date == Date.today
171
        l(:label_roadmap_due_today)
172
      else
173
        label = (date < Date.today ? :label_roadmap_overdue : :label_roadmap_due_in)
174
        l(label, distance_of_date_in_words(Date.today, date))
175
      end
171 176
    end
172 177
  end
173 178

  
app/models/version.rb
71 71
  
72 72
  # Returns true if the version is completed: due date reached and no open issues
73 73
  def completed?
74
    effective_date && (effective_date <= Date.today) && (open_issues_count == 0)
74
    effective_date && (effective_date < Date.today) && (open_issues_count == 0)
75 75
  end
76 76

  
77 77
  def behind_schedule?
config/locales/de.yml
649 649
  label_sort_lowest: Ans Ende
650 650
  label_roadmap: Roadmap
651 651
  label_roadmap_due_in: "Fällig in {{value}}"
652
  label_roadmap_due_doday: "Fällig heute"
652 653
  label_roadmap_overdue: "{{value}} verspätet"
653 654
  label_roadmap_no_issues: Keine Tickets für diese Version
654 655
  label_search: Suche
config/locales/en.yml
636 636
  label_sort_lower: Move down
637 637
  label_sort_lowest: Move to bottom
638 638
  label_roadmap: Roadmap
639
  label_roadmap_due_today: "Due today"
639 640
  label_roadmap_due_in: "Due in {{value}}"
640 641
  label_roadmap_overdue: "{{value}} late"
641 642
  label_roadmap_no_issues: No issues for this version
test/unit/helpers/application_helper_test.rb
571 571
 end
572 572
 def test_due_date_distance_in_words
573
    to_test = { Date.today => 'Due in 0 days',
573
    to_test = { Date.today => 'Due today',
574 574
                Date.today + 1 => 'Due in 1 day',
575 575
                Date.today + 100 => 'Due in about 3 months',
576 576
                Date.today + 20000 => 'Due in over 54 years',
    (1-1/1)