backlog 0.33.0 → 0.33.1

data/History.txt

@@ -1,3 +1,15 @@
+== 0.33.1 2008-05-28
+
+=== Fixes
+
+* Added Work Account column to the work report.
+* Changed work report to list times with 2 decimals and be right-aligned.
+* Fixed missing response when updating an existing row in the daily work sheet.
+* Fixed wrong date in the works excel export.
+* Fixed typo in the header of the works list and excel export.
+* Fixed filtering on works list and excel export to use work record start date instead of completetion date.
+* Fixed bug where a display of a weekly work sheet for a non-existing user would produce an application error.
+
 == 0.33.0 2008-05-09
 
 == Features

data/app/controllers/tasks_controller.rb

@@ -242,8 +242,8 @@ class TasksController < ApplicationController
             'work[task_id]' => @task.id,
             'work[started_on]' => started_work.started_on.to_s,
             'work[start_time]' => started_work.start_time.to_s,
-            'work[completed_at]' => [next_quarter, started_work.started_on.at(started_work.start_time)].max.iso8601,
-            'work[hours]' => "%0.2f" % ((next_quarter - started_work.started_on.at(started_work.start_time)).to_f / 3600),
+            'work[completed_at]' => [next_quarter, started_work.started_on.at(started_work.start_time || TimeOfDay.new(0, 0))].max.iso8601,
+            'work[hours]' => "%0.2f" % ((next_quarter - started_work.started_on.at(started_work.start_time || TimeOfDay.new(0, 0))).to_f / 3600),
             'estimate[todo]' => @task.todo
       })
     else

data/app/controllers/works_controller.rb

@@ -15,13 +15,13 @@ class WorksController < ApplicationController
   :redirect_to => { :action => :list }
   
   def list
-    work_account_name = (params[:work_account_id] && WorkAccount.find(params[:work_account_id]).name) || 'all accoutns'
+    work_account_name = (params[:work_account_id] && WorkAccount.find(params[:work_account_id]).name) || l(:all_accounts)
     @report_filter = WorksReportFilter.new(params[:report_filter])
     @report_filter.title = "#{l :hours} for #{work_account_name} #{@report_filter.start_on && @report_filter.start_on.strftime('%Y-%m-%d - ')}#{@report_filter.end_on && @report_filter.end_on.strftime('%Y-%m-%d')}"
     @period = params[:id] && Period.find(params[:id])
-    @works = Work.paginate :conditions => ["completed_at BETWEEN ? AND ? #{'AND work_account_id = ?' if @report_filter.work_account_id} #{@report_filter.invoice.nil? ? '' : 'AND invoice = ?'} #{@report_filter.user_id.nil? ? '' : 'AND user_id = ?'}", @report_filter.start_on, @report_filter.end_on + 1, @report_filter.work_account_id, @report_filter.invoice, @report_filter.user_id].compact,
-        :page => params[:page], :per_page => @report_filter.page_size,
-        :order => 'started_on, start_time, completed_at'
+    @works = Work.paginate :conditions => ["started_on BETWEEN ? AND ? #{'AND work_account_id = ?' if @report_filter.work_account_id} #{@report_filter.invoice.nil? ? '' : 'AND invoice = ?'} #{@report_filter.user_id.nil? ? '' : 'AND user_id = ?'}", @report_filter.start_on, @report_filter.end_on, @report_filter.work_account_id, @report_filter.invoice, @report_filter.user_id].compact,
+    :page => params[:page], :per_page => @report_filter.page_size,
+    :order => 'started_on, start_time, completed_at'
     @work_accounts = WorkAccount.find(:all, :order => :name)
     @users = User.find(:all, :order => 'first_name, last_name')
     if params[:export] == 'excel'
@@ -198,7 +198,16 @@ class WorksController < ApplicationController
     @date = (params[:id] && Date.parse(params[:id])) || Date.today
     @year = @date.year
     @week = @date.cweek
-    @user = (params[:user_id] && User.find(params[:user_id])) || current_user
+    if params[:user_id]
+      @user = User.find_by_id(params[:user_id])
+      if @user.nil?
+        flash[:notice] = l(:cannot_find_user, params[:user_id])
+        back_or_redirect_to '/'
+        return
+      end
+    else
+      @user = current_user
+    end
     @periods = []
     @works = Work.find_work_for_day(@date, @user)
     @customers = Customer.find(:all, :order => :name)
@@ -274,14 +283,14 @@ class WorksController < ApplicationController
     if (search_id = params[:work][:task_id].to_i) > 0
       @tasks += Task.find(:all,
                           :conditions => [ "id = ? OR id BETWEEN ? AND ?",
-                        search_id, search_id * 10, ((search_id+1) * 10 -1) ], 
+      search_id, search_id * 10, ((search_id+1) * 10 -1) ], 
       :order => 'id',
       :limit => 10)
     end
     
     
     @tasks += Task.find(:all,
-                                     :conditions => [ "finished_at IS NULL AND LOWER(description) LIKE ?",
+                        :conditions => [ "finished_at IS NULL AND LOWER(description) LIKE ?",
                         '%' + params[:work][:task_id].downcase + '%' ], 
     :order => 'description ASC',
     :limit => 10)

data/app/models/task.rb

@@ -404,7 +404,7 @@ class Task < ActiveRecord::Base
   end
   
   def started_work
-    started_works = works.select {|work| work.completed_at.nil?}
+    started_works = works.select {|work| work.start_time && work.completed_at.nil?}
     if current_user
       started_by_user = started_works.select {|work| work.user == current_user}.last
       return started_by_user if started_by_user

data/app/views/tasks/_task.rhtml

@@ -28,11 +28,12 @@
 
     <div style="float: right" style="border: 1px solid black">
     <div class="task_start">
+    &nbsp;
       <% if active && @task.loggable? -%>
           <% if @task.work_started? -%>
             <% remote_form_for(:work, :url => {:controller => 'works', :action => 'update_time', :id => @task.started_work}) do |f| %>
               <%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
-              <%=f.text_field 'start_time', :id => "work_#{@task.started_work.id}_start_time", :tabindex => i+1, :value => @task.started_work.start_time.strftime('%H:%M'),
+              <%=f.text_field 'start_time', :id => "work_#{@task.started_work.id}_start_time", :tabindex => i+1, :value => (@task.started_work.start_time ? @task.started_work.start_time.strftime('%H:%M') : ''),
                   :class => :task_time, :maxlength => 5 %>
             <% end %>
           <% elsif @task.track_times? && (@task.period_id.nil? || @task.period.active?) %>

data/app/views/tasks/edit.rhtml

@@ -31,7 +31,7 @@
           <% if @task.work_started? -%>
             <% remote_form_for(:work, :url => {:controller => 'works', :action => 'update_time', :id => @task.started_work}) do |f| %>
               <%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
-              <%=l :started_at%> <%=f.text_field 'start_time', :id => "work_#{@task.started_work.id}_start_time", :value => @task.started_work.started_at.strftime('%H:%M'),
+              <%=l :started_at%> <%=f.text_field 'start_time', :id => "work_#{@task.started_work.id}_start_time", :value => @task.started_work.started_at ? @task.started_work.started_at.strftime('%H:%M') : '',
                   :class => :task_time, :maxlength => 5 %>
             <% end %>
           <% elsif @task.track_times? && (@task.period_id.nil? || @task.period.active?) %>

data/app/views/works/list.rhtml

@@ -101,6 +101,7 @@
   <tr>
     <th><%=l :user %></th>
     <th><%=l :done %></th>
+    <th><%=l :work_account %></th>
     <th><%=l :description %></th>
     <th><%=l :invoice %></th>
     <th><%=l :started_at %></th>
@@ -110,7 +111,8 @@
 <% for work in @works %>
   <tr>
     <td valign="top"><%=work.user && work.user.login %></td>
-    <td valign="top"><%=work.hours %></td>
+    <td align="right" valign="top"><%='%.2f' % work.hours %></td>
+    <td valign="top"><%=work.work_account.name %></td>
 	<%if work.task 
 		link = "Task: #{work.task.description} <br/>"
 	else
@@ -118,10 +120,10 @@
      end
 	link += h(work.description)
 	%>
-    <td><%= link_to link, :controller => 'works', :action => 'daily_work_sheet', :id => work.started_on.strftime("%Y-%m-%d") %></td>
+    <td valign="top"><%=detour_to link, :controller => 'works', :action => 'daily_work_sheet', :id => work.started_on.strftime("%Y-%m-%d"), :user_id => work.user_id %></td>
     <td><%=work.invoice ? l(:yes) : '' %></td>
-    <td><%=work.started_at && work.started_at.strftime('%Y-%m-%d %H:%M:%S') %></td>
-    <td valign="top"><%=work.completed_at && work.completed_at.strftime('%Y-%m-%d %H:%M:%S') %></td>
+    <td valign="top"><%=(work.started_at && work.started_at.strftime('%Y-%m-%d %H:%M:%S')) || work.started_on.strftime('%Y-%m-%d') %></td>
+    <td valign="top"><%=(work.completed_at && work.completed_at.strftime('%Y-%m-%d %H:%M:%S')) || work.started_on.strftime('%Y-%m-%d') %></td>
     <tr>
 <% end %>
 	<tr>

data/app/views/works/list_excel.rhtml

@@ -77,8 +77,8 @@
     <Cell><Data ss:Type="String"><%=work.description %></Data></Cell>
     <Cell><Data ss:Type="Number"><%=work.hours %></Data></Cell>
     <Cell><Data ss:Type="String"><%=work.invoice? ? 'Ja' : 'Nei' %></Data></Cell>
-    <Cell ss:StyleID="DateTime"><Data ss:Type="Number"><%=BigDecimal((work.started_on - Date.new(1899, 12, 31)).to_s) + (work.start_time ? (BigDecimal(work.start_time.hour.to_s) + BigDecimal(work.start_time.minute.to_s)/60) / 24 : 0) %></Data></Cell>
-    <Cell ss:StyleID="DateTime"><Data ss:Type="Number"><%=work.completed_at && (BigDecimal((work.completed_at.to_datetime - DateTime.parse('1899-12-31T00:00:00+02:00')).to_f.to_s))%></Data></Cell>
+    <Cell ss:StyleID="DateTime"><Data ss:Type="Number"><%=(BigDecimal((work.started_on - Date.new(1899, 12, 30)).to_s) + (work.start_time ? (BigDecimal(work.start_time.hour.to_s) + BigDecimal(work.start_time.minute.to_s)/60) / 24 : 0)).truncate(6) %></Data></Cell>
+    <Cell ss:StyleID="DateTime"><Data ss:Type="Number"><%=work.completed_at && (BigDecimal((work.completed_at.to_datetime - DateTime.parse('1899-12-30T00:00:00+02:00')).to_f.to_s))%></Data></Cell>
    </Row>
   <% end %>
 

data/app/views/works/update_row.rjs

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

data/lang/en.yaml

@@ -7,12 +7,14 @@ account: Account
 active: Active
 administration: Administration
 all: All
+all_accounts: all accounts
 assigned_to: Assigned to
 back: Back
 backlog: Backlog
 backlog_description: Task list with ordering and status tracking
 backlogs: Backlogs
 burn_down_chart: Burn Down Chart
+cannot_find_user: Cannot find user %s
 change_password: Change Password
 complete: Complete
 completed: Completed

data/lang/no.yaml

@@ -7,12 +7,14 @@ account: Konto
 active: Aktiv
 administration: Administrasjon
 all: All
+all_accounts: alle konti
 assigned_to: Tilordnet
 back: Tilbake
 backlog: Oppgaveliste
 backlog_description: Oppgaveliste med sortering og statussporing
 backlogs: Oppgavelister
 burn_down_chart: Fremdriftsgraf
+cannot_find_user: Kan ikke finne bruker %s
 change_password: Bytt Passord
 complete: Fullfør
 completed: Fullført

data/test/functional/works_controller_test.rb

@@ -43,7 +43,7 @@ class WorksControllerTest < Test::Unit::TestCase
     assert_template 'list'
 
     assert_not_nil assigns(:works)
-    assert_equal 4, assigns(:works).size
+    assert_equal 5, assigns(:works).size
   end
 
   def test_list_excel
@@ -53,7 +53,7 @@ class WorksControllerTest < Test::Unit::TestCase
     assert_template 'list_excel'
 
     assert_not_nil assigns(:works)
-    assert_equal 4, assigns(:works).size
+    assert_equal 5, assigns(:works).size
   end
 
   def test_show

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.33.0
+  version: 0.33.1
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-23 00:00:00 +02:00
+date: 2008-07-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency