dorsale 3.9.0 → 3.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f957740f5e197d1396130300fa94904f32e3571
-  data.tar.gz: 1a1210313bd18d1bae5e90c5a057bd4db71fe876
+  metadata.gz: 76ebbb416c39796db8712d68bb5952b6a9805904
+  data.tar.gz: e2a2fa91cab07ed102a24bdb0fc9240e1a940a92
 SHA512:
-  metadata.gz: 3bfb5ef6465100808adb9fdb9b88d26475d53ad63a50f607ccd3b82d8ca04d6bd3e9e11f4a4ba1f8c29ce86e3d288934cda1510403b43f716d7773836365348f
-  data.tar.gz: 4a0afd7c630a26b280a4b555c0e48c8e70da325ad2f02b088e7507220e5c1f3c7c3e82160bd53301ca16048f4f2aaecadcf083024be39ce632d9b3e2a490b0f2
+  metadata.gz: bd88080f00eaa88ee7e464d60e6377359e88af977807e9f616679d620ec38b35ae0c7b4034dc64cafb93d8fe726e611c737bff2c085de7363e4774542a278c9b
+  data.tar.gz: 416f512d565db0c0d0a7878006b822fee869acc2ea4b7aa9df05a377102eb86e4a6ccd1d3b2cb52d3b76adad3114a696753598442a6ec6ade2b733e247e05cf1

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Next version
 
+## 3.9.1
+
+- Add tags to tasks
+
 ## 3.9.0
 
 - Remove BM id cards

data/README.md

@@ -17,7 +17,7 @@ go to http://localhost:3000/
 
 ## Online demo
 
-https://dorsale-dummy.herokuapp.com
+http://dorsale-dummy.agilidee.com/
 
 ## Requirements
 Hosting application shall define a global current_user method providing the current logged user.

data/app/controllers/dorsale/flyboy/tasks_controller.rb

@@ -11,34 +11,20 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
     :copy,
   ]
 
-  before_action :set_owners, only: [
-    :new,
-    :create,
-    :edit,
-    :update,
-    :copy,
-  ]
-
   def index
     authorize model, :list?
 
-    @tasks ||= scope.all.preload(:taskable)
-
-    @order ||= order_from_params
-
+    @tasks ||= scope.all.preload(:taskable, :taggings)
     @filters ||= ::Dorsale::Flyboy::SmallData::FilterForTasks.new(filters_jar)
-
     @tasks = @filters.apply(@tasks)
     @tasks = @tasks.search(params[:q])
+    @tasks_without_pagination = @tasks
+    @tasks = Dorsale::Flyboy::TasksSorter.(@tasks, params["sort"] ||= "term")
 
-    if @order.is_a?(Proc) # when sorting by a polymorphic attribute
-      @tasks = @tasks.sort(&@order)
-      @tasks_without_pagination = @tasks
-      @tasks = Kaminari.paginate_array(@tasks).page(params[:page])
-    else
-      @tasks = @tasks.order(@order)
-      @tasks_without_pagination = @tasks
+    if @tasks.is_a?(ActiveRecord::Relation)
       @tasks = @tasks.page(params[:page])
+    else
+      @tasks = Kaminari.paginate_array(@tasks).page(params[:page])
     end
   end
 
@@ -176,10 +162,6 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
     @taskable ||= @task.taskable
   end
 
-  def set_owners
-    @owners ||= policy_scope(User).actives
-  end
-
   def permitted_params
     [
       :taskable_id,
@@ -193,30 +175,11 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
       :reminder_duration,
       :reminder_unit,
       :owner_id,
+      :tag_list => [],
     ]
   end
 
   def task_params
     params.fetch(:task, {}).permit(permitted_params)
   end
-
-  def order_from_params
-    sortable_column_order do |column, direction|
-      case column
-      when :name, :status
-        %(LOWER(dorsale_flyboy_tasks.#{column}) #{direction})
-      when :progress, :term
-        %(dorsale_flyboy_tasks.#{column} #{direction})
-      when :taskable
-        if direction == :asc
-          proc { |a, b| a.taskable.to_s.downcase <=> b.taskable.to_s.downcase }
-        else
-          proc { |a, b| b.taskable.to_s.downcase <=> a.taskable.to_s.downcase }
-        end
-      else
-        params["sort"] = "term"
-        "term ASC"
-      end
-    end
-  end
 end

data/app/filters/dorsale/flyboy/small_data/filter_for_tasks.rb

@@ -1,6 +1,7 @@
 class Dorsale::Flyboy::SmallData::FilterForTasks < ::Agilibox::SmallData::Filter
   STRATEGIES = {
-    "fb_state"  => ::Dorsale::Flyboy::SmallData::FilterStrategyByTaskState.new,
-    "fb_owner"  => ::Agilibox::SmallData::FilterStrategyByKeyValue.new(:owner_id),
+    "fb_state" => ::Dorsale::Flyboy::SmallData::FilterStrategyByTaskState.new,
+    "fb_owner" => ::Agilibox::SmallData::FilterStrategyByKeyValue.new(:owner_id),
+    "fb_tags"  => ::Agilibox::SmallData::FilterStrategyByTags.new,
   }
 end

data/app/helpers/dorsale/flyboy/application_helper.rb

@@ -31,8 +31,20 @@ module Dorsale::Flyboy::ApplicationHelper
     end
   end
 
+  def flyboy_tasks_owners_for_select
+    ([@task&.owner].compact + policy_scope(User).actives).uniq
+  end
+
   def flyboy_tasks_owners_for_filters_select
-    policy_scope(User)
+    flyboy_tasks_owners_for_select
+  end
+
+  def flyboy_tasks_tags_for_select
+    Dorsale::TagListForModel.(Dorsale::Flyboy::Task)
+  end
+
+  def flyboy_tasks_tags_for_filters_select
+    flyboy_tasks_tags_for_select
   end
 
   def flyboy_reminder_types_for_select

data/app/models/dorsale/flyboy/task.rb

@@ -15,6 +15,11 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
   polymorphic_id_for :taskable
   polymorphic_id_for :owner
 
+  acts_as_taggable
+  def tag_list
+    super.sort
+  end
+
   STATES = %w(done undone ontime onwarning onalert)
 
   def state

data/app/services/dorsale/billing_machine/quotation/to_invoice.rb

@@ -37,6 +37,6 @@ class Dorsale::BillingMachine::Quotation::ToInvoice < ::Dorsale::Service
 
   def ignored_key?(k)
     k = k.to_s
-    k == "id" || k.match?(/index|tracking|state/) || k.end_with?("_at")
+    k == "id" || k.match(/index|tracking|state/) || k.end_with?("_at")
   end
 end

data/app/sorters/dorsale/flyboy/tasks_sorter.rb

@@ -0,0 +1,44 @@
+class Dorsale::Flyboy::TasksSorter < Agilibox::Sorter
+  def sort
+    case column
+    when :name, :status
+      %(LOWER(dorsale_flyboy_tasks.#{column}) #{direction})
+    when :progress, :term
+      %(dorsale_flyboy_tasks.#{column} #{direction})
+    when :taskable
+      if direction == :asc
+        proc { |a, b| a.taskable.to_s.downcase <=> b.taskable.to_s.downcase }
+      else
+        proc { |a, b| b.taskable.to_s.downcase <=> a.taskable.to_s.downcase }
+      end
+    when :tags
+      %(
+        (
+          SELECT STRING_AGG(n, ' ' ORDER BY n)
+          FROM (
+            SELECT name AS n
+            FROM tags
+            WHERE id IN (
+              SELECT taggings.tag_id
+              FROM taggings
+              WHERE taggable_id = dorsale_flyboy_tasks.id
+              AND taggings.taggable_type = '#{Dorsale::Flyboy::Task}'
+            )
+          ) AS task_tags
+        ) #{direction}
+      )
+    end
+  end
+
+  def call
+    order = sort
+
+    if order.is_a?(Proc) # sorting by a polymorphic attribute
+      result = @collection.sort(&order)
+    else
+      result = @collection.reorder(order)
+    end
+
+    result
+  end
+end

data/app/views/dorsale/flyboy/_filters.html.slim

@@ -1,5 +1,13 @@
 = filters_form do |f|
-  = f.input :fb_state, collection: flyboy_status_for_filters_select, include_blank: Dorsale::Flyboy::Task.t("state.all")
+  = f.input :fb_state,
+    :collection    => flyboy_status_for_filters_select,
+    :include_blank => Dorsale::Flyboy::Task.t("state.all")
 
-  - if @filters.class::STRATEGIES.include?("fb_owner")
-    = f.input :fb_owner, collection: flyboy_tasks_owners_for_filters_select, include_blank: t("filters.all_owners")
+  = f.input :fb_owner,
+    :collection    => flyboy_tasks_owners_for_filters_select,
+    :include_blank => t("filters.all_owners")
+
+  = f.input :fb_tags,
+    :collection    => flyboy_tasks_tags_for_filters_select,
+    :input_html    => {multiple: true},
+    :placeholder => ::Dorsale::Flyboy::Task.t(:all_tags)

data/app/views/dorsale/flyboy/tasks/_context.html.slim

@@ -5,11 +5,12 @@
     = task
 
   .context-body class=task.state
+    = info task, :tags, tags(task)
     = info task, :progress, progress_bar(percentage: task.progress, label: true)
     = info task, :owner
     = info task, :created_at
-    = info task, :term
     = info task, :reminder_date
+    = info task, :term
     = info task, :done
 
   .context-footer

data/app/views/dorsale/flyboy/tasks/_filters.html.slim

@@ -0,0 +1,10 @@
+= filters_form do |f|
+  = f.input :fb_state, collection: flyboy_status_for_filters_select, include_blank: Dorsale::Flyboy::Task.t("state.all")
+
+  - if @filters.class::STRATEGIES.include?("fb_owner")
+  = f.input :fb_owner, collection: flyboy_tasks_owners_for_filters_select, include_blank: t("filters.all_owners")
+
+  = f.input :fb_tags,
+    :collection    => flyboy_tasks_tags_for_filters_select,
+    :input_html    => {multiple: true},
+    :placeholder => ::Dorsale::Flyboy::Task.t(:all_tags)

data/app/views/dorsale/flyboy/tasks/_form.html.slim

@@ -17,11 +17,12 @@
 
       .row
         .col-sm-8 = f.input :name
-        .col-sm-4 = f.input :owner_id, collection: @owners
+        .col-sm-4 = f.input :owner_id, collection: flyboy_tasks_owners_for_select
 
+      = f.input :tag_list, collection: flyboy_tasks_tags_for_select, input_html: {multiple: true}
       = f.input :description, input_html: {rows: 5}
-      = render "dorsale/flyboy/tasks/term_fields", f: f
       = render "dorsale/flyboy/tasks/reminder_fields", f: f
+      = render "dorsale/flyboy/tasks/term_fields", f: f
       = f.hidden_field :taskable_id
       = f.hidden_field :taskable_type
 

data/app/views/dorsale/flyboy/tasks/_list.html.slim

@@ -9,6 +9,9 @@ table#tasks-list
       th.task-name
         = sortable_column Dorsale::Flyboy::Task.t, :name
 
+      th.task-tags
+        = sortable_column Dorsale::Flyboy::Task.t(:tags), :tags
+
       - unless nested
         th.taskable-name.hidden-xs
           = sortable_column Dorsale::Flyboy::Task.t(:taskable), :taskable
@@ -53,6 +56,9 @@ table#tasks-list
         td.task-name
           = link_to_object(task)
 
+        td.task-tags
+          = tags(task)
+
         - unless nested
           td.taskable-name.hidden-xs
             = link_to_object(task.taskable)

data/app/views/dorsale/flyboy/tasks/_tasks_for_taskable.html.slim

@@ -1,6 +1,6 @@
 .flyboy
   - content_for :filters
-    = render "dorsale/flyboy/filters"
+    = render "dorsale/flyboy/tasks/filters"
 
   - content_for :table
     = render "dorsale/flyboy/tasks/list", tasks: tasks, nested: true

data/app/views/dorsale/flyboy/tasks/index.html.slim

@@ -5,7 +5,7 @@
     = ::Dorsale::Flyboy::Task.ts
 
   - content_for :filters
-    = render "dorsale/flyboy/filters"
+    = render "dorsale/flyboy/tasks/filters"
 
   - content_for :search
     = search_form

data/config/locales/dorsale.en.yml

@@ -1,5 +1,4 @@
 en:
-  update: "Update"
   messages:
     comments:
       create_ok    : "Comment created."

data/config/locales/dorsale.fr.yml

@@ -1,5 +1,4 @@
 fr:
-  update: "Modifier"
   messages:
     comments:
       create_ok    : "Le commentaire a été créé."

data/config/locales/flyboy.en.yml

@@ -51,6 +51,7 @@ en:
         done: "Done ?"
         description: "Description"
         progress: "Progress"
+        all_tags: "All tags"
 
       dorsale/flyboy/task/state:
         all: "All states"

data/config/locales/flyboy.fr.yml

@@ -53,6 +53,7 @@ fr:
         done: "Fait"
         description: "Description"
         progress: "Progression"
+        all_tags: "Tous les tags"
 
       dorsale/flyboy/task/state:
         all: "Tous les états"

data/features/support/env.rb

@@ -1,4 +1,7 @@
 ENV["RAILS_ROOT"] ||= File.expand_path("../../../spec/dummy", __FILE__)
 require "cucumber/rails"
 require "agilibox/cucumber_config"
+def Zonebie.set_random_timezone
+  # https://github.com/agilidee/dorsale/issues/273
+end
 Agilibox::CucumberConfig.require_all_helpers!

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.9.0"
+  VERSION = "3.9.1"
 end

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

@@ -92,7 +92,7 @@ RSpec.describe ::Dorsale::CustomerVault::PeopleController, type: :controller do
   describe "#create" do
     before do
       allow_any_instance_of(Dorsale::CustomerVault::PeopleController).to \
-      receive(:model) { Dorsale::CustomerVault::Corporation }
+        receive(:model) { Dorsale::CustomerVault::Corporation }
     end
 
     it "should generate an event" do
@@ -110,7 +110,7 @@ RSpec.describe ::Dorsale::CustomerVault::PeopleController, type: :controller do
   describe "#update" do
     before do
       allow_any_instance_of(Dorsale::CustomerVault::PeopleController).to \
-      receive(:model) { Dorsale::CustomerVault::Corporation }
+        receive(:model) { Dorsale::CustomerVault::Corporation }
     end
 
     it "should generate an event" do

data/spec/controllers/dorsale/flyboy/tasks_controller_spec.rb

@@ -70,6 +70,14 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
         get :index
         expect(assigns(:tasks).to_a).to eq [@task2]
       end
+
+      it "should filter by tags" do
+        task1 = create(:flyboy_task, tag_list: "abc")
+        task2 = create(:flyboy_task, tag_list: "xyz")
+        cookies["filters"] = {fb_tags: ["abc"]}.to_json
+        get :index
+        expect(assigns(:tasks)).to eq [task1]
+      end
     end
 
     context "when sorting" do
@@ -86,6 +94,7 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
           :term          => "21/12/2012",
           :reminder_type => "custom",
           :reminder_date => "21/12/2012",
+          :tag_list      => "aaa",
         )
 
         @task2 = create(:flyboy_task,
@@ -95,6 +104,7 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
           :term          => "23/12/2012",
           :reminder_type => "custom",
           :reminder_date => "23/12/2012",
+          :tag_list      => "bbb",
         )
 
         @task3 = create(:flyboy_task,
@@ -104,6 +114,7 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
           :term          => "22/12/2012",
           :reminder_type => "custom",
           :reminder_date => "22/12/2012",
+          :tag_list      => "",
         )
       end
 
@@ -146,6 +157,16 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
         get :index, params: {sort: "-term"}
         expect(assigns(:tasks).to_a).to eq [@task2, @task3, @task1]
       end
+
+      it "sorting by tags asc" do
+        get :index, params: {sort: "tags"}
+        expect(assigns(:tasks).to_a).to eq [@task1, @task2, @task3]
+      end
+
+      it "sorting by tags desc" do
+        get :index, params: {sort: "-tags"}
+        expect(assigns(:tasks).to_a).to eq [@task3, @task2, @task1]
+      end
     end
   end
 

data/spec/routing/dorsale/alexandrie/attachments_routing_spec.rb

@@ -6,27 +6,27 @@ RSpec.describe Dorsale::Alexandrie::AttachmentsController, type: :routing do
   describe "routing" do
     it "#create" do
       expect(get "/alexandrie/attachments").to \
-      route_to("dorsale/alexandrie/attachments#index")
+        route_to("dorsale/alexandrie/attachments#index")
     end
 
     it "#create" do
       expect(post "/alexandrie/attachments").to \
-      route_to("dorsale/alexandrie/attachments#create")
+        route_to("dorsale/alexandrie/attachments#create")
     end
 
     it "#edit" do
       expect(get "/alexandrie/attachments/3/edit").to \
-      route_to("dorsale/alexandrie/attachments#edit", id: "3")
+        route_to("dorsale/alexandrie/attachments#edit", id: "3")
     end
 
     it "#update" do
       expect(patch "/alexandrie/attachments/3").to \
-      route_to("dorsale/alexandrie/attachments#update", id: "3")
+        route_to("dorsale/alexandrie/attachments#update", id: "3")
     end
 
     it "#destroy" do
       expect(delete "/alexandrie/attachments/3").to \
-      route_to("dorsale/alexandrie/attachments#destroy", id: "3")
+        route_to("dorsale/alexandrie/attachments#destroy", id: "3")
     end
   end
 end

data/spec/routing/dorsale/billing_machine/invoices_routing_spec.rb

@@ -6,57 +6,57 @@ describe ::Dorsale::BillingMachine::InvoicesController, type: :routing do
   describe "routing" do
     it "#index" do
       expect(get "/billing_machine/invoices").to \
-      route_to("dorsale/billing_machine/invoices#index")
+        route_to("dorsale/billing_machine/invoices#index")
     end
 
     it "#new" do
       expect(get "/billing_machine/invoices/new").to \
-      route_to("dorsale/billing_machine/invoices#new")
+        route_to("dorsale/billing_machine/invoices#new")
     end
 
     it "#create" do
       expect(post "/billing_machine/invoices").to \
-      route_to("dorsale/billing_machine/invoices#create")
+        route_to("dorsale/billing_machine/invoices#create")
     end
 
     it "#show" do
       expect(get "/billing_machine/invoices/1").to \
-      route_to("dorsale/billing_machine/invoices#show", id: "1")
+        route_to("dorsale/billing_machine/invoices#show", id: "1")
     end
 
     it "#show pdf" do
       expect(get "/billing_machine/invoices/1.pdf").to \
-      route_to("dorsale/billing_machine/invoices#show", id: "1", format: "pdf")
+        route_to("dorsale/billing_machine/invoices#show", id: "1", format: "pdf")
     end
 
     it "#pay" do
       expect(patch "/billing_machine/invoices/1/pay").to \
-      route_to("dorsale/billing_machine/invoices#pay", id: "1")
+        route_to("dorsale/billing_machine/invoices#pay", id: "1")
     end
 
     it "#copy" do
       expect(get "/billing_machine/invoices/1/copy").to \
-      route_to("dorsale/billing_machine/invoices#copy", id: "1")
+        route_to("dorsale/billing_machine/invoices#copy", id: "1")
     end
 
     it "#edit" do
       expect(get "/billing_machine/invoices/1/edit").to \
-      route_to("dorsale/billing_machine/invoices#edit", id: "1")
+        route_to("dorsale/billing_machine/invoices#edit", id: "1")
     end
 
     it "#update" do
       expect(patch "/billing_machine/invoices/1").to \
-      route_to("dorsale/billing_machine/invoices#update", id: "1")
+        route_to("dorsale/billing_machine/invoices#update", id: "1")
     end
 
     it "#email via GET" do
       expect(get "/billing_machine/invoices/1/email").to \
-      route_to("dorsale/billing_machine/invoices#email", id: "1")
+        route_to("dorsale/billing_machine/invoices#email", id: "1")
     end
 
     it "#email via PORT" do
       expect(post "/billing_machine/invoices/1/email").to \
-      route_to("dorsale/billing_machine/invoices#email", id: "1")
+        route_to("dorsale/billing_machine/invoices#email", id: "1")
     end
   end
 end

data/spec/routing/dorsale/billing_machine/quotations_routing_spec.rb

@@ -6,47 +6,47 @@ describe ::Dorsale::BillingMachine::QuotationsController do
 
     it "#index" do
       expect(get "/billing_machine/quotations").to \
-      route_to("dorsale/billing_machine/quotations#index")
+        route_to("dorsale/billing_machine/quotations#index")
     end
 
     it "#new" do
       expect(get "/billing_machine/quotations/new").to \
-      route_to("dorsale/billing_machine/quotations#new")
+        route_to("dorsale/billing_machine/quotations#new")
     end
 
     it "#show" do
       expect(get "/billing_machine/quotations/1").to \
-      route_to("dorsale/billing_machine/quotations#show", id: "1")
+        route_to("dorsale/billing_machine/quotations#show", id: "1")
     end
 
     it "#edit" do
       expect(get "/billing_machine/quotations/1/edit").to \
-      route_to("dorsale/billing_machine/quotations#edit", id: "1")
+        route_to("dorsale/billing_machine/quotations#edit", id: "1")
     end
 
     it "#create" do
       expect(post "/billing_machine/quotations").to \
-      route_to("dorsale/billing_machine/quotations#create")
+        route_to("dorsale/billing_machine/quotations#create")
     end
 
     it "#update" do
       expect(patch "/billing_machine/quotations/1").to \
-      route_to("dorsale/billing_machine/quotations#update", id: "1")
+        route_to("dorsale/billing_machine/quotations#update", id: "1")
     end
 
     it "#destroy" do
       expect(delete "/billing_machine/quotations/1").to \
-      route_to("dorsale/billing_machine/quotations#destroy", id: "1")
+        route_to("dorsale/billing_machine/quotations#destroy", id: "1")
     end
 
     it "#copy" do
       expect(post "/billing_machine/quotations/1/copy").to \
-      route_to("dorsale/billing_machine/quotations#copy", id: "1")
+        route_to("dorsale/billing_machine/quotations#copy", id: "1")
     end
 
     it "#create_invoice" do
       expect(get "/billing_machine/quotations/1/create_invoice").to \
-      route_to("dorsale/billing_machine/quotations#create_invoice", id: "1")
+        route_to("dorsale/billing_machine/quotations#create_invoice", id: "1")
     end
   end
 end

data/spec/routing/dorsale/customer_vault/activity_types_routing_spec.rb

@@ -6,17 +6,17 @@ describe ::Dorsale::CustomerVault::ActivityTypesController do
   describe "routing" do
     it "#index" do
       expect(get "/customer_vault/activity_types").to \
-      route_to("dorsale/customer_vault/activity_types#index")
+        route_to("dorsale/customer_vault/activity_types#index")
     end
 
     it "#new" do
       expect(get "/customer_vault/activity_types/new").to \
-      route_to("dorsale/customer_vault/activity_types#new")
+        route_to("dorsale/customer_vault/activity_types#new")
     end
 
     it "#create" do
       expect(post "/customer_vault/activity_types").to \
-      route_to("dorsale/customer_vault/activity_types#create")
+        route_to("dorsale/customer_vault/activity_types#create")
     end
 
     it "#show" do
@@ -25,12 +25,12 @@ describe ::Dorsale::CustomerVault::ActivityTypesController do
 
     it "#edit" do
       expect(get "/customer_vault/activity_types/3/edit").to \
-      route_to("dorsale/customer_vault/activity_types#edit", id: "3")
+        route_to("dorsale/customer_vault/activity_types#edit", id: "3")
     end
 
     it "#update" do
       expect(patch "/customer_vault/activity_types/3").to \
-      route_to("dorsale/customer_vault/activity_types#update", id: "3")
+        route_to("dorsale/customer_vault/activity_types#update", id: "3")
     end
 
     it "#destroy" do

data/spec/routing/dorsale/customer_vault/events_routing_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe ::Dorsale::CustomerVault::EventsController, type: :routing do
   describe "routing" do
     it "#index" do
       expect(get "/customer_vault/events").to \
-      route_to("dorsale/customer_vault/events#index")
+        route_to("dorsale/customer_vault/events#index")
     end
   end # describe "routing"
 end

data/spec/routing/dorsale/customer_vault/origins_routing_spec.rb

@@ -6,17 +6,17 @@ describe ::Dorsale::CustomerVault::OriginsController do
   describe "routing" do
     it "#index" do
       expect(get "/customer_vault/origins").to \
-      route_to("dorsale/customer_vault/origins#index")
+        route_to("dorsale/customer_vault/origins#index")
     end
 
     it "#new" do
       expect(get "/customer_vault/origins/new").to \
-      route_to("dorsale/customer_vault/origins#new")
+        route_to("dorsale/customer_vault/origins#new")
     end
 
     it "#create" do
       expect(post "/customer_vault/origins").to \
-      route_to("dorsale/customer_vault/origins#create")
+        route_to("dorsale/customer_vault/origins#create")
     end
 
     it "#show" do
@@ -25,12 +25,12 @@ describe ::Dorsale::CustomerVault::OriginsController do
 
     it "#edit" do
       expect(get "/customer_vault/origins/3/edit").to \
-      route_to("dorsale/customer_vault/origins#edit", id: "3")
+        route_to("dorsale/customer_vault/origins#edit", id: "3")
     end
 
     it "#update" do
       expect(patch "/customer_vault/origins/3").to \
-      route_to("dorsale/customer_vault/origins#update", id: "3")
+        route_to("dorsale/customer_vault/origins#update", id: "3")
     end
 
     it "#destroy" do

data/spec/routing/dorsale/customer_vault/people_routing_spec.rb

@@ -6,104 +6,104 @@ RSpec.describe ::Dorsale::CustomerVault::PeopleController, type: :routing do
   describe "routing" do
     it "#index" do
       expect(get "/customer_vault/people").to \
-      route_to("dorsale/customer_vault/people#index")
+        route_to("dorsale/customer_vault/people#index")
     end
 
     it "#corporations via get" do
       expect(get "/customer_vault/corporations").to \
-      route_to("dorsale/customer_vault/people#corporations")
+        route_to("dorsale/customer_vault/people#corporations")
     end
 
     it "#individuals via get" do
       expect(get "/customer_vault/individuals").to \
-      route_to("dorsale/customer_vault/people#individuals")
+        route_to("dorsale/customer_vault/people#individuals")
     end
 
     it "#new person" do
       expect(get "/customer_vault/people/new").to \
-      route_to("dorsale/customer_vault/people#new")
+        route_to("dorsale/customer_vault/people#new")
     end
 
     it "#new corporation" do
       expect(get "/customer_vault/corporations/new").to \
-      route_to("dorsale/customer_vault/people#new")
+        route_to("dorsale/customer_vault/people#new")
     end
 
     it "#new individual" do
       expect(get "/customer_vault/individuals/new").to \
-      route_to("dorsale/customer_vault/people#new")
+        route_to("dorsale/customer_vault/people#new")
     end
 
     it "#create person" do
       expect(post "/customer_vault/people").to \
-      route_to("dorsale/customer_vault/people#create")
+        route_to("dorsale/customer_vault/people#create")
     end
 
     it "#create individual" do
       expect(post "/customer_vault/individuals").to \
-      route_to("dorsale/customer_vault/people#create")
+        route_to("dorsale/customer_vault/people#create")
     end
 
     it "#create corporation" do
       expect(post "/customer_vault/corporations").to \
-      route_to("dorsale/customer_vault/people#create")
+        route_to("dorsale/customer_vault/people#create")
     end
 
     it "#show" do
       expect(get "/customer_vault/people/1").to \
-      route_to("dorsale/customer_vault/people#show", id: "1")
+        route_to("dorsale/customer_vault/people#show", id: "1")
     end
 
     it "#tasks" do
       expect(get "/customer_vault/people/1/tasks").to \
-      route_to("dorsale/customer_vault/people#tasks", id: "1")
+        route_to("dorsale/customer_vault/people#tasks", id: "1")
     end
 
     it "#invoices" do
       expect(get "/customer_vault/people/1/invoices").to \
-      route_to("dorsale/customer_vault/people#invoices", id: "1")
+        route_to("dorsale/customer_vault/people#invoices", id: "1")
     end
 
     it "#links" do
       expect(get "/customer_vault/people/1/links").to \
-      route_to("dorsale/customer_vault/links#index", person_id: "1")
+        route_to("dorsale/customer_vault/links#index", person_id: "1")
     end
 
     it "#edit" do
       expect(get "/customer_vault/people/1/edit").to \
-      route_to("dorsale/customer_vault/people#edit", id: "1")
+        route_to("dorsale/customer_vault/people#edit", id: "1")
     end
 
     it "#update" do
       expect(patch "/customer_vault/people/1").to \
-      route_to("dorsale/customer_vault/people#update", id: "1")
+        route_to("dorsale/customer_vault/people#update", id: "1")
     end
 
     it "#destroy" do
       expect(delete "/customer_vault/people/1").to \
-      route_to("dorsale/customer_vault/people#destroy", id: "1")
+        route_to("dorsale/customer_vault/people#destroy", id: "1")
     end
   end # describe "routing"
 
   describe "route helpers" do
     it "#new_customer_vault_corporation_path" do
       expect(new_customer_vault_corporation_path).to \
-      eq "/dorsale/customer_vault/corporations/new"
+        eq "/dorsale/customer_vault/corporations/new"
     end
 
     it "#new_customer_vault_individual_path" do
       expect(new_customer_vault_individual_path).to \
-      eq "/dorsale/customer_vault/individuals/new"
+        eq "/dorsale/customer_vault/individuals/new"
     end
 
     it "#customer_vault_corporation_path" do
       expect(customer_vault_corporations_path).to \
-      eq "/dorsale/customer_vault/corporations"
+        eq "/dorsale/customer_vault/corporations"
     end
 
     it "#customer_vault_individual_path" do
       expect(customer_vault_individuals_path).to \
-      eq "/dorsale/customer_vault/individuals"
+        eq "/dorsale/customer_vault/individuals"
     end
   end # describe "route helpers"
 end

data/spec/routing/dorsale/expense_gun/expenses_routing_spec.rb

@@ -6,57 +6,57 @@ describe ::Dorsale::ExpenseGun::ExpensesController, type: :routing do
   describe "routing" do
     it "#index" do
       expect(get "/expense_gun/expenses").to \
-      route_to("dorsale/expense_gun/expenses#index")
+        route_to("dorsale/expense_gun/expenses#index")
     end
 
     it "#new" do
       expect(get "/expense_gun/expenses/new").to \
-      route_to("dorsale/expense_gun/expenses#new")
+        route_to("dorsale/expense_gun/expenses#new")
     end
 
     it "#create" do
       expect(post "/expense_gun/expenses").to \
-      route_to("dorsale/expense_gun/expenses#create")
+        route_to("dorsale/expense_gun/expenses#create")
     end
 
     it "#show" do
       expect(get "/expense_gun/expenses/1").to \
-      route_to("dorsale/expense_gun/expenses#show", id: "1")
+        route_to("dorsale/expense_gun/expenses#show", id: "1")
     end
 
     it "#edit" do
       expect(get "/expense_gun/expenses/1/edit").to \
-      route_to("dorsale/expense_gun/expenses#edit", id: "1")
+        route_to("dorsale/expense_gun/expenses#edit", id: "1")
     end
 
     it "#update" do
       expect(patch "/expense_gun/expenses/1").to \
-      route_to("dorsale/expense_gun/expenses#update", id: "1")
+        route_to("dorsale/expense_gun/expenses#update", id: "1")
     end
 
     it "#submit" do
       expect(patch "/expense_gun/expenses/1/submit").to \
-      route_to("dorsale/expense_gun/expenses#submit", id: "1")
+        route_to("dorsale/expense_gun/expenses#submit", id: "1")
     end
 
     it "#accept" do
       expect(patch "/expense_gun/expenses/1/accept").to \
-      route_to("dorsale/expense_gun/expenses#accept", id: "1")
+        route_to("dorsale/expense_gun/expenses#accept", id: "1")
     end
 
     it "#refuse" do
       expect(patch "/expense_gun/expenses/1/refuse").to \
-      route_to("dorsale/expense_gun/expenses#refuse", id: "1")
+        route_to("dorsale/expense_gun/expenses#refuse", id: "1")
     end
 
     it "#cancel" do
       expect(patch "/expense_gun/expenses/1/cancel").to \
-      route_to("dorsale/expense_gun/expenses#cancel", id: "1")
+        route_to("dorsale/expense_gun/expenses#cancel", id: "1")
     end
 
     it "#copy" do
       expect(get "/expense_gun/expenses/1/copy").to \
-      route_to("dorsale/expense_gun/expenses#copy", id: "1")
+        route_to("dorsale/expense_gun/expenses#copy", id: "1")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.9.1
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -642,6 +642,7 @@ files:
 - app/services/dorsale/service.rb
 - app/services/dorsale/tag_list_for_model.rb
 - app/sorters/dorsale/flyboy/task_comments_sorter.rb
+- app/sorters/dorsale/flyboy/tasks_sorter.rb
 - app/uploaders/dorsale/alexandrie/file_uploader.rb
 - app/uploaders/dorsale/application_uploader.rb
 - app/uploaders/dorsale/avatar_uploader.rb
@@ -771,6 +772,7 @@ files:
 - app/views/dorsale/flyboy/task_mailer/new_task.html.slim
 - app/views/dorsale/flyboy/task_mailer/term_email.html.slim
 - app/views/dorsale/flyboy/tasks/_context.html.slim
+- app/views/dorsale/flyboy/tasks/_filters.html.slim
 - app/views/dorsale/flyboy/tasks/_form.html.slim
 - app/views/dorsale/flyboy/tasks/_index_actions.html.slim
 - app/views/dorsale/flyboy/tasks/_list.html.slim
@@ -1013,129 +1015,129 @@ signing_key:
 specification_version: 4
 summary: Modular ERP made with Ruby on Rails
 test_files:
-- spec/controllers/dorsale/alexandrie/attachments_controller_spec.rb
-- spec/controllers/dorsale/billing_machine/invoices_controller_spec.rb
-- spec/controllers/dorsale/billing_machine/quotations_controller_spec.rb
-- spec/controllers/dorsale/comments_controller_spec.rb
-- spec/controllers/dorsale/customer_vault/events_controller_spec.rb
-- spec/controllers/dorsale/customer_vault/people_controller_spec.rb
-- spec/controllers/dorsale/expense_gun/expenses_controller_spec.rb
-- spec/controllers/dorsale/flyboy/task_comments_controller_spec.rb
-- spec/controllers/dorsale/flyboy/tasks_controller_spec.rb
-- spec/factories/alexandrie_attachment_types.rb
-- spec/factories/alexandrie_attachments.rb
+- spec/spec_helper.rb
+- spec/mailers/user_mailer.rb
+- spec/models/dorsale/billing_machine_spec.rb
+- spec/models/dorsale/i18n_spec.rb
+- spec/models/dorsale/alexandrie/attachment_spec.rb
+- spec/models/dorsale/alexandrie/attachment_type_spec.rb
+- spec/models/dorsale/expense_gun/expense_spec.rb
+- spec/models/dorsale/expense_gun/expense_line_spec.rb
+- spec/models/dorsale/expense_gun/category_spec.rb
+- spec/models/dorsale/customer_vault/person_spec.rb
+- spec/models/dorsale/customer_vault/individual_spec.rb
+- spec/models/dorsale/customer_vault/activity_type_spec.rb
+- spec/models/dorsale/customer_vault/origin_spec.rb
+- spec/models/dorsale/customer_vault/event_spec.rb
+- spec/models/dorsale/customer_vault/corporation_spec.rb
+- spec/models/dorsale/customer_vault/link_spec.rb
+- spec/models/dorsale/users_spec.rb
+- spec/models/dorsale/billing_machine/quotation_line_spec.rb
+- spec/models/dorsale/billing_machine/quotation_spec.rb
+- spec/models/dorsale/billing_machine/invoice_line_spec.rb
+- spec/models/dorsale/billing_machine/invoice_spec.rb
+- spec/models/dorsale/comment_spec.rb
+- spec/models/dorsale/flyboy/task_spec.rb
+- spec/models/dorsale/flyboy/task_comment_spec.rb
+- spec/models/dorsale/address_spec.rb
+- spec/support/devise.rb
+- spec/support/message_delivery.rb
+- spec/factories/expense_gun_categories.rb
+- spec/factories/dorsale_addresses.rb
 - spec/factories/billing_machine_invoice_lines.rb
+- spec/factories/customer_vault_origins.rb
+- spec/factories/customer_vault_links.rb
+- spec/factories/alexandrie_attachments.rb
+- spec/factories/customer_vault_event.rb
 - spec/factories/billing_machine_invoices.rb
-- spec/factories/billing_machine_payment_terms.rb
-- spec/factories/billing_machine_quotation_lines.rb
-- spec/factories/billing_machine_quotations.rb
 - spec/factories/customer_vault_activity_types.rb
+- spec/factories/billing_machine_payment_terms.rb
 - spec/factories/customer_vault_corporations.rb
-- spec/factories/customer_vault_event.rb
+- spec/factories/expense_gun_expenses.rb
+- spec/factories/alexandrie_attachment_types.rb
+- spec/factories/billing_machine_quotations.rb
+- spec/factories/flyboy_tasks.rb
 - spec/factories/customer_vault_individuals.rb
-- spec/factories/customer_vault_links.rb
-- spec/factories/customer_vault_origins.rb
-- spec/factories/dorsale_addresses.rb
-- spec/factories/dorsale_comments.rb
-- spec/factories/expense_gun_categories.rb
+- spec/factories/billing_machine_quotation_lines.rb
 - spec/factories/expense_gun_expense_lines.rb
-- spec/factories/expense_gun_expenses.rb
+- spec/factories/dorsale_comments.rb
 - spec/factories/flyboy_task_comments.rb
-- spec/factories/flyboy_tasks.rb
 - spec/files/avatar.png
 - spec/files/pdf.pdf
-- spec/mailers/user_mailer.rb
-- spec/models/dorsale/address_spec.rb
-- spec/models/dorsale/alexandrie/attachment_spec.rb
-- spec/models/dorsale/alexandrie/attachment_type_spec.rb
-- spec/models/dorsale/billing_machine/invoice_line_spec.rb
-- spec/models/dorsale/billing_machine/invoice_spec.rb
-- spec/models/dorsale/billing_machine/quotation_line_spec.rb
-- spec/models/dorsale/billing_machine/quotation_spec.rb
-- spec/models/dorsale/billing_machine_spec.rb
-- spec/models/dorsale/comment_spec.rb
-- spec/models/dorsale/customer_vault/activity_type_spec.rb
-- spec/models/dorsale/customer_vault/corporation_spec.rb
-- spec/models/dorsale/customer_vault/event_spec.rb
-- spec/models/dorsale/customer_vault/individual_spec.rb
-- spec/models/dorsale/customer_vault/link_spec.rb
-- spec/models/dorsale/customer_vault/origin_spec.rb
-- spec/models/dorsale/customer_vault/person_spec.rb
-- spec/models/dorsale/expense_gun/category_spec.rb
-- spec/models/dorsale/expense_gun/expense_line_spec.rb
-- spec/models/dorsale/expense_gun/expense_spec.rb
-- spec/models/dorsale/flyboy/task_comment_spec.rb
-- spec/models/dorsale/flyboy/task_spec.rb
-- spec/models/dorsale/i18n_spec.rb
-- spec/models/dorsale/users_spec.rb
-- spec/pdfs/dorsale/billing_machine/invoice_multiple_vat_pdf_spec.rb
 - spec/pdfs/dorsale/billing_machine/invoice_single_vat_pdf_spec.rb
 - spec/pdfs/dorsale/billing_machine/quotation_multiple_vat_pdf_spec.rb
 - spec/pdfs/dorsale/billing_machine/quotation_single_vat_pdf_spec.rb
-- spec/rails_helper.rb
+- spec/pdfs/dorsale/billing_machine/invoice_multiple_vat_pdf_spec.rb
 - spec/routing/dorsale/alexandrie/attachments_routing_spec.rb
-- spec/routing/dorsale/billing_machine/invoices_routing_spec.rb
-- spec/routing/dorsale/billing_machine/quotations_routing_spec.rb
 - spec/routing/dorsale/comments_routing_spec.rb
+- spec/routing/dorsale/expense_gun/expenses_routing_spec.rb
+- spec/routing/dorsale/users_routing_spec.rb
 - spec/routing/dorsale/customer_vault/activity_types_routing_spec.rb
-- spec/routing/dorsale/customer_vault/events_routing_spec.rb
 - spec/routing/dorsale/customer_vault/origins_routing_spec.rb
 - spec/routing/dorsale/customer_vault/people_routing_spec.rb
-- spec/routing/dorsale/expense_gun/expenses_routing_spec.rb
-- spec/routing/dorsale/flyboy/task_comments_routing_spec.rb
+- spec/routing/dorsale/customer_vault/events_routing_spec.rb
+- spec/routing/dorsale/billing_machine/quotations_routing_spec.rb
+- spec/routing/dorsale/billing_machine/invoices_routing_spec.rb
 - spec/routing/dorsale/flyboy/tasks_routing_spec.rb
-- spec/routing/dorsale/users_routing_spec.rb
-- spec/services/dorsale/billing_machine/quotation/copy_spec.rb
+- spec/routing/dorsale/flyboy/task_comments_routing_spec.rb
+- spec/controllers/dorsale/alexandrie/attachments_controller_spec.rb
+- spec/controllers/dorsale/comments_controller_spec.rb
+- spec/controllers/dorsale/expense_gun/expenses_controller_spec.rb
+- spec/controllers/dorsale/customer_vault/events_controller_spec.rb
+- spec/controllers/dorsale/customer_vault/people_controller_spec.rb
+- spec/controllers/dorsale/billing_machine/invoices_controller_spec.rb
+- spec/controllers/dorsale/billing_machine/quotations_controller_spec.rb
+- spec/controllers/dorsale/flyboy/tasks_controller_spec.rb
+- spec/controllers/dorsale/flyboy/task_comments_controller_spec.rb
+- spec/rails_helper.rb
+- spec/services/dorsale/expense_gun/expense/copy_spec.rb
 - spec/services/dorsale/billing_machine/quotation/statistics.rb
+- spec/services/dorsale/billing_machine/quotation/copy_spec.rb
 - spec/services/dorsale/billing_machine/quotation/to_invoice_spec.rb
-- spec/services/dorsale/expense_gun/expense/copy_spec.rb
 - spec/services/dorsale/flyboy/task/copy_spec.rb
 - spec/services/dorsale/flyboy/task/snoozer_spec.rb
-- spec/spec_helper.rb
-- spec/support/devise.rb
-- spec/support/message_delivery.rb
-- features/access.feature
-- features/billing_machine_invoices.feature
-- features/billing_machine_multiple_vat.feature
-- features/billing_machine_payment_terms.feature
-- features/billing_machine_quotations.feature
-- features/customer_vault_activity_types.feature
-- features/customer_vault_corporations.feature
-- features/customer_vault_filters.feature
-- features/customer_vault_individuals.feature
-- features/customer_vault_invoices.feature
-- features/customer_vault_links.feature
-- features/customer_vault_origins.feature
 - features/customer_vault_people.feature
-- features/customer_vault_search.feature
-- features/customer_vault_tasks.feature
 - features/expense_gun_categories.feature
+- features/customer_vault_activity_types.feature
+- features/users_management.feature
+- features/customer_vault_individuals.feature
+- features/billing_machine_quotations.feature
 - features/expense_gun_expenses.feature
-- features/flyboy_task_comments.feature
-- features/flyboy_tasks.feature
+- features/access.feature
 - features/flyboy_tasks_summary.feature
-- features/step_definitions/access_steps.rb
-- features/step_definitions/alexandrie_steps.rb
-- features/step_definitions/billing_machine_invoices_steps.rb
-- features/step_definitions/billing_machine_multiple_vat.rb
-- features/step_definitions/billing_machine_payment_terms_steps.rb
+- features/customer_vault_corporations.feature
+- features/billing_machine_invoices.feature
+- features/support/env.rb
+- features/customer_vault_search.feature
+- features/billing_machine_payment_terms.feature
+- features/customer_vault_origins.feature
+- features/billing_machine_multiple_vat.feature
+- features/step_definitions/customer_vault_filters_steps.rb
 - features/step_definitions/billing_machine_quotations_steps.rb
-- features/step_definitions/common_steps.rb
-- features/step_definitions/customer_vault_activity_types_steps.rb
+- features/step_definitions/customer_vault_search_steps.rb
+- features/step_definitions/expense_gun_expenses_steps.rb
 - features/step_definitions/customer_vault_corporations_steps.rb
-- features/step_definitions/customer_vault_filters_steps.rb
+- features/step_definitions/tasks_summary_steps.rb
+- features/step_definitions/flyboy_tasks_steps.rb
 - features/step_definitions/customer_vault_individuals_steps.rb
+- features/step_definitions/billing_machine_payment_terms_steps.rb
+- features/step_definitions/alexandrie_steps.rb
+- features/step_definitions/billing_machine_invoices_steps.rb
+- features/step_definitions/billing_machine_multiple_vat.rb
 - features/step_definitions/customer_vault_invoices_steps.rb
-- features/step_definitions/customer_vault_links_steps.rb
-- features/step_definitions/customer_vault_origins_steps.rb
 - features/step_definitions/customer_vault_people_steps.rb
-- features/step_definitions/customer_vault_search_steps.rb
-- features/step_definitions/customer_vault_tasks_steps.rb
+- features/step_definitions/users_management_step.rb
 - features/step_definitions/expense_gun_categories_steps.rb
-- features/step_definitions/expense_gun_expenses_steps.rb
+- features/step_definitions/customer_vault_origins_steps.rb
 - features/step_definitions/flyboy_task_comments_steps.rb
-- features/step_definitions/flyboy_tasks_steps.rb
-- features/step_definitions/tasks_summary_steps.rb
-- features/step_definitions/users_management_step.rb
-- features/support/env.rb
-- features/users_management.feature
+- features/step_definitions/customer_vault_activity_types_steps.rb
+- features/step_definitions/customer_vault_tasks_steps.rb
+- features/step_definitions/common_steps.rb
+- features/step_definitions/access_steps.rb
+- features/step_definitions/customer_vault_links_steps.rb
+- features/customer_vault_invoices.feature
+- features/customer_vault_links.feature
+- features/customer_vault_filters.feature
+- features/flyboy_task_comments.feature
+- features/customer_vault_tasks.feature
+- features/flyboy_tasks.feature