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
@@ -281,8 +281,11 @@ class RecurringTodosController < ApplicationController
 
   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

@@ -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

@@ -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>

public/javascripts/application.js

@@ -991,64 +991,93 @@ var RecurringTodosPage = {
             $('#recurring_edit_'+this).hide();
         });
     },
+    reset_radio: function () {
+      $('input:radio[name="recurring_todo[recurring_period]"]')[0].checked = true;
+    },
     toggle_overlay: function () {
         var overlay_element = document.getElementById("overlay");
         overlay_element.style.visibility = (overlay_element.style.visibility == "visible") ? "hidden" : "visible";
     },
     setup_behavior: function() {
-        /* cancel button on new recurring todo form */
-        $("#recurring_todo_new_action_cancel").live('click', function(){
-            $('#recurring-todo-form-new-action input:text:first').focus();
-            RecurringTodosPage.hide_all_recurring();
-            $('#recurring_daily').show();
-            RecurringTodosPage.toggle_overlay();
-        });
-        /* cancel button on edit recurring todo form */
-        $("#recurring_todo_edit_action_cancel").live('click', function(){
-            $('#recurring-todo-form-edit-action input:text:first').focus();
-            RecurringTodosPage.hide_all_recurring();
-            $('#recurring_daily').show();
-            RecurringTodosPage.toggle_overlay();
-        });
-        /* change recurring period radio input on edit form */
-        $("#recurring_edit_period input").live('click', function(){
-            RecurringTodosPage.hide_all_edit_recurring();
-            $('#recurring_edit_'+this.id.split('_')[5]).show();
-        });
-        /* change recurring period radio input on new form */
-        $("#recurring_period input").live('click', function(){
-            RecurringTodosPage.hide_all_recurring();
-            $('#recurring_'+this.id.split('_')[4]).show();
-        });
-        /* add new recurring todo plus-button in sidebar */
-        $("#add-new-recurring-todo").live('click', function(){
-            $('#new-recurring-todo').show();
-            $('#edit-recurring-todo').hide();
-            RecurringTodosPage.toggle_overlay();
-        });
-        /* submit form when editing a recurring todo */
-        $("#recurring_todo_edit_action_submit").live('click', function (ev) {
+      /* add new recurring todo plus-button in sidebar */
+      $("#add-new-recurring-todo").live('click', function(){
+        $( "#new-recurring-todo" ).dialog( "open" );
+      });
+
+      /* setup dialog for new repeating action */
+      $( "#new-recurring-todo" ).dialog({
+    		autoOpen: false,
+        height: 690,
+  			width: 750,
+  			modal: true,
+        buttons: {
+          "Create": function() {
+              submit_with_ajax_and_block_element('form.#recurring-todo-form-new-action', $(this));
+            },
+            Cancel: function() {
+  					$( this ).dialog( "close" );
+          }
+        },
+        show: "fade",
+        hide: "fade",
+        close: function() {
+          $('#recurring-todo-form-new-action input:text:first').focus();
+          RecurringTodosPage.hide_all_recurring();
+          RecurringTodosPage.reset_radio();
+          $('#recurring_daily').show();
+        }
+      });
+
+      /* change recurring period radio input on new form */
+      $("#recurring_period input").live('click', function(){
+          RecurringTodosPage.hide_all_recurring();
+          $('#recurring_'+this.id.split('_')[4]).show();
+      });
+
+      /* setup dialog for new repeating action */
+      $( "#edit-recurring-todo" ).dialog({
+    		autoOpen: false,
+        height: 690,
+  			width: 750,
+  			modal: true,
+        buttons: {
+          "Create": function() {
             submit_with_ajax_and_block_element('form#recurring-todo-form-edit-action', $(this));
-            return false;
-        });
-        /* submit form for new recurring todo */
-        $("#recurring_todo_new_action_submit").live('click', function (ev) {
-            submit_with_ajax_and_block_element('form.#recurring-todo-form-new-action', $(this));
-            return false;
-        });
-        /* set behavior for edit recurring todo */
-        $(".item-container a.edit_icon").live('click', function (ev){
-            get_with_ajax_and_block_element(this.href, $(this).parents(".item-container"));
-            return false;
-        });
-        /* delete button to delete a todo from the list */
-        $('.item-container a.delete_icon').live('click', function(evt){
-            var confirm_message = $(this).attr("x_confirm_message")
-            if(confirm(confirm_message)){
-                delete_with_ajax_and_block_element(this.href, $(this).parents('.project'));
+          },
+          Cancel: function() {
+  					$( this ).dialog( "close" );
+          }
+        },
+        show: "fade",
+        hide: "fade",
+        close: function() {
+          $('#recurring-todo-form-edit-action input:text:first').focus();
+          RecurringTodosPage.hide_all_recurring();
+          RecurringTodosPage.reset_radio();
+          $('#recurring_daily').show();
+        }
+      });
+
+      /* change recurring period radio input on edit form */
+      $("#recurring_edit_period input").live('click', function(){
+          RecurringTodosPage.hide_all_edit_recurring();
+          $('#recurring_edit_'+this.id.split('_')[5]).show();
+      });
+
+      /* set behavior for edit recurring todo */
+      $(".item-container a.edit_icon").live('click', function (ev){
+          get_with_ajax_and_block_element(this.href, $(this).parents(".item-container"));
+          return false;
+      });
+
+      /* delete button to delete a todo from the list */
+      $('.item-container a.delete_icon').live('click', function(evt){
+          var confirm_message = $(this).attr("x_confirm_message")
+          if(confirm(confirm_message)){
+              delete_with_ajax_and_block_element(this.href, $(this).parents('.project'));
             }
-            return false;
-        });
+          return false;
+      });
 
     }
 }

public/stylesheets/standard.css

@@ -203,26 +203,6 @@ a.show_successors:hover, a.link_to_successors:hover {background-image: url(../im
     width: 100%;
 }
 
-#overlay {
-    visibility: hidden;
-    position: absolute;
-    left: 0px;
-    top: 0px;
-    width: 100%;
-    height: 100%;
-    z-index: 102;
-    text-align: center;
-    background-image:url("../images/trans70.png");
-}
-
-#overlay #new-recurring-todo, #overlay #edit-recurring-todo {
-    width:750px;
-    background-color: #fff;
-    border:1px solid #000;
-    padding: 15px;
-    margin: 70px auto;
-}
-
 .recurring_container {
     padding: 0px 5px 0px 5px;
     border: 1px solid #999;

test/functional/recurring_todos_controller_test.rb

@@ -237,4 +237,34 @@ class RecurringTodosControllerTest < ActionController::TestCase
     assert_equal true, recurring_todo.show_always?
   end
 
+  def test_find_and_inactivate
+    login_as(:admin_user)
+
+    rt = RecurringTodo.find(recurring_todos(:call_bill_gates_every_day).id)
+    todo = Todo.find_by_recurring_todo_id(rt.id)
+
+    assert_not_nil todo
+    assert_equal "active", todo.state, "todo should be active"
+    assert_equal "active", rt.state, "repeat pattern should be active"
+
+    get :index # will call find_and_inactivate
+
+    rt.reload
+    assert_equal "active", rt.state, "repeat pattern should still be active"
+
+    # disconnect todo from pattern thus leaving the pattern without
+    # any active todos, but in active state
+    todo.reload
+    todo.recurring_todo_id=nil
+    todo.save!
+
+    todo.reload
+    rt.reload
+    assert_equal "active", rt.state, "repeat pattern should still be active and not changed"
+
+    get :index
+    rt.reload
+    assert_equal "completed", rt.state, "repeat pattern should be completed"
+  end
+
 end