backlog 0.13.0 → 0.13.1

data/app/helpers/tasks_helper.rb

@@ -1,76 +1,4 @@
 module TasksHelper
-  def remove_active_task(page)
-    page.visual_effect :blind_up, "task_#{@task.id}"
-    if @last_active_in_backlog
-      page["task_#{@task.id}"].ancestors.first.ancestors.first.remove
-    else
-      page.remove "task_#{@task.id}"
-    end
-    
-    if @last_active
-      page.visual_effect :blind_up, "active_tasks"
-      page.visual_effect :appear, "no_tasks_message"
-    end
-  end
-  
-  def remove_finished_task(page)
-    page.visual_effect :fade, "task_#{@task.id}"
-    page.remove "task_#{@task.id}"
-    
-    if @last_finished
-      page.select('#completed_tasks tr').first.remove
-    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[:no_tasks_message].hide
-    
-    if @task.lower_item.nil?
-      page.visual_effect :appear, "active_tasks"
-    end
-    page.visual_effect :appear, "task_#{@task.id}"
-  end
-  
-  def add_finished_task(page)
-    finished_count = Task.count(:conditions => ['period_id = ? AND finished_at IS NOT NULL', @task.period_id])
-    unless finished_count == 1
-      page.select('#completed_tasks tr').first.remove
-    end
-    
-    page.insert_html :top, :completed_tasks, :partial => '/tasks/task', :locals => {:active => false, :hidden => true, :highlight_task => false}
-    page.visual_effect :appear, "task_#{@task.id}"
-    
-    page.insert_html :top, :completed_tasks, :partial => '/tasks/fields_header', :locals => {:backlog => @task.backlog, :active => false}
-  end
-  
-  def update_burn_down_chart(page)
-    if @task.period
-      page['burn_down_chart'].src = url_for(:controller => 'periods', :action => :burn_down_chart_thumbnail, :id => @task.period.id, :rnd => rand)
-    end
-  end
-  
-  def record(page, script)
-    page.call("#{script};//")
-  end
-  
-  def insert(page, content, selector, position = :top)
-    escaped_content = content.gsub("\n", '').gsub("'", "\\\\'")
-    record(page, "new Insertion.#{position.to_s.capitalize}($$('#{selector}').first(), '#{escaped_content}')")
-  end
-  
 end
 
 class Time

data/app/models/period.rb

@@ -1,5 +1,7 @@
 class Period < ActiveRecord::Base
   include Localization
+  extend UserSystem
+  include UserSystem
   
   belongs_to :party
   acts_as_list :scope => :party, :order => :position
@@ -11,8 +13,13 @@ class Period < ActiveRecord::Base
     errors.add "A period cannot end before it starts" unless end_on >= start_on
   end
   
-  def self.find_active_or_future
-    find(:all, :conditions => "end_on >= '#{Date.today.strftime '%Y-%m-%d'}'")
+  def self.find_active_or_future(check_tasks = false)
+    periods = find(:all, :conditions => "end_on >= '#{Date.today.strftime '%Y-%m-%d'}'")
+    if (check_tasks)
+      ended_periods_with_open_tasks = Task.find(:all, :conditions => ['finished_at IS NULL AND period_id NOT IN (?)', periods.map{|p| p.id}]).map {|t| t.period}
+      periods + ended_periods_with_open_tasks
+    end
+    periods.select {|p| p.party.includes?(current_user)}
   end
   
   def speed
@@ -170,7 +177,7 @@ class Period < ActiveRecord::Base
   def burn_down_graph(size)
     begin
       require 'gruff'
-    rescue MissingSourceFile => e
+      rescue MissingSourceFile => e
       return File.read("public/images/rmagick_#{size}.gif") if File.exists? "public/images/rmagick_#{size}.gif"
       return File.read("public/images/rmagick.gif")
     end
@@ -190,19 +197,22 @@ class Period < ActiveRecord::Base
     g.colors += %w{#8888ff #d7a790}
     
     recorded_dates = self.recorded_dates
+    
     observed_todo_data = get_todo_data(recorded_dates)
-    actual_todo_data = get_todo_data(recorded_dates, true)
     g.data("#{l :todo} (#{l :obs})", observed_todo_data)
+    g.data(l(:projection), projection_data(observed_todo_data))
+    
+    actual_todo_data = get_todo_data(recorded_dates, true)
     g.data("#{l :todo}", actual_todo_data)
+    g.data(l(:projection), projection_data(actual_todo_data))
+    
     g.data(l(:done), get_work_data(recorded_dates)) if track_work?
+    
     if previous_period = higher_item
       g.data("#{l :previous_abr} #{l :obs}", previous_period.get_todo_data(previous_period.dates))
       g.data("#{l :previous_abr}", previous_period.get_todo_data(previous_period.dates, true))
     end
     
-    g.data(l(:projection), projection_data(observed_todo_data))
-    g.data(l(:projection), projection_data(actual_todo_data))
-    
     g.minimum_value = 0
     
     all_dates = dates

data/app/models/task.rb

@@ -72,6 +72,10 @@ class Task < ActiveRecord::Base
   
   def estimate(new_todo)
     return unless new_todo && new_todo != ''
+    new_todo = new_todo.to_i
+    if new_todo == 0
+      finish(Task::COMPLETED, false)
+    end
     previous_estimate = estimates.last
     new_estimate = Estimate.new
     if previous_estimate
@@ -134,6 +138,7 @@ class Task < ActiveRecord::Base
       save!
       children.each {|child_task| child_task.reopen}
     end
+    self
   end
   
   def move_to_period(new_period)
@@ -167,8 +172,8 @@ class Task < ActiveRecord::Base
         new_task.position = nil
         new_task.save!
         new_task.insert_at 1
-#        new_task.position = 1
-#        new_task.save!
+        #        new_task.position = 1
+        #        new_task.save!
         new_task.estimate(old_todo)
       end
     else
@@ -208,7 +213,7 @@ class Task < ActiveRecord::Base
   def active_children?
     children.detect {|child| child.active?}
   end
-
+  
   def finished?
     completed?
   end
@@ -329,7 +334,7 @@ class Task < ActiveRecord::Base
     return if work_started?
     open
     new_work = works.new
-
+    
     # TODO (uwe): Only needed for rails 1.2.x branch.  Remove when moving to 1.3 or 2.0.
     new_work.task = self
     
@@ -371,7 +376,7 @@ class Task < ActiveRecord::Base
     end
     started_works.select {|work| work.user.nil?}.last
   end
-
+  
   def description_with_parents
     if parent.nil?
       "#{backlog.name}: #{description}"
@@ -379,5 +384,5 @@ class Task < ActiveRecord::Base
       "#{parent.description_with_parents} - #{description}"
     end
   end
-
+  
 end

data/app/views/backlogs/_buttons.rhtml

@@ -1,3 +1,4 @@
     	<%=image_link_to 'arrow_up.png', l(:backlogs), :action => :list %>
         <%=image_detour_to('clipboard.png', l(:edit), :controller => 'backlogs', :action => :edit, :id => @backlog)%>
         <%=image_detour_to('clipboard.png', l(:show), :controller => 'backlogs', :action => :show, :id => @backlog)%>
+        <%=detour_to(image_tag(url_for("add.png"), :alt => l(:add_task), :title => l(:add_task), :class => 'image-submit'), :controller => 'tasks', :action => 'new', :task => {:backlog_id => @backlog.id} ) %>

data/app/views/backlogs/_tasks.rhtml

@@ -5,19 +5,17 @@
     </div>
         
 <div id="active_tasks"<%=' style="display: none;"' unless @tasks and not @tasks.empty?%>>
-    <table>
-      <%= render :partial => '/tasks/backlog_header', :locals => {:backlog => @backlog, :track_times => tasks.find {|t|t.period && t.period.active?}} %>
-      <% i = 0 %>
-      <% current_period = nil %>
-      <% for @task in tasks %>
-	    <% if @task.period != current_period %>
-          <%= render :partial => '/tasks/period_header', :locals => {:period => @task.period} %>
-          <%= render :partial => '/tasks/fields_header', :locals => {:backlog => @backlog, :active => true, :track_times => tasks.find {|t|t.period && t.period.active?}} %>
-          <% current_period = @task.period %>
-		<% end %>
-        <%= render :partial => '/tasks/task/', :locals => {:task => @task, :i => i += 1, :active => true, :highlight_task => false, :update => :maincontent, :hidden => false} %>
+  <%#=render :partial => '/tasks/backlog_header', :locals => {:backlog => @backlog, :track_times => tasks.find {|t|t.period && t.period.active?}} %>
+  <% i = 0 %>
+  <% for period in @tasks.map {|t| t.period}.uniq %>
+    <table id="active_tasks_<%=period ? period.id : 'unplanned' %>">
+      <%=render :partial => '/tasks/period_header', :locals => {:period => period} %>
+      <%=render :partial => '/tasks/fields_header', :locals => {:backlog => @backlog, :active => true, :track_times => tasks.find {|t|t.period && t.period.active?}} %>
+      <% for @task in @tasks.select {|t| t.period_id == (period && period.id)} %>
+        <%=render :partial => '/tasks/task/', :locals => {:task => @task, :i => i += 1, :active => true, :highlight_task => false, :update => :maincontent, :hidden => false} %>
       <% end %>
     </table>
+  <% end %>
 </div>
 
 <p id="no_tasks_message"<%=' style="display: none;"' if @tasks and not @tasks.empty?%>><%=l :no_pending_tasks_in_backlog%></p>

data/app/views/backlogs/finish_task.rjs

@@ -0,0 +1,3 @@
+display_notice(page)
+remove_active_task(page)
+add_finished_task(page)

data/app/views/backlogs/move_task_to_period.rjs

@@ -0,0 +1,3 @@
+display_notice(page)
+remove_active_task(page)
+add_finished_task(page)

data/app/views/backlogs/reopen_task.rjs

@@ -0,0 +1,3 @@
+display_notice(page)
+remove_finished_task(page)
+add_active_task(page)

data/app/views/tasks/_completed.rhtml

@@ -1,13 +1,12 @@
-<% current_period = nil %>
-
-<table id="completed_tasks" class="input">
-<% @completed_tasks.each_with_index do |task, i| %>
-  <% if i == 0 || task.period != current_period %>
-      <%= render :partial => '/tasks/period_header', :locals => {:period => task.period} unless @completed_tasks.map(&:period).uniq.size == 1 %>
-      <%= render :partial => '/tasks/fields_header', :locals => {:backlog => task.backlog, :active => false, :track_times => false} %>
-      <% current_period = task.period %>
+<div id="completed_tasks">
+<% @completed_tasks.map {|t| t.period}.uniq.each do |period| %>
+<table id="completed_tasks_<%=period.id%>" class="input">
+  <%= 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} %>
+  <% @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 %>
-  <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => false, :highlight_task => task == @selected_task, :hidden => false } %>
-  <% i += 1 %>
-<% end %>
 </table>
+<% end %>
+</div>

data/app/views/tasks/_fields_header.rhtml

@@ -2,8 +2,8 @@
     <th/>
     <th align="center"><%=active ? '#' : l(:resolution_abr)%></th>
     <th><%=l :task %></th>
-    <th><%=l :start if backlog.work_account && backlog.work_account.track_times? %></th>
+    <th><%=l :start if active && backlog.work_account && backlog.work_account.track_times? %></th>
     <th/>
-    <th><%=l :done if backlog.track_done? %></th>
-    <th width="*"><%=l :todo if backlog.track_todo? %></th>
+    <th><%=l :done if not backlog or backlog.track_done? %></th>
+    <th width="*"><%=l :todo if active && backlog.track_todo? %></th>
   </tr>

data/app/views/tasks/_task.rhtml

@@ -60,16 +60,16 @@
     </td>
     <td nowrap="true" width="1">
       <% if active && @task.loggable? -%>
-        <% remote_form_for(:estimate, :url => {:controller => 'estimates', :action => :create_ajax, :id => @task}) do |f| -%>
+        <% remote_form_for(:estimate, :url => {:action => :update_task_estimate, :id => @task}) do |f| -%>
           <% if @task.track_todo? -%>
             <% if @task.period.nil? || @task.period.active_or_future? -%>
-              <%=f.text_field :todo, :tabindex => i+2, :id => "#{@task.id}_todo", :value => @task.todo, :class => :task_hours, :maxlength => 4 %>
+              <%=f.text_field :todo, :tabindex => i+2, :id => "task_#{@task.id}_todo", :value => @task.todo, :class => :task_hours, :maxlength => 4 %>
             <% else -%>
               <%=@task.todo %>
             <% end -%>
           <% end -%>
           <% if (not @task.track_times?) && !@task.work_started? && (@task.period.nil? || @task.period.active?) %>
-            <%=image_link_to_remote('checkmark.png', l(:complete), {:controller => 'tasks', :action => :finish, :id => @task}, nil, true)%>
+            <%=image_link_to_remote('checkmark.png', l(:complete), {:action => :finish_task, :id => @task}, nil, true)%>
           <% end -%>
         <% end -%>
       <% end -%>
@@ -79,12 +79,12 @@
         <% if @task.active? %>
           <% if @task.loggable? %>
             <% unless @task.work_started? %>
-              <%=image_link_to_remote('arrow_right.png', l(:move_to_next_period), {:controller => 'tasks', :action => :move_to_next_period, :id => @task}, nil, true)%>
-              <%=image_link_to_remote('ernes_stop.png', l(:abort), {:controller => 'tasks', :action => :abort, :id => @task}, nil, true)%>
+              <%=image_link_to_remote('arrow_right.png', l(:move_to_next_period), {:action => :move_task_to_next_period, :id => @task}, nil, true)%>
+              <%=image_link_to_remote('ernes_stop.png', l(:abort), {:action => :abort_task, :id => @task}, nil, true)%>
             <% end %>
           <% end %>
         <% elsif (@task.period.nil? || (not @task.period.passed?)) && @task.leaf? %>
-          <%=image_link_to_remote('eraser.png', l(:reopen), {:controller => 'tasks', :action => :reopen, :id => @task}, nil, true) %>
+          <%=image_link_to_remote('eraser.png', l(:reopen), {:action => :reopen_task, :id => @task}, nil, true) %>
         <% end -%>
       <% end -%>
     </td>

data/app/views/tasks/update_estimate.rjs

@@ -0,0 +1,2 @@
+display_notice(page)
+page["task_#{@task.id}_todo"].value = @task.todo.to_s

data/app/views/works/_form.rhtml

@@ -13,7 +13,7 @@
 <h4><%=link_to @work.task.description, :controller => 'tasks', :action => :edit, :id => @work.task.id %></h4></p>
 <%= hidden_field 'work', 'task_id' %>
 <% else %>
-<%= select 'work', 'task_id', @tasks.map{|task| [task.description_with_parents, task.id]}.sort %></p>
+<%= select 'work', 'task_id', [['', '']] + @tasks.map{|task| [task.description_with_parents, task.id]}.sort %></p>
 <% end %>
 
 <% if @work.task.nil? || @work.task.track_times?%>

data/app/views/works/update_time.rjs

@@ -1,2 +1,2 @@
+display_notice(page)
 page["work_#{@work.id}_started_at_time"].value = @work.started_at.strftime('%H:%M')
-page.replace "notice", :partial => '/layouts/notice'

data/cruise_config.rb

@@ -1,6 +1,5 @@
 Project.configure do |project|
   project.email_notifier.emails = ['uwe@datek.no']
-  project.email_notifier.from = 'cruisecontrol@datek.no'
-
+  project.scheduler.polling_interval = 5.minutes
   project.build_command = 'RAILS_ENV=test rake'
 end

data/test/functional/periods_controller_test.rb

@@ -121,4 +121,120 @@ class PeriodsControllerTest < Test::Unit::TestCase
     assert_redirected_to ''
   end
   
+  def test_move_task_to_next_period
+    before = Task.find(tasks(:another).id)
+    
+    post :move_task_to_next_period, :id => tasks(:another).id
+    
+    assert_response :success
+    
+    after = Task.find(tasks(:another).id)
+    assert_equal tasks(:another).period_id, after.period_id
+    
+    new_task = Task.find_by_period_id_and_previous_task_id(periods(:future).id, before.id)
+    assert_nil new_task.finished_at
+    assert_nil new_task.resolution
+    assert_equal 1, new_task.position
+  end
+  
+  def test_move_task_to_next_period_from_past
+    task = tasks(:first)
+    before = Task.find(task.id)
+    
+    post :move_task_to_next_period, :id => task.id
+    
+    assert_response :success
+    
+    after = Task.find(task.id)
+    assert_equal task.period_id, after.period_id
+    
+    new_task = Task.find_by_period_id_and_previous_task_id(periods(:active).id, task.id)
+    assert_nil new_task.finished_at
+    assert_nil new_task.resolution
+    assert_equal 1, new_task.position
+  end
+  
+  def test_move_to_next_period_at_end
+    before = Task.find(tasks(:in_last_period).id)
+    assert_equal tasks(:in_last_period).period_id, before.period_id
+    
+    post :move_task_to_next_period, :id => tasks(:in_last_period).id
+    
+    assert_response :success
+    
+    before.reload
+    assert_equal tasks(:in_last_period).period_id, before.period_id
+    
+    after = Task.find(tasks(:in_last_period).id)
+    assert_equal before.period_id, after.period_id
+  end
+  
+  def test_move_to_next_period_from_ancient
+    before = tasks(:in_ancient)
+    previous_last_id = Task.find(:first, :order => 'id DESC').id
+    
+    post :move_task_to_next_period, :id => before.id
+    
+    assert_response :success
+    
+    after = Task.find(before.id)
+    assert_equal before.period_id, after.period_id
+    assert_equal Task::POSTPONED, after.resolution
+    assert_not_nil after.finished_at
+    
+    new = Task.find(:first, :order => 'id DESC', :conditions => "id > #{previous_last_id}")
+    assert_not_nil new
+    assert_equal before.id, new.previous_task_id
+    assert_equal 1, new.position
+  end
+  
+  def test_move_task_to_period_back_to_earlier_period
+    task_to_move = tasks(:in_last_period)
+    target_task = tasks(:postponed)
+    target_period = periods(:active)
+    
+    post :move_task_to_period, {"id"=> task_to_move.id,
+                          "detour"=>{"action"=>"edit_no_layout", "id"=>"39", "controller"=>"backlogs"}, 
+                          "period_id"=> target_period.id
+    }
+    
+    old_task = Task.find(task_to_move.id)
+    assert_not_nil old_task.finished_at
+    assert_equal Task::POSTPONED, old_task.resolution
+    assert_nil old_task.position
+    
+    new_task = Task.find(target_task.id)
+    new_task.reload
+    assert_nil new_task.finished_at
+    assert_nil new_task.resolution
+    assert_equal 1, new_task.position
+  end
+
+  def test_move_task_to_period
+    highest = Task.find(:first, :order => 'id DESC')
+    
+    post :move_task_to_period, :id => "task_#{tasks(:another).id}",
+        :detour => {:action => 'show_no_layout', :id => periods(:active).id, :controller => 'periods'}, 
+        :period_id => periods(:future).id
+    
+    new_task = Task.find(:first, :order => 'id DESC')
+    assert new_task.id != highest.id
+    assert_equal periods(:future).id, new_task.period_id
+  end
+  
+  def test_move_task_to_period_past
+    post :move_task_to_period, :id => "task_#{tasks(:another).id}",
+        :detour => {:action => 'show_no_layout', :id => periods(:active).id, :controller => 'periods'}, 
+        :period_id => periods(:past).id
+    assert_equal periods(:active).id, tasks(:another).period_id
+  end
+  
+  def test_abort_task
+    post :abort_task, :id => tasks(:first).id
+    
+    after = Task.find(tasks(:first).id)
+    assert_not_nil after.finished_at
+    assert_equal Task::ABORTED, after.resolution
+  end
+  
 end