dorsale 2.3.5 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27af876d5c2fd0ae2a77cb69da09b5e32ef28912
-  data.tar.gz: 124ce3d1ce7902a38a2a4c78bc98f48373909eb5
+  metadata.gz: 784128baeb6b43ea6d548bc00b3ff135aeef90b4
+  data.tar.gz: a3a2a40bfd491bd1c09bd06572a42f5a9ddd0987
 SHA512:
-  metadata.gz: 8218233e60c22df65a8fb0d049e94113208ad6a927405fa6788692433df98a4f1a56304ddd19e46f33c82b64931d42720d4bb6fcdf442bfc4a2c2b43c1da45f9
-  data.tar.gz: 2cfe5b4f37dec228c8b74efeac92d8c07963ef53f1575caa14df5d5f0ab9be61d64ed4cb74b7d7d06bff42d46bbe95d5b719f8ffa9930a88e1cf513ac56b5f71
+  metadata.gz: 65600444caedc4c3bdbcfa9822dfd92abd022b32554659c2d2b7c375e89555d1888ef733ad29ec5d19dbd177e6887bc4324225321ded604a27dd7500ab187ad1
+  data.tar.gz: 4da36e1234e2760ed1e7e1d75b0d6a7eef37e74e7e3f6acdefb627ae99866e29a3e53651601564fd9e0d7eb3c76da86ceafe3256d820e093f427e0050a49dd94

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

@@ -3,31 +3,10 @@ module Dorsale
     module SmallData
       class FilterForInvoices < ::Dorsale::SmallData::Filter
         STRATEGIES = {
-          "customer_guid"     => FilterStrategyByCustomer.new("invoices"),
-          "bm_time_period"    => FilterStrategyByTimePeriod.new("invoices"),
-          "bm_payment_status" => FilterStrategyByPaymentStatus.new("invoices"),
+          "customer_guid"     => FilterStrategyByCustomer.new,
+          "bm_time_period"    => FilterStrategyByTimePeriod.new(:date),
+          "bm_payment_status" => FilterStrategyByPaymentStatus.new,
         }
-
-        def strategy key
-          STRATEGIES[key]
-        end
-
-        def target
-          "invoices"
-        end
-
-        def customer_guid
-          get(__method__)
-        end
-
-        def bm_time_period
-          get(__method__)
-        end
-
-        def bm_payment_status
-          get(__method__)
-        end
-
       end
     end
   end

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

@@ -3,31 +3,10 @@ module Dorsale
     module SmallData
       class FilterForQuotations < ::Dorsale::SmallData::Filter
         STRATEGIES = {
-          "customer_guid"      => FilterStrategyByCustomer.new("quotations"),
-          "bm_time_period"     => FilterStrategyByTimePeriod.new("quotations"),
-          "bm_quotation_state" => FilterStrategyByState.new("quotations"),
+          "customer_guid"      => FilterStrategyByCustomer.new,
+          "bm_time_period"     => FilterStrategyByTimePeriod.new(:date),
+          "bm_quotation_state" => FilterStrategyByState.new,
         }
-
-        def strategy key
-          STRATEGIES[key]
-        end
-
-        def target
-          "quotations"
-        end
-
-        def customer_guid
-          get(__method__)
-        end
-
-        def bm_time_period
-          get(__method__)
-        end
-
-        def bm_quotation_state
-          get(__method__)
-        end
-
       end
     end
   end

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

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

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

@@ -2,16 +2,16 @@ module Dorsale
   module BillingMachine
     module SmallData
       class FilterStrategyByPaymentStatus < ::Dorsale::SmallData::FilterStrategy
-        def do_apply query
+        def apply(query, value)
           table_name = query.model.table_name
 
-          if @value == "paid"
+          if value == "paid"
             return query.where("#{table_name}.paid = ?", true)
-          elsif @value == "unpaid"
+          elsif value == "unpaid"
             return query.where("#{table_name}.paid = ?", false)
-          elsif @value == "pending"
+          elsif value == "pending"
             return query.where("#{table_name}.paid = ? and #{table_name}.due_date >= ?", false, Date.today)
-          elsif @value == "late"
+          elsif value == "late"
             return query.where("#{table_name}.paid = ? and (#{table_name}.due_date < ? or #{table_name}.due_date is null)", false, Date.today)
           else
             return query

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

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

data/app/models/dorsale/billing_machine/small_data/filter_strategy_by_time_period.rb

@@ -1,21 +1,15 @@
 module Dorsale
   module BillingMachine
     module SmallData
-      class FilterStrategyByTimePeriod < ::Dorsale::SmallData::FilterStrategy
-        def do_apply query
-          if query.model.attribute_names.include?("day")
-            field = :day
-          else
-            field = :date
-          end
-
-          criteria = "#{query.model.table_name}.#{field}"
+      class FilterStrategyByTimePeriod < ::Dorsale::SmallData::FilterStrategyByKeyValue
+        def apply(query, value)
+          criteria = "#{query.model.table_name}.#{key}"
 
-          if @value == "today"
+          if value == "today"
             return query.where("#{criteria} >= ?", Date.today)
-          elsif @value == "week"
+          elsif value == "week"
             return query.where("#{criteria} >= ?", Date.today.at_beginning_of_week)
-          elsif @value == "month"
+          elsif value == "month"
             return query.where("#{criteria} >= ?", Date.today.at_beginning_of_month)
           else
             return query

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

@@ -3,16 +3,8 @@ module Dorsale
     module SmallData
       class FilterForPeople < ::Dorsale::SmallData::Filter
         STRATEGIES = {
-          "tags" => ::Dorsale::CustomerVault::SmallData::FilterStrategyByTags.new("people")
+          "tags" => ::Dorsale::CustomerVault::SmallData::FilterStrategyByTags.new
         }
-
-        def strategy key
-          STRATEGIES[key]
-        end
-
-        def target
-          "people"
-        end
       end
     end
   end

data/app/models/dorsale/customer_vault/small_data/filter_strategy_by_tags.rb

@@ -2,15 +2,14 @@ module Dorsale
   module CustomerVault
     module SmallData
       class FilterStrategyByTags < ::Dorsale::SmallData::FilterStrategy
-        def do_apply(query)
-          @value = [*@value].flatten.select{ |v| v.present? }
+        def apply(query, value)
+          value = [*value].flatten.select{ |v| v.present? }
 
-          if @value.any?
-            query.tagged_with(@value)
+          if value.any?
+            query.tagged_with(value)
           else
             query
           end
-
         end
       end
     end

data/app/models/dorsale/expense_gun/expense.rb

@@ -6,6 +6,11 @@ module Dorsale
 
       has_many :expense_lines, inverse_of: :expense, dependent: :destroy, class_name: ::Dorsale::ExpenseGun::ExpenseLine
 
+       has_many :attachments,
+        :as         => :attachable,
+        :dependent  => :destroy,
+        :class_name => ::Dorsale::Alexandrie::Attachment
+
       validates :name, presence: true
       validates :date, presence: true
 

data/app/models/dorsale/flyboy/small_data/filter_for_folders.rb

@@ -3,16 +3,8 @@ module Dorsale
     module SmallData
       class FilterForFolders < ::Dorsale::SmallData::Filter
         STRATEGIES = {
-          "fb_status" => FilterStrategyByStatus.new("folders")
+          "fb_status" => FilterStrategyByStatus.new,
         }
-
-        def strategy key
-          STRATEGIES[key]
-        end
-
-        def target
-          "folders"
-        end
       end
     end
   end

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

@@ -3,17 +3,9 @@ module Dorsale
     module SmallData
       class FilterForTasks < ::Dorsale::SmallData::Filter
         STRATEGIES = {
-          "fb_status" => FilterStrategyByDone.new("tasks"),
-          "owner"     => FilterStrategyByOwner.new("tasks")
+          "fb_status" => FilterStrategyByDone.new,
+          "owner"     => ::Dorsale::SmallData::FilterStrategyByKeyValue.new("owner_id")
         }
-
-        def strategy key
-          STRATEGIES[key]
-        end
-
-        def target
-          "tasks"
-        end
       end
     end
   end

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

@@ -2,8 +2,8 @@ module Dorsale
   module Flyboy
     module SmallData
       class FilterStrategyByDone < ::Dorsale::SmallData::FilterStrategy
-        def do_apply query
-          value = (@value == 'closed')
+        def apply(query, value)
+          value = (value == "closed")
           query.where(done: value)
         end
       end

data/app/models/dorsale/flyboy/small_data/filter_strategy_by_status.rb

@@ -2,8 +2,8 @@ module Dorsale
   module Flyboy
     module SmallData
       class FilterStrategyByStatus < ::Dorsale::SmallData::FilterStrategy
-        def do_apply query
-          if @value == "closed"
+        def apply(query, value)
+          if value == "closed"
             query.where(status: "closed")
           else
             query.where.not(status: "closed")

data/app/models/dorsale/small_data/filter.rb

@@ -1,25 +1,18 @@
 module Dorsale
   module SmallData
     class Filter
-
       def initialize(jar)
         @jar = jar
       end
 
       def store(filters)
-        @jar['filters'] = filters.to_json
+        @jar["filters"] = filters.to_json
       end
 
       def read
-        if @jar['filters']
-          begin
-            JSON.parse @jar['filters']
-          rescue JSON::ParserError
-            {}
-          end
-        else
-          {}
-        end
+        JSON.parse @jar["filters"].to_s
+      rescue JSON::ParserError
+        {}
       end
 
       def get(key)
@@ -32,19 +25,31 @@ module Dorsale
         store(array)
       end
 
+      def strategies
+        self.class::STRATEGIES
+      end
+
       def apply(query)
-        read.each do |key, value|
-          filter = strategy(key)
+        strategies.each do |key, strategy|
+          value = get(key)
 
-          if filter && filter.applies?(self.target)
-            filter.set(key, value)
-            query = filter.apply(query)
-          end
+          next if value.blank?
+
+          query = strategy.apply(query, value)
         end
 
         return query
       end
 
-    end
-  end
-end
+      def method_missing(method, *args)
+        key = method.to_s
+
+        if strategies.key?(key)
+          get(key)
+        else
+          super
+        end
+      end
+    end # Filter
+  end # SmallData
+end # Dorsale

data/app/models/dorsale/small_data/filter_strategy.rb

@@ -1,27 +1,9 @@
 module Dorsale
   module SmallData
     class FilterStrategy
-      def initialize(target)
-        @target = target
+      def apply(query, value)
+        raise NotImplementedError
       end
-
-      def set(key, value)
-        @key   = key
-        @value = value
-        return self
-      end
-
-      def apply(query)
-        if @value and @value != ''
-          do_apply(query)
-        else
-          query
-        end
-      end
-
-      def applies?(target)
-        @target == target
-      end
-    end
-  end
-end
+    end # FilterStrategy
+  end # SmallData
+end # Dorsale

data/app/models/dorsale/small_data/filter_strategy_by_date.rb

@@ -0,0 +1,10 @@
+module Dorsale
+  module SmallData
+    class FilterStrategyByDate < ::Dorsale::SmallData::FilterStrategyByKeyValue
+      def apply(query, value)
+        value = Date.parse(value)
+        super(query, value)
+      end
+    end # FilterStrategy
+  end # SmallData
+end # Dorsale

data/app/models/dorsale/small_data/filter_strategy_by_key_value.rb

@@ -0,0 +1,15 @@
+module Dorsale
+  module SmallData
+    class FilterStrategyByKeyValue < ::Dorsale::SmallData::FilterStrategy
+      attr_reader :key
+
+      def initialize(key = nil)
+        @key = key
+      end
+
+      def apply(query, value)
+        query.where("#{key} = ?", value)
+      end
+    end # FilterStrategy
+  end # SmallData
+end # Dorsale

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

@@ -20,7 +20,7 @@
       br
     span.user
       strong = t("labels.employee") + " : "
-      = @expense.user.full_name if @expense.respond_to?(:user)
+      = @expense.user.to_s if @expense.respond_to?(:user)
       br
     span.state class="#{@expense.state}"
       strong = t("labels.state") + " : "
@@ -87,3 +87,8 @@
           p
             strong = t("labels.deductible_vat") + " : "
             = euros @expense.total_vat_deductible
+
+  .attachments-panel
+    = panel title: @expense.t(:documents)
+      .panel-body
+        = attachments_for @expense

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "2.3.5"
+  VERSION = "2.4.0"
 end

data/spec/controllers/dorsale/flyboy/tasks_controller_spec.rb

@@ -288,8 +288,6 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
         @next_week_task      = create(:flyboy_task, term: Date.parse("2016-03-14")) # monday next week
         @next_next_week_task = create(:flyboy_task, term: Date.parse("2016-03-22")) # tuesday next next week
       end
-
-      controller.setup_tasks_summary
     end
 
     it "should not assign tasks when owner is an other person" do
@@ -297,6 +295,7 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
       Dorsale::Flyboy::Task.update_all(owner_id: other_user.id, owner_type: other_user.class)
 
       Timecop.travel "2016-03-09 15:00:00" do
+        controller.setup_tasks_summary
         expect(assigns(:delayed_tasks)).to        eq []
         expect(assigns(:today_tasks)).to          eq []
         expect(assigns(:tomorrow_tasks)).to       eq []
@@ -310,6 +309,7 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
       Dorsale::Flyboy::Task.update_all(owner_id: nil, owner_type: nil)
 
       Timecop.travel "2016-03-09 15:00:00" do
+        controller.setup_tasks_summary
         expect(assigns(:delayed_tasks)).to        eq [@delayed_task]
         expect(assigns(:today_tasks)).to          eq [@today_task]
         expect(assigns(:tomorrow_tasks)).to       eq [@tomorrow_task]
@@ -323,6 +323,7 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
       Dorsale::Flyboy::Task.update_all(owner_id: summary_user.id, owner_type: summary_user.class)
 
       Timecop.travel "2016-03-09 15:00:00" do
+        controller.setup_tasks_summary
         expect(assigns(:delayed_tasks)).to        eq [@delayed_task]
         expect(assigns(:today_tasks)).to          eq [@today_task]
         expect(assigns(:tomorrow_tasks)).to       eq [@tomorrow_task]