pg_rails 7.0.8.pre.alpha.73 → 7.0.8.pre.alpha.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fead42e7825fd503115e697fc2c276181f4eaf6accfd783c8ebd463cf5ae278
-  data.tar.gz: 0ba91edbd93dd46d83a1d2aee3e77aba5d2d2d28d38625ddcce287b8ecb2a59e
+  metadata.gz: 46472fd017bf8657e28b3d968159b206c7c2ab8118a4744b5ae887e38c6c0d57
+  data.tar.gz: f0ecdadba8aaac1a640c74bc17ce6a182a0b0e4af138e5275d01c35a082b4bf7
 SHA512:
-  metadata.gz: e55f215a88c48203ae08aa09b6005a376b3efc2fef02005b4719f19a8927bf8bca0865f663d4f08dc098a75e53dc50707ee111d78a3bfeb2d92e2d202cbdc026
-  data.tar.gz: a0c3ce96cf9303518e40ba5a4b669db2a0570dff432d30aea65821ceffe2ad10016cc536459a69b819545dad5854b7f49549c1d4c3f615226fa6f235c95453d7
+  metadata.gz: 7cc3574cfed47ad618319c9320836ea0a7941c9951226f82cacf20dd885a7d8ba425361fefb53cbd64fb52a7b1af62d681a60da0ba3a8de2bc120977383ca489
+  data.tar.gz: 16b08e59ac08a38348d08f88f591d32f2349d5f3baa188235bb57d57352213b3a224364be53a03da371971df4e1ba0f4f91e5b0fc5a9fd9b8deca7c8b5d2a25d

data/pg_associable/app/assets/stylesheets/pg_associable.scss

@@ -88,7 +88,7 @@
   border: 1px solid #a7b7bb;
   border-top: none;
   border-radius: 4px;
-  padding: 5px 11px;
+  padding: 5px 0;
   width: 100%;
 
   border-top-left-radius: 0;

data/pg_associable/app/helpers/pg_associable/form_builder_methods.rb

@@ -9,6 +9,12 @@ module PgAssociable
     MAXIMO_PARA_SELECT = 10
     # TODO: si está entre 10 y 50, habilitar un buscador por js
 
+    def pg_associable_pro(atributo, options = {})
+      return input(atributo, options) if options[:disabled]
+
+      select_pro(atributo, options, nil)
+    end
+
     def pg_associable(atributo, options = {})
       return input(atributo, options) if options[:disabled]
 

data/pg_associable/app/inputs/pg_associable_input.rb

@@ -15,8 +15,8 @@ class PgAssociableInput < SimpleForm::Inputs::StringInput
 
   def input(wrapper_options = nil)
     atributo = attribute_name.to_s.gsub('_id', '')
-    url_modal = namespaced_path(clase_asociacion(atributo), prefix: :abrir_modal)
-    url_search = namespaced_path(clase_asociacion(atributo), prefix: :buscar)
+    url_modal = options[:modal_url] || namespaced_path(clase_asociacion(atributo), prefix: :abrir_modal)
+    url_search = options[:buscar_url] || namespaced_path(clase_asociacion(atributo), prefix: :buscar)
 
     input_html_options[:data] = { url_search:, url_modal: }
     input_html_options[:type] = 'text'

data/pg_associable/app/javascript/asociable_controller.tsx

@@ -45,7 +45,8 @@ export default class extends Controller {
 
     const input = this.element.querySelector('input[type=text]')
     this.originalPlaceholder = input.placeholder
-    if (input.value) {
+    const hiddenField = this.element.querySelector('input[type=hidden]')
+    if (hiddenField.value) {
       this.element.classList.add('filled')
       input.setAttribute('readonly', 'true')
     }
@@ -64,7 +65,7 @@ export default class extends Controller {
     }
     const doSearchBounce = debounce((force) => {
       this.doSearch(force)
-    }, 200)
+    }, 900)
 
     this.input.addEventListener('blur', () => {
       this.input.placeholder = this.originalPlaceholder
@@ -211,7 +212,7 @@ export default class extends Controller {
   buscando () {
     this.subWrapper.innerHTML = renderToStaticMarkup(
       <div className="resultados" tabIndex={-1}>
-        <div className="fst-italic text-secondary">Buscando...</div>
+        <div className="fst-italic text-secondary px-3">Buscando...</div>
       </div>
     )
   }

data/pg_associable/app/views/pg_associable/_resultados_inline.html.slim

@@ -8,4 +8,4 @@
                   data: { action: 'asociable#selectItem',
                           id: object.id, object: object.decorate.to_json }
     - else
-      li.list-group-item No hay resultados para "#{query}"
+      li.px-3.py-1 No hay resultados para "#{query}"

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

@@ -102,3 +102,13 @@ input[type=datetime-local], input[type=datetime] {
     padding: 0.725rem $alert-padding-x;
   }
 }
+
+// Switcher (ver switcher_controller.js)
+.switcher > * {
+  display: none;
+}
+
+// Flash
+#flash .alert {
+  box-shadow: 0px 9px 13px -3px rgba(0, 0, 0, 0.5);
+}

data/pg_engine/app/helpers/pg_engine/print_helper.rb

@@ -32,10 +32,17 @@ module PgEngine
     end
 
     def print_cuit(cuit_number)
-      return '' if cuit_number.blank?
-
-      str = cuit_number.to_s
-      "#{str[0..1]}-#{str[2..9]}-#{str[10]}"
+      str = cuit_number.to_s.gsub(/[^\d]/, '')
+      if str.length == 11
+        "#{str[0..1]}-#{str[2..9]}-#{str[10]}"
+      else
+        cuit_number
+      end
+    rescue StandardError => e
+      # :nocov:
+      pg_err e
+      cuit_number
+      # :nocov:
     end
 
     def dmy_time(date)
@@ -93,10 +100,10 @@ module PgEngine
       return if number.blank?
 
       # TODO!: testear
-      precision ||= if (number % 0.01).positive?
-                      3
+      precision ||= if (number % 1).positive?
+                      (number * 100 % 1).positive? ? 3 : 2
                     else
-                      (number % 1).positive? ? 2 : 0
+                      0
                     end
 
       "#{simbolo} #{number_with_precision(number, delimiter: '.', separator: ',',

data/pg_engine/app/views/pg_engine/base/index.html.slim

@@ -1,11 +1,15 @@
 - content_for(:title, @clase_modelo.nombre_plural)
 - content_for :actions do
   - if @filtros.present?
-    button.btn.btn-sm.btn-outline-primary[type="button" data-bs-toggle="collapse"
-                                  data-bs-target="#filtros" aria-expanded="false"
-                                  aria-controls="filtros"]
+    button.btn.btn-sm.btn-outline-primary[
+      type="button" data-bs-toggle="collapse"
+      data-bs-target="#filtros" aria-expanded="#{any_filter? ? 'true' : 'false'}"
+      aria-controls="filtros" data-controller="filtros" data-expanded-text="Ocultar filtros"
+    ]
       span.bi.bi-funnel-fill
-      span.d-none.d-sm-inline  Filtrar
+      span.d-none.d-sm-inline
+        | &nbsp
+        span.text Filtrar
     .ms-1
   = @clase_modelo.new.decorate.new_link
 
@@ -20,6 +24,9 @@
           .col-auto
             = button_tag class: 'btn btn-sm btn-primary col-auto' do
               span.bi.bi-search
+              span.d-none.d-sm-inline
+                | &nbsp
+                span.text Buscar
           .col-auto
             = link_to namespaced_path(@clase_modelo, clean: true),
                       class: 'btn btn-sm btn-secondary col-auto' do

data/pg_engine/db/migrate/20240517174821_pg_trgm.rb

@@ -0,0 +1,5 @@
+class PgTrgm < ActiveRecord::Migration[7.1]
+  def change
+    enable_extension "pg_trgm"
+  end
+end

data/pg_engine/lib/pg_engine.rb

@@ -49,6 +49,7 @@ require 'hashid/rails'
 require 'redis'
 require 'kredis'
 require 'mailgun-ruby'
+require 'pg_search'
 
 if Rails.env.local?
   require 'letter_opener'

data/pg_engine/spec/helpers/pg_engine/print_helper_spec.rb

@@ -0,0 +1,53 @@
+require 'rails_helper'
+
+describe PgEngine::PrintHelper do
+  describe '#print_cuit' do
+    subject { print_cuit(input) }
+
+    context 'cuando es nil' do
+      let(:input) { nil }
+
+      it { expect(subject).to be_nil }
+    end
+
+    context 'cuando es un cuit válido' do
+      let(:input) { 20_351_404_478 }
+
+      it { expect(subject).to eq '20-35140447-8' }
+    end
+
+    context 'cuando es un cuit válido mal formateado' do
+      let(:input) { '2035140447-8' }
+
+      it { expect(subject).to eq '20-35140447-8' }
+    end
+
+    context 'cuando no es un cuit válido' do
+      let(:input) { 2035 }
+
+      it { expect(subject).to eq 2035 }
+    end
+  end
+
+  describe '#print_currency' do
+    subject { print_currency(input) }
+
+    context 'cuando es un entero' do
+      let(:input) { 191_624 }
+
+      it { expect(subject).to eq '$ 191.624' }
+    end
+
+    context 'cuando tiene 1 decimal' do
+      let(:input) { 123_456.1 }
+
+      it { expect(subject).to eq '$ 123.456,10' }
+    end
+
+    context 'cuando tiene más de 3 decimales' do
+      let(:input) { 123_456.164234 }
+
+      it { expect(subject).to eq '$ 123.456,164' }
+    end
+  end
+end

data/pg_layout/app/javascript/controllers/filtros_controller.js

@@ -0,0 +1,22 @@
+import { Controller } from '@hotwired/stimulus'
+
+// Connects to data-controller="switcher"
+export default class extends Controller {
+  originalText = null
+  textEl = null
+
+  connect () {
+    this.textEl = this.element.querySelector('.text')
+    this.originalText = this.textEl.textContent
+    this.element.addEventListener('click', () => { this.cambiarTexto() })
+    this.cambiarTexto()
+  }
+
+  cambiarTexto () {
+    if (this.element.getAttribute('aria-expanded') === 'true') {
+      this.textEl.textContent = this.element.dataset.expandedText
+    } else {
+      this.textEl.textContent = this.originalText
+    }
+  }
+}

data/pg_layout/app/javascript/controllers/index.js

@@ -5,9 +5,13 @@ import NestedController from './nested_controller'
 import PgFormController from './pg_form_controller'
 import FadeinOnloadController from './fadein_onload_controller'
 import ClearTimeoutController from './clear_timeout_controller'
+import SwitcherController from './switcher_controller'
+import FiltrosController from './filtros_controller'
 
 application.register('navbar', NavbarController)
 application.register('nested', NestedController)
 application.register('pg_form', PgFormController)
 application.register('fadein_onload', FadeinOnloadController)
 application.register('clear-timeout', ClearTimeoutController)
+application.register('switcher', SwitcherController)
+application.register('filtros', FiltrosController)

data/pg_layout/app/javascript/controllers/switcher_controller.js

@@ -0,0 +1,26 @@
+import { Controller } from '@hotwired/stimulus'
+
+// Connects to data-controller="switcher"
+export default class extends Controller {
+  connect () {
+    if (this.element.checked) {
+      this.show()
+    }
+    this.element.setAttribute('data-action', `${this.element.getAttribute('data-action') || ''} switcher#show`)
+  }
+
+  show () {
+    const elemToShow = document.querySelector(this.element.dataset.target)
+    this.getSiblings(elemToShow).forEach((el) => {
+      el.classList.add('d-none')
+      el.classList.remove('d-block')
+    })
+    elemToShow.classList.remove('d-none')
+    elemToShow.classList.add('d-block')
+  }
+
+  getSiblings (el) {
+    const childrenArray = [...el.parentNode.children]
+    return childrenArray.filter(child => child !== el)
+  }
+}

data/pg_layout/app/views/pg_layout/_flash_container.html.slim

@@ -1,4 +1,4 @@
-#flash-wrapper.d-flex.justify-content-around
+#flash-wrapper.d-flex.justify-content-around.sticky-top
   #flash.flash.position-relative.w-100.d-flex.justify-content-center
     = render partial: 'pg_layout/flash'
   / TODO: si hay varios flashes toast, se superponen. habría que hacer un container

data/pg_layout/app/views/pg_layout/error.html.erb

@@ -1,2 +1,2 @@
-<%# Se renderea en el rescue de base_controller %>
-<%= render partial: 'pg_layout/error' %>
+<%# Para usar como respuesta con layout en controllers %>
+<%= render partial: 'pg_layout/error', locals: { error_msg: @error_msg } %>

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.0.8-alpha.73'
+  VERSION = '7.0.8-alpha.75'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.73
+  version: 7.0.8.pre.alpha.75
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-17 00:00:00.000000000 Z
+date: 2024-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -514,6 +514,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.14
+- !ruby/object:Gem::Dependency
+  name: pg_search
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.6
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -1004,6 +1018,7 @@ files:
 - pg_engine/db/migrate/20240314114503_remove_hash_ids.rb
 - pg_engine/db/migrate/20240428152916_create_mensaje_contactos.rb
 - pg_engine/db/migrate/20240506194106_create_emails.rb
+- pg_engine/db/migrate/20240517174821_pg_trgm.rb
 - pg_engine/db/seeds.rb
 - pg_engine/lib/pg_engine.rb
 - pg_engine/lib/pg_engine/configuracion.rb
@@ -1036,6 +1051,7 @@ files:
 - pg_engine/spec/features/signup_spec.rb
 - pg_engine/spec/fixtures/test.pdf
 - pg_engine/spec/helpers/pg_engine/pg_rails_helper_spec.rb
+- pg_engine/spec/helpers/pg_engine/print_helper_spec.rb
 - pg_engine/spec/lib/pg_engine/error_helper_spec.rb
 - pg_engine/spec/lib/pg_engine/mailgun/log_sync_spec.rb
 - pg_engine/spec/lib/pg_engine/utils/pg_engine/pg_logger_spec.rb
@@ -1057,10 +1073,12 @@ files:
 - pg_layout/app/javascript/controllers/application.js
 - pg_layout/app/javascript/controllers/clear_timeout_controller.js
 - pg_layout/app/javascript/controllers/fadein_onload_controller.js
+- pg_layout/app/javascript/controllers/filtros_controller.js
 - pg_layout/app/javascript/controllers/index.js
 - pg_layout/app/javascript/controllers/navbar_controller.js
 - pg_layout/app/javascript/controllers/nested_controller.js
 - pg_layout/app/javascript/controllers/pg_form_controller.js
+- pg_layout/app/javascript/controllers/switcher_controller.js
 - pg_layout/app/javascript/utils/cookies.js
 - pg_layout/app/javascript/utils/utils.ts
 - pg_layout/app/lib/navbar.rb