backlog 0.5.5 → 0.5.6

data/History.txt

@@ -1,3 +1,7 @@
+== 0.5.6 2007-08-06
+
+* Improved the list of started tasks
+
 == 0.5.5 2007-08-06
 
 * Fixed bug in link helper that resulted in some GET buttons became POST buttons.

data/app/controllers/tasks_controller.rb

@@ -7,7 +7,7 @@ class TasksController < ApplicationController
   def list_started
     @tasks = Task.find_started(user)
     @selected_task = Task.find_by_id(params[:id])
-    back_or_redirect_to :controller => nil, :action => nil if @tasks.empty?
+    back_or_redirect_to(:controller => '', :action => '') if @tasks.empty?
   end
   
   def new

data/app/models/task.rb

@@ -47,7 +47,15 @@ class Task < ActiveRecord::Base
       user_clause = " OR user_id = #{user.id}"
     end
     conditions = "completed_at IS NULL AND (user_id IS NULL#{user_clause})"
-    Work.find(:all, :conditions => conditions).map {|work| work.task}
+    Work.find(:all, :conditions => conditions).map {|work| work.task}.sort do |t1, t2|
+      if (backlog_sort = t1.backlog.name <=> t2.backlog.name) != 0
+        backlog_sort
+      elsif (period_sort = t1.period.end_on <=> t2.period.end_on) != 0
+        period_sort
+      else
+        t1.position <=> t2.position
+      end
+    end
   end
   
   def self.recent_conditions

data/app/views/tasks/_fields_header.rhtml

@@ -1,10 +1,8 @@
-<% @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>
+    <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

@@ -14,7 +14,7 @@
       <%= "-" if @task.children.size > 0 %>
     </td>
     <td>
-		<div id="task_<%=@task.id%>"<%=' 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?)%>>
+		<div id="task_<%=@task.id%>"<%=' 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 -%>
@@ -29,7 +29,7 @@
           <% if @task.work_started? -%>
             <%= text_field 'work', 'started_at_time', :tabindex => i+1, :value => @task.started_work.started_at.strftime('%H:%M'),
                 :class => :task_time, :maxlength => 5, :onkeypress => "handleEvent(this, event, #{@task.id})" %>
-            <%= image_button_to('ernes_stop.png', l(:end_work), :controller => 'tasks', :action => :end_work, :id => @task.id) %>
+            <%= image_detour_to('ernes_stop.png', l(:end_work), {:controller => 'tasks', :action => :end_work, :id => @task.id}, nil, true) %>
           <% elsif @task.track_times? && @task.period && @task.period.active? %>
             <%= image_button_to 'hammer.png', l(:start_work), :controller => 'tasks', :action => :start_work, :id => @task.id %>
           <% end -%>
@@ -85,7 +85,7 @@
     </td>
   </tr>
 
-<% if active && (@task.period.nil? || @task.period.active_or_future?) %>
+<% if active && (@task.period.nil? || @task.period.active_or_future?) && (not @task.work_started?) %>
 <%= draggable_element "task_#{@task.id}", :revert => true, :constraint => "'vertical'" %>
 <%= drop_receiving_element "task_#{@task.id}",
       :update => update, :url => options_for_detour({:controller => 'tasks', :action => "move_to", :position => @task.position, :layout => false}),

data/app/views/tasks/list_started.rhtml

@@ -37,19 +37,23 @@ function handleEvent(field, event, id) {
 
 <% if @tasks %>
 <table class="input">
-  <tr>
-    <th/>
-    <th align="center">#</th>
-    <th><%=l :task %></th>
-    <th><%=l :start %></th>
-    <th><%=l :done %></th>
-    <th><%=l :todo %></th>
-  </tr>
 <% i = 0 %>
+<% current_backlog = nil %>
+<% current_period = nil %>
 <% for task in @tasks %>
-  <%=render :partial => 'task', :locals => { :task => task, :i => i, :active => true, :highlight_task => task == @selected_task } %>
+    <% 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 %>
+	  <tr><th colspan="6"><%=task.period ? h(task.period.name) : l(:unplanned_tasks)%></th></tr>
+      <%= render :partial => '/tasks/fields_header', :locals => {:backlog => task.backlog, :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 } %>
   <% i += 1 %>
 <% end %>
+
 </table>
 <% else %>
   <%=l :no_pending_tasks%>

data/public/stylesheets/backlog.css

@@ -1,6 +1,6 @@
 .task_description { width: 300px; }
 .task_hours { width: 32px; }
-.task_time { width: 40px; border: 1px solid black }
+.task_time { width: 40px }
 .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;}

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 date: 2007-08-06 00:00:00 +02:00
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 require_paths: