pg_rails 7.0.8.pre.alpha.111 → 7.0.8.pre.alpha.112

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 633b510e33807a5146da15616442bc144c78a7abd86bd617c2234362745c9251
-  data.tar.gz: a2d2830fedd674a54b8b527d4397c7035cec9be7dbeaf87dd2419a57b3b9103a
+  metadata.gz: 05fcca002b0d29dc6e54d625ebec851eddc239a858ebf6714019000a528e7d35
+  data.tar.gz: 8ce185225473246f30228ccde564466ccff35fb390c87006f3ee8c900a6f005c
 SHA512:
-  metadata.gz: 6f4e654ad40febd8919fc9bac6886242590e6b591d9e412b03043199a37536ce5a11c10ed540fb46c0e26f21efb3f0b77cacbb0bc74b4f79acd90b235b11637a
-  data.tar.gz: 6c91a9c7ff63cee85b00f041f9cbfa953c6ba49eae5eb447f90c2c45f4e43222ba54b2c4425407dab02b72d750b2d5da434861abb07d22f1dee50abfd144f3ee
+  metadata.gz: 93de11640c80585f58c9d5c6b69082efdd5151e9a164097aacf1ce7b1b528e8e4d5d4a873823ae2ec9bdf00fab688839300f5960802447078d1219a5ef454d75
+  data.tar.gz: 6751325594662bd3165fcb81516190e5645fb47295dcb0a465577c6cee2b44adde0fae49196dacf031cae228cc4c8ded14b0ab0bf67e57f62636456f65316953

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

@@ -15,6 +15,20 @@
 }
 
 // FORMS
+
+// Radio buttons
+.radio_buttons legend {
+  font-weight: bold;
+}
+.radio_buttons label {
+  font-weight: normal;
+}
+
+// Trix
+.is-invalid trix-editor {
+  border: 1px solid $red;
+}
+
 input[disabled] {
   background-color: #e9e9ed;
   color: black;
@@ -40,7 +54,7 @@ input[type=datetime-local], input[type=datetime] {
   background-color: #d5d5d5;
 }
 
-.form-control.is-invalid, .form-select.is-invalid {
+.form-control.is-invalid, .form-select.is-invalid, .is-invalid trix-editor {
   background-color: #fff3f3;
 }
 
@@ -50,9 +64,13 @@ input[type=datetime-local], input[type=datetime] {
     padding: 0.25rem 1rem;
   }
 }
+.listado td:has(.btn) {
+  display: flex;
+  justify-content: flex-end;
+  gap: 4px;
+}
 .listado .btn-sm {
   padding: 0em 0.3em;
-  margin-right: 4px;
 }
 
 // FILTROS
@@ -115,3 +133,32 @@ input[type=datetime-local], input[type=datetime] {
 #flash .alert {
   box-shadow: 0px 9px 13px -3px rgba(0, 0, 0, 0.5);
 }
+
+// Full calendar
+.fc-daygrid-day-top a {
+  text-decoration: none;
+}
+.fc-col-header-cell a {
+  text-decoration: none;
+}
+.fc-multimonth {
+  .fc-daygrid-day-events {
+    display: none;
+  }
+  .fc-daygrid-day-top {
+    display: inline-block;
+    height: 100%;
+  }
+  td, th {
+    vertical-align: middle;
+    text-align: center;
+    border: none;
+  }
+  td.fc-day-today {
+    border: 1px solid black;
+  }
+  .fc-daygrid-day-number {
+    cursor: default;
+  }
+  --fc-neutral-bg-color: none;
+}

data/pg_engine/app/controllers/admin/users_controller.rb

@@ -20,6 +20,7 @@ module Admin
 
     def create
       @user.skip_confirmation!
+      @user.user_accounts << UserAccount.new(account: Current.account)
       pg_respond_create
     end
 

data/pg_engine/app/policies/user_policy.rb

@@ -4,13 +4,17 @@
 
 class UserPolicy < ApplicationPolicy
   class Scope < ApplicationPolicy::Scope
-    # def resolve
-    #   if policy.acceso_total?
-    #     scope.all
-    #   else
-    #     scope.none
-    #   end
-    # end
+    def resolve
+      if policy.acceso_total?
+        if Current.account.present?
+          scope.joins(:user_accounts).where('user_accounts.account_id': Current.account.id)
+        else
+          scope.none
+        end
+      else
+        scope.none
+      end
+    end
   end
 
   # def puede_editar?
@@ -25,7 +29,7 @@ class UserPolicy < ApplicationPolicy
   #   acceso_total? && !record.readonly?
   # end
 
-  # def acceso_total?
-  #   user.developer?
-  # end
+  def acceso_total?
+    user.present?
+  end
 end

data/pg_engine/app/views/admin/users/_form.html.slim

@@ -5,6 +5,8 @@ div style="max-width: 22em"
     = f.mensajes_de_error
 
     = hidden_field_tag :asociable, true if asociable
+    = f.input :nombre
+    = f.input :apellido
     = f.input :email
     = f.input :password, required: false, hint: 'Si se deja en blanco no se cambia'
     = f.input :developer

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

@@ -6,3 +6,25 @@ import './tooltips'
 
 import 'trix'
 import '@rails/actiontext'
+
+function bindListingClick () {
+  document.body.onclick = (ev) => {
+    if (ev.target.closest('a')) return
+    if (ev.target.closest('.listado')) {
+      const row = ev.target.closest('tr')
+      if (row) {
+        const show = row.querySelector('.bi-eye-fill')
+        if (show) {
+          const link = show.closest('a')
+          if (link) {
+            link.click()
+          }
+        }
+      }
+    }
+    console.log('click')
+  }
+}
+bindListingClick()
+document.addEventListener('turbo:load', bindListingClick)
+document.addEventListener('turbo:render', bindListingClick)

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

@@ -57,7 +57,8 @@ html
         = render partial: 'pg_layout/navbar' if @navbar.present?
         div
           - if user_signed_in? && breadcrumbs.any?
-            .d-flex.align-items-center.justify-content-between.px-3.py-1.d-print-none[
+            .d-flex.px-3.py-1.d-print-none[
+              class="bg-primary-subtle align-items-center justify-content-between"
               style="min-height: 2.5em;"]
               nav aria-label="breadcrumb"
                 = render_breadcrumbs

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

@@ -14,12 +14,15 @@
       <%= render @notifications_bell %>
     <% end %>
     <%= @navbar.logo if @navbar.logo.present? %>
-    <button class="btn btn-outline-light d-inline-block d-<%= @breakpoint_navbar_expand %>-none"
-            type="button"
-            data-bs-toggle="offcanvas"
-            data-bs-target="#offcanvasExample" aria-controls="offcanvasExample">
-      <i class="bi bi-list"></i>
-    </button>
+    <% unless @sidebar == false %>
+      <button class="btn btn-outline-light d-inline-block
+                     d-<%= @breakpoint_navbar_expand %>-none"
+              type="button"
+              data-bs-toggle="offcanvas"
+              data-bs-target="#offcanvasExample" aria-controls="offcanvasExample">
+        <i class="bi bi-list"></i>
+      </button>
+    <% end %>
   </div>
 </nav>
 <div class="collapse" id="notifications-collapse" data-controller="notifications">

data/pg_rails/lib/version.rb

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

data/pg_rails/scss/pg_rails.scss

@@ -39,3 +39,13 @@ $alert-margin-bottom:           0.5rem;
 @import 'bootstrap-icons/font/bootstrap-icons';
 
 @import 'trix/dist/trix';
+
+$warning-border-emphasis:   shade-color($yellow, 60%);
+.bg-primary-subtle .btn-warning {
+  border: 1px solid $warning-border-emphasis;
+}
+
+.listado tr:has(td:hover):has(.bi-eye-fill) td {
+	background-color: #f2f2f2;
+	cursor: pointer;
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.111
+  version: 7.0.8.pre.alpha.112
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-06 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -556,440 +556,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.2.0
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.20.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.20.0
-- !ruby/object:Gem::Dependency
-  name: letter_opener
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-- !ruby/object:Gem::Dependency
-  name: overcommit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.61.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.61.0
-- !ruby/object:Gem::Dependency
-  name: database_cleaner-active_record
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.1'
-- !ruby/object:Gem::Dependency
-  name: annotate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: web-console
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.1
-- !ruby/object:Gem::Dependency
-  name: stimulus-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-- !ruby/object:Gem::Dependency
-  name: bullet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 7.1.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 7.1.6
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.64'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.64'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.25'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.25'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.21'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.21'
-- !ruby/object:Gem::Dependency
-  name: rubocop-factory_bot
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.26'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.26'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.30'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.30'
-- !ruby/object:Gem::Dependency
-  name: slim_lint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.26.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.26.0
-- !ruby/object:Gem::Dependency
-  name: ruby-lint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-- !ruby/object:Gem::Dependency
-  name: brakeman
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.1'
-- !ruby/object:Gem::Dependency
-  name: bundler-audit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.40.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.40.0
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.17.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.17.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.22.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.22.0
-- !ruby/object:Gem::Dependency
-  name: simplecov-lcov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: undercover
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: spring
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.1.3
-- !ruby/object:Gem::Dependency
-  name: spring-commands-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.4
-- !ruby/object:Gem::Dependency
-  name: factory_bot_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.4.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.4.3
-- !ruby/object:Gem::Dependency
-  name: rails-controller-testing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-- !ruby/object:Gem::Dependency
-  name: faker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.3
 description: Rails goodies.
 email:
 - mrosso10@gmail.com