dorsale 3.1.7 → 3.2.0

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

@@ -11,10 +11,8 @@
     = search_form
 
   - content_for :actions
-    - if policy(::Dorsale::Flyboy::Task).export?
-      = download_button url_for(format: :csv), action: :export_csv
-      = download_button url_for(format: :xls), action: :export_xls
-      = download_button url_for(format: :pdf), action: :export_pdf
+    - if policy(model).export?
+      = download_button url_for(format: :xlsx), download: "#{model.ts}.xlsx"
 
   - content_for :table
     = render "dorsale/flyboy/tasks/list", tasks: @tasks, nested: false

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

@@ -0,0 +1,23 @@
+data = [
+  [
+    model.t(:taskable),
+    model.t(:taskable_type),
+    model.t(:taskable_progress),
+    model.t(:name),
+    model.t(:progress),
+    model.t(:term),
+  ]
+]
+
+@tasks_without_pagination.each do |task|
+  data << [
+    task.taskable.name,
+    task.taskable.class.t,
+    percentage(task.taskable.try(:progress)),
+    task.name,
+    percentage(task.progress),
+    date(task.term),
+  ]
+end
+
+Dorsale::Serializers::XLSX.new(data).render_inline

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

@@ -1,3 +1 @@
-h1 Tasks summary
-
 = render 'dorsale/flyboy/tasks/summary'

data/config/locales/common.en.yml

@@ -151,6 +151,7 @@ en:
     addressable           : "Origin"
     attachable            : "Origin"
     email_subject         : "Subject"
+    email_from            : "Sender"
     email_to              : "Recipient"
     email_attachment      : "Attachment"
     email_body            : "Message"
@@ -161,6 +162,7 @@ en:
 
   filters:
     all_customers: "All customers"
+    all_owners: "All all owners"
     date_begin: "Date begin"
     date_end: "Date end"
 

data/config/locales/common.fr.yml

@@ -162,6 +162,7 @@ fr:
     addressable           : "Origine"
     attachable            : "Origine"
     email_subject         : "Object"
+    email_from            : "Expéditeur"
     email_to              : "Destinataire"
     email_attachment      : "Pièce jointe"
     email_body            : "Message"
@@ -181,6 +182,7 @@ fr:
 
   filters:
     all_customers: "Tous les clients"
+    all_owners: "Tout le monde"
     date_begin: "Date début"
     date_end: "Date fin"
 

data/config/locales/customer_vault.en.yml

@@ -7,12 +7,6 @@ en:
     address_informations: "Address informations"
     additional_informations: "Additional informations"
 
-  sections:
-    activity: "Activity"
-    links: "Links"
-    tasks: "Tasks"
-    people: "People"
-
   messages:
     no_people: "No people find."
     no_activity: "No recent activity."

data/config/locales/customer_vault.fr.yml

@@ -7,12 +7,6 @@ fr:
     address_informations: "Adresse"
     additional_informations: "Informations complémentaires"
 
-  sections:
-    activity: "Activité"
-    links: "Liens"
-    tasks: "Tâches"
-    people: "Personnes"
-
   messages:
     no_people: "Aucune personne trouvée."
     no_activity: "Aucune activité récente."

data/config/locales/flyboy.en.yml

@@ -69,6 +69,8 @@ en:
 
       dorsale/flyboy/task:
         taskable: "Origin"
+        taskable_type: "Origin type"
+        taskable_progerss: "Origin progress"
         owner: "Owner"
         owner_id: "Owner"
         owner_guid: "Owner"

data/config/locales/flyboy.fr.yml

@@ -69,6 +69,8 @@ fr:
 
       dorsale/flyboy/task:
         taskable: "Origine"
+        taskable_type: "Type origine"
+        taskable_progress: "Progression origine"
         owner: "Propriétaire"
         owner_id: "Propriétaire"
         owner_guid: "Propriétaire"

data/config/routes.rb

@@ -1,7 +1,7 @@
 Dorsale::Engine.routes.draw do
   # Comments
 
-  resources :comments, only: [:index, :create, :edit, :update, :destroy]
+  resources :comments, only: [:create, :edit, :update, :destroy]
 
   # Users
 
@@ -71,7 +71,12 @@ Dorsale::Engine.routes.draw do
     end
 
     resources :people do
-      resources :links, except: [:index]
+      resources :links
+
+      member do
+        get :tasks
+        get :invoices
+      end
     end
 
     resources :corporations, path: "people", except: [:new] do

data/db/migrate/20161118071317_dorsale_add_missing_indexes.rb

@@ -0,0 +1,25 @@
+class DorsaleAddMissingIndexes < ActiveRecord::Migration[5.0]
+  def change
+    add_index :dorsale_customer_vault_people, :old_id
+    add_index :dorsale_expense_gun_expenses, :user_id
+    add_index :dorsale_addresses, :addressable_id
+    add_index :dorsale_addresses, :addressable_type
+    add_index :dorsale_alexandrie_attachments, :attachable_id
+    add_index :dorsale_alexandrie_attachments, :attachable_type
+    add_index :dorsale_alexandrie_attachments, :sender_id
+    add_index :dorsale_alexandrie_attachments, :sender_type
+    add_index :dorsale_billing_machine_invoices, :tracking_id
+    add_index :dorsale_billing_machine_quotations, :tracking_id
+    add_index :dorsale_comments, :author_id
+    add_index :dorsale_comments, :user_type
+    add_index :dorsale_comments, :commentable_id
+    add_index :dorsale_comments, :commentable_type
+    add_index :dorsale_comments, :author_type
+    add_index :dorsale_customer_vault_links, :alice_id
+    add_index :dorsale_customer_vault_links, :bob_id
+    add_index :dorsale_flyboy_task_comments, :author_type
+    add_index :dorsale_flyboy_task_comments, :author_id
+    add_index :dorsale_flyboy_tasks, :owner_type
+    add_index :dorsale_flyboy_tasks, :owner_id
+  end
+end

data/features/billing_machine_invoices.feature

@@ -33,6 +33,7 @@ Feature: Invoice Management
     Then a new invoice is displayed with the informations
 
   Scenario: Send invoice by email
+    Given an existing customer
     And an existing invoice
     When the user goes to the invoice details
     And he send invoice to customer by email
@@ -141,10 +142,11 @@ Feature: Invoice Management
     And the VAT due is "196,00"
     And the total including taxes is "1 196,00"
 
-  Scenario: Export invoices in CSV
+  Scenario: Export invoices in XLSX
     And an existing invoice
     When the user goes to the invoices page
-    Then he finds and clicks on the download CSV export file
+    When I export to XLSX
+    Then I download XLSX file
 
   Scenario: Existing unpaid invoice set to paid
     And an existing invoice

data/features/customer_vault_invoices.feature

@@ -0,0 +1,10 @@
+@javascript
+Feature: People invoices
+  Background:
+    Given an authenticated user
+
+  Scenario: List person invoices
+    Given an existing corporation
+    And this corporation has an invoice
+    When he go on he corporation invoices page
+    Then he should see 1 invoices

data/features/customer_vault_tasks.feature

@@ -27,7 +27,7 @@ Feature: Create tasks on people
     When I go on the general tasks page
     Then the task appear
 
-  Scenario: Add a task to an individual
+  Scenario: Filter tasks on an individual
     Given an existing individual
     When I go on this individual
     And I go on the tasks section

data/features/flyboy_tasks.feature

@@ -44,23 +44,11 @@ Feature: Manage tasks
     Then I am on the tasks section
     And the task is snoozed
 
-  Scenario: Export tasks to PDF
+  Scenario: Export tasks to XLSX
     Given 3 existing tasks
     When I go to the tasks section
-    And I export tasks to PDF
-    Then I download PDF file
-
-  Scenario: Export tasks to CSV
-    Given 3 existing tasks
-    When I go to the tasks section
-    And I export tasks to CSV
-    Then I download CSV file
-
-  Scenario: Export tasks to XLS
-    Given 3 existing tasks
-    When I go to the tasks section
-    And I export tasks to XLS
-    Then I download XLS file
+    And I export to XLSX
+    Then I download XLSX file
 
   Scenario: Filter tasks
     Given an existing done task

data/features/step_definitions/billing_machine_invoices_steps.rb

@@ -140,10 +140,6 @@ When(/^he saves the invoice$/) do
   find("[type=submit]").click
 end
 
-When(/^he finds and clicks on the download CSV export file$/) do
-  find("[href$=csv]").click
-end
-
 When(/^he set the invoice as paid$/) do
   find("[href$=pay]").click
 end
@@ -159,7 +155,7 @@ When(/^he changes the advance to "(.*?)"€$/) do |value|
 end
 
 When(/^he goes to the newly created invoice page$/) do
-  @invoice = ::Dorsale::BillingMachine::Invoice.unscoped.order(:id).last
+  @invoice = ::Dorsale::BillingMachine::Invoice.last_created
   visit dorsale.edit_billing_machine_invoice_path(@invoice)
 end
 
@@ -187,7 +183,7 @@ When(/^the user download the pdf$/) do
   find(".link_download").click
 end
 
-Then(/^he should see (\d+) invoices$/) do |count|
+Then(/^he should see (\d+) invoices?$/) do |count|
   expect(page).to have_selector '.invoice', count: count
 end
 

data/features/step_definitions/billing_machine_quotations_steps.rb

@@ -170,7 +170,7 @@ Then(/^the quotation's label has changed$/) do
 end
 
 Then(/^I am on the created quotation$/) do
-  @quotation = Dorsale::BillingMachine::Quotation.reorder(:id).last
+  @quotation = Dorsale::BillingMachine::Quotation.last_created
   expect(current_path).to eq dorsale.billing_machine_quotation_path(@quotation)
 end
 
@@ -184,7 +184,7 @@ Then(/^the quotation default date is set to today's date\.$/) do
   page.should have_field('quotation_date', with: I18n.l(Time.zone.now.to_date))
 end
 
-Then(/^he should see (\d+) quotations$/) do |arg1|
+Then(/^he should see (\d+) quotations?$/) do |arg1|
   page.should have_selector '.quotation', count: arg1
 end
 
@@ -201,7 +201,7 @@ Then(/^he will see links to the documents$/) do
 end
 
 Then(/^the quotation informations are visible on the quotation details$/) do
-  @quotation = ::Dorsale::BillingMachine::Quotation.unscoped.order(:id).last
+  @quotation = ::Dorsale::BillingMachine::Quotation.last_created
   visit dorsale.billing_machine_quotation_path(@quotation)
   expect(page).to have_content @payment_term.label
   expect(page).to have_content "I-am-a-comment"
@@ -217,13 +217,13 @@ end
 
 Then(/^he is on the created quotation edit page$/) do
   expect(Dorsale::BillingMachine::Quotation.count).to eq(@quotations_count+1)
-  @quotation = Dorsale::BillingMachine::Quotation.reorder(:id).last
+  @quotation = Dorsale::BillingMachine::Quotation.last_created
   expect(current_path).to eq dorsale.edit_billing_machine_quotation_path(@quotation)
 end
 
 Then(/^an invoice is created from quotation$/) do
   expect(Dorsale::BillingMachine::Invoice.count).to eq(@invoices_count+1)
-  @invoice = Dorsale::BillingMachine::Invoice.reorder(:id).last
+  @invoice = Dorsale::BillingMachine::Invoice.last_created
   expect(@invoice.label).to eq @quotation.label
 end
 

data/features/step_definitions/common_steps.rb

@@ -24,7 +24,6 @@ Given(/^an authenticated user$/) do
   sign_in @user
 end
 
-
 Given(/^an active user$/) do
   @user = create(:user)
 end
@@ -53,3 +52,10 @@ end
 Then(/^he see the "([^"]*)" filter$/) do |id|
   expect(page).to have_selector("#filters_#{id}")
 end
+
+When(/^(?:I|he|she) export to XLSX$/) do
+  find("a[href$=xlsx]").click
+end
+
+When(/^(?:I|he|she) download XLSX file$/) do
+end

data/features/step_definitions/customer_vault_corporations_steps.rb

@@ -53,7 +53,7 @@ end
 
 Then(/^the corporation is created$/) do
   expect(Dorsale::CustomerVault::Corporation.count).to eq(@corporations_count + 1)
-  @corporation = Dorsale::CustomerVault::Corporation.reorder(:id).last
+  @corporation = Dorsale::CustomerVault::Corporation.last_created
 
   expect(@corporation.corporation_name).to eq "AGILiDEE"
 end
@@ -97,7 +97,7 @@ end
 
 Then(/^I see do not see my comment$/) do
   expect(Dorsale::Comment.count).to eq(@comments_count - 1)
-  expect(page).to_not have_content @comment.text
+  expect(page).to have_no_content @comment.text
 end
 
 Given(/^an existing individual with recent comments$/) do
@@ -155,8 +155,8 @@ end
 
 Then(/^tags are added$/) do
   expect(all(".tag").count).to eq 2
-  expect(page.body).to have_content "mytag1"
-  expect(page.body).to have_content "mytag2"
+  expect(page).to have_content "mytag1"
+  expect(page).to have_content "mytag2"
 end
 
 Given(/^an existing corporation with tags$/) do
@@ -169,8 +169,8 @@ end
 
 Then(/^tags are removed$/) do
   expect(all(".tag").count).to eq 1
-  expect(page.body).to_not have_content "mytag1"
-  expect(page.body).to have_content "mytag2"
+  expect(page).to have_no_content "mytag1"
+  expect(page).to have_content "mytag2"
 end
 
 Given(/^an open task to this corporation$/) do
@@ -187,7 +187,7 @@ end
 
 Then(/^I see only the open task in the context$/) do
   expect(find("#context")).to have_content "I-am-open"
-  expect(find("#context")).to_not have_content "I-am-closed"
+  expect(find("#context")).to have_no_content "I-am-closed"
 end
 
 Then(/^I see the link in the context$/) do

data/features/step_definitions/customer_vault_filters_steps.rb

@@ -22,7 +22,7 @@ end
 Then(/^only first and second corporation appear$/) do
   expect(page).to have_content @corporation1.name
   expect(page).to have_content @corporation2.name
-  expect(page).to_not have_content @corporation3.name
+  expect(page).to have_no_content @corporation3.name
 end
 
 When(/^I add the second tag world$/) do
@@ -32,6 +32,6 @@ end
 
 Then(/^only the first corporation appear$/) do
   expect(page).to have_content @corporation1.name
-  expect(page).to_not have_content @corporation2.name
-  expect(page).to_not have_content @corporation3.name
+  expect(page).to have_no_content @corporation2.name
+  expect(page).to have_no_content @corporation3.name
 end

data/features/step_definitions/customer_vault_individuals_steps.rb

@@ -30,7 +30,7 @@ end
 Then(/^the individual is created$/) do
   expect(Dorsale::CustomerVault::Individual.count).to eq(@individuals_count + 1)
 
-  @individual = Dorsale::CustomerVault::Individual.reorder(:id).last
+  @individual = Dorsale::CustomerVault::Individual.last_created
 
   expect(@individual.first_name).to eq "Benoit"
   expect(@individual.last_name).to eq "Gantaume"

data/features/step_definitions/customer_vault_invoices_steps.rb

@@ -0,0 +1,7 @@
+Given(/^this (?:corporation|individual|person) has an invoice$/) do
+ @invoice = create(:billing_machine_invoice, customer: @person)
+end
+
+When(/^he go on he (?:corporation|individual|person) invoices page$/) do
+  visit dorsale.invoices_customer_vault_person_path(@person)
+end

data/features/step_definitions/customer_vault_links_steps.rb

@@ -1,10 +1,12 @@
 
 Given(/^an existing corporation$/) do
-  @corporation= create(:customer_vault_corporation)
+  @corporation = create(:customer_vault_corporation)
+  @person = @corporation
 end
 
 Given(/^an existing indidual$/) do
   @individual = create(:customer_vault_individual)
+  @person = @individual
 end
 
 Given(/^an existing link$/) do
@@ -19,12 +21,12 @@ When(/^I navigate to the link section of the indidual details$/) do
 end
 
 When(/^I add a new link to the corporation$/) do
-  find(".tab-content [href$='links/new']").click
+  find("#context-main [href$='links/new']").click
   expect(current_path).to eq dorsale.new_customer_vault_corporation_link_path(@corporation)
 end
 
 When(/^I add a new link to the individual$/) do
-  find(".tab-content [href$='links/new']").click
+  find("#context-main [href$='links/new']").click
   expect(current_path).to eq dorsale.new_customer_vault_individual_link_path(@individual)
 end