dorsale 3.7.1 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf48ad101657528cc823ff034689b86429052dd2
-  data.tar.gz: cadb1010f520ae56b346f951772e46cc0f87670c
+  metadata.gz: a0af47396cd8de5b81e92f797844f5df65ae2de4
+  data.tar.gz: 5ab1c66f64fe05aa3fedee65da652ce0cdf7b9c7
 SHA512:
-  metadata.gz: 8d45e6c14fb4c2192e1c77b8d12061e7a5834a23a439577892122f5f05a524b855b61475c2fe40e30e457442211a52f491bb72f7092d450280f29ac5afe2bee5
-  data.tar.gz: 34e5c7642da701322077d221fb263ebc671243ddf16b1acf388648f6c25203b0fb70f9fa96bf37b6b77d67dbe2dde79bbabe2a66eb365802cbac6093b200152a
+  metadata.gz: 79e8263485452c962cf22e8f45ddc8696ce5ebb5af6d3f9f8fcc3f3fac19c4163d9c705fc240a8048546aea7a871608451de77c40480a833f69ab2f9702f345b
+  data.tar.gz: 509a11ebc78b11f47e64557ff9f7f00898a0ead78f718bec312445dbbfcc004ea9ef362e8a31ae89f304522d0593682842297b7b865667cf8a44b941a02d3d7e

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.7.2
+- Add sorting for task comments
+- Add copy for tasks
+- Add comment when reporting
+
 ## 3.7.1
 - Add activity type and origin filters for people
 - Add activity type and origin in people export

data/app/assets/stylesheets/dorsale/engines/flyboy.sass

@@ -9,13 +9,13 @@
     th
       text-align: left
 
-  .finished td
+  .finished td, .context-body.finished
     background: $state-success-bg !important
 
-  .onwarning td
+  .onwarning td, .context-body.onwarning
     background: $state-warning-bg !important
 
-  .onalert td
+  .onalert td, .context-body.onalert
     background: $state-danger-bg !important
 
   td.actions

data/app/controllers/dorsale/application_controller.rb

@@ -14,11 +14,16 @@ class Dorsale::ApplicationController < ::ApplicationController
     end
   }
 
+  def filters_jar
+    cookies
+  end
+
   def model
     raise NotImplementedError
   end
 
   helper_method :model
+  helper_method :filters_jar
 
   def scope
     policy_scope(model)

data/app/controllers/dorsale/billing_machine/invoices_controller.rb

@@ -13,7 +13,7 @@ class Dorsale::BillingMachine::InvoicesController < ::Dorsale::BillingMachine::A
     authorize model, :list?
 
     @invoices ||= scope.all.preload(:customer)
-    @filters  ||= ::Dorsale::BillingMachine::SmallData::FilterForInvoices.new(cookies)
+    @filters  ||= ::Dorsale::BillingMachine::SmallData::FilterForInvoices.new(filters_jar)
 
     @invoices = @filters.apply(@invoices)
     @invoices_without_pagination = @invoices

data/app/controllers/dorsale/billing_machine/quotations_controller.rb

@@ -13,7 +13,7 @@ class Dorsale::BillingMachine::QuotationsController < ::Dorsale::BillingMachine:
     authorize model, :list?
 
     @quotations ||= scope.all.preload(:customer)
-    @filters    ||= ::Dorsale::BillingMachine::SmallData::FilterForQuotations.new(cookies)
+    @filters    ||= ::Dorsale::BillingMachine::SmallData::FilterForQuotations.new(filters_jar)
 
     @quotations = @filters.apply(@quotations)
     @quotations_without_pagination = @quotations # All filtered quotations (not paginated)

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

@@ -4,7 +4,7 @@ class Dorsale::CustomerVault::PeopleController < ::Dorsale::CustomerVault::Appli
   def index
     authorize model, :list?
 
-    @filters        ||= ::Dorsale::CustomerVault::SmallData::FilterForPeople.new(cookies)
+    @filters        ||= ::Dorsale::CustomerVault::SmallData::FilterForPeople.new(filters_jar)
     @tags           ||= customer_vault_tag_list
     @origins        ||= policy_scope(Dorsale::CustomerVault::Origin)
     @activity_types ||= policy_scope(Dorsale::CustomerVault::ActivityType)

data/app/controllers/dorsale/expense_gun/expenses_controller.rb

@@ -16,7 +16,7 @@ class Dorsale::ExpenseGun::ExpensesController < Dorsale::ExpenseGun::Application
     authorize model, :list?
 
     @expenses ||= scope.all.preload(:user, :expense_lines)
-    @filters ||= Dorsale::ExpenseGun::SmallData::FilterForExpenses.new(cookies)
+    @filters ||= Dorsale::ExpenseGun::SmallData::FilterForExpenses.new(filters_jar)
     @expenses = @filters.apply(@expenses)
     @expenses = @expenses.page(params[:page]).per(25)
   end

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

@@ -7,7 +7,8 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
     :update,
     :destroy,
     :complete,
-    :snooze
+    :snooze,
+    :copy,
   ]
 
   def index
@@ -33,7 +34,7 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
       end
     end
 
-    @filters ||= ::Dorsale::Flyboy::SmallData::FilterForTasks.new(cookies)
+    @filters ||= ::Dorsale::Flyboy::SmallData::FilterForTasks.new(filters_jar)
 
     @tasks = @filters.apply(@tasks)
     @tasks = @tasks.search(params[:q])
@@ -51,6 +52,19 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
 
   def show
     authorize @task, :read?
+    @task_comments = @task.comments
+
+    @order ||= sortable_column_order do |column, direction|
+    case column
+    when :description
+        %(LOWER(#{column}) #{direction})
+      when :progress
+        %(#{column} #{direction})
+      else
+        "date #{direction}"
+      end
+    end
+    @task_comments = @task_comments.reorder(@order)
   end
 
   def new
@@ -131,6 +145,8 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
     authorize @task, :snooze?
 
     if @task.snoozer.snooze
+      comment = Dorsale::Flyboy::TaskComment.new(task: @task, progress: @task.progress, description: t("messages.tasks.snooze_ok"), author: current_user)
+      comment.save!
       flash[:success] = t("messages.tasks.snooze_ok")
     else
       flash[:danger] = t("messages.tasks.snooze_error")
@@ -139,6 +155,14 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
     redirect_to back_url
   end
 
+  def copy
+    authorize @task, :copy?
+
+    @original = @task
+    @task  = Dorsale::Flyboy::Task::Copy.(@original)
+    render :new
+  end
+
   def summary
     authorize model, :list?
 

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

@@ -1,6 +1,6 @@
 module Dorsale::Flyboy::ApplicationHelper
   def tasks_for(taskable)
-    @filters = ::Dorsale::Flyboy::SmallData::FilterForTasks.new(cookies)
+    @filters = ::Dorsale::Flyboy::SmallData::FilterForTasks.new(filters_jar)
 
     order ||= sortable_column_order do |column, direction|
       case column

data/app/policies/dorsale/flyboy/task_policy_helper.rb

@@ -9,6 +9,7 @@ module Dorsale::Flyboy::TaskPolicyHelper
     :delete?,
     :complete?,
     :snooze?,
+    :copy?,
   ]
 
   def create?
@@ -16,14 +17,6 @@ module Dorsale::Flyboy::TaskPolicyHelper
     super
   end
 
-  def update?
-    super
-  end
-
-  def delete?
-    super
-  end
-
   def complete?
     return false if task.done?
     super

data/app/services/dorsale/flyboy/task/copy.rb

@@ -0,0 +1,18 @@
+class Dorsale::Flyboy::Task::Copy < ::Dorsale::Service
+  attr_accessor :task, :copy
+
+  def initialize(task)
+    @task = task
+  end
+
+  def call
+    @copy = @task.dup
+    @copy.reminder_date = nil
+    @copy.reminder_type = nil
+    @copy.term = nil
+    @copy.done = nil
+    @copy.progress = nil
+    @copy.assign_default_values
+    @copy
+  end
+end

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

@@ -3,10 +3,10 @@
     thead
       tr
         th.task_comment-progress
-          = Dorsale::Flyboy::TaskComment.t(:progress)
+          = sortable_column Dorsale::Flyboy::TaskComment.t(:progress), :progress
 
         th.task_comment-description
-          = Dorsale::Flyboy::TaskComment.t(:description)
+          = sortable_column Dorsale::Flyboy::TaskComment.t(:description), :description
 
     tbody
       - if policy(@task).comment?
@@ -22,7 +22,7 @@
               input type="submit" value=t("actions.save")
 
 
-      - @task.reload.comments.map do |comment|
+      - @task_comments.each do |comment|
         tr.task_comment
           td.task_comment-progress
             = progress_bar percentage: comment.progress, label: true

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

@@ -4,7 +4,7 @@
     = " "
     = task
 
-  .context-body
+  .context-body class=task_color(task)
     = info task, :progress, progress_bar(percentage: task.progress, label: true)
     = info task, :owner
     = info task, :created_at
@@ -14,3 +14,9 @@
 
   .context-footer
     = actions_for task
+
+    - if policy(task).copy?
+      = copy_button copy_flyboy_task_path(task), method: :patch
+
+    - if policy(task).snooze?
+      = snooze_button snooze_flyboy_task_path(task), method: :patch

data/config/locales/flyboy.fr.yml

@@ -11,6 +11,8 @@ fr:
       snooze_eror: "Impossible de reporter la tâche"
       complete_ok: "La tâche a été marquée comme terminée"
       complete_eror: "Impossible de terminer la tâche"
+      copy_ok: "La tâche a été copiée"
+      copy_ko: "Impossible de copier cette tâche"
 
   task_mailer:
     new_task:

data/config/routes.rb

@@ -21,6 +21,7 @@ Dorsale::Engine.routes.draw do
       member do
         patch :complete
         patch :snooze
+        patch :copy
       end
     end
 

data/lib/dorsale/version.rb

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

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

@@ -234,6 +234,11 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
       patch :snooze, params: {:id => task.to_param}
       expect(response).to redirect_to(task)
     end
+
+    it "is expected to create a task comment" do
+      task = create(:flyboy_task, term: 3.days.ago)
+      expect{patch :snooze, params: {:id => task.to_param}}.to change{Dorsale::Flyboy::TaskComment.count}.by(1)
+    end
   end
 
   describe "summary" do

data/spec/routing/dorsale/flyboy/tasks_routing_spec.rb

@@ -44,5 +44,8 @@ describe ::Dorsale::Flyboy::TasksController, type: :routing do
       expect(delete("flyboy/tasks/1")).to route_to("dorsale/flyboy/tasks#destroy", id: "1")
     end
 
+    it "routes to #copy" do
+      expect(patch("flyboy/tasks/1/copy")).to route_to("dorsale/flyboy/tasks#copy", id: "1")
+    end
   end
 end

data/spec/services/dorsale/flyboy/task/copy_spec.rb

@@ -0,0 +1,25 @@
+require "rails_helper"
+
+RSpec.describe Dorsale::Flyboy::Task::Copy do
+  let(:task) {
+    create(:flyboy_task, done: true, progress: 50)
+  }
+
+  let(:copy) {
+    copy = Dorsale::Flyboy::Task::Copy.(task)
+    copy.save
+    copy
+  }
+
+  it "is expected to duplicate the whole object" do
+    expect(copy).to be_persisted
+    expect(copy.name).to                    eq task.name
+    expect(copy.owner).to                   eq task.owner
+    expect(copy.description).to             eq task.description
+  end
+
+  it "is expected to set the progress to 0" do
+    expect(copy.progress).to eq 0
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.2
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -636,6 +636,7 @@ files:
 - app/services/dorsale/billing_machine/quotation/statistics.rb
 - app/services/dorsale/billing_machine/quotation/to_invoice.rb
 - app/services/dorsale/expense_gun/expense/copy.rb
+- app/services/dorsale/flyboy/task/copy.rb
 - app/services/dorsale/flyboy/task/snoozer.rb
 - app/services/dorsale/service.rb
 - app/services/dorsale/tag_list_for_model.rb
@@ -990,6 +991,7 @@ files:
 - spec/services/dorsale/billing_machine/quotation/statistics.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
@@ -1095,6 +1097,7 @@ test_files:
 - spec/services/dorsale/billing_machine/quotation/statistics.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