move recurrence text helpers into patterns. move next_date calculation into

respective models

app/models/recurring_todos/yearly_repeat_pattern.rb

@@ -61,6 +61,37 @@ module RecurringTodos
       end      
     end
 
-  end
-  
+    def get_next_date(previous)
+      start = determine_start(previous)
+      day = every_x_day
+      month = get(:every_other2)
+
+      case recurrence_selector
+      when 0 # specific day of a specific month
+        if start.month > month || (start.month == month && start.day >= day)
+          # if there is no next month n and day m in this year, search in next
+          # year
+          start = Time.zone.local(start.year+1, month, 1)
+        else
+          # if there is a next month n, stay in this year
+          start = Time.zone.local(start.year, month, 1)
+        end
+        Time.zone.local(start.year, month, day)
+
+      when 1 # relative weekday of a specific month
+        # if there is no next month n in this year, search in next year
+        the_next = start.month > month ? Time.zone.local(start.year+1, month, 1) : start
+
+        # get the xth day of the month
+        the_next = get_xth_day_of_month(self.every_xth_day, day_of_week, month, the_next.year)
+
+        # if the_next is before previous, we went back into the past, so try next
+        # year
+        the_next = get_xth_day_of_month(self.every_xth_day, day_of_week, month, start.year+1) if the_next <= start
+
+        the_next
+      end
+    end
+
+  end  
 end