backlog 0.29.0 → 0.30.0

data/History.txt

@@ -1,3 +1,28 @@
+== 0.30.0 2008-04-08
+
+=== Features
+
+* Added two new shortcuts: ALT-SHIFT-D to go to the Daily Work Sheet
+  and ALT-SHIFT-W to go to the Weekly Work Sheet.
+
+=== Fixes
+
+* Add 8 hours of work time for public holidays.
+* Fixed bad rounding of work record durations.
+* Fixed so that the "task" field gets focus after the "done" field has changed.
+* Fixed wrong label for "Sick with doctor's note" radio button in the Daily Work Sheet.
+  It would select the "Sick day" button instead.
+* Fixed parsing error for time of day: 930, 815 etc.
+
+=== Internal
+
+* Renamed the weekly work sheet view from weekly_work_sheet_by_work_account to weekly_work_sheet for shorter URLs.
+* Moved search call from works_controller to Work model.
+* Removed non-use of client side JRuby applet.
+* Extracted shortcut code into partials for use in all layouts.
+* Removed unused absences layout.
+* Removed duplicate code for parsing time of day.
+
 == 0.29.0 2008-04-07
 
 === Features

data/app/controllers/application.rb

@@ -148,6 +148,8 @@ class ApplicationController < ActionController::Base
     {:key => 'Alt-Shift-N',    :function => :new_period, :options => {:controller => 'periods', :action => 'new'}},
     {:key => 'Alt-Ctrl-N',     :function => :new_backlog, :options => {:controller => 'backlogs', :action => 'new'}},
     {:key => 'Alt-Ctrl-G',     :function => :new_group, :options => {:controller => 'groups', :action => :new}},
+    {:key => 'Alt-Shift-D',    :function => :daily_work_sheet, :options => {:controller => 'works', :action => :daily_work_sheet}},
+    {:key => 'Alt-Shift-W',    :function => :weekly_work_sheet, :options => {:controller => 'works', :action => :weekly_work_sheet}},
     ]
   end
   

data/app/controllers/work_locks_controller.rb

@@ -61,7 +61,7 @@ class WorkLocksController < ApplicationController
     user_subscribers = current_user.work_lock_subscribers
     notify_users = (work_account_subscribers + user_subscribers).uniq
     notify_users.each do |user|
-      week_url = url_for :controller => 'works', :action => :weekly_work_sheet_by_work_account, :year => @year, :week => @week, :user_id => current_user.id
+      week_url = url_for :controller => 'works', :action => :weekly_work_sheet, :year => @year, :week => @week, :user_id => current_user.id
       spreadsheet_url = url_for :controller => 'works', :action => :timeliste, :year => @year, :week => @week, :user_id => current_user.id
       WorkLockNotify.deliver_lock(user, current_user, @week, week_url, spreadsheet_url)
     end

data/app/controllers/works_controller.rb

@@ -191,7 +191,7 @@ class WorksController < ApplicationController
     render :layout => 'wide'
   end
   
-  def weekly_work_sheet
+  def weekly_work_sheet_details
     @year = (params[:year] && params[:year].to_i) || Date.today.year
     @week = (params[:week] && params[:week].to_i) || Date.today.cweek
     @rows = Work.works_for_week(@year, @week)
@@ -201,18 +201,16 @@ class WorksController < ApplicationController
     render :layout => 'wide'
   end
   
-  def weekly_work_sheet_by_work_account
+  def weekly_work_sheet
     @year = (params[:year] && params[:year].to_i) || Date.today.year
     @week = (params[:week] && params[:week].to_i) || Date.today.cweek
     @user = params[:user_id] ? User.find(params[:user_id]) : current_user
     @work_accounts = Work.works_for_week_by_work_account(@year, @week, @user)
     @first_date = Date.commercial(@year, @week, 1)
     @last_date = @first_date + 6
-    @lock = WorkLock.find(:first, :conditions => ['user_id = ? AND start_on <= ? AND end_on >= ?', current_user.id, @first_date, @last_date])
-    @absences = Absence.find(:all, :conditions => ['"on" BETWEEN ? AND ?', @first_date, @last_date], :order => '"on"')
-    (0..6).each do |day|
-      @absences.insert(day, nil) if @absences[day] && @absences[day].on > @first_date + day
-    end
+    @lock = WorkLock.find_by_week(@year, @week)
+    @absences = Absence.find_by_week(@year, @week)
+    @public_holidays = PublicHoliday.find_by_week(@year, @week)
     render :layout => 'wide'
   end
   
@@ -286,7 +284,7 @@ class WorksController < ApplicationController
     raise "Unknown time format: #{params[:hours_time]}" unless convert_hours_param
     @work = Work.new(params[:work])
     @updated_fields = [@field]
-    if @work.hours == 0  && @work.started_on && @work.start_time && @work.completed_at
+    if @work.hours == 0 && @work.started_on && @work.start_time && @work.completed_at
       @work.calculate_hours!
       @updated_fields << :hours_time
     end

data/app/helpers/application_helper.rb

@@ -59,6 +59,8 @@ module ApplicationHelper
   end
   
   def t(time_as_float)
+    return '' unless time_as_float
+    time_as_float = BigDecimal(time_as_float.to_s) unless time_as_float.is_a? BigDecimal
     "#{time_as_float.to_i}:#{'%02d' % (time_as_float.frac * 60).round}" 
   end
   

data/app/models/absence.rb

@@ -1,4 +1,6 @@
 class Absence < ActiveRecord::Base
+  extend UserSystem
+   
   validates_presence_of :user_id
   validates_presence_of :on
   validates_presence_of :reason
@@ -14,4 +16,15 @@ class Absence < ActiveRecord::Base
     end
   end
   
+  # Return an array of either an absence or nil for each day of the given week.
+  def self.find_by_week(year, week)
+    first_date = Date.commercial(year, week, 1)
+    last_date = first_date + 6
+    results = self.find(:all, :conditions => ['"on" BETWEEN ? AND ? AND user_id = ?', first_date, last_date, current_user && current_user.id], :order => '"on"')
+    (0..6).each do |day|
+      results.insert(day, nil) if results[day] && results[day].on > first_date + day
+    end
+    results
+  end
+  
 end

data/app/models/public_holiday.rb

@@ -1,2 +1,13 @@
 class PublicHoliday < ActiveRecord::Base
+  # Return an array of either a public holiday or nil for each day of the given week.
+  def self.find_by_week(year, week)
+    first_date = Date.commercial(year, week, 1)
+    last_date = first_date + 6
+    results = self.find(:all, :conditions => ['"on" BETWEEN ? AND ?', first_date, last_date], :order => '"on"')
+    (0..6).each do |day|
+      results.insert(day, nil) if results[day] && results[day].on > first_date + day
+    end
+    results
+  end
+  
 end

data/app/models/work.rb

@@ -139,10 +139,9 @@ class Work < ActiveRecord::Base
       self.completed_at = nil
       return
     end
-    raise "invalid time format: #{new_value}" unless new_value =~ /^(\d{0,2}):?(\d{2})?$/
-    new_hour, new_minutes = $1, $2
-    t = started_on || completed_at || Time.now
-    self.completed_at = Time.local(t.year, t.month, t.day, new_hour, new_minutes)
+    time_of_day = TimeOfDay.parse(new_value)
+    date = started_on || completed_at.to_date || Date.today
+    self.completed_at = date.at time_of_day
   end
   
   def calculate_hours!
@@ -151,7 +150,7 @@ class Work < ActiveRecord::Base
   end
   
   def calculate_hours
-    BigDecimal(((completed_at - started_at) / 3600).to_s).round(2)
+    BigDecimal(((completed_at - started_at) / 3600).to_s).round(3)
   end
   
 end

data/app/models/work_lock.rb

@@ -1,3 +1,11 @@
 class WorkLock < ActiveRecord::Base
+  extend UserSystem
+  
   belongs_to :user
+  
+  def self.find_by_week(year, week)
+    first_date = Date.commercial(year, week, 1)
+    last_date = first_date + 6
+    result = self.find(:first, :conditions => ['user_id = ? AND start_on <= ? AND end_on >= ?', current_user.id, first_date, last_date])
+  end
 end

data/app/models/work_lock_nagger.rb

@@ -13,11 +13,11 @@ class WorkLockNagger
         app_url = config[:app_url]
       end
       if app_url
-        url = app_url + 'works/weekly_work_sheet_by_work_account'
+        url = app_url + 'works/weekly_work_sheet'
       else      
         host = Socket::gethostname
         port = config[:port] || 3000
-        url = url_for(:host => host, :port => port, :controller => 'works', :action => :weekly_work_sheet_by_work_account)
+        url = url_for(:host => host, :port => port, :controller => 'works', :action => :weekly_work_sheet)
       end
     rescue Exception => e
       puts "Work Lock Nagger Exception"

data/app/views/layouts/_headers.rhtml

@@ -20,4 +20,4 @@
   <%= javascript_include_tag "effects" %>
   <%= javascript_include_tag "controls" %>
   <%= javascript_include_tag "dragdrop" %>
-  <%= javascript_include_tag "ruby" %>
+  <%#= javascript_include_tag "ruby" %>

data/app/views/layouts/_shortcuts.rhtml

@@ -0,0 +1,16 @@
+<% if @shortcuts %>
+    <div class="rblock">
+      <div class="btitle">
+        <h4><%=l :shortcuts %></h4>
+      </div>
+      <table>
+  <% @shortcuts.each_with_index do |shortcut, index| %>
+    <% if shortcut[:options] %>
+        <tr><td valign="top"><%= shortcut[:key]%></td><td><%=detour_to l(shortcut[:function]), shortcut[:options], :id => shortcut[:function], :tabindex => index+100 %></td></tr>
+    <% else %>
+        <tr><td valign="top"><%= shortcut[:key]%></td><td><%=l shortcut[:function] %></td></tr>
+    <% end %>
+  <% end %>
+      </table>
+    </div>
+  <% end %>

data/app/views/layouts/_shortcuts_js.rhtml

@@ -0,0 +1,19 @@
+<script type="text/javascript">
+function handlePageEvent(event) {
+  if (event.altKey && event.shiftKey && event.charCode == 110) {
+    window.location = '<%=url_for(:controller => 'periods', :action => :new)%>';
+  } else if (event.altKey && event.ctrlKey && event.charCode == 110) {
+    window.location = '<%=url_for(:controller => 'backlogs', :action => :new ) %>';
+  } else if (event.altKey && event.charCode == 110) {
+    window.location = '<%=url_for(:controller => 'tasks', :action => :new, :task => {:backlog_id => (@backlog ? @backlog.id : nil), :period_id => (@period ? @period.id : nil)} ) %>';
+  } else if (event.altKey && event.ctrlKey && event.charCode == 103) {
+    window.location = '<%=url_for(:controller => 'groups', :action => :new ) %>';
+  } else if (event.shiftKey && event.altKey && event.charCode == 100) {
+    window.location = '<%=url_for(:controller => 'works', :action => :daily_work_sheet ) %>';
+  } else if (event.shiftKey && event.altKey && event.charCode == 119) {
+    window.location = '<%=url_for(:controller => 'works', :action => :weekly_work_sheet ) %>';
+  } else {
+     //alert("shift: " + event.shiftKey + ", alt: " + event.altKey + ", ctrl: " + event.ctrlKey + ", " + event.charCode + ", " + event.keyCode);
+  }
+}
+</script>

data/app/views/layouts/mwrt002.rhtml

@@ -6,21 +6,7 @@
   <%=render :partial => '/layouts/headers' %>
 </head>
 
-<script type="text/javascript">
-function handlePageEvent(event) {
-  if (event.altKey && event.shiftKey && event.charCode == 110) {
-    window.location = '<%=url_for(:controller => 'periods', :action => :new)%>';
-  } else if (event.altKey && event.ctrlKey && event.charCode == 110) {
-    window.location = '<%=url_for(:controller => 'backlogs', :action => :new ) %>';
-  } else if (event.altKey && event.charCode == 110) {
-    window.location = '<%=url_for(:controller => 'tasks', :action => :new, :task => {:backlog_id => (@backlog ? @backlog.id : nil), :period_id => (@period ? @period.id : nil)} ) %>';
-  } else if (event.altKey && event.ctrlKey && event.charCode == 103) {
-    window.location = '<%=url_for(:controller => 'groups', :action => :new ) %>';
-  } else {
-     // alert("shift: " + event.shiftKey + ", alt: " + event.altKey + ", ctrl: " + event.ctrlKey + ", " + event.charCode + ", " + event.keyCode);
-  }
-}
-</script>
+<%=render :partial => '/layouts/shortcuts_js'%>
 
 <body onkeypress="handlePageEvent(event);">
 <div id="wrap">
@@ -31,22 +17,7 @@ function handlePageEvent(event) {
     </div>
   </div>
   <div id="rightcol">
-<% if @shortcuts %>
-    <div class="rblock">
-      <div class="btitle">
-        <h4><%=l :shortcuts %></h4>
-      </div>
-      <table>
-  <% @shortcuts.each_with_index do |shortcut, index| %>
-    <% if shortcut[:options] %>
-        <tr><td valign="top"><%= shortcut[:key]%></td><td><%=detour_to l(shortcut[:function]), shortcut[:options], :id => shortcut[:function], :tabindex => index+100 %></td></tr>
-    <% else %>
-        <tr><td valign="top"><%= shortcut[:key]%></td><td><%=l shortcut[:function] %></td></tr>
-    <% end %>
-  <% end %>
-      </table>
-    </div>
-  <% end %>
+  	<%=render :partial => '/layouts/shortcuts'%>
 
 <% if @sidebars %>    
 <% @sidebars.each do |sidebar| %>

data/app/views/layouts/wide.rhtml

@@ -8,10 +8,14 @@
 <head>
   <%=render :partial => '/layouts/headers' %>
 </head>
-<body>
+
+<%=render :partial => '/layouts/shortcuts_js'%>
+
+<body onkeypress="handlePageEvent(event);">
 
 <div width="793" align="center">
   	<%=render :partial => '/layouts/left_top'%>
+  	<%=render :partial => '/layouts/shortcuts'%>
 	<%= yield %>
 </div>
 

data/app/views/works/_buttons.rhtml

@@ -1,6 +1,6 @@
-        <%=image_detour_to('hammer.png', l(:weekly_work_sheet), :controller => 'works', :action => :weekly_work_sheet_by_work_account)%>
-<!--
         <%=image_detour_to('hammer.png', l(:weekly_work_sheet), :controller => 'works', :action => :weekly_work_sheet)%>
+<!--
+        <%=image_detour_to('hammer.png', l(:weekly_work_sheet), :controller => 'works', :action => :weekly_work_sheet_details)%>
 -->
         <%=link_to(image_tag(url_for("hammer.png"), :alt => l(:daily_work_sheet), :title => l(:daily_work_sheet), :class => 'image-submit'), :controller => 'works', :action => :daily_work_sheet)%>
 <!--

data/app/views/works/_row.rhtml

@@ -67,7 +67,7 @@
         :next_field => 'hours_time', :next_row_id => next_row_id, :previous_row_id => previous_row_id} %>
     </td>
     <td align="right">
-      <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id, :next_field => :invoice} do |f|%>
+      <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id, :next_field => :task_id} do |f|%>
       	<%=f.text_field :hours_time, :value => (@work.hours && @work.hours > 0 ? t(@work.hours) : ''), :id => "work_#{@work.id}_hours_time", :class => 'task_hours',
         :onkeypress => "
         if(event.keyCode == 40) { 
@@ -79,7 +79,7 @@
           e.focus();
           e.select();
         }", 
-            :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=invoice', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
+            :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=task_id', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
       <% end %>
     </td>
 	<td align="right">

data/app/views/works/_weekly_work_sheet_buttons.rhtml

@@ -5,10 +5,10 @@
 	<% lock_action = @lock ? :unlock : :lock %>
 	[<%=link_to l(lock_action), with_detour(:controller => 'work_locks', :action => lock_action, :year => @year, :week => @week) %>]
 	<%unless controller.action_name == 'weekly_work_sheet'%>
-		[<%=link_to l(:details), :action => :weekly_work_sheet, :year => @year, :week => @week %>]
+		[<%=link_to l(:totals), :action => :weekly_work_sheet, :year => @year, :week => @week %>]
 	<% end %>
-	<%unless controller.action_name == 'weekly_work_sheet_by_work_account'%>
-		[<%=link_to l(:totals), :action => :weekly_work_sheet_by_work_account, :year => @year, :week => @week %>]
+	<%unless controller.action_name == 'weekly_work_sheet_details'%>
+		[<%=link_to l(:details), :action => :weekly_work_sheet_details, :year => @year, :week => @week %>]
 	<% end %>
 	<% if @lock %>
 		[<%=link_to l(:spreadsheet), :action => :timeliste, :year => @year, :week => @week %>]

data/app/views/works/daily_work_sheet.rhtml

@@ -4,7 +4,7 @@
 
 <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_by_work_account, :year => @year, :week => @week%>
+<%=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>
 
@@ -21,7 +21,7 @@
 					<%=f.radio_button :reason, '', :disabled => work_disabled, :checked => @absence.nil? && (!@works.empty? || @public_holiday.nil?), :onchange => 'form.submit()' %><label for="absence_reason_">Work day</label>
 					<%=f.radio_button :reason, 'HOLIDAY', :disabled => absence_disabled, :onchange => 'form.submit()' %><label for="absence_reason_holiday"><%=l :holiday%></label>
 					<%=f.radio_button :reason, 'SICK', :disabled => absence_disabled, :onchange => 'form.submit()' %><label for="absence_reason_sick">Sick day</label>
-					<%=f.radio_button :reason, 'SICK_WITH_DOCTOR', :disabled => absence_disabled, :onchange => 'form.submit()' %><label for="absence_reason_sick">Sick day with doctor's note</label>
+					<%=f.radio_button :reason, 'SICK_WITH_DOCTOR', :disabled => absence_disabled, :onchange => 'form.submit()' %><label for="absence_reason_sick_with_doctor">Sick day with doctor's note</label>
 				<% end %>
 			</div>
 		</td>

data/app/views/works/update_new_row.rjs

@@ -16,9 +16,8 @@ if @work && @work.errors.empty?
     end
     page["work_" + field_name.to_s].value = value
   end
-  #page.replace "work_#{@work.id}", :partial => 'row', :object => @work
-  #page["work_#{@work.id}_#{@next_field}"].select
-  #page["work_#{@work.id}_#{@next_field}"].focus
+  #page["work_#{@next_field}"].focus
+  #page["work_#{@next_field}"].select
 else
   @work.errors.each do |error|
     page["work_#{@work.id}_#{error[0]}"].addClassName('fieldWithErrors')

data/app/views/works/update_row.rjs

@@ -9,5 +9,5 @@ else
   end
 end
 if @day_total
-  page.replace_html "hours_total", "#{'%d:%02d' % [@day_total.to_i, 60 * (@day_total % 1)]}"
+  page.replace_html "hours_total", "#{t @day_total}"
 end

data/app/views/works/weekly_work_sheet.rhtml

@@ -1,102 +1,46 @@
-<% @page_title = l(:weekly_work_sheet) + (@period ? " for #{@period}" : '') + (user? ? " for #{user.login}" : '')%>
+<% @page_title = l(:weekly_work_sheet) + " " + @week.to_s + (@user ? " for #{@user.name}" : '')%>
 
 <div id="spotlight">
-<% track_times = @rows.find {|r| r.find {|w| w && w.work_account.track_times?}} %>
-<% invoicing = @rows.find {|r| r.find {|w| w && w.work_account.enable_invoicing?}} %>
-<% columns = 2 + (track_times ? 1 : 0) + (invoicing ? 1 : 0) %>
-
-<h1>Work for week <%=@week%><%=user? ? " for #{user.login}" : ''%></h1>
+<% columns = 2 %>
 
 <%=render :partial => 'weekly_work_sheet_buttons'%>
 
 <table border="1">
   <tr>
+    <th><%=l :work_account %></th>
   	<% [:monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday].each_with_index do |day, i| %>
-    <th colspan="<%=columns%>" align="center"><%=detour_to "#{l(day)} #{week_date(i+1)}", :action => :daily_work_sheet, :id => (@first_date + i).strftime('%Y-%m-%d') %></th>
+    <th align="center"><%=detour_to "#{l(day)} #{week_date(i+1)}", :action => :daily_work_sheet, :id => (@first_date + i).strftime('%Y-%m-%d') %></th>
 	<% end %>
     <th align="center" nowrap="true"><%=l :week %> <%=@week%></th>
   </tr>
-  <tr>
-<% (1..7).each do %>
-    <th><%=l :work_account %></th>
-    <% if invoicing %>
-    <th><%=l :invoice_short %></th>
-    <% end %>
-    <% if track_times %>
-    <th><%=l(:start) if track_times %> - <%=l(:stop) if track_times %></th>
-    <% end %>
-    <th><%=l :done %></th>
-<% end %>
-    <th><%=l :totals %></th>
-  </tr>
 
-<% week_total = 0 %>
+<% week_totals = Hash.new(0) %>
 <% day_totals = Array.new(7, 0) %>
-<% for row in @rows %>
+<% for work_account, totals in @work_accounts %>
   <tr>
-    <% row.each_with_index do |@work, day| %>
-      <% if @work %>
-        <% day_totals[day] += @work.hours %>
-        <% week_total += @work.hours %>
-        <td valign="top">
-          <%=image_detour_to('hammer.png', l(:edit), {:controller => 'works', :action => :edit, :id => @work.id}, {:style => "float: left"}) %>
-	      <% if @work.task_id %>
-      	    <%=detour_to(h(@work.task.description), :controller => 'tasks', :action => :edit, :id => @work.task_id)%>
-	      <% else %>
-		    <% field_id = "work_#{@work.id}_description" %>
-          	<%=text_field(:work, :description, :id => field_id, :name => "work_#{@work.id}_description", :class => :task_description, :style => 'width: 8em', :disabled => @lock, 
-							:onchange => "new Ajax.Updater('#{field_id}', '#{url_for(:action => :update, :id => @work.id)}' + '?work[description]=' + this.value);") %>
-	      <% end %>
-		  <br/>
-<!--
-          <%=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) %>
-        </td>
-        <% if invoicing %>
-          <td id="invoice_<%=@work.id%>" valign="top">
-		  	<% form_id  = "work_#{@work.id}_invoice_form" %>
-		  	<% field_id = "work_#{@work.id}_invoice" %>
-            <%=check_box(:work, :invoice, :id => field_id, :name => field_id, :onchange => "new Ajax.Updater('invoice_#{@work}', '#{url_for(:action => :set_work_invoice, :id => @work)}' + '?value=' + this.checked);", :disabled => @lock) if @work.work_account.enable_invoicing? %>
-          </td>
-        <% end %>
-        <% if track_times %>
-          <td align="left" valign="top">
-		  	<% form_id  = "work_#{@work.id}_time_form" %>
-		  	<% field_id = "work_#{@work.id}_start_time" %>
-		  	<form id="<%=form_id%>">
-          	<%=text_field(:work, :start_time, :class => :task_time, :disabled => @lock,
-					:onchange => "new Ajax.Updater('#{field_id}', '#{url_for(:action => :update, :id => @work.id)}' + '?work[start_time]=' + this.value);") %> -
-    	    <%=text_field(:work, :completed_at_time, :class => :task_time, :disabled => @lock,
-					:onchange => "new Ajax.Updater('work_#{@work.id}_completed_at_time', '#{url_for(:action => :update, :id => @work.id)}' + '?work[completed_at_time]=' + this.value);") %>
-			</form>
-		  </td>
-        <% end %>
-        <td align="right" valign="top">
-			<% form_id  = "work_#{@work.id}_hours_form" %>
-		  	<% field_id = "work_#{@work.id}_hours_time" %>
-		  	<form id="<%=form_id%>">
-        		<%=text_field(:work, :hours_time, :value => '%d:%02d' % [@work.hours , 60 * @work.hours % 60], :class => 'task_hours', :disabled => @lock,
-						:onchange => "new Ajax.Updater('#{field_id}', '#{url_for(:action => :update, :id => @work.id)}' + '?work[hours_time]=' + this.value);") %>
-			</form>
-		</td>
-      	<% else %>
-    	<td/>
-    	<% if invoicing %>
-    		<td/>
-      	<% end %>
-      	<% if track_times %>
-    		<td/>
-      	<% end %>
-    	<td/>
+    <td valign="top">
+      <%=detour_to(h(work_account.name), :controller => 'work_accounts', :action => :show, :id => work_account.id) %>
+    </td>
+    <% totals.each_with_index do |total, day| %>
+      <% if total %>
+        <% day_totals[day] += total %>
+        <% week_totals[work_account] += total %>
+        <td align="right" valign="top"><%=t(total)%></td>
+      <% else %>
+        <td/>
       <% end %>
     <% end %>
+    <td align="right"><%=t(week_totals[work_account])%></td>
   </tr>
 <% end %>
   <tr>
-	<% (0..6).each do |day| %>
-    	<th class="hours" colspan="<%=columns%>"><%='%.2f' % day_totals[day] if day_totals[day] > 0%></th>
-	<% end %>
-    <th class="hours"><%= '%.2f' % week_total %></th>
+  	<th><%=l :totals%></th>
+<% (0..6).each do |day| %>
+	<% day_totals[day] += 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>
   </tr>
 </table>
+</div>

data/app/views/works/weekly_work_sheet_details.rhtml

@@ -0,0 +1,102 @@
+<% @page_title = l(:weekly_work_sheet) + (@period ? " for #{@period}" : '') + (user? ? " for #{user.login}" : '')%>
+
+<div id="spotlight">
+<% track_times = @rows.find {|r| r.find {|w| w && w.work_account.track_times?}} %>
+<% invoicing = @rows.find {|r| r.find {|w| w && w.work_account.enable_invoicing?}} %>
+<% columns = 2 + (track_times ? 1 : 0) + (invoicing ? 1 : 0) %>
+
+<h1>Work for week <%=@week%><%=user? ? " for #{user.login}" : ''%></h1>
+
+<%=render :partial => 'weekly_work_sheet_buttons'%>
+
+<table border="1">
+  <tr>
+  	<% [:monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday].each_with_index do |day, i| %>
+    <th colspan="<%=columns%>" align="center"><%=detour_to "#{l(day)} #{week_date(i+1)}", :action => :daily_work_sheet, :id => (@first_date + i).strftime('%Y-%m-%d') %></th>
+	<% end %>
+    <th align="center" nowrap="true"><%=l :week %> <%=@week%></th>
+  </tr>
+  <tr>
+<% (1..7).each do %>
+    <th><%=l :work_account %></th>
+    <% if invoicing %>
+    <th><%=l :invoice_short %></th>
+    <% end %>
+    <% if track_times %>
+    <th><%=l(:start) if track_times %> - <%=l(:stop) if track_times %></th>
+    <% end %>
+    <th><%=l :done %></th>
+<% end %>
+    <th><%=l :totals %></th>
+  </tr>
+
+<% week_total = 0 %>
+<% day_totals = Array.new(7, 0) %>
+<% for row in @rows %>
+  <tr>
+    <% row.each_with_index do |@work, day| %>
+      <% if @work %>
+        <% day_totals[day] += @work.hours %>
+        <% week_total += @work.hours %>
+        <td valign="top">
+          <%=image_detour_to('hammer.png', l(:edit), {:controller => 'works', :action => :edit, :id => @work.id}, {:style => "float: left"}) %>
+	      <% if @work.task_id %>
+      	    <%=detour_to(h(@work.task.description), :controller => 'tasks', :action => :edit, :id => @work.task_id)%>
+	      <% else %>
+		    <% field_id = "work_#{@work.id}_description" %>
+          	<%=text_field(:work, :description, :id => field_id, :name => "work_#{@work.id}_description", :class => :task_description, :style => 'width: 8em', :disabled => @lock, 
+							:onchange => "new Ajax.Updater('#{field_id}', '#{url_for(:action => :update, :id => @work.id)}' + '?work[description]=' + this.value);") %>
+	      <% end %>
+		  <br/>
+<!--
+          <%=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) %>
+        </td>
+        <% if invoicing %>
+          <td id="invoice_<%=@work.id%>" valign="top">
+		  	<% form_id  = "work_#{@work.id}_invoice_form" %>
+		  	<% field_id = "work_#{@work.id}_invoice" %>
+            <%=check_box(:work, :invoice, :id => field_id, :name => field_id, :onchange => "new Ajax.Updater('invoice_#{@work}', '#{url_for(:action => :set_work_invoice, :id => @work)}' + '?value=' + this.checked);", :disabled => @lock) if @work.work_account.enable_invoicing? %>
+          </td>
+        <% end %>
+        <% if track_times %>
+          <td align="left" valign="top">
+		  	<% form_id  = "work_#{@work.id}_time_form" %>
+		  	<% field_id = "work_#{@work.id}_start_time" %>
+		  	<form id="<%=form_id%>">
+          	<%=text_field(:work, :start_time, :class => :task_time, :disabled => @lock,
+					:onchange => "new Ajax.Updater('#{field_id}', '#{url_for(:action => :update, :id => @work.id)}' + '?work[start_time]=' + this.value);") %> -
+    	    <%=text_field(:work, :completed_at_time, :class => :task_time, :disabled => @lock,
+					:onchange => "new Ajax.Updater('work_#{@work.id}_completed_at_time', '#{url_for(:action => :update, :id => @work.id)}' + '?work[completed_at_time]=' + this.value);") %>
+			</form>
+		  </td>
+        <% end %>
+        <td align="right" valign="top">
+			<% form_id  = "work_#{@work.id}_hours_form" %>
+		  	<% field_id = "work_#{@work.id}_hours_time" %>
+		  	<form id="<%=form_id%>">
+        		<%=text_field(:work, :hours_time, :value => '%d:%02d' % [@work.hours , 60 * @work.hours % 60], :class => 'task_hours', :disabled => @lock,
+						:onchange => "new Ajax.Updater('#{field_id}', '#{url_for(:action => :update, :id => @work.id)}' + '?work[hours_time]=' + this.value);") %>
+			</form>
+		</td>
+      	<% else %>
+    	<td/>
+    	<% if invoicing %>
+    		<td/>
+      	<% end %>
+      	<% if track_times %>
+    		<td/>
+      	<% end %>
+    	<td/>
+      <% end %>
+    <% end %>
+  </tr>
+<% end %>
+  <tr>
+	<% (0..6).each do |day| %>
+    	<th class="hours" colspan="<%=columns%>"><%='%.2f' % day_totals[day] if day_totals[day] > 0%></th>
+	<% end %>
+    <th class="hours"><%= '%.2f' % week_total %></th>
+  </tr>
+</table>

data/db/migrate/031_expand_work_done_precision.rb

@@ -0,0 +1,9 @@
+class ExpandWorkDonePrecision < ActiveRecord::Migration
+  def self.up
+    change_column :works, :hours, :decimal, :precision => 6, :scale => 3, :null => false, :default => 0
+  end
+
+  def self.down
+    change_column :works, :hours, :decimal, :precision => 6, :scale => 2, :null => false, :default => 0
+  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 => 30) do
+ActiveRecord::Schema.define(:version => 31) do
 
   create_table "absences", :force => true do |t|
     t.column "user_id", :integer, :null => false
@@ -135,7 +135,7 @@ ActiveRecord::Schema.define(:version => 30) do
 
   create_table "works", :force => true do |t|
     t.column "task_id",         :integer
-    t.column "hours",           :decimal,  :precision => 6, :scale => 2, :default => 0.0, :null => false
+    t.column "hours",           :decimal,  :precision => 6, :scale => 3, :default => 0.0, :null => false
     t.column "completed_at",    :datetime
     t.column "user_id",         :integer
     t.column "invoice",         :boolean

data/test/functional/works_controller_test.rb

@@ -87,7 +87,7 @@ class WorksControllerTest < Test::Unit::TestCase
     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.33'), assigns(:work).hours
+    assert_equal BigDecimal('0.333'), assigns(:work).hours
   end
   
   def test_edit

data/vendor/plugins/rails_time/lib/time_of_day.rb

@@ -21,7 +21,7 @@ class TimeOfDay
   def self.parse(string)
     string.strip!
     return nil if string.empty?
-    raise "Illegal time format: '#{string}'" unless string =~ /(\d{1,2}):?(\d{2})?(?::(\d{1,2}))?/
+    raise "Illegal time format: '#{string}'" unless string =~ /^(\d{1,2}):?(\d{2})?(?::(\d{1,2}))?$/
     self.new($1.to_i, $2.to_i, $3.to_i)
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-07 00:00:00 +02:00
+date: 2008-04-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -171,11 +171,12 @@ files:
 - app/views/works/_form.rhtml
 - app/views/works/weekly_work_sheet.rhtml
 - app/views/works/_weekly_work_sheet_buttons.rhtml
+- app/views/works/weekly_work_sheet_details.rhtml
 - app/views/works/show.rhtml
-- app/views/works/weekly_work_sheet_by_work_account.rhtml
 - app/views/layouts
+- app/views/layouts/_shortcuts_js.rhtml
 - app/views/layouts/wide.rhtml
-- app/views/layouts/absences.rhtml
+- app/views/layouts/_shortcuts.rhtml
 - app/views/layouts/mwrt002.rhtml
 - app/views/layouts/_headers.rhtml
 - app/views/layouts/_left_top.rhtml
@@ -709,6 +710,7 @@ files:
 - db/migrate/018_create_groups.rb
 - db/migrate/003_add_estimation_points.rb
 - db/migrate/010_add_work_start.rb
+- db/migrate/031_expand_work_done_precision.rb
 - db/migrate/007_add_task_created_at.rb
 - db/migrate/016_add_invoicable_flag.rb
 - db/migrate/009_add_subtasks.rb

data/app/views/layouts/absences.rhtml

@@ -1,17 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-  <title>Absences: <%= controller.action_name %></title>
-  <%= stylesheet_link_tag 'scaffold' %>
-</head>
-<body>
-
-<p style="color: green"><%= flash[:notice] %></p>
-
-<%= yield  %>
-
-</body>
-</html>

data/app/views/works/weekly_work_sheet_by_work_account.rhtml

@@ -1,46 +0,0 @@
-<% @page_title = l(:weekly_work_sheet) + " " + @week.to_s + (@user ? " for #{@user.name}" : '')%>
-
-<div id="spotlight">
-<% columns = 2 %>
-
-<%=render :partial => 'weekly_work_sheet_buttons'%>
-
-<table border="1">
-  <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') %></th>
-	<% end %>
-    <th align="center" nowrap="true"><%=l :week %> <%=@week%></th>
-  </tr>
-
-<% week_totals = Hash.new(0) %>
-<% day_totals = Array.new(7, 0) %>
-<% for work_account, totals in @work_accounts %>
-  <tr>
-    <td valign="top">
-      <%=detour_to(h(work_account.name), :controller => 'work_accounts', :action => :show, :id => work_account.id) %>
-    </td>
-    <% totals.each_with_index do |total, day| %>
-      <% if total %>
-        <% day_totals[day] += total %>
-        <% week_totals[work_account] += total %>
-        <td align="right" valign="top"><%='%d:%02d' % [total, 60 * total % 60]%></td>
-      <% else %>
-        <td/>
-      <% end %>
-    <% end %>
-    <td align="right"><%='%d:%02d' % [week_totals[work_account], 60 * week_totals[work_account] % 60]%></td>
-  </tr>
-<% end %>
-  <tr>
-  	<th><%=l :totals%></th>
-<% (0..6).each do |day| %>
-	<% day_totals[day] += 8 if @absences[day] %>
-    <th class="hours"><%='%d:%02d' % [day_totals[day], 60 * day_totals[day] % 60] if day_totals[day] > 0%></th>
-<% end %>
-<% week_total = day_totals.inject(0) {|total, day_total| total + day_total} %>
-    <th class="hours"><%= '%d:%02d' % [week_total, 60 * week_total % 60] %></th>
-  </tr>
-</table>
-</div>