backlog 0.32.0 → 0.33.0

data/History.txt

@@ -1,4 +1,25 @@
-== 0.32.0 2008-05-06
+== 0.33.0 2008-05-09
+
+== Features
+
+* Upgraded JRuby to version 1.1.1 for the WAR distribution.
+
+=== Fixes
+
+* Changed to set the most commonly used backlog as default backlog for a new task.
+* Copied the list of users that have grabbed a task when the task is moved to another period.
+* Changed setting of start time for a new work record in the daily work sheet
+  to to completion time of the last work record on the same day,
+  or blank if there are no work records or the last work record was not completed yet..
+* Added user_id parameter when navigating links in the daily and weekly work sheets.
+* Changed to display expected number of hours per week instead of
+  adding 8 hours for public holidays and absences.
+* Fixed wrong indent in Show Sprint view.
+* Always show start time in works list.
+* Fixed migrations to work with PostgreSQL 8.3
+* Removed automatic setting of "completed at" time for works.
+
+== 0.32.0 2008-05-08
 
 == Features
 

data/app/controllers/works_controller.rb

@@ -65,7 +65,7 @@ class WorksController < ApplicationController
       end
       @work = Work.new(params[:work])
       @work.started_on ||= Date.today
-      @work.completed_at = Time.now unless @work.start_time || @work.completed_at
+      #@work.completed_at = Time.now unless @work.start_time || @work.completed_at
       @work.calculate_hours! unless @work.hours && @work.hours.to_f > 0
       @work.user_id = current_user.id
     end
@@ -86,7 +86,11 @@ class WorksController < ApplicationController
     
     @work.task.estimates.create!(params[:estimate]) if @work.task && params[:estimate]
     
-    back_or_redirect_to :controller => 'periods', :action => 'show', :id => @work.task && @work.task.period, :task_id => @work.task && @work.task.id
+    if @work.task
+      back_or_redirect_to :controller => 'periods', :action => 'show', :id => @work.task && @work.task.period, :task_id => @work.task && @work.task.id
+    else
+      back_or_redirect_to :controller => 'works', :action => 'daily_work_sheet', :id => @work.started_on.strftime('%Y-%m-%d')
+    end
   end
   
   
@@ -139,13 +143,14 @@ class WorksController < ApplicationController
     if update_work
       #flash.discard
       @next_field = params[:next_field] || 'description'
-      works = Work.find_work_for_day((@work.started_on || @work.completed_at).to_date)
-      @day_total = works.inject(BigDecimal('0')){|total,work|total+=work.hours}
+      @works = Work.find_work_for_day((@work.started_on || @work.completed_at).to_date)
+      @day_total = @works.inject(BigDecimal('0')){|total,work|total+=work.hours}
     else
       @next_field = params[:field] || 'description'
     end
     @work_accounts = WorkAccount.find(:all, :order => :name)
     @customers = Customer.find(:all, :order => :name)
+    @new_work = flash[:work] || Work.new(@works.last && @works.last.completed_at ? {:started_at => @works.last.completed_at} : nil)
   end
   
   def update_time
@@ -198,7 +203,7 @@ class WorksController < ApplicationController
     @works = Work.find_work_for_day(@date, @user)
     @customers = Customer.find(:all, :order => :name)
     @started_works = Task.find_started
-    @new_work = flash[:work] || Work.new(:started_at => Time.now)
+    @new_work = flash[:work] || Work.new(@works.last && @works.last.completed_at ? {:started_at => @works.last.completed_at} : nil)
     @work_accounts = WorkAccount.find(:all, :order => :name)
     @absence = Absence.find(:first, :conditions => {:on => @date, :user_id => @user.id})
     @public_holiday = PublicHoliday.find(:first, :conditions => {:on => @date})

data/app/models/period.rb

@@ -45,7 +45,7 @@ class Period < ActiveRecord::Base
       freq[b.id] ||= 0
       freq[b.id] += 1
     end
-    freq.to_a.sort_by {|backlog, count| count}.first[0]
+    freq.to_a.sort_by {|backlog, count| -count}.first[0]
   end
   
   def active?(check_tasks = false)

data/app/models/task.rb

@@ -179,6 +179,7 @@ class Task < ActiveRecord::Base
         existing_task.open
         existing_task.previous_task_id = self.previous_task_id || self.id
         existing_task.description = self.description
+        existing_task.users = self.users
         existing_task.save!
         existing_task.estimate(old_todo)
         return existing_task
@@ -195,6 +196,7 @@ class Task < ActiveRecord::Base
         new_task.description = self.description
         new_task.initial_estimate = self.initial_estimate
         new_task.position = nil
+        new_task.users = self.users
         new_task.save!
         new_task.insert_at 1
         new_task.estimate(old_todo)

data/app/views/tasks/_completed.rhtml

@@ -7,7 +7,9 @@
   	<%=render :partial => '/tasks/fields_header', :locals => {:backlog => @backlog, :active => false, :track_times => false, :work_done => work_done} %>
   	<ul id="completed_tasks_<%=period && period.id%>" class="task_list" style="width: 100%;">
   	  <% @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, :show_backlog => controller.class != BacklogsController } %>
+  	    <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => false, 
+				:highlight_task => task == @selected_task, :hidden => false, 
+				:show_backlog => controller.class != BacklogsController, :update => :spotlight } %>
   	    <% i += 1 %>
   	  <% end %>
   	</ul>

data/app/views/tasks/_task.rhtml

@@ -6,6 +6,8 @@
         <%=image_button_to('add.png', l(:specify), {:controller => 'tasks', :action => :specify, :id => @task.id}, 
         		:style => "margin-left: #{@task.depth * 2}em") %>
       <% end %>
+    <% else %>
+		<%=image_tag 'blank.png', :class => 'image-submit', :style => "margin-left: 0em; padding: 0px" %>
     <% end %>
     </div>
     <div style="float: left" style="border: 3px solid red">

data/app/views/works/_new_row.rhtml

@@ -56,7 +56,7 @@
     </td>
     <td id="work_start_time_cell" align="right" valign="bottom">
 	  <% field = 'start_time'; next_field = 'completed_at_time' %>
-      <%=text_field :work, :start_time, :value => last_work && last_work.completed_at && last_work.completed_at.strftime('%H:%M'), :class => 'task_time',
+      <%=text_field :work, :start_time, :value => @new_work.start_time && @new_work.start_time.strftime('%H:%M'), :class => 'task_time',
         :onchange => remote_function(:url => {:action => :update_new_row, :field => field,
 						:next_field => next_field},
 						:with => "

data/app/views/works/_weekly_work_sheet_buttons.rhtml

@@ -1,5 +1,7 @@
-<div style="float: left"><%=link_to(image_tag('arrow_left.png'), :year => (@week > 1 ? @year : @year - 1), :week => (@week > 1 ? @week - 1 : 52))%></div>
-<div style="float: right"><%=link_to(image_tag('arrow_right.png'), :year => (@week < 52 ? @year : @year + 1), :week => (@week < 52 ? @week + 1 : 1))%></div>
+<% user_parameter = @user != current_user ? @user.id : nil %>
+
+<div style="float: left"><%=link_to(image_tag('arrow_left.png'), :year => (@week > 1 ? @year : @year - 1), :week => (@week > 1 ? @week - 1 : 52), :user_id => user_parameter)%></div>
+<div style="float: right"><%=link_to(image_tag('arrow_right.png'), :year => (@week < 52 ? @year : @year + 1), :week => (@week < 52 ? @week + 1 : 1), :user_id => user_parameter)%></div>
 
 <div align="right">
 	<% lock_action = @lock ? :unlock : :lock %>

data/app/views/works/daily_work_sheet.rhtml

@@ -2,11 +2,13 @@
 
 <div id="spotlight">
 
-<div style="float: left"><%=image_link_to('arrow_left.png', l(:previous_week), {:id => @date - 7}, :class => nil)%></div>
-<div style="float: left"><%=image_link_to('arrow_left.png', l(:previous_day), {:id => @date-1}, :class => nil)%></div>
-<%=link_to l(:weekly_work_sheet), :action => :weekly_work_sheet, :year => @year, :week => @week%>
-<div style="float: right"><%=image_link_to('arrow_right.png', l(:next_week), {:id => @date + 7}, :class => nil)%></div>
-<div style="float: right"><%=image_link_to('arrow_right.png', l(:next_day), {:id => @date+1}, :class => nil)%></div>
+<% user_parameter = @user != current_user ? @user.id : nil %>
+
+<div style="float: left"><%=image_link_to('arrow_left.png', l(:previous_week), {:id => @date - 7, :user_id => user_parameter}, :class => nil)%></div>
+<div style="float: left"><%=image_link_to('arrow_left.png', l(:previous_day), {:id => @date-1, :user_id => user_parameter}, :class => nil)%></div>
+<%=link_to l(:weekly_work_sheet), :action => :weekly_work_sheet, :year => @year, :week => @week, :user_id => user_parameter%>
+<div style="float: right"><%=image_link_to('arrow_right.png', l(:next_week), {:id => @date + 7, :user_id => user_parameter}, :class => nil)%></div>
+<div style="float: right"><%=image_link_to('arrow_right.png', l(:next_day), {:id => @date+1, :user_id => user_parameter}, :class => nil)%></div>
 
 <br clear="all" />
 

data/app/views/works/list.rhtml

@@ -103,9 +103,7 @@
     <th><%=l :done %></th>
     <th><%=l :description %></th>
     <th><%=l :invoice %></th>
-  <% if @period && @period.track_times? %>
     <th><%=l :started_at %></th>
-  <% end %>
     <th><%=l :completed_at %></th>
   </tr>
   
@@ -122,9 +120,7 @@
 	%>
     <td><%= link_to link, :controller => 'works', :action => 'daily_work_sheet', :id => work.started_on.strftime("%Y-%m-%d") %></td>
     <td><%=work.invoice ? l(:yes) : '' %></td>
-  <% if @period && @period.track_times? %>
     <td><%=work.started_at && work.started_at.strftime('%Y-%m-%d %H:%M:%S') %></td>
-  <% end %>
     <td valign="top"><%=work.completed_at && work.completed_at.strftime('%Y-%m-%d %H:%M:%S') %></td>
     <tr>
 <% end %>

data/app/views/works/update_row.rjs

@@ -11,3 +11,7 @@ end
 if @day_total
   page.replace_html "hours_total", "#{t @day_total}"
 end
+
+if @new_work
+  page["work_start_time"].value = @new_work.started_at.strftime('%H:%M')
+end

data/app/views/works/weekly_work_sheet.rhtml

@@ -9,11 +9,25 @@
   <tr>
     <th><%=l :work_account %></th>
   	<% [:monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday].each_with_index do |day, i| %>
-    <th align="center"><%=detour_to "#{l(day)} #{week_date(i+1)}", :action => :daily_work_sheet, :id => (@first_date + i).strftime('%Y-%m-%d'), :user_id => (@user != current_user ? @user : nil) %></th>
+    	<th align="center"><%=detour_to "#{l(day)} #{week_date(i+1)}", :action => :daily_work_sheet, :id => (@first_date + i).strftime('%Y-%m-%d'), :user_id => (@user != current_user ? @user : nil) %></th>
 	<% end %>
     <th align="center" nowrap="true"><%=l :week %> <%=@week%></th>
   </tr>
 
+<% unless (@absences + @public_holidays).compact.empty? %>
+  <tr>
+    <th/>
+  	<% (0..6).each do |i| %>
+	<th><span style="color: red">
+		<%=l :public_holiday if @public_holidays[i] %>
+		<%=l :absent if @absences[i] %>
+		</span>
+	</th>
+	<% end %>
+    <th/>
+  </tr>
+<% end %>
+
 <% week_totals = Hash.new(0) %>
 <% day_totals = Array.new(7, 0) %>
 <% for work_account, totals in @work_accounts %>
@@ -35,12 +49,13 @@
 <% end %>
   <tr>
   	<th><%=l :totals%></th>
+<% expected_week_total = BigDecimal('40') %>
 <% (0..6).each do |day| %>
-	<% day_totals[day] += BigDecimal('8') if @absences[day] || @public_holidays[day] %>
+	<% expected_week_total -= BigDecimal('8') if @absences[day] || @public_holidays[day] %>
     <th class="hours"><%=t(day_totals[day]) if day_totals[day] > 0%></th>
 <% end %>
 <% week_total = day_totals.inject(BigDecimal('0')) {|total, day_total| total + day_total} %>
-    <th class="hours"><%=t(week_total)%></th>
+    <th class="hours"><%=t(week_total)%><%=" (#{t expected_week_total})" unless expected_week_total == 40 %></th>
   </tr>
 </table>
 

data/config/war.rb

@@ -1,7 +1,7 @@
 # Goldspike configuration
 
 # Set the version of JRuby and GoldSpike to use:
-maven_library 'org.jruby', 'jruby-complete', '1.1RC3'
+maven_library 'org.jruby', 'jruby-complete', '1.1.1'
 maven_library 'backport-util-concurrent', 'backport-util-concurrent', '3.0'
 #maven_library 'org.jruby.extras', 'goldspike', '1.3-SNAPSHOT'
 
@@ -10,9 +10,9 @@ maven_library 'postgresql', 'postgresql', '8.2-504.jdbc4'
 #maven_library 'bouncycastle', 'bcprov-jdk16', '136'
 
 add_gem('jruby-openssl', '>=0.0.4')
-add_gem('rubyforge', '>=0.4.4')
+add_gem('rubyforge', '>=1.0.0')
 add_gem('rmagick4j', '>=0.3.3')
-add_gem('gruff', '>=0.2.8')
+add_gem('gruff', '>=0.3.1')
 add_gem('slave', '>=1.2.1')
 
 exclude_files('pkg')

data/db/migrate/017_insert_datek_projects.rb

@@ -53,7 +53,7 @@ class InsertDatekProjects < ActiveRecord::Migration
       Backlog.reset_column_information
       
       projects.each do |invoice_code, name|
-        if backlog = Backlog.find_by_invoice_code(invoice_code)
+        if backlog = Backlog.find_by_invoice_code(invoice_code.to_s)
           if backlog.invoice_code.nil? || backlog.invoice_code.length >= 31
             puts "Set Mamut project code to #{invoice_code} for '#{name}'"
             backlog.invoice_code = invoice_code

data/db/schema.rb

@@ -151,29 +151,29 @@ ActiveRecord::Schema.define(:version => 31) do
 
   add_foreign_key "absences", ["user_id"], "users", ["party_id"], :name => "absences_user_id_fkey"
 
-  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"
+  add_foreign_key "backlogs", ["customer_id"], "customers", ["id"], :name => "backlogs_customer_id_fkey"
 
-  add_foreign_key "estimates", ["user_id"], "users", ["party_id"], :name => "estimates_user_id_fkey"
   add_foreign_key "estimates", ["task_id"], "tasks", ["id"], :name => "estimates_task_id_fkey"
+  add_foreign_key "estimates", ["user_id"], "users", ["party_id"], :name => "estimates_user_id_fkey"
 
   add_foreign_key "groups", ["party_id"], "parties", ["id"], :name => "groups_party_id_fkey"
 
-  add_foreign_key "groups_users", ["user_id"], "users", ["party_id"], :name => "groups_users_user_id_fkey"
   add_foreign_key "groups_users", ["group_id"], "groups", ["party_id"], :name => "groups_users_group_id_fkey"
+  add_foreign_key "groups_users", ["user_id"], "users", ["party_id"], :name => "groups_users_user_id_fkey"
 
   add_foreign_key "periods", ["party_id"], "parties", ["id"], :name => "periods_party_id_fkey"
 
   add_foreign_key "task_files", ["task_id"], "tasks", ["id"], :name => "task_files_task_id_fkey"
 
-  add_foreign_key "tasks", ["updated_by"], "users", ["party_id"], :name => "tasks_updated_by_fkey"
-  add_foreign_key "tasks", ["created_by"], "users", ["party_id"], :name => "tasks_created_by_fkey"
-  add_foreign_key "tasks", ["customer_id"], "customers", ["id"], :name => "tasks_customer_id_fkey"
-  add_foreign_key "tasks", ["work_account_id"], "work_accounts", ["id"], :name => "tasks_work_account_id_fkey"
-  add_foreign_key "tasks", ["backlog_id"], "backlogs", ["id"], :name => "tasks_backlog_id_fkey"
-  add_foreign_key "tasks", ["previous_task_id"], "tasks", ["id"], :name => "tasks_previous_task_id_fkey"
-  add_foreign_key "tasks", ["parent_id"], "tasks", ["id"], :name => "tasks_parent_id_fkey"
   add_foreign_key "tasks", ["period_id"], "periods", ["id"], :name => "tasks_period_id_fkey"
+  add_foreign_key "tasks", ["parent_id"], "tasks", ["id"], :name => "tasks_parent_id_fkey"
+  add_foreign_key "tasks", ["previous_task_id"], "tasks", ["id"], :name => "tasks_previous_task_id_fkey"
+  add_foreign_key "tasks", ["backlog_id"], "backlogs", ["id"], :name => "tasks_backlog_id_fkey"
+  add_foreign_key "tasks", ["work_account_id"], "work_accounts", ["id"], :name => "tasks_work_account_id_fkey"
+  add_foreign_key "tasks", ["customer_id"], "customers", ["id"], :name => "tasks_customer_id_fkey"
+  add_foreign_key "tasks", ["created_by"], "users", ["party_id"], :name => "tasks_created_by_fkey"
+  add_foreign_key "tasks", ["updated_by"], "users", ["party_id"], :name => "tasks_updated_by_fkey"
 
   add_foreign_key "tasks_users", ["task_id"], "tasks", ["id"], :name => "tasks_users_task_id_fkey"
   add_foreign_key "tasks_users", ["user_id"], "users", ["party_id"], :name => "tasks_users_user_id_fkey"
@@ -188,9 +188,9 @@ ActiveRecord::Schema.define(:version => 31) do
 
   add_foreign_key "work_locks", ["user_id"], "users", ["party_id"], :name => "work_locks_user_id_fkey"
 
-  add_foreign_key "works", ["work_account_id"], "work_accounts", ["id"], :name => "works_work_account_id_fkey"
-  add_foreign_key "works", ["customer_id"], "customers", ["id"], :name => "works_customer_id_fkey"
-  add_foreign_key "works", ["user_id"], "users", ["party_id"], :name => "works_user_id_fkey"
   add_foreign_key "works", ["task_id"], "tasks", ["id"], :name => "works_task_id_fkey"
+  add_foreign_key "works", ["user_id"], "users", ["party_id"], :name => "works_user_id_fkey"
+  add_foreign_key "works", ["customer_id"], "customers", ["id"], :name => "works_customer_id_fkey"
+  add_foreign_key "works", ["work_account_id"], "work_accounts", ["id"], :name => "works_work_account_id_fkey"
 
 end

data/lang/en.yaml

@@ -2,6 +2,7 @@ file_charset: utf-8
 
 abort: Abort
 aborted: Aborted
+absent: Absent
 account: Account
 active: Active
 administration: Administration

data/lang/no.yaml

@@ -2,6 +2,7 @@ file_charset: utf-8
 
 abort: Avbryt
 aborted: Avbrutt
+absent: Fravær
 account: Konto
 active: Aktiv
 administration: Administrasjon

data/test/functional/works_controller_test.rb

@@ -110,6 +110,34 @@ class WorksControllerTest < Test::Unit::TestCase
     assert_equal BigDecimal('0.333'), assigns(:work).hours
   end
   
+  def test_create_with_old_start_date_and_completed_at_time
+    num_works = Work.count
+    
+    post :create, :work => {:task_id => 1, :started_on => '2007-07-31', :work_account_id => '1', 
+        :start_time => '12:00', :completed_at_time => '12:20'}
+    
+    assert_response :redirect
+    assert_redirected_to :controller => 'periods', :action => 'show', :id => periods(:past).id, :task_id => 1
+    
+    assert_equal num_works + 1, Work.count
+    assert_equal BigDecimal('0.333'), assigns(:work).hours
+    assert_equal Time.parse('2007-07-31 12:20'), assigns(:work).completed_at
+  end
+  
+  def test_create_with_old_start_date_and_no_times
+    num_works = Work.count
+    
+    post :create, :work => {:started_on => '2007-07-31', :work_account_id => '1', :hours_time => '3:00'}
+    
+    assert_response :redirect
+    assert_redirected_to :controller => 'works', :action => 'daily_work_sheet', :id => '2007-07-31'
+    
+    assert_equal num_works + 1, Work.count
+    assert_equal BigDecimal('3.000'), assigns(:work).hours
+    assert_nil assigns(:work).start_time
+    assert_nil assigns(:work).completed_at
+  end
+  
   def test_edit
     get :edit, :id => 1
     

data/test/unit/user_test.rb

@@ -7,7 +7,7 @@ class UserTest < Test::Unit::TestCase
   def test_authenticate
     assert_equal users(:tesla), User.authenticate(users(:tesla).login, "atest")
     assert_nil User.authenticate("nontesla", "atest")
-    assert_nil User.authenticate(users(:tesla), "wrong password")
+    assert_nil User.authenticate(users(:tesla).login, "wrong password")
   end
   
   def test_authenticate_by_token

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-08 00:00:00 +02:00
+date: 2008-05-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,7 +55,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.5.3
     version: 
 description: Welcome to Backlog!  Backlog is a tool to help you collect and organize all your tasks, whether you are a single person or a small or large group.
 email: uwe@kubosch.no
@@ -596,6 +596,7 @@ files:
 - public/images/rmagick_270.gif
 - public/images/arrow_right.svg
 - public/images/arrow_left.png
+- public/images/blank.png
 - public/images/arrow_right.png
 - public/images/arrow_down.svg
 - public/images/grab_gray.png
@@ -757,7 +758,7 @@ requirements:
 - ImageMagick
 - PostgreSQL
 rubyforge_project: backlog
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.