voluntary_classified_advertisement 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e0af2c11128cde4f2e14162a635847dd6d9670d
-  data.tar.gz: f178c2fb85b1c6ccd85dfba6a75ff54118c536c8
+  metadata.gz: aec7ac6a224d0308649e238c69b9e9fef327aa57
+  data.tar.gz: 970a05e0b18a896868f1f0311458c6177f1975e4
 SHA512:
-  metadata.gz: bcbb2fb9157aaf9aaee2e181496b669dade19a7323ec615c0a82069601fcbc5ebc647f6faa9953de3975c78144d4e38657646da39f6a5f184d35c425f0a601f0
-  data.tar.gz: 85e1aa022bfd4cfbcae1980bca93bfee9d5906f1576308f7eecf082f68d32ef288beef320c92f52fafd2f99d7ad6647c96eb0b9626ca2f20b9826d17c19f1c12
+  metadata.gz: da23cf8bd51cf0f6b648f5966f26582eeff549508a6467ec9ec75489b4bb8f1b8871775592bd1cee8a3f5c31cc2480195cb7c2a8cd5ffddf970936d8fdbbb7fd
+  data.tar.gz: 730e52f3bcddc1977b305bd112d9a67312a590ed23eb6a400d421a101ce26561fd1c5e88f2d93203774656e132686bfddf753c0c0df5723df543df59930b157d

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.3.0 (October 29, 2015) ##
+
+* [#7](https://github.com/volontariat/voluntary_classified_advertisement/issues/7) Custom task page
+* [#6](https://github.com/volontariat/voluntary_classified_advertisement/issues/6) Calendar view of story tasks
+* [#5](https://github.com/volontariat/voluntary_classified_advertisement/issues/5) Task Form and Management "2.0"
+* [#4](https://github.com/volontariat/voluntary_classified_advertisement/issues/4) Story Form and Management "2.0"
+
 ## 0.2.0 (April 10, 2015) ##
 
 *   #3 Rails 4.2.1 upgrade and Travis setup.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 YOURNAME
+Copyright 2013 Mathias Gawlista
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/controllers/classified_advertisement/tasks_controller.rb

@@ -0,0 +1,40 @@
+module ClassifiedAdvertisement
+  class TasksController < ApplicationController
+    def calendar
+      @story = Story.find params[:story_id]  
+    end
+    
+    def events
+      @story = Story.find params[:story_id]
+      tasks = @story.tasks.where(:from.gte => params[:start], :to.lt => params[:end])
+      
+      tasks = tasks.map do |task|
+        { title: task.name, url: task_path(task), start: task.from.to_s, end: task.to.to_s }
+      end
+     
+      render json: tasks
+    end
+    
+    def sign_up_form
+      @task = Task.find(params[:id])
+      @amount = @task.vacancy.candidatures.where(user_id: current_user.id).first.try(:amount)
+      
+      render layout: false
+    end
+    
+    def sign_up
+      task = Task.find(params[:id])
+      params[:candidature] ||= {}
+      @error = task.sign_up(current_user.id, params[:candidature][:amount])
+      
+      render layout: false
+    end
+    
+    def sign_out
+      task = Task.find(params[:id])
+      @error = task.sign_out(current_user.id)
+      
+      render layout: false
+    end
+  end
+end

data/app/helpers/voluntary_classified_advertisement/tasks_helper.rb

@@ -0,0 +1,17 @@
+module VoluntaryClassifiedAdvertisement
+  module TasksHelper
+    def tasks_with_candidatures(user)
+      task_ids, vacancy_to_task_id = [], {}
+      
+      if user_signed_in?
+        @tasks.each{|t| vacancy_to_task_id[t.vacancy_id] = t.id }
+        
+        Candidature.where(user_id: current_user.id, vacancy_id: @tasks.map(&:vacancy_id)).each do |candidature|
+          task_ids << vacancy_to_task_id[candidature.vacancy_id]
+        end
+      end
+      
+      task_ids
+    end
+  end
+end

data/app/models/product/classified_advertisement/candidature.rb

@@ -1,20 +1,7 @@
 class Product::ClassifiedAdvertisement::Candidature < ::Candidature
-  accepts_nested_attributes_for :resource
+  protected
   
-  attr_accessible :resource_attributes
-  
-  def resource_attributes=(attributes)
-    self.resource = if attributes[:id].present?
-      Asset.find(attributes[:id])
-    else
-      Asset.new
-    end
-    
-    self.resource.attributes = attributes
-    
-    self.resource.save
-  
-    self.resource_type = 'Asset'
-    self.resource_id = self.resource.id
+  def validate_resource_id?
+    resource_type == 'User' || vacancy.resource_type == 'User'
   end
 end

data/app/models/product/classified_advertisement/story.rb

@@ -1,19 +1,18 @@
 class Product::ClassifiedAdvertisement::Story < Story
   has_many :tasks, dependent: :destroy, class_name: 'Product::ClassifiedAdvertisement::Task', inverse_of: :story
   
-  def tasks_attributes=(attributes)
-    self.tasks ||= []
-    
-    attributes.each do |index, task_attributes|
-      destroy = task_attributes.delete :_destroy
-      
-      if task_attributes[:id].present? && destroy.to_i == 1
-        self.tasks.where(id: task_attributes[:id]).destroy_all
-      elsif task_attributes[:id].present?
-        tasks.find(task_attributes[:id]).update_attributes(task_attributes)
-      else
-        self.tasks.build(task_attributes)
-      end
-    end
+  field :address, type: String
+  field :lat, type: String
+  field :lon, type: String
+  field :address_description, type: String
+  
+  attr_accessible :address, :lat, :lon, :address_description
+  
+  def after_creation_path
+    Rails.application.routes.url_helpers.story_tasks_path(self)
+  end
+  
+  def custom_tasks
+    tasks.order('from ASC, to ASC')
   end
 end

data/app/models/product/classified_advertisement/task.rb

@@ -1,65 +1,32 @@
 class Product::ClassifiedAdvertisement::Task < ::Task
   belongs_to :story, class_name: 'Product::ClassifiedAdvertisement::Story', inverse_of: :task
   
-  attr_accessible :vacancies_attributes
-  attr_writer :vacancies
-  
   validates :text, presence: true
   
-  validate :at_least_one_vacancy
+  attr_accessible :vacancy_attributes
+  attr_writer :vacancy
   
-  after_save :save_dependencies
-  after_destroy :destroy_non_mongodb_records
+  field :vacancy_id, type: Integer
+  field :address, type: String
+  field :lat, type: String
+  field :lon, type: String
+  field :address_description, type: String
+  field :from, type: DateTime
+  field :to, type: DateTime
+  field :resource_type, type: String
   
-  state_machine :state, initial: :new do
-    state :under_supervision do
-      validate :new_candidature_present?
-    end
-  end
+  attr_accessible :address, :lat, :lon, :address_description, :from, :to, :resource_type
   
-  def vacancies
-    @vacancies ||= new_record? ? [vacancy_class.new(task: self)] : vacancy_class.where(task_id: id.to_s)
-  end
+  before_validation :validate_vacancy
+  after_create :set_vacancy_task_association
+  after_destroy :destroy_non_mongodb_records
   
-  def vacancies_attributes=(attributes = {})
-    self.vacancies = [] if self.vacancies.length == 1 && self.vacancies.first.new_record?
-    
-    attributes.select{|k,v| (v[:name].present? && v[:text].present?) || v[:id].present? }.each do |index, vacancy_attributes|
-      destroy = vacancy_attributes.delete :_destroy
-      vacancy_attributes[:task] = self
-      vacancy = nil
-      
-      if vacancy_attributes[:id].present? && destroy.to_i == 1
-        begin; vacancy_class.destroy(vacancy_attributes[:id]); rescue ActiveRecord::RecordNotFound; end
-        @vacancies.select!{|v| v.id != vacancy_attributes[:id]}
-      elsif vacancy_attributes[:id].present?
-        begin; vacancy = vacancy_class.find(vacancy_attributes[:id]); rescue ActiveRecord::RecordNotFound; end
-        
-        vacancy_id = vacancy_attributes.delete(:id)
-        
-        vacancy.update_attributes(vacancy_attributes) if vacancy.present?
-        
-        vacancy_attributes[:id] = vacancy_id
-      else
-        vacancy = vacancy_class.new(vacancy_attributes)
-      end
-      
-      next unless vacancy.present?
-      
-      if vacancy_attributes[:id].present?
-        self.vacancies.each_with_index do |current_vacancy, vacancies_index|
-          if current_vacancy.id.to_s == vacancy_attributes[:id]
-            self.vacancies[vacancies_index] = vacancy
-          end
-        end
-      else
-        self.vacancies << vacancy
-      end
-    end
+  def vacancy_attributes=(value)
+    vacancy.update value
   end
   
-  def vacancies_attributes
-    @vacancies_attributes ||= (vacancies.empty? ? [vacancy_class.new(task: self)] : vacancies).map{|v| v.attributes}
+  def vacancy
+    @vacancy ||= new_record? ? vacancy_class.new(task: self) : vacancy_class.find(vacancy_id)
   end
   
   def vacancy_class
@@ -89,54 +56,52 @@ class Product::ClassifiedAdvertisement::Task < ::Task
     super(transition)
   end
   
-  private
-  
-  def at_least_one_vacancy
-    unless vacancies.select(&:valid?).any?
-      errors.add(:base, I18n.t('activerecord.errors.models.task.attributes.base.no_vacancies'))
+  def sign_up(current_user_id, amount = nil)
+    amount = vacancy.resource_type == 'User' ? 1 : amount
+    user_candidature = vacancy.candidatures.where(user_id: current_user_id).first
+    
+    if amount == user_candidature.try(:amount)
+      return I18n.t('tasks.sign_up.already_signed_up')
+    elsif vacancy.calculate_accepted_candidatures_amount == vacancy.limit && amount > user_candidature.try(:amount)
+      return I18n.t('tasks.sign_up.limit_reached')
     end
+    
+    candidature = user_candidature ? user_candidature : vacancy.candidatures.new
+    candidature.user_id = current_user_id
+    candidature.resource_type = vacancy.resource_type
+    candidature.resource_id = current_user_id if vacancy.resource_type == 'User'
+    candidature.amount = amount
+    user_candidature ? candidature.save : candidature.accept
+    
+    nil
   end
   
-  def save_dependencies
-    vacancies.select(&:new_record?).each do |vacancy|
-      vacancy.task = self
-      vacancy.do_open
-    end
+  def sign_out(current_user_id)
+    user_candidature = vacancy.candidatures.where(user_id: current_user_id).first
+    
+    return I18n.t('tasks.sign_out.not_signed_up') unless user_candidature
+      
+    user_candidature.destroy
+    
+    nil
   end
   
-  def new_candidature_present?
-    vacancies.each do |vacancy|
-      new_candidatures = vacancy.candidatures.select{|c| c.state == 'new'}
-      
-      if new_candidatures.none?
-        errors.add(
-          :base, 
-          I18n.t(
-            'activerecord.errors.models.task.attributes.base.' + 
-            'only_one_new_candidature'
-          )
-        )
-      elsif new_candidatures.length == 1 && !new_candidatures.first.resource.valid?
-        errors.add(
-          :base, 
-          I18n.t(
-            'activerecord.errors.models.task.attributes.base.' + 
-            'candidature_resource_invalid'
-          )
-        )  
-      elsif new_candidatures.length != 1
-        errors.add(
-          :base, 
-          I18n.t(
-            'activerecord.errors.models.task.attributes.base.' + 
-            'only_one_new_candidature'
-          )
-        )
-      end
+  private
+  
+  def validate_vacancy
+    unless vacancy.valid?
+      errors[:base] << I18n.t('tasks.save.vacancy_invalid')
     end
   end
   
+  def set_vacancy_task_association
+    vacancy.do_open
+    vacancy.task_id = id
+    vacancy.save!
+    update_attribute :vacancy_id, vacancy.id
+  end
+  
   def destroy_non_mongodb_records
-    vacancies.destroy_all
+    vacancy.destroy
   end
 end

data/app/models/product/classified_advertisement/vacancy.rb

@@ -1,63 +1,14 @@
 class Product::ClassifiedAdvertisement::Vacancy < ::Vacancy
   has_many :candidatures, dependent: :destroy, class_name: 'Product::ClassifiedAdvertisement::Candidature', inverse_of: :vacancy
   
+  validates :timezone, presence: true
+  validates :from_raw, presence: true
+  validates :to_raw, presence: true
+  
   attr_accessible :task_id, :task
   
   after_initialize :set_defaults
-
-=begin
-  has_many :candidatures, -> do
-    order(%Q{
-      CASE 
-        WHEN candidatures.state='new' THEN 1 
-        WHEN candidatures.state='accepted' THEN 2 
-        WHEN candidatures.state='denied' THEN 3 
-        ELSE 4 
-      END
-    })
-  end
-=end
-
-  validates :task, presence: true
-  
-  def candidatures_attributes=(attributes)
-    self.candidatures ||= []
-    
-    attributes.each do |index, candidature_attributes|
-      destroy = candidature_attributes.delete :_destroy
-      
-      if candidature_attributes[:id].present? && destroy.to_i == 1
-        begin; candidature_class.destroy(candidature_attributes[:id]); rescue ActiveRecord::RecordNotFound; end
-        @candidatures.select!{|v| v.id != candidature_attributes[:id]}
-        next
-      end
-      
-      candidature_attributes[:vacancy] = self
-      candidature = nil
-      
-      if candidature_attributes[:id].present?
-        begin; candidature = candidature_class.find(candidature_attributes[:id]); rescue ActiveRecord::RecordNotFound; end
-        
-        candidature_attributes.delete(:id)
-        
-        candidature.attributes = candidature_attributes if candidature.present?
-      else
-        candidature = candidature_class.new(candidature_attributes)
-      end
-      
-      next unless candidature.present?
-      
-      if candidature_attributes[:id].present?
-        self.candidatures.each_with_index do |current_candidature, candidatures_index|
-          if current_candidature.id.to_s == candidature_attributes[:id]
-            self.candidatures[candidatures_index] = candidature
-          end
-        end
-      else
-        self.candidatures << candidature
-      end
-    end
-  end
+  after_update :set_cached_task_attributes
   
   def task
     @task ||= task_class.where(id: task_id).first
@@ -88,13 +39,13 @@ class Product::ClassifiedAdvertisement::Vacancy < ::Vacancy
     @product ||= project.product if project
   end
   
-  #def new_or_accepted_candidature
-  #  candidatures.where(state: ['new', 'accepted']).first
-  #end
+  def calculate_accepted_candidatures_amount
+    candidatures.accepted.sum('amount')
+  end
   
-  #def denied_candidatures
-  #  candidatures.where(state: 'denied')
-  #end
+  def create_project_user?
+    false
+  end
   
   protected
   
@@ -103,4 +54,10 @@ class Product::ClassifiedAdvertisement::Vacancy < ::Vacancy
     
     super
   end
+  
+  private
+  
+  def set_cached_task_attributes
+    task.update_attributes(from: from, to: to, resource_type: resource_type)
+  end
 end

data/app/views/classified_advertisement/tasks/_navigation.html.erb

@@ -0,0 +1,8 @@
+<ul class="nav nav-pills">
+  <li role="presentation" class="<%= current_page?(story_tasks_path(@story)) ? 'active' : '' %>">
+    <%= link_to t('general.list'), story_tasks_path(@story) %>
+  </li>
+  <li role="presentation" class="<%= current_page?(calendar_story_tasks_path(@story)) ? 'active' : '' %>">
+    <%= link_to t('general.calendar'), calendar_story_tasks_path(@story) %>
+  </li>
+</ul>

data/app/views/classified_advertisement/tasks/calendar.html.erb

@@ -0,0 +1,23 @@
+<% content_for :stylesheet_includes do %>
+  <%= stylesheet_link_tag 'fullcalendar' %>
+<% end %>
+
+<%= render partial: 'classified_advertisement/tasks/navigation' %>
+
+<div id="calendar"></div>
+
+<p style="margin-top:15px;">
+  <%= link_to new_story_task_path(@story), class: 'btn btn-default' do %>
+    <span class="glyphicon glyphicon-plus"></span> <%= t("tasks.new.title") %>
+  <% end %>
+</p>
+
+<% content_for :document_ready do %>
+  $('#calendar').fullCalendar({
+    events: '<%= events_story_tasks_path(@story, format: 'json') %>'
+  });
+<% end %>
+
+<% content_for :javascript_includes do %>
+  <%= javascript_include_tag 'fullcalendar' %>
+<% end %>

data/app/views/classified_advertisement/tasks/sign_out.js.erb

@@ -0,0 +1,5 @@
+<% if @error.present? %>
+  alert("<%= @error %>");
+<% else %>
+  window.location.reload();
+<% end %>

data/app/views/classified_advertisement/tasks/sign_up.js.erb

@@ -0,0 +1,5 @@
+<% if @error.present? %>
+  alert("<%= @error %>");
+<% else %>
+  window.location.reload();
+<% end %>

data/app/views/classified_advertisement/tasks/sign_up_form.html.erb

@@ -0,0 +1,23 @@
+<div class="modal-dialog">
+  <div class="modal-content">
+    <%= form_tag sign_up_task_path(@task.id), method: :put, remote: true, class: 'form-horizontal' do %>
+      <div class="modal-header">
+        <h3><%= t('general.sign_up') %></h3>
+      </div>
+      <div class="modal-body">
+        <div class="form-group string required candidature_amount">
+          <label class="string required control-label col-sm-3 control-label" for="candidature_amount">
+            <abbr title="required">*</abbr> <%= t('activerecord.attributes.candidature.amount') %>
+          </label>
+          <div class="col-sm-9">
+            <input class="string required form-control" type="text" name="candidature[amount]" id="candidature_amount" value="<%= @amount %>">
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('general.close') %></button>
+        <%= submit_tag t('general.submit'), class: 'btn btn-default' %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/products/types/classified_advertisement/stories/_task_fields.html.erb

@@ -4,17 +4,14 @@
 
   <%= f.check_box :_destroy %>
   <%= f.label :_destroy, t('general.destroy') %>
-  <div class="form-actions">
-    <div class="control-group string required" style="display: block">
-      <div class="controls">
-        &nbsp;&nbsp;&nbsp;&nbsp;
-        <%= link_to_add_fields(
-          t('stories.steps.setup_tasks.add_vacancy'), f, :vacancies, target: 'setup_vacancies_input'
-        ) %>
-      </div>
-    </div>
-  </div>
   
+  <div class="form-group">
+    &nbsp;&nbsp;&nbsp;&nbsp;
+    <%= link_to_add_fields(
+      t('stories.steps.setup_tasks.add_vacancy'), f, :vacancies, target: 'setup_vacancies_input'
+    ) %>
+  </div>
+
   <fieldset>
     <legend><%= t('vacancies.index.title')%></legend>
     <div id="setup_vacancies_input" class="form-inputs">

data/app/views/products/types/classified_advertisement/tasks/_collection.html.erb

@@ -0,0 +1,76 @@
+<%= render partial: 'classified_advertisement/tasks/navigation' %>
+
+<% if @tasks.none? || @tasks.select{|e| e.id.present? }.none? %>
+<p><%= I18n.t("tasks.index.empty_collection")%></p>
+<% else %>
+<table class="table table-striped">
+  <thead>
+    <tr class="<%= cycle('odd', 'even') %>">
+      <th><%= t('attributes.name') %></th>
+      <th><%= t('attributes.resource_type') %>
+      <th><%= t('attributes.from') %>
+      <th><%= t('attributes.to') %>
+      <th><%= t('activerecord.attributes.vacancy.limit') %></th>
+      <% if user_signed_in? %><th></th><% end %>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+  <% tasks_with_candidatures_of_current_user = tasks_with_candidatures(current_user) %> 
+  <% @tasks.select{|e| e.id.present? }.each do |task| %>
+    <% accepted_candidatures_amount = task.vacancy.calculate_accepted_candidatures_amount %>
+    <tr class="<%= cycle('odd', 'even') %>">
+      <td><%= link_to task.name, task_path(task) %></td>
+      <td><%= task.resource_type %></td>  
+      <td><%= task.from ? l(task.from, format: :default) : '-' %></td>
+      <td><%= task.to ? l(task.to, format: :default) : '-' %></td>
+      <td>
+        <%= accepted_candidatures_amount %> / <%= task.vacancy.limit || '∞' %>
+      </td>
+      <% if user_signed_in? %>
+      <td>
+        <%= render partial: 'products/types/classified_advertisement/tasks/state_switch', locals: { task: task, accepted_candidatures_amount: accepted_candidatures_amount, signed_up: tasks_with_candidatures_of_current_user.include?(task.id) } %>
+      </td>
+      <% end %>
+      <td>
+        <% if !task.is_a?(Column) && (
+          can?(:destroy, task) || can?(:edit, task) || (
+              task.respond_to?(:state_events) && task.state_events.select{|event| can? event, task }.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, task %>    
+            <li>
+              <%= link_to(
+                t('general.destroy'), task_path(task.id), id: "task_#{task.id}", method: :delete, 
+                data: { confirm: t('general.questions.are_you_sure') },
+                onclick: "delete_link('task_#{task.id}'); return false;"
+              ) 
+              %>
+            </li>
+          <% end %>
+          <% if can? :edit, task %>    
+            <li><%= link_to t('general.edit'), eval("edit_task_path(task)") %></li>
+          <% end %>
+          <% links = event_links_for_resource(task, 'tasks') %>
+          <% if links.any? %>
+            <li class="divider"></li>
+            <%= render 'shared/resource/event_elements', links: links %>
+          <% end %>
+          </ul>
+        </div>
+        <% end %>
+      </td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>
+<% end %>
+
+<p style="margin-top:15px;">
+  <%= link_to new_story_task_path(@story), class: 'btn btn-default' do %>
+    <span class="glyphicon glyphicon-plus"></span> <%= t("tasks.new.title") %>
+  <% end %>
+</p>

data/app/views/products/types/classified_advertisement/tasks/_form.html.erb

@@ -0,0 +1,134 @@
+<%= simple_form_for(@task, url: @task.new_record? ? tasks_path : task_path(@task), as: :task, html: {class: 'form-vertical', style: 'margin-bottom:15px;'}) do |f| %>
+  <%= hidden_field_tag :story_id, @task.story_id %>
+  <%= f.input :name %>  
+  <%= f.input :text, as: :text %>
+  
+  <fieldset class="fieldset" style="border: 1px solid black; padding:15px; margin-top:15px;">
+    <legend style="margin-bottom: 0px;"><%= t('activerecord.models.vacancy') %></legend>
+    
+    <div class="form-group string optional vacancy_resource_type <%= params[:task].present? && @task.vacancy.resource_type.blank? ? ' has-error' : '' %>">
+      <label class="string optional control-label control-label" for="vacancy_resource_type">
+        <abbr title="required">*</abbr> <%= t('attributes.resource_type') %>
+      </label>
+      <%= select_tag :resource_type, options_for_select(['User', 'Thing'], @task.vacancy.resource_type), id: 'vacancy_resource_type', name: 'task[vacancy_attributes][resource_type]', class: 'string required form-control' %>
+      <% if params[:task].present? && @task.vacancy.resource_type.blank? %>
+        <span class="help-block"><%= t('errors.messages.blank') %></span>
+      <% end %>
+    </div>
+    
+    <div class="form-group string required vacancy_name <%= params[:task].present? && @task.vacancy.name.blank? ? ' has-error' : '' %>">
+      <label class="string required control-label control-label" for="vacancy_name">
+        <abbr title="required">*</abbr> <%= t('attributes.name') %>
+      </label>
+      <%= text_field_tag :name, @task.vacancy.name, id: 'vacancy_name', name: 'task[vacancy_attributes][name]', class: 'string required form-control' %>
+      <% if params[:task].present? && @task.vacancy.name.blank? %>
+        <span class="help-block"><%= t('errors.messages.blank') %></span>
+      <% end %>
+    </div>
+    
+    <div class="form-group string optional vacancy_limit">
+      <label class="string optional control-label control-label" for="vacancy_limit">
+        <%= t('activerecord.attributes.vacancy.limit') %>
+      </label>
+      <%= text_field_tag :limit, @task.vacancy.limit, id: 'vacancy_limit', name: 'task[vacancy_attributes][limit]', class: 'string optional form-control' %>
+    </div>
+    
+    <div class="form-group string optional vacancy_timezone <%= params[:task].present? && @task.vacancy.timezone.blank? ? ' has-error' : '' %>">
+      <label class="string optional control-label control-label" for="vacancy_timezone">
+        <%= t('attributes.timezone') %>
+      </label>
+      <%= time_zone_select @task.vacancy, :timezone, nil, {}, id: 'vacancy_timezone', name: 'task[vacancy_attributes][timezone]', class: 'form-control', class: 'string required form-control' %>
+      <% if params[:task].present? && @task.vacancy.timezone.blank? %>
+        <span class="help-block"><%= t('errors.messages.blank') %></span>
+      <% end %>
+    </div>
+    
+    <div class="form-group string optional vacancy_from_raw <%= params[:task].present? && @task.vacancy.from_raw.blank? ? ' has-error' : '' %>">
+      <label class="string optional control-label control-label" for="vacancy_from_raw">
+        <%= t('activerecord.attributes.vacancy.from') %>
+      </label>
+      <div class="datetime_picker" class="input-append date">
+        <%= text_field_tag :from_raw, @task.vacancy.from_raw, id: 'vacancy_from_raw', name: 'task[vacancy_attributes][from_raw]', 'data-format' => 'yyyy-MM-dd hh:mm:ss', style: 'width:165px;', class: 'string required form-control' %>
+        <span class="add-on">
+          <i data-time-icon="icon-time" data-date-icon="icon-calendar">
+          </i>
+        </span>
+        <% if params[:task].present? && @task.vacancy.from_raw.blank? %>
+          <span class="help-block"><%= t('errors.messages.blank') %></span>
+        <% end %>
+      </div>
+    </div>
+    
+    <div class="form-group string optional vacancy_to_raw <%= params[:task].present? && @task.vacancy.to_raw.blank? ? ' has-error' : '' %>">
+      <label class="string optional control-label control-label" for="vacancy_to_raw">
+        <%= t('activerecord.attributes.vacancy.to') %>
+      </label>
+      <div class="datetime_picker" class="input-append date">
+        <%= text_field_tag :to_raw, @task.vacancy.to_raw, id: 'vacancy_to_raw', name: 'task[vacancy_attributes][to_raw]', 'data-format' => 'yyyy-MM-dd hh:mm:ss', style: 'width:165px;', class: 'string required form-control' %>
+        <span class="add-on">
+          <i data-time-icon="icon-time" data-date-icon="icon-calendar">
+          </i>
+        </span>
+        <% if params[:task].present? && @task.vacancy.to_raw.blank? %>
+          <span class="help-block"><%= t('errors.messages.blank') %></span>
+        <% end %>
+      </div>
+    </div>
+  </fieldset>
+  
+  <fieldset class="fieldset" style="border: 1px solid black; padding:15px; margin-top:15px; margin-bottom:15px;">
+    <legend style="margin-bottom: 0px;"><%= t('attributes.address') %></legend>
+    <div class="form-group string optional task_address">
+      <label class="string optional control-label control-label" for="task_address"><%= t('attributes.string') %></label>
+      <input name="task[address]" id="task_address" value="<%= @task.address %>" class="string optional form-control"/>
+      <div id="task_map" style="width: 500px; height: 400px; margin-top:15px;"></div>
+      <input type="hidden" name="task[lat]" id="task_lat" value="<%= @task.lat %>"/> 
+      <input type="hidden" name="task[lon]" id="task_lon" value="<%= @task.lon %>"/>  
+    </div>
+    
+    <div class="form-group string optional task_address_description">
+      <label class="string optional control-label control-label" for="task_address_description"><%= t('attributes.description') %></label>
+      <input name="task[address_description]" id="task_address_description" value="<%= @task.address_description %>" class="string optional form-control"/>
+    </div>
+  </fieldset>
+  
+  <%= f.button :submit %>
+<% end %>
+
+<% content_for :javascript_includes do %>
+  <script type="text/javascript" src='http://maps.google.com/maps/api/js?sensor=false&libraries=places'></script>
+  <%= javascript_include_tag 'voluntary/optional_lib/jquery.location_picker.js' %>
+<% end %>
+
+<% content_for :document_ready do %>
+  var lat = "<%= @task.lat %>";
+  var lon = "<%= @task.lon %>";
+  
+  function initLocationPicker(position) {
+    options = {
+      radius: 300,
+      inputBinding: {
+        latitudeInput: $('#task_lat'),
+        longitudeInput: $('#task_lon'),
+        locationNameInput: $('#task_address')
+      },
+      enableAutocomplete: true
+    }
+    
+    if(position) {
+      options['location'] = { latitude: position.coords.latitude, longitude: position.coords.longitude }
+    } else if (lat != "") {
+      options['location'] = { latitude: lat, longitude: lon }
+    }
+    
+    $('#task_map').locationpicker(options);
+  }
+  
+  if(lat == "" && navigator.geolocation) {
+    navigator.geolocation.getCurrentPosition(initLocationPicker);
+  } else {
+    initLocationPicker(null);
+  }
+  
+  $('#vacancy_timezone').val('<%= @task.vacancy.timezone %>')
+<% end %>

data/app/views/products/types/classified_advertisement/tasks/_state_switch.html.erb

@@ -0,0 +1,17 @@
+<% if signed_up %>
+  <% if task.vacancy.resource_type == 'Thing' %>
+    <%= link_to t('tasks.show.change_signing'), change_signing_task_path(task.id), class: 'btn btn-warning btn-xs remote_modal_link' %>
+  <% end %>
+  
+  <%= link_to t('general.sign_out'), sign_out_task_path(task.id), method: :delete, remote: true, data: { confirm: t('general.questions.are_you_sure') }, class: 'btn btn-danger btn-xs' %>
+<% else %>
+  <% if (task.vacancy.limit.blank? || accepted_candidatures_amount < task.vacancy.limit) && !task.vacancy.ended? %>
+    <% if task.vacancy.resource_type == 'User' %>
+      <%= link_to t('general.sign_up'), sign_up_task_path(task.id), method: :put, remote: true, class: 'btn btn-success btn-xs' %>
+    <% else %>
+      <%= link_to t('general.sign_up'), sign_up_task_path(task.id), class: 'btn btn-success btn-xs remote_modal_link' %>
+    <% end %>
+  <% else %>
+    <%= link_to t('general.sign_up'), '#', class: 'btn btn-danger btn-xs disabled' %></a>
+  <% end %>
+<% end %>

data/app/views/products/types/classified_advertisement/tasks/show.html.erb

@@ -0,0 +1,42 @@
+<% accepted_candidatures_amount = resource.vacancy.calculate_accepted_candidatures_amount %>
+<% signed_up = Candidature.where(user_id: current_user.id, vacancy_id: resource.vacancy_id).any? %>
+<h3><%= resource.name %></h3>
+
+<% if resource.text.present? %>
+  <%= markdown resource.text %>
+<% end %>
+
+<dl class="dl-horizontal">
+  <%= show_attribute :vacancy_title, title: t('tasks.show.vacancy_title'), value: resource.vacancy.name %>
+  <%= show_attribute :from, title: t('attributes.from'), value: resource.from ? l(resource.from, format: :default) : '-' %>
+  <%= show_attribute :to, title: t('attributes.to'), value: resource.to ? l(resource.to, format: :default) : '-' %>
+  <%= show_attribute :limit, title: t('activerecord.attributes.vacancy.limit'), value: "#{accepted_candidatures_amount} / #{resource.vacancy.limit ? resource.vacancy.limit : '∞'}" %>
+  <%= show_attribute :sign_up, title: t('general.sign_up') + ' / ' + t('general.sign_out'), value: render(partial: 'products/types/classified_advertisement/tasks/state_switch', locals: { task: resource, accepted_candidatures_amount: accepted_candidatures_amount, signed_up: signed_up }) %>
+  <%= show_actions %>
+</dl>
+
+<% if @task.lat.present? %>
+  <h4><%= t('attributes.address') %></h4>
+  
+  <p><strong><%= t('attributes.string') %>:</strong> <%= resource.address %></p>
+  
+  <% if resource.address_description.present? %>
+    <p><strong><%= t('attributes.description') %></strong> <%= resource.address_description %></p>
+  <% end %>
+  
+  <div id="task_map" style="width: 500px; height: 400px; margin-top:15px;"></div>
+  
+  <% content_for :javascript_includes do %>
+    <script type="text/javascript" src='http://maps.google.com/maps/api/js?sensor=false&libraries=places'></script>
+    <%= javascript_include_tag 'voluntary/optional_lib/jquery.location_picker.js' %>
+  <% end %>
+  
+  <% content_for :document_ready do %>
+    $('#task_map').locationpicker({
+      location: { latitude: "<%= @task.lat %>", longitude: "<%= @task.lon %>" },
+      radius: 300
+    });
+  <% end %>
+<% end %>
+
+<p>&nbsp;</p>

data/app/views/products/types/classified_advertisement/wizard.html.erb

@@ -0,0 +1,45 @@
+<% if @story.new_record? %>
+  <h1><%= t('stories.new.title') %></h1>
+<% else %>
+  <h1><%= t('stories.edit.title') %></h1>
+<% end %>
+
+<%= simple_form_for(@story, url: @story.new_record? ? stories_path : story_path(@story), as: :story, html: {class: 'form-vertical'}) do |f| %>
+  <%= render partial: 'shared/form/error_messages', locals: { resource: @story } %>
+  
+  <%= @story.project ? f.hidden_field(:project_id) : f.input(:project_id, collection: Project.all) %> 
+  <%= f.input :name %>  
+  <%= f.input :text, as: :text %>
+ 
+  <div class="form-group string optional story_address">
+    <label class="string optional control-label control-label" for="story_address">Address</label>
+    <input name="story[address]" id="story_address" value="<%= @story.address %>" class="string required form-control"/>
+    <div id="story_map" style="width: 500px; height: 400px; margin-top:15px;"></div>
+    <input type="hidden" name="story[lat]" id="story_lat" value="<%= @story.lat %>"/> 
+    <input type="hidden" name="story[lon]" id="story_lon" value="<%= @story.lon %>"/>  
+  </div>
+  
+  <div class="form-group string optional story_address_description">
+    <label class="string optional control-label control-label" for="story_address_description">Address description</label>
+    <input name="story[address_description]" id="story_address_description" value="<%= @story.address_description %>" class="string required form-control"/>
+  </div>
+  <%= f.button :submit %>
+<% end %>
+
+<% content_for :javascript_includes do %>
+  <script type="text/javascript" src='http://maps.google.com/maps/api/js?sensor=false&libraries=places'></script>
+  <%= javascript_include_tag 'voluntary/optional_lib/jquery.location_picker.js' %>
+<% end %>
+
+<% content_for :document_ready do %>
+  $('#story_map').locationpicker({
+    location: {latitude: <%= @story.lat ? @story.lat : 'null' %>, longitude: <%= @story.lon ? @story.lon : 'null' %>}, 
+    radius: 300,
+    inputBinding: {
+      latitudeInput: $('#story_lat'),
+      longitudeInput: $('#story_lon'),
+      locationNameInput: $('#story_address')
+    },
+    enableAutocomplete: true
+  });
+<% end %>

data/app/views/products/types/classified_advertisement/workflow/tasks/_vacancy_fields.html.erb

@@ -12,7 +12,7 @@
     <% f.object.candidatures.build if f.object.candidatures.select{|c| ['new', 'accepted'].include?(c.state)}.none? %>
     
     <% 
-    f.object.candidatures.sort! do |x,y|
+    f.object.candidatures = f.object.candidatures.to_a.sort do |x,y|
       Candidature::STATES.index(x.state.to_sym) <=> Candidature::STATES.index(y.state.to_sym) 
     end
     %>

data/app/views/products/types/classified_advertisement/workflow/tasks/_work_form.html.erb

@@ -1,16 +1,14 @@
 <%= render 'shared/form/error_messages', resource: resource %>
-<div class="form-inputs">
-  <table class="table table-striped">
-  	<thead>
-      <th>Name</th>
-      <th>Text</th>
-    </thead>
-    <tbody>
-      <%= f.simple_fields_for :vacancies do |vacancy_form| %>
-        <%= render_product_specific_partial_if_available(
-          vacancy_form.object, 'workflow/tasks/vacancy_fields', f: vacancy_form
-        ) %>
-      <% end %>
-    </tbody>
-  </table>
-</div>
+<table class="table table-striped">
+	<thead>
+    <th><%= t('attributes.name') %></th>
+    <th><%= t('attributes.text') %></th>
+  </thead>
+  <tbody>
+    <%= f.simple_fields_for :vacancies do |vacancy_form| %>
+      <%= render_product_specific_partial_if_available(
+        vacancy_form.object, 'workflow/tasks/vacancy_fields', f: vacancy_form
+      ) %>
+    <% end %>
+  </tbody>
+</table>

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

@@ -0,0 +1,5 @@
+en:
+  activerecord:
+    attributes:
+      candidature:
+        amount: Amount

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

@@ -1,4 +1,17 @@
 en:
+  tasks:
+    save:
+      vacancy_invalid: Vacancy form is invalid!
+    show:
+      vacancy_title: Vacancy title
+      change_signing: Change signing
+        
+    sign_up:
+      already_signed_up: You've already signed up this much!
+      limit_reached: The limit is already reached!
+    sign_out:
+      not_signed_up: You've not signed up yet!
+      
   activerecord:
     errors:
       models:

data/config/routes.rb

@@ -1,2 +1,19 @@
 Rails.application.routes.draw do
+  resources :tasks do
+    member do
+      get 'sign_up' => 'classified_advertisement/tasks#sign_up_form'
+      put 'sign_up' => 'classified_advertisement/tasks#sign_up'
+      get 'change_signing' => 'classified_advertisement/tasks#sign_up_form'
+      delete 'sign_out' => 'classified_advertisement/tasks#sign_out'
+    end
+  end
+  
+  resources :stories, only: [:create, :show, :edit, :update, :destroy] do
+    resources :tasks, only: [:index, :new] do
+      collection do
+        get 'calendar' => 'classified_advertisement/tasks#calendar'
+        get 'events' => 'classified_advertisement/tasks#events'
+      end
+    end
+  end
 end

data/db/migrate/20130806131503_add_classified_advertisement_product.rb

@@ -1,9 +1,9 @@
 class AddClassifiedAdvertisementProduct < ActiveRecord::Migration
   def up
-    product = Product.create(name: 'Classified Advertisement', text: 'Dummy')
+    product = Product::ClassifiedAdvertisement.create(name: 'Classified Advertisement', text: 'Dummy')
   end
   
   def down
-    Product.where(name: 'Classified Advertisement').first.destroy
+    Product::ClassifiedAdvertisement.first.destroy
   end
 end

data/db/migrate/20151021161627_add_amount_to_candidatures.rb

@@ -0,0 +1,5 @@
+class AddAmountToCandidatures < ActiveRecord::Migration
+  def change
+    add_column :candidatures, :amount, :integer
+  end
+end

data/lib/voluntary_classified_advertisement/version.rb

@@ -1,3 +1,3 @@
 module VoluntaryClassifiedAdvertisement
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voluntary_classified_advertisement
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mathias Gawlista
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: voluntary
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: voluntary_recruiting
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: letter_opener
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +276,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
-description: 'Plugin for #Crowdsourcing system Voluntary.Software: http://bit.ly/vca-0-2-0'
+description: "#Crowdsourcing plugin: http://bit.ly/vca-0-3-0"
 email:
 - gawlista@gmail.com
 executables: []
@@ -273,19 +287,32 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/controllers/classified_advertisement/tasks_controller.rb
+- app/helpers/voluntary_classified_advertisement/tasks_helper.rb
 - app/models/asset.rb
 - app/models/product/classified_advertisement.rb
 - app/models/product/classified_advertisement/candidature.rb
 - app/models/product/classified_advertisement/story.rb
 - app/models/product/classified_advertisement/task.rb
 - app/models/product/classified_advertisement/vacancy.rb
+- app/views/classified_advertisement/tasks/_navigation.html.erb
+- app/views/classified_advertisement/tasks/calendar.html.erb
+- app/views/classified_advertisement/tasks/sign_out.js.erb
+- app/views/classified_advertisement/tasks/sign_up.js.erb
+- app/views/classified_advertisement/tasks/sign_up_form.html.erb
 - app/views/products/types/classified_advertisement/stories/_task_fields.html.erb
 - app/views/products/types/classified_advertisement/stories/_vacancy_fields.html.erb
+- app/views/products/types/classified_advertisement/tasks/_collection.html.erb
+- app/views/products/types/classified_advertisement/tasks/_form.html.erb
+- app/views/products/types/classified_advertisement/tasks/_state_switch.html.erb
+- app/views/products/types/classified_advertisement/tasks/show.html.erb
+- app/views/products/types/classified_advertisement/wizard.html.erb
 - app/views/products/types/classified_advertisement/workflow/tasks/_candidature_fields.html.erb
 - app/views/products/types/classified_advertisement/workflow/tasks/_resource_fields.html.erb
 - app/views/products/types/classified_advertisement/workflow/tasks/_vacancy_fields.html.erb
 - app/views/products/types/classified_advertisement/workflow/tasks/_work_form.html.erb
 - app/views/products/types/classified_advertisement/workflow/tasks/_work_head.html.erb
+- config/locales/resources/candidature/en.yml
 - config/locales/resources/story/en.yml
 - config/locales/resources/task/en.yml
 - config/locales/workflow/en.yml
@@ -293,6 +320,7 @@ files:
 - db/migrate/20130806131503_add_classified_advertisement_product.rb
 - db/migrate/20130809134227_add_task_id_to_vacancies.rb
 - db/migrate/20130830170731_create_assets.rb
+- db/migrate/20151021161627_add_amount_to_candidatures.rb
 - lib/tasks/voluntary_classified_advertising_tasks.rake
 - lib/voluntary_classified_advertisement.rb
 - lib/voluntary_classified_advertisement/engine.rb