pg_rails 7.0.7 → 7.0.8.pre.alpha.6

data/pg_layout/app/javascript/pg_form_controller.js

@@ -0,0 +1,13 @@
+import { Controller } from '@hotwired/stimulus'
+
+export default class extends Controller {
+  connect () {
+    this.element.querySelectorAll('.form-select, .form-control').forEach((slct) => {
+      slct.addEventListener('change', (e) => {
+        if (e.target.value) {
+          slct.classList.remove('is-invalid')
+        }
+      })
+    })
+  }
+}

data/pg_layout/app/javascript/utils.ts

@@ -0,0 +1,34 @@
+export function round (value) {
+  return Math.round(value * 100) / 100
+}
+
+export function printCurrency (value, moneda) {
+  return monedaSimbolo(moneda) + numberWithDots(round(value).toFixed(2).replace('.', ','))
+}
+
+export function showPercentage (value) {
+  return '% ' + value
+}
+
+export function monedaSimbolo (moneda) {
+  switch (moneda) {
+    case 'pesos':
+      return '$ '
+    case 'dolares':
+      return 'U$S '
+    case 'euros':
+      return '€ '
+    case 'reales':
+      return 'R$ '
+    case 'pesos_chilenos':
+      return 'CLP '
+    case 'pesos_mexicanos':
+      return 'MXN '
+    default:
+      return '$ '
+  }
+}
+
+export function numberWithDots (x) {
+  return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, '.')
+}

data/pg_layout/app/views/layouts/pg_layout/devise.html.slim

@@ -19,6 +19,6 @@ html
 
 css:
   .pg-form {
-    max-width: 300px;
+    max-width: 22em;
     margin: auto;
   }

data/pg_layout/app/views/layouts/pg_layout/layout.html.slim

@@ -3,6 +3,11 @@ html
   head
     title = Rails.application.class.module_parent_name
     meta name="viewport" content="width=device-width,initial-scale=1"
+    / meta name="turbo-cache-control" content="no-cache"
+    / meta name="turbo-refresh-method" content="morph"
+    / meta name="turbo-refresh-scroll" content="preserve"
+    / meta name="turbo-prefetch" content="true"
+    meta name="view-transition" content="same-origin"
     = csrf_meta_tags
     = csp_meta_tag
 
@@ -12,19 +17,18 @@ html
     .with-sidebar
       = render partial: 'pg_layout/sidebar'
       div
+        .position-relative.d-flex.justify-content-around
+          #flash.flash.position-absolute.z-1.mt-1
+            = render partial: 'pg_layout/flash'
         = render partial: 'pg_layout/navbar'
         div
-          .text-center
-            #flash.flash.d-inline-block
-              = render partial: 'pg_layout/flash'
           - if user_signed_in?
-            .d-flex.px-3.align-items-center.justify-content-between.d-print-none
-              div
-                / <!-- <h1 class="h3 mb-0 text-gray-800"><%= content_for(:title) %></h1> -->
-                nav aria-label="breadcrumb"
-                  = render_breadcrumbs
-                / = render_breadcrumbs builder: ::Bootstrap4BreadcrumbsBuilder
-              .btn-toolbar.py-2
+            .d-flex.align-items-center.justify-content-between.px-3.py-1.d-print-none[
+              style="min-height: 2.5em;"]
+              nav aria-label="breadcrumb"
+                = render_breadcrumbs
+              / = render_breadcrumbs builder: ::Bootstrap4BreadcrumbsBuilder
+              .btn-toolbar
                 = yield(:actions)
             hr.my-0
           = yield

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

@@ -4,7 +4,7 @@
 / slim-lint:enable LineLength
 
 - flash_to_show.each do |flash_type, message|
-  .toast(class="bg-#{flash_type_to_class(flash_type)}-subtle" role="alert"
-         aria-live="assertive" aria-atomic="true")
+  .toast(class="bg-#{flash_type_to_class(flash_type)}-subtle" role="alert" data-bs-autohide="true"
+         data-turbo-temporary="true" aria-live="assertive" aria-atomic="true")
     .toast-body
       = message

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

@@ -24,6 +24,16 @@
               </li>
             </ul>
           </li>
+          <% @navbar.sidebar.each do |entry| %>
+            <% next if @navbar.hide_entry?(entry) %>
+            <% random_id = rand(99999).to_s %>
+            <li class="nav-item d-md-none">
+              <a class="nav-link" href="<%= entry[:path] %>" role="button">
+                <%= entry[:title] %>
+              </a>
+            </li>
+          <% end %>
+
         <% else %>
           <li class="nav-item">
             <%= link_to 'ingresar', new_user_session_path, class: 'nav-link' %>

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

@@ -1,8 +1,8 @@
 <div id="sidebar" class="<%= @navbar_opened_class %> flex-shrink-0 bg-gradient d-none d-<%= @breakpoint_navbar_expand %>-block">
   <% if user_signed_in? %>
-    <div class="sidebar--large-items" style="position:fixed">
+    <div class="sidebar--large-items">
       <hr>
-      <div class="sidebar--small-items">
+      <%# <div class="sidebar--small-items">
         <ul class="list-unstyled ps-0">
           <li class="mb-1 text-center">
             <a href="javascript:void(0)" class="nav-link" data-bs-toggle="tooltip" data-bs-title="Agenda">
@@ -10,7 +10,7 @@
             </a>
           </li>
         </ul>
-      </div>
+      </div> %>
       <div class="sidebar--large-items">
         <ul class="list-unstyled ps-0">
           <% @navbar.sidebar.each do |entry| %>

data/pg_layout/index.js

@@ -1,9 +1,13 @@
 // Controllers
 import NavbarController from './app/javascript/navbar_controller'
+import NestedController from './app/javascript/nested_controller'
+import PgFormController from './app/javascript/pg_form_controller'
 // Bootstrap's toasts
 import * as bootstrap from 'bootstrap'
 
 window.Stimulus.register('navbar', NavbarController)
+window.Stimulus.register('nested', NestedController)
+window.Stimulus.register('pg_form', PgFormController)
 
 document.addEventListener('turbo:load', function () {
   const toastElList = document.querySelectorAll('.toast:not(.hide):not(.show)')

data/pg_rails/lib/version.rb

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

data/pg_rails/scss/pg_rails.scss

@@ -1,3 +1,3 @@
 @import './../../pg_engine/app/assets/stylesheets/pg_rails_b5';
-@import './../../pg_associable/app/assets/css/pg_associable';
+@import './../../pg_associable/app/assets/stylesheets/pg_associable';
 @import './../../pg_layout/app/assets/stylesheets/sidebar';

data/pg_scaffold/lib/generators/pg_slim/templates/_form.html.slim

@@ -1,12 +1,12 @@
 / # locals: (object: nil, asociable: false)
 
-div style="max-width: 300px"
-  = pg_form_for(@<%= singular_name %> || object) do |f|
+div style="max-width: 22em" data-controller="pg_form"
+  = pg_form_for(@<%= singular_name %> || object, asociable:)) do |f|
     = f.mensajes_de_error
 
     = hidden_field_tag :asociable, true if asociable
   <%- attributes.each do |attribute| -%>
-    = f.<%= attribute.reference? ? :pg_associable_inline : :input %> :<%= attribute.name %>
+    = f.<%= attribute.reference? ? :pg_associable : :input %> :<%= attribute.name %>
   <%- end -%>
     .mt-2
     = f.button :submit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.7
+  version: 7.0.8.pre.alpha.6
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-11 00:00:00.000000000 Z
+date: 2024-02-28 00:00:00.000000000 Z
 dependencies: []
 description: Rails goodies.
 email:
@@ -19,22 +19,17 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
-- pg_associable/app/assets/css/pg_associable.scss
-- pg_associable/app/assets/js/asociable_controller.js
-- pg_associable/app/assets/js/asociable_inline_controller.js
-- pg_associable/app/assets/js/modal_controller.js
+- pg_associable/app/assets/stylesheets/pg_associable.scss
 - pg_associable/app/helpers/pg_associable/form_builder_methods.rb
 - pg_associable/app/helpers/pg_associable/helpers.rb
-- pg_associable/app/inputs/pg_associable/pg_associable_inline_input.rb
-- pg_associable/app/inputs/pg_associable/pg_associable_input.rb
-- pg_associable/app/views/pg_associable/_resultados.html.slim
+- pg_associable/app/inputs/pg_associable_input.rb
+- pg_associable/app/javascript/asociable_controller.tsx
+- pg_associable/app/javascript/modal_controller.js
 - pg_associable/app/views/pg_associable/_resultados_inline.html.slim
 - pg_associable/app/views/pg_engine/base/_pg_associable_modal.html.slim
 - pg_associable/index.js
 - pg_associable/lib/pg_associable.rb
 - pg_associable/lib/pg_associable/engine.rb
-- pg_associable/lib/pg_associable/simple_form_initializer.rb
-- pg_associable/lib/tasks/pg_associable_tasks.rake
 - pg_associable/spec/pg_associable/helpers_spec.rb
 - pg_engine/app/admin/accounts.rb
 - pg_engine/app/admin/audits.rb
@@ -102,12 +97,14 @@ files:
 - pg_engine/db/migrate/20240210025702_create_active_admin_comments.rb
 - pg_engine/db/migrate/20240211152951_create_accounts.rb
 - pg_engine/db/migrate/20240211153049_create_user_accounts.rb
+- pg_engine/db/migrate/20240222115722_create_active_storage_tables.active_storage.rb
 - pg_engine/db/seeds.rb
 - pg_engine/lib/pg_engine.rb
 - pg_engine/lib/pg_engine/configuracion.rb
 - pg_engine/lib/pg_engine/core_ext.rb
 - pg_engine/lib/pg_engine/engine.rb
 - pg_engine/lib/pg_engine/route_helpers.rb
+- pg_engine/lib/pg_engine/utils/pdf_preview_generator.rb
 - pg_engine/lib/pg_engine/utils/pg_logger.rb
 - pg_engine/lib/tasks/auto_anotar_modelos.rake
 - pg_engine/spec/controllers/admin/accounts_controller_spec.rb
@@ -116,12 +113,17 @@ files:
 - pg_engine/spec/factories/accounts.rb
 - pg_engine/spec/factories/user_accounts.rb
 - pg_engine/spec/factories/users.rb
+- pg_engine/spec/fixtures/test.pdf
 - pg_engine/spec/models/account_spec.rb
 - pg_engine/spec/models/user_account_spec.rb
 - pg_engine/spec/models/user_spec.rb
+- pg_engine/spec/pg_engine/pdf_preview_generator_spec.rb
 - pg_layout/app/assets/stylesheets/sidebar.scss
 - pg_layout/app/javascript/cookies.js
 - pg_layout/app/javascript/navbar_controller.js
+- pg_layout/app/javascript/nested_controller.js
+- pg_layout/app/javascript/pg_form_controller.js
+- pg_layout/app/javascript/utils.ts
 - pg_layout/app/lib/navbar.rb
 - pg_layout/app/views/devise/confirmations/new.html.erb
 - pg_layout/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -220,9 +222,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.22
 signing_key: 

data/pg_associable/app/assets/js/asociable_controller.js

@@ -1,58 +0,0 @@
-import { Controller } from '@hotwired/stimulus'
-
-export default class extends Controller {
-  static outlets = ['modal']
-
-  lastValue = null
-
-  connect (e) {
-    console.log('connect asociable')
-
-    // ID único para identificar el campo y el modal
-    const elemId = Math.trunc(Math.random() * 1000000000)
-    this.element.setAttribute('data-asociable-modal-outlet', `.modal-${elemId}`)
-    this.element.classList.add(`asociable-${elemId}`)
-
-    const that = this
-    const modalLink = this.targets.element.querySelector('.modal-link')
-    const path = modalLink.attributes.href.value
-    modalLink.setAttribute('href', `${path}?id=${elemId}`)
-    modalLink.onclick = (e) => {
-      // Si ya hay un modal abierto lo abro y evito que se haga el get
-      // Si no, dejo que se ejecute el comportamiento por default
-      if (that.modalOutlets.length > 0) {
-        e.preventDefault()
-        that.modalOutlet.openModal()
-      }
-    }
-    const input = this.element.querySelector('input[type=text]')
-    if (input.value) {
-      this.element.classList.add('filled')
-    }
-  }
-
-  selectItem (e) {
-    // TODO: text en data
-    this.completarCampo(e.target.dataset.id, e.target.text)
-  }
-
-  completarCampo (id, text) {
-    const textField = this.element.querySelector('input[type=text]')
-    const hiddenField = this.element.querySelector('input[type=hidden]')
-    if (id === undefined) {
-      id = null
-    }
-    hiddenField.value = id
-    if (id) {
-      textField.value = text
-      this.element.classList.add('filled')
-    } else {
-      textField.value = null
-      this.element.classList.remove('filled')
-    }
-  }
-
-  disconnect (e) {
-    console.log('disconnect asociable')
-  }
-}

data/pg_associable/app/assets/js/asociable_inline_controller.js

@@ -1,142 +0,0 @@
-import { Controller } from '@hotwired/stimulus'
-
-export default class extends Controller {
-  static outlets = ['modal']
-
-  result = null
-  elemId = null
-  input = null
-  lastValue = ''
-  connect (e) {
-    console.log('connect asociable_inline')
-    const that = this
-    // ID único para identificar el campo y el modal
-    this.input = this.element.querySelector('input[type=text]')
-    this.elemId = Math.trunc(Math.random() * 1000000000)
-    this.element.classList.add(`asociable-${this.elemId}`)
-    this.result = document.createElement('div')
-    this.result.setAttribute('id', `resultados-${this.elemId}`)
-    this.result.classList.add('resultados-wrapper')
-    this.input.parentNode.appendChild(this.result)
-    this.input.parentNode.appendChild(this.result)
-    this.element.querySelector('.pencil').onclick = (e) => {
-      that.input.focus()
-    }
-    if (this.input.value) {
-      this.element.classList.add('filled')
-    }
-
-    const debounce = function (callback, wait) {
-      let timerId
-      return (...args) => {
-        clearTimeout(timerId)
-        timerId = setTimeout(() => {
-          callback(...args)
-        }, wait)
-      }
-    }
-    const doSearchBounce = debounce((force) => {
-      that.doSearch(force)
-    }, 200)
-
-    this.input.addEventListener('blur', (e) => {
-      this.input.placeholder = ''
-    })
-    this.input.onfocus = (e) => {
-      this.input.select()
-      if (this.input.value.length === 0) {
-        this.escribiAlgo()
-      }
-    }
-    this.input.onkeyup = (e) => {
-      if (this.input.value.length === 0) {
-        this.escribiAlgo()
-      }
-      if (e.keyCode === 13) {
-        doSearchBounce(true)
-      } else {
-        doSearchBounce()
-      }
-    }
-    this.input.onkeydown = (e) => {
-      if (e.keyCode === 13) {
-        e.preventDefault()
-        return false
-      }
-    }
-  }
-
-  buscando () {
-    this.result.innerHTML = `
-<div class="resultados" tabindex="-1">
-  <div class="fst-italic text-secondary">Buscando...</div>
-</div>
-`
-  }
-
-  escribiAlgo () {
-    this.input.placeholder = 'Escribí algo para buscar'
-  }
-
-  doSearch (force = false) {
-    if (!force && this.input.value.length < 3) {
-      return
-    }
-    if (!force && this.input.value === this.lastValue) {
-      return
-    }
-    this.lastValue = this.input.value
-
-    const timerId = setTimeout(() => {
-      this.buscando()
-    }, 200)
-    document.addEventListener('turbo:before-stream-render', function (e) {
-      clearTimeout(timerId)
-    })
-    const url = `${this.input.dataset.url}?id=${this.elemId}`
-    const form = document.createElement('form')
-    form.setAttribute('method', 'post')
-    form.setAttribute('action', url)
-    form.setAttribute('data-turbo-stream', true)
-    const partial = document.createElement('input')
-    partial.setAttribute('type', 'hidden')
-    partial.setAttribute('name', 'partial')
-    partial.setAttribute('value', 'pg_associable/resultados_inline')
-    form.appendChild(partial)
-    const query = document.createElement('input')
-    query.setAttribute('type', 'hidden')
-    query.setAttribute('name', 'query')
-    query.setAttribute('value', this.input.value)
-    form.appendChild(query)
-    document.body.prepend(form)
-    form.requestSubmit()
-    form.remove()
-  }
-
-  completarCampo (id, text) {
-    const textField = this.element.querySelector('input[type=text]')
-    const hiddenField = this.element.querySelector('input[type=hidden]')
-    if (id === undefined) {
-      id = null
-    }
-    hiddenField.value = id
-    if (id) {
-      textField.value = text
-      this.element.classList.add('filled')
-    } else {
-      this.element.classList.remove('filled')
-      textField.value = null
-    }
-  }
-
-  selectItem (e) {
-    console.log('select')
-    // TODO: text en data
-    this.completarCampo(e.target.dataset.id, e.target.text)
-    this.result.innerHTML = ''
-  }
-
-  disconnect (e) {
-    console.log('disconnect asociable_inline')
-  }
-}

data/pg_associable/app/assets/js/modal_controller.js

@@ -1,117 +0,0 @@
-import { Controller } from '@hotwired/stimulus'
-import * as bootstrap from 'bootstrap'
-
-export default class extends Controller {
-  static outlets = ['asociable']
-  static targets = ['response', 'result', 'searchInput', 'searchForm']
-
-  modalPuntero = null
-  lastValue = ''
-
-  connect (e) {
-    console.log('ModalController connected')
-    const modal = this.targets.element
-    this.modalPuntero = new bootstrap.Modal(modal)
-    this.modalPuntero.show()
-
-    if (this.searchInputTargets.length > 0) {
-      this.bindSearchInput()
-    }
-  }
-
-  debounce (callback, wait) {
-    let timerId
-    return (...args) => {
-      clearTimeout(timerId)
-      timerId = setTimeout(() => {
-        callback(...args)
-      }, wait)
-    }
-  }
-
-  bindSearchInput () {
-    const doSearchBounce = this.debounce((force) => {
-      this.doSearch(force)
-    }, 200)
-    this.searchInputTarget.onkeydown = (e) => {
-      if (e.keyCode === 13) {
-        e.preventDefault()
-        return false
-      }
-    }
-    this.searchInputTarget.onkeyup = (e) => {
-      if (e.keyCode === 13) {
-        doSearchBounce(true)
-      } else {
-        doSearchBounce()
-      }
-    }
-  }
-
-  buscando () {
-    this.resultTarget.innerHTML = `
-<ul class="resultados list-group list-group-flush" tabindex="-1">
-  <li class="list-group-item">
-    <span class="fst-italic text-secondary">Buscando...</span>
-  </li>
-</ul>
-`
-  }
-
-  doSearch (force = false) {
-    if (!force && this.searchInputTarget.value.length < 3) {
-      return
-    }
-    if (!force && this.searchInputTarget.value === this.lastValue) {
-      return
-    }
-    this.lastValue = this.searchInputTarget.value
-
-    const timerId = setTimeout(() => {
-      this.buscando()
-    }, 200)
-    document.addEventListener('turbo:before-stream-render', function (e) {
-      clearTimeout(timerId)
-    })
-    this.searchFormTarget.requestSubmit()
-  }
-
-  selectItem (e) {
-    const asociable = this.asociableOutlet
-    // TODO: text en data
-    asociable.completarCampo(e.target.dataset.id, e.target.text)
-    this.remove()
-  }
-
-  responseTargetConnected (e) {
-    const newObject = JSON.parse(e.dataset.response)
-    const asociable = this.asociableOutlet
-    asociable.completarCampo(newObject.id, newObject.to_s)
-    this.remove()
-  }
-
-  remove () {
-    this.targets.element.remove()
-  }
-
-  openModal () {
-    this.modalPuntero.show()
-  }
-
-  toggleCrearElegir (e) {
-    const content = this.element.querySelector('.modal-content')
-    const state = content.dataset.state
-    const newValue = state === 'new-item' ? 'select-item' : 'new-item'
-    content.setAttribute('data-state', newValue)
-  }
-
-  disconnect (e) {
-    console.log('ModalController disconnected')
-    this.modalPuntero.dispose()
-    document.querySelectorAll('.modal-backdrop').forEach(e => { e.remove() })
-  }
-
-  buscar () {
-    alert('buscar')
-  }
-}

data/pg_associable/app/inputs/pg_associable/pg_associable_inline_input.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module PgAssociable
-  class PgAssociableInlineInput < SimpleForm::Inputs::StringInput
-    include ActionView::Helpers::FormTagHelper
-
-    def hidden_input(wrapper_options = {})
-      merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
-      # merged_input_options = merge_wrapper_options(merged_input_options, { class: 'oculto' })
-      @builder.hidden_field(attribute_name, merged_input_options)
-    end
-
-    def search_form(wrapper_options = nil)
-      unless string?
-        input_html_classes.unshift('string')
-        # input_html_options[:type] ||= input_type if html5?
-      end
-      input_html_options[:type] = 'text'
-      input_html_options[:data] = { url: options[:url_search] }
-      input_html_options[:class] = 'form-control'
-      input_html_options[:placeholder] = ''
-
-      merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
-
-      text_field_tag(nil, object.send(reflection.name).to_s, merged_input_options)
-    end
-
-    def limpiar(_wrapper_options = nil)
-      content_tag('a', href: 'javascript:void(0)', class: 'limpiar', title: 'Limpiar', tabindex: '0',
-                       data: { action: 'asociable_inline#selectItem' }) do
-        '<i class="bi bi-x-lg"></i>'.html_safe
-      end
-    end
-
-    def pencil(_wrapper_options = nil)
-      '<i tabindex="-1" class="bi bi-pencil pencil"></i>'.html_safe
-    end
-  end
-end