backlog 0.17.4 → 0.17.5

data/History.txt

@@ -1,3 +1,10 @@
+== 0.17.5 2008-01-15
+
+=== Fixes
+
+* Fixed various ordering bugs.
+* Fixed ajax for finishing and reopening tasks.
+
 == 0.17.4 2008-01-14
 
 === Features

data/app/controllers/backlogs_controller.rb

@@ -96,7 +96,7 @@ class BacklogsController < ApplicationController
           @success, flash[:notice] = false, "Estimate was not numeric"
         end
         if @task.finished?
-          load_tasks(@task.period)
+          load_tasks(@task.backlog)
           render :action => 'finish_task', :layout => false
         else
           render :template => '/tasks/update_estimate', :layout => false
@@ -162,7 +162,7 @@ class BacklogsController < ApplicationController
     params.keys.find {|k| k =~ /active_tasks_(.*)/}
     period_id = $1
     if period_id
-      period = Period.find(period_id)
+      period = period_id.empty? ? nil : Period.find(period_id)
       tasks = params["active_tasks_#{period_id}"].select {|id| not id.empty?}
       tasks.each_with_index do |id,idx|
         task = Task.find(id)

data/app/helpers/backlogs_helper.rb

@@ -1,8 +1,9 @@
 module BacklogsHelper
   def remove_active_task(page)
     page.visual_effect :blind_up, "task_#{@task.id}"
-    if not @tasks.find {|t| t.period_id == @task.period_id}
-      page["task_#{@task.id}"].ancestors.first.ancestors.first.remove
+    last_in_period = @tasks.find {|t| t.period_id == @task.period_id}.nil?
+    if last_in_period
+      page.remove "active_period_#{@task.period_id}"
     else
       page.remove "task_#{@task.id}"
     end
@@ -14,21 +15,20 @@ module BacklogsHelper
   end
   
   def add_finished_task(page)
+    list_tag_id = "completed_tasks_#{@task.period_id}"
     tasks_in_period = @completed_tasks.select {|t| t.period_id == @task.period_id}
     work_done = ! tasks_in_period.find {|t| t.total_done != 0}.nil?
-    not_first = tasks_in_period.size > 1
-    if not_first
-      page.select("#completed_tasks_#{@task.period_id} tr").first.remove
-      page.select("#completed_tasks_#{@task.period_id} tr").first.remove
-    else
-      page.insert_html :top, "completed_tasks", "<table id=\"completed_tasks_#{@task.period_id}\" class=\"input\" />"
+    first = tasks_in_period.size == 1
+    if first
+      period_tag_id = "completed_period_#{@task.period_id}"
+      page.insert_html :top, :completed_tasks, "<div id=\"#{period_tag_id}\ />"
+      page.insert_html :top, period_tag_id, "<ul id=\"#{list_tag_id}\" class=\"task_list\" />"
+      page.insert_html :top, period_tag_id, :partial => '/tasks/fields_header', :locals => {:backlog => @task.backlog, :active => false, :work_done => work_done}
+      page.insert_html :top, period_tag_id, :partial => '/tasks/period_header', :locals => {:period => @task.period}
     end
     
-    page.insert_html :top, "completed_tasks_#{@task.period_id}", :partial => '/tasks/task', :locals => {:active => false, :hidden => true, :highlight_task => false, :show_backlog => false}
+    page.insert_html :top, list_tag_id, :partial => '/tasks/task', :locals => {:active => false, :hidden => true, :highlight_task => false, :show_backlog => false}
     page.visual_effect :appear, "task_#{@task.id}"
-    
-    page.insert_html :top, "completed_tasks_#{@task.period_id}", :partial => '/tasks/fields_header', :locals => {:backlog => @task.backlog, :active => false, :work_done => work_done}
-    page.insert_html :top, "completed_tasks_#{@task.period_id}", :partial => '/tasks/period_header', :locals => {:period => @task.period}
   end
 
   def remove_finished_task(page)
@@ -36,26 +36,33 @@ module BacklogsHelper
     page.remove "task_#{@task.id}"
     
     unless @completed_tasks.find {|t| t.period_id == @task.period_id}
-      page["completed_tasks_#{@task.period_id}"].remove
+      page["completed_period_#{@task.period_id}"].remove
     end
   end
   
   def add_active_task(page)
+    list_tag_id = "active_tasks_#{@task.period_id}"
     tasks_in_period = @tasks.select{|t| t.period_id == @task.period_id}
     first_in_period = tasks_in_period.size == 1
     if first_in_period
-      page.insert_html :top, :active_tasks, %Q{<table id="active_tasks_#{@task.period_id}" class="input" style="width: 100%;"/>}
-    else
-      page.select("#active_tasks_#{@task.period_id} tr").first.remove
-      page.select("#active_tasks_#{@task.period_id} tr").first.remove
+      period_tag_id = "active_period_#{@task.period_id}"
+      period_tag = %Q{<div id="#{period_tag_id}" style="width: 100%;" />}
+      if @task.period.nil?
+        page.insert_html :bottom, :active_tasks, period_tag
+      elsif @task.period.higher_item.nil? || @tasks.find {|t| t.period == @task.period.higher_item}.nil?
+        page.insert_html :top, :active_tasks, period_tag
+      else
+        page.insert_html :after, "active_period_#{@task.period.higher_item.id}", period_tag
+      end
+      page.insert_html :top, period_tag_id, %Q{<ul id="#{list_tag_id}" class="task_list" style="width: 100%;"/>}
+      fields_header = render(:partial => '/tasks/fields_header', :locals => { :backlog => @task.backlog, :active => true, :track_todo => @task.backlog.track_todo?, :track_done => @task.backlog.track_done?, :track_times => tasks_in_period.find {|t|t.period && t.period.active?} } )
+      page.insert_html :top, period_tag_id, fields_header
+      page.insert_html :top, period_tag_id, render(:partial => "/tasks/period_header", :locals => {:period => @task.period})
     end
     
-    page.insert_html(:top, "active_tasks_#{@task.period_id}", render(:partial => "/tasks/task", :locals => { :task => @task, :i => 1, :active => true, :highlight_task => false, :update => :spotlight, :hidden => true }))
-    
-    fields_header = render(:partial => '/tasks/fields_header', :locals => { :backlog => @task.backlog, :active => true, :track_todo => @task.backlog.track_todo?, :track_done => @task.backlog.track_done?, :track_times => tasks_in_period.find {|t|t.period && t.period.active?} } )
-    page.insert_html :top, "active_tasks_#{@task.period_id}", fields_header
-    page.insert_html :top, "active_tasks_#{@task.period_id}", render(:partial => "/tasks/period_header", :locals => {:period => @task.period})
-    
+    page.insert_html(:top, list_tag_id, render(:partial => "/tasks/task", :locals => { :task => @task, :i => 1, :active => true, :highlight_task => false, :update => :spotlight, :hidden => true }))
+    record page, sortable_element_js(list_tag_id, :url => { :action => :order }, :containment => @tasks.map{|t| t.period_id}.uniq.map{|p| "active_tasks_#{p}"}, :constraint => false)
+
     page[:no_tasks_message].hide
     
     if @tasks.size == 1

data/app/helpers/periods_helper.rb

@@ -1,11 +1,7 @@
 module PeriodsHelper
   def remove_active_task(page)
     page.visual_effect :blind_up, "task_#{@task.id}"
-    if @tasks.find {|t| t.backlog_id == @task.backlog_id}.nil?
-      page["task_#{@task.id}"].ancestors.first.ancestors.first.remove
-    else
-      page.remove "task_#{@task.id}"
-    end
+    page.remove "task_#{@task.id}"
     
     if @tasks.empty?
       page.visual_effect :blind_up, "active_tasks"
@@ -18,23 +14,14 @@ module PeriodsHelper
     page.remove "task_#{@task.id}"
     
     if @last_finished
-      page.select('#completed_tasks tr').first.remove
+      page.visual_effect :fade, "completed_period_#{@task.period_id}"
+      page.remove "completed_period_#{@task.period_id}"
+      page.visual_effect :fade, :completed_tasks
     end
-  end
+end
   
   def add_active_task(page)
-    if @task.lower_item.nil? || @task.lower_item.backlog != @task.backlog
-      page.insert_html :top, :active_tasks, '<table class="input" style="width: 100%;"/>'
-    elsif @task.lower_item
-      page.select('#active_tasks table tr').first.remove
-      page.select('#active_tasks table tr').first.remove
-    end
-    
-    insert(page, render(:partial => "/tasks/task", :locals => { :task => @task, :i => 1, :active => true, :highlight_task => false, :update => :spotlight, :hidden => true }), '#active_tasks table')
-    
-    fields_header = render(:partial => '/tasks/fields_header', :locals => { :backlog => @task.backlog, :active => true } )
-    insert(page, fields_header, '#active_tasks table')
-    insert(page, render(:partial => "/tasks/backlog_header", :locals => {:backlog => @task.backlog}), '#active_tasks table')
+    page.insert_html(:top, "active_tasks_#{@task.period.id}", render(:partial => "/tasks/task", :locals => { :task => @task, :i => 1, :active => true, :highlight_task => false, :update => :spotlight, :hidden => true }))
     
     page[:no_tasks_message].hide
     
@@ -45,18 +32,22 @@ module PeriodsHelper
   end
   
   def add_finished_task(page)
+    list_tag_id = "completed_tasks_#{@task.period_id}"
     work_done = ! @completed_tasks.find {|t| t.total_done != 0}.nil?
     first_finished = @completed_tasks.find {|t| t.id != @task.id}.nil?
-    unless first_finished
-      page.select("#completed_tasks_#{@task.period_id} tr").first.remove
-    else
-      page.insert_html :top, "completed_tasks", "<table id=\"completed_tasks_#{@task.period_id}\" class=\"input\" />"
+    first_in_period = @completed_tasks.find {|t| t.period_id == @task.period_id && t.id != @task.id}.nil?
+    if first_finished
+      page.visual_effect :appear, "completed_tasks"
     end
-    
-    page.insert_html :top, "completed_tasks_#{@task.period_id}", :partial => '/tasks/task', :locals => {:active => false, :hidden => true, :highlight_task => false}
+    if first_in_period
+      period_tag_id = "completed_period_#{@task.period_id}"
+      page.insert_html :top, "completed_tasks", %Q{<div id="#{period_tag_id}" />}
+      page.insert_html :top, period_tag_id, %Q{<ul id="#{list_tag_id}" class="task_list"/>}
+      page.insert_html :top, period_tag_id, :partial => '/tasks/fields_header', :locals => {:backlog => @task.backlog, :active => false, :work_done => work_done}
+    end
+    page.insert_html :top, list_tag_id, :partial => '/tasks/task', :locals => {:active => false, :hidden => true, :highlight_task => false}
     page.visual_effect :appear, "task_#{@task.id}"
     
-    page.insert_html :top, "completed_tasks_#{@task.period_id}", :partial => '/tasks/fields_header', :locals => {:backlog => @task.backlog, :active => false, :work_done => work_done}
   end
   
   def update_burn_down_chart(page)

data/app/models/task.rb

@@ -142,7 +142,6 @@ class Task < ActiveRecord::Base
   end
   
   def move_to_period(new_period)
-    raise "Period missing" unless new_period
     raise "Cannot move finished tasks" unless active?
     return self if new_period == period
     
@@ -151,10 +150,10 @@ class Task < ActiveRecord::Base
     
     if self.period
       old_todo = self.todo
-      self.finish(new_period.party == self.period.party ? Task::POSTPONED : Task::MOVED, true)
+      self.finish((new_period.nil? || (new_period.party == self.period.party)) ? Task::POSTPONED : Task::MOVED, true)
       ancestor_id = self.previous_task_id || self.id
-      existing_task =   Task.find_by_period_id_and_id(new_period.id, ancestor_id)
-      if existing_task ||= Task.find_by_period_id_and_previous_task_id(new_period.id, ancestor_id)
+      existing_task =   Task.find_by_period_id_and_id(new_period && new_period.id, ancestor_id)
+      if existing_task ||= Task.find_by_period_id_and_previous_task_id(new_period && new_period.id, ancestor_id)
         raise "mismatch" unless existing_task.backlog == root_task.backlog
         raise "Mismatch" unless existing_task.period == new_period
         existing_task.open
@@ -177,7 +176,7 @@ class Task < ActiveRecord::Base
         return new_task
       end
     else
-      self.period_id = new_period.id
+      self.period_id = new_period && new_period.id
       self.period = new_period
       self.insert_at(1)
       self.position = 1

data/app/views/backlogs/show.rhtml

@@ -4,25 +4,26 @@
         <%=render :partial => 'buttons' %><h4><%=l :tasks %></h4>
     </div>
     <div id="active_tasks"<%=' style="display: none;"' unless @tasks and not @tasks.empty? %>>
-        <%#=render :partial => '/tasks/backlog_header', :locals => {:backlog => @backlog, :track_times => @tasks.find {|t|t.period && t.period.active?}} %>
 		<%i = 0 %>
 		<% periods = @tasks.map {|t| t.period}.uniq %>
-		<% period_ids = periods.map {|period| "active_tasks_#{period ? period.id : ''}"} %>
+		<% list_ids = periods.map {|period| "active_tasks_#{period && period.id}"} %>
 		<%for period in periods %>
 		    <% tasks_in_period = @tasks.select {|t| t.period_id == (period && period.id)} %>
 			<% work_done = !tasks_in_period.find{|t| t.total_done > 0}.nil? %>
+			<div id="active_period_<%=period && period.id%>">
           	<%=render :partial => '/tasks/period_header', :locals => {:period => period} if @backlog.enable_periods %>
-			<%=render :partial => '/tasks/fields_header', :locals => {:backlog => @backlog, :active => true, :track_times => tasks_in_period.find {|t|t.period && t.period.active?}, :work_done => work_done} %>
-        	<ul id="active_tasks_<%=period ? period.id : '' %>" class="task_list">
+			<%=render :partial => '/tasks/fields_header', :locals => {:backlog => @backlog, :active => true, :track_todo => @backlog.track_todo?, :track_done => @backlog.track_done?, :track_times => tasks_in_period.find {|t|t.period && t.period.active?}, :work_done => work_done} %>
+        	<ul id="active_tasks_<%=period && period.id%>" class="task_list">
 				<%for @task in tasks_in_period %>
 					<%=render :partial => '/tasks/task/', :locals => {:task => @task, :i => i += 1, :active => true, :highlight_task => false, :update => :maincontent, :show_backlog => false, :hidden => false} %>
 				<%end %>
         	</ul>
-        <% end %>
-		<%for period in periods %>
-	        <%=sortable_element "active_tasks_#{period ? period.id : ''}", :url => { :action => :order }, :containment => period_ids, :constraint => false %>
+			</div>
         <% end %>
     </div>
+	<%for list_id in list_ids %>
+        <%=sortable_element list_id, :url => { :action => :order }, :containment => list_ids, :constraint => false %>
+    <% end %>
     <p id="no_tasks_message"<%=' style="display: none;"' if @tasks and not @tasks.empty? %>>
         <%=l :no_pending_tasks_in_backlog %>
     </p>

data/app/views/periods/_show_active.rhtml

@@ -37,7 +37,6 @@ function handleEvent(field, event, id) {
 	<ul id="active_tasks_<%=@period.id%>" class="task_list">
 		<% for task in @tasks -%>
   			<%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => true, :highlight_task => task == @selected_task, :update => :spotlight, :show_backlog => true, :hidden => false } %>
-  			<%#=render :partial => '/tasks/backlog_header', :locals => { :backlog => task.backlog, :track_times => task.backlog.track_done? && @tasks.find {|t|t.period && t.period.active?} } %>
   			<% i += 1 %>
   		<% end -%>
     </ul>

data/app/views/tasks/_completed.rhtml

@@ -1,14 +1,16 @@
-<div id="completed_tasks" style="margin: 0px; border: 0px; padding: 0px">
+<div id="completed_tasks" style="margin: 0px; border: 0px; padding: 0px; <%='display: none' if @completed_tasks.empty?%>">
 <% @completed_tasks.map {|t| t.period}.uniq.each do |period| %>
-<ul id="completed_tasks_<%=period ? period.id : ''%>" class="input" style="width: 100%; list-style-type: none; margin: 0px; border: 0px; padding: 0px">
   <% tasks_in_period = @completed_tasks.select {|t| t.period == period} %>
   <% work_done = !tasks_in_period.find{|t| t.total_done != 0}.nil? %>
-  <%=render :partial => '/tasks/period_header', :locals => {:period => period} unless @completed_tasks.map(&:period).uniq.size == 1 %>
-  <%=render :partial => '/tasks/fields_header', :locals => {:backlog => @backlog, :active => false, :track_times => false, :work_done => work_done} %>
-  <% @completed_tasks.select {|t| t.period == period}.each do |task| %>
-    <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => false, :highlight_task => task == @selected_task, :hidden => false } %>
-    <% i += 1 %>
-  <% end %>
-</ul>
+  <div id="completed_period_<%=period && period.id%>">
+  	<%=render :partial => '/tasks/period_header', :locals => {:period => period} unless @completed_tasks.map(&:period).uniq.size == 1 %>
+  	<%=render :partial => '/tasks/fields_header', :locals => {:backlog => @backlog, :active => false, :track_times => false, :work_done => work_done} %>
+  	<ul id="completed_tasks_<%=period && period.id%>" class="task_list" style="width: 100%;">
+  	  <% @completed_tasks.select {|t| t.period == period}.each do |task| %>
+  	    <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => false, :highlight_task => task == @selected_task, :hidden => false } %>
+  	    <% i += 1 %>
+  	  <% end %>
+  	</ul>
+  </div>
 <% end %>
 </div>

data/test/functional/backlogs_controller_test.rb

@@ -47,6 +47,7 @@ class BacklogsControllerTest < Test::Unit::TestCase
 
     assert_not_nil assigns(:backlog)
     assert assigns(:backlog).valid?
+    assert_not_nil assigns(:tasks)
   end
 
   def test_new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.17.4
+  version: 0.17.5
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-14 00:00:00 +01:00
+date: 2008-01-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency