backlog 0.5.0 → 0.5.1

data/History.txt

@@ -1,3 +1,7 @@
+== 0.5.1 2007-08-06
+
+* Improved backlog edit task list
+
 == 0.5.0 2007-08-06
 
 * Changed first time workflow to add new backlog

data/app/controllers/tasks_controller.rb

@@ -30,7 +30,7 @@ class TasksController < ApplicationController
       if @task.period
         back_or_redirect_to :controller => 'periods', :action => 'show', :id => @task.period, :task => @task.id
       else
-        back_or_redirect_to :controller => 'backlogs', :action => 'show', :id => @task.backlog, :task => @task.id
+        back_or_redirect_to :controller => 'backlogs', :action => :edit, :id => @task.backlog, :task => @task.id
       end
     else
       populate_layout

data/app/views/backlogs/_tasks.rhtml

@@ -6,8 +6,14 @@
     <table>
       <%= render :partial => '/tasks/backlog_header', :locals => {:backlog => @backlog, :track_times => tasks.find {|t|t.period && t.period.active?}} %>
       <% i = 0 %>
+      <% current_period = nil %>
       <% for @task in tasks %>
-        <%= render :partial => '/tasks/task/', :locals => {:task => @task, :i => i += 1, :active => true, :highlight => false, :update => :maincontent} %>
+	    <% if @task.period != current_period %>
+		  <tr><th colspan="6"><%=@task.period ? h(@task.period.name) : l(:unplanned_tasks)%></th></tr>
+          <%= render :partial => '/tasks/fields_header', :locals => {:backlog => @backlog, :track_times => tasks.find {|t|t.period && t.period.active?}} %>
+          <% current_period = @task.period %>
+		<% end %>
+        <%= render :partial => '/tasks/task/', :locals => {:task => @task, :i => i += 1, :active => true, :highlight_task => false, :update => :maincontent} %>
       <% end %>
     </table>
   </div>

data/app/views/periods/_show_active.rhtml

@@ -38,9 +38,10 @@ function handleEvent(field, event, id) {
   <% if task.backlog != current_backlog %>
     <%= '<tr><td>&nbsp;</td></tr>' if 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, :track_times => @tasks.find {|t|t.period && t.period.active?} } %>
     <% current_backlog = task.backlog %>
   <% end %>
-  <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => true, :highlight => task == @selected_task, :update => :spotlight } %>
+  <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => true, :highlight_task => task == @selected_task, :update => :spotlight } %>
   <% i += 1 %>
 <% end %>
 </table>

data/app/views/periods/show.rhtml

@@ -22,7 +22,7 @@
     <% end %>
   </tr>
 <% for task in @completed_tasks %>
-  <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => false } %>
+  <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => false, :highlight_task => task == @selected_task } %>
   <% i += 1 %>
 <% end %>
 </table>

data/app/views/tasks/_backlog_header.rhtml

@@ -11,11 +11,3 @@
     </td>
     <td width="*"/>
   </tr>
-  <tr>
-    <th/>
-    <th align="center">#</th>
-    <th><%=l :task %></th>
-    <th><%=l :start if @backlog.track_times? && track_times %></th>
-    <th><%=l :done if @backlog.track_done? %></th>
-    <th width="*"><% l :todo if @backlog.track_todo? %></th>
-  </tr>

data/app/views/tasks/_fields_header.rhtml

@@ -0,0 +1,10 @@
+<% @backlog = backlog %>
+
+  <tr>
+    <th/>
+    <th align="center">#</th>
+    <th><%=l :task %></th>
+    <th><%=l :start if @backlog.track_times? && track_times %></th>
+    <th><%=l :done if @backlog.track_done? %></th>
+    <th width="*"><% l :todo if @backlog.track_todo? %></th>
+  </tr>

data/app/views/tasks/_task.rhtml

@@ -1,5 +1,5 @@
 <% @task = task %>
-  <tr valign="top" <%='class="highlight"' if highlight %>>
+  <tr valign="top" <%='class="highlight"' if highlight_task %>>
     <td width="1">
     <% if @task.enable_subtasks? && active && (@task.period.nil? || @task.period.active_or_future?) %>
       <% form_tag({:controller => 'tasks', :action => :specify, :id => @task}) do %>
@@ -63,7 +63,7 @@
               <%= @task.todo %>
             <% end %>
           <% end -%>
-          <% if (not @task.track_times?) && !@task.work_started? && @task.period.active? %>
+          <% if (not @task.track_times?) && !@task.work_started? && @task.period && @task.period.active? %>
             <%= image_button_to('checkmark.png', l(:complete), :controller => 'tasks', :action => :finish, :id => @task)%>
           <% end -%>
         <% end -%>
@@ -78,7 +78,7 @@
               <%= image_detour_to('ernes_stop.png', l(:abort), {:controller => 'tasks', :action => :abort, :id => @task}, nil, true)%>
             <% end %>
           <% end %>
-        <% elsif not @task.period.passed? && @task.leaf? %>
+        <% elsif (not @task.period.passed?) && @task.leaf? %>
           <%=image_detour_to('/images/eraser.png', l(:reopen), {:controller => 'tasks', :action => :reopen, :id => @task}, nil, true) %>
         <% end -%>
       <% end -%>

data/app/views/tasks/list_started.rhtml

@@ -47,7 +47,7 @@ function handleEvent(field, event, id) {
   </tr>
 <% i = 0 %>
 <% for task in @tasks %>
-  <%=render :partial => 'task', :locals => { :task => task, :i => i, :active => true, :highlight => task == @selected_task } %>
+  <%=render :partial => 'task', :locals => { :task => task, :i => i, :active => true, :highlight_task => task == @selected_task } %>
   <% i += 1 %>
 <% end %>
 </table>

data/lang/en.yaml

@@ -81,6 +81,7 @@ track_todo: Estimates
 track_done: Track work done
 track_times: Track start and stop times
 tuesday: Tuesday
+unplanned_tasks: Unplanned tasks
 up: Up
 user: User
 wednesday: Wednesday

data/lang/no.yaml

@@ -80,6 +80,7 @@ track_todo: Estimater
 track_done: Spor utført arbeid
 track_times: Spor start- og stopptider
 tuesday: Tirsdag
+unplanned_tasks: Ikke planlagte oppgaver
 up: Opp
 user: Bruker
 wednesday: Onsdag

data/test/functional/tasks_controller_test.rb

@@ -74,7 +74,7 @@ class TasksControllerTest < Test::Unit::TestCase
     assert_equal [], task.errors.full_messages
 
     assert_response :redirect
-    assert_redirected_to :controller => 'backlogs', :action => 'show', :id => 2
+    assert_redirected_to :controller => 'backlogs', :action => :edit, :id => 2
 
     assert_equal num_tasks + 1, Task.count
   end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 date: 2007-08-06 00:00:00 +02:00
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 require_paths: 
@@ -1724,6 +1724,7 @@ files:
 - app/views/tasks/list.rhtml
 - app/views/tasks/_form.rhtml
 - app/views/tasks/new.rhtml
+- app/views/tasks/_fields_header.rhtml
 - app/views/tasks/edit.rhtml
 - app/views/tasks/list_started.rhtml
 - app/views/tasks/_task.rhtml