voluntary 0.1.0.rc4 → 0.1.0

data/app/controllers/stories_controller.rb

@@ -43,7 +43,6 @@ class StoriesController < ApplicationController
   
   def update
     @story.attributes = params[:story]
-    
     success = params[:next_step] == '1' ? @story.send(step) : @story.save
     
     if success

data/app/controllers/workflow/products_controller.rb

@@ -1,6 +1,6 @@
 class Workflow::ProductsController < ApplicationController
   def show
-    @stories = Product.stories(params[:id], current_user, params[:page])
+    @stories = Product.stories(params[:id], current_user)
     @areas = Area.find_by_product_id(params[:id])
     @product = Product.find(params[:id]) unless params[:id] == 'no-name'
   end

data/app/controllers/workflow/user/projects_controller.rb

@@ -1,6 +1,8 @@
 class Workflow::User::ProjectsController < ApplicationController
   def show
     @project = Project.find(params[:id])
-    @stories = @project.stories.active.paginate(page: params[:page])
+    
+    @stories = @project.product.stories_for_user(current_user).
+    where(project_id: @project.try(:id)).paginate(page: params[:page])
   end
 end

data/app/models/area.rb

@@ -15,11 +15,11 @@ class Area < ActiveRecord::Base
   friendly_id :name, :use => :slugged
   
   def self.find_by_product_id(product_id)
-    roots.joins(:projects).merge(Project.for_product_id(product_id)).group('areas.id')
+    roots.joins(:projects).merge(Project.for_product_id(product_id))
   end
   
   def children_for_product_id(product_id)
-    children.joins(:projects).merge(Project.for_product_id(product_id)).group('areas.id')
+    children.joins(:projects).merge(Project.for_product_id(product_id))
   end
     
   def products

data/app/models/column.rb

@@ -0,0 +1,23 @@
+class Column
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Slug
+  
+  include Model::MongoDb::Customizable
+  
+  belongs_to :story
+  
+  has_many :tasks, dependent: :destroy
+  
+  field :key, type: String
+  field :text, type: String
+  field :state, type: String
+  
+  attr_accessible :story_id, :key, :text
+  
+  private
+  
+  def cache_product_association
+    self.product_id = story.project.product_id if story_id.present? && (story.project rescue nil)
+  end
+end

data/app/models/product.rb

@@ -40,7 +40,7 @@ class Product
     struct
   end
   
-  def self.stories(id, user, page)
+  def self.stories(id, user)
     collection = if id == 'no-name'
       Story.exists(_type: false)
     else
@@ -53,7 +53,11 @@ class Product
       end
     end
     
-    collection.where(:users_without_tasks_ids.ne => user.id)#.page(page).per(1)
+    collection.where(:users_without_tasks_ids.ne => user.id)
+  end
+  
+  def stories_for_user(user)
+    self.class.stories(id, user)
   end
   
   # belongs_to (SQL)

data/app/models/product/project_management.rb

@@ -6,7 +6,7 @@ module Product::ProjectManagement
   end
   
   module ClassMethods
-    def stories(id, user, page)
+    def stories(id, user)
       collection = if id == 'no-name'
         Story.exists(_type: false)
       else
@@ -19,7 +19,7 @@ module Product::ProjectManagement
         end
       end
       
-      collection.where(:users_without_tasks_ids.ne => user.id)#.page(page).per(1)
+      collection.where(:users_without_tasks_ids.ne => user.id)
     end
   end
     

data/app/models/story.rb

@@ -51,7 +51,8 @@ class Story
   def next_task_for_user(user)
     return nil if (users_without_tasks_ids || []).include?(user.id)
     
-    task = tasks.assigned.where(user_id: user.id).first
+    task = tasks.assigned.not.in(state: ['under_supervision', 'completed']).
+           where(user_id: user.id).first
     
     return task if task
     

data/app/models/task.rb

@@ -33,8 +33,8 @@ class Task
   
   validates :story_id, presence: true
   validates :offeror_id, presence: true
-  validates :name, presence: true, uniqueness: { scope: :story_id }
   validates :text, presence: true, if: ->(t) { t.class.name == 'Task' }
+  validate :name_valid?
   
   after_initialize :cache_associations
   before_validation :cache_associations  
@@ -61,6 +61,19 @@ class Task
     end
   end
   
+  protected
+  
+  # validates :name, presence: true, uniqueness: { scope: :story_id }
+  def name_valid?
+    if name.present?
+      if Task.where(name: name, story_id: story_id).any?
+        errors.add(:name, I18n.t('errors.messages.taken'))
+      end
+    else
+      errors.add(:name, I18n.t('errors.messages.blank'))
+    end
+  end
+  
   private
   
   def cache_associations

data/app/views/columns/_collection.html.erb

@@ -0,0 +1,12 @@
+<% options ||= {} %>
+<% options = {
+  current_parent: parent, show_title: true, append_new_link: true,
+  columns: ['key', 'text']
+}.merge(options) %>
+<%= render partial: 'shared/collection/table', locals: { 
+  type: 'columns', collection: collection, columns: options[:columns], 
+  options: {
+    append_new_link: options[:append_new_link], show_title: options[:show_title],
+    current_parent: options[:current_parent]
+  }
+} %>

data/app/views/shared/collection/_table.html.erb

@@ -33,4 +33,6 @@
 </table>
 <% end %>
 
-<%= table_presenter.new_link(options) %>
+<% unless options[:append_new_link] == false %>
+  <%= table_presenter.new_link(options) %>
+<% end %>

data/app/views/shared/resource/_actions.html.erb

@@ -1,5 +1,7 @@
-<% if can?(:destroy, resource) || can?(:edit, resource) || (
-  resource.respond_to?(:state_events) && resource.state_events.select{|event| can? event, resource }.any?
+<% if !resource.is_a?(Column) && (
+	can?(:destroy, resource) || can?(:edit, resource) || (
+      resource.respond_to?(:state_events) && resource.state_events.select{|event| can? event, resource }.any?
+    )
 ) %>
 <div class="dropdown">
   <a class="dropdown-toggle" data-toggle="dropdown" href="#"><%= t('general.actions') %></a>
@@ -7,10 +9,10 @@
   <% if can? :destroy, resource %>    
     <li>
       <%= link_to(
-        t('general.destroy'), resource, id: "area_#{resource.id}", method: :delete, 
+        t('general.destroy'), resource, id: "#{resource.class.name.tableize.singularize}_#{resource.id}", method: :delete, 
         confirm: t('general.questions.are_you_sure'),
-        onclick: "delete_link('#area_#{resource.id}'); return false;"
-      )
+        onclick: "delete_link('#{resource.class.name.tableize.singularize}_#{resource.id}'); return false;"
+      ) 
       %>
     </li>
   <% end %>

data/app/views/stories/_column_fields.html.erb

@@ -0,0 +1,11 @@
+<fieldset>
+  <%= f.input :key %>  
+  <%= f.input :text, as: :text, input_html: {style: 'width: 500px; height:50px;'} %>
+
+  <%= f.check_box :_destroy %>
+  <%= f.label :_destroy, t('general.destroy') %>
+  
+  <%= link_to t('general.remove'), '#', class: 'remove_fields' %>
+</fieldset>
+
+<hr/>