backlog 0.23.0 → 0.23.1

data/History.txt

@@ -1,3 +1,25 @@
+== 0.23.1 2008-02-26
+
+=== Features
+
+* Declared the daily work sheet to be out of experimental stage.
+* Automatically calculate total hours for work record in daily work sheet.
+* Added summary of who has grabbed a task in the edit task view.
+
+=== Fixes
+
+* Moved to JRuby 1.1RC2 for the WAR.
+* Removed unused keyboard shortcuts, and fixed the remaining shortcuts.
+* Fixed bug where the last date in a search for work records for a work account were omitted.
+* Some speedup of daily work sheet and weekly work sheet.
+* Fixed bug where end time for a work record was filled in when it should be left blank in daily work sheet.
+* Fixed rounding error for hours in daily work sheet.
+* Fixed bug in work lock nagger when the global configuration file was missing.
+* Changed sort order in daily work sheet from completion time to start time.
+* Changed to allow time format without separator:  0800 and 800 equal 08:00.
+* Minor cosmetic tweaks in the daily work sheet.
+* Fixed style sheet to remove the flickers in the sprint view.
+
 == 0.23.0 2008-02-25
 
 === Features

data/app/controllers/application.rb

@@ -146,12 +146,6 @@ 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-#{l :up}",   :function => :up},
-    {:key => "Alt-#{l :down}", :function => :down},
-    {:key => "Alt-Shift-#{l :left}", :function => :move_to_top},
-    {:key => "Alt-Shift-#{l :right}", :function => :move_to_bottom},
-    {:key => 'Alt-X',                 :function => :complete},
-    {:key => 'Alt-Q',                 :function => :reopen},
     ]
   end
   

data/app/controllers/work_accounts_controller.rb

@@ -59,7 +59,7 @@ class WorkAccountsController < ApplicationController
     work_account = WorkAccount.find(params[:id])
     @report_filter = ReportFilter.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')}"
-    @works = Work.paginate :conditions => ["completed_at BETWEEN ? AND ? AND work_account_id = ?", @report_filter.start_on, @report_filter.end_on, work_account.id], :page => params[:page], :per_page => @report_filter.page_size
+    @works = Work.paginate :conditions => ["completed_at BETWEEN ? AND ? AND work_account_id = ?", @report_filter.start_on, @report_filter.end_on + 1, work_account.id], :page => params[:page], :per_page => @report_filter.page_size
     if params[:export] == 'excel'
       render :template => '/works/list_excel', :layout => false
     else

data/app/controllers/works_controller.rb

@@ -3,7 +3,7 @@ class WorksController < ApplicationController
   in_place_edit_for :work, :invoice
   in_place_edit_for :work, :started_at_time
   in_place_edit_for :work, :completed_at_time
-  skip_before_filter :populate_layout, :except => [:create, :destroy, :edit, :index, :list, :new, :show, :update, :daily_work_sheet, :weekly_work_sheet_by_work_account]
+  skip_before_filter :populate_layout, :except => [:create, :destroy, :edit, :index, :list, :new, :show, :update]
   auto_complete_for :work, :description
 
   def index
@@ -59,9 +59,8 @@ class WorksController < ApplicationController
       end
     end
     convert_hours_param
-    convert_start_time_param
     @work = Work.new(params[:work])
-    @work.completed_at = Time.now unless @work.completed_at
+    @work.completed_at = Time.now unless @work.started_at || @work.completed_at
     @work.user_id = current_user.id
     if @work.save
       flash[:notice] = 'Work was successfully created.'
@@ -120,6 +119,10 @@ class WorksController < ApplicationController
     @work = Work.find(params[:id])
     convert_hours_param
     if @work.update_attributes(params[:work])
+      if params[:work] && (params[:work][:started_at_time] || params[:work][:completed_at_time])
+        @work.calculate_hours!
+        @work.save!
+      end
       flash[:notice] = 'Work was successfully updated.'
       if @work.task
         if params[:estimate]
@@ -234,33 +237,15 @@ class WorksController < ApplicationController
   
   private
   
-  def convert_start_time_param
-    if params[:work] && params[:work][:started_at_time]
-      if params[:work][:started_at_time] =~ /^(\d*):(\d{2})$/
-        new_hours = $1
-        new_minutes = $2.to_i
-      else
-        raise "Unknown time format: '#{params[:work][:hours_time]}'"
-      end
-      if params[:work][:completed_at]
-        t = Time.parse params[:work][:completed_at]
-      elsif @work && @work.started?
-        t = @work.started_at
-      else
-        t = Time.now
-      end
-      params[:work][:started_at] = Time.local(t.year, t.month, t.day, new_hours, new_minutes)
-      params[:work].delete :started_at_time
-    end
-  end
-  
   def convert_hours_param
     if params[:work] && params[:work][:hours_time]
       params[:work][:hours_time].strip!
       if params[:work][:hours_time] =~ /^(\d*):(\d{2})$/
         new_hours = $1
         new_minutes = $2.to_i
-        params[:work][:hours] = BigDecimal("#{new_hours}.#{new_minutes / 0.6}")
+        new_value_str = "#{new_hours}.#{(new_minutes / 0.6).ceil}"
+        new_value = BigDecimal(new_value_str)
+        params[:work][:hours] = new_value
       elsif params[:work][:hours_time] =~ /^(\d*(?:.\d)?)$/
         params[:work][:hours] = BigDecimal($1)
       else

data/app/models/work.rb

@@ -98,7 +98,7 @@ class Work < ActiveRecord::Base
   
   def self.find_work_for_day date
     Work.find(:all, :conditions => "(completed_at IS NULL OR completed_at BETWEEN '#{date}' AND '#{date+1}') AND user_id = #{current_user.id}",
-    :order => 'completed_at, started_at')
+    :order => 'started_at, completed_at')
   end
   
   def started?
@@ -111,7 +111,7 @@ class Work < ActiveRecord::Base
   
   def started_at_time=(new_value)
     new_value = '0:00' if new_value == ''
-    raise "invalid time format: #{new_value}" unless new_value =~ /(\d{0,2}):(\d{2})/
+    raise "invalid time format: #{new_value}" unless new_value =~ /(\d{0,2}):?(\d{2})/
     new_hour, new_minutes = $1.to_i, $2.to_i
     t = started_at || Time.now
     self.started_at = Time.local(t.year, t.month, t.day, new_hour, new_minutes)
@@ -126,10 +126,15 @@ class Work < ActiveRecord::Base
       self.completed_at = nil
       return
     end
-    raise "invalid time format: #{new_value}" unless new_value =~ /(\d{2}):(\d{2})/
+    raise "invalid time format: #{new_value}" unless new_value =~ /(\d{0,2}):?(\d{2})/
     new_hour, new_minutes = $1, $2
     t = completed_at || Time.now
     self.completed_at = Time.local(t.year, t.month, t.day, new_hour, new_minutes)
   end
   
+  def calculate_hours!
+    return unless started_at && completed_at
+    self.hours = (completed_at - started_at) / 3600
+  end
+  
 end

data/app/models/work_lock_nagger.rb

@@ -8,8 +8,11 @@ class WorkLockNagger
     sleep 1.minute
     puts "Work Lock Nagger started"
     begin
-      config = YAML::load(ERB.new(IO.read(APP_CONFIG_FILE)).result) || {}
-      if app_url = config[:app_url]
+      if File.exists? APP_CONFIG_FILE
+        config = YAML::load(ERB.new(IO.read(APP_CONFIG_FILE)).result) || {}
+        app_url = config[:app_url]
+      end
+      if app_url
         url = app_url + 'works/weekly_work_sheet_by_work_account'
       else      
         host = Socket::gethostname

data/app/views/layouts/mwrt002.rhtml

@@ -9,11 +9,15 @@
 <script type="text/javascript">
 function handlePageEvent(event) {
   if (event.altKey && event.shiftKey && event.charCode == 110) {
-    window.location = '<%=url_for(:controller => 'backlogs', :action => :new)%>';
+    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, :period_id => (@backlog ? @backlog.id : nil) ) %>';
+    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);
+     // alert("shift: " + event.shiftKey + ", alt: " + event.altKey + ", ctrl: " + event.ctrlKey + ", " + event.charCode + ", " + event.keyCode);
   }
 }
 </script>

data/app/views/tasks/_form.rhtml

@@ -74,6 +74,20 @@
 <% end %>
 <br clear="all" />
 
+<% if @task.backlog.enable_users? %>
+  <% unless @task.new_record? %>
+    <p><label><%=l :ownership%></label><br/>
+    	<%= if @task.users.empty?
+				l(:not_grabbed)
+			elsif @task.users.include? current_user
+				l(:grabbed)
+			end
+		%>
+		<%=link_to_remote l(:invite), :action => :invite, :id => @task.id %>
+	</p>
+  <% end %>
+<% end %>
+
 <p><label for="task_notes"><%=l :notes%></label><br/>
 <%=text_area 'task', 'notes', :cols => '72', :rows => 16 %>
 <%=if @task.notes and not @task.notes.empty? then image_link_to 'view_fullscreen.png', l(:view_fullscreen), :controller => 'tasks', :action => :notes, :id => @task end%>

data/app/views/works/_row.rhtml

@@ -15,17 +15,17 @@
     <td align="right">
 		<%=render :partial => 'row_field', :locals => {:field => 'started_at_time', :next_field => 'completed_at_time'} %>
     </td>
-    <td align="right">
+    <td align="left">
 		<%=render :partial => 'row_field', :locals => {:field => 'completed_at_time', :next_field => 'hours_time'} %>
     </td>
     <td align="right">
-      <% remote_form_for :work, :url => {:action => :update_row, :id => @work.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', :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?field=description', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
+      <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id, :next_field => :invoice} 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', :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=invoice', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
       <% end %>
     </td>
-    <td align="right">
+    <td style="text-align: left">
       <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id} do |f|%>
-      	<%=f.check_box :invoice, :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?field=description', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
+      	<%=f.check_box :invoice, :id => "work_#{@work.id}_invoice", :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=invoice', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
       <% end %>
     </td>	
     <td>

data/app/views/works/_row_field.rhtml

@@ -1,3 +1,6 @@
       <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id, :next_field => next_field} do |f|%>
-	    <%=text_field :work, field, :id => "work_#{@work.id}_#{field}", :class => ('task_time' if field=~/_at_time$/), :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=#{next_field}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})" %>
+	    <%=text_field :work, field, :id => "work_#{@work.id}_#{field}", 
+				:class => ('task_time' if field=~/_at_time$/), 
+				:onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=#{next_field}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)});"
+		%>
       <% end %>

data/app/views/works/daily_work_sheet.rhtml

@@ -1,4 +1,4 @@
-<% @page_title = "#{l :experimental} #{l :daily_work_sheet} on #{@date}" + (" for #{user.login}" if user?) %>
+<% @page_title = "#{l :daily_work_sheet} on #{@date}" + (" for #{user.login}" if user?) %>
 
 <div id="spotlight">
 
@@ -52,13 +52,16 @@
     <td align="right" valign="bottom">
       <%=text_field :work, :started_at_time, :value => last_work && last_work.completed_at && last_work.completed_at.strftime('%H:%M'), :class => 'task_time' %>
     </td>
-    <td align="right" valign="bottom">
-      <%=text_field :work, :completed_at_time, :class => 'task_time', :value => @work && @work.completed_at.strftime('%H:%M'), :onchange => "update_hours(this.form);" %>
+    <td align="left" valign="bottom">
+      	<%=text_field :work, :completed_at_time, :class => 'task_time', 
+				:value => @work && @work.completed_at.strftime('%H:%M'), 
+				:onchange => "update_hours(this.form);"
+		%>
 	</td>
     <td align="right" valign="bottom">
       <%=text_field :work, :hours_time, :value => '', :class => 'task_hours' %>
     </td>
-    <td align="right" valign="bottom">
+    <td align="left" valign="bottom">
       <%=check_box :work, :invoice %>
     </td>
 	<td valign="bottom">
@@ -90,10 +93,17 @@
 
 <script type="text/JavaScript">
 //<!--
-function update_hours(form){
-	var started_at = form.elements['work_started_at_time'];
-	var completed_at = form.elements['work_completed_at_time'];
-	var hours_field = form.elements['work_hours_time'];
+function update_hours(form, id) {
+	var id_str;
+	if(!id) {
+		id_str = '';
+	} else {
+		id_str = '_' + id;
+	}
+
+	var started_at = $('work' + id_str + '_started_at_time');
+	var completed_at = $('work' + id_str + '_completed_at_time');
+	var hours_field = $('work' + id_str + '_hours_time');
 	
 	if (started_at.value.length >= 4 && completed_at.value.length >= 4){
 		var start_hours = started_at.value.substr(0,2);
@@ -107,7 +117,7 @@ function update_hours(form){
 			hours--;
 			minutes += 60;
 		}
-		
+
 		hours_field.value = '' + hours + ':' + (minutes < 10 ? '0' : '') +  minutes;
 	}
 }

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.1RC1'
+maven_library 'org.jruby', 'jruby-complete', '1.1RC2'
 maven_library 'backport-util-concurrent', 'backport-util-concurrent', '3.0'
 #maven_library 'org.jruby.extras', 'goldspike', '1.3-SNAPSHOT'
 

data/cruise_config.rb

@@ -1,5 +1,5 @@
 Project.configure do |project|
-  project.email_notifier.emails = ['uwe@datek.no']
+  project.email_notifier.emails = ['espen@datek.no', 'uwe@datek.no']
   project.scheduler.polling_interval = 5.minutes
   project.build_command = 'export RAILS_ENV=test ; rake db:migrate ; rake'
 end

data/public/stylesheets/backlog.css

@@ -15,7 +15,7 @@ table.input td {vertical-align: top; margin: 0; border: 0; padding: 0 1px;}
 .highlight {background: yellow;}
 .task_list {width: 100%; text-align: left; list-style-type: none; padding-left: 0}
 .task_list li {margin-left: 0}
-.tasks {cursor: move}
+.tasks {cursor: move; border: 1px solid transparent}
 .task_id {float: left; padding-left: 2px; width: 3.5em; text-align: center}
 .task_description {float: left; padding: 1px; width: auto}
 .task_start {float: left; width: 5em; text-align: center}

data/test/functional/work_accounts_controller_test.rb

@@ -90,4 +90,25 @@ class WorkAccountsControllerTest < Test::Unit::TestCase
       WorkAccount.find(@first_id)
     }
   end
+
+  def test_works
+    get :works, :id => 1, :report_filter => {:start_on => '2007-04-01', :end_on => '2007-06-13'}
+
+    assert_response :success
+    assert_template 'list'
+
+    assert_not_nil assigns(:works)
+    assert_equal 4, assigns(:works).size
+  end
+
+  def test_works_excel
+    get :works, :id => 1, :report_filter => {:start_on => '2007-04-01', :end_on => '2007-06-13'}, :export => 'excel'
+
+    assert_response :success
+    assert_template 'list_excel'
+
+    assert_not_nil assigns(:works)
+    assert_equal 4, assigns(:works).size
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.23.0
+  version: 0.23.1
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-25 00:00:00 +01:00
+date: 2008-02-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency