dorsale 3.9.7 → 3.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19154c764ac2dbbf08f847870a9e25551c745ea0
-  data.tar.gz: 401461784af4a331967feb30e8769623584ec539
+  metadata.gz: 92313d3e11ca03d76f1153193497dd581e8cf4ad
+  data.tar.gz: 4e9f7171df37fff5047abecf671cd2408affb103
 SHA512:
-  metadata.gz: cd9a9eba500e6e8d9941029c64cffca4b7165bad1f63b922e4a6297243df75e26759a305cd3799d31252cd869b5d430624142fef1461dcc4af7de162c7ce9caa
-  data.tar.gz: ece4ad04640bfeddd6b406a00233752b9c58c539952dcb74152346beb41976ea3b2fcd0dbcae21b21984d061063cb4a90724b1bde9c7579998bd30e2f1151103
+  metadata.gz: e836be0347fe2fafd0bfedc565599c89ab786f58dc665ac923489cb900aaad73e5b34c9b06e4a8fff1681181ac3a81591315c9734ee424455ebb536da0380ed2
+  data.tar.gz: 3a377cbad257367addc9a05df944d4e22608001ba8ec15624efedabb023519879e0f7160ea73032d9f30be59cf3e512cc48528deee29726a37de6c7457524835

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Next version
 
+## 3.9.8
+
+- Tasks : add increment progress buttons
+- Tasks : small improvements
+
 ## 3.9.7
 
 - Attachments : refactor + sorting

data/app/filters/dorsale/billing_machine/small_data/filter_for_invoices.rb

@@ -1,6 +1,6 @@
 class Dorsale::BillingMachine::SmallData::FilterForInvoices < ::Agilibox::SmallData::Filter
   STRATEGIES = {
-    "bm_time_period"    => ::Agilibox::SmallData::FilterStrategyByTimePeriod.new(:date),
+    "bm_time_period"    => ::Agilibox::SmallData::FilterStrategyByDatePeriod.new(:date),
     "bm_date_begin"     => ::Agilibox::SmallData::FilterStrategyByDateBegin.new(:date),
     "bm_date_end"       => ::Agilibox::SmallData::FilterStrategyByDateEnd.new(:date),
     "bm_customer_guid"  => ::Dorsale::BillingMachine::SmallData::FilterStrategyByCustomer.new,

data/app/filters/dorsale/billing_machine/small_data/filter_for_quotations.rb

@@ -1,6 +1,6 @@
 class Dorsale::BillingMachine::SmallData::FilterForQuotations < ::Agilibox::SmallData::Filter
   STRATEGIES = {
-    "bm_time_period"     => ::Agilibox::SmallData::FilterStrategyByTimePeriod.new(:date),
+    "bm_time_period"     => ::Agilibox::SmallData::FilterStrategyByDatePeriod.new(:date),
     "bm_date_begin"      => ::Agilibox::SmallData::FilterStrategyByDateBegin.new(:date),
     "bm_date_end"        => ::Agilibox::SmallData::FilterStrategyByDateEnd.new(:date),
     "bm_customer_guid"   => ::Dorsale::BillingMachine::SmallData::FilterStrategyByCustomer.new,

data/app/models/dorsale/customer_vault/person.rb

@@ -65,7 +65,7 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
   def validate_taken_emails
     return if taken_emails.empty?
 
-    if taken_emails.keys.include?(email)
+    if taken_emails.key?(email)
       errors.add(:email, :taken)
     end
 

data/app/models/dorsale/flyboy.rb

@@ -1,2 +1,9 @@
 module Dorsale::Flyboy
+  class << self
+    attr_writer :progress_increment_buttons
+
+    def progress_increment_buttons
+      @progress_increment_buttons ||= [5, 10, 25, 50]
+    end
+  end
 end

data/app/pdfs/dorsale/prawn_helpers.rb

@@ -93,7 +93,7 @@ module Dorsale::PrawnHelpers
     if ApplicationUploader.storage.to_s.end_with?("File") # Local
       obj.path
     elsif ApplicationUploader.storage.to_s.end_with?("Fog") # Amazon S3
-      open(obj.url)
+      URI.parse(obj.url).open
     else
       raise NotImplementedError
     end

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

@@ -2,6 +2,7 @@
   tr#new_task_comment_tr
     td.task_comment-progress
       = f.input :progress, label: false
+      = render "dorsale/flyboy/task_comments/increment_buttons"
 
     td.task_comment-content
       = f.hidden_field :task_id

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

@@ -0,0 +1,16 @@
+.task_comment-increment-buttons.text-center
+ - Dorsale::Flyboy.progress_increment_buttons.each do |value|
+    button.btn.btn-xs.increment type="button" data-value=value
+      = "+" if value.positive?
+      = "-" if value.negative?
+      = value.abs
+
+coffee:
+  $("button.increment").click ->
+    current   = parseInt $("#task_comment_progress").val()
+    increment = parseInt this.dataset.value
+    newValue  = current + increment
+    newValue  = 0   if newValue < 0
+    newValue  = 100 if newValue > 100
+    $("#task_comment_progress").val(newValue)
+    $(this).blur()

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

@@ -8,6 +8,10 @@
         th.task_comment-description
           = sortable_column Dorsale::Flyboy::TaskComment.t(:description), :description
 
+          - if policy(@task).complete?
+            .pull-right = complete_button complete_flyboy_task_path(task)
+
+
     tbody
       - if params[:sort] != "date"
         = render "dorsale/flyboy/task_comments/form", f: f

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

@@ -0,0 +1,10 @@
+= actions_for task
+
+- if policy(task).copy?
+  = copy_button copy_flyboy_task_path(task)
+
+- if policy(task).snooze?
+  = snooze_button snooze_flyboy_task_path(task), method: :patch
+
+- if policy(task).complete?
+  = complete_button complete_flyboy_task_path(task)

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

@@ -14,10 +14,4 @@
     = info task, :done
 
   .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
+    = render "dorsale/flyboy/tasks/actions", task: task

data/app/views/dorsale/flyboy/tasks/index.xlsx.ruby

@@ -11,7 +11,7 @@ data = [
 @tasks_without_pagination.each do |task|
   data << [
     task.taskable.to_s,
-    (task.taskable.class.t if task.taskable),
+    task.taskable&.class&.t,
     task.name,
     percentage(task.progress),
     date(task.term),

data/config/routes.rb

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

data/features/billing_machine_invoices.feature

@@ -258,4 +258,4 @@ Feature: Invoice Management
   Scenario: Invoices data
     Given existing "100" invoices with "123" amount
     When the user goes to the invoices page
-    Then data total amount is "12 300"
+    Then data total amount is "12 300"

data/features/billing_machine_quotations.feature

@@ -190,4 +190,4 @@ Feature: Quotation Management
   Scenario: Quotations data
     Given existing "100" quotations with "123" amount
     When the user goes to the quotations page
-    Then data total amount is "12 300"
+    Then data total amount is "12 300"

data/features/flyboy_task_comments.feature

@@ -10,3 +10,12 @@ Feature: Manage task comments
     And I create a new task comment
     Then I am on this task
     And the task comment is created
+
+  Scenario: Increment task comment progress JS
+    Given an existing task
+    When I go to the tasks section
+    And I consult this task
+    And I fill "task_comment_progress" with "0"
+    Then "task_comment_progress" has value "0"
+    When I click on "+5"
+    Then "task_comment_progress" has value "5"

data/features/step_definitions/billing_machine_invoices_steps.rb

@@ -182,7 +182,7 @@ Then(/^he should see (\d+) invoices?$/) do |count|
 end
 
 Then(/^the invoice is displayed correctly$/) do
-  expect(page).to have_selector ".tracking_id", @invoice.tracking_id
+  expect(page).to have_selector ".tracking_id", text: @invoice.tracking_id
 end
 
 Then(/^the total excluding taxes is "(.*?)"$/) do |total|
@@ -303,7 +303,7 @@ Then(/^a new invoice is displayed with the informations$/) do
 end
 
 Then(/^he can see all the informations$/) do
-  expect(page).to have_selector ".invoice-label", @invoice.label
+  expect(page).to have_selector ".invoice-label", text: @invoice.label
 end
 
 Then(/^only the invoices of this customer do appear$/) do

data/features/step_definitions/billing_machine_quotations_steps.rb

@@ -141,9 +141,7 @@ Then(/^I am on the created quotation$/) do
 end
 
 Then(/^he can see all the quotation informations$/) do
-  expect(page).to have_selector ".quotation-label", @quotation.label
-
-  expect(page).to have_selector ".quotation-expires_at", "21/12/2012"
+  expect(page).to have_selector ".quotation-label", text: @quotation.label
 end
 
 Then(/^the quotation default date is set to today's date\.$/) do
@@ -155,7 +153,7 @@ Then(/^he should see (\d+) quotations?$/) do |arg1|
 end
 
 Then(/^the quotation is displayed correctly$/) do
-  expect(page).to have_selector ".tracking_id", @quotation.tracking_id
+  expect(page).to have_selector ".tracking_id", text: @quotation.tracking_id
 end
 
 Then(/^a message signals the success of the quotation creation$/) do

data/features/step_definitions/common_steps.rb

@@ -84,3 +84,7 @@ end
 Then(/^I see "([^"]*)" element$/) do |element_selector|
   expect(page).to have_selector element_selector
 end
+
+When("I click on {string}") do |text|
+  click_on text
+end

data/features/step_definitions/customer_vault_links_steps.rb

@@ -1,4 +1,3 @@
-
 Given(/^an existing corporation$/) do
   @corporation = create(:customer_vault_corporation)
   @person = @corporation

data/features/support/env.rb

@@ -1,7 +1,8 @@
-ENV["RAILS_ROOT"] ||= File.expand_path("../../../spec/dummy", __FILE__)
+ENV["RAILS_ROOT"] ||= File.expand_path("../../spec/dummy", __dir__)
 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!
+Agilibox::CucumberConfig.require_poltergeist!

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.9.7"
+  VERSION = "3.9.8"
 end

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

@@ -45,7 +45,7 @@ describe ::Dorsale::Flyboy::TasksController, type: :routing do
     end
 
     it "routes to #copy" do
-      expect(patch("flyboy/tasks/1/copy")).to route_to("dorsale/flyboy/tasks#copy", id: "1")
+      expect(get("flyboy/tasks/1/copy")).to route_to("dorsale/flyboy/tasks#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.7
+  version: 3.9.8
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -776,10 +776,12 @@ files:
 - app/views/dorsale/expense_gun/expenses/new.html.slim
 - app/views/dorsale/expense_gun/expenses/show.html.slim
 - app/views/dorsale/flyboy/task_comments/_form.html.slim
+- app/views/dorsale/flyboy/task_comments/_increment_buttons.html.slim
 - app/views/dorsale/flyboy/task_comments/_list.html.slim
 - app/views/dorsale/flyboy/task_comments/_task_comment.html.slim
 - 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/_actions.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