backlog 0.17.3 → 0.17.4

data/History.txt

@@ -1,11 +1,27 @@
-== 0.17.3 2008-01-09
+== 0.17.4 2008-01-14
+
+=== Features
+
+* Added date and time to top bar
+* Simplified design of task lists.
+* Changed title in Show Sprint view from "Backlog" to "Sprint"
+
+=== Fixes
+
+* Fixed wrong "Home" link.
+* Fixed exception when updating task estimate.
+* Removed shake effect when starting work on  a task.
+* Various style sheet adjustments.
+* Fixed moving tasks between sprints in backlog view.
+* Fixed redirect after ending work directly after starting it.
+
+== 0.17.3 2008-01-11
 
 === Fixes
 
 * Fixed wrong redirect at startup.
 * Fixed ugly listing of started tasks.
 
-
 == 0.17.2 2008-01-07
 
 === Fixes

data/app/controllers/application.rb

@@ -109,9 +109,11 @@ class ApplicationController < ActionController::Base
   end
   
   def pop_detour
-    detour = session[:detours].pop
+    detours = session[:detours]
+    return nil unless detours
+    detour = detours.pop
     logger.debug "popped detour: #{detour.inspect} #{session[:detours].size} more"
-    if session[:detours].empty?
+    if detours.empty?
       session[:detours] = nil
     end
     detour

data/app/controllers/backlogs_controller.rb

@@ -92,7 +92,7 @@ class BacklogsController < ApplicationController
           @task.estimate(params[:estimate][:todo])
           @period = @task.period
           @success, flash[:notice] = true, 'Estimate updated'
-          rescue ArgumentError => e
+        rescue ArgumentError => e
           @success, flash[:notice] = false, "Estimate was not numeric"
         end
         if @task.finished?
@@ -161,15 +161,19 @@ class BacklogsController < ApplicationController
   def order
     params.keys.find {|k| k =~ /active_tasks_(.*)/}
     period_id = $1
-    tasks = params["active_tasks_#{period_id}"].select {|id| not id.empty?}
-    tasks.each_with_index do |id,idx|
-      task = Task.find(id)
-      task.insert_at(idx + 1) 
-      task.save!
+    if period_id
+      period = Period.find(period_id)
+      tasks = params["active_tasks_#{period_id}"].select {|id| not id.empty?}
+      tasks.each_with_index do |id,idx|
+        task = Task.find(id)
+        task = task.move_to_period(period) if task.period != period
+        task.insert_at(idx + 1)
+        task.save!
+      end
     end
     render :text => 'Updated sort order'
   end
-
+  
   private
   
   def load_tasks(backlog)
@@ -177,7 +181,7 @@ class BacklogsController < ApplicationController
     planned_tasks = backlog.tasks.select {|t| t.period && t.finished_at.nil?}.sort_by {|t| [t.period.end_on, t.position]}
     @tasks = planned_tasks + unplanned_tasks
     @completed_tasks = backlog.tasks.select {|t| t.finished_at}.sort {|t1, t2| t2.finished_at <=> t1.finished_at}
-
+    
   end
   
 end

data/app/controllers/tasks_controller.rb

@@ -7,7 +7,7 @@ class TasksController < ApplicationController
   def list_started
     @tasks = Task.find_started
     @selected_task = Task.find_by_id(params[:id])
-    back_or_redirect_to(:controller => '', :action => '') if @tasks.empty?
+    back_or_redirect_to('/') if @tasks.empty?
   end
   
   def new
@@ -87,7 +87,7 @@ class TasksController < ApplicationController
       end
     end
     
-    file = params[:task].delete(:file)
+    file = params[:task] && params[:task].delete(:file)
     
     if params[:task] && @task.update_attributes(params[:task])
       flash[:notice] = 'Task was successfully updated.'
@@ -202,6 +202,8 @@ class TasksController < ApplicationController
   def start_work
     @task = Task.find(params[:id])
     @task.start_work
+    detour = pop_detour
+    params.update(detour) if detour
   end
   
   def end_work

data/app/helpers/backlogs_helper.rb

@@ -24,7 +24,7 @@ module BacklogsHelper
       page.insert_html :top, "completed_tasks", "<table id=\"completed_tasks_#{@task.period_id}\" class=\"input\" />"
     end
     
-    page.insert_html :top, "completed_tasks_#{@task.period_id}", :partial => '/tasks/task', :locals => {:active => false, :hidden => true, :highlight_task => false}
+    page.insert_html :top, "completed_tasks_#{@task.period_id}", :partial => '/tasks/task', :locals => {:active => false, :hidden => true, :highlight_task => false, :show_backlog => false}
     page.visual_effect :appear, "task_#{@task.id}"
     
     page.insert_html :top, "completed_tasks_#{@task.period_id}", :partial => '/tasks/fields_header', :locals => {:backlog => @task.backlog, :active => false, :work_done => work_done}
@@ -52,7 +52,7 @@ module BacklogsHelper
     
     page.insert_html(:top, "active_tasks_#{@task.period_id}", render(:partial => "/tasks/task", :locals => { :task => @task, :i => 1, :active => true, :highlight_task => false, :update => :spotlight, :hidden => true }))
     
-    fields_header = render(:partial => '/tasks/fields_header', :locals => { :backlog => @task.backlog, :active => true, :track_times => tasks_in_period.find {|t|t.period && t.period.active?} } )
+    fields_header = render(:partial => '/tasks/fields_header', :locals => { :backlog => @task.backlog, :active => true, :track_todo => @task.backlog.track_todo?, :track_done => @task.backlog.track_done?, :track_times => tasks_in_period.find {|t|t.period && t.period.active?} } )
     page.insert_html :top, "active_tasks_#{@task.period_id}", fields_header
     page.insert_html :top, "active_tasks_#{@task.period_id}", render(:partial => "/tasks/period_header", :locals => {:period => @task.period})
     

data/app/models/task.rb

@@ -144,7 +144,7 @@ class Task < ActiveRecord::Base
   def move_to_period(new_period)
     raise "Period missing" unless new_period
     raise "Cannot move finished tasks" unless active?
-    return if new_period == period
+    return self if new_period == period
     
     self.remove_from_list
     self.position = nil
@@ -162,6 +162,7 @@ class Task < ActiveRecord::Base
         existing_task.description = self.description
         existing_task.save!
         existing_task.estimate(old_todo)
+        return existing_task
       else
         new_task = Task.new
         new_task.previous_task_id = ancestor_id
@@ -172,9 +173,8 @@ class Task < ActiveRecord::Base
         new_task.position = nil
         new_task.save!
         new_task.insert_at 1
-        #        new_task.position = 1
-        #        new_task.save!
         new_task.estimate(old_todo)
+        return new_task
       end
     else
       self.period_id = new_period.id
@@ -183,6 +183,7 @@ class Task < ActiveRecord::Base
       self.position = 1
       self.move_to_bottom
       self.save!
+      return self
     end
   end
   

data/app/views/backlogs/show.rhtml

@@ -6,18 +6,22 @@
     <div id="active_tasks"<%=' style="display: none;"' unless @tasks and not @tasks.empty? %>>
         <%#=render :partial => '/tasks/backlog_header', :locals => {:backlog => @backlog, :track_times => @tasks.find {|t|t.period && t.period.active?}} %>
 		<%i = 0 %>
-		<%for period in @tasks.map {|t| t.period}.uniq %>
+		<% periods = @tasks.map {|t| t.period}.uniq %>
+		<% period_ids = periods.map {|period| "active_tasks_#{period ? period.id : ''}"} %>
+		<%for period in periods %>
 		    <% tasks_in_period = @tasks.select {|t| t.period_id == (period && period.id)} %>
 			<% work_done = !tasks_in_period.find{|t| t.total_done > 0}.nil? %>
+          	<%=render :partial => '/tasks/period_header', :locals => {:period => period} if @backlog.enable_periods %>
+			<%=render :partial => '/tasks/fields_header', :locals => {:backlog => @backlog, :active => true, :track_times => tasks_in_period.find {|t|t.period && t.period.active?}, :work_done => work_done} %>
         	<ul id="active_tasks_<%=period ? period.id : '' %>" class="task_list">
-            	<%=render :partial => '/tasks/period_header', :locals => {:period => period} if @backlog.enable_periods %>
-				<%=render :partial => '/tasks/fields_header', :locals => {:backlog => @backlog, :active => true, :track_times => tasks_in_period.find {|t|t.period && t.period.active?}, :work_done => work_done} %>
 				<%for @task in tasks_in_period %>
-					<%=render :partial => '/tasks/task/', :locals => {:task => @task, :i => i += 1, :active => true, :highlight_task => false, :update => :maincontent, :hidden => false} %>
+					<%=render :partial => '/tasks/task/', :locals => {:task => @task, :i => i += 1, :active => true, :highlight_task => false, :update => :maincontent, :show_backlog => false, :hidden => false} %>
 				<%end %>
         	</ul>
-            <%=sortable_element "active_tasks_#{period ? period.id : ''}", :url => { :action => :order }, :constraint => false %>
-        <%end %>
+        <% end %>
+		<%for period in periods %>
+	        <%=sortable_element "active_tasks_#{period ? period.id : ''}", :url => { :action => :order }, :containment => period_ids, :constraint => false %>
+        <% end %>
     </div>
     <p id="no_tasks_message"<%=' style="display: none;"' if @tasks and not @tasks.empty? %>>
         <%=l :no_pending_tasks_in_backlog %>

data/app/views/layouts/_left_top.rhtml

@@ -1,7 +1,8 @@
     <div id="navbar">
       <span style="float: left"><%=link_to "#{l :backlog} #{APP::VERSION}", 'http://rubyforge.org/projects/backlog'%></span>
       <span style="float: left"><form action="<%=url_for :controller => 'search', :action => :results%>"><%=text_field_tag :q, @search || l(:search), :onfocus => "if (value == '#{l(:search)}') value='' "%><%=submit_tag :search, :style => 'display: none'%></form></span>
-      <%= link_to l(:home), url_for(:controller => 'backlogs') %>
+      <span style="float: left; margin-left: 5px; font-weight: bold"><%=Time.new.strftime('%Y-%m-%d %H:%M')%></span>
+      <%= link_to l(:home), url_for('/') %>
       
       <% if user? %>
       | <%= link_to l(:backlogs), :controller => 'backlogs', :action => :list %>

data/app/views/periods/_show_active.rhtml

@@ -33,22 +33,15 @@ function handleEvent(field, event, id) {
 
 
 <div id="active_tasks"<%=' style="display: none;"' unless @tasks and not @tasks.empty?%>>
-<% current_backlog = nil -%>
-<% for task in @tasks -%>
-  <% if task.backlog != current_backlog -%>
-    <%=sortable_element "active_tasks_#{current_backlog.id}", :url => { :action => :order } if current_backlog%>
-    <%='</ul>' if current_backlog%>
-    <% current_backlog = task.backlog %>
-    <ul id="active_tasks_<%=current_backlog.id%>" class="task_list">
-      <%= '<li><span>&nbsp;</span></li>' if false && current_backlog %>
-      <%=render :partial => '/tasks/backlog_header', :locals => { :backlog => task.backlog, :track_times => current_backlog.track_done? && @tasks.find {|t|t.period && t.period.active?} } %>
-      <%=render :partial => '/tasks/fields_header', :locals => { :backlog => task.backlog, :active => true, :track_times => @tasks.find {|t|t.period && t.period.active?}, :work_done => @tasks.find {|t|t.backlog_id == current_backlog.id && t.total_done > 0} } %>
-  <% end -%>
-  <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => true, :highlight_task => task == @selected_task, :update => :spotlight, :hidden => false } %>
-  <% i += 1 %>
-<% end -%>
-    <%=sortable_element "active_tasks_#{current_backlog.id}", :url => { :action => :order }, :constraint => false if current_backlog%>
-    <%='</ul>' if current_backlog%>
+    <%=render :partial => '/tasks/fields_header', :locals => { :backlog => nil, :active => true, :track_todo => @tasks.find {|t|t.period && t.period.active?}, :track_times => @tasks.find {|t|t.period && t.period.active?}, :track_done => @tasks.find {|t|t.period && t.period.active? }, :work_done => @tasks.find {|t| t.total_done > 0} } %>
+	<ul id="active_tasks_<%=@period.id%>" class="task_list">
+		<% for task in @tasks -%>
+  			<%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => true, :highlight_task => task == @selected_task, :update => :spotlight, :show_backlog => true, :hidden => false } %>
+  			<%#=render :partial => '/tasks/backlog_header', :locals => { :backlog => task.backlog, :track_times => task.backlog.track_done? && @tasks.find {|t|t.period && t.period.active?} } %>
+  			<% i += 1 %>
+  		<% end -%>
+    </ul>
+    <%=sortable_element "active_tasks_#{@period.id}", :url => { :action => :order }, :constraint => false%>
 </div>
 
 <p id="no_tasks_message"<%=' style="display: none;"' if @tasks and not @tasks.empty?%>><%=l :no_pending_tasks%></p>

data/app/views/periods/show.rhtml

@@ -1,3 +1,6 @@
+<%@application_title = l :period %>
+<%@page_title = @period.name %>
+
 <% i = 1 %>
 
 <div id="spotlight">

data/app/views/tasks/_backlog_header.rhtml

@@ -1,17 +1,17 @@
 <% @backlog = backlog %>
 
-  <li valign="top">
+  <div valign="top">
   	<div>
-    <span style="float: left">
-      <%=image_detour_to('add.png', l(:new_task), :controller => 'tasks', :action => :new, :task => {:backlog_id => @backlog.id, :period_id => @period && @period.id})%>
-    </span>
-    <span colspan="4" style="float: left; vertical-align: middle">
-    <h5>
-      <%=detour_to(h(backlog.name), :controller => 'backlogs', :action => :show, :id => @backlog) %>
-      <%=image_detour_to('clipboard.png', l(:edit), :controller => 'backlogs', :action => :edit, :id => @backlog.id)%>
-      </h5>
-    </span>
-    <span style="float: left" width="*"/>
+      <span style="float: left">
+        <%=image_detour_to('add.png', l(:new_task), :controller => 'tasks', :action => :new, :task => {:backlog_id => @backlog.id, :period_id => @period && @period.id})%>
+      </span>
+      <span colspan="4" style="float: left; vertical-align: middle">
+        <h5>
+      		<%=detour_to(h(backlog.name), :controller => 'backlogs', :action => :show, :id => @backlog) %>
+      		<%=image_detour_to('clipboard.png', l(:edit), :controller => 'backlogs', :action => :edit, :id => @backlog.id)%>
+      	</h5>
+      </span>
+      <span style="float: left" width="*"/>
 	</div>
 	<br clear="all" />
-  </li>
+  </div>

data/app/views/tasks/_fields_header.rhtml

@@ -1,15 +1,13 @@
-  <li>
   	<div style="font-weight: bold">
-	    <div style="float: left" />
+	    <div style="float: left"></div>
     	<div class="task_id"><%=active ? 'ID' : l(:resolution_abr)%></div>
     	<div class="task_description"><%=l :task %></div>
 		<div style="float: right">
-		   	<div class="task_start"><%=l :start if active && backlog.track_times? %></div>
+		   	<div class="task_start"><%=l :start if active && track_times %></div>
     		<div class="task_end_work">&nbsp;</div>
-    		<div class="task_done"><%=l :done if (active && backlog.track_done?) || work_done %></div>
-    		<div class="task_todo"><%=l :todo if active && backlog.track_todo? %></div>
+    		<div class="task_done"><%=l :done if (active && track_done) || work_done %></div>
+    		<div class="task_todo"><%=l :todo if active && track_todo %></div>
     		<div class="task_buttons"></div>
 		</div>
 	</div>
 	<br clear="all"/>
-  </li>

data/app/views/tasks/_period_header.rhtml

@@ -1 +1 @@
-		  <li><span><%=period ? link_to(h(period.name), :controller => 'periods', :action => :show, :id => period) : l(:unplanned_tasks)%></span></li>
+		  <div><span><%=period ? link_to(h(period.name), :controller => 'periods', :action => :show, :id => period) : l(:unplanned_tasks)%></span></div>

data/app/views/tasks/_task.rhtml

@@ -17,6 +17,10 @@
 	</div>
 	<div id="task_<%=@task.id%>_description" class="task_description">
    		<%=h(@task.description) %>
+		<% if show_backlog %>
+			<br/>
+			<%=l :backlog%>: <%=detour_to(h(@task.backlog.name), :controller => 'backlogs', :action => :show, :id => @task.backlog) %>
+		<% end %>
 	</div>
 
 
@@ -31,7 +35,7 @@
                   :class => :task_time, :maxlength => 5 %>
             <% end %>
           <% elsif @task.track_times? && (@task.period_id.nil? || @task.period.active?) %>
-            <%=image_link_to_remote 'hammer.png', l(:start_work), {:controller => 'tasks', :action => :start_work, :id => @task.id}, nil, true %>
+            <%=image_link_to_remote 'hammer.png', l(:start_work), with_detour({:controller => 'tasks', :action => :start_work, :id => @task.id}), nil, true %>
           <% end -%>
       <% end -%>
     </div>
@@ -65,7 +69,7 @@
       <% if active && @task.loggable? -%>
           <% if @task.track_todo? -%>
             <% if @task.period.nil? || @task.period.active_or_future? -%>
-              <% form_for(:estimate, :url => {:action => :update_task_estimate, :id => @task}) do |f| -%>
+              <% remote_form_for(:estimate, :url => {:action => :update_task_estimate, :id => @task}) do |f| -%>
                 <%=f.text_field :todo, :tabindex => i+2, :id => "task_#{@task.id}_todo", :value => @task.todo, :class => :task_hours, :maxlength => 4 %>
               <% end -%>
             <% else -%>

data/app/views/tasks/list_started.rhtml

@@ -36,21 +36,13 @@ 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?}} %>
 <ul class="task_list">
 <% i = 0 %>
 <% current_backlog = nil %>
 <% current_period = nil %>
 <% for task in @tasks %>
-    <% if task.backlog != current_backlog %>
-      <%= render :partial => '/tasks/backlog_header', :locals => {:backlog => task.backlog, :track_times => @tasks.find {|t|t.period && t.period.active?}} %>
-      <% current_backlog = task.backlog %>
-	<% end %>
-    <% if task.period != current_period %>
-  	  <%=render :partial => '/tasks/period_header', :locals => {:period => task.period} %>
-      <%=render :partial => '/tasks/fields_header', :locals => {:backlog => task.root_task.backlog, :active => true, :track_times => @tasks.find {|t|t.period && t.period.active?}} %>
-      <% current_period = task.period %>
-	<% end %>
-  <%=render :partial => 'task', :locals => { :task => task, :i => i, :active => true, :highlight_task => (task == @selected_task), :update => :spotlight, :hidden => false } %>
+  <%=render :partial => 'task', :locals => { :task => task, :i => i, :active => true, :highlight_task => (task == @selected_task), :update => :spotlight, :show_backlog => true, :hidden => false } %>
   <% i += 1 %>
 <% end %>
 

data/app/views/tasks/start_work.rjs

@@ -1,2 +1 @@
 page.replace "task_#{@task.id}", :partial => '/tasks/task', :locals => { :task => @task, :i => 1, :active => true, :highlight_task => false, :update => :spotlight, :hidden => false }
-page.visual_effect :shake, "task_#{@task.id}"

data/public/stylesheets/backlog.css

@@ -1,8 +1,8 @@
 textarea {font-family:Arial, Helvetica, sans-serif; font-size:10.8pt;}
 
 .task_description { width: 300px; }
-.task_hours { width: 32px; }
-.task_time { width: 40px }
+.task_hours { width: 2.5em; text-align: right}
+.task_time { width: 3em; text-align: right; }
 .image-submit {height: 22px; border: 0; margin-bottom: 1px; padding: 0; vertical-align: bottom; float: none;}
 table.input {border-collapse: collapse}
 table.input td {vertical-align: top; margin: 0; border: 0; padding: 0 1px;}
@@ -13,15 +13,15 @@ table.input td {vertical-align: top; margin: 0; border: 0; padding: 0 1px;}
 #maincontent div.btitle img.image-submit {float: right;}
 #maincontent div.btitle h4 {margin-top: 6px;}
 .highlight {background: yellow;}
-.task_list {width: 95%; text-align: left; list-style-type: none; padding-left: 0}
+.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_description {float: left; padding: 1px; width: auto}
-.task_start {float: left; width: 4em; text-align: center}
+.task_start {float: left; width: 5em; text-align: center}
 .task_end_work {float: left; width: 2em}
-.task_done {float: left; width: 3em}
-.task_todo {float: left; width: 3em; padding: 1px}
+.task_done {float: left; width: 3.6em; text-align: right; padding: 1px}
+.task_todo {float: left; width: 4.3em; padding: 1px; text-align: center;}
 .task_buttons {float: left; width: 5em}
 .dragable-hover {background: yellow; border: 1px solid black;}
 .dropzone-hover {background: yellow; border: 1px solid black;}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.17.3
+  version: 0.17.4
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-11 00:00:00 +01:00
+date: 2008-01-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency