replace new repeating todo form with jquery dialog. And some refactoring

app/controllers/recurring_todos_controller.rb

@@ -9,8 +9,8 @@ class RecurringTodosController < ApplicationController
     @page_title = t('todos.recurring_actions_title')
     @source_view = params['_source_view'] || 'recurring_todo'
     find_and_inactivate
-    @recurring_todos = current_user.recurring_todos.active
-    @completed_recurring_todos = current_user.recurring_todos.completed.find(:all, :limit => 10)
+    @recurring_todos = current_user.recurring_todos.active.find(:all, :include => [:tags, :taggings])
+    @completed_recurring_todos = current_user.recurring_todos.completed.find(:all, :limit => 10, :include => [:tags, :taggings])
 
     @no_recurring_todos = @recurring_todos.size == 0
     @no_completed_recurring_todos = @completed_recurring_todos.size == 0
@@ -21,15 +21,15 @@ class RecurringTodosController < ApplicationController
 
   def new
   end
-  
+
   def show
   end
-  
+
   def done
     @page_title = t('todos.completed_recurring_actions_title')
     @source_view = params['_source_view'] || 'recurring_todo'
     items_per_page = 20
-    page = params[:page] || 1    
+    page = params[:page] || 1
     @completed_recurring_todos = current_user.recurring_todos.completed.paginate :page => params[:page], :per_page => items_per_page
     @total = @count = current_user.recurring_todos.completed.count
     @range_low = (page.to_i-1) * items_per_page + 1
@@ -54,7 +54,7 @@ class RecurringTodosController < ApplicationController
     params['recurring_todo']['recurring_period']=params['recurring_edit_todo']['recurring_period']
     params['recurring_todo']['end_date']=parse_date_per_user_prefs(params['recurring_todo_edit_end_date'])
     params['recurring_todo']['start_from']=parse_date_per_user_prefs(params['recurring_todo_edit_start_from'])
-    
+
     # update project
     if params['recurring_todo']['project_id'].blank? && !params['project_name'].nil?
       if params['project_name'] == 'None'
@@ -70,7 +70,7 @@ class RecurringTodosController < ApplicationController
       end
       params["recurring_todo"]["project_id"] = project.id
     end
-    
+
     # update context
     if params['recurring_todo']['context_id'].blank? && !params['context_name'].blank?
       context = current_user.contexts.find_by_name(params['context_name'].strip)
@@ -88,14 +88,14 @@ class RecurringTodosController < ApplicationController
     %w{monday tuesday wednesday thursday friday saturday sunday}.each do |day|
       params["recurring_todo"]["weekly_return_"+day]=' ' if params["recurring_todo"]["weekly_return_"+day].nil?
     end
-    
+
     @saved = @recurring_todo.update_attributes params["recurring_todo"]
 
     respond_to do |format|
       format.js
     end
   end
-  
+
   def create
     p = RecurringTodoCreateParamsHelper.new(params)
     p.attributes['end_date']=parse_date_per_user_prefs(p.attributes['end_date'])
@@ -109,7 +109,7 @@ class RecurringTodosController < ApplicationController
       @new_project_created = project.new_record_before_save?
       @recurring_todo.project_id = project.id
     end
-    
+
     if p.context_specified_by_name?
       context = current_user.contexts.find_or_create_by_name(p.context_name)
       @new_context_created = context.new_record_before_save?
@@ -134,13 +134,13 @@ class RecurringTodosController < ApplicationController
       @new_recurring_todo = RecurringTodo.new
     else
       @status_message = t('todos.error_saving_recurring')
-    end    
-    
+    end
+
     respond_to do |format|
-      format.js 
+      format.js
     end
   end
-  
+
   def destroy
     # remove all references to this recurring todo
     @todos = @recurring_todo.todos
@@ -149,16 +149,16 @@ class RecurringTodosController < ApplicationController
       t.recurring_todo_id = nil
       t.save
     end
-    
+
     # delete the recurring todo
     @saved = @recurring_todo.destroy
 
     # count remaining recurring todos
     @active_remaining = current_user.recurring_todos.active.count
     @completed_remaining = current_user.recurring_todos.completed.count
-    
+
     respond_to do |format|
-      
+
       format.html do
         if @saved
           notify :notice, t('todos.recurring_deleted_success'), 2.0
@@ -168,10 +168,10 @@ class RecurringTodosController < ApplicationController
           redirect_to :action => 'index'
         end
       end
-      
+
       format.js do
         render
-      end    
+      end
     end
   end
 
@@ -184,19 +184,19 @@ class RecurringTodosController < ApplicationController
 
     if @recurring_todo.active?
       @completed_remaining = current_user.recurring_todos.completed.count
-      
+
       # from completed back to active -> check if there is an active todo
       @active_todos = @recurring_todo.todos.active.count
       # create todo if there is no active todo belonging to the activated
       # recurring_todo
       @new_recurring_todo = create_todo_from_recurring_todo(@recurring_todo) if @active_todos == 0
     end
-    
+
     respond_to do |format|
-      format.js 
+      format.js
     end
   end
-  
+
   def toggle_star
     @recurring_todo.toggle_star!
     @saved = @recurring_todo.save!
@@ -204,13 +204,13 @@ class RecurringTodosController < ApplicationController
       format.js
     end
   end
-  
+
   class RecurringTodoCreateParamsHelper
 
     def initialize(params)
       @params = params['request'] || params
       @attributes = params['request'] && params['request']['recurring_todo']  || params['recurring_todo']
-      
+
       # make sure all selectors (recurring_period, recurrence_selector,
       # daily_selector, monthly_selector and yearly_selector) are first in hash
       # so that they are processed first by the model
@@ -221,47 +221,47 @@ class RecurringTodosController < ApplicationController
         'yearly_selector' => @attributes['yearly_selector']
       }
     end
-      
+
     def attributes
       @attributes
     end
-    
+
     def selector_attributes
       return @selector_attributes
     end
-            
+
     def project_name
       @params['project_name'].strip unless @params['project_name'].nil?
     end
-      
+
     def context_name
       @params['context_name'].strip unless @params['context_name'].nil?
     end
-      
+
     def tag_list
       @params['tag_list']
     end
-            
+
     def project_specified_by_name?
       return false unless @attributes['project_id'].blank?
       return false if project_name.blank?
       return false if project_name == 'None'
       true
     end
-      
+
     def context_specified_by_name?
       return false unless @attributes['context_id'].blank?
       return false if context_name.blank?
       true
     end
-      
+
   end
 
   private
-  
+
   def init
     @days_of_week = []
-    0.upto 6 do |i| 
+    0.upto 6 do |i|
       @days_of_week << [t('date.day_names')[i], i]
     end
 
@@ -274,15 +274,18 @@ class RecurringTodosController < ApplicationController
     @projects = current_user.projects.find(:all, :include => [:default_context])
     @contexts = current_user.contexts.find(:all)
   end
-  
+
   def get_recurring_todo_from_param
     @recurring_todo = current_user.recurring_todos.find(params[:id])
   end
 
   def find_and_inactivate
     # find active recurring todos without active todos and inactivate them
-    recurring_todos = current_user.recurring_todos.active
-    recurring_todos.each { |rt| rt.toggle_completion! if rt.todos.not_completed.count == 0}
+
+    current_user.recurring_todos.active.all(
+      :select => "recurring_todos.id, recurring_todos.state",
+      :joins => "LEFT JOIN todos fai_todos ON (recurring_todos.id = fai_todos.recurring_todo_id) AND (NOT fai_todos.state='completed')",
+      :conditions => "fai_todos.id IS NULL").each { |rt| current_user.recurring_todos.find(rt.id).toggle_completion! }
   end
-  
+
 end

app/models/recurring_todo.rb

@@ -467,7 +467,11 @@ class RecurringTodo < ActiveRecord::Base
   end
 
   def starred?
-    tags.any? {|tag| tag.name == Todo::STARRED_TAG_NAME }
+    return has_tag?(Todo::STARRED_TAG_NAME)
+  end
+
+  def has_tag?(tag_name)
+    return self.tags.any? {|tag| tag.name == tag_name}
   end
 
   def get_due_date(previous)

app/views/recurring_todos/_recurring_todo.html.erb

@@ -1,8 +1,9 @@
 <% @recurring_todo = recurring_todo -%>
 <div id="<%= dom_id(@recurring_todo)%>" class="recurring_todo item-container">
-  <%= recurring_todo_remote_delete_icon %> <%= recurring_todo_remote_edit_icon -%> 
-
-  <%= recurring_todo_remote_star_icon %> <%= recurring_todo_remote_toggle_checkbox -%>
+  <%= recurring_todo_remote_delete_icon %>
+  <%= recurring_todo_remote_edit_icon -%>
+  <%= recurring_todo_remote_star_icon %>
+  <%= recurring_todo_remote_toggle_checkbox -%>
   <div class="rec_description">
     <span class="todo.descr"><%= sanitize(recurring_todo.description) %></span> <%= recurring_todo_tag_list %>
     <span class='recurrence_pattern'>

app/views/recurring_todos/_recurring_todo_form.erb

@@ -1,10 +1,10 @@
 <%- reset_tab_index %>
 <div class="recurring_container">
-  <% 
+  <%
   form_for(@new_recurring_todo, :html=> { :id=>'recurring-todo-form-new-action', :name=>'recurring_todo', :class => 'inline-form' }) do
     -%>
     <div id="error_status"><%= error_messages_for("item", :object_name => 'action') %></div>
-  
+
     <div id="recurring_todo_form_container">
       <div id="recurring_todo">
         <label for="recurring_todo_description"><%= Todo.human_attribute_name('description') %></label><%=
@@ -14,12 +14,12 @@
         <label for="recurring_todo_project_name"><%= Todo.human_attribute_name('project') %></label>
         <input id="recurring_todo_project_name" name="project_name" autocomplete="off" tabindex="<%=next_tab_index%>" size="30" type="text" value="" />
         <div class="page_name_auto_complete" id="project_list" style="display:none"></div>
-      
+
         <label for="recurring_todo_context_name"><%= Todo.human_attribute_name('context') %></label>
         <input id="recurring_todo_context_name" name="context_name" autocomplete="off" tabindex="<%=next_tab_index%>" size="30" type="text" value="<%= current_user.contexts.first.name unless current_user.contexts.first.nil?%>" />
-        <div class="page_name_auto_complete" id="context_list" style="display:none"></div>  
+        <div class="page_name_auto_complete" id="context_list" style="display:none"></div>
         <label for="tag_list"><%= "#{Todo.human_attribute_name('tags')} #{t('shared.separate_tags_with_commas')}"%></label>
-        <%= text_field_tag "tag_list", nil, :size => 30, :tabindex => next_tab_index -%> 
+        <%= text_field_tag "tag_list", nil, :size => 30, :tabindex => next_tab_index -%>
       </div>
     </div>
     <div id="recurring_period_id">
@@ -88,17 +88,6 @@
       <%= radio_button_tag('recurring_todo[recurring_target]', 'show_from_date', false, {:tabindex => next_tab_index})%> <%= t('todos.recurrence.from_tickler') %><br/>
       <br/>
     </div>
-    <div class="recurring_submit_box">
-      <div class="widgets">
-        <button type="submit" class="positive" id="recurring_todo_new_action_submit" tabindex="<%=next_tab_index%>">
-          <%=image_tag("accept.png", :alt => "") %>
-          <%= t('common.create') %>
-        </button>
-        <button type="button" class="positive" id="recurring_todo_new_action_cancel" tabindex="<%=next_tab_index%>">
-          <%=image_tag("cancel.png", :alt => "") %>
-          <%= t('common.cancel') %>
-        </button>
-      </div>
-    </div>
+
   <% end %>
 </div>

app/views/recurring_todos/create.js.erb

@@ -1,8 +1,8 @@
 <% if @saved -%>
   TracksPages.page_notify('notice', "<%=@status_message%>", 5);
-  RecurringTodosPage.toggle_overlay();
   add_recurring_todo_to_active_container();
   replace_form_with_empty_form();
+  $( "#new-recurring-todo" ).dialog( "close" );
   TracksPages.set_page_badge(<%= @down_count %>);
 <% else -%>
   TracksPages.show_errors(html_for_error_messages());

app/views/recurring_todos/index.html.erb

@@ -8,7 +8,7 @@
       <%= render :partial => @recurring_todos %>
     </div>
   </div>
-  
+
   <div class="container" id="completed_recurring_todos_container">
     <div class=add_note_link><%= link_to "Show all", done_recurring_todos_path%></div>
     <h2><%= t('common.last') %> <%= t('todos.completed_recurring') %></h2>
@@ -26,12 +26,9 @@
   </div>
 </div>
 
-<div id="overlay">
-  <div id="new-recurring-todo" class="new-form">
-    <label><%= t('todos.add_new_recurring') %></label><br/>
-    <%= render :partial => "recurring_todo_form" %>
-  </div>
-  <div id="edit-recurring-todo" class="edit-form"  style="display:none">
-    <div class='placeholder'>This should not be visible</div>
-  </div>
+<div id="new-recurring-todo" class="new-form" title="<%= t('todos.add_new_recurring') %>">
+  <%= render :partial => "recurring_todo_form" %>
+</div>
+<div id="edit-recurring-todo" class="edit-form"  style="display:none">
+  <div class='placeholder'>This should not be visible</div>
 </div>