backlog 0.1.2 → 0.2.0

data/History.txt

@@ -1,3 +1,12 @@
+== 0.2.0 2007-07-31
+
+* Improved workflow
+
+== 0.1.2 2007-07-29
+
+* Improved gem generation
+* Fixed bugs in user registration and initial setup
+
 == 0.1.1 2007-07-29
 
 * Improved gem generation

data/Rakefile

@@ -11,7 +11,7 @@ require 'tasks/rails'
 
 require 'hoe'
 
-Hoe.new("backlog", '0.1.2') do |p|
+Hoe.new("backlog", '0.2.0') do |p|
   p.rubyforge_name = "backlog"
   p.description = p.paragraphs_of('README.txt', 0..-1).join("\n\n")
   p.remote_rdoc_dir = '' # Release to root

data/app/controllers/application.rb

@@ -12,8 +12,8 @@ class ApplicationController < ActionController::Base
   layout :determine_layout
   helper :user
   before_filter :store_detour_from_params
-  before_filter :populate_layout
   before_filter :authenticate_user
+  before_filter :populate_layout
   
   def self.in_place_edit_for(object, attribute, options = {})
     define_method("set_#{object}_#{attribute}") do
@@ -73,8 +73,8 @@ class ApplicationController < ActionController::Base
   end
   
   def store_detour_from_params
-    if params[:return_controller] && params[:return_action]
-      store_detour(:controller => params[:return_controller], :action => params[:return_action], :id => params[:return_id])
+    if params[:detour]
+      store_detour(params[:detour])
     end
     if params[:return_from_detour] && session[:detours]
       pop_detour
@@ -107,6 +107,7 @@ class ApplicationController < ActionController::Base
     {:key => 'Alt-N',          :function => :new_task,    :options => {:controller => 'tasks', :action => 'new', :period_id => (@period ? @period.id : (@backlog && @backlog.periods.first ? @backlog.periods.first.id : nil))}},
     {:key => 'Alt-Shift-N',    :function => :new_period, :options => {:controller => 'periods', :action => 'new'}},
     {:key => 'Alt-Ctrl-N',     :function => :new_backlog, :options => {:controller => 'backlogs', :action => 'new'}},
+    {:key => 'Alt-Ctrl-G',     :function => :new_group, :options => {:controller => 'groups', :action => :new}},
     {:key => "Alt-#{l :up}",   :function => :up},
     {:key => "Alt-#{l :down}", :function => :down},
     {:key => "Alt-Shift-#{l :left}", :function => :move_to_top},
@@ -122,7 +123,7 @@ class ApplicationController < ActionController::Base
     populate_shortcuts
     
     # TODO (uwe): This does not scale!
-    periods = Period.find(:all).select {|period| period.active_or_future?(true)}
+    periods = Period.find(:all).select {|period| period.active_or_future?(true) && period.party.includes?(user)}
     
     @sidebars = periods.sort_by {|p| p.required_speed}.reverse.map do |period|
       content = '<ul>'
@@ -147,7 +148,7 @@ class ApplicationController < ActionController::Base
       started_tasks = Task.find_started(user)
       if not started_tasks.empty?
         links = started_tasks.map do |task|
-        "<li><a href=\"#{url_for :controller => 'periods', :action => :show, :id => task.period, :task_id => task.id}\">#{task.description}</a></li>"
+        "<li><a href=\"#{url_for :controller => 'tasks', :action => :list_started, :id => task.id}\">#{task.description}</a></li>"
         end
         @sidebars.unshift({ :title   => l(:started_tasks),
           :options => {:controller => 'tasks', :action => :list_started},

data/app/controllers/groups_controller.rb

@@ -20,7 +20,7 @@ class GroupsController < ApplicationController
     @group = Group.new(params[:group])
     if @group.save
       flash[:notice] = 'Group was successfully created.'
-      redirect_to :action => 'list'
+      back_or_redirect_to :action => 'list'
     else
       render :action => 'new'
     end
@@ -30,6 +30,7 @@ class GroupsController < ApplicationController
     @group = Group.find(params[:id])
     @users = User.find(:all)
     @members = @group.users.to_s
+    @groups = Group.find(:all, :order => 'name')
   end
 
   def update

data/app/controllers/periods_controller.rb

@@ -37,8 +37,8 @@ class PeriodsController < ApplicationController
   
   def new
     @period = Period.new
-    if params[:party_id]
-      @period.party_id = params[:party_id]
+    if params[:period] && params[:period][:party_id]
+      @period.party_id = params[:period][:party_id]
       previous = @period.party.periods.last
       if previous
         @period.start_on = previous.end_on + 1
@@ -46,9 +46,8 @@ class PeriodsController < ApplicationController
       else
         @period.start_on = Date.today
       end
-    else
-      @parties = Party.find(:all)
     end
+    @parties = Party.find(:all)
   end
   
   def create

data/app/controllers/tasks_controller.rb

@@ -7,10 +7,12 @@ 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?
   end
   
   def new
+    redirect_to params if request.post?
     @task = Task.new params[:task]
     @task.backlog_id ||= @task.period && @task.period.most_frequent_backlog
     @backlogs = Backlog.find(:all, :order => 'name')
@@ -36,6 +38,7 @@ class TasksController < ApplicationController
   def edit
     @task = Task.find(params[:id])
     @periods = Period.find_active_or_future
+    @backlogs = Backlog.find(:all, :order => 'name')
   end
   
   def update
@@ -126,7 +129,7 @@ class TasksController < ApplicationController
           back_or_redirect_to :controller => 'periods', :action => :show_nolayout, :id => next_task.period, :task_id => next_task.id
         end
       else
-        detour_to :controller => 'periods', :action => :new, :party_id => task.period.party_id, :layout => with_layout && determine_layout
+        detour_to :controller => 'periods', :action => :new, :period => {:party_id => task.period.party_id}, :layout => with_layout && determine_layout
       end
     else
       redirect_to :controller => 'periods', :action => :show, :id => task.period, :task_id => task.id, :layout => with_layout && determine_layout
@@ -167,7 +170,7 @@ class TasksController < ApplicationController
   def end_work
     @task = Task.find(params[:id])
     next_quarter = Time.next_quarter
-    if started_work = @task.started_work(user)
+    if started_work = @task.started_work
       redirect_to({
         :controller => 'works',
         :action => :edit,

data/app/controllers/user_controller.rb

@@ -12,8 +12,7 @@ class UserController < ApplicationController
     @user = User.new(params['user'])
     user = User.authenticate(params['user']['login'], params['user']['password'])
     if user
-      @current_user = user
-      session[:user_id] = user.id
+      self.current_user = user
       flash['notice'] = 'Login succeeded'
       back_or_redirect_to :controller => 'backlogs', :action => :index
     else
@@ -46,7 +45,7 @@ class UserController < ApplicationController
   
   def logout
     session[:user_id] = nil
-    @current_user = nil
+    self.current_user = nil
     cookies.delete :autologin
     redirect_to :action => 'login'
   end
@@ -130,7 +129,7 @@ class UserController < ApplicationController
   end
   
   def delete
-    @user = @current_user || User.find_by_id( session[:user_id] )
+    @user = current_user || User.find_by_id( session[:user_id] )
     begin
       @user.update_attribute( :deleted, true )
       logout
@@ -166,7 +165,8 @@ class UserController < ApplicationController
   
   # Generate a template user for certain actions on get
   def generate_filled_in
-    @user = @current_user || User.find_by_id( session[:user_id] )
+    @user = User.find_by_id(params[:id]) || current_user || User.find_by_id(session[:user_id])
+    @groups = Group.find(:all, :order => 'name')
     case request.method
     when :get
       render

data/app/controllers/works_controller.rb

@@ -57,8 +57,6 @@ class WorksController < ApplicationController
   def update
     @work = Work.find(params[:id])
     
-    @work.task.estimates.new(params[:estimate]).save! if params[:estimate]
-    
     convert_start_time_param
     convert_hours_param
     if @work.update_attributes(params[:work])
@@ -67,6 +65,7 @@ class WorksController < ApplicationController
     else
       render :action => 'edit'
     end
+    @work.task.estimates.new(params[:estimate]).save! if params[:estimate]
   end
   
   def destroy

data/app/helpers/application_helper.rb

@@ -11,8 +11,9 @@ module ApplicationHelper
             :onclick => "form.action='#{url_for(options)}'"
   end
 
-  def detour_to(title, options)
-    link_to title, options.update({:return_controller => @controller.controller_name, :return_action => @controller.action_name, :return_id => params[:id]})
+  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 )

data/app/models/group.rb

@@ -8,4 +8,10 @@ class Group < Party
 
   validates_presence_of :name
   validates_length_of :name, :allow_nil => false, :maximum => 255
+  validates_uniqueness_of :name
+
+  def includes?(user)
+    return users.include?(user)
+  end
+
 end

data/app/models/party.rb

@@ -1,3 +1,8 @@
 class Party < ActiveRecord::Base
   has_many :periods, :order => :position, :dependent => :destroy
+  
+  def to_sym
+    self.class.name.downcase.to_sym
+  end
+  
 end

data/app/models/task.rb

@@ -1,4 +1,6 @@
 class Task < ActiveRecord::Base
+  include UserSystem
+  
   COMPLETED = 'COMPLETED'
   POSTPONED = 'POSTPONED'
   MOVED = 'MOVED'
@@ -132,7 +134,7 @@ class Task < ActiveRecord::Base
   end
   
   def finish(resolution, save_work, user)
-    unless finished_at || work_started?(user)
+    unless finished_at || work_started?
       remove_from_list
       self.finished_at = Time.now
       self.resolution = resolution
@@ -152,7 +154,7 @@ class Task < ActiveRecord::Base
   end
   
   def active?
-    finished_at.nil? || active_children?
+    finished_at.nil? || work_started? || active_children?
   end
   
   def active_children?
@@ -201,10 +203,18 @@ class Task < ActiveRecord::Base
     root_task.backlog.enable_subtasks?
   end
   
+  def enable_users?
+    root_task.backlog.enable_users?
+  end
+  
   def enable_customer?
     root_task.backlog.enable_customer?
   end
   
+  def enable_invoicing?
+    root_task.backlog.enable_invoicing?
+  end
+  
   alias_method :old_period, :period
   def period
     old_period || root_task.old_period
@@ -250,7 +260,7 @@ class Task < ActiveRecord::Base
   end
   
   def start_work(user)
-    return if work_started?(user)
+    return if work_started?
     open(user)
     new_work = works.new
     new_work.started_at = Time.previous_quarter
@@ -277,14 +287,14 @@ class Task < ActiveRecord::Base
     finish(Task::ABORTED, false, user)
   end
   
-  def work_started?(user)
-    !started_work(user).nil? 
+  def work_started?
+    !started_work.nil? 
   end
   
-  def started_work(user)
+  def started_work
     started_works = works.select {|work| work.completed_at.nil?}
-    if user
-      started_by_user = started_works.select {|work| work.user == user}.last
+    if current_user
+      started_by_user = started_works.select {|work| work.user == current_user}.last
       return started_by_user if started_by_user
     end
     started_works.select {|work| work.user.nil?}.last

data/app/models/user.rb

@@ -93,6 +93,10 @@ class User < Party
   def name
     [first_name, last_name].compact.join(' ')
   end
+  
+  def includes?(user)
+    return user == self
+  end
 
   protected
 

data/app/models/work.rb

@@ -2,12 +2,12 @@ class Work < ActiveRecord::Base
   belongs_to :task
   belongs_to :user
   
-  validates_associated :task
+  validates_presence_of :task_id
   validates_presence_of :started_at
-  validates_associated :user_id, :if => :validate_user?
+  validates_presence_of :user_id, :if => :validate_user?
 
   def validate_user?
-    task.backlog.enable_users
+    task.enable_users?
   end
   
   def track_times?
@@ -27,7 +27,7 @@ class Work < ActiveRecord::Base
     works = find(:all, :conditions => "completed_at BETWEEN '#{first.to_time.iso8601}' AND '#{last.to_time.iso8601}'", :order => 'completed_at')
     length = 0
     works_per_day = (0..6).map do |day|
-      works_for_day = works.select {|work| work.completed_at.to_date == (first + day) && (!work.task.backlog.enable_users || (user && work.user_id == user.id)) }
+      works_for_day = works.select {|work| work.completed_at.to_date == (first + day) && (!work.task.enable_users? || (user && work.user_id == user.id)) }
       length = [length, works_for_day.length].max
       works_for_day
     end

data/app/views/backlogs/edit.rhtml

@@ -4,7 +4,6 @@
 <% 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 %>
-
-<%= back_or_link_to l(:back), :action => 'show', :id => @backlog %>
 </div>

data/app/views/groups/edit.rhtml

@@ -16,7 +16,7 @@
 <table>
 <% for @user in @users %>
   <tr>
-    <td><%=h @user.name%></td>
+    <td><%=link_to h(@user.name), :controller => 'user', :action => :edit, :id => @user %></td>
     <td>
       <% form_for :group, @group, :url => {:action => :set_member, :id => @group, :user_id => @user.id} do %>
         <%=check_box_tag :value, true, @group.users.include?(@user), :onchange => "form.submit()" %></td>
@@ -29,3 +29,19 @@
 
 </div>
 
+<div id="rfeature">
+  <div class="btitle">
+    <h4><%=l :groups %></h4>
+  </div>
+
+<table>
+<% for @group in @groups %>
+  <tr>
+    <td>
+      <%=link_to @group.name, :action => :edit, :id => @group%>
+  </tr>
+<% end %>
+</table>
+
+</div>
+

data/app/views/groups/new.rhtml

@@ -1,8 +1,7 @@
-<h1>New group</h1>
+<% @page_title = l :new_group %>
 
 <% form_tag :action => 'create' do %>
   <%= render :partial => 'form' %>
-  <%= submit_tag "Create" %>
+  <%= submit_tag l(:save) %>
+  <%= back_or_link_to l(:back), :action => 'list' %>
 <% end %>
-
-<%= link_to 'Back', :action => 'list' %>

data/app/views/layouts/mwrt002.rhtml

@@ -54,7 +54,7 @@ function handlePageEvent(event) {
       <table>
   <% @shortcuts.each_with_index do |shortcut, index| %>
     <% if shortcut[:options] %>
-        <tr><td valign="top"><%= shortcut[:key]%></td><td><%= link_to l(shortcut[:function]), shortcut[:options], :id => shortcut[:function], :tabindex => index+100 %></td></tr>
+        <tr><td valign="top"><%= shortcut[:key]%></td><td><%=detour_to l(shortcut[:function]), shortcut[:options], :id => shortcut[:function], :tabindex => index+100 %></td></tr>
     <% else %>
         <tr><td valign="top"><%= shortcut[:key]%></td><td><%=l shortcut[:function] %></td></tr>
     <% end %>

data/app/views/periods/_form.rhtml

@@ -1,12 +1,12 @@
 <%= error_messages_for 'period' %>
 
 <!--[form:period]-->
-<% if @period.party %>
+<% if @period.new_record? %>
+<p><label for="period_party_id"><%=l :group%>/<%=l :user%></label><br/>
+<%= select 'period', 'party_id', [['', '']] + @parties.map{|party| [party.name, party.id]}, {}, :onchange => "form.action = '#{url_for :action => :new}'; form.submit();" %></p>
+<% else %>
 <p><label for="period_party_id"><%=l @period.party.class.name.downcase.to_s%></label>:
 <%= hidden_field 'period', 'party_id' %><%=detour_to h(@period.party.name), :controller => @period.party.type.name.downcase.pluralize, :action => :edit, :id => @period.party%></p>
-<% else %>
-<p><label for="period_party_id"><%=l :group%>/<%=l :user%></label><br/>
-<%= select 'period', 'party_id', @parties.map{|party| [party.name, party.id]} %></p>
 <% end %>
 
 <%= hidden_field 'period', 'position' %>

data/app/views/periods/_show_active.rhtml

@@ -31,7 +31,7 @@ function handleEvent(field, event, id) {
 //-->
 </script>
 
-<% if @tasks and not @tasks.empty? %>
+<% if @tasks and not @tasks.empty?%>
 <table class="input">
 <% current_backlog = nil %>
 <% for task in @tasks %>
@@ -40,7 +40,7 @@ function handleEvent(field, event, id) {
     <%=render :partial => '/tasks/backlog_header', :locals => { :backlog => task.backlog } %>
     <% current_backlog = task.backlog %>
   <% end %>
-  <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => true } %>
+  <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => true, :highlight => task == @selected_task } %>
   <% i += 1 %>
 <% end %>
 </table>

data/app/views/periods/_title.rhtml

@@ -2,7 +2,9 @@
         <%= render :partial => '/works/buttons'%>
         <%=if @period.lower_item then link_to(image_tag(url_for("arrow_right.png"), :alt => "#{l :next} #{l :period}", :title => "#{l :next} #{l :period}", :class => 'image-submit'), :controller => 'periods', :action => :show, :id => @period.lower_item) end%>
         <%=link_to(image_tag(url_for("period.png"), :alt => l(:period), :title => l(:period), :class => 'image-submit'), :controller => 'periods', :action => :edit, :id => @period) %>
-        <%=detour_to(image_tag(url_for("person.png"), :alt => l(:group), :title => l(:group), :class => 'image-submit'), :controller => 'groups', :action => :edit, :id => @period.party) %>
+
+        <%=detour_to(image_tag(url_for(@period.party.to_sym.to_s + ".png"), :alt => l(@period.party.to_sym), :title => l(@period.party.to_sym), :class => 'image-submit'), :controller => @period.party.to_sym.to_s, :action => :edit, :id => @period.party) %>
+
         <%=if @period.higher_item then link_to(image_tag(url_for("arrow_left.png"), :alt => "#{l :previous} #{l :period}", :title => "#{l :previous} #{l :period}", :class => 'image-submit'), :controller => 'periods', :action => :show, :id => @period.higher_item) end%>
         <%=unless @period.passed? then link_to(image_tag(url_for("add.png"), :alt => l(:add_task), :title => l(:add_task), :class => 'image-submit'), :controller => 'tasks', :action => 'new', :task => {:period_id => (@period ? @period.id : (@backlog && @backlog.periods.first ? @backlog.periods.first.id : nil))} ) end %>
         <h4><%=h @period.name %> (<%=@period.start_on%> - <%=@period.end_on%>)</h4>

data/app/views/periods/new.rhtml

@@ -3,8 +3,7 @@
 
 <% form_tag :action => 'create' do %>
   <%= render :partial => 'form' %>
-  <%= submit_tag "Create" %>
+  <%= submit_tag l(:save) %>
+  <%= back_or_link_to l(:back), :action => 'list' %>
 <% end %>
-
-<%= back_or_link_to l(:back), :action => 'list' %>
 </div>

data/app/views/tasks/_backlog_header.rhtml

@@ -1,14 +1,16 @@
 <% @backlog = backlog %>
+
   <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})%>
     </td>
-    <td colspan="7" valign="top">
+    <td colspan="4" valign="top">
     <h5>
       <%=h backlog.name %>
       <%=image_detour_to("clipboard.png", l(:backlog), nil, :controller => 'backlogs', :action => :edit, :id => @backlog) %>
       </h5>
     </td>
+    <td width="*"/>
   </tr>
   <tr>
     <th/>
@@ -18,5 +20,5 @@
     <% if @period.track_work? -%>
     <th><%=l :done %></th>
     <% end %>
-    <th><% if @backlog.track_todo? %><%=l :todo %><% end %></th>
+    <th width="*"><% l :todo if @backlog.track_todo? %></th>
   </tr>

data/app/views/tasks/_form.rhtml

@@ -16,10 +16,11 @@
 
 
 <p><label for="task_period_id"><%=l :period%></label><br/>
-<%= select 'task', 'period_id', [['', '']] + @periods.map{|p| [p.name, p.id]} %>
+<%= select 'task', 'period_id', [['', '']] + @periods.map{|p| [p.name, p.id]}, {}, :onchange => "form.action = '#{url_for}'; form.submit();" %>
 <% if @task.period %>
-<%=image_detour_to('person.png', 'Group', nil, :controller => 'groups', :action => :edit, :id => @task.period.party) %>
+<%=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) %>
 <% end %>
+<%=detour_to l(:new_period), :controller => 'periods', :action => :new %>
 </p>
 
 
@@ -44,5 +45,5 @@
 
 
 <script type="text/JavaScript">
-document.forms[0].elements[1].focus();
+document.forms[0].elements[<%=@task.backlog.nil? ? 0 : @task.period.nil? ? 1 : 2%>].focus();
 </script>

data/app/views/tasks/_task.rhtml

@@ -1,19 +1,16 @@
 <% @task = task %>
-  <tr valign="top">
-    <td>
+  <tr valign="top" <%= 'style="background-color: yellow"' if highlight %>>
+    <td width="1">
     <% if @task.enable_subtasks? && @task.period.active_or_future? && active %>
       <% form_tag({:controller => 'tasks', :action => :specify, :id => @task}) do %>
         <%= image_button_to('add.png', l(:specify), :controller => 'tasks', :action => :specify, :id => @task.id)%>
       <% end %>
     <% end %>
     </td>
-    <td align="left" valign="top">
-      <% form_tag({:controller => 'tasks', :action => 'update', :id => @task}) do %>
-        <%= submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
-        <%= ("&nbsp;" * @task.depth * 4) if @task.depth > 0 %>
-        <%= l @task.resolution.downcase if @task.finished_at %>
-        <%= "-" if @task.children.size > 0 %>
-      <% end %>
+    <td align="left" valign="top" width="1" nowrap="true">
+      <%= ("&nbsp;" * @task.depth * 4) if @task.depth > 0 %>
+      <%= l(@task.resolution.downcase) if @task.finished_at %>
+      <%= "-" if @task.children.size > 0 %>
     </td>
     <td id="<%=@task.id%>" <%if active && @task.period.active_or_future?%>class="tasks" style=cursor:move;"<%end%>>
       <% if @task.active? -%>
@@ -22,12 +19,12 @@
         <%= @task.description -%>
       <% end -%>
     </td>
-    <td align="right" nowrap="true">
-      <% if @task.loggable? -%>
-        <% form_tag({:controller => 'works', :action => 'update', :id => @task.started_work(user)}) do %>
+    <td align="right" nowrap="true" width="1">
+      <% if active && @task.loggable? -%>
+        <% form_tag({:controller => 'works', :action => 'update', :id => @task.started_work}) do %>
           <%= submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
-          <% if @task.work_started?(user) -%>
-            <%= text_field 'work', 'started_at_time', :tabindex => i+1, :value => @task.started_work(user).started_at.strftime('%H:%M'),
+          <% 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) %>
           <% elsif @task.track_times? && @task.period.active? %>
@@ -37,12 +34,12 @@
       <% end -%>
     </td>
     <% if @task.track_done? %>
-    <td align="<%=@task.loggable? ? 'center' : 'left'%>" nowrap="true">
+    <td align="<%=@task.loggable? ? 'center' : 'left'%>" nowrap="true" width="1">
       <% if @task.loggable? || @task.finished_at -%>
-        <% form_tag({:controller => 'works', :action => (@task.work_started?(user) ? :edit : :create), :id => @task.started_work(user)}) do %>
+        <% form_tag({:controller => 'works', :action => (@task.work_started? ? :edit : :create), :id => @task.started_work}) do %>
           <%= hidden_field('work', 'task_id', :value => @task.id)%>
           <%= submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
-          <% unless @task.track_times? || @task.work_started?(user) || @task.finished_at -%>
+          <% unless @task.track_times? || @task.work_started? || @task.finished_at -%>
             <%= text_field 'work', 'hours', :tabindex => i+1, :id => "#{@task.id}_done", 
                 :class => :task_hours, :maxlength => 4, :onkeypress => "handleEvent(this, event, #{@task.id})",
                 :ondblclick => "form.elements[1].style.display = 'inline';this.style.display = 'none'" -%>
@@ -52,8 +49,8 @@
       <% end -%>
     </td>
     <% end -%>
-    <td nowrap="true">
-      <% if @task.loggable? -%>
+    <td nowrap="true" width="1">
+      <% if active && @task.loggable? -%>
         <% form_tag({:controller => 'estimates', :action => 'create', :id => @task}) do %>
           <%= submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
           <% if @task.track_todo? %>
@@ -63,17 +60,17 @@
               <%= @task.todo %>
             <% end %>
           <% end -%>
-          <% if (not @task.track_times?) && !@task.work_started?(user) && @task.period.active? %>
+          <% if (not @task.track_times?) && !@task.work_started? && @task.period.active? %>
             <%= image_button_to('checkmark.png', l(:complete), :controller => 'tasks', :action => :finish, :id => @task)%>
           <% end -%>
         <% end -%>
       <% end -%>
     </td>
-    <td align="right" nowrap="true" width="*">
+    <td align="right" nowrap="true" width="1">
       <% form_tag({:controller => 'tasks', :action => 'update', :id => @task}) do %>
         <% if @task.active? %>
           <% if @task.loggable? %>
-            <% unless @task.work_started?(user) %>
+            <% 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)%>
             <% end %>

data/app/views/tasks/edit.rhtml

@@ -1,6 +1,8 @@
 <div id="spotlight">
 <h1>Editing task</h1>
 
+<%=h @task.inspect%>
+
 <% form_tag :action => 'update', :id => @task do %>
   <%= render :partial => 'form' %>
   <%= submit_tag l(:save) %>

data/app/views/tasks/list_started.rhtml

@@ -38,6 +38,7 @@ function handleEvent(field, event, id) {
 <% if @tasks %>
 <table class="input">
   <tr>
+    <th/>
     <th align="center">#</th>
     <th><%=l :task %></th>
     <th><%=l :start %></th>
@@ -46,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 } %>
+  <%=render :partial => 'task', :locals => { :task => task, :i => i, :active => true, :highlight => task == @selected_task } %>
   <% i += 1 %>
 <% end %>
 </table>

data/app/views/user/_edit.rhtml

@@ -21,8 +21,9 @@
     </tr>
     <% if submit %>
      <tr>
-       <td>
-         <%= submit_tag user.new_record? ? 'signup' : 'change_settings', :class => 'two_columns' %>
+       <td colspan="2">
+         <%= submit_tag user.new_record? ? 'signup' : l(:save), :class => 'two_columns' %>
+         <%= back_or_link_to l(:back), :action => 'list' %>
        </td>
      </tr>
     <% end %>

data/app/views/user/_password.rhtml

@@ -4,16 +4,16 @@
   <table>
     <tr class="two_columns">
       <td class="prompt"><label>Password:</label></td>
-      <td class="value"><%= password_field 'user', 'password', :size => 30 %></td>
+      <td class="value"><%= password_field 'user', 'password', :size => 16 %></td>
     </tr>
     <tr class="two_columns">
       <td class="prompt"><label>Password confirmation:</label></td>
-      <td class="value"><%= password_field 'user', 'password_confirmation', :size => 30 %></td>
+      <td class="value"><%= password_field 'user', 'password_confirmation', :size => 16 %></td>
     </tr>
     <% if submit %>
     <tr>
-      <td>
-        <%= submit_tag 'change_password' %>
+      <td colspan="2">
+        <%= submit_tag l(:change_password) %>
       </td>
     </tr>
     <% end %>

data/app/views/user/edit.rhtml

@@ -1,10 +1,16 @@
-<div title="<%= title_helper %>" class="form">
-  <%= head_helper 'Edit User', :error => true %>
+<div id="spotlight" title="<%= title_helper %>" class="form">
+  <% @page_title = "#{l :editing} #{l :user}" %>
 
     <%= start_form_tag_helper %>
       <%= render_partial 'edit', :user => @user, :submit => true %>
     </form>
-    </br>
+</div>
+
+<div id="rfeature">
+  <div class="btitle">
+    <h4><%=l :password %></h4>
+  </div>
+
     <%= start_form_tag_helper %>
       <%= render_partial 'password', :submit => true %>
     </form>
@@ -12,8 +18,26 @@
     <%= start_form_tag_helper %>
       <div class="user_delete">
         <%= hidden_field 'user', 'form', :value => 'delete' %>
-        <%= submit_tag 'Delete' %>
+        <%= submit_tag l(:delete) %>
       </div>
     </form>
   </div>
-</div>
+</div>
+
+<div id="lfeature">
+  <div class="btitle">
+    <h4><%=l :groups %></h4>
+  </div>
+
+<table>
+<% for @group in @groups %>
+  <tr>
+    <td><%=link_to h(@group.name), :controller => 'groups', :action => :edit, :id => @group %></td>
+    <td>
+      <% form_for :group, @group, :url => {:controller => 'groups', :action => :set_member, :id => @group, :user_id => @user.id} do %>
+        <%=check_box_tag :value, true, @group.users.include?(@user), :onchange => "form.submit()" %></td>
+      <% end %>
+  </tr>
+<% end %>
+</table>
+</div>

data/app/views/works/_form.rhtml

@@ -10,7 +10,7 @@
 <%= select 'work', 'task_id', @tasks.map{|task| [task.description, task.id]} %></p>
 <% end %>
 
-<% if @work.task.nil? || @work.task.backlog.track_times?%>
+<% if @work.task.nil? || @work.task.track_times?%>
 <p><label for="work_started_at"><%=l :started_at%></label><br/>
 <%= text_field 'work', 'started_at', :size => 16, :value => @work.started_at ? @work.started_at.strftime('%Y-%m-%d %H:%M') : nil %>
     <button id="trigger1">...</button>
@@ -50,23 +50,23 @@
 </p>
 <% end %>
 
-<% if @work.task.nil? || @work.task.backlog.enable_users %>
+<% if @work.task.nil? || @work.task.enable_users? %>
 <p><label for="work_user_id"><%=l :user%></label><br/>
 <%= select 'work', 'user_id', @users.map{|user| [user.login, user.id]} %></p>
 <% end %>
 
-<% if @work.task.nil? || @work.task.backlog.track_done?%>
+<% if @work.task.nil? || @work.task.track_done?%>
 <p style="float: left;"><label for="work_hours"><%=l :hours%></label><br/>
 <%= text_field 'work', 'hours_time', :class => :task_hours, :value => t(@work.hours)  %></p>
 <% end %>
 
-<% if @work.task.nil? || @work.task.backlog.enable_invoicing? %>
+<% if @work.task.nil? || @work.task.enable_invoicing? %>
 <p style="float: left;"><br/><%= check_box 'work', 'invoice' %><label for="work_invoice"><%=l :invoice%>?</label></p>
 <% end %>
 
 <br clear="all"/>
 
-<% if @work.task.nil? || @work.task.backlog.track_todo?%>
+<% if @work.task.nil? || @work.task.track_todo?%>
 <p><label for="estimate_todo"><%=l :todo%></label><br/>
 <%= text_field 'estimate', 'todo', :class => :task_hours %>
 <%= image_tag('checkmark.png', :onclick => "document.forms[0].elements['estimate_todo'].value='0'", :style => 'vertical-align: bottom; height: 24px; float: none')%>

data/app/views/works/weekly_work_sheet.rhtml

@@ -1,8 +1,8 @@
 <% @page_title = l(:weekly_work_sheet) + (@period ? " for #{@period}" : '') + (user? ? " for #{user.login}" : '')%>
 
 <div id="spotlight">
-<% track_times = @rows.find {|r| r.find {|w| w && w.task.backlog.track_times?}} %>
-<% invoicing = @rows.find {|r| r.find {|w| w && w.task.backlog.enable_invoicing?}} %>
+<% track_times = @rows.find {|r| r.find {|w| w && w.task.track_times?}} %>
+<% invoicing = @rows.find {|r| r.find {|w| w && w.task.enable_invoicing?}} %>
 <% columns = 2 + (track_times ? 2 : 0) + (invoicing ? 1 : 0) %>
 
 <h1>Work for week <%=@week%><%=user? ? " for #{user.login}" : ''%></h1>

data/config/database.yml

@@ -1,7 +1,7 @@
 development:
   adapter: postgresql
   database: backlog_development
-  username: #{`whoami`}
+  username: uwe
   host: localhost
 
 # Warning: The database defined as 'test' will be erased and

data/lang/en.yaml

@@ -8,6 +8,7 @@ back: Back
 backlog: Backlog
 backlog_description: Task list with ordering and status tracking
 burn_down_chart: Burn Down Chart
+change_password: Change Password
 complete: Complete
 completed: Completed
 completed_at: Ended at
@@ -27,6 +28,7 @@ end_work: Stop
 estimate: Estimate
 friday: Friday
 group: Group
+groups: Groups
 home: Home
 hours: Hours
 invoice: Invoice
@@ -43,11 +45,13 @@ move_to_next_period: Move task to next period
 move_to_top: Move task to top of list
 name: Name
 new_backlog: Start new backlog
+new_group: Start new group
 new_period: Add new period
 new_task: Add new task
 new_work: Add new work record
 next: Next
 no_pending_tasks: There are no pending tasks in this period.
+password: Password
 period: Period
 position: Position
 postponed: Postponed

data/lang/no.yaml

@@ -8,6 +8,7 @@ back: Tilbake
 backlog: Oppgaveliste
 backlog_description: Oppgaveliste med sortering og statussporing
 burn_down_chart: Fremdriftsgraf
+change_password: Bytt Passord
 complete: Fullfør
 completed: Fullført
 completed_at: Stop tid
@@ -27,6 +28,7 @@ end_work: Stopp
 estimate: Estimat
 friday: Fredag
 group: Gruppe
+groups: Grupper
 home: Hjem
 hours: Timer
 invoice: Fakturerbart
@@ -39,15 +41,17 @@ main_backlog: Hovedliste
 members: Medlemmer
 monday: Mandag
 move_to_bottom: Flytt oppgaven til slutten av listen
-move_to_next_period: Flytt oppgaven til nexte periode
+move_to_next_period: Flytt oppgaven til neste periode
 move_to_top: Flytt oppgaven til toppen av listen
 name: Navn
 new_backlog: Start ny oppgaveliste
+new_group: Start ny gruppe
 new_period: Start ny periode
 new_task: Legg til ny oppgave
 new_work: Registrer arbeid
 next: Neste
 no_pending_tasks: Det er ingen ventende oppgaver i denne perioden.
+password: Passord
 period: Periode
 position: Posisjon
 postponed: Utsatt

data/lib/class_table_inheritance.rb

@@ -115,7 +115,7 @@ class ActiveRecord::Base
             end
           end
           
-          delegate :foreign_keys, {:to => #{proxy_class_name}}
+          delegate :foreign_keys, :validates_uniqueness_of, {:to => #{proxy_class_name}}
         end
       EOV
       

data/lib/user_system.rb

@@ -7,7 +7,12 @@ module UserSystem
   #   before_filter :authenticate_user
   #
   def authenticate_user
-    return true if authenticated_user?
+    if authenticated_user = authenticated_user?
+      self.current_user = authenticated_user
+      return true
+    end
+    session[:user_id] = nil
+    Thread.current[:user] = nil
     store_detour_from_params
     access_denied
     return false 
@@ -33,9 +38,9 @@ module UserSystem
   
   def authenticated_user?
     if session[:user_id]
-      @current_user = User.find_by_id(session[:user_id])
-      return true if @current_user
-      session[:user_id]
+      current_user = User.find_by_id(session[:user_id])
+      return current_user if current_user
+      session[:user_id] = nil
     end
     
     if cookie = cookies[:autologin]
@@ -47,11 +52,8 @@ module UserSystem
       else
         raise "Unknown cookie class: #{cookie.class}"
       end
-      @current_user = User.authenticate(cookie_value, '')
-      if @current_user
-        session[:user_id] = @current_user.id
-        return true
-      end
+      cookie_user = User.authenticate(cookie_value, '')
+      return cookie_user if cookie_user
     end
     
     # If not, is the user being authenticated by a token (created by signup/forgot password actions)?
@@ -59,12 +61,20 @@ module UserSystem
     id = params['user']['id']
     key = params['key']
     if id and key
-      @current_user = User.authenticate_by_token(id, key)
-      session[:user_id] = @current_user ? @current_user.id : nil
-      return true if not @current_user.nil?
+      return current_user if current_user = User.authenticate_by_token(id, key)
     end
     
     # Everything failed
     return false
   end
+  
+  def current_user
+    Thread.current[:user]
+  end
+
+  def current_user= user
+    session[:user_id] = user && user.id
+    Thread.current[:user] = user
+  end
+
 end

data/test/functional/tasks_controller_test.rb

@@ -24,6 +24,24 @@ class TasksControllerTest < Test::Unit::TestCase
     assert_redirected_to :controller => 'backlogs'
   end
 
+  def test_list_started
+    get :list_started, :id => '1'
+    assert_response :success
+    assert_template 'list_started'
+
+    assert_not_nil assigns(:tasks)
+    assert_not_nil assigns(:selected_task)
+  end
+
+  def test_list_started_no_selected_task
+    get :list_started
+    assert_response :success
+    assert_template 'list_started'
+
+    assert_not_nil assigns(:tasks)
+    assert_nil assigns(:selected_task)
+  end
+
   def test_new
     get :new
 
@@ -100,7 +118,7 @@ class TasksControllerTest < Test::Unit::TestCase
     assert_response :redirect
     assert_redirected_to :controller => 'periods',
                           :action => :new, 
-                          :party_id => 1
+                          :period => {:party_id => 1}
 
     after = Task.find(2)
     assert_equal 2, before.period_id

data/test/functional/user_controller_test.rb

@@ -241,7 +241,7 @@ class UserControllerTest < Test::Unit::TestCase
   
   def assert_logged_in( user )
     assert_equal user.id, @request.session[:user_id]
-    assert_equal user, assigns(:current_user)
+    assert_equal user, Thread.current[:user]
   end
   
   def assert_not_logged_in

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2007-07-29 00:00:00 +02:00
+  version: 0.2.0
+date: 2007-07-31 00:00:00 +02:00
 summary: The author was too lazy to write a summary
 require_paths: 
 - lib
@@ -44,13 +44,13 @@ files:
 - public/images/arrow_right.svg
 - public/images/arrow_down.png
 - public/images/eraser_org.png
-- public/images/person.png
 - public/images/period.png
 - public/images/arrow_right.png
 - public/images/construction_hammer_jon__01.svg
 - public/images/arrow_down.svg
 - public/images/checkmark_org.png
 - public/images/pagebak.jpg
+- public/images/group.png
 - public/images/tabella_architetto_franc_01.svg
 - public/images/header.jpg
 - public/images/rails.png
@@ -62,6 +62,7 @@ files:
 - public/images/blank.jpg
 - public/images/period_org.png
 - public/images/arrow07_4.png
+- public/images/user.png
 - public/images/arrow07_2.png
 - public/images/appunti_architetto_franc_01.svg
 - public/images/eraser.png
@@ -225,6 +226,7 @@ files:
 - config/environments/datek_production.rb
 - LICENSE_LOCALIZATION
 - README.txt
+- doc
 - Manifest.txt
 - vendor
 - vendor/plugins