backlog 0.2.1 → 0.3.0

data/History.txt

@@ -1,3 +1,8 @@
+== 0.3.0 2007-08-02
+
+* Improved workflow
+* Added task list to backlog edit view
+
 == 0.2.1 2007-07-31
 
 * Improved workflow

data/Rakefile

@@ -11,7 +11,7 @@ require 'tasks/rails'
 
 require 'hoe'
 
-Hoe.new("backlog", '0.2.1') do |p|
+Hoe.new("backlog", '0.3.0') do |p|
   p.rubyforge_name = "backlog"
   p.summary = "Application to aid collecting, processing, organizing, reviewing and doing tasks."
   p.description = p.paragraphs_of('README.txt', 0..-1).join("\n\n")

data/app/controllers/application.rb

@@ -67,6 +67,10 @@ class ApplicationController < ActionController::Base
   end
   
   def store_detour(options)
+    if session[:detours] && session[:detours].last == options
+      puts "duplicate detour: #{options}"; STDOUT.flush
+      return
+    end
     puts "adding detour: #{options}"; STDOUT.flush
     session[:detours] ||= []
     session[:detours] << options
@@ -118,8 +122,8 @@ class ApplicationController < ActionController::Base
   end
   
   def populate_layout
-    @period = Period.find(:first, params[:id]) if params[:id]
-    @owner = @period.party if @period
+#    @period = Period.find(:first, params[:id]) if params[:id]
+#    @owner = @period.party if @period
     populate_shortcuts
     
     # TODO (uwe): This does not scale!

data/app/controllers/backlogs_controller.rb

@@ -48,6 +48,10 @@ class BacklogsController < ApplicationController
 
   def edit
     @backlog = Backlog.find(params[:id])
+    @tasks = @backlog.tasks.sort do |t1, t2|
+      (t1.position && (t2.position ? t1.position <=> t2.position : -1)) ||
+        (t2.position ? 1 : t1.finished_at <=> t2.finished_at)
+    end
   end
 
   def update

data/app/controllers/tasks_controller.rb

@@ -31,6 +31,8 @@ class TasksController < ApplicationController
       redirect_to :controller => 'periods', :action => 'show', :id => @task.period, :task => @task.id
     else
       populate_layout
+      @backlogs = Backlog.find(:all, :order => 'name')
+      @periods = Period.find_active_or_future
       render :action => 'new'
     end
   end
@@ -122,7 +124,7 @@ class TasksController < ApplicationController
       period = params[:period_id] && Period.find(params[:period_id])
       if period && period.active_or_future?
         next_task = task.higher_item ? task.higher_item : task.lower_item ? task.lower_item : task
-        task.move_to_period period, user
+        task.move_to_period period
         if with_layout
           back_or_redirect_to :controller => 'periods', :action => :show, :id => next_task.period, :task_id => next_task.id
         else
@@ -151,13 +153,13 @@ class TasksController < ApplicationController
   def abort
     task = Task.find params[:id]
     task.abort(user)
-    redirect_to(:controller => "periods", :action => "show", :id => task.period)
+    back_or_redirect_to(:controller => "periods", :action => "show", :id => task.period)
   end
   
   def reopen
     task = Task.find(params[:id])
     task.reopen(user)
-    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 start_work

data/app/helpers/application_helper.rb

@@ -12,20 +12,19 @@ module ApplicationHelper
   end
 
   def detour_to(title, options, html_options = nil)
-    #link_to title, options.update({:detour => {:controller => @controller.controller_name, :action => @controller.action_name, :id => params[:id]}}), html_options
     link_to title, options.update({:detour => params.reject {|k, v| [:detour, :return_from_detour].include? k.to_sym}}), html_options
   end
   
-  def image_detour_to(image_source, title, image_options, options )
+  def image_detour_to(image_source, title, url_options, image_options = nil, post = false)
     image_options ||= {:class => 'image-submit'}
     image_options.update :alt => title, :title => title
-    detour_to image_tag(image_source, image_options), options
+    detour_to image_tag(image_source, image_options), url_options, :method => post ? :post : :get
   end
   
   def back_or_link_to(title, options)
     if session[:detours]
-      options = session[:detours].last.update({:return_from_detour => true})
-puts "linked detour: #{options}"
+      options = {:return_from_detour => true}.update(session[:detours].last)
+puts "linked return from detour: #{options}"
     end
     link_to title, options
   end

data/app/models/party.rb

@@ -9,4 +9,8 @@ class Party < ActiveRecord::Base
     self.class.name.downcase.pluralize
   end
   
+  def icon
+    to_sym.to_s + '.png'
+  end
+  
 end

data/app/models/task.rb

@@ -17,6 +17,9 @@ class Task < ActiveRecord::Base
   validates_size_of :customer, :maximum => 64, :if => :customer
   validates_presence_of :backlog_id, :if => Proc.new { |task| task.parent_id.nil? }
   validates_presence_of :parent_id, :if => Proc.new { |task| task.backlog_id.nil? }
+  #validates_absence_of :position, :if => :finished_at
+  #validates_absence_of :finished_at, :if => :position
+  validates_presence_of :resolution, :if => :finished_at
   validates_uniqueness_of :description, :scope => :period_id
   validates_uniqueness_of :position, :scope => :period_id, :allow_nil => true
   
@@ -24,7 +27,7 @@ class Task < ActiveRecord::Base
     unless (self.period_id || self.parent_id) && !(self.period_id && self.parent_id)
       errors.add :parent_id, "A task may have either period or parent task set, not both."
     end
-    if new_record? && self.period.passed?
+    if new_record? && self.period && self.period.passed?
       errors.add :period_id, "You may not add a task to a past period."
     end
   end
@@ -49,7 +52,7 @@ class Task < ActiveRecord::Base
     estimates.last ? estimates.last.todo : initial_estimate
   end
   
-  def estimate(new_todo, user)
+  def estimate(new_todo)
     return unless new_todo && new_todo != ''
     previous_estimate = estimates.last
     new_estimate = Estimate.new
@@ -61,13 +64,13 @@ class Task < ActiveRecord::Base
     now = Time.now
     if previous_estimate && (now < previous_estimate.created_at || now.strftime('%Y-%m-%DT%H:%M:%S') == previous_estimate.created_at.strftime('%Y-%m-%DT%H:%M:%S'))
       previous_estimate.todo = new_todo
-      previous_estimate.user = user
+      previous_estimate.user = current_user
       previous_estimate.save!
     else
       new_estimate.task_id = self.id
       new_estimate.todo = new_todo
       new_estimate.created_at = now
-      new_estimate.user = user
+      new_estimate.user = current_user
       new_estimate.save!
       estimates << new_estimate
     end
@@ -94,13 +97,13 @@ class Task < ActiveRecord::Base
     total
   end
   
-  def open(user)
+  def open
     if finished_at
       self.finished_at = nil
       self.resolution = nil
-      estimate(initial_estimate, user)
+      estimate(initial_estimate)
       insert_at 1
-      parent.open(user) if parent
+      parent.open if parent
     end
   end
 
@@ -114,7 +117,7 @@ class Task < ActiveRecord::Base
     end
   end
   
-  def move_to_period(period, user)
+  def move_to_period(period)
     raise "Period missing" unless period
     raise "Cannot move finished tasks" unless active?
     
@@ -122,26 +125,26 @@ class Task < ActiveRecord::Base
     new_task =   Task.find_by_period_id_and_id(period.id, ancestor_id)
     new_task ||= Task.find_by_period_id_and_previous_task_id(period.id, ancestor_id)
     new_task ||= Task.new
-    new_task.open(user)
+    new_task.open
     new_task.previous_task_id = self.previous_task_id || self.id
-    new_task.backlog = backlog
+    new_task.backlog = root_task.backlog
     new_task.period = period
     new_task.description = self.description
     new_task.save!
-    new_task.estimate(self.todo, user)
+    new_task.estimate(self.todo)
     new_task.move_to_top
-    new_task.estimate(self.todo, user)
-    self.finish(new_task.period.party == self.period.party ? Task::POSTPONED : Task::MOVED, true, user)
+    new_task.estimate(self.todo)
+    self.finish(new_task.period.party == self.period.party ? Task::POSTPONED : Task::MOVED, true, current_user)
   end
   
   def finish(resolution, save_work, user)
     unless finished_at || work_started?
-      remove_from_list
       self.finished_at = Time.now
       self.resolution = resolution
       self.position = nil
       save!
-      estimate(0, user) if save_work
+      remove_from_list
+      estimate(0) if save_work
       parent.check_finished(self.finished_at, resolution, save_work, user) if parent
     end
   end

data/app/views/backlogs/edit.rhtml

@@ -7,3 +7,20 @@
   <%= back_or_link_to l(:back), :action => 'show', :id => @backlog %>
 <% end %>
 </div>
+
+    <div id="maincontent">
+      <div class="mainblock">
+        <div class="btitle">
+          <h4><%=l :tasks%></h4>
+        </div>
+        
+        <table>
+          <%= render :partial => '/tasks/backlog_header', :locals => {:backlog => @backlog} %>
+          <% i = 0 %>
+        <% for @task in @tasks %>
+          <%= render :partial => '/tasks/task/', :locals => {:task => @task, :i => i += 1, :active => true, :highlight => false} %>
+        <% end %>
+        </table>
+      </div>
+
+    </div>

data/app/views/periods/_form.rhtml

@@ -10,7 +10,7 @@
   <%= hidden_field 'period', 'party_id' %><%=detour_to h(@period.party.name), :controller => @period.party.type.name.downcase.pluralize, :action => :edit, :id => @period.party%>
 <% end %>
 <% if @period.party %>
-  <%=image_detour_to(@period.party.to_sym.to_s + '.png', "#{l(@period.party.to_sym)} #{@period.party.name}", nil, :controller => @period.party.to_s, :action => :edit, :id => @period.party) %>
+  <%=image_detour_to(@period.party.icon, "#{l(@period.party.to_sym)} #{@period.party.name}", :controller => @period.party.controller, :action => :edit, :id => @period.party) %>
 <% end %>
 </p>
 

data/app/views/periods/edit.rhtml

@@ -4,7 +4,7 @@
 <% form_tag :action => 'update', :id => @period do %>
   <%= render :partial => 'form' %>
   <%= submit_tag l(:save) %>
+  <%= link_to l(:back), :action => 'show', :id => @period %>
 <% end %>
 
-<%= link_to l(:back), :action => 'show', :id => @period %>
 </div>

data/app/views/tasks/_backlog_header.rhtml

@@ -2,12 +2,11 @@
 
   <tr valign="top">
     <td>
-      <%= image_detour_to('add.png', l(:new_task), nil, :controller => 'tasks', :action => :new, :task => {:backlog_id => @backlog.id, :period_id => @period.id})%>
+      <%= image_detour_to('add.png', l(:new_task), :controller => 'tasks', :action => :new, :task => {:backlog_id => @backlog.id, :period_id => @period && @period.id})%>
     </td>
-    <td colspan="4" valign="top">
+    <td colspan="4" style="vertical-align: middle">
     <h5>
-      <%=h backlog.name %>
-      <%=image_detour_to("clipboard.png", l(:backlog), nil, :controller => 'backlogs', :action => :edit, :id => @backlog) %>
+      <%=detour_to(h(backlog.name), :controller => 'backlogs', :action => :edit, :id => @backlog) %>
       </h5>
     </td>
     <td width="*"/>
@@ -16,9 +15,7 @@
     <th/>
     <th align="center">#</th>
     <th><%=l :task %></th>
-    <th><%=l :start if @period.track_times? && @period.active? %></th>
-    <% if @period.track_work? -%>
-    <th><%=l :done %></th>
-    <% end %>
+    <th><%=l :start if @backlog.track_times? && @tasks.find {|t|t.period && t.period.active?} %></th>
+    <th><%=l :done if @backlog.track_done? %></th>
     <th width="*"><% l :todo if @backlog.track_todo? %></th>
   </tr>

data/app/views/tasks/_form.rhtml

@@ -10,7 +10,7 @@
   <%= hidden_field 'task', 'backlog_id' %><%=h @task.backlog.name%>
 <% end %>
 <% if @task.backlog %>
-  <%=image_detour_to('clipboard.png', "#{l(:backlog)} #{@task.backlog.name}", {:class => 'image-submit', :style => 'vertical-align: bottom'}, :controller => 'backlogs', :action => :edit, :id => @task.backlog) %>
+  <%=image_detour_to('clipboard.png', "#{l(:backlog)} #{@task.backlog.name}", {:controller => 'backlogs', :action => :edit, :id => @task.backlog}, {:class => 'image-submit', :style => 'vertical-align: bottom'}) %>
 <% end %>
 </p>
 
@@ -18,7 +18,7 @@
 <p><label for="task_period_id"><%=l :period%></label><br/>
 <%= select 'task', 'period_id', [['', '']] + @periods.map{|p| [p.name, p.id]}, {}, :onchange => "form.action = '#{url_for}'; form.submit();" %>
 <% if @task.period %>
-<%=image_detour_to(@task.period.party.to_sym.to_s + '.png', "#{l(@task.period.party.to_sym)} #{@task.period.party.name}", nil, :controller => @task.period.party.to_s, :action => :edit, :id => @task.period.party) %>
+  <%=image_detour_to('period.png', "#{l :period} #{@task.period.name}", :controller => 'periods', :action => :edit, :id => @task.period) %>
 <% end %>
 <%=detour_to l(:new_period), :controller => 'periods', :action => :new %>
 </p>

data/app/views/tasks/_task.rhtml

@@ -8,7 +8,7 @@
     <% end %>
     </td>
     <td align="left" valign="top" width="1" nowrap="true">
-      <%= @task.position if @task.depth == 0 %>
+      <%=detour_to @task.position.to_s, :controller => 'tasks', :action => :edit, :id => @task.id if @task.depth == 0 %>
       <%= ("&nbsp;" * @task.depth * 4) if @task.depth > 0 %>
       <%= l(@task.resolution.downcase) if @task.finished_at %>
       <%= "-" if @task.children.size > 0 %>
@@ -72,12 +72,12 @@
         <% if @task.active? %>
           <% if @task.loggable? %>
             <% unless @task.work_started? %>
-              <%= image_button_to('arrow_right.png', l(:move_to_next_period), :controller => 'tasks', :action => :move_to_next_period, :id => @task)%>
-              <%= image_button_to('ernes_stop.png', l(:abort), :controller => 'tasks', :action => :abort, :id => @task)%>
+              <%= image_detour_to('arrow_right.png', l(:move_to_next_period), {:controller => 'tasks', :action => :move_to_next_period, :id => @task}, nil, true)%>
+              <%= 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? %>
-          <%=image_button_to('/images/eraser.png', l(:reopen), :controller => 'tasks', :action => :reopen, :id => @task) %>
+          <%=image_detour_to('/images/eraser.png', l(:reopen), {:controller => 'tasks', :action => :reopen, :id => @task}, nil, true) %>
         <% end -%>
       <% end -%>
     </td>

data/app/views/tasks/edit.rhtml

@@ -1,7 +1,5 @@
 <div id="spotlight">
-<h1>Editing task</h1>
-
-<%=h @task.inspect%>
+<% @page_title = "#{l :editing} #{l :task}" %>
 
 <% form_tag :action => 'update', :id => @task do %>
   <%= render :partial => 'form' %>

data/app/views/works/_buttons.rhtml

@@ -1,3 +1,3 @@
-        <%=image_detour_to('hammer.png', l(:weekly_work_sheet), nil, :controller => 'works', :action => :weekly_work_sheet)%>
+        <%=image_detour_to('hammer.png', l(:weekly_work_sheet), :controller => 'works', :action => :weekly_work_sheet)%>
         <%=link_to(image_tag(url_for("hammer.png"), :alt => l(:daily_work_sheet), :title => l(:daily_work_sheet), :class => 'image-submit'), :controller => 'works', :action => :daily_work_sheet)%>
         <%=link_to(image_tag(url_for("hammer.png"), :alt => l(:edit_works), :title => l(:edit_works), :class => 'image-submit'), :controller => 'periods', :action => 'list_work', :id => (@period ? @period.id : (@backlog && @backlog.periods.first ? @backlog.periods.first.id : nil)))%>

data/app/views/works/daily_work_sheet.rhtml

@@ -20,7 +20,7 @@
   <% day_total += @work.hours if @work %>
   <tr>
     <td>
-      <%=image_detour_to('period.png', l(:period), nil, :controller => 'periods', :action => :show, :id => @work.task.period) %>
+      <%=image_detour_to('period.png', l(:period), :controller => 'periods', :action => :show, :id => @work.task.period) %>
     </td>
     <td>
       <form>

data/lang/en.yaml

@@ -72,6 +72,7 @@ started_at: Started at
 started_tasks: Started tasks
 sunday: Sunday
 task: Task
+tasks: Tasks
 thursday: Thursday
 todo: Todo
 totals: Totals

data/lang/no.yaml

@@ -71,6 +71,7 @@ start_work: Start arbeid
 started_at: Start tid
 sunday: Søndag
 task: Oppgave
+tasks: Oppgaver
 thursday: Torsdag
 todo: Igjen
 totals: Totalt

data/test/fixtures/tasks.yml

@@ -5,10 +5,12 @@ first:
   backlog_id: 1
   period_id: 1
   description: first task
+  position: 1
 another:
   id: 2
   created_at: 2007-06-12
   backlog_id: 1
   period_id: 2
   description: second task
+  position: 2
   

data/test/functional/tasks_controller_test.rb

@@ -56,6 +56,9 @@ class TasksControllerTest < Test::Unit::TestCase
 
     post :create, :task => {:description => 'an important task', :backlog_id => '2', :period_id => '2'}
 
+    task = assigns(:task)
+    assert_equal [], task.errors.full_messages
+
     assert_response :redirect
     assert_redirected_to :controller => 'periods', :action => 'show', :id => Period.find(2)
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2007-07-31 00:00:00 +02:00
+  version: 0.3.0
+date: 2007-08-02 00:00:00 +02:00
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 require_paths: 
 - lib
@@ -226,6 +226,7 @@ files:
 - config/environments/datek_production.rb
 - LICENSE_LOCALIZATION
 - README.txt
+- doc
 - Manifest.txt
 - vendor
 - vendor/plugins