backlog 0.3.2 → 0.3.3

data/History.txt

@@ -1,3 +1,8 @@
+== 0.3.3 2007-08-03
+
+* Made validation of tasks position tighter
+* Fixed bugs in task positioning :)
+
 == 0.3.2 2007-08-02
 
 * Improved setup on linux

data/README.txt

@@ -5,6 +5,12 @@ Welcome to Backlog!
 Backlog is a tool to help you collect and organize all your tasks,
 wether you are a single persion or a small or large group.
 
+A timekeeping module is also included to track time spent on the different tasks.
+
+=== Backlog is not meant to be
+
+* an issue tracker with customer communication.
+
 === Installation
 
 * Install ruby

data/Rakefile

@@ -11,7 +11,7 @@ require 'tasks/rails'
 
 require 'hoe'
 
-Hoe.new("backlog", '0.3.2') do |p|
+Hoe.new("backlog", '0.3.3') do |p|
   p.rubyforge_name = "backlog"
   p.summary = "Application to aid collecting, processing, organizing, reviewing and doing tasks."
   p.description = p.paragraphs_of('README.txt', 0..-1).join("\n\n")

data/app/controllers/tasks_controller.rb

@@ -1,6 +1,5 @@
 class TasksController < ApplicationController
-  skip_before_filter :populate_layout, :only => [:create, :update, :set_task_description, :move_to,
-  :move_to_next_period, :move_to_period, :reopen, :start_work]
+  skip_before_filter :populate_layout, :only => [:create, :update, :destroy, :set_task_description, :move_to, :move_to_next_period, :move_to_period, :reopen, :start_work]
   
   verify :method => :post, :except => [ :new, :show, :edit, :list_started, :move_to_next_period],
   :redirect_to => { :controller => 'backlogs' }
@@ -28,7 +27,11 @@ class TasksController < ApplicationController
     if @task.save
       flash[:notice] = 'Task was successfully created.'
       @task.move_to_top
-      redirect_to :controller => 'periods', :action => 'show', :id => @task.period, :task => @task.id
+      if @task.period
+        back_or_redirect_to :controller => 'periods', :action => 'show', :id => @task.period, :task => @task.id
+      else
+        back_or_redirect_to :controller => 'backlogs', :action => 'show', :id => @task.backlog, :task => @task.id
+      end
     else
       populate_layout
       @backlogs = Backlog.find(:all, :order => 'name')
@@ -75,6 +78,7 @@ class TasksController < ApplicationController
       end
     else
       populate_layout
+      edit
       render :action => 'edit'
     end
   end
@@ -146,7 +150,7 @@ class TasksController < ApplicationController
   
   def finish
     @task = Task.find(params[:id])
-    @task.finish(Task::COMPLETED, true, user)
+    @task.finish(Task::COMPLETED, true)
     redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task_id => @task.id
   end
   
@@ -158,14 +162,13 @@ class TasksController < ApplicationController
   
   def reopen
     task = Task.find(params[:id])
-    task.reopen(user)
+    task.reopen
     back_or_redirect_to :controller => 'periods', :action => :show, :id => task.period, :task => task.id
   end
   
   def start_work
     task = Task.find(params[:id])
-    task.start_work(user)
-    task.save!
+    task.start_work
     redirect_to :controller => 'periods', :action => :show, :id => task.period, :task => task.id
   end
   

data/app/controllers/works_controller.rb

@@ -42,7 +42,7 @@ class WorksController < ApplicationController
       return
     end
     
-    @work.task.estimates.new(params[:estimate]).save! if params[:estimate]
+    @work.task.estimates.create!(params[:estimate]) if params[:estimate]
     
     back_or_redirect_to :controller => 'periods', :action => 'show', :id => @work.task.period, :task_id => @work.task.id
   end
@@ -61,11 +61,14 @@ class WorksController < ApplicationController
     convert_hours_param
     if @work.update_attributes(params[:work])
       flash[:notice] = 'Work was successfully updated.'
-      back_or_redirect_to :controller => 'periods', :action => 'show', :id => @work.task.period, :task_id => @work.task.id
-    else
-      render :action => 'edit'
+      if params[:estimate].nil? || (@estimate = @work.task.estimates.create(params[:estimate])).errors.size == 0
+        back_or_redirect_to :controller => 'periods', :action => 'show', :id => @work.task.period, :task_id => @work.task.id
+        return
+      end
     end
-    @work.task.estimates.new(params[:estimate]).save! if params[:estimate]
+    @task = @work.task
+    edit
+    render :action => 'edit'
   end
   
   def destroy
@@ -102,7 +105,7 @@ class WorksController < ApplicationController
   
   def auto_complete_for_work_backlog_name
     @backlogs = Backlog.find(:all, 
-                       :conditions => [ 'LOWER(name) LIKE ?',
+                             :conditions => [ 'LOWER(name) LIKE ?',
     '%' + params[:work][:backlog_name].downcase + '%' ], 
     :order => 'name ASC',
     :limit => 16)

data/app/models/backlog.rb

@@ -37,7 +37,7 @@ class Backlog < ActiveRecord::Base
 
   def first_active_period
     t = active_tasks
-    periods = t.map {|t| t.period}.uniq
+    periods = t.map {|t| t.period}.compact.uniq
     periods = periods.select {|p| p.active?}
     periods.sort_by {|p| p.end_on}.first
   end

data/app/models/estimate.rb

@@ -10,7 +10,7 @@ class Estimate < ActiveRecord::Base
   validates_associated :task
 
   def after_create
-    task.finish(Task::COMPLETED, false, user) if todo == 0
+    task.finish(Task::COMPLETED, false) if todo == 0
   end
   
 end

data/app/models/task.rb

@@ -8,7 +8,7 @@ class Task < ActiveRecord::Base
   
   belongs_to :backlog
   belongs_to :period
-  acts_as_list :scope => '#{period_id ? "period_id = #{period_id}" : "parent_id = #{parent_id}"} AND finished_at IS NULL'
+  acts_as_list :scope => '#{period_id ? "period_id = #{period_id}" : parent_id ? "parent_id = #{parent_id}" : "backlog_id = #{backlog_id}"} AND finished_at IS NULL'
   has_many :estimates, :order => 'created_at', :dependent => :destroy
   has_many :works, :order => 'completed_at', :dependent => :destroy
   acts_as_tree :order => 'position'
@@ -20,12 +20,15 @@ class Task < ActiveRecord::Base
   #validates_absence_of :position, :if => :finished_at
   #validates_absence_of :finished_at, :if => :position
   validates_presence_of :resolution, :if => :finished_at
-  validates_uniqueness_of :description, :scope => :period_id
-  validates_uniqueness_of :position, :scope => :period_id, :allow_nil => true
+  validates_uniqueness_of :description, :scope => :backlog_id, :if => :backlog_id
+  validates_uniqueness_of :description, :scope => :period_id, :if => :period_id
+  validates_uniqueness_of :position, :scope => :period_id, :if => :period_id, :allow_nil => true
+  validates_uniqueness_of :position, :scope => :parent_id, :if => :parent_id, :allow_nil => true
+  validates_uniqueness_of :position, :scope => :backlog_id, :if => Proc.new {|task| task.period_id.nil? && task.parent_id.nil?}, :allow_nil => true
   
   def validate
-    unless (self.period_id || self.parent_id) && !(self.period_id && self.parent_id)
-      errors.add :parent_id, "A task may have either period or parent task set, not both."
+    if self.parent_id && (self.period_id || self.backlog_id)
+      errors.add :parent_id, "A subtask may not have neither period nor backlog set."
     end
     if new_record? && self.period && self.period.passed?
       errors.add :period_id, "You may not add a task to a past period."
@@ -99,21 +102,21 @@ class Task < ActiveRecord::Base
   
   def open
     if finished_at
+      insert_at 1
       self.finished_at = nil
       self.resolution = nil
       estimate(initial_estimate)
-      insert_at 1
       parent.open if parent
     end
   end
 
-  def reopen(user)
+  def reopen
     if period.passed?
       flash[:notice] = "You cannot reopen a task in a period that is passed."
     else
-      open(user)
+      open
       save!
-      children.each {|child_task| child_task.reopen(user)}
+      children.each {|child_task| child_task.reopen}
     end
   end
   
@@ -137,24 +140,24 @@ class Task < ActiveRecord::Base
     self.finish(new_task.period.party == self.period.party ? Task::POSTPONED : Task::MOVED, true, current_user)
   end
   
-  def finish(resolution, save_work, user)
+  def finish(resolution, save_work)
     unless finished_at || work_started?
       self.finished_at = Time.now
       self.resolution = resolution
+      remove_from_list
       self.position = nil
       save!
-      remove_from_list
       estimate(0) if save_work
-      parent.check_finished(self.finished_at, resolution, save_work, user) if parent
+      parent.check_finished(self.finished_at, resolution, save_work) if parent
     end
   end
   
-  def check_finished(subtask_finsihed_at, resolution, save_work, user)
+  def check_finished(subtask_finsihed_at, resolution, save_work)
     return if self.finished_at
     children.each do |child_task|
       return if child_task.active?
     end
-    finish(resolution, save_work, user)
+    finish(resolution, save_work)
   end
   
   def active?
@@ -263,14 +266,14 @@ class Task < ActiveRecord::Base
     total
   end
   
-  def start_work(user)
+  def start_work
     return if work_started?
-    open(user)
+    open
     new_work = works.new
     new_work.started_at = Time.previous_quarter
     if works.size > 0
-      if user
-        last_work = works.select {|work| work.user == user}.last
+      if current_user
+        last_work = works.select {|work| work.user == current_user}.last
       end
       unless last_work
         last_work = works.select {|work| work.user.nil?}.last
@@ -279,8 +282,16 @@ class Task < ActiveRecord::Base
         new_work.started_at = last_work.completed_at
       end
     end
-    new_work.user = user
+    new_work.user = current_user
+begin
     new_work.save!
+rescue Exception => e
+p e
+p e.record
+p e.record.task
+p e.record.task.errors
+p e.record.task.errors.full_messages
+end
   end
   
   def works_with_children
@@ -288,7 +299,7 @@ class Task < ActiveRecord::Base
   end
   
   def abort(user)
-    finish(Task::ABORTED, false, user)
+    finish(Task::ABORTED, false)
   end
   
   def work_started?

data/app/models/work.rb

@@ -3,6 +3,7 @@ class Work < ActiveRecord::Base
   belongs_to :user
   
   validates_presence_of :task_id
+  validates_associated :task
   validates_presence_of :started_at
   validates_presence_of :user_id, :if => :validate_user?
 

data/app/views/layouts/mwrt002.rhtml

@@ -34,14 +34,14 @@ function handlePageEvent(event) {
       <% if user? %>| <%=user.email%><% end %>
     </div>
     <div id="header">
+      <%= error_messages_for :backlog, :user, :group, :period, :task, :work, :estimate %>
+
       <div id="introtext">
         <h1><%=@application_title%></h1>
         <h3><%=@page_title ? @page_title : @application_description%></h3>
       </div>
     </div>
     <div id="content">
-      <%= error_messages_for 'period', 'task' %>
-
       <%= yield  %>
     </div>
   </div>

data/app/views/tasks/_form.rhtml

@@ -1,5 +1,3 @@
-<%= error_messages_for 'task' %>
-
 <!--[form:task]-->
 <p>
 <% if @task.backlog.nil? || @task.new_record? %>
@@ -12,6 +10,7 @@
 <% if @task.backlog %>
   <%=image_detour_to('clipboard.png', "#{l(:backlog)} #{@task.backlog.name}", {:controller => 'backlogs', :action => :edit, :id => @task.backlog}, {:class => 'image-submit', :style => 'vertical-align: bottom'}) %>
 <% end %>
+<%=detour_to l(:new_backlog), :controller => 'backlogs', :action => :new %>
 </p>
 
 

data/app/views/tasks/_task.rhtml

@@ -8,7 +8,7 @@
     <% end %>
     </td>
     <td align="left" valign="top" width="1" nowrap="true">
-      <%=detour_to @task.position.to_s, :controller => 'tasks', :action => :edit, :id => @task.id if @task.depth == 0 %>
+      <%=detour_to @task.position.to_s, :controller => 'tasks', :action => :edit, :id => @task.id if @task.position || @task.depth == 0 %>
       <%= ("&nbsp;" * @task.depth * 4) if @task.depth > 0 %>
       <%= l(@task.resolution.downcase) if @task.finished_at %>
       <%= "-" if @task.children.size > 0 %>
@@ -34,8 +34,8 @@
         <% end %>
       <% end -%>
     </td>
-    <% if @task.track_done? %>
     <td align="<%=@task.loggable? ? 'center' : 'left'%>" nowrap="true" width="1">
+    <% if @task.track_done? %>
       <% if @task.loggable? || @task.finished_at -%>
         <% form_tag({:controller => 'works', :action => (@task.work_started? ? :edit : :create), :id => @task.started_work}) do %>
           <%= hidden_field('work', 'task_id', :value => @task.id)%>
@@ -48,8 +48,8 @@
           <%=t @task.total_done if @task.total_done != 0%>
         <% end -%>
       <% end -%>
-    </td>
     <% end -%>
+    </td>
     <td nowrap="true" width="1">
       <% if active && @task.loggable? -%>
         <% form_tag({:controller => 'estimates', :action => 'create', :id => @task}) do %>

data/public/stylesheets/backlog.css

@@ -17,12 +17,12 @@ th.hours {text-align: right;}
 }
 
 #errorExplanation {
-  width: 400px;
   border: 2px solid red;
   padding: 7px;
   padding-bottom: 12px;
   margin-bottom: 20px;
-  background-color: #f0f0f0;
+  background: transparent;
+  float: right;
 }
 
 #errorExplanation h2 {

data/test/fixtures/tasks.yml

@@ -5,12 +5,26 @@ first:
   backlog_id: 1
   period_id: 1
   description: first task
-  position: 1
+  position: 0
 another:
   id: 2
   created_at: 2007-06-12
   backlog_id: 1
   period_id: 2
   description: second task
+  position: 0
+started:
+  id: 3
+  created_at: 2007-08-02 14:15:42
+  backlog_id: 1
+  period_id: 2
+  description: third task
+  position: 1
+last:
+  id: 4
+  created_at: 2007-08-02 14:15:42
+  backlog_id: 1
+  period_id: 2
+  description: last task
   position: 2
   

data/test/fixtures/works.yml

@@ -4,7 +4,7 @@ first:
   task_id: 1
   started_at: 2007-06-12T13:35:00
   completed_at: 2007-06-12T14:35:00
-another:
+started:
   id: 2
-  task_id: 2
+  task_id: 3
   started_at: 2007-06-12T13:35:00

data/test/functional/tasks_controller_test.rb

@@ -5,7 +5,7 @@ require 'tasks_controller'
 class TasksController; def rescue_action(e) raise e end; end
 
 class TasksControllerTest < Test::Unit::TestCase
-  fixtures :users, :backlogs, :periods, :tasks, :works, :estimates
+  fixtures :parties, :users, :groups, :backlogs, :periods, :tasks, :works, :estimates
 
   def setup
     @controller = TasksController.new
@@ -65,6 +65,20 @@ class TasksControllerTest < Test::Unit::TestCase
     assert_equal num_tasks + 1, Task.count
   end
 
+  def test_create_without_period
+    num_tasks = Task.count
+
+    post :create, :task => {:description => 'an important task', :backlog_id => '2'}
+
+    task = assigns(:task)
+    assert_equal [], task.errors.full_messages
+
+    assert_response :redirect
+    assert_redirected_to :controller => 'backlogs', :action => 'show', :id => 2
+
+    assert_equal num_tasks + 1, Task.count
+  end
+
   def test_edit
     get :edit, :id => 1
 

data/test/functional/works_controller_test.rb

@@ -86,4 +86,32 @@ class WorksControllerTest < Test::Unit::TestCase
       Work.find(1)
     }
   end
+
+  def test_update_with_finish
+    num_tasks = Task.count
+    num_open_tasks = Task.find_open.size
+    task = tasks(:started)
+    work = works(:started)
+
+    post :update, "commit"=>"Lagre", "action"=>"update", "id"=>work.id.to_s, "controller"=>"works", "estimate"=>{"todo"=>"0"}, "work"=>{"completed_at"=>"2007-08-02 14:15", "task_id"=> task.id.to_s, "user_id"=>"1000001", "started_at"=>"2007-08-02 14:00"}
+    
+    assert_response :redirect
+    assert_redirected_to :controller => 'periods', :action => :show, :id => task.period, :task => nil
+
+    assert_equal num_tasks, Task.count
+    assert_equal num_open_tasks - 1, Task.find_open.size
+    assert_sequence
+  end
+
+  
+  private
+  
+  def assert_sequence
+    Period.find(:all).each do |p|
+      p.open_tasks.each_with_index do |t, i|
+        assert_equal i, t.position
+      end
+    end
+  end
+  
 end

data/test/unit/task_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class TaskTest < Test::Unit::TestCase
-  fixtures :backlogs, :periods, :tasks, :estimates, :works
+  fixtures :parties, :users, :groups, :backlogs, :periods, :tasks, :estimates, :works
   
   # Replace this with your real tests.
   def test_truth

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
-date: 2007-08-02 00:00:00 +02:00
+  version: 0.3.3
+date: 2007-08-03 00:00:00 +02:00
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 require_paths: 
 - lib
 email: ryand-ruby@zenspider.com
 homepage: http://www.zenspider.com/ZSS/Products/backlog/
 rubyforge_project: backlog
-description: == Backlog  Welcome to Backlog!  Backlog is a tool to help you collect and organize all your tasks, wether you are a single persion or a small or large group.  === Installation  * Install ruby * Install RubyGems * Install PostgreSQL * run <tt>sudo gem install backlog -y</tt> * run <tt>sudo backlog setup_linux</tt> * run <tt>sudo backlog start</tt>  === Updates  * run <tt>sudo backlog stop</tt> * run <tt>sudo gem update -y</tt> * run <tt>sudo backlog start</tt>
+description: == Backlog  Welcome to Backlog!  Backlog is a tool to help you collect and organize all your tasks, wether you are a single persion or a small or large group.  A timekeeping module is also included to track time spent on the different tasks.  === Backlog is not meant to be  * an issue tracker with customer communication.  === Installation  * Install ruby * Install RubyGems * Install PostgreSQL * run <tt>sudo gem install backlog -y</tt> * run <tt>sudo backlog setup_linux</tt> * run <tt>sudo backlog start</tt>  === Updates  * run <tt>sudo backlog stop</tt> * run <tt>sudo gem update -y</tt> * run <tt>sudo backlog start</tt>
 autorequire: 
 default_executable: 
 bindir: bin
@@ -105,7 +105,6 @@ files:
 - public/stylesheets/zpcal/themes/scroller-down.gif
 - public/stylesheets/zpcal/themes/scroller-up.gif
 - public/stylesheets/backlog.css
-- public/stylesheets/scaffold.css
 - public/stylesheets/user.css
 - public/robots.txt
 - public/404.html

data/public/stylesheets/scaffold.css

@@ -1,74 +0,0 @@
-body { background-color: #fff; color: #333; }
-
-body, p, ol, ul, td {
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size:   13px;
-  line-height: 18px;
-}
-
-pre {
-  background-color: #eee;
-  padding: 10px;
-  font-size: 11px;
-}
-
-a { color: #000; }
-a:visited { color: #666; }
-a:hover { color: #fff; background-color:#000; }
-
-.fieldWithErrors {
-  padding: 2px;
-  background-color: red;
-  display: table;
-}
-
-#errorExplanation {
-  width: 400px;
-  border: 2px solid red;
-  padding: 7px;
-  padding-bottom: 12px;
-  margin-bottom: 20px;
-  background-color: #f0f0f0;
-}
-
-#errorExplanation h2 {
-  text-align: left;
-  font-weight: bold;
-  padding: 5px 5px 5px 15px;
-  font-size: 12px;
-  margin: -7px;
-  background-color: #c00;
-  color: #fff;
-}
-
-#errorExplanation p {
-  color: #333;
-  margin-bottom: 0;
-  padding: 5px;
-}
-
-#errorExplanation ul li {
-  font-size: 12px;
-  list-style: square;
-}
-
-div.uploadStatus {
-  margin: 5px;
-}
-
-div.progressBar {
-  margin: 5px;
-}
-
-div.progressBar div.border {
-  background-color: #fff;
-  border: 1px solid grey;
-  width: 100%;
-}
-
-div.progressBar div.background {
-  background-color: #333;
-  height: 18px;
-  width: 0%;
-}
-