backlog 0.13.0 → 0.13.1

data/History.txt

@@ -1,4 +1,18 @@
-== 0.13.0 2007-11-12
+== 0.13.1 2007-11-17
+
+=== Features
+
+* Changed to allow not setting a task for a work record.
+* Fixed finishing and reopening tasks in the Backlog view.
+
+=== Fixes
+
+* Added missing web.xml file to WAR distribution.
+* Fixed wrong parsing of updated start time when using single digit hour (eg. 8:15)
+* Added "Add Task" button to Backlog view.
+* Speed up of all pages.
+
+== 0.13.0 2007-11-14
 
 === Features
 

data/Rakefile

@@ -43,6 +43,8 @@ task :release_all do
 end
 
 task :release_war do
+  File.mkdir 'WEB-INF' unless File.exists? 'WEB-INF'
+  FileUtils.cp 'vendor/plugins/goldspike/generators/goldspike/templates/web.xml.erb', 'WEB-INF/web.xml.erb' unless File.exists? 'WEB-INF/web.xml.erb'
   Rake::Task['war:standalone:create'].invoke
   war_pkg_file = "pkg/backlog-#{APP::VERSION}.war"
   if File.exists? 'backlog.war'

data/app/controllers/application.rb

@@ -143,7 +143,9 @@ class ApplicationController < ActionController::Base
     populate_shortcuts
     
     # TODO (uwe): This does not scale!
-    periods = Period.find(:all).select {|period| period.active_or_future?(true) && period.party.includes?(user)}
+    #periods = Period.find(:all).select {|period| period.active_or_future?(true) && period.party.includes?(user)}
+    periods = Period.find_active_or_future(true)
+
     
     @sidebars = periods.sort_by {|p| p.required_speed}.reverse.map do |period|
       content = '<ul>'
@@ -186,9 +188,4 @@ class ApplicationController < ActionController::Base
       User.find_by_id(user_id) if user_id
     end
     
-    def setup_remove
-      @last_active = @task.higher_item.nil? && @task.lower_item.nil? 
-      @last_active_in_backlog = @last_active || ((@task.higher_item.nil? || @task.higher_item.backlog != @task.backlog) && (@task.lower_item.nil? || @task.lower_item.backlog != @task.backlog))
-    end
-        
   end

data/app/controllers/backlogs_controller.rb

@@ -33,10 +33,7 @@ class BacklogsController < ApplicationController
         return
       end
     end
-    unplanned_tasks = @backlog.tasks.select {|t| t.period.nil? && t.finished_at.nil?}.sort_by {|t| t.position}
-    planned_tasks = @backlog.tasks.select {|t| t.period && t.finished_at.nil?}.sort_by {|t| [t.period.end_on, t.position]}
-    @tasks = planned_tasks + unplanned_tasks
-    @completed_tasks = @backlog.tasks.select {|t| t.finished_at}.sort {|t1, t2| t2.finished_at <=> t1.finished_at}
+    load_tasks(@backlog)
   end
   
   def show_no_layout
@@ -93,8 +90,91 @@ class BacklogsController < ApplicationController
     send_burn_down_chart 640
   end
   
+  def update_task_estimate
+    if params[:id]
+      @task = Task.find_by_id(params[:id])
+      if params[:estimate] && params[:estimate][:todo]
+        begin
+          Float(params[:estimate][:todo])
+          @task.estimate(params[:estimate][:todo])
+          @period = @task.period
+          @success, @message = true, 'Estimate updated'
+          rescue ArgumentError => e
+          @success, @message = false, "Estimate was not numeric"
+        end
+        if @task.finished?
+          load_tasks(@task.period)
+          render :action => 'finish_task', :layout => false
+        else
+          render :template => '/tasks/update_estimate', :layout => false
+        end
+      else
+        return false, "Estimate is missing."
+      end
+    else
+      @estimate = Estimate.new
+      return false, 'Task id is missing.'
+    end
+  end
+  
+  def finish_task
+    @task = Task.find(params[:id])
+    @task.finish(Task::COMPLETED, true)
+    load_tasks(@task.backlog)
+  end
+  
+  def abort_task
+    @task = Task.find params[:id]
+    @task.abort
+    load_tasks(@task.backlog)
+    render :action => :finish_task, :layout => false
+  end
+  
+  def move_task_to_period
+    params[:id] = $1 if params[:id] =~ /^task_(\d*)/
+    @task = Task.find(params[:id])
+    if request.post?
+      period = params[:period_id] && Period.find(params[:period_id])
+      if period && period.active_or_future?
+        next_task = @task.higher_item ? @task.higher_item : @task.lower_item ? @task.lower_item : @task
+        @task.move_to_period period
+        load_tasks(@task.backlog)
+        render :action => :move_task_to_period, :layout => false
+      else
+        rjs_detour_to :controller => 'periods', :action => :new, :period => {:party_id => @task.period.party_id}, :layout => false
+      end
+    else
+      redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task_id => @task.id, :layout => false
+    end
+  end
+  
+  def move_task_to_next_period
+    @task = Task.find(params[:id])
+    if @task.period
+      next_period = @task.period.lower_item
+      next_period = next_period.lower_item while next_period && next_period.passed?
+      params[:period_id] = next_period && next_period.id
+      move_task_to_period
+    else
+      rjs_redirect_to :action => :edit, :id => @task
+    end
+  end
+  
+  def reopen_task
+    @task = Task.find(params[:id]).reopen
+    load_tasks(@task.backlog)
+  end
+  
   private
   
+  def load_tasks(backlog)
+    unplanned_tasks = backlog.tasks.select {|t| t.period.nil? && t.finished_at.nil?}.sort_by {|t| t.position}
+    planned_tasks = backlog.tasks.select {|t| t.period && t.finished_at.nil?}.sort_by {|t| [t.period.end_on, t.position]}
+    @tasks = planned_tasks + unplanned_tasks
+    @completed_tasks = backlog.tasks.select {|t| t.finished_at}.sort {|t1, t2| t2.finished_at <=> t1.finished_at}
+
+  end
+  
   def send_burn_down_chart(size)
     backlog = Backlog.find(params[:id])
     g = Gruff::Line.new(size)

data/app/controllers/estimates_controller.rb

@@ -17,12 +17,8 @@ class EstimatesController < ApplicationController
   end
   
   def create_ajax
-    if @task = Task.find_by_id(params[:id])
-      setup_remove
-    end
+    @task = Task.find_by_id(params[:id])
     @success, @message = do_create
-    # Only necessary since we have an unecessary complex update of estimates
-    @task.reload
     if @task.finished?
       render :template => '/tasks/finish', :layout => false
     end

data/app/controllers/periods_controller.rb

@@ -36,8 +36,7 @@ class PeriodsController < ApplicationController
     if @selected_task.nil?
       @selected_task = @period.open_tasks.first
     end
-    @tasks = @period.open_tasks
-    @completed_tasks = @period.completed_tasks.reverse
+    load_tasks(@period)
   end
   
   def show_no_layout
@@ -121,6 +120,84 @@ class PeriodsController < ApplicationController
     end
   end
   
+  def move_task_to_period
+    params[:id] = $1 if params[:id] =~ /^task_(\d*)/
+    @task = Task.find(params[:id])
+    if request.post?
+      period = params[:period_id] && Period.find(params[:period_id])
+      if period && period.active_or_future?
+        next_task = @task.higher_item ? @task.higher_item : @task.lower_item ? @task.lower_item : @task
+        @task.move_to_period period
+        load_tasks(@task.period)
+        render :action => :move_task_to_period, :layout => false
+      else
+        rjs_detour_to :controller => 'periods', :action => :new, :period => {:party_id => @task.period.party_id}, :layout => false
+      end
+    else
+      redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task_id => @task.id, :layout => false
+    end
+  end
+  
+  def move_task_to_next_period
+    @task = Task.find(params[:id])
+    if @task.period
+      next_period = @task.period.lower_item
+      next_period = next_period.lower_item while next_period && next_period.passed?
+      params[:period_id] = next_period && next_period.id
+      move_task_to_period
+    else
+      rjs_redirect_to :action => :edit, :id => @task
+    end
+  end
+  
+  def finish_task
+    @task = Task.find(params[:id])
+    @task.finish(Task::COMPLETED, true)
+    load_tasks(@task.period)
+  end
+  
+  def abort_task
+    @task = Task.find params[:id]
+    @task.abort
+    load_tasks(@task.period)
+    render :action => :finish_task, :layout => false
+  end
+  
+  def reopen_task
+    @task = Task.find(params[:id])
+    @task.reopen
+    @task.reload
+    finished_count = Task.count(:conditions => ['period_id = ? AND finished_at IS NOT NULL', @task.period_id])
+    @last_finished = finished_count == 0
+  end
+  
+  def update_task_estimate
+    if params[:id]
+      @task = Task.find_by_id(params[:id])
+      if params[:estimate] && params[:estimate][:todo]
+        begin
+          Float(params[:estimate][:todo])
+          @task.estimate(params[:estimate][:todo])
+          @period = @task.period
+          @success, @message = true, 'Estimate updated'
+          rescue ArgumentError => e
+          @success, @message = false, "Estimate was not numeric"
+        end
+        if @task.finished?
+          load_tasks(@task.period)
+          render :action => 'finish_task', :layout => false
+        else
+          render :template => '/tasks/update_estimate', :layout => false
+        end
+      else
+        return false, "Estimate is missing."
+      end
+    else
+      @estimate = Estimate.new
+      return false, 'Task id is missing.'
+    end
+  end
+  
   private
   
   def send_burn_down_chart(size)
@@ -129,4 +206,9 @@ class PeriodsController < ApplicationController
     send_data(g, :disposition => 'inline', :type => 'image/png', :filename => "burn_down_chart.png")
   end
   
+  def load_tasks(period)
+    @tasks = period.open_tasks
+    @completed_tasks = period.completed_tasks.reverse
+  end
+  
 end

data/app/controllers/tasks_controller.rb

@@ -187,57 +187,6 @@ class TasksController < ApplicationController
     back_or_redirect_to :controller => 'periods', :action => :show_no_layout, :id => task.period_id, :task => task.id
   end
   
-  def move_to_period
-    params[:id] = $1 if params[:id] =~ /^task_(\d*)/
-    @task = Task.find(params[:id])
-    if request.post?
-      period = params[:period_id] && Period.find(params[:period_id])
-      if period && period.active_or_future?
-        next_task = @task.higher_item ? @task.higher_item : @task.lower_item ? @task.lower_item : @task
-        setup_remove
-        @task.move_to_period period
-        render :action => :move_to_period, :layout => false
-      else
-        rjs_detour_to :controller => 'periods', :action => :new, :period => {:party_id => @task.period.party_id}, :layout => false
-      end
-    else
-      redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task_id => @task.id, :layout => false
-    end
-  end
-  
-  def move_to_next_period
-    @task = Task.find(params[:id])
-    if @task.period
-      next_period = @task.period.lower_item
-      next_period = next_period.lower_item while next_period && next_period.passed?
-      params[:period_id] = next_period && next_period.id
-      move_to_period
-    else
-      rjs_redirect_to :action => :edit, :id => @task
-    end
-  end
-  
-  def finish
-    @task = Task.find(params[:id])
-    setup_remove
-    @task.finish(Task::COMPLETED, true)
-  end
-  
-  def abort
-    @task = Task.find params[:id]
-    setup_remove
-    @task.abort
-    render :action => :finish
-  end
-  
-  def reopen
-    @task = Task.find(params[:id])
-    @task.reopen
-    @task.reload
-    finished_count = Task.count(:conditions => ['period_id = ? AND finished_at IS NOT NULL', @task.period_id])
-    @last_finished = finished_count == 0
-  end
-  
   def start_work
     @task = Task.find(params[:id])
     @task.start_work

data/app/controllers/works_controller.rb

@@ -186,14 +186,18 @@ class WorksController < ApplicationController
   
   def convert_start_time_param
     if params[:work] && params[:work][:started_at_time]
-      new_hour = params[:work][:started_at_time][0..1]
-      new_minutes = params[:work][:started_at_time][3..4]
+      if params[:work][:started_at_time] =~ /^(\d*):(\d{2})$/
+        new_hours = $1
+        new_minutes = $2.to_i
+      else
+        raise "Unknown time format: '#{params[:work][:hours_time]}'"
+      end
       if @work && @work.started?
         t = @work.started_at
       else
         t = Time.now
       end
-      params[:work][:started_at] = Time.local(t.year, t.month, t.day, new_hour, new_minutes)
+      params[:work][:started_at] = Time.local(t.year, t.month, t.day, new_hours, new_minutes)
       params[:work].delete :started_at_time
     end
   end

data/app/helpers/application_helper.rb

@@ -94,4 +94,13 @@ module ApplicationHelper
     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

data/app/helpers/backlogs_helper.rb

@@ -1,2 +1,64 @@
 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
+    else
+      page.remove "task_#{@task.id}"
+    end
+    
+    if @tasks.empty?
+      page.visual_effect :blind_up, "active_tasks"
+      page.visual_effect :appear, "no_tasks_message"
+    end
+  end
+  
+  def add_finished_task(page)
+    not_first = @completed_tasks.find {|t| t.id != @task.id && t.period_id == @task.period_id}
+    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\" />"
+    end
+    
+    page.insert_html :top, "completed_tasks_#{@task.period_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}
+    page.insert_html :top, "completed_tasks_#{@task.period_id}", :partial => '/tasks/period_header', :locals => {:period => @task.period}
+  end
+
+  def remove_finished_task(page)
+    page.visual_effect :fade, "task_#{@task.id}"
+    page.remove "task_#{@task.id}"
+    
+    unless @completed_tasks.find {|t| t.period_id == @task.period_id}
+      page["completed_tasks_#{@task.period_id}"].remove
+    end
+  end
+  
+  def add_active_task(page)
+    first_in_period = @tasks.find{|t| t.id != @task.id && t.period_id == @task.period_id}.nil?
+    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
+    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 } )
+    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[:no_tasks_message].hide
+    
+    if @tasks.size == 1
+      page.visual_effect :appear, "active_tasks"
+    end
+    page.visual_effect :appear, "task_#{@task.id}"
+  end
+  
 end

data/app/helpers/periods_helper.rb

@@ -1,2 +1,65 @@
 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
+    
+    if @tasks.empty?
+      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)
+    first_finished = @completed_tasks.find {|t| t.id != @task.id}.nil?
+    unless first_finished
+      page.select("#completed_tasks_#{@task.period_id} tr").first.remove
+    end
+    
+    page.insert_html :top, "completed_tasks_#{@task.period_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}
+  end
+  
+  def update_burn_down_chart(page)
+    if @period
+      page['burn_down_chart'].src = url_for(:controller => 'periods', :action => :burn_down_chart_thumbnail, :id => @task.period.id, :rnd => rand)
+    end
+  end
+  
 end