voluntary_recruiting 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55641eb467512030495e3b1ba5ec426c2a6931c8
-  data.tar.gz: d862958729d6ef4314c52131cae3a7e12870ff3f
+  metadata.gz: c15d4b2c1d7fc57914c9e1595fb99c484a4cff30
+  data.tar.gz: 443f3fe702622964d81122c9a1d37fc8c68fb272
 SHA512:
-  metadata.gz: c6324e15b2116153d8238452a734d8cfe78149259831ce08d74a169ec74fec222751a9cdc15f0438241a42fb93ab9e2577d8abca87a99e1ef1b6206edd1d168d
-  data.tar.gz: 5d8ffcd55f363825e16f6f7b498ff010021af1922303e59968d268fc5ee923d67e0c45afb6085f24bc5d626ba77397c9ec8931f53414b10582bfd6177a5de43a
+  metadata.gz: 1af84f578a3606ca7323d310a576a15dfa60a4f7e6d901587f485d3cdd34eeddd3ba23e9b1e87ce08d4223ef24b2eba7cf8ff291ee385a9f3269cbba64537cd3
+  data.tar.gz: 6472041859cf05dcd96559c421eed238ca481e68f68a4526ccea53c4d6c0864c8873406a738790d866cd9facdb0d7eab8815a27617eeca6fede4474e561d2c9b

data/app/controllers/candidatures_controller.rb

@@ -34,6 +34,7 @@ class CandidaturesController < ApplicationController
     @candidature = Candidature.new(params[:candidature])
     @candidature.resource_type = 'User'
     @candidature.resource_id = current_user.id
+    @candidature.user_id = current_user.id
     
     if @candidature.save
       redirect_to @candidature, notice: t('general.form.successfully_created')
@@ -75,10 +76,10 @@ class CandidaturesController < ApplicationController
   private
   
   def find_candidature
-    @candidature = Candidature.includes(:vacancy, :resource, :comments).friendly.find(params[:id])
+    @candidature = Candidature.includes(:vacancy, :resource, :comments).find(params[:id])
   end
   
   def find_vacancy
-    @vacancy = params[:vacancy_id].present? ? Vacancy.friendly.find(params[:vacancy_id]) : nil
+    @vacancy = params[:vacancy_id].present? ? Vacancy.find(params[:vacancy_id]) : nil
   end
 end

data/app/controllers/vacancies_controller.rb

@@ -10,7 +10,7 @@ class VacanciesController < ApplicationController
   respond_to :html, :js, :json
   
   def index
-    @vacancies = @project ? @project.vacancies : Vacancy.all
+    @vacancies = @project ? @project.vacancies : Vacancy.where(type: nil).all
   end
   
   def show
@@ -25,6 +25,7 @@ class VacanciesController < ApplicationController
   
   def create
     @vacancy = Vacancy.new(params[:vacancy])
+    @vacancy.resource_type = 'User'
     
     if @vacancy.project.user_id == current_user.id
       @vacancy.do_open
@@ -41,11 +42,11 @@ class VacanciesController < ApplicationController
   end
   
   def edit
-    @vacancy = Vacancy.friendly.find(params[:id])
+    @vacancy = Vacancy.find(params[:id])
   end
   
   def update
-    @vacancy = Vacancy.friendly.find(params[:id])
+    @vacancy = Vacancy.find(params[:id])
     
     if @vacancy.update_attributes(params[:vacancy])
       redirect_to @vacancy, notice: t('general.form.successfully_updated')
@@ -55,7 +56,7 @@ class VacanciesController < ApplicationController
   end
 
   def destroy
-    @vacancy = Vacancy.friendly.find(params[:id])
+    @vacancy = Vacancy.find(params[:id])
     @vacancy.destroy
     redirect_to vacancies_url, notice: t('general.form.destroyed')
   end
@@ -79,7 +80,7 @@ class VacanciesController < ApplicationController
     
     @vacancy = Vacancy
     @vacancy = @vacancy.includes(:project, :candidatures, :comments) if action_name == 'show'
-    @vacancy = @vacancy.friendly.find(params[:id])
+    @vacancy = @vacancy.find(params[:id])
   end
   
   def find_project

data/app/models/candidature.rb

@@ -11,14 +11,11 @@ class Candidature < ActiveRecord::Base
 
   validates :vacancy_id, presence: true
   validates :offeror_id, presence: true
-  validates :resource_id, presence: true, uniqueness: { scope: [:resource_type, :vacancy_id] }
+  validates :resource_id, presence: true, uniqueness: { scope: [:resource_type, :vacancy_id] }, if: 'validate_resource_id?'
   #validates :name, presence: true, uniqueness: { scope: :vacancy_id }
   
   attr_accessible :vacancy, :vacancy_id, :name, :text
   
-  extend FriendlyId
-  friendly_id :name, use: :slugged
-  
   before_validation :set_offeror
   
   # association shortcuts
@@ -30,6 +27,12 @@ class Candidature < ActiveRecord::Base
     project.product
   end
   
+  protected
+  
+  def validate_resource_id?
+    true
+  end
+  
   private
   
   def set_offeror

data/app/models/state_machines/candidature.rb

@@ -30,12 +30,14 @@ module StateMachines::Candidature
         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.create_project_user?
+                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
+                )
+              end
               
-              if object.vacancy.limit == object.vacancy.candidatures.accepted.count
+              if object.vacancy.limit == object.vacancy.calculate_accepted_candidatures_amount
                 object.vacancy.close! unless object.vacancy.closed?
               end
             when 'denied'
@@ -48,7 +50,7 @@ module StateMachines::Candidature
       
       # state validations
       def candidatures_limit_not_reached
-        if vacancy.limit == vacancy.candidatures.where(state: 'accepted').count
+        if vacancy.limit == vacancy.calculate_accepted_candidatures_amount
           errors[:state] << I18n.t('activerecord.errors.models.vacancy.attributes.limit.reached')
         end
       end

data/app/models/vacancy.rb

@@ -13,23 +13,77 @@ class Vacancy < ActiveRecord::Base
   accepts_nested_attributes_for :candidatures, allow_destroy: true, reject_if: ->(t) { t['name'].blank? }
   scope :open, -> { where(state: 'open') }
   
-  
+  validates :resource_type, presence: true
   validates :project_id, presence: true
   validates :offeror_id, presence: true
-  validates :name, presence: true, uniqueness: { scope: :project_id }
-  validates :text, presence: true
-  validates :limit, presence: true
-  
-  attr_accessible :project_id, :name, :text, :limit, :candidatures_attributes
-  
-  extend FriendlyId
+  validates :name, presence: true
   
-  friendly_id :name, use: :slugged
+  attr_accessible :project_id, :name, :text, :limit, :timezone, :from_raw, :to_raw, :resource_type, :candidatures_attributes
   
   before_validation :set_defaults
   
   def candidatures_left
-    limit - candidatures.accepted.count
+    if limit
+      limit - candidatures.accepted.count
+    else
+      '∞'
+    end
+  end
+  
+  def from_raw
+    timezone && from ? from.in_time_zone(timezone).strftime('%Y-%m-%d %H:%M:%S') : ''
+  end
+  
+  def from_raw=(value)
+    if timezone && value.present?
+      datetime = Time.zone.parse(value)
+      args = [
+        datetime.strftime('%Y').to_i, datetime.strftime('%m').to_i, datetime.strftime('%d').to_i,
+        datetime.strftime('%H').to_i, datetime.strftime('%M').to_i, datetime.strftime('%S').to_i
+      ]
+      timezone_was = Time.zone
+      Time.zone = timezone
+      self.from = Time.zone.local *args
+    end
+  end
+  
+  def to_raw
+    timezone && to ? to.in_time_zone(timezone).strftime('%Y-%m-%d %H:%M:%S') : ''
+  end
+  
+  def to_raw=(value)
+    if timezone && value.present?
+      datetime = Time.zone.parse(value)
+      args = [
+        datetime.strftime('%Y').to_i, datetime.strftime('%m').to_i, datetime.strftime('%d').to_i,
+        datetime.strftime('%H').to_i, datetime.strftime('%M').to_i, datetime.strftime('%S').to_i
+      ]
+      timezone_was = Time.zone
+      Time.zone = timezone
+      self.to = Time.zone.local *args
+    end
+  end
+  
+  def ended?
+    if from.present? && Time.now < from
+      false
+    elsif from.blank? && to.present? && Time.now < to
+      false
+    elsif from.blank? && to.present?
+      true
+    elsif from.blank?
+      false
+    else
+      true
+    end
+  end
+  
+  def calculate_accepted_candidatures_amount
+    candidatures.accepted.count
+  end
+  
+  def create_project_user?
+    true
   end
   
   protected

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

@@ -1,13 +1,11 @@
 <%= simple_form_for(@candidature) do |f| %>
   <%= render partial: 'shared/form/error_messages', locals: { resource: @candidature } %>
   
-  <div class="form-inputs">
-    <%= @candidature.vacancy ? f.hidden_field(:vacancy_id) : f.association(:vacancy) %> 
-    <%= f.input :name %>
-    <%= f.input :text, input_html: {style: 'width: 500px; height:300px;'} %>
-  </div>
+  <%= @candidature.vacancy ? f.hidden_field(:vacancy_id) : f.association(:vacancy) %> 
+  <%= f.input :name %>
+  <%= f.input :text, input_html: {style: 'width: 500px; height:300px;'} %>
   
-  <div class="form-actions">
+  <div class="form-group">
     <%= f.button :submit %>
   </div>
 <% end %>

data/app/views/vacancies/_form.html.erb

@@ -1,15 +1,58 @@
-<%= simple_form_for(@vacancy, html: {class: 'form-horizontal'}) do |f| %>
+<%= simple_form_for(@vacancy, html: { class: 'form-horizontal' }, wrapper: :horizontal_form) do |f| %>
   <%= render partial: 'shared/form/error_messages', locals: { resource: @vacancy } %>
   
-  <div class="form-inputs">
-    <%= @vacancy.project ? f.hidden_field(:project_id) : f.association(:project) %> 
-    
-    <%= f.input :name %>
-    <%= f.input :text, input_html: {style: 'width: 500px; height:300px;'} %>
-    <%= f.input :limit %> 
+  <%= @vacancy.project ? f.hidden_field(:project_id) : f.association(:project) %> 
+  
+  <%= f.input :name %>
+  <%= f.input :text, input_html: {style: 'width: 500px; height:300px;'} %>
+  <%= f.input :limit %> 
+  
+  <div class="form-group string optional vacancy_timezone">
+    <label class="string optional control-label col-sm-3 control-label" for="vacancy_timezone">
+      <%= t('attributes.timezone') %>
+    </label>
+    <div class="col-sm-9">
+      <%= time_zone_select @vacancy, :timezone, nil, {}, id: 'vacancy_timezone', name: 'vacancy[timezone]', class: 'form-control' %>
+    </div>
   </div>
   
-  <div class="form-actions">
-    <%= f.button :submit %>
+  <div class="form-group string optional vacancy_from">
+    <label class="string optional control-label col-sm-3 control-label" for="vacancy_from">
+      <%= t('activerecord.attributes.vacancy.from') %>
+    </label>
+    <div class="col-sm-9">
+      <div class="datetime_picker" class="input-append date">
+        <%= text_field_tag :from_raw, @vacancy.from_raw, name: 'vacancy[from_raw]', 'data-format' => 'yyyy-MM-dd hh:mm:ss' %>
+        <span class="add-on">
+          <i data-time-icon="icon-time" data-date-icon="icon-calendar">
+          </i>
+        </span>
+      </div>
+    </div>
+  </div>
+  
+  <div class="form-group string optional vacancy_to">
+    <label class="string optional control-label col-sm-3 control-label" for="vacancy_to">
+      <%= t('activerecord.attributes.vacancy.to') %>
+    </label>
+    <div class="col-sm-9">
+      <div class="datetime_picker" class="input-append date">
+        <%= text_field_tag :to_raw, @vacancy.to_raw, name: 'vacancy[to_raw]', 'data-format' => 'yyyy-MM-dd hh:mm:ss' %>
+        <span class="add-on">
+          <i data-time-icon="icon-time" data-date-icon="icon-calendar">
+          </i>
+        </span>
+      </div>
+    </div>
+  </div>
+
+  <div class="form-group">
+    <div class="col-sm-offset-3 col-sm-9">
+      <%= f.button :submit %>
+    </div>
   </div>
 <% end %>
+
+<% content_for :document_ready do %>
+  $('#vacancy_timezone').val('<%= @vacancy.timezone %>')
+<% end %>

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

@@ -5,7 +5,7 @@
 
 <dl class="dl-horizontal">
   <%= show_associations :project %>
-  <%= show_attribute :limit, value: "#{@vacancy.candidatures_left} / #{@vacancy.limit}" %>
+  <%= show_attribute :limit, value: "#{@vacancy.calculate_accepted_candidatures_amount} / #{@vacancy.limit ? @vacancy.limit : '∞'}" %>
   <%= show_attribute :state %>
   <%= show_actions %>
 </dl>

data/app/views/workflow/project_owner/_candidatures.html.erb

@@ -18,8 +18,7 @@
             <%= render partial: 'shared/collection/table', locals: { 
               type: 'candidatures', collection: @candidatures[state], 
               columns: { 
-                'project_id' => 'vacancy.project', 'vacancy_id' => '', 'name' => 'user.name', 
-                'resource_id' => ''
+                'project_id' => 'vacancy.project', 'vacancy_id' => '', 'resource_id' => ''
               },
               options: {show_title: false, append_new_link: false }
             } %>

data/config/locales/resources/candidature/en.yml

@@ -15,4 +15,9 @@ en:
       events:
         accept: Accept
         deny: Deny
-        quit: Quit
+        quit: Quit
+        
+  activerecord:
+    attributes:
+      candidature:
+        resource_id: Resource

data/config/locales/resources/vacancy/en.yml

@@ -20,10 +20,15 @@ en:
         close: Close
         reopen: Reopen
        
-  activerecord:     
+  activerecord:
+    models:
+      vacancy: Vacancy
+         
     attributes:
       vacancy:
         limit: Limit
+        from: From
+        to: To
         
     errors:   
       models:  

data/db/migrate/20151012141951_add_timespan_to_vacancy.rb

@@ -0,0 +1,19 @@
+class AddTimespanToVacancy < ActiveRecord::Migration
+  def up
+    add_column :vacancies, :timezone, :string
+    add_column :vacancies, :from, :datetime
+    add_column :vacancies, :to, :datetime
+    remove_index :vacancies, name: 'index_vacancies_on_project_id_and_name'
+    add_column :candidatures, :user_id, :integer
+    
+    Candidature.where(resource_type: 'User').update_all('user_id = resource_id')
+  end
+  
+  def down
+    remove_column :vacancies, :timezone
+    remove_column :vacancies, :from
+    remove_column :vacancies, :to
+    add_index :vacancies, [:project_id, :name], unique: true
+    remove_column :candidatures, :user_id
+  end
+end

data/lib/voluntary_recruiting/controller/project_owner_controller.rb

@@ -15,7 +15,15 @@ module VoluntaryRecruiting
               # eval("@#{controller}[state] = current_user.offeror_#{controller}.where(state: state).limit(5)")
               collection = controller.to_s.classify.constantize.where(
                 query, user_id: current_user.id, state: state
-              ).order('created_at DESC').limit(5)
+              )
+              
+              if controller == :vacancies
+                collection = collection.where(type: nil)
+              elsif controller == :candidatures
+                collection = collection.where(resource_type: 'User')
+              end
+              
+              collection.order('created_at DESC').limit(10)
               eval("@#{controller}[state] = collection")
             end
           end

data/lib/voluntary_recruiting/version.rb

@@ -1,3 +1,3 @@
 module VoluntaryRecruiting
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voluntary_recruiting
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Mathias Gawlista
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: voluntary
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: letter_opener
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +262,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
-description: Recruiting plugin for voluntary gem.
+description: "#Crowdsourcing gem voluntary's recruiting plugin: http://bit.ly/vrec-0-1-0"
 email:
 - gawlista@gmail.com
 executables: []
@@ -298,6 +298,7 @@ files:
 - config/locales/resources/vacancy/en.yml
 - config/routes.rb
 - db/migrate/20150711124651_add_recruiting.rb
+- db/migrate/20151012141951_add_timespan_to_vacancy.rb
 - lib/tasks/voluntary_recruiting_tasks.rake
 - lib/voluntary_recruiting.rb
 - lib/voluntary_recruiting/ability.rb