backlog 0.3.9 → 0.4.0

data/History.txt

@@ -1,3 +1,11 @@
+== 0.4.0 2007-08-06
+
+* Added tasks to backlog edit view
+* Started simplifying task ordering.  Now ordering simply has period_id as scope.
+* Improved and fixed bugs in workflow
+* Fixed typos in stylesheet
+* KNOWN BUG: Ordering for tasks in backlog does not work properly
+
 == 0.3.9 2007-08-03
 
 * Fixed bug in moving task between periods

data/README.txt

@@ -28,8 +28,10 @@ A timekeeping module is also included to track time spent on the different tasks
 
 === Configuration
 
-You can set configuration parameters for abcklog using the /etc/backlog.conf file.
+You can set configuration parameters for backlog using the /etc/backlog.conf file.
 The format is YAML.
 Currently only port number is settable.
 
+Example:
+
 port: 3000

data/app/controllers/application.rb

@@ -122,8 +122,7 @@ class ApplicationController < ActionController::Base
   end
   
   def populate_layout
-#    @period = Period.find(:first, params[:id]) if params[:id]
-#    @owner = @period.party if @period
+    return true if request.path_parameters[:action] =~ /_no_layout$/
     populate_shortcuts
     
     # TODO (uwe): This does not scale!
@@ -161,26 +160,6 @@ class ApplicationController < ActionController::Base
       end
     end
     
-    #  def populate_layout
-    #    populate_shortcuts
-    #    @groups = Group.find(:all, :order => 'name')
-    #    @backlogs = Backlog.find(:all, :order => 'name')
-    #    @sidebars = @backlogs.map do |backlog|
-    #      content = '<ul>'
-    #      periods = backlog.tasks.map {|task| task.period}.uniq
-    #      periods.select {|period| period.in_list? }[0...5].map do |period|
-    #        "<li><a href=\"#{url_for(:controller => 'periods', :action => :show, :id => period)}\">#{period.name}</a></li>"
-    #        end.each do |period_link|
-    #          content << "#{period_link}"
-    #        end
-    #        content << '</ul>'
-    #        { :title => "#{backlog.name}",
-    #          :options => {:controller => 'backlogs', :action => :show, :id => backlog},
-    #          :content => content
-    #        }
-    #      end
-    #    end
-    
     private
     
     def user_id

data/app/controllers/backlogs_controller.rb

@@ -48,10 +48,21 @@ 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)
+    unplanned_tasks = @backlog.tasks.select {|t| t.period.nil? && t.finished_at.nil?}.sort_by {|t| t.position}
+    planned_tasks = @backlog.tasks.select {|t| t.period && t.finished_at.nil?}.sort do |t1, t2|
+      if (cmp_period = t1.period.end_on <=> t2.period.end_on) != 0
+        cmp_period
+      else
+        t1.position <=> t2.position
+      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}
+  end
+
+  def edit_no_layout
+    edit
+    render :partial => 'tasks'
   end
 
   def update

data/app/controllers/periods_controller.rb

@@ -30,7 +30,7 @@ class PeriodsController < ApplicationController
     @completed_tasks = @period.completed_tasks.reverse
   end
   
-  def show_nolayout
+  def show_no_layout
     show
     render :partial => 'show_active', :layout => false, :locals => {:i => 0}
   end

data/app/controllers/tasks_controller.rb

@@ -42,6 +42,7 @@ class TasksController < ApplicationController
   
   def edit
     @task = Task.find(params[:id])
+    @task.period_id = params[:task][:period_id] if params[:task] && params[:task][:period_id]
     @periods = Period.find_active_or_future
     @backlogs = Backlog.find(:all, :order => 'name')
   end
@@ -117,9 +118,9 @@ class TasksController < ApplicationController
   end
   
   def move_to
-    task = Task.find(params[:id])
+    task = Task.find(params[:id][5..-1])
     task.insert_at params[:position]
-    redirect_to :controller => 'periods', :action => :show_nolayout, :id => task.period, :task => task.id
+    back_or_redirect_to :controller => 'periods', :action => :show_nolayout, :id => task.period, :task => task.id
   end
   
   def move_to_period(with_layout = false)
@@ -144,8 +145,12 @@ class TasksController < ApplicationController
   
   def move_to_next_period
     task = Task.find(params[:id])
-    params[:period_id] = task.period.lower_item && task.period.lower_item.id
-    move_to_period(true)
+    if task.period
+      params[:period_id] = task.period.lower_item && task.period.lower_item.id
+      move_to_period(true)
+    else
+      detour_to :action => :edit, :id => task
+    end
   end
   
   def finish

data/app/helpers/application_helper.rb

@@ -12,7 +12,13 @@ module ApplicationHelper
   end
 
   def detour_to(title, options, html_options = nil)
-    link_to title, options.update({:detour => params.reject {|k, v| [:detour, :return_from_detour].include? k.to_sym}}), html_options
+    link_to title, options_for_detour(options), html_options
+  end
+  
+  def options_for_detour(options)
+    detour_options = {:detour => params.reject {|k, v| [:detour, :return_from_detour].include? k.to_sym}}.update(options)
+    detour_options[:detour].update({:action => params[:action] + '_no_layout'}) if (not options[:layout].nil?) && params[:action] !~ /_no_layout$/
+    detour_options
   end
   
   def image_detour_to(image_source, title, url_options, image_options = nil, post = false)

data/app/models/task.rb

@@ -8,7 +8,7 @@ class Task < ActiveRecord::Base
   
   belongs_to :backlog
   belongs_to :period
-  acts_as_list :scope => '#{period_id ? "period_id = #{period_id}" : parent_id ? "parent_id = #{parent_id}" : "backlog_id = #{backlog_id}"} AND finished_at IS NULL'
+  acts_as_list :scope => :period_id
   has_many :estimates, :order => 'created_at', :dependent => :destroy
   has_many :works, :order => 'completed_at', :dependent => :destroy
   acts_as_tree :order => 'position'
@@ -18,7 +18,7 @@ class Task < ActiveRecord::Base
   #validates_absence_of :position, :if => :finished_at
   #validates_absence_of :finished_at, :if => :position
   validates_presence_of :resolution, :if => :finished_at
-  validates_presence_of :description
+  validates_presence_of :description, :if => :backlog_id
 
   validates_size_of :description, :maximum => 80, :if => :description
   validates_size_of :customer, :maximum => 64, :if => :customer

data/app/views/backlogs/_form.rhtml

@@ -1,5 +1,3 @@
-<%= error_messages_for 'backlog' %>
-
 <!--[form:task]-->
 <p>
 <label for="backlog_name"><%=l :name%></label><br/>

data/app/views/backlogs/_tasks.rhtml

@@ -0,0 +1,13 @@
+  <div class="mainblock">
+    <div class="btitle">
+      <h4><%=l :tasks%></h4>
+    </div>
+        
+    <table>
+      <%= render :partial => '/tasks/backlog_header', :locals => {:backlog => @backlog, :track_times => tasks.find {|t|t.period && t.period.active?}} %>
+      <% i = 0 %>
+      <% for @task in tasks %>
+        <%= render :partial => '/tasks/task/', :locals => {:task => @task, :i => i += 1, :active => true, :highlight => false, :update => :maincontent} %>
+      <% end %>
+    </table>
+  </div>

data/app/views/backlogs/edit.rhtml

@@ -1,26 +1,13 @@
 <% @page_title = "#{l(:editing)} #{l(:backlog)}" %>
 
 <div id="spotlight">
-<% form_tag :action => 'update', :id => @backlog do %>
-  <%= render :partial => 'form' %>
-  <%= submit_tag l(:save) %>
-  <%= back_or_link_to l(:back), :action => 'show', :id => @backlog %>
-<% end %>
+  <% form_tag :action => 'update', :id => @backlog do %>
+    <%= render :partial => 'form' %>
+    <%= submit_tag l(:save) %>
+    <%= 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>
+<div id="maincontent">
+	<%=render :partial => 'tasks', :locals => {:tasks => @tasks}%>
+</div>

data/app/views/periods/_show_active.rhtml

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

data/app/views/tasks/_backlog_header.rhtml

@@ -15,7 +15,7 @@
     <th/>
     <th align="center">#</th>
     <th><%=l :task %></th>
-    <th><%=l :start if @backlog.track_times? && @tasks.find {|t|t.period && t.period.active?} %></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,7 +1,7 @@
 <% @task = task %>
-  <tr valign="top" <%= 'class="highlight"' if highlight %>>
+  <tr valign="top" <%='class="highlight"' if highlight %>>
     <td width="1">
-    <% if @task.enable_subtasks? && @task.period && @task.period.active_or_future? && active %>
+    <% if @task.enable_subtasks? && active && (@task.period.nil? || @task.period.active_or_future?) %>
       <% form_tag({:controller => 'tasks', :action => :specify, :id => @task}) do %>
         <%= image_button_to('add.png', l(:specify), :controller => 'tasks', :action => :specify, :id => @task.id)%>
       <% end %>
@@ -13,12 +13,14 @@
       <%= l(@task.resolution.downcase) if @task.finished_at %>
       <%= "-" if @task.children.size > 0 %>
     </td>
-    <td id="<%=@task.id%>" <%if active && @task.period && @task.period.active_or_future?%>class="tasks" style=cursor:move;"<%end%>>
-      <% 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 -%>
+    <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?)%>>
+      		<% 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 -%>
+		</div>
     </td>
     <td align="right" nowrap="true" width="1">
       <% if active && @task.loggable? -%>
@@ -83,14 +85,14 @@
     </td>
   </tr>
 
-<% if active && @task.period && @task.period.active_or_future? %>
-<%= draggable_element "#{@task.id}", :revert => true, :constraint => "'vertical'" %>
-<%= drop_receiving_element "#{@task.id}",
-      :update => "spotlight", :url => {:controller => 'tasks', :action => "move_to", :position => @task.position},
+<% if active && (@task.period.nil? || @task.period.active_or_future?) %>
+<%= 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}),
       :accept => "tasks",
       :loading => "",
       :complete => "",
-      :hoverclass => 'highlight'
+      :hoverclass => 'dropzone-hover'
 %>
 <% end %>
 

data/app/views/tasks/edit.rhtml

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

data/lang/en.yaml

@@ -32,6 +32,7 @@ groups: Groups
 home: Home
 hours: Hours
 invoice: Invoice
+invoice_code: Invoice Code
 invoice_short: Inv.
 left: Left
 listing_works: Recorded work

data/lang/no.yaml

@@ -32,6 +32,7 @@ groups: Grupper
 home: Hjem
 hours: Timer
 invoice: Fakturerbart
+invoice_code: Faktureringskode
 invoice_short: Fakt
 left: Venstre
 listing_works: Registrert arbeid

data/public/stylesheets/backlog.css

@@ -1,6 +1,6 @@
 .task_description { width: 300px; }
 .task_hours { width: 32px; }
-.task_time { width: 40px; border: 1 }
+.task_time { width: 40px; border: 1px solid black }
 .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;}
@@ -8,6 +8,9 @@ table.input td {vertical-align: top; margin: 0; border: 0; padding: 0 1px;}
 #spotlight div.btitle img.image-submit {float: right;}
 #spotlight div.btitle h4 {margin-top: 6px;}
 .highlight {background: yellow;}
+.tasks {cursor: move;}
+.dragable-hover {background: yellow; border: 1px solid black;}
+.dropzone-hover {background: yellow; border: 1px solid black;}
 th.hours {text-align: right;}
 
 .fieldWithErrors {
@@ -56,7 +59,7 @@ div.progressBar {
 
 div.progressBar div.border {
   background-color: #fff;
-  border: 1px solid grey;
+  border: 1px solid gray;
   width: 100%;
 }
 

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.3.9
-date: 2007-08-03 00:00:00 +02:00
+  version: 0.4.0
+date: 2007-08-06 00:00:00 +02:00
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 require_paths: 
 - lib
 email: ryand-ruby@zenspider.com
 homepage: http://www.zenspider.com/ZSS/Products/backlog/
 rubyforge_project: backlog
-description: "== Backlog  Welcome to Backlog!  Backlog is a tool to help you collect and organize all your tasks, wether you are a single persion or a small or large group.  A timekeeping module is also included to track time spent on the different tasks.  === Backlog is not meant to be  * an issue tracker with customer communication.  === Installation  * Install ruby * Install RubyGems * Install PostgreSQL * run <tt>sudo gem install backlog -y</tt> * run <tt>sudo backlog setup_linux</tt> * run <tt>sudo backlog start</tt>  === Updates  * run <tt>sudo backlog stop</tt> * run <tt>sudo gem update -y</tt> * run <tt>sudo backlog start</tt>  === Configuration  You can set configuration parameters for abcklog using the /etc/backlog.conf file. The format is YAML. Currently only port number is settable.  port: 3000"
+description: "== Backlog  Welcome to Backlog!  Backlog is a tool to help you collect and organize all your tasks, wether you are a single persion or a small or large group.  A timekeeping module is also included to track time spent on the different tasks.  === Backlog is not meant to be  * an issue tracker with customer communication.  === Installation  * Install ruby * Install RubyGems * Install PostgreSQL * run <tt>sudo gem install backlog -y</tt> * run <tt>sudo backlog setup_linux</tt> * run <tt>sudo backlog start</tt>  === Updates  * run <tt>sudo backlog stop</tt> * run <tt>sudo gem update -y</tt> * run <tt>sudo backlog start</tt>  === Configuration  You can set configuration parameters for backlog using the /etc/backlog.conf file. The format is YAML. Currently only port number is settable.  Example:  port: 3000"
 autorequire: 
 default_executable: 
 bindir: bin
@@ -223,6 +223,7 @@ files:
 - config/environments/datek_production.rb
 - LICENSE_LOCALIZATION
 - README.txt
+- doc
 - Manifest.txt
 - vendor
 - vendor/plugins
@@ -1710,6 +1711,7 @@ files:
 - app/views/backlogs/_form.rhtml
 - app/views/backlogs/new.rhtml
 - app/views/backlogs/edit.rhtml
+- app/views/backlogs/_tasks.rhtml
 - app/views/estimates
 - app/views/groups
 - app/views/groups/list.rhtml