agilibox 1.9.19 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ec9c151ffb8cfeac78339974ae35f77124730d8e5a0f4103489c65c03738cff
-  data.tar.gz: cf1862277f5a5fefff00dc06b356902d05ecb1b6e8b9b1bad12e973f4cbfe8fb
+  metadata.gz: c957ea49c90e282829586fcc2e643e29f0cafdf6de7addd6867e7c7ccb84b208
+  data.tar.gz: 7a03a0ccea759d460a7c67deb95f44e9e06f09ae89ddf9e8038e23f8112749a7
 SHA512:
-  metadata.gz: df5df7fe6e3016d1740a684f8dbdcb44a85c37d299f02cabb2b056137a3745f6ef968f0f5f018d7f540286e9a51ef0a78f518aeaf824063dea2897e81c858db2
-  data.tar.gz: 10a96821c98427c56b24d16e90b904038e7d2a4b60a38c495946ae3ff3d0c81adab668280103e68925e57124d072cc78a085d13c32f58351c97055aae1035098
+  metadata.gz: b458a4602f68758275b70049a33def1d27658af96e4d6941251702b0d2957b5968c3cd2cf7bb682338f4c3a931233e054636629e9539053ef5700ad9102c847b
+  data.tar.gz: f64d11c96a644d6f2871820a25f1ba000904dbecf50037fa07b69cfe37c1f87aab16041a9188f0fb78c9ff9d988597408ba8f3dac9d78682c755c3a5d1badc36

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 ## Next version
 
+## v1.10.2
+- Filters improvements
+
+## v1.10.1
+- Fix date filters
+
+## v1.10.0
+- Add date support to XLSX serializer
+- Remove AXLSX serializer
+
+## v1.9.20
+- Add bootstrap 5 search form
+
 ## v1.9.19
 - Add bootstrap 4/5 pagination support
 

data/app/filters/agilibox/small_data/filter.rb

@@ -1,4 +1,6 @@
 class Agilibox::SmallData::Filter
+  include ActiveModel::Model
+
   STRATEGIES = {}
 
   attr_reader :jar
@@ -60,8 +62,12 @@ class Agilibox::SmallData::Filter
     write read.merge(new_filters)
   end
 
+  def actives_count
+    read.count { |k, v| strategies.key?(k.to_s) && v.present? }
+  end
+
   def any?
-    read.select { |k, v| strategies.key?(k.to_s) && v.present? }.any?
+    actives_count.positive?
   end
 
   def empty?

data/app/filters/agilibox/small_data/filter_strategy_by_date_begin.rb

@@ -1,6 +1,6 @@
 class Agilibox::SmallData::FilterStrategyByDateBegin < ::Agilibox::SmallData::FilterStrategyByKeyValue
   def apply(query, value)
-    value = Time.zone.parse(value).beginning_of_day
+    value = Date.parse(value)
     column = column_for(query)
     query.where("#{column} >= ?", value)
   end

data/app/filters/agilibox/small_data/filter_strategy_by_date_end.rb

@@ -1,6 +1,6 @@
 class Agilibox::SmallData::FilterStrategyByDateEnd < ::Agilibox::SmallData::FilterStrategyByKeyValue
   def apply(query, value)
-    value = Time.zone.parse(value).end_of_day
+    value = Date.parse(value)
     column = column_for(query)
     query.where("#{column} <= ?", value)
   end

data/app/serializers/agilibox/serializers/base.rb

@@ -39,8 +39,8 @@ class Agilibox::Serializers::Base
       I18n.t(value.to_s)
     end
 
-    def format_datetime(value)
-      Agilibox::AllHelpers.date(value)
+    def format_date_or_time(value)
+      value
     end
 
     def format_default(value)
@@ -48,10 +48,10 @@ class Agilibox::Serializers::Base
     end
 
     def formatter_for(value)
-      return :integer  if value.is_a?(Integer)
-      return :decimal  if value.is_a?(Numeric)
-      return :boolean  if value.is_a?(TrueClass) || value.is_a?(FalseClass)
-      return :datetime if value.is_a?(Date) || value.is_a?(Time)
+      return :integer if value.is_a?(Integer)
+      return :decimal if value.is_a?(Numeric)
+      return :boolean if value.is_a?(TrueClass) || value.is_a?(FalseClass)
+      return :date_or_time if value.is_a?(Date) || value.is_a?(Time)
       return :default
     end
 

data/app/serializers/agilibox/serializers/xlsx.rb

@@ -1,7 +1,13 @@
 class Agilibox::Serializers::XLSX < Agilibox::Serializers::Base
   def render_inline
     headers, *data = formatted_data
-    SpreadsheetArchitect.to_xlsx(headers: headers, data: data, freeze_headers: true)
+
+    SpreadsheetArchitect.to_xlsx(
+      headers: headers,
+      data: data,
+      freeze_headers: true,
+      range_styles: range_styles(data[0]),
+    )
   end
 
   def render_file(file_path)
@@ -9,4 +15,24 @@ class Agilibox::Serializers::XLSX < Agilibox::Serializers::Base
       f.write(render_inline)
     end
   end
+
+  private
+
+  def range_styles(row)
+    return [] if row.nil?
+
+    date_range_styles(row) + time_range_styles(row)
+  end
+
+  def date_range_styles(row)
+    row.each_index.select { row[_1].is_a?(Date) }.map do
+      {range: {rows: :all, columns: _1}, styles: {format_code: "dd/mm/yyyy"}}
+    end
+  end
+
+  def time_range_styles(row)
+    row.each_index.select { row[_1].is_a?(Time) }.map do
+      {range: {rows: :all, columns: _1}, styles: {format_code: "dd/mm/yyyy hh:mm:ss"}}
+    end
+  end
 end

data/app/views/agilibox/search/_form_bs5.html.slim

@@ -0,0 +1,7 @@
+form.search.bs5.mb-3 method="get" action=action
+  = form_hidden_submit
+
+  .input-group.search
+    input.form-control.form-control-sm type="text" name="q" placeholder=ta(:search) value=params[:q]
+    button.btn.btn-sm.bg-light.border.search-reset.reset type="submit" = icon(:times)
+    button.btn.btn-sm.bg-light.border.search-submit type="submit" = icon(:search)

data/lib/agilibox/cucumber_helpers/capybara.rb

@@ -1,5 +1,6 @@
 Capybara.register_driver :agilibox_no_driver do |_app|
-  raise "You need to add Agilibox::CucumberConfig.require_cuprite! or "\
+  raise \
+    "You need to add Agilibox::CucumberConfig.require_cuprite! or " \
     "Agilibox::CucumberConfig.require_chrome_headless! " \
     "to your features/support/env.rb"
 end

data/lib/agilibox/errors_middleware.rb

@@ -9,6 +9,7 @@ class Agilibox::ErrorsMiddleware
     "ActionController::BadRequest",
     "ActionController::UnknownFormat",
     "ActionController::UnknownHttpMethod",
+    "ActionDispatch::Cookies::CookieOverflow",
     "ActionView::MissingTemplate",
     "Mime::Type::InvalidMimeType",
   ]

data/lib/agilibox/version.rb

@@ -1,3 +1,3 @@
 module Agilibox
-  VERSION = "1.9.19"
+  VERSION = "1.10.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agilibox
 version: !ruby/object:Gem::Version
-  version: 1.9.19
+  version: 1.10.2
 platform: ruby
 authors:
 - agilidée
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -125,7 +125,6 @@ files:
 - app/filters/agilibox/small_data/filter_strategy_by_key_value.rb
 - app/filters/agilibox/small_data/filter_strategy_by_key_values.rb
 - app/filters/agilibox/small_data/filter_strategy_by_tags.rb
-- app/filters/agilibox/small_data/filter_strategy_by_time_period.rb
 - app/forms/agilibox/mini_form_object.rb
 - app/helpers/agilibox/all_helpers.rb
 - app/helpers/agilibox/bootstrap_helper.rb
@@ -163,7 +162,6 @@ files:
 - app/models/concerns/agilibox/search.rb
 - app/models/concerns/agilibox/timestamp_helpers.rb
 - app/serializers/agilibox/serializers.rb
-- app/serializers/agilibox/serializers/axlsx.rb
 - app/serializers/agilibox/serializers/base.rb
 - app/serializers/agilibox/serializers/xlsx.rb
 - app/services/agilibox/service.rb
@@ -179,6 +177,7 @@ files:
 - app/views/agilibox/search/_form.html.slim
 - app/views/agilibox/search/_form_bs3.html.slim
 - app/views/agilibox/search/_form_bs4.html.slim
+- app/views/agilibox/search/_form_bs5.html.slim
 - app/views/kaminari/bootstrap4/_first_page.html.slim
 - app/views/kaminari/bootstrap4/_gap.html.slim
 - app/views/kaminari/bootstrap4/_last_page.html.slim

data/app/filters/agilibox/small_data/filter_strategy_by_time_period.rb

@@ -1,6 +0,0 @@
-class Agilibox::SmallData::FilterStrategyByTimePeriod
-  def initialize(*)
-    raise "FilterStrategyByTimePeriod is deprecated, please use " \
-      "FilterStrategyByDatePeriod or FilterStrategyByDatetimePeriod"
-  end
-end

data/app/serializers/agilibox/serializers/axlsx.rb

@@ -1,21 +0,0 @@
-class Agilibox::Serializers::AXLSX < Agilibox::Serializers::Base
-  def render_inline
-    xlsx.to_stream.read.force_encoding("BINARY")
-  end
-
-  def render_file(file_path)
-    xlsx.serialize(file_path)
-  end
-
-  def xlsx
-    @xlsx ||= Axlsx::Package.new do |p|
-      p.workbook.add_worksheet do |sheet|
-        formatted_data.each do |line|
-          sheet.add_row(line)
-        end
-      end
-
-      p.use_shared_strings = true
-    end
-  end
-end