backlog 0.22.1 → 0.23.0

data/app/views/works/_form.rhtml

@@ -16,6 +16,10 @@
 <%=detour_to l(:new_task), :controller => 'tasks', :action => :new %>
 </p>
 
+<p><%=l :description%>:<br/>
+<%=text_field 'work', 'description' %>
+</p>
+
 <% if @work.task.nil? || @work.task.track_times?%>
 <p><label for="work_started_at"><%=l :started_at%></label><br/>
 <%= text_field 'work', 'started_at', :size => 16, :value => @work.started_at ? @work.started_at.strftime('%Y-%m-%d %H:%M') : nil %>
@@ -56,10 +60,12 @@
 </p>
 <% end %>
 
+<!--
 <% if @work.task.nil? || @work.task.enable_users? %>
 <p><label for="work_user_id"><%=l :user%></label><br/>
 <%= select 'work', 'user_id', @users.map{|user| [user.login, user.id]} %></p>
 <% end %>
+-->
 
 <% if @work.task.nil? || @work.task.track_done?%>
 <p style="float: left;"><label for="work_hours"><%=l :hours%></label><br/>

data/app/views/works/_row.rhtml

@@ -1,26 +1,33 @@
   <tr id="work_<%=@work.id%>" style="border: 1px solid black">
     <td>
-	  <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id, :field => :description}, :html => {:id => "work_#{@work.id}_form"} do |f|%>
-        <%=f.select :work_account_id, @work_accounts.map {|wa| [wa.name, wa.id]}, {}, :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 => :customer_name}, :html => {:id => "work_#{@work.id}_form"} do |f|%>
+        <%=f.select :work_account_id, @work_accounts.map {|wa| [wa.name, wa.id]}, {}, :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=customer_name', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
       <% end %>
     </td>
     <td>
-<!--
-      <%=text_field :work, :description, :id => "work_#{@work.id}_description", :size => 16, :class => :task_description%>
--->
-		<%=render :partial => 'row_field', :locals => {:field => 'description'} %>
+	  <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id, :next_field => :description} do |f|%>
+        <%=f.select :customer_id, [['', '']] + @customers.map {|cu| [cu.name, cu.id]}, {}, :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=description', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
+      <% end %>
+    </td>
+    <td>
+		<%=render :partial => 'row_field', :locals => {:field => 'description', :next_field => 'started_at_time'} %>
     </span>
     <td align="right">
-		<%=render :partial => 'row_field', :locals => {:field => 'started_at_time'} %>
+		<%=render :partial => 'row_field', :locals => {:field => 'started_at_time', :next_field => 'completed_at_time'} %>
     </td>
     <td align="right">
-		<%=render :partial => 'row_field', :locals => {:field => 'completed_at_time'} %>
+		<%=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 => t(@work.hours), :class => 'task_hours'%>
+      	<%=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)})"%>
       <% end %>
     </td>
+    <td align="right">
+      <% 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)})"%>
+      <% end %>
+    </td>	
     <td>
       <%=image_detour_to('delete.png', l(:delete), {:controller => 'works', :action => :destroy, :id => @work, :confirm => true}, nil, true)%>
 	  <% if @work.task %>

data/app/views/works/_row_field.rhtml

@@ -1,3 +1,3 @@
-      <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id, :field => field} do |f|%>
-	    <%=text_field :work, field, :id => "work_#{@work.id}_#{field}", :class => ('task_time' if field=~/_at_time$/) %>
+      <% 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)})" %>
       <% end %>

data/app/views/works/daily_work_sheet.rhtml

@@ -18,10 +18,12 @@
 
   <tr>
     <th><%=l :account %></th>
+	<th><%=l :customer %></th>
     <th><%=l :description %></th>
     <th><%=l :started_at %></th>
     <th><%=l :completed_at %></th>
     <th><%=l :done %></th>
+	<th><%=l :invoice %></th>	
     <th/>
   </tr>
 
@@ -33,26 +35,31 @@
 <% last_work = @work %>
 <% @work = nil %>
 
-<% if last_work.completed_at %>
 <% form_tag with_detour(:controller => 'works', :action => 'create') do %>
 <%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
 <%=hidden_field :work, :completed_at, :value => @date %>
 
   <tr>
     <td valign="bottom">
-      <%=text_field_with_auto_complete :work, :work_account_name, {:value => '', :size => 16, :class => :task_description} %>
+      <%=text_field_with_auto_complete :work, :work_account_name, {:value => '', :size => 16, :class => :task_description}, {:delay => "0.01"} %>
+    </td>
+    <td valign="bottom">
+      <%=text_field_with_auto_complete :work, :customer_name, {:value => '', :size => 16, :class => :task_description} %>
     </td>
     <td valign="bottom">
-      <%=text_field_with_auto_complete :work, :description, {:size => 16, :class => :task_description} %>
+      <%=text_field_with_auto_complete :work, :description, {:class => :task_description} %>
     </td>
     <td align="right" valign="bottom">
-      <%=text_field :work, :started_at_time, :value => last_work && last_work.completed_at.strftime('%H:%M'), :class => 'task_time' %>
+      <%=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') %>
+      <%=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">
+      <%=check_box :work, :invoice %>
     </td>
 	<td valign="bottom">
     </td>
@@ -62,9 +69,10 @@
     <th><%=l :totals %></th>
     <th/>
     <th/>
-    <th class="hours"><%='%d:%02d' % [day_total.to_i, 60 * (day_total % 1)] %></th>
+	<th/>
+    <th id="hours_total" class="hours"><%='%d:%02d' % [day_total.to_i, 60 * (day_total % 1)] %></th>
+	<th/>
   </tr>
-<% end %>
 </table>
   <%= submit_tag l(:save) %>
   <%= back_or_link_to l(:back), '' %>
@@ -82,6 +90,28 @@
 
 <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'];
+	
+	if (started_at.value.length >= 4 && completed_at.value.length >= 4){
+		var start_hours = started_at.value.substr(0,2);
+		var start_minutes = started_at.value.substr(3,5);
+		var end_hours = completed_at.value.substr(0,2);
+		var end_minutes = completed_at.value.substr(3,5);
+		
+		var hours = end_hours - start_hours;
+		var minutes = end_minutes - start_minutes;
+		if ( minutes < 0){
+			hours--;
+			minutes += 60;
+		}
+		
+		hours_field.value = '' + hours + ':' + (minutes < 10 ? '0' : '') +  minutes;
+	}
+}
+
 <% if last_work.completed_at %>
   start_field = $('work_work_account_name')
 <% else %>

data/app/views/works/daily_work_sheet_old.rhtml

@@ -0,0 +1,93 @@
+<% @page_title = "#{l :experimental} #{l :daily_work_sheet} on #{@date}" + (" for #{user.login}" if user?) %>
+
+<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>
+<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>
+
+<br clear="all" />
+
+<table sstyle="width: 100%" border="0">
+  <tr>
+    <th align="right" colspan="5">
+    	<%=link_to l(:weekly_work_sheet), :action => :weekly_work_sheet_by_work_account%>
+    </th>
+  </tr>
+
+  <tr>
+    <th><%=l :account %></th>
+    <th><%=l :description %></th>
+    <th><%=l :started_at %></th>
+    <th><%=l :completed_at %></th>
+    <th><%=l :done %></th>
+    <th/>
+  </tr>
+
+<% day_total = 0 %>
+<% for @work in @works %>
+  <% day_total += @work.hours if @work %>
+  <%=render :partial => 'row'%>
+<% end %>
+<% last_work = @work %>
+<% @work = nil %>
+
+<% if last_work.completed_at %>
+<% form_tag with_detour(:controller => 'works', :action => 'create') do %>
+<%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
+<%=hidden_field :work, :completed_at, :value => @date %>
+
+  <tr>
+    <td valign="bottom">
+      <%=text_field_with_auto_complete :work, :work_account_name, {:value => '', :size => 16, :class => :task_description} %>
+    </td>
+    <td valign="bottom">
+      <%=text_field_with_auto_complete :work, :description, {:size => 16, :class => :task_description} %>
+    </td>
+    <td align="right" valign="bottom">
+      <%=text_field :work, :started_at_time, :value => last_work && 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') %>
+	</td>
+    <td align="right" valign="bottom">
+      <%=text_field :work, :hours_time, :value => '', :class => 'task_hours' %>
+    </td>
+	<td valign="bottom">
+    </td>
+  </tr>
+  <tr>
+    <td/>
+    <th><%=l :totals %></th>
+    <th/>
+    <th/>
+    <th class="hours"><%='%d:%02d' % [day_total.to_i, 60 * (day_total % 1)] %></th>
+  </tr>
+<% end %>
+</table>
+  <%= submit_tag l(:save) %>
+  <%= back_or_link_to l(:back), '' %>
+<% end %>
+
+
+<% if @period %>
+<%= link_to l(:back), :controller => 'periods', :action => :show, :id => @period %>
+<% end %>
+</div>
+
+<% if @period %>
+<%=render :partial => '/periods/burn_down_chart' %>
+<% end %>
+
+<script type="text/JavaScript">
+//<!--
+<% if last_work.completed_at %>
+  start_field = $('work_work_account_name')
+<% else %>
+  start_field = $('work_<%=last_work.id%>_completed_at_time')
+<% end %>
+start_field.focus();
+start_field.select();
+//-->
+</script>

data/app/views/works/list.rhtml

@@ -51,12 +51,10 @@
 	<% end %>
 <% end %>
 
-
-
 <table id="summary">
 	<tr>
-		<th><%=l :total%></th>
-		<td><%=@works.inject(BigDecimal('0')){|total, work| total += work.hours}%> <%=l(:hours).downcase%></td>
+		<th><%=l :total%>:</th>
+		<th><%=@works.inject(BigDecimal('0')){|total, work| total += work.hours}%> <%=l(:hours).downcase%></td>
 		<td><%=link_to l(:spreadsheet), {:export => :excel}.update(params) %></td>
 	</tr>
 </table>
@@ -89,14 +87,22 @@
     <td><%= link_to 'Destroy', { :controller => 'works', :action => 'destroy', :id => work }, :confirm => 'Are you sure?', :method => :post %></td>
   </tr>
 <% end %>
+	<tr>
+		<th><%=l :total%>:</th>
+		<td/>
+		<th><%=@works.inject(BigDecimal('0')){|total, work| total += work.hours}%> <%=l(:hours).downcase%></td>
+	</tr>
 </table>
 
 <%=will_paginate @works %> 
 <br />
 
 <% if @period %>
-<%= link_to l(:back), :controller => 'periods', :action => :show, :id => @period %>
+	<%=back_or_link_to l(:back), :controller => 'periods', :action => :show, :id => @period %>
+<% else %>
+	<%=back_or_link_to l(:back), :controller => 'work_accounts', :action => :show, :id => @work_account %>
 <% end %>
+
 </div>
 
 <% if @period %>

data/app/views/works/update_row.rjs

@@ -1,4 +1,7 @@
 page.replace "work_#{@work.id}", :partial => 'row', :object => @work
 page.replace "notice", :partial => '/layouts/notice'
-page["work_#{@work.id}_#{@field}"].select
-page["work_#{@work.id}_#{@field}"].focus
+page.visual_effect(:highlight, "notice")
+page.replace_html "hours_total", "#{'%d:%02d' % [@day_total.to_i, 60 * (@day_total % 1)]}"
+page["work_#{@work.id}_#{@next_field}"].select
+page["work_#{@work.id}_#{@next_field}"].focus
+

data/config/environment.rb

@@ -25,15 +25,27 @@ if File.exists? APP_CONFIG_FILE
         if db_settings = app_conf['database']
           puts "Found global database connection settings: #{db_settings.inspect}"
           db_conf['production'] = db_settings
-        else
-          puts "Did not find global database connection settings: #{app_conf.inspect}"
         end
         db_conf
       end
     end
   end
 else
-  puts "Global config file not found (#{APP_CONFIG_FILE})"
+	puts "Optional global config file not present (#{APP_CONFIG_FILE})"    
+end
+
+DB_CONFIG_FILE = Config::CONFIG["sysconfdir"] + '/backlog/config/database.yml'
+if File.exists? DB_CONFIG_FILE
+  puts "Found global database config file (#{DB_CONFIG_FILE})"
+  module Rails
+    class Configuration
+      def database_configuration_file
+        DB_CONFIG_FILE
+      end
+    end
+  end
+else
+  puts "Optional global database config file not present (#{DB_CONFIG_FILE})"
 end
 
 if RUBY_PLATFORM =~ /java/
@@ -98,6 +110,10 @@ require 'version_from_history'
 require 'user_system'
 require 'url_for_fix'
 
+if RUBY_PLATFORM !~ /i386-mswin32/
 gem 'slave'
 require 'slave'
 work_lock_nagger_thread = Slave.object(:async=>true) {WorkLockNagger.new.nag}
+else
+  puts 'Not spawning worklognagger on windows'
+end

data/lang/en.yaml

@@ -37,6 +37,7 @@ estimate: Estimate
 experimental: Experimental!
 files: Files
 friday: Friday
+grab_task: Grab task
 group: Group
 groups: Groups
 home: Home
@@ -66,9 +67,12 @@ new_task: Add new task
 new_work: Add new work record
 new_work_account: Add new work account
 next: Next
+no_backlog: No Backlog
 no_pending_tasks: There are no pending tasks in this sprint.
 no_pending_tasks_in_backlog: There are no pending tasks in this backlog.
+not_grabbed: Not grabbed by anyone
 notes: Notes
+paging: Paging
 password: Password
 period: Sprint
 periods: Sprints
@@ -78,6 +82,7 @@ postponed: Postponed
 previous: Previous
 previous_abr: Prev.
 projection: Projection
+release_task: Release task
 reopen: Reopen task
 resolution: Resolution
 resolution_abr: Res.

data/lang/no.yaml

@@ -37,6 +37,7 @@ estimate: Estimat
 experimental: Eksperimentell!
 files: Files
 friday: Fredag
+grab_task: Grip oppgave
 group: Gruppe
 groups: Grupper
 home: Hjem
@@ -66,9 +67,12 @@ new_task: Legg til ny oppgave
 new_work: Registrer arbeid
 new_work_account: Legg til timeføringskonto
 next: Neste
+no_backlog: Uten oppgaveliste
 no_pending_tasks: Det er ingen ventende oppgaver i denne perioden.
 no_pending_tasks_in_backlog: Det er ingen ventende oppgaver i denne oppgavelisten.
+not_grabbed: Ikke tatt av noen
 notes: Notater
+paging: Del opp i flere sider
 password: Passord
 period: Periode
 periods: Perioder
@@ -78,6 +82,7 @@ postponed: Utsatt
 previous: Forrige
 previous_abr: Forrige
 projection: Projeksjon
+release_task: Slipp oppgave
 reopen: Gjenåpne
 resolution: Avslutningsmåte
 resolution_abr: Avsl.

data/lib/class_table_inheritance.rb

@@ -1,3 +1,7 @@
+# This library makes an ActiveRecord subclass model use one table per subclass level.
+# Instances are instances of the _super class_, with a proxy instance handling the subclass attributes
+# and method calls.
+
 class ActiveRecord::Base
   class_inheritable_array :default_eager_loading
   
@@ -54,6 +58,7 @@ class ActiveRecord::Base
       end
       
       has_one_without_cti proxy_symbol, :class_name => proxy_class.name, :foreign_key => primary_key_name, :dependent => :destroy
+      validates_associated proxy_symbol
       
       if options[:save_before_superclass_callbacks] || true
         # We need the after_save filter for this association to run /before/ any other after_save's already registered on a superclass,
@@ -123,8 +128,10 @@ class ActiveRecord::Base
               method_missing_super(method_symbol, *parameters)
             end
           end
-          
-          delegate :foreign_keys, :validates_uniqueness_of, {:to => #{proxy_class_name}}
+# TODO (uwe): validates_uniqueness_of should only be delegated for colimns not in super class???
+          delegate :validates_uniqueness_of, {:to => #{proxy_class_name}}
+
+          delegate :foreign_keys, {:to => #{proxy_class_name}}
         end
       EOV
       
@@ -141,7 +148,7 @@ class ActiveRecord::Base
           [reflection.name, "#{reflection.name}=".to_sym, "#{reflection.name}?".to_sym, "build_#{reflection.name}".to_sym, "create_#{reflection.name}".to_sym]
         end
       end
-      delegate *(delegate_methods << {:to => proxy_symbol})
+      delegate(*(delegate_methods << {:to => proxy_symbol}))
       
       proxy_class.belongs_to(:base, :class_name => options[:proxy_class_belongs_to], :foreign_key => primary_key_name) if options[:proxy_class_belongs_to]
       

data/no_test.rb~

@@ -0,0 +1,6 @@
+require 'rubygems';
+gem 'slave';
+require 'slave';
+server_thread = Slave.object(:async=>true) {load 'script/server -e test'};
+server_thread = Slave.object(:async=>true) {load 'script/server -e test'};
+