backlog 0.21.0 → 0.21.1

data/History.txt

@@ -1,3 +1,17 @@
+== 0.21.1 2008-02-04
+
+=== Features
+
+* Added link from weekly work sheet summary to details view with editing option.
+
+=== Fixes
+
+* Changed to nag for work locks at 10am instead of every 24 hours after server startup.
+* Added localizations for Lock/Unlock operations.
+* Fixed bug when updating work records without tasks.
+* Changed formatting of week total of work account to two decimals in the weekly work sheet.
+* Fixed editing in weekly work sheet details view.
+
 == 0.21.0 2008-02-02
 
 === Features

data/Rakefile

@@ -46,6 +46,8 @@ task :release_all do
   Rake::Task[:post_news].invoke
 end
 
+# Remember to set timeout in /usr/lib/ruby/gems/1.8/gems/rubyforge-0.4.4/lib/http-access2.rb
+# @send_timeout = 3600
 desc 'Release the application as a Java EE WAR file to RubyForge'
 task :release_war do
   FileUtils.rm_rf 'WEB-INF' if File.exists? 'WEB-INF'

data/app/controllers/works_controller.rb

@@ -73,13 +73,18 @@ class WorksController < ApplicationController
     @work.attributes = params[:work]
     @estimate = Estimate.new(params[:estimate])
     @work_accounts = WorkAccount.find(:all)
-    @tasks = [@work.task] + Task.find_open
+    @tasks = Task.find_open
+    @tasks.unshift @work.task if @work.task
     @users = User.find(:all)
   end
   
   def update
     if update_work
-      back_or_redirect_to :controller => 'periods', :action => 'show', :id => @work.task.period, :task_id => @work.task.id
+      if @work.task
+        back_or_redirect_to :controller => 'periods', :action => 'show', :id => @work.task.period, :task_id => @work.task.id
+      else
+        back_or_redirect_to :controller => 'welcome', :action => 'index'
+      end
     else
       @task = @work.task
       edit
@@ -199,7 +204,7 @@ class WorksController < ApplicationController
     
     render :partial => 'description_list'
   end
-
+  
   def calculate_hours
     calculated_duration = (Time.parse(params[:completed_at]) - Time.parse(params[:started_at]))
     new_value = '%2d:%02d' % [calculated_duration / 3600, (calculated_duration % 3600) / 60]

data/app/models/work_lock_nagger.rb

@@ -19,9 +19,9 @@ class WorkLockNagger
     loop do
       puts "Nagging"
       begin
-        p late_work_locks = WorkLock.find(
-                                          :all, 
-                                          :conditions => ["end_on < ? and not exists (select id from work_locks wl2 where wl2.user_id = work_locks.user_id and wl2.end_on > work_locks.end_on)", Date.today ])
+        late_work_locks = WorkLock.find(
+                                        :all, 
+                                        :conditions => ["end_on < ? and not exists (select id from work_locks wl2 where wl2.user_id = work_locks.user_id and wl2.end_on > work_locks.end_on)", Date.today ])
         late_users = late_work_locks.map{|wl| wl.user}.uniq
         late_users.each do |u|
           missing_date = (u.work_locks.last.end_on + 7)
@@ -29,11 +29,15 @@ class WorkLockNagger
           week = missing_date.cweek
           WorkLockNotify.deliver_nag(u, week, url + "/#{year}/#{week}")
         end
+        now = Time.now
+        next_nag_time = Time.local(now.year, now.month, now.hour < 10 ? now.day : now.day + 1, 10, 0, 0)
+        sleep_duration = next_nag_time - now
+        puts "Sleeping #{sleep_duration.to_i / 3600} hours #{(sleep_duration.to_i % 3600) / 60} minutes and #{sleep_duration.to_i % 60} seconds."
+        sleep sleep_duration
       rescue Exception => e
         p e
       end
       puts "Nag ends"
-      sleep 24.hours
     end
   end
   

data/app/views/works/_weekly_work_sheet_buttons.rhtml

@@ -0,0 +1,20 @@
+<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>
+
+<div align="right">
+	<% 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 %>]
+	<% 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 %>]
+	<% end %>
+	<% if @lock %>
+		[<%=link_to l(:spreadsheet), :action => :timeliste, :year => @year, :week => @week %>]
+	<% else %>
+		[<%=detour_to l(:new_work), :controller => 'works', :action => :new %>]
+	<% end %>
+</div>
+
+<br clear="all" />

data/app/views/works/weekly_work_sheet.rhtml

@@ -5,22 +5,9 @@
 <% invoicing = @rows.find {|r| r.find {|w| w && w.work_account.enable_invoicing?}} %>
 <% columns = 2 + (track_times ? 1 : 0) + (invoicing ? 1 : 0) %>
 
-<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>
-
 <h1>Work for week <%=@week%><%=user? ? " for #{user.login}" : ''%></h1>
 
-<div align="right">
-<% lock_action = @lock ? :unlock : :lock %>
-[<%=link_to l(lock_action), :controller => 'work_locks', :action => lock_action %>]
-[<%=detour_to l(:new_work), :controller => 'works', :action => :new %>]
-[<%=link_to 'Timeliste', :action => :timeliste, :id => @week %>]
-[<%= if params[:with_empty]
-  link_to 'Hide empty work records'
-else
-  link_to 'Show empty work records', :with_empty => 'yes'
-end %>]
-</div>
+<%=render :partial => 'weekly_work_sheet_buttons'%>
 
 <table border="1">
   <tr>
@@ -47,47 +34,69 @@ end %>]
 <% 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; border: 1px solid black"}) %>
-<!--
-      <%=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) %>:
+    <% 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.description), :controller => 'tasks', :action => :edit, :id => @work.task_id) if @work.task_id%>
+          <%=detour_to(h(@work.task.period.name), :controller => 'periods', :action => :show, :id => @work.task.period) if @work.task && @work.task.period %>
 -->
-    </td>
-      <% if 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);", :disabled => @lock) if @work.work_account.enable_invoicing? %>
-    </td>
-      <% end %>
-      <% if track_times %>
-    <td align="left" valign="top"><%=text_field(:work, :started_at_time, :class => :task_time, :disabled => @lock) %> -
-    	<%=text_field(:work, :completed_at_time, :class => :task_time, :disabled => @lock) %></td>
+          <%=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}_started_at_time" %>
+		  	<form id="<%=form_id%>">
+          	<%=text_field(:work, :started_at_time, :class => :task_time, :disabled => @lock,
+					:onchange => "new Ajax.Updater('#{field_id}', '#{url_for(:action => :update, :id => @work.id)}' + '?work[started_at_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 %>
-    <td align="right" valign="top"><%=text_field(:work, :hours, :value => '%.2f' % @work.hours, :class => 'task_hours') %></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 %>
+	<% (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/app/views/works/weekly_work_sheet_by_work_account.rhtml

@@ -3,20 +3,7 @@
 <div id="spotlight">
 <% columns = 2 %>
 
-<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>
-
-<div align="right">
-<% lock_action = @lock ? :unlock : :lock %>
-[<%=link_to l(lock_action), with_detour(:controller => 'work_locks', :action => lock_action, :year => @year, :week => @week) %>]
-<% if @lock %>
-[<%=link_to l(:spreadsheet), :action => :timeliste, :year => @year, :week => @week %>]
-<% else %>
-[<%=detour_to l(:new_work), :controller => 'works', :action => :new %>]
-<% end %>
-</div>
-
-<br clear="all" />
+<%=render :partial => 'weekly_work_sheet_buttons'%>
 
 <table border="1">
   <tr>
@@ -38,20 +25,21 @@
       <% if total %>
         <% day_totals[day] += total %>
         <% week_totals[work_account] += total %>
-        <td align="right" valign="top"><%='%.2f' % total%></td>
+        <td align="right" valign="top"><%='%d:%02d' % [total, 60 * total % 60]%></td>
       <% else %>
         <td/>
       <% end %>
     <% end %>
-    <td align="right"><%=week_totals[work_account]%></td>
+    <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| %>
-    <th class="hours"><%='%.2f' % day_totals[day] if day_totals[day] > 0%></th>
+    <th class="hours"><%='%d:%02d' % [day_totals[day], 60 * day_totals[day] % 60] if day_totals[day] > 0%></th>
 <% end %>
-    <th class="hours"><%= '%.2f' % week_totals.values.inject(0) {|total, work_account_total| total + work_account_total} %></th>
+<% week_total = week_totals.values.inject(0) {|total, work_account_total| total + work_account_total} %>
+    <th class="hours"><%= '%d:%02d' % [week_total, 60 * week_total % 60] %></th>
   </tr>
 </table>
 </div>

data/lang/en.yaml

@@ -21,6 +21,7 @@ customer: Customer
 daily_work_sheet: Daily work sheet
 delete: Delete
 description: Description
+details: Details
 done: Done
 down: Down
 edit: Edit
@@ -46,6 +47,7 @@ invoice_code: Invoice Code
 invoice_short: Inv.
 left: Left
 listing_works: Recorded work
+lock: Lock
 log_in: Log in
 log_out: Log out
 main_backlog: Main Backlog
@@ -88,6 +90,7 @@ select: Select
 shortcuts: Shortcuts
 signup: Sign Up
 specify: Specify
+spreadsheet: Spreadsheet
 start: Start
 start_on: Start on
 start_work: Start
@@ -104,6 +107,7 @@ track_todo: Estimates
 track_done: Track work done
 track_times: Track start and stop times
 tuesday: Tuesday
+unlock: Unlock
 unplanned_tasks: Unplanned tasks
 up: Up
 user: User

data/lang/no.yaml

@@ -21,6 +21,7 @@ customer: Kunde
 daily_work_sheet: Timeføringsskjema
 delete: Slett
 description: Beskrivelse
+details: Detaljer
 done: Utført
 down: Ned
 edit: Rediger
@@ -46,6 +47,7 @@ invoice_code: Faktureringskode
 invoice_short: Fakt
 left: Venstre
 listing_works: Registrert arbeid
+lock: Lås
 log_in: Log inn
 log_out: Log ut
 main_backlog: Hovedliste
@@ -88,6 +90,7 @@ select: Velg
 shortcuts: Knapper
 signup: Innmelding
 specify: Spesifisèr
+spreadsheet: Regneark
 start: Start
 start_on: Start på
 start_work: Start arbeid
@@ -103,6 +106,7 @@ track_todo: Estimater
 track_done: Spor utført arbeid
 track_times: Spor start- og stopptider
 tuesday: Tirsdag
+unlock: Lås opp
 unplanned_tasks: Ikke planlagte oppgaver
 up: Opp
 user: Bruker

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.21.0
+  version: 0.21.1
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-02 00:00:00 +01:00
+date: 2008-02-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -156,6 +156,7 @@ files:
 - app/views/works/_row_field.rhtml
 - app/views/works/_form.rhtml
 - app/views/works/weekly_work_sheet.rhtml
+- app/views/works/_weekly_work_sheet_buttons.rhtml
 - app/views/works/show.rhtml
 - app/views/works/weekly_work_sheet_by_work_account.rhtml
 - app/views/layouts