dorsale 3.8.1 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a17406e315fbb33c48f5604ce568769965b4d3b4
-  data.tar.gz: e41ccc6d00e2e3d627dcc386047d5069fcc83210
+  metadata.gz: 9f957740f5e197d1396130300fa94904f32e3571
+  data.tar.gz: 1a1210313bd18d1bae5e90c5a057bd4db71fe876
 SHA512:
-  metadata.gz: 793932d453f32824948498bec31c14274aea9297c906d28d95ab818a81f3141294285098fac81cdd652563ffd0eb8502c247721fb8c44fc47af26d4b74c5318c
-  data.tar.gz: eef15ca0089f73911c95775d081feb8f4b6b7e176f0a5991f99334b0ae9da9c38ca1c48705a6ad8b95b919c3196c8722effa3ec6e13da0d973ecb8525585a261
+  metadata.gz: 3bfb5ef6465100808adb9fdb9b88d26475d53ad63a50f607ccd3b82d8ca04d6bd3e9e11f4a4ba1f8c29ce86e3d288934cda1510403b43f716d7773836365348f
+  data.tar.gz: 4a0afd7c630a26b280a4b555c0e48c8e70da325ad2f02b088e7507220e5c1f3c7c3e82160bd53301ca16048f4f2aaecadcf083024be39ce632d9b3e2a490b0f2

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Next version
 
+## 3.9.0
+
+- Remove BM id cards
+- Syntax improvements and refactors
+
 ## 3.8.1
 
 - Change CV contact type default value

data/README.md

@@ -1,3 +1,7 @@
+[![Build Status](https://semaphoreci.com/api/v1/agilidee/dorsale/branches/master/badge.svg)](https://semaphoreci.com/agilidee/dorsale)
+[![Maintainability](https://api.codeclimate.com/v1/badges/c3b2143566f714fcb104/maintainability)](https://codeclimate.com/github/agilidee/dorsale/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/c3b2143566f714fcb104/test_coverage)](https://codeclimate.com/github/agilidee/dorsale/test_coverage)
+
 # Dorsale
 
 This project uses the GNU AGPLv3 license.
@@ -20,4 +24,4 @@ Hosting application shall define a global current_user method providing the curr
 
 Returned user shall implement followings methods:
 tasks: returns all taks visible by the user
-colleagues(context): return all people affected in the provided context
+colleagues(context): return all people affected in the provided context

data/app/commands/dorsale/flyboy/task_commands.rb

@@ -2,7 +2,7 @@ module Dorsale::Flyboy::TaskCommands
   def self.send_daily_term_emails!
     ::Dorsale::Flyboy::Task.all.each do |task|
       next if task.done?
-      next if task.term != Time.zone.now.to_date
+      next if task.term != Date.current
       next if task.owner.nil?
 
       ::Dorsale::Flyboy::TaskMailer.term_email(task).deliver_later

data/app/controllers/concerns/dorsale/flyboy/tasks_summary_concern.rb

@@ -11,5 +11,4 @@ module Dorsale::Flyboy::TasksSummaryConcern
     @next_week_tasks      = tasks.next_week
     @next_next_week_tasks = tasks.next_next_week
   end
-
 end

data/app/controllers/dorsale/alexandrie/attachments_controller.rb

@@ -98,7 +98,7 @@ class Dorsale::Alexandrie::AttachmentsController < ::Dorsale::ApplicationControl
   def common_permitted_params
     [
       :name,
-      :attachment_type_id
+      :attachment_type_id,
     ]
   end
 
@@ -138,5 +138,4 @@ class Dorsale::Alexandrie::AttachmentsController < ::Dorsale::ApplicationControl
   def notify_attachable
     @attachment.attachable.send(:try, :after_attachments_changes)
   end
-
 end

data/app/controllers/dorsale/application_controller.rb

@@ -30,5 +30,4 @@ class Dorsale::ApplicationController < ::ApplicationController
   end
 
   helper_method :scope
-
 end

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

@@ -11,8 +11,6 @@ class Dorsale::BillingMachine::ApplicationController < ::Dorsale::ApplicationCon
 
   def set_common_variables
     @payment_terms ||= policy_scope(::Dorsale::BillingMachine::PaymentTerm)
-    @id_cards      ||= policy_scope(::Dorsale::BillingMachine::IdCard)
     @people        ||= policy_scope(::Dorsale::CustomerVault::Person)
   end
-
 end

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

@@ -26,8 +26,7 @@ class Dorsale::BillingMachine::InvoicesController < ::Dorsale::BillingMachine::A
     # callback in BillingMachine::ApplicationController
     @invoice ||= scope.new
 
-    @invoice.lines.build               if @invoice.lines.empty?
-    @invoice.id_card = @id_cards.first if @id_cards.one?
+    @invoice.lines.build if @invoice.lines.empty?
 
     authorize @invoice, :create?
   end
@@ -103,26 +102,16 @@ class Dorsale::BillingMachine::InvoicesController < ::Dorsale::BillingMachine::A
   def email
     authorize @invoice, :email?
 
-    @subject =
-    begin
-      params[:email][:subject]
-    rescue
-      "#{model.t} #{@invoice.tracking_id} : #{@invoice.label}"
-    end
+    default_subject = "#{model.t} #{@invoice.tracking_id} : #{@invoice.label}"
+    default_body    = t("emails.invoices.send_invoice_to_customer",
+      :from => current_user.to_s,
+      :to   => @invoice.customer.to_s,
+    )
 
-    @body =
-    begin
-      params[:email][:body]
-    rescue
-      t("emails.invoices.send_invoice_to_customer",
-        :from => current_user.to_s,
-        :to   => @invoice.customer.to_s,
-      )
-    end
+    @subject = params.dig(:email, :subject) || default_subject
+    @body    = params.dig(:email, :body)    || default_body
 
-    if request.get?
-      return
-    end
+    return if request.get?
 
     email = ::Dorsale::BillingMachine::InvoiceMailer
       .send_invoice_to_customer(@invoice, @subject, @body, current_user)
@@ -156,7 +145,6 @@ class Dorsale::BillingMachine::InvoicesController < ::Dorsale::BillingMachine::A
 
   def permitted_params
     [
-      :id_card_id,
       :customer_guid,
       :payment_term_id,
       :label,
@@ -190,5 +178,4 @@ class Dorsale::BillingMachine::InvoicesController < ::Dorsale::BillingMachine::A
   def invoice_params_for_update
     invoice_params
   end
-
 end

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

@@ -72,5 +72,4 @@ class Dorsale::BillingMachine::PaymentTermsController < ::Dorsale::BillingMachin
   def payment_term_params_for_update
     payment_term_params
   end
-
 end

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

@@ -26,8 +26,7 @@ class Dorsale::BillingMachine::QuotationsController < ::Dorsale::BillingMachine:
     # callback in BillingMachine::ApplicationController
     @quotation ||= scope.new
 
-    @quotation.lines.build               if @quotation.lines.empty?
-    @quotation.id_card = @id_cards.first if @id_cards.one?
+    @quotation.lines.build if @quotation.lines.empty?
 
     authorize @quotation, :create?
   end
@@ -133,7 +132,6 @@ class Dorsale::BillingMachine::QuotationsController < ::Dorsale::BillingMachine:
       :state,
       :customer_guid,
       :payment_term_id,
-      :id_card_id,
       :date,
       :expires_at,
       :comments,
@@ -162,5 +160,4 @@ class Dorsale::BillingMachine::QuotationsController < ::Dorsale::BillingMachine:
   def quotation_params_for_update
     quotation_params
   end
-
 end

data/app/controllers/dorsale/comments_controller.rb

@@ -74,8 +74,9 @@ class Dorsale::CommentsController < ::Dorsale::ApplicationController
     [
       params[:form_url],
       request.referer,
-      (main_app.root_path rescue "/"),
-    ].select(&:present?).first
+      main_app.try(:root_path),
+      "/",
+    ].find(&:present?)
   end
 
   def model

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

@@ -72,5 +72,4 @@ class Dorsale::CustomerVault::ActivityTypesController < ::Dorsale::CustomerVault
   def activity_type_params_for_update
     activity_type_params
   end
-
 end

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

@@ -15,5 +15,4 @@ class Dorsale::CustomerVault::ApplicationController < ::Dorsale::ApplicationCont
   def set_form_variables
     @tags ||= customer_vault_tag_list
   end
-
 end

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

@@ -66,21 +66,32 @@ class Dorsale::CustomerVault::LinksController < ::Dorsale::CustomerVault::Applic
   end
 
   def set_objects
+    set_people
+    set_person
+    set_link
+  end
+
+  def set_people
     @people ||= person_scope.all
+  end
+
+  def set_person
     @person ||= person_scope.find(params[:person_id])
+  end
+
+  def set_link
+    return unless params.key?(:id)
 
-    if params.key?(:id)
-      @link ||= scope.find(params[:id])
+    @link ||= scope.find(params[:id])
 
-      if @person == @link.alice
-        @link.person       = @link.alice
-        @link.other_person = @link.bob
-      end
+    if @person == @link.alice
+      @link.person       = @link.alice
+      @link.other_person = @link.bob
+    end
 
-      if @person == @link.bob
-        @link.person       = @link.bob
-        @link.other_person = @link.alice
-      end
+    if @person == @link.bob
+      @link.person       = @link.bob
+      @link.other_person = @link.alice
     end
   end
 
@@ -97,12 +108,11 @@ class Dorsale::CustomerVault::LinksController < ::Dorsale::CustomerVault::Applic
   def link_params_for_create
     link_params.merge(
       :alice  => @person,
-      :bob_id => params.dig(:link, :bob_id)
+      :bob_id => params.dig(:link, :bob_id),
     )
   end
 
   def link_params_for_update
     link_params
   end
-
 end

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

@@ -72,5 +72,4 @@ class Dorsale::CustomerVault::OriginsController < ::Dorsale::CustomerVault::Appl
   def origin_params_for_update
     origin_params
   end
-
 end

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

@@ -155,7 +155,7 @@ class Dorsale::CustomerVault::PeopleController < ::Dorsale::CustomerVault::Appli
         :street_bis,
         :zip,
         :city,
-        :country
+        :country,
       ],
     ]
   end
@@ -205,8 +205,7 @@ class Dorsale::CustomerVault::PeopleController < ::Dorsale::CustomerVault::Appli
       :author => current_user,
       :person => @person,
       :action => action,
-      :text   => ::Dorsale::CustomerVault::Event.t("text.#{action}")
+      :text   => ::Dorsale::CustomerVault::Event.t("text.#{action}"),
     )
   end
-
 end

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

@@ -74,5 +74,4 @@ class Dorsale::ExpenseGun::CategoriesController < ::Dorsale::ExpenseGun::Applica
   def category_params_for_update
     category_params
   end
-
 end

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

@@ -145,5 +145,4 @@ class Dorsale::ExpenseGun::ExpensesController < Dorsale::ExpenseGun::Application
   def set_filters_variables
     @users ||= scope.preload(:user).map(&:user).uniq.compact
   end
-
 end

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

@@ -40,5 +40,4 @@ class Dorsale::Flyboy::TaskCommentsController < ::Dorsale::Flyboy::ApplicationCo
   def task_comment_params_for_create
     task_comment_params.merge(author: current_user)
   end
-
 end

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

@@ -24,23 +24,7 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
 
     @tasks ||= scope.all.preload(:taskable)
 
-    @order ||= sortable_column_order do |column, direction|
-      case column
-      when :name, :status
-        %(LOWER(dorsale_flyboy_tasks.#{column}) #{direction})
-      when :progress, :term
-        %(dorsale_flyboy_tasks.#{column} #{direction})
-      when :taskable
-        if direction == :asc
-          proc { |a, b| a.taskable.to_s.downcase <=> b.taskable.to_s.downcase }
-        else
-          proc { |a, b| b.taskable.to_s.downcase <=> a.taskable.to_s.downcase }
-        end
-      else
-        params["sort"] = "term"
-        "term ASC"
-      end
-    end
+    @order ||= order_from_params
 
     @filters ||= ::Dorsale::Flyboy::SmallData::FilterForTasks.new(filters_jar)
 
@@ -90,7 +74,6 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
 
   def edit
     authorize @task, :update?
-
   end
 
   def update
@@ -123,7 +106,7 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
       :progress    => 100,
       :description => t("messages.tasks.complete_ok"),
       :date        => Time.zone.now,
-      :author      => current_user
+      :author      => current_user,
     )
 
     if @task_comment.save
@@ -139,8 +122,13 @@ 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!
+      Dorsale::Flyboy::TaskComment.create!(
+        :task        => @task,
+        :progress    => @task.progress,
+        :description => t("messages.tasks.snooze_ok"),
+        :author      => current_user,
+      )
+
       flash[:success] = t("messages.tasks.snooze_ok")
     else
       flash[:danger] = t("messages.tasks.snooze_error")
@@ -212,4 +200,23 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
     params.fetch(:task, {}).permit(permitted_params)
   end
 
+  def order_from_params
+    sortable_column_order do |column, direction|
+      case column
+      when :name, :status
+        %(LOWER(dorsale_flyboy_tasks.#{column}) #{direction})
+      when :progress, :term
+        %(dorsale_flyboy_tasks.#{column} #{direction})
+      when :taskable
+        if direction == :asc
+          proc { |a, b| a.taskable.to_s.downcase <=> b.taskable.to_s.downcase }
+        else
+          proc { |a, b| b.taskable.to_s.downcase <=> a.taskable.to_s.downcase }
+        end
+      else
+        params["sort"] = "term"
+        "term ASC"
+      end
+    end
+  end
 end

data/app/controllers/dorsale/users_controller.rb

@@ -81,5 +81,4 @@ class Dorsale::UsersController < ::Dorsale::ApplicationController
   def user_params_for_update
     user_params
   end
-
 end

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

@@ -3,15 +3,19 @@ class Dorsale::BillingMachine::SmallData::FilterStrategyByPaymentStatus < ::Agil
     table_name = query.model.table_name
 
     if value == "paid"
-      return query.where("#{table_name}.paid = ?", true)
+      query.where(paid: true)
     elsif value == "unpaid"
-      return query.where("#{table_name}.paid = ?", false)
+      query.where(paid: false)
     elsif value == "pending"
-      return query.where("#{table_name}.paid = ? and #{table_name}.due_date >= ?", false, Time.zone.now.to_date)
+      query
+        .where(paid: false)
+        .where("#{table_name}.due_date >= ?", Date.current)
     elsif value == "late"
-      return query.where("#{table_name}.paid = ? and (#{table_name}.due_date < ? or #{table_name}.due_date is null)", false, Time.zone.now.to_date)
+      query
+        .where(paid: false)
+        .where("#{table_name}.due_date < ? OR #{table_name}.due_date IS NULL)", Date.current)
     else
-      return query
+      query
     end
   end
 end

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

@@ -1,7 +1,7 @@
 class Dorsale::BillingMachine::SmallData::FilterStrategyByState < ::Agilibox::SmallData::FilterStrategy
   def apply(query, value)
-    if value.to_s.match(/not_(.+)/)
-      query.where.not(state: $~[1])
+    if (m = value.to_s.match(/not_(.+)/))
+      query.where.not(state: m[1])
     else
       query.where(state: value)
     end

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

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

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

@@ -9,10 +9,10 @@ module Dorsale::BillingMachine::ApplicationHelper
   end
 
   def billing_machine_quotation_states_for_filter_select
-      [
-        [::Dorsale::BillingMachine::Quotation.t("state.all"), ""],
-        [::Dorsale::BillingMachine::Quotation.t("state.not_canceled"), "not_canceled"],
-      ] + billing_machine_quotation_states_for_select
+    [
+      [::Dorsale::BillingMachine::Quotation.t("state.all"), ""],
+      [::Dorsale::BillingMachine::Quotation.t("state.not_canceled"), "not_canceled"],
+    ] + billing_machine_quotation_states_for_select
   end
 
   def billing_machine_payment_status_for_filter_select
@@ -27,9 +27,9 @@ module Dorsale::BillingMachine::ApplicationHelper
 
   def quotation_state_classes(quotation)
     if quotation.state == "pending" && quotation.date < 1.month.ago
-      return "pending late"
+      "pending late"
     else
-      return quotation.state
+      quotation.state
     end
   end