backlog 0.6.5 → 0.6.6

data/History.txt

@@ -1,3 +1,7 @@
+== 0.6.6 2007-08-07
+
+* Improved task lists in backlog edit view.
+
 == 0.6.5 2007-08-07
 
 * Fixed authentication error for burn down chart

data/app/controllers/application.rb

@@ -96,7 +96,7 @@ class ApplicationController < ActionController::Base
   
   def pop_detour
     detour = session[:detours].pop
-    puts "popped detour: #{detour} #{session[:detours].size} more"; STDOUT.flush
+    puts "popped detour: #{detour.inspect} #{session[:detours].size} more"; STDOUT.flush
     if session[:detours].empty?
       session[:detours] = nil
     end

data/app/controllers/backlogs_controller.rb

@@ -65,7 +65,7 @@ class BacklogsController < ApplicationController
       end
     end
     @tasks = planned_tasks + unplanned_tasks
-    @completed_tasks = @backlog.tasks.select {|t| t.finished_at}.sort {|t1, t2| t1.finished_at <=> t2.finished_at}
+    @completed_tasks = @backlog.tasks.select {|t| t.finished_at}.sort {|t1, t2| t2.finished_at <=> t1.finished_at}
   end
   
   def edit_no_layout

data/app/controllers/tasks_controller.rb

@@ -54,11 +54,23 @@ class TasksController < ApplicationController
       return
     end
     @task = Task.find(params[:id])
-    unless @task.period.active?
+    unless (@task.period && @task.period.active?) || (params[:task] && params[:task][:period_id] && Period.find(params[:task][:period_id]).active?)
       @task.errors.add(:period_id, "You may not update a task in an inactive period.  Move the task to an active period first.")
-      redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task => @task.id
+      back_or_redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task => @task.id
       return
     end
+    if params[:task] && params[:task][:period_id]
+      if params[:task][:period_id] != ''
+        if params[:task][:period_id].to_i != @task.period_id
+          params[:task][:position] = Period.find(params[:task][:period_id]).tasks.size
+        end
+      else
+        if @task.period_id != nil
+          @task.period = nil
+          params[:task][:position] = @task.backlog.tasks.count(:conditions => 'period_id IS NULL') + 1
+        end
+      end
+    end
     if params[:task] && @task.update_attributes(params[:task])
       flash[:notice] = 'Task was successfully updated.'
       if params[:task][:todo] && params[:task][:todo].to_i == 0
@@ -66,15 +78,15 @@ class TasksController < ApplicationController
           next_task = @task.lower_item || @task.higher_item
           @task.finish Task::COMPLETED, true, user
           @task.save
-          redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task => next_task ? next_task.id : nil
+          back_or_redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task => next_task ? next_task.id : nil
         else
-          redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task => @task.id
+          back_or_redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task => @task.id
         end
       else
         if @task.finished_at
           reopen
         else
-          redirect_to :controller => 'periods', :action => 'show', :id => @task.period, :task => @task.id
+          back_or_redirect_to :controller => 'periods', :action => 'show', :id => @task.period, :task => @task.id
         end
       end
     else
@@ -119,7 +131,12 @@ class TasksController < ApplicationController
   
   def move_to
     task = Task.find(params[:id][5..-1])
+    if params[:period_id] && params[:period_id].to_i != task.period_id
+      task.remove_from_list
+      task.period_id = params[:period_id]
+    end
     task.insert_at params[:position]
+    task.save!
     back_or_redirect_to :controller => 'periods', :action => :show_nolayout, :id => task.period, :task => task.id
   end
   
@@ -149,14 +166,14 @@ class TasksController < ApplicationController
       params[:period_id] = task.period.lower_item && task.period.lower_item.id
       move_to_period(true)
     else
-      detour_to :action => :edit, :id => task
+      redirect_to :action => :edit, :id => task
     end
   end
   
   def finish
     @task = Task.find(params[:id])
     @task.finish(Task::COMPLETED, true)
-    redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task_id => @task.id
+    back_or_redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task_id => @task.id
   end
   
   def abort
@@ -174,7 +191,7 @@ class TasksController < ApplicationController
   def start_work
     task = Task.find(params[:id])
     task.start_work
-    redirect_to :controller => 'periods', :action => :show, :id => task.period, :task => task.id
+    back_or_redirect_to :controller => 'periods', :action => :show, :id => task.period, :task => task.id
   end
   
   def end_work

data/app/models/task.rb

@@ -27,8 +27,7 @@ class Task < ActiveRecord::Base
   #validates_uniqueness_of :description, :scope => :backlog_id, :if => Proc.new {|task| task.backlog_id && task.previous_task_id.nil?}
   validates_uniqueness_of :description, :scope => :period_id, :if => :period_id
   validates_uniqueness_of :position, :scope => :period_id, :if => :period_id, :allow_nil => true
-  validates_uniqueness_of :position, :scope => :parent_id, :if => :parent_id, :allow_nil => true
-  validates_uniqueness_of :position, :scope => :backlog_id, :if => Proc.new {|task| task.period_id.nil? && task.parent_id.nil?}, :allow_nil => true
+  validates_uniqueness_of :position, :scope => [:period_id, :backlog_id], :if => Proc.new {|task| task.period_id.nil?}, :allow_nil => true
   
   def validate
     if self.parent_id && (self.period_id || self.backlog_id)

data/app/views/backlogs/_tasks.rhtml

@@ -10,7 +10,7 @@
       <% current_period = nil %>
       <% for @task in tasks %>
 	    <% if @task.period != current_period %>
-		  <tr><th colspan="6"><%=@task.period ? h(@task.period.name) : l(:unplanned_tasks)%></th></tr>
+		  <tr><th colspan="6"><%=link_to (@task.period ? h(@task.period.name) : l(:unplanned_tasks)), :controller => 'periods', :action => :show, :id => @task.period%></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 %>

data/app/views/backlogs/edit.rhtml

@@ -10,4 +10,14 @@
 
 <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.rhtml

@@ -11,20 +11,5 @@
     <h4><%=l(:completed_tasks) %></h4>
   </div>
 
-<table class="input">
-  <tr>
-    <th/>
-    <th align="left"><%=l :resolution %></th>
-    <th><%=l :task %></th>
-    <% if @period.track_work? -%>
-    <th></th>
-    <th><%=l :done %></th>
-    <% end %>
-  </tr>
-<% for task in @completed_tasks %>
-  <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => false, :highlight_task => task == @selected_task } %>
-  <% i += 1 %>
-<% end %>
-</table>
-
+	<%=render :partial => '/tasks/completed', :locals => {:i => i} %>
 </div>

data/app/views/tasks/_completed.rhtml

@@ -0,0 +1,13 @@
+<table class="input">
+  <tr>
+    <th/>
+    <th align="left"><%=l :resolution %></th>
+    <th><%=l :task %></th>
+    <th></th>
+    <th><%=l(:done) if (@period && @period.track_work?) || @completed_tasks.find {|t| t.track_times?} %></th>
+  </tr>
+<% for task in @completed_tasks %>
+  <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => false, :highlight_task => task == @selected_task } %>
+  <% i += 1 %>
+<% end %>
+</table>

data/app/views/tasks/_task.rhtml

@@ -31,7 +31,7 @@
                 :class => :task_time, :maxlength => 5, :onkeypress => "handleEvent(this, event, #{@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 %>
+            <%= image_detour_to 'hammer.png', l(:start_work), {:controller => 'tasks', :action => :start_work, :id => @task.id}, nil, true %>
           <% end -%>
         <% end %>
       <% end -%>
@@ -64,7 +64,7 @@
             <% end %>
           <% end -%>
           <% 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)%>
+            <%= image_detour_to('checkmark.png', l(:complete), {:controller => 'tasks', :action => :finish, :id => @task}, nil, true)%>
           <% end -%>
         <% 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 @task.period && (not @task.period.passed?) && @task.leaf? %>
           <%=image_detour_to('/images/eraser.png', l(:reopen), {:controller => 'tasks', :action => :reopen, :id => @task}, nil, true) %>
         <% end -%>
       <% end -%>
@@ -88,7 +88,7 @@
 <% 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}),
+      :update => update, :url => options_for_detour({:controller => 'tasks', :action => "move_to", :period_id => @task.period_id, :position => @task.position, :layout => false}),
       :accept => "tasks",
       :loading => "",
       :complete => "",

metadata

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