dorsale 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56df4e99e7f2c43e981701c129cb9f16cd795730
-  data.tar.gz: bf0eccdda5b712abbf01deffc58ae3146daa0499
+  metadata.gz: 870af5f1c6e4514f3673393d9d6661f1e2102150
+  data.tar.gz: 20fdcbb567db8d19f31413f4e4e64864e6663eac
 SHA512:
-  metadata.gz: 2471402877909fd94ad6bb27d0eba98cc362e6cb225c40e73e55e58a7a30654f36f67b2294919f02d3897aafab5a99742b541b733176ee6d66c4ce11d00cd0e4
-  data.tar.gz: 52908cd5f86c3f8b757a6ecc644970e0e727746165cbe1c213d9c9ec5cf91af7f81eb2e7e7f76ef852ce67ad275b8c48f48a0de89a746735c072a84df20fae19
+  metadata.gz: 09af05b5ab27cc8d965a630c54fb8b266e12f16c09f2bafc855f6a0e88a531bb92e94d7f5d0ef11184772f8d172dd46b9550262ef4f3be1ce1065ffa1eb6ad64
+  data.tar.gz: eb03d2134bee5347d5959c3a7657af7460a93edd68c5d0f31eda8631e87d078fea0cb85e3f207d7b6eb21e1850d9326cdf34b91c445c838e367ba1303f337456

data/CHANGELOG.md

@@ -1,8 +1,10 @@
 # Changelog
 
-## Next version
+## 3.5.0
 
-Nothing.
+- Move helpers/i18n/... to agilibox gem
+  - rename `dorsale_button` helper to `bs_button`
+  - rename `dorsale_time_periods_for_select` helper to `agilibox_time_periods_for_select`
 
 ## 3.4.0
 

data/app/assets/javascripts/dorsale/common/upload.coffee

@@ -0,0 +1,25 @@
+# Fake file input (bootstrap style)
+window.setupUploadInputs = (scope = document) ->
+  $(scope).find(".form-control.upload").map ->
+    container = $(this)
+    form      = container.parents("form")
+    input     = container.find("[type=file]")
+    label     = container.find("label")
+    submit    = form.find("[type=submit]")
+    progress  = form.find(".progress")
+
+    progress.hide() if not xhr2_available()
+
+    label.map ->
+      this.dataset.defaultValue = $(this).html()
+
+    input.change ->
+      if this.value == ""
+        submit.prop(disabled: true) if input.hasClass("required")
+        label_value = label.data("defaultValue")
+      else
+        submit.prop(disabled: false)
+        label_value = this.value.split("/").pop().split("\\").pop()
+
+      label.html(label_value)
+    input.change()

data/app/assets/javascripts/dorsale/dependencies.coffee

@@ -11,3 +11,4 @@
 //= require bootstrap-datepicker/locales/bootstrap-datepicker.fr
 //= require Chart.bundle
 //= require chartkick
+//= require agilibox/all

data/app/assets/stylesheets/dorsale/all.sass

@@ -1,4 +1,3 @@
 @import dorsale/dependencies
 @import dorsale/common
 @import dorsale/engines
-@import dorsale/print

data/app/assets/stylesheets/dorsale/common.sass

@@ -1,10 +1,6 @@
 @import dorsale/common/comments
 @import dorsale/common/contexts
-@import dorsale/common/filters
-@import dorsale/common/flash
 @import dorsale/common/forms
-@import dorsale/common/modals
-@import dorsale/common/pagination
 @import dorsale/common/styles
 @import dorsale/common/tables
 @import dorsale/common/upload

data/app/assets/stylesheets/dorsale/dependencies.sass

@@ -3,6 +3,7 @@
 @import font-awesome-sprockets
 @import font-awesome
 @import bootstrap-datepicker3
-
 @import select2
 @import select2-bootstrap
+
+@import agilibox/all

data/app/controllers/dorsale/application_controller.rb

@@ -1,7 +1,7 @@
 class Dorsale::ApplicationController < ::ApplicationController
   include Pundit
-  include Dorsale::BackUrlConcern
-  include Dorsale::SortingHelper
+  include Agilibox::BackUrlConcern
+  include Agilibox::SortingHelper
 
   after_action :verify_authorized
   after_action :verify_policy_scoped

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

@@ -17,11 +17,11 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
 
     @order ||= sortable_column_order do |column, direction|
       case column
-      when "name", "status"
+      when :name, :status
         %(LOWER(dorsale_flyboy_tasks.#{column}) #{direction})
-      when "progress", "term"
+      when :progress, :term
         %(dorsale_flyboy_tasks.#{column} #{direction})
-      when "taskable"
+      when :taskable
         if direction == :asc
           proc { |a, b| a.taskable.to_s.downcase <=> b.taskable.to_s.downcase }
         else

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

@@ -1,9 +1,9 @@
-class Dorsale::BillingMachine::SmallData::FilterForInvoices < ::Dorsale::SmallData::Filter
+class Dorsale::BillingMachine::SmallData::FilterForInvoices < ::Agilibox::SmallData::Filter
   STRATEGIES = {
-    "customer_guid"     => ::Dorsale::BillingMachine::SmallData::FilterStrategyByCustomer.new,
-    "bm_time_period"    => ::Dorsale::SmallData::FilterStrategyByTimePeriod.new(:date),
-    "bm_date_begin"     => ::Dorsale::SmallData::FilterStrategyByDateBegin.new(:date),
-    "bm_date_end"       => ::Dorsale::SmallData::FilterStrategyByDateEnd.new(:date),
+    "bm_time_period"    => ::Agilibox::SmallData::FilterStrategyByTimePeriod.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,
     "bm_payment_status" => ::Dorsale::BillingMachine::SmallData::FilterStrategyByPaymentStatus.new,
   }
 end

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

@@ -1,9 +1,9 @@
-class Dorsale::BillingMachine::SmallData::FilterForQuotations < ::Dorsale::SmallData::Filter
+class Dorsale::BillingMachine::SmallData::FilterForQuotations < ::Agilibox::SmallData::Filter
   STRATEGIES = {
-    "customer_guid"      => ::Dorsale::BillingMachine::SmallData::FilterStrategyByCustomer.new,
-    "bm_time_period"     => ::Dorsale::SmallData::FilterStrategyByTimePeriod.new(:date),
-    "bm_date_begin"      => ::Dorsale::SmallData::FilterStrategyByDateBegin.new(:date),
-    "bm_date_end"        => ::Dorsale::SmallData::FilterStrategyByDateEnd.new(:date),
+    "bm_time_period"     => ::Agilibox::SmallData::FilterStrategyByTimePeriod.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,
     "bm_quotation_state" => ::Dorsale::BillingMachine::SmallData::FilterStrategyByState.new,
   }
 end

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

@@ -1,4 +1,4 @@
-class Dorsale::BillingMachine::SmallData::FilterStrategyByCustomer < ::Dorsale::SmallData::FilterStrategy
+class Dorsale::BillingMachine::SmallData::FilterStrategyByCustomer < ::Agilibox::SmallData::FilterStrategy
   def apply(query, value)
     type, id = value.split("-", 2)
     query.where(customer_type: type, customer_id: id)

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

@@ -1,4 +1,4 @@
-class Dorsale::BillingMachine::SmallData::FilterStrategyByPaymentStatus < ::Dorsale::SmallData::FilterStrategy
+class Dorsale::BillingMachine::SmallData::FilterStrategyByPaymentStatus < ::Agilibox::SmallData::FilterStrategy
   def apply(query, value)
     table_name = query.model.table_name
 

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

@@ -1,4 +1,4 @@
-class Dorsale::BillingMachine::SmallData::FilterStrategyByState < ::Dorsale::SmallData::FilterStrategy
+class Dorsale::BillingMachine::SmallData::FilterStrategyByState < ::Agilibox::SmallData::FilterStrategy
   def apply(query, value)
     if value.to_s.match(/not_(.+)/)
       query.where("state != ?", $~[1])

data/app/filters/dorsale/customer_vault/small_data/filter_for_people.rb

@@ -1,6 +1,6 @@
-class Dorsale::CustomerVault::SmallData::FilterForPeople < ::Dorsale::SmallData::Filter
+class Dorsale::CustomerVault::SmallData::FilterForPeople < ::Agilibox::SmallData::Filter
   STRATEGIES = {
-    "person_type" => ::Dorsale::SmallData::FilterStrategyByKeyValue.new(:type),
-    "person_tags" => ::Dorsale::SmallData::FilterStrategyByTags.new,
+    "person_type" => ::Agilibox::SmallData::FilterStrategyByKeyValue.new(:type),
+    "person_tags" => ::Agilibox::SmallData::FilterStrategyByTags.new,
   }
 end

data/app/filters/dorsale/expense_gun/small_data/filter_for_expenses.rb

@@ -1,6 +1,6 @@
-class Dorsale::ExpenseGun::SmallData::FilterForExpenses < ::Dorsale::SmallData::Filter
+class Dorsale::ExpenseGun::SmallData::FilterForExpenses < ::Agilibox::SmallData::Filter
   STRATEGIES = {
-    "expense_state"   => ::Dorsale::SmallData::FilterStrategyByKeyValue.new("state"),
-    "expense_user_id" => ::Dorsale::SmallData::FilterStrategyByKeyValue.new("user_id"),
+    "expense_state"   => ::Agilibox::SmallData::FilterStrategyByKeyValue.new("state"),
+    "expense_user_id" => ::Agilibox::SmallData::FilterStrategyByKeyValue.new("user_id"),
   }
 end

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

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

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

@@ -1,4 +1,4 @@
-class Dorsale::Flyboy::SmallData::FilterStrategyByDone < ::Dorsale::SmallData::FilterStrategy
+class Dorsale::Flyboy::SmallData::FilterStrategyByDone < ::Agilibox::SmallData::FilterStrategy
   def apply(query, value)
     value = (value == "closed")
     query.where(done: value)

data/app/helpers/dorsale/all_helpers.rb

@@ -1,18 +1,10 @@
 module Dorsale::AllHelpers
   include ::ActionView::Helpers::NumberHelper
+  include ::Agilibox::AllHelpers
 
-  include ::Dorsale::ButtonHelper
-  include ::Dorsale::CommentsHelper
   include ::Dorsale::ContextHelper
-  include ::Dorsale::FiltersHelper
-  include ::Dorsale::FormHelper
-  include ::Dorsale::LinkHelper
-  include ::Dorsale::PaginationHelper
-  include ::Dorsale::RoutesHelper
-  include ::Dorsale::TextHelper
-  include ::Dorsale::BootstrapHelper
-  include ::Dorsale::SortingHelper
 
+  include ::Dorsale::CommentsHelper
   include ::Dorsale::Alexandrie::AttachmentsHelper
   include ::Dorsale::BillingMachine::ApplicationHelper
   include ::Dorsale::Flyboy::ApplicationHelper

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

@@ -4,9 +4,9 @@ module Dorsale::Flyboy::ApplicationHelper
 
     order ||= sortable_column_order do |column, direction|
       case column
-      when "name", "status"
+      when :name, :status
         %(LOWER(dorsale_flyboy_tasks.#{column}) #{direction})
-      when "progress", "term"
+      when :progress, :term
         %(dorsale_flyboy_tasks.#{column} #{direction})
       else
         params["sort"] = "term"

data/app/models/dorsale/application_record.rb

@@ -1,13 +1,11 @@
-require "dorsale/search"
-
 class Dorsale::ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 
-  include Dorsale::ActiveRecordUUIDConcern
-  include Dorsale::DefaultValuesConcern
-  include Dorsale::ModelToS
-  include Dorsale::ModelI18n
-  include Dorsale::PolymorphicId
+  include Agilibox::ActiveRecordUUIDConcern
+  include Agilibox::DefaultValuesConcern
+  include Agilibox::ModelToS
+  include Agilibox::ModelI18n
+  include Agilibox::PolymorphicId
 
   nilify_blanks
 
@@ -16,5 +14,5 @@ class Dorsale::ApplicationRecord < ActiveRecord::Base
   end
 end
 
-ActsAsTaggableOn::Tagging.send(:include, Dorsale::ActiveRecordUUIDConcern)
-ActsAsTaggableOn::Tag.send(:include, Dorsale::ActiveRecordUUIDConcern)
+ActsAsTaggableOn::Tagging.send(:include, Agilibox::ActiveRecordUUIDConcern)
+ActsAsTaggableOn::Tag.send(:include, Agilibox::ActiveRecordUUIDConcern)

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

@@ -2,7 +2,7 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_customer_vault_people"
 
   extend Forwardable
-  include ::Dorsale::Search
+  include ::Agilibox::Search
   include ::Dorsale::Users::Avatar
 
   def self.policy_class

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

@@ -1,7 +1,7 @@
 class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_flyboy_tasks"
 
-  include ::Dorsale::Search
+  include ::Agilibox::Search
 
   paginates_per 50
 

data/app/views/dorsale/billing_machine/invoices/_filters.html.slim

@@ -1,11 +1,11 @@
 = filters_form do |f|
-  = f.input(:customer_guid,
+  = f.input(:bm_customer_guid,
     :collection    => @people.map { |p| [p.to_s, p.guid] },
     :include_blank => t("filters.all_customers"),
   )
 
   = f.input(:bm_time_period,
-    :collection    => dorsale_time_periods_for_select,
+    :collection    => agilibox_time_periods_for_select,
     :include_blank => false,
   )
 

data/app/views/dorsale/billing_machine/invoices/_show_actions.html.slim

@@ -2,7 +2,7 @@
   = update_button dorsale.edit_billing_machine_invoice_path(@invoice)
 
   - unless @invoice.paid?
-    = dorsale_button dorsale.pay_billing_machine_invoice_path(@invoice), icon: :check, action: :paid, method: :patch
+    = bs_button dorsale.pay_billing_machine_invoice_path(@invoice), icon: :check, action: :paid, method: :patch
 
 - if policy(@invoice).download?
   = download_button dorsale.billing_machine_invoice_path(@invoice, format: :pdf)
@@ -11,4 +11,4 @@
   = copy_button dorsale.copy_billing_machine_invoice_path(@invoice)
 
 - if policy(@invoice).email?
-  = dorsale_button dorsale.email_billing_machine_invoice_path(@invoice), icon: :send, action: :email
+  = bs_button dorsale.email_billing_machine_invoice_path(@invoice), icon: :send, action: :email

data/app/views/dorsale/billing_machine/invoices/index.xlsx.ruby

@@ -38,4 +38,4 @@ data = [
   ]
 end
 
-Dorsale::Serializers::XLSX.new(data).render_inline
+Agilibox::Serializers::XLSX.new(data).render_inline

data/app/views/dorsale/billing_machine/quotations/_filters.html.slim

@@ -1,11 +1,11 @@
 = filters_form do |f|
-  = f.input(:customer_guid,
+  = f.input(:bm_customer_guid,
     :collection    => @people.map { |p| [p.to_s, p.guid] },
     :include_blank => t("filters.all_customers"),
   )
 
   = f.input(:bm_time_period,
-    :collection    => dorsale_time_periods_for_select,
+    :collection    => agilibox_time_periods_for_select,
     :include_blank => false,
   )
 

data/app/views/dorsale/billing_machine/quotations/_show_actions.html.slim

@@ -8,7 +8,7 @@
   = copy_button dorsale.copy_billing_machine_quotation_path(@quotation), method: :post, confirm: true
 
 - if policy(@quotation).create?
-  = dorsale_button dorsale.create_invoice_billing_machine_quotation_path(@quotation), action: :create_invoice, icon: :magic
+  = bs_button dorsale.create_invoice_billing_machine_quotation_path(@quotation), action: :create_invoice, icon: :magic
 
 - if policy(@quotation).delete?
   = delete_button dorsale.billing_machine_quotation_path(@quotation)

data/app/views/dorsale/customer_vault/people/index.xlsx.ruby

@@ -46,4 +46,4 @@ data << fields.map { |field| model.t(field) }
   data << line
 end
 
-Dorsale::Serializers::XLSX.new(data).render_inline
+Agilibox::Serializers::XLSX.new(data).render_inline

data/app/views/dorsale/expense_gun/expenses/_show_actions.html.slim

@@ -5,15 +5,15 @@
   = copy_button dorsale.copy_expense_gun_expense_path(@expense)
 
 - if policy(@expense).submit?
-  = dorsale_button dorsale.submit_expense_gun_expense_path(@expense), action: :submit, method: "patch", confirm: true, icon: :check, class: "btn btn-xs btn-primary"
+  = bs_button dorsale.submit_expense_gun_expense_path(@expense), action: :submit, method: "patch", confirm: true, icon: :check, class: "btn btn-xs btn-primary"
 
 - if policy(@expense).accept?
-  = dorsale_button dorsale.accept_expense_gun_expense_path(@expense), action: :accept, method: "patch", confirm: true, icon: :check, class: "btn btn-xs btn-success"
+  = bs_button dorsale.accept_expense_gun_expense_path(@expense), action: :accept, method: "patch", confirm: true, icon: :check, class: "btn btn-xs btn-success"
 
 - if policy(@expense).refuse?
-  = dorsale_button dorsale.refuse_expense_gun_expense_path(@expense), action: :refuse, method: "patch", confirm: true, icon: :ban, class: "btn btn-xs btn-danger"
+  = bs_button dorsale.refuse_expense_gun_expense_path(@expense), action: :refuse, method: "patch", confirm: true, icon: :ban, class: "btn btn-xs btn-danger"
 
 - if policy(@expense).cancel?
-  = dorsale_button dorsale.cancel_expense_gun_expense_path(@expense), action: :cancel, method: "patch", confirm: true, icon: :times, class: "btn btn-xs btn-warning"
+  = bs_button dorsale.cancel_expense_gun_expense_path(@expense), action: :cancel, method: "patch", confirm: true, icon: :times, class: "btn btn-xs btn-warning"
 
 = print_button

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

@@ -18,4 +18,4 @@ data = [
   ]
 end
 
-Dorsale::Serializers::XLSX.new(data).render_inline
+Agilibox::Serializers::XLSX.new(data).render_inline

data/config/locales/dorsale.en.yml

@@ -23,4 +23,14 @@ en:
             subtitle: "Congratulation for your new account"
             login: "Your login is: %{login}"
             password: "Your password is: %{password}"
-            url_label: "Click here to access service"
+            url_label: "Click here to access service"
+
+  activerecord:
+    models:
+      dorsale/address:
+        one: "Address"
+        other: "Addresses"
+
+      dorsale/comment:
+        one: "Comment"
+        other: "Comments"

data/config/locales/dorsale.fr.yml

@@ -24,3 +24,13 @@ fr:
           login: "Votre login est: %{login}"
           password: "Votre mot de passe est: %{password}"
           url_label: "Cliquez ici pour accéder au service"
+
+  activerecord:
+    models:
+      dorsale/address:
+        one: "Adresse"
+        other: "Adresses"
+
+      dorsale/comment:
+        one: "Commentaire"
+        other: "Commentaires"

data/config/routes.rb

@@ -7,12 +7,6 @@ Dorsale::Engine.routes.draw do
 
   resources :users, except: [:destroy]
 
-  # Small Sata / Filters
-
-  namespace :small_data do
-    resources :filters, only: [:create]
-  end
-
   # Alexandrie / Attachments
 
   namespace :alexandrie do

data/lib/dorsale/engine.rb

@@ -25,6 +25,9 @@ require "prawn/table"
 require "combine_pdf"
 require "nilify_blanks"
 require "chartkick"
+require "axlsx"
+
+require "agilibox"
 
 if Rails.env.test? || Rails.env.development?
   require "pry"
@@ -70,4 +73,4 @@ module Dorsale
   end
 end
 
-require_relative "core_and_rails_ext"
+require_relative "file_loader"