backlog 0.14.4 → 0.15.0

data/History.txt

@@ -1,3 +1,24 @@
+== 0.15.0 2007-11-28
+
+=== Features
+
+* Expanded search to include the "notes" field of tasks.
+* Added unformatted viewing of notes for a task.
+* Made using sprints an option for backlogs.  Default is not to use sprints to enable simple usage of the Backlog application.
+  Existing backlogs have the option set even if no sprints have been started, for backwards compatibility.
+* Added link from task line to task editing view.
+
+=== Fixes
+
+* Ordered work records by end date in list view.
+* Fixed wrong redirect when moving an unplanned task to a sprint.
+* Fixed bug when editing a finished task leads to reopening it.
+* Fixed cosmetic errors in finishing and reopening tasks.
+* Fixed error when tracking time done, but not start and stop times.
+* Removed unnecessary icon for showing a backlog when already showing the backlog.
+* Fixed missing border around icons in backlog view.
+* Fixed cosmetics on task lines.
+
 == 0.14.4 2007-11-27
 
 === Features

data/app/controllers/backlogs_controller.rb

@@ -148,7 +148,7 @@ class BacklogsController < ApplicationController
       params[:period_id] = next_period && next_period.id
       move_task_to_period
     else
-      rjs_redirect_to :action => :edit, :id => @task
+      rjs_redirect_to :controller => 'tasks', :action => :edit, :id => @task
     end
   end
   

data/app/controllers/periods_controller.rb

@@ -140,14 +140,10 @@ class PeriodsController < ApplicationController
   
   def move_task_to_next_period
     @task = Task.find(params[:id])
-    if @task.period
-      next_period = @task.period.lower_item
-      next_period = next_period.lower_item while next_period && next_period.passed?
-      params[:period_id] = next_period && next_period.id
-      move_task_to_period
-    else
-      rjs_redirect_to :action => :edit, :id => @task
-    end
+    next_period = @task.period.lower_item
+    next_period = next_period.lower_item while next_period && next_period.passed?
+    params[:period_id] = next_period && next_period.id
+    move_task_to_period
   end
   
   def finish_task

data/app/controllers/search_controller.rb

@@ -1,9 +1,10 @@
 class SearchController < ApplicationController
+  
   def results
     if params[:q]
       @search = params[:q]
       @backlogs = Backlog.find(:all, :conditions => ["lower(name) LIKE ?", "%#{@search.downcase}%"])
-      @tasks = Task.find(:all, :conditions => ["lower(description) LIKE ?", "%#{@search.downcase}%"])
+      @tasks = Task.find(:all, :conditions => ["lower(description) LIKE ? OR lower(notes) LIKE ?", "%#{@search.downcase}%", "%#{@search.downcase}%"])
     else
       @backlogs = []
       @tasks = []

data/app/controllers/tasks_controller.rb

@@ -1,7 +1,7 @@
 class TasksController < ApplicationController
   skip_before_filter :populate_layout, :except => [:edit, :list_started, :move_down, :move_to_bottom, :move_to_top, :move_up, :new, :specify]
   
-  verify :method => :post, :except => [ :new, :show, :edit, :list_started, :move_to_next_period],
+  verify :method => :post, :except => [ :new, :show, :edit, :list_started, :move_to_next_period, :notes],
   :redirect_to => { :controller => 'backlogs' }
   
   def list_started
@@ -109,6 +109,9 @@ class TasksController < ApplicationController
       else
         if @task.finished_at
           @task.reopen
+          flash[:notice] += 'Task was reopened.'
+          populate_layout
+          render :action => 'edit'
         else
           if @task.period
             back_or_redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task => @task.id
@@ -260,6 +263,9 @@ class TasksController < ApplicationController
     render :text => task.description
   end
   
-  private
+  def notes
+    @task = Task.find(params[:id])
+    render :layout => 'wide'
+  end
   
 end

data/app/controllers/works_controller.rb

@@ -17,7 +17,7 @@ class WorksController < ApplicationController
   
   def list
     @period = params[:id] && Period.find(params[:id])
-    @work_pages, @works = paginate :works, :per_page => 20
+    @work_pages, @works = paginate :works, :order => 'completed_at', :per_page => 20
   end
   
   def show

data/app/helpers/backlogs_helper.rb

@@ -14,7 +14,9 @@ module BacklogsHelper
   end
   
   def add_finished_task(page)
-    not_first = @completed_tasks.find {|t| t.id != @task.id && t.period_id == @task.period_id}
+    tasks_in_period = @completed_tasks.select {|t| t.period_id == @task.period_id}
+    work_done = ! tasks_in_period.find {|t| t.total_done != 0}.nil?
+    not_first = tasks_in_period.size > 1
     if not_first
       page.select("#completed_tasks_#{@task.period_id} tr").first.remove
       page.select("#completed_tasks_#{@task.period_id} tr").first.remove
@@ -25,7 +27,7 @@ module BacklogsHelper
     page.insert_html :top, "completed_tasks_#{@task.period_id}", :partial => '/tasks/task', :locals => {:active => false, :hidden => true, :highlight_task => 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}
+    page.insert_html :top, "completed_tasks_#{@task.period_id}", :partial => '/tasks/fields_header', :locals => {:backlog => @task.backlog, :active => false, :work_done => work_done}
     page.insert_html :top, "completed_tasks_#{@task.period_id}", :partial => '/tasks/period_header', :locals => {:period => @task.period}
   end
 
@@ -39,17 +41,18 @@ module BacklogsHelper
   end
   
   def add_active_task(page)
-    first_in_period = @tasks.find{|t| t.id != @task.id && t.period_id == @task.period_id}.nil?
+    tasks_in_period = @tasks.select{|t| t.period_id == @task.period_id}
+    first_in_period = tasks_in_period.size == 1
     if first_in_period
       page.insert_html :top, :active_tasks, %Q{<table id="active_tasks_#{@task.period_id}" class="input" style="width: 100%;"/>}
     else
-      page.select('#active_tasks_#{@task.period_id} tr').first.remove
-      page.select('#active_tasks_#{@task.period_id} tr').first.remove
+      page.select("#active_tasks_#{@task.period_id} tr").first.remove
+      page.select("#active_tasks_#{@task.period_id} tr").first.remove
     end
     
     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 } )
+    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?} } )
     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/helpers/periods_helper.rb

@@ -45,15 +45,18 @@ module PeriodsHelper
   end
   
   def add_finished_task(page)
+    work_done = ! @completed_tasks.find {|t| t.total_done != 0}.nil?
     first_finished = @completed_tasks.find {|t| t.id != @task.id}.nil?
     unless first_finished
       page.select("#completed_tasks_#{@task.period_id} tr").first.remove
+    else
+      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.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}
+    page.insert_html :top, "completed_tasks_#{@task.period_id}", :partial => '/tasks/fields_header', :locals => {:backlog => @task.backlog, :active => false, :work_done => work_done}
   end
   
   def update_burn_down_chart(page)

data/app/models/work.rb

@@ -7,7 +7,7 @@ class Work < ActiveRecord::Base
   belongs_to :work_account
   
   validates_associated :task
-  validates_presence_of :started_at
+  validates_presence_of :started_at, :if => :track_times?
   validates_presence_of :work_account
   
   def validate
@@ -20,7 +20,7 @@ class Work < ActiveRecord::Base
   end
   
   def track_times?
-    task && task.backlog && task.backlog.track_times?
+    work_account.track_times?
   end
   
   # Return an array with an array of works per day:

data/app/views/backlogs/_buttons.rhtml

@@ -1,4 +1,3 @@
     	<%=image_link_to 'arrow_up.png', l(:backlogs), :action => :list %>
-        <%=image_detour_to('clipboard.png', l(:edit), :controller => 'backlogs', :action => :edit, :id => @backlog)%>
-        <%=image_detour_to('clipboard.png', l(:show), :controller => 'backlogs', :action => :show, :id => @backlog)%>
+        <%=image_detour_to('clipboard.png', l(:edit), :controller => 'backlogs', :action => :edit, :id => @backlog) unless controller.action_name == 'edit' %>
         <%=detour_to(image_tag(url_for("add.png"), :alt => l(:add_task), :title => l(:add_task), :class => 'image-submit'), :controller => 'tasks', :action => 'new', :task => {:backlog_id => @backlog.id} ) %>

data/app/views/backlogs/_form.rhtml

@@ -4,6 +4,8 @@
 <%= text_field 'backlog', 'name', :maxlength => 64 %>
 </p>
 
+<h3>Options</h3>
+
 <p>
 <%= check_box 'backlog', 'track_todo'  %>
 <label for="backlog_track_todo"><%=l :track_todo%></label>
@@ -14,6 +16,11 @@
 <label for="backlog_enable_subtasks"><%=l :enable_subtasks%></label>
 </p>
 
+<p>
+<%= check_box 'backlog', 'enable_periods'  %>
+<label for="backlog_enable_periods"><%=l :enable_periods%></label>
+</p>
+
 <p>
 <%= check_box 'backlog', 'enable_customer'  %>
 <label for="backlog_enable_customer"><%=l :enable_customer%></label>

data/app/views/backlogs/show.rhtml

@@ -1,5 +1,33 @@
-<% @page_title = @backlog.name %>
-
+<%@page_title = @backlog.name %>
+<div id="spotlight">
+    <div class="btitle">
+        <%=render :partial => 'buttons' %><h4><%=l :tasks %></h4>
+    </div>
+    <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 %>
+		    <% tasks_in_period = @tasks.select {|t| t.period_id == (period && period.id)} %>
+			<% work_done = !tasks_in_period.find{|t| t.total_done > 0}.nil? %>
+        	<table id="active_tasks_<%=period ? period.id : '' %>">
+            	<%=render :partial => '/tasks/period_header', :locals => {:period => period} %>
+				<%=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} %>
+				<%end %>
+        	</table>
+        <%end %>
+    </div>
+    <p id="no_tasks_message"<%=' style="display: none;"' if @tasks and not @tasks.empty? %>>
+        <%=l :no_pending_tasks_in_backlog %>
+    </p>
+    <%=back_or_link_to(l(:back)) %>
+</div>
 <div id="maincontent">
-	<%=render :partial => 'tasks', :locals => {:tasks => @tasks}%>
+    <div class="mainblock">
+        <div class="btitle">
+            <h4><%=l(:completed_tasks) %></h4>
+        </div>
+        <%=render :partial => '/tasks/completed', :locals => {:i => 1} %>
+    </div>
 </div>

data/app/views/periods/_show_active.rhtml

@@ -40,8 +40,8 @@ function handleEvent(field, event, id) {
     <% current_backlog = task.backlog %>
     <table class="input" style="width: 100%;">
       <%= '<tr><td>&nbsp;</td></tr>' if false && current_backlog %>
-      <%=render :partial => '/tasks/backlog_header', :locals => { :backlog => task.backlog, :track_times => @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?} } %>
+      <%=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 %>

data/app/views/tasks/_completed.rhtml

@@ -1,8 +1,10 @@
 <div id="completed_tasks">
 <% @completed_tasks.map {|t| t.period}.uniq.each do |period| %>
 <table id="completed_tasks_<%=period ? period.id : ''%>" class="input">
+  <% tasks_in_period = @completed_tasks.select {|t| t.period == period} %>
+  <% work_done = !tasks_in_period.find{|t| t.total_done != 0}.nil? %>
   <%=render :partial => '/tasks/period_header', :locals => {:period => period} unless @completed_tasks.map(&:period).uniq.size == 1 %>
-  <%=render :partial => '/tasks/fields_header', :locals => {:backlog => @backlog, :active => false, :track_times => false} %>
+  <%=render :partial => '/tasks/fields_header', :locals => {:backlog => @backlog, :active => false, :track_times => false, :work_done => work_done} %>
   <% @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 } %>
     <% i += 1 %>

data/app/views/tasks/_fields_header.rhtml

@@ -2,8 +2,8 @@
     <th/>
     <th align="center"><%=active ? '#' : l(:resolution_abr)%></th>
     <th><%=l :task %></th>
-    <th><%=l :start if active && backlog.work_account && backlog.work_account.track_times? %></th>
+    <th><%=l :start if active && backlog.track_times? %></th>
     <th/>
-    <th><%=l :done if not backlog or backlog.track_done? %></th>
+    <th><%=l :done if (active && backlog.track_done?) || work_done %></th>
     <th width="*"><%=l :todo if active && backlog.track_todo? %></th>
   </tr>

data/app/views/tasks/_form.rhtml

@@ -14,6 +14,7 @@
 </p>
 
 
+<% if @task.backlog && @task.backlog.enable_periods? %>
 <p><label for="task_period_id"><%=l :period%></label><br/>
 <%= select 'task', 'period_id', [['', '']] + @periods.map{|p| [p.name, p.id]}, {},
 		:onchange => remote_function(:update => 'period_link', 
@@ -23,13 +24,17 @@
 </span>
 <%=detour_to l(:new_period), :controller => 'periods', :action => :new %>
 </p>
-
+<% end %>
 
 
 <% if @task.backlog %>
 
 <p><label for="task_description"><%=l :task%></label><br/>
-<%= text_field 'task', 'description', :size => 64, :maxlength => 80 %></p>
+<% if @task.active? -%>
+	<%=text_field 'task', 'description', :size => 64, :maxlength => 80 %></p>
+<% else -%>
+	<%=@task.description -%>
+<% end -%>
 
 <% if @task.enable_customer? %>
 <p><label for="task_customer"><%=l :customer%></label><br/>
@@ -52,7 +57,9 @@
 <% end %>
 
 <p><label for="task_notes"><%=l :notes%></label><br/>
-<%= text_area 'task', 'notes', :cols => '72', :rows => 16 %></p>
+<%=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%>
+</p>
 
 <p><label for="task_file"><%=l :files%></label><br/>
 <%=@task.task_files.map do |task_file|

data/app/views/tasks/_task.rhtml

@@ -9,17 +9,13 @@
     </td>
     <td align="left" valign="top" width="1" nowrap="true">
       <%= ("&nbsp;" * @task.depth * 4) if @task.depth > 0 %>
-      <%=detour_to @task.position.to_s, :controller => 'tasks', :action => :edit, :id => @task.id if @task.position || @task.depth == 0 %>
+      <%=@task.position if @task.position || @task.depth == 0 %>
       <%= resolution_image(@task.resolution) if @task.finished_at %>
       <%= "-" if @task.children.size > 0 %>
     </td>
     <td>
 		<div id="task_<%=@task.id%>_description"<%=' class="tasks" onmouseover="this.style.border=\'1px solid black\'" onmouseout="this.style.border=\'1px solid transparent\'"' if active && (@task.period.nil? || @task.period.active_or_future?) && (not @task.work_started?) %>>
-      		<% if @task.active? -%>
-        		<%=in_place_editor_field(:task, :description, {:id => "#{@task.id}_description", :tabindex => i}, :url => url_for(:controller => 'tasks', :action => "set_task_description", :id => @task)) %>
-      		<% else -%>
-        		<%=@task.description -%>
-      		<% end -%>
+      		<%=detour_to h(@task.description), :controller => 'tasks', :action => :edit, :id => @task.id if @task.position || @task.depth == 0 %>
 		</div>
     </td>
     <td align="right" nowrap="true" width="1">
@@ -29,7 +25,7 @@
           <% if @task.work_started? -%>
             <%=f.text_field 'started_at_time', :id => "work_#{@task.started_work.id}_started_at_time", :tabindex => i+1, :value => @task.started_work.started_at.strftime('%H:%M'),
                 :class => :task_time, :maxlength => 5 %>
-          <% elsif @task.track_times? && @task.period && @task.period.active? %>
+          <% 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 %>
           <% end -%>
         <% end %>
@@ -42,13 +38,13 @@
         <% end -%>
       <% end -%>
     </td>
-    <td align="<%=@task.loggable? ? 'center' : 'left'%>" nowrap="true" width="1">
-    <% if @task.track_done? %>
+    <td align="<%=active && @task.loggable? && @task.track_done? ? 'left' : 'right'%>" nowrap="true" width="1">
+    <% if @task.track_done? || @task.total_done != 0 %>
       <% if @task.loggable? || @task.finished_at -%>
         <% form_tag({:controller => 'works', :action => (@task.work_started? ? :edit : :create), :id => @task.started_work}) do %>
-          <%= hidden_field('work', 'task_id', :value => @task.id)%>
-          <%= submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
-          <% unless @task.track_times? || @task.work_started? || @task.finished_at -%>
+          <%=hidden_field('work', 'task_id', :value => @task.id)%>
+          <%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
+          <% unless !@task.track_done? || @task.track_times? || @task.work_started? || @task.finished_at -%>
             <%=text_field 'work', 'hours', :tabindex => i+1, :id => "#{@task.id}_done", 
                 :class => :task_hours, :maxlength => 4,
                 :ondblclick => "form.elements[1].style.display = 'inline';this.style.display = 'none'" -%>
@@ -74,12 +70,12 @@
         <% end -%>
       <% end -%>
     </td>
-    <td align="right" nowrap="true" width="54">
+    <td align="right" nowrap="true">
       <% form_tag({:controller => 'tasks', :action => 'update', :id => @task}) do %>
         <% if @task.active? %>
           <% if @task.loggable? %>
             <% unless @task.work_started? %>
-              <%=image_link_to_remote('arrow_right.png', l(:move_to_next_period), {:action => :move_task_to_next_period, :id => @task}, nil, true)%>
+              <%=image_link_to_remote('arrow_right.png', l(:move_to_next_period), {:action => :move_task_to_next_period, :id => @task}, nil, true) if @task.backlog.enable_periods? || @task.period_id%>
               <%=image_link_to_remote('ernes_stop.png', l(:abort), {:action => :abort_task, :id => @task}, nil, true)%>
             <% end %>
           <% end %>

data/app/views/tasks/notes.rhtml

@@ -0,0 +1,8 @@
+<div id="spotlight">
+<% @page_title = "#{l :notes} #{l :task} ##{@task.id}" %>
+
+<pre style="text-align: left;">
+<%=h @task.notes %>
+</pre>
+
+</div>

data/db/migrate/024_add_sprint_option.rb

@@ -0,0 +1,10 @@
+class AddSprintOption < ActiveRecord::Migration
+  def self.up
+    add_column :backlogs, :enable_periods, :boolean
+    execute("UPDATE backlogs SET enable_periods = TRUE")
+  end
+
+  def self.down
+    remove_column :backlogs, :enable_periods
+  end
+end

data/db/schema.rb

@@ -2,7 +2,7 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define(:version => 23) do
+ActiveRecord::Schema.define(:version => 24) do
 
   create_table "backlogs", :force => true do |t|
     t.column "name",            :string,  :limit => 64,                    :null => false
@@ -12,6 +12,7 @@ ActiveRecord::Schema.define(:version => 23) do
     t.column "enable_users",    :boolean
     t.column "work_account_id", :integer
     t.column "customer_id",     :integer
+    t.column "enable_periods",  :boolean
   end
 
   create_table "configurations", :force => true do |t|

data/lang/en.yaml

@@ -27,6 +27,7 @@ edit: Edit
 editing: Editing
 enable_customer: Enable customer
 enable_invoicing: Enable invoicing
+enable_periods: Enable Sprints
 enable_subtasks: Enable Subtasks
 enable_users: Enable users
 end_on: End on
@@ -55,7 +56,8 @@ move_to_top: Move task to top of list
 moved: Moved
 name: Name
 new_backlog: Start new backlog
-new_group: Start new group
+new_customer: Add new customer
+new_group: Form new group
 new_period: Add new sprint
 new_task: Add new task
 new_work: Add new work record
@@ -104,6 +106,7 @@ tuesday: Tuesday
 unplanned_tasks: Unplanned tasks
 up: Up
 user: User
+view_fullscreen: View fullscreen
 wednesday: Wednesday
 week: Week
 weekly_work_sheet: Weekly work sheet

data/lang/no.yaml

@@ -27,6 +27,7 @@ edit: Rediger
 editing: Redigerer
 enable_customer: Tillat kunder
 enable_invoicing: Tillat fakturering
+enable_periods: Tillat sprinter
 enable_subtasks: Tillat underoppgaver
 enable_users: Tillat brukere
 end_on: Avslutt på
@@ -55,6 +56,7 @@ move_to_top: Flytt oppgaven til toppen av listen
 moved: Flyttet
 name: Navn
 new_backlog: Start ny oppgaveliste
+new_customer: Legg til ny kunde
 new_group: Start ny gruppe
 new_period: Start ny periode
 new_task: Legg til ny oppgave
@@ -103,6 +105,7 @@ tuesday: Tirsdag
 unplanned_tasks: Ikke planlagte oppgaver
 up: Opp
 user: Bruker
+view_fullscreen: Vis fullskjerm
 wednesday: Onsdag
 week: Uke
 weekly_work_sheet: Timeoversikt for uke

data/test/fixtures/tasks.yml

@@ -6,6 +6,7 @@
     period_id: 2
     description: first task
     position: 1
+    notes: hullo
 - another:
     id: 2
     created_at: 2007-06-12

data/test/functional/search_controller_test.rb

@@ -5,14 +5,20 @@ require 'search_controller'
 class SearchController; def rescue_action(e) raise e end; end
 
 class SearchControllerTest < Test::Unit::TestCase
+  main_scenario
+  
   def setup
     @controller = SearchController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    @request.session[:user_id] = 1000001
   end
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  def test_notes
+    post :results, :q => 'hullo'
+    assert_not_nil assigns(:backlogs)
+    assert_not_nil assigns(:tasks)
+    assert_equal 1, assigns(:tasks).size
+    assert_equal tasks(:first).id, assigns(:tasks).first.id
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.14.4
-date: 2007-11-27 00:00:00 +01:00
+  version: 0.15.0
+date: 2007-11-28 00:00:00 +01:00
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 require_paths: 
 - lib
@@ -44,6 +44,7 @@ files:
 - public/images/hammer.png
 - public/images/arrow_right.svg
 - public/images/arrow_down.png
+- public/images/view_fullscreen.png
 - public/images/eraser_org.png
 - public/images/period.png
 - public/images/rmagick.gif
@@ -146,6 +147,7 @@ files:
 - db/migrate/022_remove_track_done_flag.rb
 - db/migrate/005_add_field_work_started_at.rb
 - db/migrate/006_works_data_fix.rb
+- db/migrate/024_add_sprint_option.rb
 - db/test.db
 - db/schema.rb
 - test
@@ -434,7 +436,6 @@ files:
 - app/views/backlogs/_form.rhtml
 - app/views/backlogs/new.rhtml
 - app/views/backlogs/edit.rhtml
-- app/views/backlogs/_tasks.rhtml
 - app/views/backlogs/reopen_task.rjs
 - app/views/estimates
 - app/views/groups
@@ -466,6 +467,7 @@ files:
 - app/views/tasks/edit.rhtml
 - app/views/tasks/list_started.rhtml
 - app/views/tasks/_task.rhtml
+- app/views/tasks/notes.rhtml
 - app/views/customers
 - app/views/customers/list.rhtml
 - app/views/customers/show.rhtml

data/app/views/backlogs/_tasks.rhtml

@@ -1,33 +0,0 @@
-  <div class="mainblock">
-    <div class="btitle">
-    	<%=render :partial => 'buttons'%>
-        <h4><%=l :tasks%></h4>
-    </div>
-        
-<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 %>
-    <table id="active_tasks_<%=period ? period.id : 'unplanned' %>">
-      <%=render :partial => '/tasks/period_header', :locals => {:period => period} %>
-      <%=render :partial => '/tasks/fields_header', :locals => {:backlog => @backlog, :active => true, :track_times => tasks.find {|t|t.period && t.period.active?}} %>
-      <% for @task in @tasks.select {|t| t.period_id == (period && period.id)} %>
-        <%=render :partial => '/tasks/task/', :locals => {:task => @task, :i => i += 1, :active => true, :highlight_task => false, :update => :maincontent, :hidden => false} %>
-      <% end %>
-    </table>
-  <% end %>
-</div>
-
-<p id="no_tasks_message"<%=' style="display: none;"' if @tasks and not @tasks.empty?%>><%=l :no_pending_tasks_in_backlog%></p>
-
-    <%=back_or_link_to(l(:back)) %>
-  </div>
-
-  <div class="mainblock">
-    <div class="btitle">
-    	<h4><%=l(:completed_tasks) %></h4>
-  	</div>
-
-	<%=render :partial => '/tasks/completed', :locals => {:i => 1} %>
-  </div>
-