voluntary 0.1.0 → 0.2.0

data/app/models/state_machines/candidature.rb

@@ -18,12 +18,28 @@ module StateMachines::Candidature
         end
         
         event :deny do
-          transition :new => :denied
+          transition [:new, :accepted] => :denied
         end
         
         event :quit do
           transition :accepted => :denied
         end
+        
+        after_transition do |object, transition|
+          case transition.to
+            when 'accepted'
+              ProjectUser.find_or_create_by_project_id_and_vacancy_id_and_user_id!(
+                project_id: object.vacancy.project_id, vacancy_id: object.vacancy_id, 
+                user_id: object.resource_id
+              )
+              
+              if object.vacancy.limit == object.vacancy.candidatures.accepted.count
+                object.vacancy.close! unless object.vacancy.closed?
+              end
+            when 'denied'
+              # if comming from :accepted then the vacancy offerer has to reopen the vacancy manually
+          end
+        end
       end
       
       private

data/app/models/state_machines/story.rb

@@ -20,7 +20,7 @@ module StateMachines::Story
         end
         
         state :tasks_defined do
-          validates_associated :tasks
+          #validates_associated :tasks
           validate :presence_of_tasks
         end
         
@@ -35,12 +35,25 @@ module StateMachines::Story
         event :close do
           transition :completed => :closed
         end
+        
+        before_transition do |object, transition|
+          object.event = transition.event.to_s
+          object.state_before = transition.from
+        end
       end
       
       private
       
       def presence_of_tasks
-        unless tasks.any?
+        self.tasks.delete_if{|t| t.name.blank? && t.text.blank? }
+        
+        if tasks.select{|t| !t.valid?}.any?
+          errors[:base] << I18n.t(
+            'activerecord.errors.models.story.attributes.base.invalid_tasks'
+          )
+        end
+        
+        if tasks.none?
           errors[:base] << I18n.t(
             'activerecord.errors.models.story.attributes.base.missing_tasks'
           )

data/app/models/state_machines/task.rb

@@ -40,6 +40,39 @@ module StateMachines::Task
           # TODO: complete the story through observer
           transition :under_supervision => :completed
         end
+        
+        before_transition do |object, transition|
+          object.event = transition.event.to_s
+          object.state_before = transition.from
+          
+          case transition.event
+          when :assign
+            object.author_id = object.user_id
+          when :cancel
+            object.unassigned_user_ids ||= []
+            object.unassigned_user_ids << object.user_id
+            object.user_id = nil
+            object.author_id = nil
+            object.result.text = nil if object.result
+          when :review
+            object.user_id = object.offeror_id
+          when :follow_up
+            object.user_id = object.author_id
+          end
+        end
+        
+        after_transition do |object, transition|
+          case transition.event
+          when :follow_up
+            if object.story.completed?
+              object.story.activate
+            end
+          when :complete
+            if object.story.tasks.complete.count == object.story.tasks.count
+              object.story.complete
+            end
+          end
+        end
       end
     end
   end

data/app/models/story.rb

@@ -2,6 +2,7 @@ class Story
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::Slug
+  include ActiveModel::MassAssignmentSecurity
   
   include Model::MongoDb::Customizable
   include StateMachines::Story
@@ -25,7 +26,7 @@ class Story
   
   attr_accessible :project_id, :name, :text, :tasks_attributes
   
-  scope :active, where(state: 'active')
+  scope :active, -> { where(state: 'active') }
   
   validates :project_id, presence: true
   validates :offeror_id, presence: true
@@ -61,7 +62,7 @@ class Story
     if task
       task.user_id = user.id
     
-      return task.errors.full_messages.join('<br/>') unless task.assign
+      raise task.errors.full_messages.join('<br/>') unless task.assign
     else
       self.users_without_tasks_ids ||= []
       self.users_without_tasks_ids << user.id

data/app/models/task.rb

@@ -3,6 +3,7 @@ class Task
   include Mongoid::Timestamps
   include Mongoid::Slug
   #include Mongoid::History::Trackable
+  include ActiveModel::MassAssignmentSecurity
   
   include Model::MongoDb::Customizable
   include Model::MongoDb::Commentable
@@ -25,11 +26,11 @@ class Task
    
   attr_accessible :story, :story_id, :name, :text, :result_attributes
   
-  scope :current, where(state: 'new')
-  scope :unassigned, where(user_id: nil)
-  scope :assigned, ne(user_id: nil)
-  scope :complete, where(state: 'completed')
-  scope :incomplete, ne(state: 'completed')
+  scope :current, -> { where(state: 'new') }
+  scope :unassigned, -> { where(user_id: nil) }
+  scope :assigned, -> { ne(user_id: nil) }
+  scope :complete, -> { where(state: 'completed') }
+  scope :incomplete, -> { ne(state: 'completed') }
   
   validates :story_id, presence: true
   validates :offeror_id, presence: true
@@ -61,10 +62,47 @@ class Task
     end
   end
   
+  def with_result?
+    true
+  end
+  
+  def before_transition(transition)
+    self.event = transition.event.to_s
+    self.state_before = transition.from
+    
+    case transition.event
+    when :assign
+      self.author_id = self.user_id
+    when :cancel
+      self.unassigned_user_ids ||= []
+      self.unassigned_user_ids << self.user_id
+      self.user_id = nil
+      self.author_id = nil
+      self.result.text = nil if self.result
+    when :review
+      self.user_id = self.offeror_id
+    when :follow_up
+      self.user_id = self.author_id
+    end
+  end
+  
+  def after_transition(transition)
+    case transition.event
+    when :follow_up
+      self.story.activate if self.story.completed?
+    when :complete
+      if self.story.tasks.complete.count == self.story.tasks.count
+        self.story.complete
+      end
+    end
+  end
+  
   protected
   
   # validates :name, presence: true, uniqueness: { scope: :story_id }
   def name_valid?
+    return unless name_changed?
+    
     if name.present?
       if Task.where(name: name, story_id: story_id).any?
         errors.add(:name, I18n.t('errors.messages.taken'))
@@ -83,4 +121,4 @@ class Task
   def cache_product_association
     self.product_id = story.product_id if story_id.present? && (story rescue nil)
   end
-end
+end

data/app/models/thing.rb

@@ -0,0 +1,3 @@
+class Thing < ActiveRecord::Base
+  include Concerns::Model::BaseThing
+end

data/app/models/user.rb

@@ -1,5 +1,7 @@
 class User < ActiveRecord::Base
   include ::Applicat::Mvc::Model::Resource::Base
+  include User::Listable
+  include User::Extensions
   
   belongs_to :main_role, class_name: 'Role'
   belongs_to :profession
@@ -8,9 +10,10 @@ class User < ActiveRecord::Base
   has_and_belongs_to_many :areas
   has_and_belongs_to_many :projects
   
+  has_many :organizations, dependent: :destroy
   has_many :offeror_vacancies, source: :offeror, class_name: 'Vacancy'
   has_many :offeror_candidatures, source: :offeror, class_name: 'Candidature'
-  has_many :candidatures
+  has_many :candidatures, as: :resource
   
   accepts_nested_attributes_for :areas, allow_destroy: true
   
@@ -23,10 +26,10 @@ class User < ActiveRecord::Base
   validates :country, presence: true
   validates :interface_language, presence: true
         
-  attr_accessible :name, :password, :password_confirmation, :text, :language, :first_name, :last_name, 
+  attr_accessible :name, :password, :password_confirmation, :remember_me, :text, :language, :first_name, :last_name, 
                   :salutation, :marital_status, :family_status, :date_of_birth, :place_of_birth, :citizenship, 
                   :email, :country, :language, :interface_language, :foreign_language_tokens, :profession_id, 
-                  :employment_relationship, :area_tokens,
+                  :employment_relationship, :area_tokens, :remember_me
                   # preferences
                   :main_role_id
        
@@ -59,6 +62,10 @@ class User < ActiveRecord::Base
     options
   end
   
+  def is_master?
+    roles.where(name: 'Master').any?
+  end
+  
   def languages
     (foreign_languages || []) + [language]
   end
@@ -87,9 +94,13 @@ class User < ActiveRecord::Base
     areas
   end
   
+  def full_name
+    [first_name, last_name].join(' ')
+  end
+  
   private
   
   def set_main_role
-    self.update_attribute :main_role_id, Role.find_or_create_by_name('User').id
+    self.update_attribute :main_role_id, Role.find_or_create_by(name: 'User').id if self.respond_to? :main_role_id
   end
 end

data/app/models/vacancy.rb

@@ -4,13 +4,15 @@ class Vacancy < ActiveRecord::Base
   belongs_to :project
   belongs_to :offeror, class_name: 'User'
   belongs_to :author, class_name: 'User'
-  belongs_to :user
+  belongs_to :resource, polymorphic: true
   belongs_to :project_user
   
   has_many :candidatures, dependent: :destroy
   has_many :comments, as: :commentable, dependent: :destroy
   
-  scope :open, where(state: 'open')
+  accepts_nested_attributes_for :candidatures, allow_destroy: true, reject_if: ->(t) { t['name'].blank? }
+  scope :open, -> { where(state: 'open') }
+  
   
   validates :project_id, presence: true
   validates :offeror_id, presence: true
@@ -18,7 +20,7 @@ class Vacancy < ActiveRecord::Base
   validates :text, presence: true
   validates :limit, presence: true
   
-  attr_accessible :project_id, :name, :text, :limit
+  attr_accessible :project_id, :name, :text, :limit, :candidatures_attributes
   
   extend FriendlyId
   
@@ -30,7 +32,7 @@ class Vacancy < ActiveRecord::Base
     limit - candidatures.accepted.count
   end
   
-  private
+  protected
   
   def set_defaults
     if project
@@ -38,4 +40,4 @@ class Vacancy < ActiveRecord::Base
       self.author_id = project.user_id unless self.author_id.present?
     end
   end
-end
+end

data/app/presenters/resources/general/wizards/story/steps/setup_tasks_presenter.rb

@@ -1,5 +1,5 @@
 class Resources::General::Wizards::Story::Steps::SetupTasksPresenter < Presenter
   def form_options
-    { html: {class: 'form-horizontal'} }
+    { html: {class: 'form-horizontal'}, url: story_path(resource), as: :story }
   end
 end

data/app/presenters/shared/collection/table_presenter.rb

@@ -14,7 +14,7 @@ class Shared::Collection::TablePresenter < Presenter
   end
   
   def actions
-    return '' unless show_actions
+    return content_tag(:td, '') unless show_actions
     
     content_tag :td, render('shared/resource/actions', type: type, resource: resource)
   end

data/app/views/candidatures/index.html.erb

@@ -1,4 +1,4 @@
-<% columns = { 'name' => 'user.name', 'user_id' => ''} %>
+<% columns = { 'name' => 'resource.name', 'resource_id' => ''} %>
 <% columns['vacancy_id'] = '' unless @vacancy %>
 <% columns['project_id'] = 'vacancy.project' unless @vacancy %>
 

data/app/views/candidatures/show.html.erb

@@ -8,7 +8,7 @@
 </h3>
 
 <dl class="dl-horizontal">
-  <%= show_associations :project, :vacancy, :user %>
+  <%= show_associations :project, :vacancy, :resource %>
   <%= show_attribute :state %>
   <%= show_actions %>
 </dl>

data/app/views/comments/_resource.html.erb

@@ -11,6 +11,6 @@
       "new_#{resource.commentable_type.tableize.singularize}_comment_path(resource.commentable, comment: { parent_id: resource.id })" 
     ), class: 'new_comment' %> |
     <%= link_to t('general.edit'), edit_comment_path(resource), class: 'edit_comment' %> |
-    <%= link_to t('general.destroy'), resource, confirm: t('general.questions.are_you_sure'), method: :delete, class: 'destroy_comment' %>
+    <%= link_to t('general.destroy'), resource, data: { confirm: t('general.questions.are_you_sure') }, method: :delete, class: 'destroy_comment' %>
   </div>
 </div>

data/app/views/layouts/application.html.erb

@@ -4,7 +4,9 @@
   <title><%= t('layout.title') %></title>
   <meta charset='utf-8'>
   <meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <%= stylesheet_link_tag 'voluntary/application', media: 'all' %>
+  <%= stylesheet_link_tag 'application', media: 'all' %>
   <link href="//netdna.bootstrapcdn.com/font-awesome/3.1.1/css/font-awesome.css" rel="stylesheet"/>
 </head>
 <body>
@@ -24,6 +26,7 @@
     </div>
 <% end %>    
     <div class="row-fluid">
+<% if sidenav(@sidenav_links_count).present? %>
       <div class="span9">
         <%= breadcrumbs %>
         
@@ -32,6 +35,13 @@
       <div class="span3">
         <%= sidenav(@sidenav_links_count) %>
       </div>
+<% else %>
+      <div class="span12">
+        <%= breadcrumbs %>
+        
+        <%= yield %>
+      </div>      
+<% end %>
     </div>
   </div>
   <div class="container-fluid">
@@ -42,6 +52,8 @@
     </div>
   </div>
   <%= javascript_include_tag 'voluntary/application' %>
+  <%= javascript_include_tag 'application' %>
+  <%= yield :javascript_includes %>
   <%= csrf_meta_tags %>
   <%= javascript_tag do %>
     <%= yield :top_javascript %>

data/app/views/layouts/shared/_navigation.html.erb

@@ -1,10 +1,10 @@
 <div class="navbar navbar-inverse navbar-fixed-top">
   <div class="navbar-inner">
     <div class="container">
-      <a id="plattform_brand" class="brand" href="#">Volontari.at /</a>
-      <a id="product_brand" class="brand" href="#">Core</a>
+      <a id="plattform_brand" class="brand" href="/">Volontari.at /</a>
+      <a id="product_brand" class="brand" href="<%= navigation_product_path %>"><%= navigation_product_name %></a>
       
-      <%= render_navigation context: :main, expand_all: false, renderer: :bootstrap %>
+      <%= render_navigation context: application_navigation, expand_all: false, renderer: :bootstrap %>
     </div>
   </div>
 </div>

data/app/views/organizations/show.html.erb

@@ -1,6 +1,5 @@
 <h3><%= @organization.name %></h3>
 
 <dl class="dl-horizontal">
-  <%= show_associations :parent %>
   <%= show_actions %>
 </dl>

data/app/views/products/index.html.erb

@@ -1,5 +1,54 @@
-<%= form_tag update_multiple_products_path, method: :post do %>
-  <%= render partial: 'shared/collection/table', locals: { 
-    type: 'products', collection: @products, columns: ['name'] 
-  } %>
+<h3><%= t("products.index.title") %></h3>
+<% if @products.none? || @products.select{|e| e.id.present? }.none? %>
+<p><%= I18n.t("products.index.empty_collection")%></p>
+<% else %>
+<table class="table table-striped">
+  <thead>
+    <tr class="<%= cycle('odd', 'even') %>">
+      <th><%= t("activerecord.attributes.product.name") %></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+  <% @products.select{|e| e.id.present? }.each do |product| %>
+    <tr class="<%= cycle('odd', 'even') %>">
+      <td>
+        <%= link_to product.name, product_path(product) %>
+      </td>
+      <td>
+      	<% if !product.is_a?(Column) && (
+					can?(:destroy, product) || can?(:edit, product) || (
+				      product.respond_to?(:state_events) && product.state_events.select{|event| can? event, product }.any?
+				    )
+				) %>
+				<div class="dropdown">
+				  <a class="dropdown-toggle" data-toggle="dropdown" href="#"><%= t('general.actions') %></a>
+				  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+				  <% if can? :destroy, product %>    
+				    <li>
+				      <%= link_to(
+				        t('general.destroy'), product_path(product.id), id: "product_#{product.id}", method: :delete, 
+				        data: { confirm: t('general.questions.are_you_sure') },
+				        onclick: "delete_link('product_#{product.id}'); return false;"
+				      ) 
+				      %>
+				    </li>
+				  <% end %>
+				  <% if can? :edit, product %>    
+				    <li><%= link_to t('general.edit'), eval("edit_product_path(product)") %></li>
+				  <% end %>
+				  <% if product.respond_to? :state_events %>
+				  <li class="divider"></li>
+				  <% end %>
+				  <%= render 'shared/resource/event_elements', resource: product, type: 'products' %>
+				  </ul>
+				</div>
+				<% end %>
+      </td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>
 <% end %>
+
+<%= link_to t("products.new.title"), products_path %>