backlog 0.14.2 → 0.14.3

data/History.txt

@@ -1,3 +1,19 @@
+== 0.14.3 2007-11-20
+
+=== Features
+
+* Speedup of Burn Down Charts.
+* Added link to add new work account when recording work.
+
+=== Fixes
+
+* Fixed bug for weekly work sheet with invoicing.
+* Fixed bug in Edit Group view.  The wrong burn down chart was shown.
+
+=== Internal
+
+* Removed unused code for backlog charts.
+
 == 0.14.2 2007-11-19
 
 === Features

data/app/controllers/backlogs_controller.rb

@@ -82,14 +82,6 @@ class BacklogsController < ApplicationController
     redirect_to :action => 'index'
   end
   
-  def burn_down_chart_thumbnail
-    send_burn_down_chart 270
-  end
-  
-  def burn_down_chart
-    send_burn_down_chart 640
-  end
-  
   def update_task_estimate
     if params[:id]
       @task = Task.find_by_id(params[:id])
@@ -175,42 +167,4 @@ class BacklogsController < ApplicationController
 
   end
   
-  def send_burn_down_chart(size)
-    backlog = Backlog.find(params[:id])
-    g = Gruff::Line.new(size)
-    g.theme_37signals
-    g.title = "Burn Down Graph" 
-    g.font = '/usr/share/fonts/bitstream-vera/Vera.ttf'
-    g.hide_dots = true
-    g.colors = %w{blue green}
-    
-    dates = []
-    backlog.periods.first.start_on.upto(backlog.periods.last.end_on) {|date| dates << date}
-    
-    g.data(l(:todo), get_todo_data(dates, backlog))
-    g.data(l(:done), get_work_data(dates, backlog))
-    g.minimum_value = 0
-    
-    labels = {0 => dates.first.to_s, dates.length-1 => dates.last.to_s}
-    labels.merge({dates.index(Date.today) => Date.today.to_s}) if (dates.index(Date.today).to_f / dates.length) > 0.15
-    g.labels = labels
-    
-    send_data(g.to_blob,
-              :disposition => 'inline', 
-    :type => 'image/png', 
-    :filename => "burn_down_chart.png")
-  end
-  
-  def get_todo_data(dates, backlog)
-    dates.map do |date|
-      backlog.get_estimate_data(date)
-    end
-  end
-  
-  def get_work_data(dates, backlog)
-    dates.map do |date|
-      backlog.get_work_data(date)
-    end
-  end
-  
 end

data/app/controllers/parties_controller.rb

@@ -18,7 +18,7 @@ class PartiesController < ApplicationController
   
   def send_burn_down_chart(size)
     party = Party.find(params[:id])
-    if period = party.periods.select{|p| p.active?}.first || party.periods.last 
+    if period = party.periods.to_a.find{|p| p.active?} || party.periods.last 
       g = period.burn_down_graph(size)
       send_data(g,
                 :disposition => 'inline', 

data/app/models/backlog.rb

@@ -23,22 +23,6 @@ class Backlog < ActiveRecord::Base
     tasks.map {|t| t.self_with_children}.flatten
   end
   
-  def estimate_data(date)
-    total = 0
-    periods.each do |period|
-      total += period.estimate_data(date)
-    end
-    total
-  end
-
-  def work_data(date)
-    total = 0
-    periods.each do |period|
-      total += period.work_data(date)
-    end
-    total
-  end
-
   def first_active_period
     t = active_tasks
     periods = t.map {|t| t.period}.compact.uniq
@@ -47,7 +31,7 @@ class Backlog < ActiveRecord::Base
   end
   
   def enable_invoicing?
-    work_account && work_account.invoice_code && work_account.invoice_code.length > 0
+    work_account && work_account.enable_invoicing?
   end
   
   def track_done?

data/app/views/groups/edit.rhtml

@@ -36,10 +36,10 @@
   </div>
 
 <table>
-<% for @group in @groups %>
+<% for group in @groups %>
   <tr>
     <td>
-      <%=link_to @group.name, :action => :edit, :id => @group%>
+      <%=link_to group.name, :action => :edit, :id => group%>
   </tr>
 <% end %>
 </table>

data/app/views/works/_form.rhtml

@@ -5,6 +5,7 @@
 <% if @work.work_account -%>
   <%=image_detour_to('work_account.png', "#{l(:work_account)} #{@work.work_account.name}", {:controller => 'work_accounts', :action => :edit, :id => @work.work_account}, {:class => 'image-submit', :style => 'vertical-align: bottom'}) %>
 <% end -%>
+<%=detour_to l(:new_work_account), :controller => 'work_accounts', :action => :new %>
 </p>
 
 <p><%=l :task%>:<br/>

data/app/views/works/weekly_work_sheet.rhtml

@@ -54,22 +54,22 @@ end %>]
     <% if @work %>
       <% day_totals[day] += @work.hours %>
       <% week_total += @work.hours %>
-    <td>
-      <%=image_detour_to('hammer.png', l(:edit), {:style => "float: right;"}, :controller => 'works', :action => :edit, :id => @work.id) %>
+    <td valign="top">
+      <%=image_detour_to('hammer.png', l(:edit), {:controller => 'works', :action => :edit, :id => @work.id}, {:style => "float: right;"}) %>
       <%=detour_to(h(@work.task.period.name), :controller => 'periods', :action => :show, :id => @work.task.period) if @work.task && @work.task.period %>
       <%=detour_to(h(@work.work_account.name), :controller => 'work_accounts', :action => :show, :id => @work.work_account_id) %>:
       <%=detour_to(h(@work.task.description), :controller => 'tasks', :action => :edit, :id => @work.task_id) if @work.task_id%>
     </td>
       <% if invoicing %>
-    <td id="invoice_<%=@work.id%>">
-      <%=check_box(:work, :invoice, :onchange => "new Ajax.Updater('invoice_#{@work}', '#{url_for(:action => :set_work_invoice, :id => @work)}' + '?value=' + this.checked);") if @work.task.invoicing? %>
+    <td id="invoice_<%=@work.id%>" valign="top">
+      <%=check_box(:work, :invoice, :onchange => "new Ajax.Updater('invoice_#{@work}', '#{url_for(:action => :set_work_invoice, :id => @work)}' + '?value=' + this.checked);") if @work.work_account.enable_invoicing? %>
     </td>
       <% end %>
       <% if track_times %>
-    <td align="right"><%=in_place_editor_field(:work, :started_at_time, :class => :task_time) %></td>
-    <td align="right"><%=in_place_editor_field(:work, :completed_at_time, :class => :task_time) %></td>
+    <td align="right" valign="top"><%=in_place_editor_field(:work, :started_at_time, :class => :task_time) %></td>
+    <td align="right" valign="top"><%=in_place_editor_field(:work, :completed_at_time, :class => :task_time) %></td>
       <% end %>
-    <td align="right"><%=in_place_editor_field(:work, :hours, {}, :value => '%.2f' % @work.hours) %></td>
+    <td align="right" valign="top"><%=in_place_editor_field(:work, :hours, {}, :value => '%.2f' % @work.hours) %></td>
     <% else %>
     <td/>
       <% if invoicing %>

data/db/migrate/023_add_indices_for_burn_down_chart.rb

@@ -0,0 +1,13 @@
+class AddIndicesForBurnDownChart < ActiveRecord::Migration
+  def self.up
+    add_index :tasks, :parent_id
+    add_index :estimates, [:task_id, :created_at]
+    add_index :works, [:task_id, :completed_at]
+  end
+
+  def self.down
+    remove_index :works, [:task_id, :completed_at]
+    remove_index :estimates, [:task_id, :created_at]
+    remove_index :tasks, :parent_id
+  end
+end

data/db/schema.rb

@@ -2,7 +2,7 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define(:version => 22) do
+ActiveRecord::Schema.define(:version => 23) do
 
   create_table "backlogs", :force => true do |t|
     t.column "name",            :string,  :limit => 64,                    :null => false
@@ -29,6 +29,8 @@ ActiveRecord::Schema.define(:version => 22) do
     t.column "user_id",    :integer
   end
 
+  add_index "estimates", ["task_id", "created_at"], :name => "index_estimates_on_task_id_and_created_at"
+
   create_table "groups", :primary_key => "party_id", :force => true do |t|
     t.column "name", :string, :null => false
   end
@@ -74,6 +76,8 @@ ActiveRecord::Schema.define(:version => 22) do
     t.column "customer_id",      :integer
   end
 
+  add_index "tasks", ["parent_id"], :name => "index_tasks_on_parent_id"
+
   create_table "users", :primary_key => "party_id", :force => true do |t|
     t.column "login",           :string,   :limit => 80,                    :null => false
     t.column "salted_password", :string,   :limit => 40,                    :null => false
@@ -106,6 +110,8 @@ ActiveRecord::Schema.define(:version => 22) do
     t.column "description",     :string
   end
 
+  add_index "works", ["task_id", "completed_at"], :name => "index_works_on_task_id_and_completed_at"
+
   add_foreign_key "backlogs", ["customer_id"], "customers", ["id"], :name => "backlogs_customer_id_fkey"
   add_foreign_key "backlogs", ["work_account_id"], "work_accounts", ["id"], :name => "backlogs_work_account_id_fkey"
 

data/lang/en.yaml

@@ -59,6 +59,7 @@ new_group: Start new group
 new_period: Add new sprint
 new_task: Add new task
 new_work: Add new work record
+new_work_account: Add new work account
 next: Next
 no_pending_tasks: There are no pending tasks in this sprint.
 no_pending_tasks_in_backlog: There are no pending tasks in this backlog.

data/lang/no.yaml

@@ -59,6 +59,7 @@ new_group: Start ny gruppe
 new_period: Start ny periode
 new_task: Legg til ny oppgave
 new_work: Registrer arbeid
+new_work_account: Legg til timeføringskonto
 next: Neste
 no_pending_tasks: Det er ingen ventende oppgaver i denne perioden.
 no_pending_tasks_in_backlog: Det er ingen ventende oppgaver i denne oppgavelisten.

data/test/functional/parties_controller_test.rb

@@ -5,6 +5,8 @@ require 'parties_controller'
 class PartiesController; def rescue_action(e) raise e end; end
 
 class PartiesControllerTest < Test::Unit::TestCase
+  main_scenario
+
   def setup
     @controller = PartiesController.new
     @request    = ActionController::TestRequest.new

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.14.2
-date: 2007-11-19 00:00:00 +01:00
+  version: 0.14.3
+date: 2007-11-22 00:00:00 +01:00
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 require_paths: 
 - lib
@@ -142,6 +142,7 @@ files:
 - db/migrate/021_create_work_accounts.rb
 - db/migrate/016_add_invoicable_flag.rb
 - db/migrate/018_create_groups.rb
+- db/migrate/023_add_indices_for_burn_down_chart.rb
 - db/migrate/022_remove_track_done_flag.rb
 - db/migrate/005_add_field_work_started_at.rb
 - db/migrate/006_works_data_fix.rb