pg_rails 7.0.8.pre.alpha.74 → 7.0.8.pre.alpha.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1be4c79ea65550474a25d90dfe6350776ee4729e1606fc4a33f9b2d510c00f6e
-  data.tar.gz: 2455fe21d800515773fc24a930e2ef78d79ce05ebda5e579ca900b7c6ab9e8c6
+  metadata.gz: 1e72fb52c1042404baaf142d2b8a3e83eb75cd8034e4ba58ca7c862054cfe8d8
+  data.tar.gz: 7f2cf6cd1ae8089fdeba57501d7d990fe9c59fc7a713b21068a16772a0506c17
 SHA512:
-  metadata.gz: 5dec9355d0371042c062dd6b90ae6306196965ef7c41ed59e672dddd38f658b2428e230f1c3e6ed82b4cb1e82657f48b7372b1b05c7d7062ccbc07cac903c711
-  data.tar.gz: 135d91aed0d9fdfe6e7aaa61d98a8cc2773516a6649eca3a65ee5fe2b49b563879276143ee49f4228605fc7caea8bc9cb1ef5a25fed54624dad73c9ef7006aad
+  metadata.gz: 28be79030af6d2cf172da55d757d040b414e166cda53960fd66f982d3dd36f36b829c45e835d798425a50bd38609d3b2c1ca3ab5d0536983ffd3d3b3e38bd2d6
+  data.tar.gz: 6c88a919dafb6e96c03214d0a7d91d6e4293752e0323b6a5fec3e0c1d97750b541e6af8000ce8f21e3057dbfb0159d44fe4d5644076046992144207261aa31f6

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/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/lib/pg_engine/devise_failure_app.rb

@@ -21,7 +21,6 @@ module PgEngine
     def render_unconfirmed
       self.content_type = 'text/vnd.turbo-stream.html'
       self.status = 200
-      # TODO: poner data-turbo-temporary?
       self.response_body = <<~HTML
         <turbo-stream action="update" target="flash">
           <template>

data/pg_engine/app/lib/pg_form_builder.rb

@@ -27,7 +27,7 @@ class PgFormBuilder < SimpleForm::FormBuilder
   end
 
   def mensajes_de_error
-    # TODO: poner data-turbo-temporary?
+    # TODO: quitar en before-cache?
     title = error_notification(message: mensaje, class: 'text-danger mb-2 error-title') if mensaje
 
     base_errors = object.errors[:base]

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/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/application.js

@@ -37,6 +37,9 @@ document.addEventListener('turbo:load', bindAndObserveToasts)
 document.addEventListener('turbo:render', bindAndObserveToasts)
 
 document.addEventListener('turbo:before-cache', () => {
+  document.querySelectorAll('#flash .alert').forEach((el) => {
+    el.remove()
+  })
   document.querySelectorAll('.offcanvas-backdrop').forEach((el) => {
     el.remove()
   })

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/lib/navbar.rb

@@ -38,9 +38,9 @@ class Navbar
         path: eval(item['path']),
         show: item['policy'] ? eval(item['policy']) : true
       }
-    rescue StandardError
+    rescue StandardError => e
       # TODO!: testear
-      pg_err item
+      pg_err e, item
       return []
     end
     # rubocop:enable Security/Eval

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

@@ -1,6 +1,6 @@
 <%# locals: (error_msg: nil) %>
 
-<div class="d-flex justify-content-around mt-2" data-turbo-temporary="true">
+<div class="d-flex justify-content-around mt-2">
   <div class="alert alert-danger d-flex align-items-center">
     <div>
       <span class="bi bi-emoji-dizzy fs-1 me-3"></span>

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/_flash_inner.html.slim

@@ -5,7 +5,7 @@
     mt-2 d-flex align-items-center
     alert-#{flash_type_to_class(flash_type)}
     #{'position-absolute pg-toast' if toast}"
-  data-turbo-temporary="true" data-bs-autohide="true"
+  data-bs-autohide="true"
   aria-live="assertive" aria-atomic="true" role="alert"
 ]
   - case flash_type

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.74'
+  VERSION = '7.0.8-alpha.76'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.74
+  version: 7.0.8.pre.alpha.76
 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
@@ -1051,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
@@ -1072,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