dorsale 3.3.0 → 3.4.0

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

@@ -1 +1 @@
-= render "#{@task.taskable.class.to_s.tableize}/context", taskable: @task.taskable
+= render "#{@task.taskable.class.to_s.tableize}/context", taskable: @task.taskable if @task.taskable

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

@@ -2,7 +2,6 @@ data = [
   [
     model.t(:taskable),
     model.t(:taskable_type),
-    model.t(:taskable_progress),
     model.t(:name),
     model.t(:progress),
     model.t(:term),
@@ -11,9 +10,8 @@ data = [
 
 @tasks_without_pagination.each do |task|
   data << [
-    task.taskable.name,
-    task.taskable.class.t,
-    percentage(task.taskable.try(:progress)),
+    task.taskable.to_s,
+    (task.taskable.class.t if task.taskable),
     task.name,
     percentage(task.progress),
     date(task.term),

data/config/locales/billing_machine.en.yml

@@ -61,6 +61,7 @@ en:
     total_including_taxes: "Total"
     expires_at: "Expires at"
     balance: "Balance"
+    pdf_file: "PDF File"
 
   activerecord:
     models:

data/config/locales/billing_machine.fr.yml

@@ -61,6 +61,7 @@ fr:
     total_including_taxes: "Total TTC"
     expires_at: "Date d'expiration"
     balance: "Reste à payer"
+    pdf_file: "Fichier PDF"
 
   activerecord:
     models:

data/config/locales/common.en.yml

@@ -176,9 +176,9 @@ en:
     tomorrow: "Tomorrow"
     today: "Today"
     yesterday: "Yesterday"
-    this_week: "This semaine"
-    this_month: "This mois"
-    this_year: "This année"
+    this_week: "This week"
+    this_month: "This month"
+    this_year: "This year"
     last_week: "Last week"
     last_month: "Last month"
     last_year: "Last year"

data/config/locales/expense_gun.fr.yml

@@ -2,12 +2,12 @@ fr:
   expense_gun:
     expense:
       messages:
-        created  : "La note de frais a été créée."
-        updated  : "La note de frais a été mise à jour."
-        submited : "La note de frais a été soumise."
-        accepted : "La note de frais a été acceptée."
-        refused  : "La note de frais a été refusée."
-        canceled : "La note de frais a été annulée."
+        created   : "La note de frais a été créée."
+        updated   : "La note de frais a été mise à jour."
+        submitted : "La note de frais a été soumise."
+        accepted  : "La note de frais a été acceptée."
+        refused   : "La note de frais a été refusée."
+        canceled  : "La note de frais a été annulée."
 
       actions:
         create : "Nouvelle note de frais"
@@ -61,9 +61,9 @@ fr:
         vat_deductible : "TVA déductible"
 
       dorsale/expense_gun/expense/state:
-        all      : "Toutes"
-        new      : "Brouillon"
-        submited : "Soumise"
-        accepted : "Accepée"
-        refused  : "Refusée"
-        canceled : "Annulée"
+        all       : "Toutes"
+        draft     : "Brouillon"
+        submitted : "Soumise"
+        accepted  : "Accepée"
+        refused   : "Refusée"
+        canceled  : "Annulée"

data/config/locales/flyboy.en.yml

@@ -2,15 +2,6 @@ en:
   messages:
     forbidden: "This page dont exist"
 
-    folders:
-      title_create: "New folder"
-      create_ok: "Folder created"
-      update_ok: "Folder updated"
-      open_ok: "Folder is open again"
-      open_error: "One error occurs, folder can't be opened"
-      close_ok: "Folder closed"
-      close_error: "One error occurs, folder can't be closed"
-
     tasks:
       create_ok: "Task created"
       update_ok: "Task updated"
@@ -33,15 +24,8 @@ en:
   actions:
     label: "Actions"
 
-    folders:
-      new_task: "New task"
-
   activerecord:
     models:
-      dorsale/flyboy/folder:
-        one: "Folder"
-        other: "Folders"
-
       dorsale/flyboy/task:
         one: "Task"
         other: "Tasks"
@@ -51,26 +35,15 @@ en:
         other: "Task Comments"
 
     attributes:
-      dorsale/flyboy/folder:
-        folderable: "Origin"
-        name: "Name"
-        status: "Status"
-        description: "Description"
-        revision: "Revision"
-        status: "State"
-        progress: "Progress"
-
-      dorsale/flyboy/folder/status:
+      dorsale/flyboy/task/status:
         all: "All status"
         open: "Open"
-        pending: "Pending"
         closed: "Closed"
         unknown: "Unknown"
 
       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

@@ -2,15 +2,6 @@ fr:
   messages:
     forbidden: "Cette page ne peut être trouvée"
 
-    folders:
-      title_create: "Nouveau dossier"
-      create_ok: "Le dossier a bien été créé"
-      update_ok: "Le dossier a bien été modifié"
-      open_ok: "Le dossier a été réouvert"
-      open_error: "Impossible de réouvrir le dossier"
-      close_ok: "Le dossier a été fermé"
-      close_error: "Impossible de fermer le dossier"
-
     tasks:
       create_ok: "La tâche a bien été créée"
       update_ok: "La tâche a bien été modifiée"
@@ -33,15 +24,8 @@ fr:
   actions:
     label: "Actions"
 
-    folders:
-      new_task: "Nouvelle tâche"
-
   activerecord:
     models:
-      dorsale/flyboy/folder:
-        one: "Dossier"
-        other: "Dossiers"
-
       dorsale/flyboy/task:
         one: "Tâche"
         other: "Tâches"
@@ -51,26 +35,15 @@ fr:
         other: "Commentaires de tâche"
 
     attributes:
-      dorsale/flyboy/folder:
-        folderable: "Origine"
-        name: "Titre"
-        status: "Status"
-        description: "Description"
-        revision: "Révision"
-        status: "Etat"
-        progress: "Progression"
-
-      dorsale/flyboy/folder/status:
+      dorsale/flyboy/task/status:
         all: "Tous les status"
         open: "Ouvert"
-        pending: "En attente"
         closed: "Fermé"
         unknown: "Inconnu"
 
       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

@@ -22,13 +22,6 @@ Dorsale::Engine.routes.draw do
   # Flyboy
 
   namespace :flyboy do
-    resources :folders do
-      member do
-        patch :open
-        patch :close
-      end
-    end
-
     resources :tasks do
       get :summary, on: :collection
       member do

data/db/migrate/20170127131537_delete_folders.rb

@@ -0,0 +1,10 @@
+class DeleteFolders < ActiveRecord::Migration[5.0]
+  def change
+    # Comment this migration or only this line to keep or delete folders
+    raise "Hi ! Do you want to delete folders ?"
+    drop_table :dorsale_flyboy_folders
+    Dorsale::Flyboy::Task
+      .where(taskable_type: "Dorsale::Flyboy::Folder")
+      .update_all(taskable_type: nil, taskable_id: nil)
+  end
+end

data/db/migrate/20170127151610_fix_expense_state.rb

@@ -0,0 +1,6 @@
+class FixExpenseState < ActiveRecord::Migration[5.0]
+  def change
+    Dorsale::ExpenseGun::Expense.where(state: "submited").update_all(state: "submitted")
+    Dorsale::ExpenseGun::Expense.where(state: "new").update_all(state: "draft")
+  end
+end

data/db/migrate/20170127155636_billing_machine_add_pdf_file.rb

@@ -0,0 +1,16 @@
+class BillingMachineAddPdfFile < ActiveRecord::Migration[5.0]
+  def change
+    add_column :dorsale_billing_machine_invoices,   :pdf_file, :string
+    add_column :dorsale_billing_machine_quotations, :pdf_file, :string
+
+    Dorsale::ApplicationRecord.reset_column_information
+
+    Dorsale::BillingMachine::Invoice.all.each do |invoice|
+      Dorsale::BillingMachine::PdfFileGenerator.(invoice)
+    end
+
+    Dorsale::BillingMachine::Quotation.all.each do |quotation|
+      Dorsale::BillingMachine::PdfFileGenerator.(quotation)
+    end
+  end
+end

data/features/expense_gun_expenses.feature

@@ -34,7 +34,7 @@ Feature: Expenses
     When I go on the expense page
     And I submit the expense
     Then I am redirect to the expenses page
-    And the expense state is "submited"
+    And the expense state is "submitted"
 
   Scenario: Cancel expense
     Given an existing expense
@@ -45,7 +45,7 @@ Feature: Expenses
 
   Scenario: Accept expense
     Given an existing expense
-    And the expense is submited
+    And the expense is submitted
     When I go on the expense page
     And I accept the expense
     Then I am redirect to the expense page
@@ -53,7 +53,7 @@ Feature: Expenses
 
   Scenario: Refuse expense
     Given an existing expense
-    And the expense is submited
+    And the expense is submitted
     When I go on the expense page
     And I refuse the expense
     Then I am redirect to the expenses page

data/features/flyboy_task_comments.feature

@@ -1,5 +1,5 @@
 @javascript
-Feature: Manage folder comments
+Feature: Manage task comments
   Background:
     Given an authenticated user
 

data/features/flyboy_tasks.feature

@@ -4,11 +4,10 @@ Feature: Manage tasks
     Given an authenticated user
 
   Scenario: Create a task
-    Given an existing folder
-    When I consult this folder
+    When I go to the tasks section
     And I create a task
-    Then I am on this folder
-    And the task is created
+    Then the task is created
+    And I go to the tasks section
 
   Scenario: Read a task
     Given an existing task

data/features/flyboy_tasks_summary.feature

@@ -5,7 +5,6 @@ Feature: Homepage
 
   Background:
     Given an authenticated user
-    Given an existing folder
 
   Scenario: Expired tasks
     Given an expired tasks

data/features/step_definitions/billing_machine_invoices_steps.rb

@@ -339,6 +339,7 @@ end
 When(/^he send invoice to customer by email$/) do
   ActionMailer::Base.deliveries.clear
 
+  Dorsale::BillingMachine::PdfFileGenerator.(@invoice)
   @invoice.customer = create(:customer_vault_corporation, email: "aaa@example.org")
   @invoice.save!
 

data/features/step_definitions/expense_gun_expenses_steps.rb

@@ -90,8 +90,8 @@ Then(/^the expense state is "([^"]*)"$/) do |new_state|
   expect(@expense.reload.state).to eq new_state
 end
 
-Given(/^the expense is submited$/) do
-  @expense.update_columns(state: "submited")
+Given(/^the expense is submitted$/) do
+  @expense.update_columns(state: "submitted")
 end
 
 When(/^I cancel the expense$/) do

data/features/step_definitions/flyboy_tasks_steps.rb

@@ -14,8 +14,7 @@ Given(/^an existing task named "(.*?)"$/) do |name|
 end
 
 Given(/^an existing task$/) do
-  @task   = create(:flyboy_task)
-  @folder = @task.taskable
+  @task = create(:flyboy_task)
 end
 
 Given(/^an existing snoozable task$/) do
@@ -63,7 +62,7 @@ When(/^the flyboy daily crons run$/) do
 end
 
 When(/^I create a task$/) do
-  find("#context-main a[href*='tasks/new']").click
+  find("a[href*='tasks/new']").click
   find("form[id*=task] [type=submit]").click # First submit to see errors
   fill_in "task_name", with: "I-am-the-task-title"
   fill_in "task_description", with: "I-am-the-task-description"

data/features/step_definitions/tasks_summary_steps.rb

@@ -1,13 +1,13 @@
 Given(/^an expired tasks$/) do
-  @task = create(:flyboy_task, taskable: @folder, owner: @user, term: Time.zone.now.to_date-1)
+  @task = create(:flyboy_task, owner: @user, term: Time.zone.now.to_date-1)
 end
 
 Given(/^a task that expire tommorow$/) do
- @task = create(:flyboy_task, taskable: @folder, owner: @user, term: Time.zone.now.to_date+1)
+ @task = create(:flyboy_task, owner: @user, term: Time.zone.now.to_date+1)
 end
 
 Given(/^a task that expire today$/) do
-  @task = create(:flyboy_task, taskable: @folder, owner: @user, term: Time.zone.now.to_date)
+  @task = create(:flyboy_task, owner: @user, term: Time.zone.now.to_date)
 end
 
 When(/^he go to the tasks summary page$/) do

data/lib/dorsale/active_record_comma_type_cast.rb

@@ -0,0 +1,12 @@
+module Dorsale::ActiveRecordCommaTypeCast
+  def cast_value(value)
+    if value.is_a?(String)
+      super value.gsub(",", ".").gsub(/[^-0-9\.]/, "")
+    else
+      super value
+    end
+  end
+end
+
+ActiveRecord::Type::Decimal.send(:prepend, Dorsale::ActiveRecordCommaTypeCast)
+ActiveRecord::Type::Float.send(:prepend, Dorsale::ActiveRecordCommaTypeCast)

data/lib/dorsale/core_and_rails_ext.rb

@@ -0,0 +1,3 @@
+require "dorsale/file_loader"
+require "dorsale/active_record_comma_type_cast"
+require "dorsale/form_back_url"

data/lib/dorsale/engine.rb

@@ -19,7 +19,6 @@ require "awesome_print"
 require "kaminari-i18n"
 require "carrierwave"
 require "aasm"
-require "handles_sortable_columns"
 require "pdf/reader"
 require "prawn"
 require "prawn/table"
@@ -34,7 +33,6 @@ if Rails.env.test? || Rails.env.development?
 end
 
 require "acts-as-taggable-on"
-require "active_record_comma_type_cast"
 
 module Dorsale
   class Engine < ::Rails::Engine
@@ -62,16 +60,14 @@ module Dorsale
       Rails.application.config.assets.precompile += %w( dorsale/avatar.png )
     end
 
+    initializer "simple_form" do
+      require "dorsale/simple_form"
+      require "dorsale/simple_form_bootstrap"
+    end
+
     Mime::Type.register "application/vnd.ms-excel", :xls
     Mime::Type.register "application/vnd.ms-excel", :xlsx
   end
 end
 
-require "dorsale/file_loader"
-require "dorsale/polymorphic_id"
-require "dorsale/simple_form"
-require "dorsale/simple_form_bootstrap"
-require "dorsale/model_i18n"
-require "dorsale/model_to_s"
-require "dorsale/alexandrie/prawn"
-require "dorsale/form_back_url"
+require_relative "core_and_rails_ext"

data/lib/dorsale/form_back_url.rb

@@ -1,4 +1,4 @@
-ActionView::Helpers::FormTagHelper.module_eval do
+module Dorsale::FormBackUrl
   def back_url_tag
     tag(:input,
       :type => "hidden",
@@ -14,3 +14,5 @@ ActionView::Helpers::FormTagHelper.module_eval do
     output.safe_concat("</form>")
   end
 end
+
+ActionView::Helpers::FormTagHelper.send(:prepend, Dorsale::FormBackUrl)