Merge branch 'vacation-work'

app/controllers/login_controller.rb

@@ -54,7 +54,7 @@ class LoginController < ApplicationController
           end
         when :get
           if User.no_users_yet?
-            redirect_to :controller => 'users', :action => 'new'
+            redirect_to signup_path
             return
           end
       end

app/controllers/stats_controller.rb

@@ -319,6 +319,7 @@ class StatsController < ApplicationController
     # - actions not part of a hidden project
     # - actions not part of a hidden context
     # - actions not deferred (show_from must be null)
+    # - actions not pending/blocked
     
     @actions_running_time = @actions.find_by_sql([
         "SELECT t.created_at "+
@@ -326,7 +327,7 @@ class StatsController < ApplicationController
           "WHERE t.user_id=? "+
           "AND t.completed_at IS NULL " +
           "AND t.show_from IS NULL " +
-          "AND NOT (p.state='hidden' OR c.hide=?) " +
+          "AND NOT (p.state='hidden' OR p.state='pending' OR c.hide=?) " +
           "ORDER BY t.created_at ASC", @user.id, true]
     )
     

app/controllers/users_controller.rb

@@ -90,7 +90,7 @@ class UsersController < ApplicationController
 
         unless user.valid?
           session['new_user'] = user
-          redirect_to :action => 'new'
+          redirect_to signup_path
           return
         end
 

app/models/recurring_todo.rb

@@ -29,13 +29,17 @@ class RecurringTodo < ActiveRecord::Base
   
   validates_presence_of :description
   validates_presence_of :recurring_period
+  validates_presence_of :target
+  validates_presence_of :recurring_period
+  validates_presence_of :ends_on
+  validates_presence_of :context
+
   validates_length_of :description, :maximum => 100
   validates_length_of :notes, :maximum => 60000, :allow_nil => true 
 
-  validates_presence_of :context
-
   validate :period_specific_validations
   validate :starts_and_ends_on_validations
+  validate :set_recurrence_on_validations
   
   def period_specific_validations
     periods = %W[daily weekly monthly yearly]
@@ -57,9 +61,8 @@ class RecurringTodo < ActiveRecord::Base
       errors.add_to_base("Every other nth week may not be empty for recurrence setting")
     end
     something_set = false
-    %w{sunday monday tuesday wednesday thursday friday}.each do |day|
+    %w{sunday monday tuesday wednesday thursday friday saturday}.each do |day|
       something_set ||= self.send("on_#{day}")
-
     end
     errors.add_to_base("You must specify at least one day on which the todo recurs") if !something_set
   end
@@ -104,6 +107,21 @@ class RecurringTodo < ActiveRecord::Base
       errors.add_to_base("The end of the recurrence is not selected") unless ends_on == "no_end_date"
     end
   end
+
+  def set_recurrence_on_validations
+    # show always or x days before due date. x not null
+    case self.target
+    when 'show_from_date'
+      # no validations
+    when 'due_date'
+      errors.add_to_base("Please select when to show the action") if show_always.nil?
+      unless show_always
+        errors.add_to_base("Please fill in the number of days to show the todo before the due date") if show_from_delta.nil? || show_from_delta.blank?
+      end
+    else
+      raise Exception.new, "unexpected value of recurrence target selector '#{self.recurrence_target}'"
+    end
+  end
   
   # the following recurrence patterns can be stored:
   #
@@ -388,9 +406,9 @@ class RecurringTodo < ActiveRecord::Base
   end
   
   def recurrence_pattern
+    return "invalid repeat pattern" if every_other1.nil?
     case recurring_period
     when 'daily'
-      return "invalid repeat pattern" if every_other1.nil?
       if only_work_days
         return "on work days"
       else
@@ -401,21 +419,19 @@ class RecurringTodo < ActiveRecord::Base
         end
       end
     when 'weekly'
-      return "invalid repeat pattern" if every_other1.nil?
       if every_other1 > 1
         return "every #{every_other1} weeks"
       else
         return 'weekly'
       end
     when 'monthly'
-      return "invalid repeat pattern" if every_other1.nil? || every_other2.nil?
+      return "invalid repeat pattern" if every_other2.nil?
       if self.recurrence_selector == 0
         return "every #{self.every_other2} month#{self.every_other2>1?'s':''} on day #{self.every_other1}"
       else
         return "every #{self.xth} #{self.day_of_week} of every #{self.every_other2} month#{self.every_other2>1?'s':''}"
       end
     when 'yearly'
-      return "invalid repeat pattern" if every_other1.nil?
       if self.recurrence_selector == 0
         return "every year on #{self.month_of_year} #{self.every_other1}"
       else
@@ -535,8 +551,8 @@ class RecurringTodo < ActiveRecord::Base
       start = previous + 1.day
       if start.wday() == 0
         # we went to a new week , go to the nth next week and find first match
-        # that week
-        start += self.every_other1.week
+        # that week. Note that we already went into the next week, so -1
+        start += (self.every_other1-1).week
       end
       unless self.start_from.nil?
         # check if the start_from date is later than previous. If so, use
@@ -726,11 +742,7 @@ class RecurringTodo < ActiveRecord::Base
   end
   
   protected
-  
-  def validate
-    errors.add("", "At least one day must be selected in the weekly pattern") if self.every_day == '       '
-  end
-  
+    
   def determine_start(previous)
     if previous.nil?
       start = self.start_from.nil? ? Time.zone.now : self.start_from

app/models/todo.rb

@@ -18,7 +18,10 @@ class Todo < ActiveRecord::Base
 
   named_scope :active, :conditions => { :state => 'active' }
   named_scope :not_completed, :conditions =>  ['NOT (todos.state = ? )', 'completed']
+  named_scope :completed, :conditions =>  ["NOT completed_at IS NULL"]
   named_scope :are_due, :conditions => ['NOT (todos.due IS NULL)']
+  named_scope :deferred, :conditions => ["completed_at IS NULL AND NOT show_from IS NULL"]
+  named_scope :blocked, :conditions => ['todos.state = ?', 'pending']
 
   STARRED_TAG_NAME = "starred"
   RE_TODO = /[^"]+/

app/views/stats/_totals.rhtml

@@ -1,19 +1,21 @@
 <p>You have <%= @projects.count%> projects. 
-  Of those <%= @projects.count(:conditions => "state = 'active'")%> are active projects, 
-  <%= @projects.count(:conditions => "state = 'hidden'")%> hidden projects and 
-<%= @projects.count(:conditions => "state = 'completed'")%> completed projects</p>
+  Of those <%= @projects.active.count%> are active projects,
+  <%= @projects.hidden.count%> hidden projects and
+<%= @projects.completed.count%> completed projects</p>
 
 <p>You have <%= @contexts.count%> contexts. 
-Of those <%= @contexts.count(:conditions => ["hide = ?", false])%> are visible contexts and 
-<%= @contexts.count(:conditions => ["hide = ?", true]) %> are hidden contexts
+Of those <%= @contexts.active.count%> are visible contexts and
+<%= @contexts.hidden.count%> are hidden contexts
 
 <% unless @actions.empty? -%>
-<p>You have <%= @actions.count(:conditions => "completed_at IS NULL") %> incomplete actions 
-of which <%= @actions.count(:conditions => "completed_at IS NULL AND NOT show_from IS NULL") %> are deferred actions. </p>
+<p>Since your first action on <%= format_date(@first_action.created_at) %>
+you have a total of <%= @actions.count %> actions.
+<%= @actions.completed.count %> of these are completed.
 
-<p>Since your first action on <%= format_date(@first_action.created_at) %> 
-you have a total of <%= @actions.count %> actions. 
-<%= @actions.count(:conditions => "NOT completed_at IS NULL") %> of these are completed.
+<p>You have <%= @actions.not_completed.count %> incomplete actions
+of which <%= @actions.deferred.count %> are deferred actions
+in the tickler and <%= @actions.blocked.count %> are dependent on the completion of other actions.
+. </p>
 
 <p>You have <%= @tags_count-%> tags placed on actions. Of those tags,
 <%= @unique_tags_count -%> are unique.