pg_rails 7.6.6 → 7.6.7

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 365f1740542a5fbba1bce8e40441e42581235cd67e68a7890292f512a63535d7
4
- data.tar.gz: dfc9376def176892e05dc733c8a0df12a97f4b3da8c2fd0a31b1f7f5fc9b77a5
3
+ metadata.gz: c0c1496f0173c6ee43cc92f45a5ed539ad58b308533f9fb4fe0f04621882d6de
4
+ data.tar.gz: 6cc98c258ec0b585e705162da82386cb10f0726800641eafac229bad90759af4
5
5
  SHA512:
6
- metadata.gz: 94fc43c2038e908511860200282138fc7fa4ca95d8536abbbaa1530e5a975ffcdc8e6d64243669511c7c8a9abe6dfea0922f27fc23eea91f71c455d92295851f
7
- data.tar.gz: 9020921857f2ec5e1d7af48321a9655b2f34557c0496a55b92bebd557772e9873e921bb7f1a9b8133093759c2f388c9ccc395949b13c5ad06ee68d52ae1eee86
6
+ metadata.gz: 6638f89154fb33f4f840cee25e54d4fc7a544a3f7d65505c779e70d1830b360722ddba32b3e4b3b29e027fa04b76c06740ba687411eb95f055d049f9196dedb8
7
+ data.tar.gz: d2c19217475e137c8e2a8177a2325e3ac184d634740b580972bdd2be777c8e0ac6b48b2462cd6b7f5ca21c14828d9bb4d8263fe4eedd24421079bc205ecabc8c
@@ -61,6 +61,8 @@ module PgAssociable
61
61
 
62
62
  def select_comun(atributo, options, collection)
63
63
  options[:collection] = collection
64
+ options[:include_blank] = 'Ninguno'
65
+ options[:prompt] = nil
64
66
  association atributo, options
65
67
  end
66
68
 
@@ -311,6 +311,10 @@ export default class extends Controller {
311
311
  this.element.dataset.object = object
312
312
  const event = new CustomEvent('pg_associable:changed', { detail: object })
313
313
  this.element.dispatchEvent(event)
314
+ const inlineEdit = this.element.closest('.inline-edit')
315
+ if (inlineEdit) {
316
+ inlineEdit.querySelector('button[type=submit]').click()
317
+ }
314
318
  } else {
315
319
  hiddenField.value = null
316
320
  textField.value = null
@@ -2,8 +2,12 @@
2
2
  = helpers.pg_form_for(@model, render_errors: false, wrapper_mappings: @wrapper_mappings) do |f|
3
3
  = hidden_field_tag :inline_attribute, @attribute
4
4
 
5
- = f.field @unsuffixed_attribute, label: false, html5: true
6
-
5
+ / html5 solo aplica a datetime
6
+ / date_selector solo aplica a date
7
+ / ignore_date y prompt solo aplica a time
8
+ / cada caso es inocuo para el resto de los types
9
+ = f.field @unsuffixed_attribute, label: false, date_selector: true, minute_step: 15,
10
+ ignore_date: true, prompt: { hour: 'hh', minute: 'mm' }
7
11
  .actions.d-flex.gap-1
8
12
  = button_tag class: 'btn btn-sm btn-primary',
9
13
  data: { controller: 'tooltip', 'bs-title': 'Guardar' } do
@@ -5,6 +5,7 @@ class InlineEditComponent < InlineComponent
5
5
  pg_associable: :inline_form_control,
6
6
  date: :inline_form_control,
7
7
  datetime: :inline_form_control,
8
+ time: :inline_multi_select,
8
9
  select: :inline_form_select
9
10
  }
10
11
 
@@ -1,7 +1,10 @@
1
1
  - if @model.class.inline_editable?(@unsuffixed_attribute) && helpers.policy(@model).edit?
2
2
  = helpers.turbo_frame_tag(@frame_id, class: 'inline-edit')
3
3
  = link_to users_inline_edit_path(model: @model.to_gid, attribute: @attribute),
4
- class: 'text-body-tertiary edit-link', style: 'font-size: 0.8em' do
4
+ data: { \
5
+ controller: :tooltip,
6
+ 'bs-title': "Modificar #{@model.class.human_attribute_name(@attribute).downcase}" },
7
+ class: 'text-body-tertiary edit-link', style: 'font-size: 0.8em' do
5
8
  i.bi.bi-pencil
6
9
  span = @model.decorate.send(@attribute)
7
10
  - else
@@ -34,7 +34,12 @@ module PgEngine
34
34
  if valor.instance_of?(Date)
35
35
  dmy(valor)
36
36
  elsif valor.instance_of?(ActiveSupport::TimeWithZone)
37
- dmy_time(valor)
37
+ column = object.class.columns.find { |c| c.name == method_name.to_s }
38
+ if column.present? && column.type == :time
39
+ hhmm(valor)
40
+ else
41
+ dmy_time(valor)
42
+ end
38
43
  else
39
44
  super
40
45
  end
@@ -51,6 +51,12 @@ module PgEngine
51
51
  date.strftime('%d/%m/%Y %H:%M')
52
52
  end
53
53
 
54
+ def hhmm(time)
55
+ return if time.blank?
56
+
57
+ time.strftime('%H:%M')
58
+ end
59
+
54
60
  def dmy(date)
55
61
  return if date.blank?
56
62
 
@@ -141,6 +141,16 @@ SimpleForm.setup do |config|
141
141
  b.use :hint, wrap_with: { class: 'form-text' }
142
142
  end
143
143
 
144
+ config.wrappers :inline_multi_select, class: '' do |b|
145
+ b.use :html5
146
+ b.optional :readonly
147
+ b.wrapper class: 'd-flex flex-row justify-content-between align-items-center' do |ba|
148
+ ba.use :input, class: 'form-select form-select-sm mx-1', error_class: 'is-invalid'
149
+ end
150
+ b.use :error, wrap_with: { class: 'invalid-feedback d-block' }
151
+ b.use :hint, wrap_with: { class: 'form-text' }
152
+ end
153
+
144
154
  # vertical range input
145
155
  config.wrappers :vertical_range, class: 'mb-3' do |b|
146
156
  b.use :html5
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module PgRails
4
- VERSION = '7.6.6'
4
+ VERSION = '7.6.7'
5
5
  end
@@ -77,9 +77,11 @@ $values: 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100;
77
77
  white-space: nowrap;
78
78
  min-width: 30em * $value * 0.01;
79
79
 
80
- // TODO: con css grid esto se debería poder hacer mejor
80
+ // FIXME: con css grid esto se debería poder hacer mejor
81
+ // además, el pg_asociable directamente se rompe
81
82
  &:has(form) {
82
83
  min-width: 28em;
84
+ overflow: initial;
83
85
  }
84
86
  }
85
87
  }
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pg_rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.6.6
4
+ version: 7.6.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Martín Rosso
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-10-10 00:00:00.000000000 Z
11
+ date: 2024-10-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails