pg_rails 7.1.3 → 7.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a62b699dfe2595c04b2c1dbde1379411b3ddaa4c49ad54b0a9f66e421b62796
-  data.tar.gz: 992584663e2439031e7760c9d97971478a8f9a41d4d9d52b01316d81789b3549
+  metadata.gz: 0aaf9f6d48a4411856efca24dfbe0e1f27fe03202c2f5fc5f5c45b628f5142e9
+  data.tar.gz: a342d47cac9298e1a29ffab6222f7c66cf36aa48c15119330eed2efb258c369d
 SHA512:
-  metadata.gz: cd3261127d268f14b9af5c991f66e959ccd3d5a700d500b109003c8a40fdf376ca8a85a9ff18b053fe657bcf4cdabc12d43ee95804f056fc1091d02c80fa7369
-  data.tar.gz: 5dfc48133fc688bd971d83586b845c78b8222740c598f7919dfc5ad8619aa3d140698c1fae4d869c4df38574fea07256b5921f03d715c196c0223dc9236bc876
+  metadata.gz: 4de79ebcc76b2d4d04b0709d18f0ae5106019a16eec4cee8272708b33aba4476980d0563f7c0569bde685638614b91a5ee5197fb750f21bbd10862176ea429e8
+  data.tar.gz: 2f3b8bd20aee78bd24133777fd6660a919cfa10b66d581ff13b0a0ce60adae8061401e08966c994aed86bedaa08d5cfbc4bcb90c4d07217c39f3a3654e7d58ba

data/pg_engine/app/assets/stylesheets/pg_rails_b5.scss

@@ -80,6 +80,19 @@ input[type=datetime-local], input[type=datetime] {
   // max-width: 17em;
 }
 
+.filter label {
+  font-size: 0.8em;
+  font-weight: bold;
+  max-width: 5em;
+  text-align: right;
+  line-height: 1.2em;
+  vertical-align: middle;
+  opacity: 0.5;
+  min-width: 1em!important;
+  padding-left: 0.5em;
+  width: min-content;
+}
+
 // Modal
 .modal-content {
   box-shadow: 15px 15px 9px 0px rgba(0, 0, 0, 0.6);

data/pg_engine/app/controllers/concerns/pg_engine/resource.rb

@@ -318,7 +318,8 @@ module PgEngine
       scope = if scope.model.respond_to? "order_by_#{field}"
                 scope.send "order_by_#{field}", direction
               else
-                scope.order("#{field} #{direction} nulls last")
+                sql = scope.model.arel_table[field.to_sym].send(direction).to_sql + ' nulls last'
+                scope.order(sql)
               end
       instance_variable_set(:@field, field)
       instance_variable_set(:@direction, direction)

data/pg_engine/app/controllers/pg_engine/base_controller.rb

@@ -91,7 +91,7 @@ module PgEngine
       end
 
       if Current.user.present?
-        @notifications = Current.user.notifications.order(id: :desc)
+        @notifications = Current.user.notifications.order(id: :desc).includes(:event)
                                 .where(type: 'SimpleUserNotifier::Notification')
         unseen = @notifications.unseen.any?
         # FIXME: testear y fixear, buscar el primero que esté present

data/pg_engine/app/helpers/pg_engine/index_helper.rb

@@ -6,6 +6,9 @@ module PgEngine
       campo = campo.to_s.sub(/_f\z/, '')
       campo = campo.to_s.sub(/_text\z/, '')
       clase = options[:clase] || @clase_modelo
+      key = [controller_name, action_name, 'listado_header', campo].join('.')
+      dflt = :"activerecord.attributes.#{clase.model_name.i18n_key}.#{campo}"
+      human_name = clase.human_attribute_name(key, default: dflt)
       if options[:ordenable]
         field = controller.instance_variable_get(:@field)
         direction = controller.instance_variable_get(:@direction)
@@ -35,9 +38,9 @@ module PgEngine
 
         uri.query = cgi.transform_values { |b| (b.length == 1 ? b.first : b) }.to_query
 
-        link_to(clase.human_attribute_name(campo), uri.to_s) + " #{symbol}".html_safe
+        link_to(human_name, uri.to_s) + " #{symbol}".html_safe
       else
-        clase.human_attribute_name(campo)
+        human_name
       end
     end
   end

data/pg_engine/app/lib/pg_engine/filtros_builder.rb

@@ -7,7 +7,7 @@ module PgEngine
     include PostgresHelper
     attr_accessor :controller
 
-    SUFIJOS = %w[desde hasta incluye es_igual_a in cont eq].freeze
+    SUFIJOS = %w[desde hasta gt gte lt lte incluye es_igual_a in cont cont_all eq].freeze
 
     def initialize(controller, clase_modelo, campos)
       @clase_modelo = clase_modelo
@@ -178,10 +178,13 @@ module PgEngine
 
     def placeholder_campo(campo)
       suf = extraer_sufijo(campo)
+      key = [controller_name, action_name, 'filter', sin_sufijo(campo)].join('.')
+      dflt = :"activerecord.attributes.#{@clase_modelo.model_name.i18n_key}.#{sin_sufijo(campo)}"
+      humann = @clase_modelo.human_attribute_name(key, default: dflt)
       if suf.present?
-        "#{@clase_modelo.human_attribute_name(sin_sufijo(campo))} #{suf}"
+        "#{humann} #{I18n.t(suf, scope: 'ransack.predicates')}".strip.tap { _1[0] = _1[0].capitalize }
       else
-        @clase_modelo.human_attribute_name(campo)
+        humann
       end
     end
 
@@ -238,7 +241,7 @@ module PgEngine
       end
     end
 
-    def filtro_asociacion(campo, _placeholder = '')
+    def filtro_asociacion(campo, placeholder = '')
       asociacion = obtener_asociacion(campo)
       nombre_clase = asociacion.options[:class_name]
       nombre_clase = asociacion.name.to_s.camelize if nombre_clase.nil?
@@ -256,7 +259,7 @@ module PgEngine
 
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
-          placeholder = ransack_placeholder(campo)
+          # placeholder = ransack_placeholder(campo)
           suf = extraer_sufijo(campo)
           if suf.in? %w[in]
             @form.select sin_sufijo(campo) + '_id_in', map, { multiple: true }, placeholder:, 'data-controller': 'selectize',
@@ -276,7 +279,7 @@ module PgEngine
       end
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
-          placeholder = ransack_placeholder(campo)
+          # placeholder = ransack_placeholder(campo)
           suf = extraer_sufijo(campo)
           if suf.in? %w[in]
             @form.select(campo, map, { multiple: true }, placeholder:, class: 'form-control form-control-sm pg-input-lg', 'data-controller': 'selectize')
@@ -305,7 +308,7 @@ module PgEngine
     def filtro_texto(campo, placeholder = '')
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
-          placeholder = ransack_placeholder(campo)
+          # placeholder = ransack_placeholder(campo)
           @form.search_field(
             campo, class: 'form-control form-control-sm allow-enter-submit', placeholder:, autocomplete: 'off'
           )
@@ -330,7 +333,7 @@ module PgEngine
     def filtro_fecha(campo, placeholder = '')
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
-          placeholder = ransack_placeholder(campo)
+          # placeholder = ransack_placeholder(campo)
           label_tag(nil, placeholder, class: 'text-body-secondary') +
             @form.date_field(
               campo, class: 'form-control form-control-sm d-inline-block w-auto ms-1', placeholder:, autocomplete: 'off'

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.1.3'
+  VERSION = '7.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.1.3
+  version: 7.1.5
 platform: ruby
 authors:
 - Martín Rosso