diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index 3d2e079c380e1d84e7f1254bfb7ab27e96ecb5fc..a9db8bb2b82351145411d60e9645cdaa010ba8be 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -117,11 +117,19 @@ module TodosHelper def todo_due_date(todo) return unless todo.target.try(:due_date) - is_due_today = todo.target.due_date.try(:today?) - is_overdue = todo.target.try(:overdue?) + is_due_today = todo.target.due_date.today? + is_overdue = todo.target.overdue? + css_class = + if is_due_today + 'text-warning' + elsif is_overdue + 'text-danger' + else + '' + end html = "· ".html_safe - html << content_tag(:span, class: [('text-warning' if is_due_today), ('text-danger' if is_overdue)]) do + html << content_tag(:span, class: css_class) do "Due #{is_due_today ? "today" : todo.target.due_date.to_s(:medium)}" end end