backlog 0.17.5 → 0.17.6

data/History.txt

@@ -1,3 +1,19 @@
+== 0.17.6 2008-01-17
+
+=== Features
+
+* Allowed moving a task from one backlog to another.
+* Added simple summary to work account view.
+
+=== Fixes
+
+* Minor cosmetic adjustment of task list.
+* Fixed application error when displaying completed tasks.
+* Fixed error when trying to create new task with errors (duplicate description).
+* Fixed showing of work record for earlier years.
+* Made task description bold in task lists for better readability.
+* Changed dependency to rmagick to 1.15.12 instead of newest since rmagick 2 requires very new ImageMagick.
+
 == 0.17.5 2008-01-15
 
 === Fixes

data/Rakefile

@@ -32,7 +32,7 @@ Hoe.new("backlog", APP::VERSION) do |p|
   }
   p.need_zip = true
   p.url = 'http://rubyforge.org/projects/backlog/'
-  p.extra_deps = [['rails', '>= 1.2.4'], ['gruff', '>= 0.2.9'], ['rmagick', '>= 1.15.12'], ['postgres', '>= 0.7.9']]
+  p.extra_deps = [['rails', '>= 1.2.4'], ['gruff', '>= 0.2.9'], ['rmagick', '= 1.15.12'], ['postgres', '>= 0.7.9']]
   p.rsync_args = "-av --delete --exclude=wiki*"
 end
 

data/app/controllers/backlogs_controller.rb

@@ -171,7 +171,7 @@ class BacklogsController < ApplicationController
         task.save!
       end
     end
-    render :text => 'Updated sort order'
+    render :text => 'alert("Updated sort order");'
   end
   
   private

data/app/controllers/periods_controller.rb

@@ -196,15 +196,16 @@ class PeriodsController < ApplicationController
   end
   
   def order
-    params.keys.find {|k| k =~ /active_tasks_(.*)/}
+    if params.keys.find {|k| k =~ /active_tasks_(.*)/}
     period_id = $1
-    tasks = params["active_tasks_#{period_id}"].select {|id| not id.empty?}
+    ids = params["active_tasks_#{period_id}"]
+    tasks = ids.select {|id| not id.empty?}
     tasks.each_with_index do |id,idx|
       task = Task.find(id)
       task.insert_at(idx + 1) 
       task.save!
     end
-    render :text => 'Updated sort order'
+    end
   end
 
   private

data/app/controllers/tasks_controller.rb

@@ -44,12 +44,14 @@ class TasksController < ApplicationController
       populate_layout
       @backlogs = Backlog.find(:all, :order => 'name')
       @periods = Period.find_active_or_future
+      @customers = Customer.find(:all)
       render :action => 'new'
     end
   end
   
   def edit
     @task ||= Task.find(params[:id])
+    @task.backlog_id = params[:task][:backlog_id] if params[:task] && params[:task][:backlog_id]
     @task.period_id = params[:task][:period_id] if params[:task] && params[:task][:period_id]
     @periods = Period.find_active_or_future
     @backlogs = Backlog.find(:all, :order => 'name')

data/app/controllers/work_accounts_controller.rb

@@ -14,6 +14,11 @@ class WorkAccountsController < ApplicationController
 
   def show
     @work_account = WorkAccount.find(params[:id])
+    works = @work_account.works.select{|w|w.user_id == current_user.id}
+    @backlog_totals = works.to_summarized_hash {|work| [work.task && work.task.backlog, work.hours]}
+    @task_totals = works.to_summarized_hash {|work| [work.task, work.hours]}
+    @task_totals_per_backlog = @task_totals.to_a.to_grouped_hash {|task, hours| [task && task.backlog, [task, hours]]}
+    @total_hours = works.inject(BigDecimal('0')) {|total, work| total += work.hours}
   end
 
   def new

data/app/controllers/works_controller.rb

@@ -42,7 +42,7 @@ class WorksController < ApplicationController
       if backlog_name && backlog_name.size > 0 && task_description && task_description.size > 0
         backlog = Backlog.find_by_name(backlog_name)
         task = backlog.tasks_with_children.find{|t| t.description == task_description}
-        params[:work][:task_id] = task.id
+        params[:work][:task_id] = task.id if task
       end
       account_name = params[:work].delete(:work_account_name)
       if account_name && account_name.size > 0
@@ -137,8 +137,9 @@ class WorksController < ApplicationController
   end
   
   def weekly_work_sheet
-    @week = (params[:id] && params[:id].to_i) || Date.today.cweek
-    @rows = Work.works_for_week(@week)
+    @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)
     render :layout => 'wide'
   end
   

data/app/helpers/works_helper.rb

@@ -1,5 +1,5 @@
 module WorksHelper
   def week_date(day)
-    Date.commercial(Date.today.year, @week, day).strftime('%d/%m')
+    Date.commercial(@year, @week, day).strftime('%d/%m')
   end
 end

data/app/models/work.rb

@@ -30,8 +30,8 @@ class Work < ActiveRecord::Base
   #   [m2, t2, nil,t2, nil,nil, nil],
   #   [nil,t2, nil,nil,nil,nil, nil],
   # ]
-  def self.works_for_week(week_no, user = current_user)
-    first = Date.commercial(Date.today.year, week_no, 1)
+  def self.works_for_week(year, week_no, user = current_user)
+    first = Date.commercial(year, week_no, 1)
     last = first + 7
     works = find(:all, :conditions => "completed_at IS NOT NULL AND started_at BETWEEN '#{first.to_time.iso8601}' AND '#{last.to_time.iso8601}'", :order => 'started_at')
     length = 0
@@ -98,6 +98,10 @@ class Work < ActiveRecord::Base
   end
   
   def completed_at_time=(new_value)
+    if new_value == ''
+      self.completed_at = nil
+      return
+    end
     raise "invalid time format: #{new_value}" unless new_value =~ /(\d{2}):(\d{2})/
     new_hour, new_minutes = $1, $2
     t = completed_at || Time.now

data/app/models/work_account.rb

@@ -8,5 +8,9 @@ class WorkAccount < ActiveRecord::Base
   def enable_invoicing?
     invoice_code && invoice_code.length > 0
   end
+
+  def total_hours
+    works.inject(BigDecimal('0')) {|total, work| total + work.hours}
+  end
   
 end

data/app/views/backlogs/show.rhtml

@@ -22,7 +22,7 @@
         <% end %>
     </div>
 	<%for list_id in list_ids %>
-        <%=sortable_element list_id, :url => { :action => :order }, :containment => list_ids, :constraint => false %>
+        <%=sortable_element list_id, :url => { :action => :order }, :containment => list_ids, :constraint => false, :dropOnEmpty => true %>
     <% end %>
     <p id="no_tasks_message"<%=' style="display: none;"' if @tasks and not @tasks.empty? %>>
         <%=l :no_pending_tasks_in_backlog %>

data/app/views/periods/order.rjs

@@ -0,0 +1 @@
+record page, 'alert("hi");'

data/app/views/periods/show.rhtml

@@ -47,10 +47,10 @@ function echoRuby(ruby) {
   alert(Ruby.eval(ruby));
 }
 
-window.onload = function() {
-  Ruby.init(function(result) {
-    alert(result);
-  });
-}
+//window.onload = function() {
+//  Ruby.init(function(result) {
+//    alert(result);
+//  });
+//}
 
 </script>

data/app/views/tasks/_completed.rhtml

@@ -7,7 +7,7 @@
   	<%=render :partial => '/tasks/fields_header', :locals => {:backlog => @backlog, :active => false, :track_times => false, :work_done => work_done} %>
   	<ul id="completed_tasks_<%=period && period.id%>" class="task_list" style="width: 100%;">
   	  <% @completed_tasks.select {|t| t.period == period}.each do |task| %>
-  	    <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => false, :highlight_task => task == @selected_task, :hidden => false } %>
+  	    <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => false, :highlight_task => task == @selected_task, :hidden => false, :show_backlog => controller.class != BacklogsController } %>
   	    <% i += 1 %>
   	  <% end %>
   	</ul>

data/app/views/tasks/_form.rhtml

@@ -1,6 +1,6 @@
 <!--[form:task]-->
 <p>
-<% if @task.backlog.nil? || @task.new_record? %>
+<% if @task.backlog.nil? || @task.new_record? || @task.active? %>
   <label for="task_backlog_id"><%=l :backlog%></label><br/>
   <%= select 'task', 'backlog_id', [['', '']] + @backlogs.map{|backlog| [backlog.name, backlog.id]}, {}, :onchange => "form.action = '#{url_for}'; form.submit();" %>
 <% else %>
@@ -16,9 +16,13 @@
 
 <% if @task.backlog && @task.backlog.enable_periods? %>
 <p><label for="task_period_id"><%=l :period%></label><br/>
+<% if @task.active? %>
 <%= select 'task', 'period_id', [['', '']] + @periods.map{|p| [p.name, p.id]}, {},
 		:onchange => remote_function(:update => 'period_link', 
 									 :url => { :controller => 'periods', :action => 'make_link', :id => "'+value+'", :escape => false }) %>
+<% else %>
+<%=detour_to @task.period, :controller => 'periods', :action => :show, :id => @task.period %>
+<% end %>
 <span id="period_link">
 	<%=render :partial => '/periods/link', :locals => {:period => @task.period}%>
 </span>
@@ -33,13 +37,15 @@
 <% if @task.active? -%>
 	<%=text_field 'task', 'description', :size => 64, :maxlength => 80 %>
 <% else -%>
-	<%=@task.description -%>
+	<b><%=@task.description -%></b>
 <% end -%>
 </p>
 
-<% if @task.enable_customer? %>
+<% if @task.enable_customer? && (@task.active? || @task.customer) %>
 <p><label for="task_customer"><%=l :customer%></label><br/>
+<% if @task.active? %>
 <%=select 'task', 'customer_id', [['', '']] + @customers.map{|c| [c.name, c.id]}  %>
+<% end %>
 <% if @task.customer %>
   <%=image_detour_to('customer.png', "#{l(:customer)} #{@task.customer.name}", {:controller => 'customers', :action => :edit, :id => @task.customer}, {:class => 'image-submit', :style => 'vertical-align: bottom'}) %>
 <% end %>
@@ -53,8 +59,10 @@
       <%= text_field 'task', 'initial_estimate', :size => 4  %>
 	</p>
   <% else %>
-    <p style="float: left"><label for="estimate_todo"><%=l :estimate%></label><br/>
+	<% if @task.active? %>
+      <p style="float: left; margin-right: 1em"><label for="estimate_todo"><%=l :estimate%></label><br/>
       <%=text_field 'estimate', 'todo', :size => 4, :value => @task.todo  %>
+	<% end %>
 	</p>
   <% end %>
 <% end %>

data/app/views/tasks/_task.rhtml

@@ -16,7 +16,7 @@
    		<%=detour_to "##{@task.id}", :controller => 'tasks', :action => :edit, :id => @task.id, :style => 'border: 0px; margin: 0px; padding: 0px' if @task.position || @task.depth == 0 %>
 	</div>
 	<div id="task_<%=@task.id%>_description" class="task_description">
-   		<%=h(@task.description) %>
+   		<b><%=h(@task.description)%></b>
 		<% if show_backlog %>
 			<br/>
 			<%=l :backlog%>: <%=detour_to(h(@task.backlog.name), :controller => 'backlogs', :action => :show, :id => @task.backlog) %>

data/app/views/tasks/list_started.rhtml

@@ -36,7 +36,7 @@ function handleEvent(field, event, id) {
 </script>
 
 <% if @tasks %>
-<%=render :partial => '/tasks/fields_header', :locals => {:backlog => nil, :active => true, :track_times => @tasks.find {|t|t.period && t.period.active?}} %>
+<%=render :partial => '/tasks/fields_header', :locals => {:backlog => nil, :active => true, :track_todo => @tasks.find {|t|t.track_todo?}, :track_done => @tasks.find {|t|t.track_done?}, :track_times => @tasks.find {|t|t.period && t.period.active?}} %>
 <ul class="task_list">
 <% i = 0 %>
 <% current_backlog = nil %>

data/app/views/work_accounts/show.rhtml

@@ -1,8 +1,33 @@
-<% for column in WorkAccount.content_columns %>
-<p>
-  <b><%= column.human_name %>:</b> <%=h @work_account.send(column.name) %>
-</p>
-<% end %>
+<% @page_title = "#{l(:work_account)} #{l(:work_account)}" %>
 
-<%= link_to 'Edit', :action => 'edit', :id => @work_account %> |
-<%= link_to 'Back', :action => 'list' %>
+<div id="spotlight">
+    <div class="btitle">
+		<h4><%=@work_account.name%></h4>
+    </div>
+
+  <table>
+  	<% for backlog in @backlog_totals.keys %>
+  		<tr>
+  			<th><%=backlog ? backlog.name : l(:no_backlog)%></th>
+			<th><%=@backlog_totals[backlog]%></th>
+  		</tr>
+  		<% for task, hours in @task_totals_per_backlog[backlog] %>
+  		<tr>
+  			<td>
+  				<% if task %>
+				  <%=link_to task.description, :controller => 'tasks', :action => :edit, :id => task.id %>
+				<% end %>
+			</td>
+			<td align="right" valign="top"><%='%.2f' % hours%></td>
+  		</tr>
+		<% end %>
+	<% end %>
+  	<tr>
+  		<th>Total hours</th>
+		<th><%=@total_hours%></th>
+  	</tr>
+  </table>
+
+	<%= link_to 'Edit', :action => 'edit', :id => @work_account %> |
+	<%= link_to 'Back', :action => 'list' %>
+</div>

data/app/views/works/_row.rhtml

@@ -18,6 +18,7 @@
 		<%=render :partial => 'row_field', :locals => {:field => 'started_at_time'} %>
     </td>
     <td align="right">
+		<%=render :partial => 'row_field', :locals => {:field => 'completed_at_time'} %>
     </td>
     <td align="right">
       <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id} do |f|%>

data/app/views/works/weekly_work_sheet.rhtml

@@ -5,8 +5,8 @@
 <% invoicing = @rows.find {|r| r.find {|w| w && w.work_account.enable_invoicing?}} %>
 <% columns = 2 + (track_times ? 2 : 0) + (invoicing ? 1 : 0) %>
 
-<div style="float: left"><%=link_to(image_tag('arrow_left.png'), :id => (@week - 1))%></div>
-<div style="float: right"><%=link_to(image_tag('arrow_right.png'), :id => (@week + 1))%></div>
+<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>
 

data/config/routes.rb

@@ -1,5 +1,6 @@
 ActionController::Routing::Routes.draw do |map|
   map.connect '', :controller => "welcome"
+  map.connect ':controller/:action/:year/:week'
   map.connect ':controller/:action/:id.:format'
   map.connect ':controller/:action/:id'
 end

data/lib/array_helper.rb

@@ -6,5 +6,37 @@ class Array
     end
     calculated_value
   end
+  
+  def to_freq_hash
+    freq = {}
+    each do |e|
+      freq[e] = freq[e].to_i + 1
+    end
+    freq
+  end
+  
+  def to_summarized_hash(operation_symbol = :+)
+    sums = {}
+    each do |e|
+      key, value = yield(e)
+      if sums[key]
+        sums[key] = sums[key].send(operation_symbol, value)
+      else
+        sums[key] = value
+      end
+    end
+    sums
+  end
+  
+  def to_grouped_hash
+    groups = {}
+    each do |e|
+      key, value = yield(e)
+      groups[key] ||= []
+      groups[key] << value
+    end
+    groups
+  end
+  
 end
   

data/public/stylesheets/backlog.css

@@ -16,7 +16,7 @@ table.input td {vertical-align: top; margin: 0; border: 0; padding: 0 1px;}
 .task_list {width: 100%; text-align: left; list-style-type: none; padding-left: 0}
 .task_list li {margin-left: 0}
 .tasks {cursor: move}
-.task_id {float: left; padding-left: 2px; width: 3em; text-align: center}
+.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}
 .task_end_work {float: left; width: 2em}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.17.5
+  version: 0.17.6
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-15 00:00:00 +01:00
+date: 2008-01-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 1.15.12
     version: 
@@ -81,6 +81,7 @@ files:
 - app/views/periods/move_task_to_period.rjs
 - app/views/periods/edit.rhtml
 - app/views/periods/_form.rhtml
+- app/views/periods/order.rjs
 - app/views/periods/show.rhtml
 - app/views/welcome
 - app/views/redirect.rjs