pg_rails 7.0.8.pre.alpha.112 → 7.1.1.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05fcca002b0d29dc6e54d625ebec851eddc239a858ebf6714019000a528e7d35
-  data.tar.gz: 8ce185225473246f30228ccde564466ccff35fb390c87006f3ee8c900a6f005c
+  metadata.gz: 26619042e1d28565472f7c5dd99e31b4a75668c3efd5e0c299ad6f3a5e6f71cd
+  data.tar.gz: 1f306defd53cda0f8567ac4f17465b99aaed1d1293565b08b08176b853301713
 SHA512:
-  metadata.gz: 93de11640c80585f58c9d5c6b69082efdd5151e9a164097aacf1ce7b1b528e8e4d5d4a873823ae2ec9bdf00fab688839300f5960802447078d1219a5ef454d75
-  data.tar.gz: 6751325594662bd3165fcb81516190e5645fb47295dcb0a465577c6cee2b44adde0fae49196dacf031cae228cc4c8ded14b0ab0bf67e57f62636456f65316953
+  metadata.gz: a338901f4520b0a9dd9b7dfb363951ddd884f20ad87b9bcd5fea6591d908383c22a942ff9be7e6f914a7788e18e8233b58a541cb5b37d27f889665025bdede16
+  data.tar.gz: e21ec84cfa1a7191fdc5776524cfa1e67468f38720080ceb6299dd9305f16d7f57cc155314f72d9eaa79a6ed0a2c7d9834d7781f80eeb0e0d7d53f6827557230

data/pg_associable/app/javascript/modal_controller.js

@@ -9,6 +9,14 @@ export default class extends Controller {
 
   connect (e) {
     this.modalPuntero = new bootstrap.Modal(this.element)
+    if (this.element.dataset.removeOnHide) {
+      this.element.addEventListener('hidden.bs.modal', (e) => {
+        this.element.remove()
+        window.Stimulus.controllers.map((c) => { return c.calendar })
+          .filter((e) => { return e })
+          .map((c) => { c.refetchEvents() })
+          })
+    }
     this.modalPuntero.show()
     document.addEventListener('turbo:before-cache', () => {
       this.element.remove()

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

@@ -135,6 +135,9 @@ input[type=datetime-local], input[type=datetime] {
 }
 
 // Full calendar
+.fc .fc-highlight {
+	background-color: #{tint-color($primary, 60%)};
+}
 .fc-daygrid-day-top a {
   text-decoration: none;
 }
@@ -143,7 +146,8 @@ input[type=datetime-local], input[type=datetime] {
 }
 .fc-multimonth {
   .fc-daygrid-day-events {
-    display: none;
+    xdisplay: none;
+    visibility: hidden;
   }
   .fc-daygrid-day-top {
     display: inline-block;

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

@@ -89,6 +89,7 @@ module PgEngine
       object = instancia_modelo
       respond_to do |format|
         if (@saved = object.save)
+          # TODO: 'asociable' lo cambiaría por 'in_modal' o algo así
           if params[:asociable]
             format.turbo_stream do
               render turbo_stream:
@@ -96,7 +97,8 @@ module PgEngine
                   <div data-modal-target="response" data-response='#{object.decorate.to_json}'></div>
                 HTML
                 )
-              # rubocop:enable Rails/SkipsModelValidations
+              # FIXME: handlear json
+              # render json: object.decorate, content_type: 'application/json'
             end
           end
           format.html do
@@ -113,10 +115,9 @@ module PgEngine
           # self.instancia_modelo = instancia_modelo.decorate
           if params[:asociable]
             format.turbo_stream do
-              # rubocop:disable Rails/SkipsModelValidations
+              # FIXME: agregar , status: :unprocessable_entity
               render turbo_stream:
                 turbo_stream.update_all('.modal.show .pg-associable-form', partial: 'form', locals: { asociable: true })
-              # rubocop:enable Rails/SkipsModelValidations
             end
           end
           format.html { render :new, status: :unprocessable_entity }
@@ -138,9 +139,14 @@ module PgEngine
     end
 
     def pg_respond_show(object = nil)
-      respond_to do |format|
-        format.json { render json: object || instancia_modelo }
-        format.html
+      object = object || instancia_modelo
+      if params[:modal].present?
+        render turbo_stream: turbo_stream.append_all('body', partial: 'pg_layout/modal_show', locals: { object: })
+      else
+        respond_to do |format|
+          format.json { render json: object }
+          format.html
+        end
       end
     end
 

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

@@ -22,7 +22,6 @@ function bindListingClick () {
         }
       }
     }
-    console.log('click')
   }
 }
 bindListingClick()

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

@@ -0,0 +1,9 @@
+.modal.modal-lg.modal-asociable[tabindex="-1" data-controller="modal" data-remove-on-hide="true"]
+  .modal-dialog
+    .modal-content
+      .modal-header
+        .modal-title
+          h3 Item
+        a.btn-close[type="button" data-bs-dismiss="modal" aria-label="Close"]
+      .modal-body
+        = render object

data/pg_rails/lib/version.rb

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

data/pg_rails/scss/bootstrap_overrides.scss

@@ -7,5 +7,8 @@ $danger-bg-subtle:        tint-color($danger, 98%);
 // $info-border-subtle:      tint-color($info, 60%);
 $warning-border-subtle:   tint-color($warning, 20%);
 // $danger-border-subtle:    tint-color($danger, 60%);
+$secondary-bg-subtle:     tint-color($secondary, 92%);
+$warning-bg-subtle:       tint-color($warning, 40%);
+
 
 $btn-close-focus-shadow: none;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.112
+  version: 7.1.1.pre.1
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -848,6 +848,7 @@ files:
 - pg_layout/app/views/layouts/pg_layout/mailer.html.slim
 - pg_layout/app/views/layouts/pg_layout/mailer.text.erb
 - pg_layout/app/views/pg_layout/_flash.html.slim
+- pg_layout/app/views/pg_layout/_modal_show.html.slim
 - pg_layout/app/views/pg_layout/_navbar.html.erb
 - pg_layout/app/views/pg_layout/_sidebar.html.erb
 - pg_layout/app/views/pg_layout/_sidebar_mobile.html.erb