backlog 0.10.4 → 0.10.5

data/History.txt

@@ -1,4 +1,17 @@
-== 0.10.4 2007-09-25
+== 0.10.5 2007-09-25
+
+=== Fixes
+
+* Changed so that when specifying a task, only one subtask is created.
+* Fixed bug in creation of estimates for subtasks.
+* Corrected list work for period.
+* Changed to group work done by start time instead of end time.
+* Fixed bug in listing started subtasks.
+* Added link to task from edit work view.
+* Added backlog and super task names in drop down in new work view.
+* Added edit link in weekly work sheet.
+
+== 0.10.4 2007-09-24
 
 === Features
 

data/app/controllers/estimates_controller.rb

@@ -14,7 +14,7 @@ class EstimatesController < ApplicationController
           render :file => "public/500.html", :layout => true, :status => 500
           return
         end
-        redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task_id => @task.id
+        redirect_to :controller => 'periods', :action => :show, :id => @task.root_task.period, :task_id => @task.id
       else
         @task.errors.add :task, 'Estimate is missing.'
         render :file => "public/500.html", :layout => true, :status => 500

data/app/controllers/periods_controller.rb

@@ -104,7 +104,7 @@ class PeriodsController < ApplicationController
   
   def list_work
     @period = Period.find(params[:id])
-    @works = Work.find_by_sql("SELECT w.* FROM works w LEFT OUTER JOIN tasks t ON t.id = w.task_id WHERE t.period_id = #{@period.id} ORDER BY w.completed_at")
+    @works = @period.tasks.map {|t| t.works}.flatten.sort_by {|w| w.completed_at}
     render :template => '/works/list'
   end
   

data/app/controllers/tasks_controller.rb

@@ -274,7 +274,7 @@ class TasksController < ApplicationController
     parent_task = Task.find(params[:id])
     raise "Task is not open" unless parent_task.active? && (parent_task.period.nil? || parent_task.period.active_or_future?)
     if parent_task.children.empty?
-      subtask_estimate = (parent_task.todo / 4).ceil
+      subtask_estimate = (parent_task.todo).ceil
       no_of_subtasks = (parent_task.todo / subtask_estimate).to_i
       subtask_estimate = parent_task.todo / no_of_subtasks
        (1..no_of_subtasks).each do |index|

data/app/controllers/works_controller.rb

@@ -57,6 +57,7 @@ class WorksController < ApplicationController
     @work = Work.find(params[:id])
     @work.attributes = params[:work]
     @estimate = Estimate.new(params[:estimate])
+    @tasks = Task.find_open
     @users = User.find(:all)
   end
   

data/app/models/estimate.rb

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

data/app/models/task.rb

@@ -52,14 +52,8 @@ class Task < ActiveRecord::Base
       user_clause = " OR user_id = #{current_user.id}"
     end
     conditions = "completed_at IS NULL AND (user_id IS NULL#{user_clause})"
-    Work.find(:all, :conditions => conditions).map {|work| work.task}.sort do |t1, t2|
-      if (backlog_sort = t1.backlog.name <=> t2.backlog.name) != 0
-        backlog_sort
-      elsif (period_sort = t1.period.end_on <=> t2.period.end_on) != 0
-        period_sort
-      else
-        t1.position <=> t2.position
-      end
+    Work.find(:all, :conditions => conditions).map {|work| work.task}.sort_by do |t|
+      [t.root_task.backlog.name, t.root_task.period.end_on, t.position || 0]
     end
   end
   
@@ -353,5 +347,13 @@ class Task < ActiveRecord::Base
     end
     started_works.select {|work| work.user.nil?}.last
   end
-  
+
+  def description_with_parents
+    if parent.nil?
+      "#{backlog.name}: #{description}"
+    else
+      "#{parent.description_with_parents} - #{description}"
+    end
+  end
+
 end

data/app/models/work.rb

@@ -28,10 +28,10 @@ class Work < ActiveRecord::Base
   def self.works_for_week(week_no, user = current_user)
     first = Date.commercial(Date.today.year, week_no, 1)
     last = first + 7
-    works = find(:all, :conditions => "completed_at BETWEEN '#{first.to_time.iso8601}' AND '#{last.to_time.iso8601}'", :order => 'completed_at')
+    works = find(:all, :conditions => "completed_at IS NOT NULL AND started_at BETWEEN '#{first.to_time.iso8601}' AND '#{last.to_time.iso8601}'", :order => 'started_at')
     length = 0
     works_per_day = (0..6).map do |day|
-      works_for_day = works.select {|work| work.completed_at.to_date == (first + day) && (work.user_id.nil? || (user && work.user_id == user.id)) }
+      works_for_day = works.select {|work| work.started_at.to_date == (first + day) && (work.user_id.nil? || (user && work.user_id == user.id)) }
       length = [length, works_for_day.length].max
       works_for_day
     end
@@ -47,12 +47,12 @@ class Work < ActiveRecord::Base
   def self.work_totals_for_week(week_no, user_id = current_user)
     first = Date.commercial(Date.today.year, week_no, 1)
     last = first + 7
-    works = find(:all, :conditions => "completed_at BETWEEN '#{first.to_time.iso8601}' AND '#{last.to_time.iso8601}'", :order => 'completed_at')
+    works = find(:all, :conditions => "completed_at IS NOT NULL AND started_at BETWEEN '#{first.to_time.iso8601}' AND '#{last.to_time.iso8601}'", :order => 'started_at')
     totals_per_backlog = {}
     Backlog.find(:all).each do |backlog|
       totals_per_backlog[backlog.id] = [[], []]
       (0..6).each do |day|
-        works_for_day = works.select {|work| (work.task.backlog == backlog) && (work.completed_at.to_date == (first + day)) && (user_id && work.user_id == user_id) }
+        works_for_day = works.select {|work| (work.task.backlog == backlog) && (work.started_at.to_date == (first + day)) && (user_id && work.user_id == user_id) }
         invoice_works_for_day = works_for_day.select {|work| work.invoice? }
         internal_works_for_day = works_for_day.select {|work| !work.invoice? }
 

data/app/views/tasks/list_started.rhtml

@@ -47,7 +47,7 @@ function handleEvent(field, event, id) {
 	<% end %>
     <% if task.period != current_period %>
 	  <tr><th colspan="6"><%=task.period ? h(task.period.name) : l(:unplanned_tasks)%></th></tr>
-      <%= render :partial => '/tasks/fields_header', :locals => {:backlog => task.backlog, :active => true, :track_times => @tasks.find {|t|t.period && t.period.active?}} %>
+      <%= render :partial => '/tasks/fields_header', :locals => {:backlog => task.root_task.backlog, :active => true, :track_times => @tasks.find {|t|t.period && t.period.active?}} %>
       <% current_period = task.period %>
 	<% end %>
   <%=render :partial => 'task', :locals => { :task => task, :i => i, :active => true, :highlight_task => (task == @selected_task), :update => :spotlight } %>

data/app/views/works/_form.rhtml

@@ -4,10 +4,10 @@
 
 <p><%=l :task%>:<br/>
 <% if @work.task %>
-<h4><%= @work.task.description %></h4></p>
+<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, task.id]} %></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/weekly_work_sheet.rhtml

@@ -58,6 +58,7 @@ end %>]
       <%=link_to(h(@work.task.period.name), :controller => 'periods', :action => :show, :id => @work.task.period) if @work.task.period %>
       <%=link_to(h(@work.task.root_task.backlog.name), :controller => 'backlogs', :action => :show, :id => @work.task.root_task.backlog) %>
       <%=link_to(h(@work.task.description), :controller => 'periods', :action => :show, :id => @work.task.period, :task_id => @work.task.id) %>
+      <%=link_to(l(:edit), :controller => 'works', :action => :edit, :id => @work.id) %>
     </td>
       <% if invoicing %>
     <td id="invoice_<%=@work.id%>">

data/lang/en.yaml

@@ -21,6 +21,7 @@ daily_work_sheet: Daily work sheet
 delete: Delete
 done: Done
 down: Down
+edit: Edit
 editing: Editing
 enable_customer: Enable customer
 enable_invoicing: Enable invoicing

data/lang/no.yaml

@@ -21,6 +21,7 @@ daily_work_sheet: Timeføringsskjema
 delete: Slett
 done: Utført
 down: Ned
+edit: Rediger
 editing: Redigerer
 enable_customer: Tillat kunder
 enable_invoicing: Tillat fakturering

data/test/fixtures/estimates.yml

@@ -7,3 +7,4 @@ two:
   id: 2
   created_at: 2007-06-11T13:45:00
   task_id: 2
+  todo: 40

data/test/functional/tasks_controller_test.rb

@@ -110,7 +110,10 @@ class TasksControllerTest < Test::Unit::TestCase
   end
   
   def test_specify
-    post :specify, "id"=>"2"
+    post :specify, "id" => tasks(:another).id.to_s
+    
+    after = Task.find(tasks(:another))
+    assert_equal 1, after.children.size
   end
   
   def test_specify_passed_period

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.10.4
-date: 2007-09-24 00:00:00 +02:00
+  version: 0.10.5
+date: 2007-09-25 00:00:00 +02:00
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 require_paths: 
 - lib