dorsale 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 523d3264e16c525112422f6ec7beb74c0c28a2e8
-  data.tar.gz: 5018061784efc57024e7787e055bb8f64ed6be2c
+  metadata.gz: cf48ad101657528cc823ff034689b86429052dd2
+  data.tar.gz: cadb1010f520ae56b346f951772e46cc0f87670c
 SHA512:
-  metadata.gz: 9497cb875ece483c790e5aae3a5c1661b3e9fade30246d9c9a269ea1239f642056c6898ba981197829eca38263cc9eb9452723a3e849c391e44e0983da0810bb
-  data.tar.gz: 16ecb86b3ad8dd7df1992bc507b091c479657dd4a3172a5ced80e1434051bbadb5b3656f4c3453f38a4ac36894ff488e7c7e34abbe1dfb628f21863bf1b4f8eb
+  metadata.gz: 8d45e6c14fb4c2192e1c77b8d12061e7a5834a23a439577892122f5f05a524b855b61475c2fe40e30e457442211a52f491bb72f7092d450280f29ac5afe2bee5
+  data.tar.gz: 34e5c7642da701322077d221fb263ebc671243ddf16b1acf388648f6c25203b0fb70f9fa96bf37b6b77d67dbe2dde79bbabe2a66eb365802cbac6093b200152a

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.7.1
+- Add activity type and origin filters for people
+- Add activity type and origin in people export
+
 ## 3.7.0
 
 - Remove some useless "polymorphic" belongs_to

data/app/controllers/dorsale/customer_vault/people_controller.rb

@@ -4,9 +4,11 @@ class Dorsale::CustomerVault::PeopleController < ::Dorsale::CustomerVault::Appli
   def index
     authorize model, :list?
 
-    @filters ||= ::Dorsale::CustomerVault::SmallData::FilterForPeople.new(cookies)
-    @tags    ||= customer_vault_tag_list
-    @people  ||= policy_scope(model)
+    @filters        ||= ::Dorsale::CustomerVault::SmallData::FilterForPeople.new(cookies)
+    @tags           ||= customer_vault_tag_list
+    @origins        ||= policy_scope(Dorsale::CustomerVault::Origin)
+    @activity_types ||= policy_scope(Dorsale::CustomerVault::ActivityType)
+    @people         ||= policy_scope(model)
       .search(params[:q])
       .preload(:taggings)
 

data/app/filters/dorsale/customer_vault/small_data/filter_for_people.rb

@@ -1,6 +1,8 @@
 class Dorsale::CustomerVault::SmallData::FilterForPeople < ::Agilibox::SmallData::Filter
   STRATEGIES = {
-    "person_type" => ::Agilibox::SmallData::FilterStrategyByKeyValue.new(:type),
-    "person_tags" => ::Agilibox::SmallData::FilterStrategyByTags.new,
+    "person_type"     => ::Agilibox::SmallData::FilterStrategyByKeyValue.new(:type),
+    "person_tags"     => ::Agilibox::SmallData::FilterStrategyByTags.new,
+    "person_origin"   => ::Agilibox::SmallData::FilterStrategyByKeyValue.new("origin_id"),
+    "person_activity" => ::Dorsale::CustomerVault::SmallData::FilterStrategyByActivityType.new,
   }
 end

data/app/filters/dorsale/customer_vault/small_data/filter_strategy_by_activity_type.rb

@@ -0,0 +1,7 @@
+class Dorsale::CustomerVault::SmallData::FilterStrategyByActivityType < ::Agilibox::SmallData::FilterStrategy
+  def apply(query, value)
+    corporations_id = query.where(activity_type_id: value).pluck(:id)
+    individuals_id  = query.where(corporation_id: corporations_id).pluck(:id)
+    query.where(id: (corporations_id + individuals_id))
+  end
+end

data/app/views/dorsale/customer_vault/people/_filters.html.slim

@@ -7,3 +7,11 @@
     :collection    => @tags,
     :input_html    => {multiple: true},
     :placeholder => ::Dorsale::CustomerVault::Person.t(:all_tags)
+
+  = f.input :person_origin,
+    :collection    => @origins,
+    :include_blank => ::Dorsale::CustomerVault::Person.t(:all_origins)
+
+  = f.input :person_activity,
+    :collection    => @activity_types,
+    :include_blank => ::Dorsale::CustomerVault::Person.t(:all_activity_types)

data/app/views/dorsale/customer_vault/people/index.xlsx.ruby

@@ -7,6 +7,8 @@ fields = %w(
   email
   phone
   mobile
+  origin
+  activity_type
   fax
   skype
   www

data/config/locales/customer_vault.en.yml

@@ -81,6 +81,8 @@ en:
       dorsale/customer_vault/person: &customer_vault_person_attributes
         context: "Context"
         all_tags: "All tags"
+        all_origins: "All origins"
+        all_activity_types: "All activities"
         all_types: "All types"
         capital: "Capital"
         immatriculation_number: "Immatriculation number 1"

data/config/locales/customer_vault.fr.yml

@@ -80,6 +80,8 @@ fr:
       dorsale/customer_vault/person: &customer_vault_person_attributes
         context: "Contexte"
         all_tags: "Tous les tags"
+        all_origins: "Toutes les origines"
+        all_activity_types: "Toutes les activités"
         all_types: "Tous les types"
         capital: "Capital"
         immatriculation_number: "SIREN"

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.7.0"
+  VERSION = "3.7.1"
 end

data/spec/controllers/dorsale/customer_vault/people_controller_spec.rb

@@ -54,6 +54,31 @@ RSpec.describe ::Dorsale::CustomerVault::PeopleController, type: :controller do
 
         expect(assigns(:people)).to eq [individual]
       end
+
+      it "should filter by person origin" do
+        @origin = create(:customer_vault_origin)
+        individual  = create(:customer_vault_individual, origin: @origin)
+        corporation = create(:customer_vault_corporation)
+
+        cookies[:filters] = {person_origin: @origin.id}.to_json
+
+        get :index
+
+        expect(assigns(:people)).to eq [individual]
+      end
+
+      it "should filter by person activity" do
+        @activity = create(:customer_vault_activity_type)
+        corpo1 = create(:customer_vault_corporation, activity_type: @activity)
+        individual  = create(:customer_vault_individual, corporation: corpo1)
+        corpo2 = create(:customer_vault_corporation)
+
+        cookies[:filters] = {person_activity: @activity.id}.to_json
+
+        get :index
+
+        expect(assigns(:people)).to eq [corpo1, individual]
+      end
     end # describe "filters"
 
     describe "search" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -553,6 +553,7 @@ files:
 - app/filters/dorsale/billing_machine/small_data/filter_strategy_by_payment_status.rb
 - app/filters/dorsale/billing_machine/small_data/filter_strategy_by_state.rb
 - app/filters/dorsale/customer_vault/small_data/filter_for_people.rb
+- app/filters/dorsale/customer_vault/small_data/filter_strategy_by_activity_type.rb
 - app/filters/dorsale/expense_gun/small_data/filter_for_expenses.rb
 - app/filters/dorsale/flyboy/small_data/filter_for_tasks.rb
 - app/filters/dorsale/flyboy/small_data/filter_strategy_by_done.rb