voluntary_classified_advertisement 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aec7ac6a224d0308649e238c69b9e9fef327aa57
-  data.tar.gz: 970a05e0b18a896868f1f0311458c6177f1975e4
+  metadata.gz: 65d3494a31fe98eea95f9a467be910816b1c87db
+  data.tar.gz: 98c0b50248cf9d37ccb482e73454d9af7afd1537
 SHA512:
-  metadata.gz: da23cf8bd51cf0f6b648f5966f26582eeff549508a6467ec9ec75489b4bb8f1b8871775592bd1cee8a3f5c31cc2480195cb7c2a8cd5ffddf970936d8fdbbb7fd
-  data.tar.gz: 730e52f3bcddc1977b305bd112d9a67312a590ed23eb6a400d421a101ce26561fd1c5e88f2d93203774656e132686bfddf753c0c0df5723df543df59930b157d
+  metadata.gz: 6ff5717c5f38947570afa223b05678c3adaada3f853a0a38b913ac08a8c911a73deed4efc1c6f008378c5115f268b3795abc58ceff6e8b888914c79144087270
+  data.tar.gz: 8beb7cd8fb136eb1238dcdc19fdb2e62fcd2b8f239db63a01f1bd8f3d85044aeea14c8b79350ffb760b39a3248c322a64c88c8d3b0454328625f50961c0e33ea

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.3.1 (November 9, 2015) ##
+
+* Take story location if task location not available.
+* TRY to destroy vacancy after destroying task.
+* Removes root from task events JSON.
+* Init story location with current one.
+
 ## 0.3.0 (October 29, 2015) ##
 
 * [#7](https://github.com/volontariat/voluntary_classified_advertisement/issues/7) Custom task page

data/app/controllers/classified_advertisement/tasks_controller.rb

@@ -6,13 +6,13 @@ module ClassifiedAdvertisement
     
     def events
       @story = Story.find params[:story_id]
-      tasks = @story.tasks.where(:from.gte => params[:start], :to.lt => params[:end])
+      tasks = @story.tasks.where(:from.gte => params[:start])
       
       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
+      render json: tasks, root: false
     end
     
     def sign_up_form

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

@@ -26,7 +26,7 @@ class Product::ClassifiedAdvertisement::Task < ::Task
   end
   
   def vacancy
-    @vacancy ||= new_record? ? vacancy_class.new(task: self) : vacancy_class.find(vacancy_id)
+    @vacancy ||= new_record? ? vacancy_class.new(task: self) : vacancy_class.where(id: vacancy_id).first
   end
   
   def vacancy_class
@@ -102,6 +102,6 @@ class Product::ClassifiedAdvertisement::Task < ::Task
   end
   
   def destroy_non_mongodb_records
-    vacancy.destroy
+    vacancy.try(:destroy)
   end
 end

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

@@ -70,7 +70,7 @@
 <% end %>
 
 <p style="margin-top:15px;">
-  <%= link_to new_story_task_path(@story), class: 'btn btn-default' do %>
+  <%= link_to new_story_task_path(@story), class: 'btn btn-default new_task_link' do %>
     <span class="glyphicon glyphicon-plus"></span> <%= t("tasks.new.title") %>
   <% end %>
 </p>

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

@@ -1,6 +1,6 @@
 <%= 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 :name, required: true %>  
   <%= f.input :text, as: :text %>
   
   <fieldset class="fieldset" style="border: 1px solid black; padding:15px; margin-top:15px;">
@@ -101,8 +101,13 @@
 <% end %>
 
 <% content_for :document_ready do %>
-  var lat = "<%= @task.lat %>";
-  var lon = "<%= @task.lon %>";
+  <% if @task.lat.present? %>
+    var lat = "<%= @task.lat %>";
+    var lon = "<%= @task.lon %>";
+  <% else %>
+    var lat = "<%= @story.lat %>";
+    var lon = "<%= @story.lon %>";
+  <% end %>
   
   function initLocationPicker(position) {
     options = {

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

@@ -3,11 +3,11 @@
     <%= 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' %>
+  <%= 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 sign_out_task_link' %>
 <% 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' %>
+      <%= link_to t('general.sign_up'), sign_up_task_path(task.id), method: :put, remote: true, class: 'btn btn-success btn-xs sign_up_task_link' %>
     <% else %>
       <%= link_to t('general.sign_up'), sign_up_task_path(task.id), class: 'btn btn-success btn-xs remote_modal_link' %>
     <% end %>

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

@@ -32,14 +32,32 @@
 <% 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
-  });
+  var lat = "<%= @story.lat %>";
+  var lon = "<%= @story.lon %>";
+  
+  function initLocationPicker(position) {
+    options = {
+      radius: 300,
+      inputBinding: {
+        latitudeInput: $('#story_lat'),
+        longitudeInput: $('#story_lon'),
+        locationNameInput: $('#story_address')
+      },
+      enableAutocomplete: true
+    }
+    
+    if(position) {
+      options['location'] = { latitude: position.coords.latitude, longitude: position.coords.longitude }
+    } else if (lat != "") {
+      options['location'] = { latitude: lat, longitude: lon }
+    }
+    
+    $('#story_map').locationpicker(options);
+  }
+  
+  if(lat == "" && navigator.geolocation) {
+    navigator.geolocation.getCurrentPosition(initLocationPicker);
+  } else {
+    initLocationPicker(null);
+  }
 <% end %>

data/lib/voluntary_classified_advertisement/version.rb

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

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: voluntary_classified_advertisement
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Mathias Gawlista
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: voluntary
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: voluntary_recruiting
   requirement: !ruby/object:Gem::Requirement
@@ -276,7 +282,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
-description: "#Crowdsourcing plugin: http://bit.ly/vca-0-3-0"
+description: 'Plugin for #Crowdsourcing system Voluntary.Software: http://bit.ly/vca-0-3-1'
 email:
 - gawlista@gmail.com
 executables: []