backlog 0.0.4 → 0.0.5

data/app/helpers/groups_helper.rb

@@ -0,0 +1,2 @@
+module GroupsHelper
+end

data/app/models/backlog.rb

@@ -1,5 +1,19 @@
 class Backlog < ActiveRecord::Base
-  has_many :periods, :order => 'start_on', :dependent => :destroy
+  validates_presence_of :name
+  validates_length_of :name, :allow_nil => false, :maximum => 64
+  validates_inclusion_of :track_todo, :in => [true, false], :allow_nil => true, :message => ActiveRecord::Errors.default_error_messages[:blank]
+  validates_inclusion_of :track_done, :in => [true, false], :allow_nil => true, :message => ActiveRecord::Errors.default_error_messages[:blank]
+  validates_inclusion_of :track_times, :in => [true, false], :allow_nil => true, :message => ActiveRecord::Errors.default_error_messages[:blank]
+  validates_inclusion_of :enable_subtasks, :in => [true, false], :allow_nil => false, :message => ActiveRecord::Errors.default_error_messages[:blank]
+  validates_inclusion_of :enable_customer, :in => [true, false], :allow_nil => true, :message => ActiveRecord::Errors.default_error_messages[:blank]
+  validates_inclusion_of :enable_users, :in => [true, false], :allow_nil => true, :message => ActiveRecord::Errors.default_error_messages[:blank]
+  validates_length_of :invoice_code, :allow_nil => true, :maximum => 255
+
+  has_many :tasks, :order => 'period_id, position', :dependent => :destroy
+
+  def active_tasks
+    tasks.find(:all, :conditions => "finished_at IS NULL", :order => "position")
+  end
 
   def recent_tasks
     Task.find(:all, :conditions => "period_id = #{periods.first.id} AND (position IS NOT NULL OR finished_at >= '#{1.week.ago.iso8601}')", :order => "position, finished_at")
@@ -21,16 +35,11 @@ class Backlog < ActiveRecord::Base
     total
   end
 
-  def required_speed
-    return 0 if periods.empty?
-    estimate_data(Date.today) / ((periods.last.end_on - Date.today).to_i > 0 ? (periods.last.end_on - Date.today).to_i : 1)
-  end
-
   def first_active_period
-    periods.each do |period|
-      return period if period.active?
-    end
-    return periods.last
+    t = active_tasks
+    periods = t.map {|t| t.period}.uniq
+    periods = periods.select {|p| p.active?}
+    periods.sort_by {|p| p.end_on}.first
   end
   
   def enable_invoicing?

data/app/models/estimate.rb

@@ -2,8 +2,9 @@ class Estimate < ActiveRecord::Base
   belongs_to :task
   belongs_to :user
 
+  validates_associated :task
+
   def after_create
-puts todo
     task.finish(Task::COMPLETED, false, user) if todo == 0
   end
   

data/app/models/group.rb

@@ -0,0 +1,11 @@
+#class Group < ActiveRecord::Base
+class Group < Party
+  class_table_inheritance
+
+  # TODO (uwe): We need to specify :join_table, :foreign_key and :association_foreign_key
+  # even if they follow the defaults since ClassTableInheritanceInRails breaks it.
+  has_and_belongs_to_many :users, :join_table => "groups_users", :foreign_key => "group_id", :association_foreign_key => 'user_id'
+
+  validates_presence_of :name
+  validates_length_of :name, :allow_nil => false, :maximum => 255
+end

data/app/models/party.rb

@@ -0,0 +1,3 @@
+class Party < ActiveRecord::Base
+  has_many :periods, :order => :position, :dependent => :destroy
+end

data/app/models/period.rb

@@ -1,7 +1,17 @@
 class Period < ActiveRecord::Base
-  belongs_to :backlog
-  acts_as_list :scope => :backlog
+  belongs_to :party
+  acts_as_list :scope => :party, :order => :position
   has_many :tasks, :order => 'position, finished_at', :dependent => :destroy
+  validates_associated :party
+  validates_uniqueness_of :position, :scope => :party_id
+
+  def validate
+    errors.add "A period cannot end before it starts" unless end_on >= start_on
+  end
+
+  def self.find_active_or_future
+    find(:all, :conditions => "end_on >= '#{Date.today.strftime '%Y-%m-%d'}'")
+  end
   
   def completed_tasks
     tasks.select {|task| task.completed?}
@@ -11,6 +21,17 @@ class Period < ActiveRecord::Base
     tasks.select {|task| task.active?}
   end
 
+  def most_frequent_backlog
+    all_backlogs = tasks.map {|t| t.backlog}.compact
+    return nil if all_backlogs.empty?
+    freq = {}
+    all_backlogs.each do |b|
+      freq[b.id] ||= 0
+      freq[b.id] += 1
+    end
+    freq.to_a.sort_by {|backlog, count| count}.first[0]
+  end
+  
   def active?(check_tasks = false)
     start_on <= Date.today && (end_on >= Date.today || (check_tasks && tasks.select {|task| task.active?}.size > 0))
   end
@@ -58,7 +79,11 @@ class Period < ActiveRecord::Base
   end
 
   def to_s
-    "#{backlog.name}##{position}"
+    name
+  end
+
+  def name
+    "#{party.name}##{position}"
   end
 
   def dates
@@ -109,16 +134,28 @@ class Period < ActiveRecord::Base
     by_line
   end
   
+  def estimates?
+    not backlogs.find {|backlog| backlog.track_todo?}.nil?
+  end
+  
+  def track_work?
+    not backlogs.find {|backlog| backlog.track_done?}.nil?
+  end
+  
   def track_times?
-    backlog.track_times?
+    not backlogs.find {|backlog| backlog.track_times?}.nil?
   end
   
   def enable_subtasks?
-    backlog.enable_subtasks?
+    not backlogs.find {|backlog| backlog.enable_subtasks?}.nil?
   end
   
   def invoice?
-    backlog.enable_invoicing?
+    not backlogs.find {|backlog| backlog.enable_invoicing?}.nil?
+  end
+
+  def backlogs
+    tasks.map {|task| task.backlog}.uniq
   end
   
 end

data/app/models/task.rb

@@ -1,8 +1,10 @@
 class Task < ActiveRecord::Base
   COMPLETED = 'COMPLETED'
   POSTPONED = 'POSTPONED'
+  MOVED = 'MOVED'
   ABORTED     = 'ABORTED'
   
+  belongs_to :backlog
   belongs_to :period
   acts_as_list :scope => '#{period_id ? "period_id = #{period_id}" : "parent_id = #{parent_id}"} AND finished_at IS NULL'
   has_many :estimates, :order => 'created_at', :dependent => :destroy
@@ -11,7 +13,8 @@ class Task < ActiveRecord::Base
   
   validates_size_of :description, :maximum => 80
   validates_size_of :customer, :maximum => 64, :if => :customer
-#  validates_presence_of :created_at
+  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_uniqueness_of :description, :scope => :period_id
   
   def validate
@@ -23,6 +26,10 @@ class Task < ActiveRecord::Base
     end
   end
   
+  def self.find_open
+    find(:all, :conditions => 'finished_at IS NULL', :order => 'description')
+  end
+  
   def self.find_started(user)
     if user
       user_clause = " OR user_id = #{user.id}"
@@ -31,10 +38,6 @@ class Task < ActiveRecord::Base
     Work.find(:all, :conditions => conditions).map {|work| work.task}
   end
   
-  def self.open_conditions
-    return "finished_at IS NULL"
-  end
-  
   def self.recent_conditions
     return "finished_at >= '#{1.week.ago.iso8601}'"
   end
@@ -112,14 +115,20 @@ class Task < ActiveRecord::Base
     raise "Period missing" unless period
     raise "Cannot move finished tasks" unless active?
     
-    new_task = Task.find_by_period_id_and_previous_task_id(period.id, self.id) || Task.new
-    new_task.description = self.description
+    ancestor_id = self.previous_task_id || self.id
+    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.previous_task_id = self.previous_task_id || self.id
+    new_task.backlog = backlog
     new_task.period = period
-    new_task.previous_task_id = self.id
+    new_task.description = self.description
     new_task.save!
+    new_task.estimate(self.todo, user)
     new_task.move_to_top
     new_task.estimate(self.todo, user)
-    self.finish(Task::POSTPONED, true, user)
+    self.finish(new_task.period.party == self.period.party ? Task::POSTPONED : Task::MOVED, true, user)
   end
   
   def finish(resolution, save_work, user)
@@ -172,24 +181,28 @@ class Task < ActiveRecord::Base
   
   def root_task
     root_task = self 
-    root_task = root_task.parent while !root_task.root?
+    root_task = root_task.parent while root_task.parent
     root_task
   end
   
   def track_done?
-    root_task.period.backlog.track_done
+    root_task.backlog.track_done
   end
   
   def track_times?
-    root_task.period.backlog.track_times
+    root_task.backlog.track_times?
   end
   
   def track_todo?
-    root_task.period.backlog.track_todo
+    root_task.backlog.track_todo?
   end
   
   def enable_subtasks?
-    root_task.period.backlog.enable_subtasks
+    root_task.backlog.enable_subtasks?
+  end
+  
+  def enable_customer?
+    root_task.backlog.enable_customer?
   end
   
   alias_method :old_period, :period

data/app/models/user.rb

@@ -1,7 +1,14 @@
 require 'digest/sha1'
 
 # this model expects a certain database layout and its based on the name/login pattern. 
-class User < ActiveRecord::Base
+#class User < ActiveRecord::Base
+class User < Party
+  class_table_inheritance
+
+  # TODO (uwe): We need to specify :join_table, :foreign_key and :association_foreign_key
+  # even if they follow the defaults since ClassTableInheritanceInRails breaks it.
+  has_and_belongs_to_many :groups, :join_table => "groups_users", :foreign_key => "user_id", :association_foreign_key => 'group_id'
+
   attr_accessor :password_needs_confirmation
 
   after_save '@password_needs_confirmation = false'
@@ -9,14 +16,31 @@ class User < ActiveRecord::Base
 
   validates_presence_of :login, :on => :create
   validates_length_of :login, :within => 3..40, :on => :create
-  validates_uniqueness_of :login, :on => :create
-  validates_uniqueness_of :email, :on => :create
-
+  
+  # TODO (uwe): This is commented out since it is broken by ClassTableInheritanceInRails
+  #validates_uniqueness_of :login, :on => :create
+  
+  validates_presence_of :email
+  validates_length_of :email, :allow_nil => false, :maximum => 60, :if => :email
+  
+  # TODO (uwe): This is commented out since it is broken by ClassTableInheritanceInRails
+  #validates_uniqueness_of :email, :on => :create
+
+  # This is commented out since I want to allow empty passwords
 #  validates_presence_of :password, :if => :validate_password?
   validates_confirmation_of :password, :if => :validate_password?
+  # This is commented out since I want to allow empty passwords
 #  validates_length_of :password, { :minimum => 5, :if => :validate_password? }
   validates_length_of :password, { :maximum => 40, :if => :validate_password? }
 
+  validates_length_of :first_name, :allow_nil => true, :maximum => 40
+  validates_length_of :last_name, :allow_nil => true, :maximum => 40
+
+  validates_length_of :role, :allow_nil => true, :maximum => 40
+
+  validates_length_of :security_token, :allow_nil => true, :maximum => 40
+  validates_inclusion_of :deleted, :in => [true, false], :allow_nil => true, :message => ActiveRecord::Errors.default_error_messages[:blank]
+
   def initialize(attributes = nil)
     super
     @password_needs_confirmation = false
@@ -66,6 +90,9 @@ class User < ActiveRecord::Base
     UserSystem::CONFIG[:security_token_life_hours] * 60 * 60
   end
 
+  def name
+    [first_name, last_name].compact.join(' ')
+  end
 
   protected
 
@@ -76,7 +103,8 @@ class User < ActiveRecord::Base
   end
 
   def self.hashed(str)
-    return Digest::SHA1.hexdigest("change-me--#{str}--")[0..39]
+    hashed_password = Digest::SHA1.hexdigest("change-me--#{str}--")[0..39]
+    return hashed_password
   end
 
   def crypt_password
@@ -90,12 +118,13 @@ class User < ActiveRecord::Base
     expiry = Time.at(Clock.now.to_i + token_lifetime)
     write_attribute('security_token', self.class.hashed(self.salted_password + Clock.now.to_i.to_s + rand.to_s))
     write_attribute('token_expiry', expiry)
-    update_without_callbacks
+#    update_without_callbacks
+    update
     return self.security_token
   end
 
   def self.salted_password(salt, hashed_password)
-    hashed(salt + hashed_password)
+    salted_password = hashed(salt + hashed_password)
+    return salted_password
   end
 end
-

data/app/models/work.rb

@@ -6,11 +6,11 @@ class Work < ActiveRecord::Base
   validates_presence_of :user_id, :if => :validate_user? 
 
   def validate_user?
-    task.period.backlog.enable_users
+    task.backlog.enable_users
   end
   
   def track_times?
-    task.period.backlog.track_times?
+    task.backlog.track_times?
   end
   
   # Return an array with an array of works per day:
@@ -26,7 +26,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.period.backlog.enable_users || (user && work.user_id == user.id)) }
+      works_for_day = works.select {|work| work.completed_at.to_date == (first + day) && (!work.task.backlog.enable_users || (user && work.user_id == user.id)) }
       length = [length, works_for_day.length].max
       works_for_day
     end
@@ -47,8 +47,7 @@ class Work < ActiveRecord::Base
     Backlog.find(:all).each do |backlog|
       totals_per_backlog[backlog.id] = [[], []]
       (0..6).each do |day|
-        works_for_day = works.select {|work| work.task.period.backlog == backlog && work.completed_at.to_date == (first + day) && (!work.task.period.backlog.enable_users || (user_id && work.user_id == user_id)) }
-        p works_for_day
+        works_for_day = works.select {|work| work.task.backlog == backlog && work.completed_at.to_date == (first + day) && (!work.task.backlog.enable_users || (user_id && work.user_id == user_id)) }
         invoice_works_for_day = works_for_day.select {|work| work.invoice? }
         internal_works_for_day = works_for_day.select {|work| !work.invoice? }
 
@@ -61,7 +60,6 @@ class Work < ActiveRecord::Base
     totals_per_backlog.reject! do |backlog_id, day_totals|
       !day_totals[0].find{|day_total| day_total > 0} && !day_totals[1].find{|day_total| day_total > 0}
     end
-    p totals_per_backlog
     totals_per_backlog
   end
   

data/app/views/backlogs/_name_list.rhtml

@@ -0,0 +1,5 @@
+<ul class="backlogs">
+<% for backlog in @backlogs do -%>
+  <li class="task"><div class="name"><%=h backlog.name %></div></li>
+<% end -%>
+</ul>

data/app/views/backlogs/show.rhtml

@@ -55,15 +55,15 @@ function handle<%=@task.id%>(field, event) {
   <% end %>
     <td>
     <% unless @task.finished_at %>
-        <%= image_button_to '/images/arrow07_4', l(:up), :controller => 'tasks', :action => :move_up, :id => @task %>
+        <%= image_button_to 'arrow07_4.png', l(:up), :controller => 'tasks', :action => :move_up, :id => @task %>
     </td>
     <td>
-        <%= image_button_to('/images/arrow07_2', l(:down), :controller => 'tasks', :action => :move_down, :id => @task)%>
+        <%= image_button_to('arrow07_2.png', l(:down), :controller => 'tasks', :action => :move_down, :id => @task)%>
     </td>
     <td>
-        <%= image_button_to('/images/checkmark_joel_montes_de_', l(:complete), :controller => 'tasks', :action => :finish, :id => @task)%>
+        <%= image_button_to('checkmark_joel_montes_de_.png', l(:complete), :controller => 'tasks', :action => :finish, :id => @task)%>
     <% else %>
-        <%=image_button_to('/images/eraser', l(:reopen), :controller => 'tasks', :action => :reopen, :id => @task) %>
+        <%=image_button_to('eraser.png', l(:reopen), :controller => 'tasks', :action => :reopen, :id => @task) %>
     <% end %>
     </td>
   </tr>

data/app/views/groups/_form.rhtml

@@ -0,0 +1,7 @@
+<%= error_messages_for 'group' %>
+
+<!--[form:group]-->
+<p><label for="group_name"><%=l :name%></label><br/>
+<%= text_field 'group', 'name'  %></p>
+<!--[eoform:group]-->
+

data/app/views/groups/edit.rhtml

@@ -0,0 +1,31 @@
+<div id="spotlight">
+<% @page_title = "#{l :editing} #{l :group}" %>
+
+<% form_tag :action => 'update', :id => @group do %>
+  <%= render :partial => 'form' %>
+  <%= submit_tag l(:save) %>
+  <%= back_or_link_to l(:back), :action => 'list' %>
+<% end %>
+</div>
+
+<div id="lfeature">
+  <div class="btitle">
+    <h4><%=l :members %></h4>
+  </div>
+
+<table>
+<% for @user in @users %>
+  <tr>
+    <td><%=h @user.name%></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>
+      <% end %>
+  </tr>
+<% end %>
+</table>
+
+<%= back_or_link_to l(:back), :action => 'list' %>
+
+</div>
+