diff --git a/Gemfile b/Gemfile index 0cd20b5..a7efa22 100644 --- a/Gemfile +++ b/Gemfile @@ -92,28 +92,28 @@ gem "will_paginate" # Listados en páginas # estas ponerse en orden de apilamiento lógico y no alfabético). gem "msip", # Motor generico - git: "https://gitlab.com/pasosdeJesus/msip.git", branch: "main" - #path: "../msip" + git: "https://gitlab.com/pasosdeJesus/msip.git", branch: "v2.2" + #path: "../msip-2.2" gem "mr519_gen", # Motor de gestion de formularios y encuestas - git: "https://gitlab.com/pasosdeJesus/mr519_gen.git", branch: "main" - #path: "../mr519_gen" + git: "https://gitlab.com/pasosdeJesus/mr519_gen.git", branch: "v2.2" + #path: "../mr519_gen-2.2" gem "heb412_gen", # Motor de nube y llenado de plantillas - git: "https://gitlab.com/pasosdeJesus/heb412_gen.git", branch: "main" - #path: "../heb412_gen" + git: "https://gitlab.com/pasosdeJesus/heb412_gen.git", branch: "v2.2" + #path: "../heb412_gen-2.2" gem "sivel2_gen", # Motor para manejo de casos - git: "https://gitlab.com/pasosdeJesus/sivel2_gen.git", branch: "main" - #path: "../sivel2_gen" + git: "https://gitlab.com/pasosdeJesus/sivel2_gen.git", branch: "v2.2" + #path: "../sivel2_gen-2.2" gem "cor1440_gen", - git: "https://gitlab.com/pasosdeJesus/cor1440_gen.git", branch: "main" - #path: "../cor1440_gen" + git: "https://gitlab.com/pasosdeJesus/cor1440_gen.git", branch: "v2.2" + #path: "../cor1440_gen-2.2" gem "jos19", - git: "https://gitlab.com/pasosdeJesus/jos19.git", branch: "main" - #path: "../jos19" + git: "https://gitlab.com/pasosdeJesus/jos19.git", branch: "v2.2" + #path: "../jos19-2.2" group :development, :test do gem "brakeman" diff --git a/Gemfile.lock b/Gemfile.lock index 233a232..9d42ab4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -33,8 +33,8 @@ GIT GIT remote: https://gitlab.com/pasosdeJesus/cor1440_gen.git - revision: d73942a5e1586be251efff6c8cd02b9ec7b85821 - branch: main + revision: e5d9cdb4da1e91496fb5723f746dcce224f4231c + branch: v2.2 specs: cor1440_gen (2.2.0.beta4) devise @@ -46,8 +46,8 @@ GIT GIT remote: https://gitlab.com/pasosdeJesus/heb412_gen.git - revision: efb0a43506f8cf5bc327ace436feaf0c32260d98 - branch: main + revision: 9c6f38132a51415236c2bc8b11615a5a38d31987 + branch: v2.2 specs: heb412_gen (2.2.0.beta4) mr519_gen @@ -57,16 +57,16 @@ GIT GIT remote: https://gitlab.com/pasosdeJesus/jos19.git - revision: 69da8143e2aa516667ff122fab0e1ff585c161bd - branch: main + revision: 85a02662ee4288fe7527095e430b0c5285f014de + branch: v2.2 specs: jos19 (2.2.0.beta4) rails (>= 7.0.4) GIT remote: https://gitlab.com/pasosdeJesus/mr519_gen.git - revision: 257869ab3ba9ff0ec262a63309abac3e333f6769 - branch: main + revision: e3a9946bd7806be25ae2b0a99cab462117822b6c + branch: v2.2 specs: mr519_gen (2.2.0.beta4) msip @@ -74,10 +74,10 @@ GIT GIT remote: https://gitlab.com/pasosdeJesus/msip.git - revision: 7f514eeba4d95a6cb473e9f94e415c416be58679 - branch: main + revision: c1a5a0be21a5a2107d904e1ec4ec30f00ce6ed3b + branch: v2.2 specs: - msip (2.2.0.beta4) + msip (2.2.0.beta5) cancancan (~> 3) devise (~> 4) devise-i18n (~> 1) @@ -94,8 +94,8 @@ GIT GIT remote: https://gitlab.com/pasosdeJesus/sivel2_gen.git - revision: ea666e4e0d49241a222f3f87faa2fd958ca5ca73 - branch: main + revision: 628815e1953f241bf8d8194e3adceeaaf277dc7f + branch: v2.2 specs: sivel2_gen (2.2.0.beta4) color @@ -105,35 +105,35 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.1.3) - actionpack (= 7.1.3) - activesupport (= 7.1.3) + actioncable (7.1.3.2) + actionpack (= 7.1.3.2) + activesupport (= 7.1.3.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.3) - actionpack (= 7.1.3) - activejob (= 7.1.3) - activerecord (= 7.1.3) - activestorage (= 7.1.3) - activesupport (= 7.1.3) + actionmailbox (7.1.3.2) + actionpack (= 7.1.3.2) + activejob (= 7.1.3.2) + activerecord (= 7.1.3.2) + activestorage (= 7.1.3.2) + activesupport (= 7.1.3.2) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.3) - actionpack (= 7.1.3) - actionview (= 7.1.3) - activejob (= 7.1.3) - activesupport (= 7.1.3) + actionmailer (7.1.3.2) + actionpack (= 7.1.3.2) + actionview (= 7.1.3.2) + activejob (= 7.1.3.2) + activesupport (= 7.1.3.2) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.3) - actionview (= 7.1.3) - activesupport (= 7.1.3) + actionpack (7.1.3.2) + actionview (= 7.1.3.2) + activesupport (= 7.1.3.2) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -141,35 +141,35 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.3) - actionpack (= 7.1.3) - activerecord (= 7.1.3) - activestorage (= 7.1.3) - activesupport (= 7.1.3) + actiontext (7.1.3.2) + actionpack (= 7.1.3.2) + activerecord (= 7.1.3.2) + activestorage (= 7.1.3.2) + activesupport (= 7.1.3.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3) - activesupport (= 7.1.3) + actionview (7.1.3.2) + activesupport (= 7.1.3.2) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.3) - activesupport (= 7.1.3) + activejob (7.1.3.2) + activesupport (= 7.1.3.2) globalid (>= 0.3.6) - activemodel (7.1.3) - activesupport (= 7.1.3) - activerecord (7.1.3) - activemodel (= 7.1.3) - activesupport (= 7.1.3) + activemodel (7.1.3.2) + activesupport (= 7.1.3.2) + activerecord (7.1.3.2) + activemodel (= 7.1.3.2) + activesupport (= 7.1.3.2) timeout (>= 0.4.0) - activestorage (7.1.3) - actionpack (= 7.1.3) - activejob (= 7.1.3) - activerecord (= 7.1.3) - activesupport (= 7.1.3) + activestorage (7.1.3.2) + actionpack (= 7.1.3.2) + activejob (= 7.1.3.2) + activerecord (= 7.1.3.2) + activesupport (= 7.1.3.2) marcel (~> 1.0) - activesupport (7.1.3) + activesupport (7.1.3.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -192,7 +192,7 @@ GEM execjs (~> 2.0) base64 (0.2.0) bcrypt (3.1.20) - bigdecimal (3.1.6) + bigdecimal (3.1.7) bindex (0.8.1) bootsnap (1.18.3) msgpack (~> 1.2) @@ -234,7 +234,7 @@ GEM capybara (~> 3.0) ferrum (~> 0.14.0) date (3.3.4) - debug (1.9.1) + debug (1.9.2) irb (~> 1.10) reline (>= 0.3.8) devise (4.9.3) @@ -246,12 +246,11 @@ GEM devise-i18n (1.12.0) devise (>= 4.9.0) docile (1.4.0) - dotenv (3.0.2) - dotenv-rails (3.0.2) - dotenv (= 3.0.2) + dotenv (3.1.0) + dotenv-rails (3.1.0) + dotenv (= 3.1.0) railties (>= 6.1) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) erubi (1.12.0) execjs (2.9.1) ferrum (0.14) @@ -266,10 +265,10 @@ GEM rails (>= 6.0.0) stimulus-rails turbo-rails - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) io-console (0.7.2) - irb (1.11.2) + irb (1.12.0) rdoc reline (>= 0.4.2) jbuilder (2.11.5) @@ -280,7 +279,7 @@ GEM json (2.7.1) kgio (2.11.4) language_server-protocol (3.17.0.3) - libxml-ruby (5.0.2) + libxml-ruby (5.0.3) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -289,14 +288,14 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) matrix (0.4.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0206) + mime-types-data (3.2024.0305) mini_mime (1.1.5) mini_portile2 (2.8.5) - minitest (5.22.2) + minitest (5.22.3) minitest-reporters (1.6.1) ansi builder @@ -311,27 +310,27 @@ GEM net-protocol net-protocol (0.2.2) timeout - net-smtp (0.4.0.1) + net-smtp (0.5.0) net-protocol - nio4r (2.7.0) - nokogiri (1.16.2) + nio4r (2.7.1) + nokogiri (1.16.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.16.2-aarch64-linux) + nokogiri (1.16.3-aarch64-linux) racc (~> 1.4) - nokogiri (1.16.2-arm-linux) + nokogiri (1.16.3-arm-linux) racc (~> 1.4) - nokogiri (1.16.2-arm64-darwin) + nokogiri (1.16.3-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86-linux) + nokogiri (1.16.3-x86-linux) racc (~> 1.4) - nokogiri (1.16.2-x86_64-darwin) + nokogiri (1.16.3-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.16.3-x86_64-linux) racc (~> 1.4) - odf-report (0.7.3) + odf-report (0.8.1) mime-types - nokogiri (>= 1.10.0) + nokogiri (>= 1.12.0) rubyzip (>= 1.3.0) orm_adapter (0.5.0) parallel (1.24.0) @@ -339,11 +338,12 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - pdf-core (0.9.0) - pg (1.5.5) - prawn (2.4.0) - pdf-core (~> 0.9.0) - ttfunk (~> 1.7) + pdf-core (0.10.0) + pg (1.5.6) + prawn (2.5.0) + matrix (~> 0.4) + pdf-core (~> 0.10.0) + ttfunk (~> 1.8) prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) prawnto_2 (0.3.1) @@ -351,10 +351,10 @@ GEM rails (>= 3.2) psych (5.1.2) stringio - public_suffix (5.0.4) + public_suffix (5.0.5) racc (1.7.3) - rack (2.2.8) - rack-cors (2.0.1) + rack (2.2.9) + rack-cors (2.0.2) rack (>= 2.0.0) rack-session (1.0.2) rack (< 3) @@ -363,20 +363,20 @@ GEM rackup (1.0.0) rack (< 3) webrick - rails (7.1.3) - actioncable (= 7.1.3) - actionmailbox (= 7.1.3) - actionmailer (= 7.1.3) - actionpack (= 7.1.3) - actiontext (= 7.1.3) - actionview (= 7.1.3) - activejob (= 7.1.3) - activemodel (= 7.1.3) - activerecord (= 7.1.3) - activestorage (= 7.1.3) - activesupport (= 7.1.3) + rails (7.1.3.2) + actioncable (= 7.1.3.2) + actionmailbox (= 7.1.3.2) + actionmailer (= 7.1.3.2) + actionpack (= 7.1.3.2) + actiontext (= 7.1.3.2) + actionview (= 7.1.3.2) + activejob (= 7.1.3.2) + activemodel (= 7.1.3.2) + activerecord (= 7.1.3.2) + activestorage (= 7.1.3.2) + activesupport (= 7.1.3.2) bundler (>= 1.15.0) - railties (= 7.1.3) + railties (= 7.1.3.2) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -393,12 +393,12 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - rails-i18n (7.0.8) + rails-i18n (7.0.9) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.1.3) - actionpack (= 7.1.3) - activesupport (= 7.1.3) + railties (7.1.3.2) + actionpack (= 7.1.3.2) + activesupport (= 7.1.3.2) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -406,12 +406,12 @@ GEM zeitwerk (~> 2.6) rainbow (3.1.1) raindrops (0.20.1) - rake (13.1.0) - rdoc (6.6.2) + rake (13.2.0) + rdoc (6.6.3.1) psych (>= 4.0.0) redcarpet (3.6.0) regexp_parser (2.9.0) - reline (0.4.2) + reline (0.5.0) io-console (~> 0.5) responders (3.1.1) actionpack (>= 5.2) @@ -420,7 +420,7 @@ GEM rspreadsheet (0.5.3) andand (>= 1.3) rubyzip (>= 1.3) - rubocop (1.60.2) + rubocop (1.62.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -428,25 +428,24 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-minitest (0.34.5) - rubocop (>= 1.39, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.23.1) + rubocop-ast (1.31.2) + parser (>= 3.3.0.4) + rubocop-minitest (0.35.0) + rubocop (>= 1.61, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rails (2.24.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) rubocop-shopify (2.15.1) rubocop (~> 1.51) ruby-graphviz (1.2.5) rexml ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) rubyzip (2.3.2) sassc (2.4.0) ffi (~> 1.9) @@ -478,10 +477,11 @@ GEM stringio (3.1.0) terrapin (1.0.1) climate_control - thor (1.3.0) + thor (1.3.1) tilt (2.3.0) timeout (0.4.1) - ttfunk (1.7.0) + ttfunk (1.8.0) + bigdecimal (~> 3.1) turbo-rails (1.5.0) actionpack (>= 6.0.0) activejob (>= 6.0.0) @@ -590,4 +590,4 @@ DEPENDENCIES will_paginate BUNDLED WITH - 2.5.6 + 2.5.7 diff --git a/app/controllers/sivel2_gen/actos_controller.rb b/app/controllers/sivel2_gen/actos_controller.rb index b2bf3ee..e110876 100644 --- a/app/controllers/sivel2_gen/actos_controller.rb +++ b/app/controllers/sivel2_gen/actos_controller.rb @@ -1,57 +1,25 @@ -#require 'sivel2_gen/concerns/controllers/actos_controller' +require 'sivel2_gen/concerns/controllers/actos_controller' module Sivel2Gen class ActosController < ApplicationController load_and_authorize_resource class: Sivel2Gen::Acto - #include Sivel2Gen::Concerns::Controllers::ActoController - - include ActionView::Helpers::AssetUrlHelper before_action :prepara_caso - # Crea una nueva etiqueta para el caso que recibe por parametro - # params[:caso_id]. Pone valores simples en los campos requeridos - def nueva - if params[:caso_id] - @acto = Sivel2Gen::Acto.new - @acto.caso_id = params[:caso_id] - @acto.etiqueta_id = Msip::Etiqueta.count > 0 ? Msip::Etiqueta.take.id : 0 - @acto.usuario_id = current_usuario.id - @acto.fecha = Date.today - if @acto.save - respond_to do |format| - format.js { render text: @acto.id.to_s } - format.json { render json: @acto.id.to_s, status: :created } - format.html { render inline: @acto.id.to_s } - end - else - respond_to do |format| - format.html { - render inline: "error: #{@acto.errors.messages} " - } - format.json { render json: @acto.errors.messages, - status: :unprocessable_entity } - end - end - else - respond_to do |format| - format.html { render inline: 'Falta identificacion del caso' } - end - end - end # def nueva - - def new - end - def destroy - end + include Sivel2Gen::Concerns::Controllers::ActosController - def create + def pasan_validaciones_create?(merr) + if (params[:caso] && + (!params[:caso][:acto_fecha] || params[:caso][:acto_fecha] == "")) + merr << "Debe tener fecha" + return false + end + return true end - def update + def completar_acto(acto, params) + acto[:fecha] = params[:caso][:acto_fecha] end - private - def prepara_caso @caso = Sivel2Gen::Caso.new( acto: [Sivel2Gen::Acto.new]) diff --git a/app/javascript/application.js b/app/javascript/application.js index f4dce25..2f62201 100644 --- a/app/javascript/application.js +++ b/app/javascript/application.js @@ -3,11 +3,13 @@ console.log('Hola Mundo desde ESM') import Rails from "@rails/ujs"; +if (typeof window.Rails == 'undefined') { + Rails.start(); + window.Rails = Rails; +} import {Turbo} from "@hotwired/turbo-rails"; // no hacer "Turbo.session.drive = false " porque dejan de operar // operaciones con turbo como añadir familiar -Rails.start(); -window.Rails = Rails import './jquery' import '../../vendor/assets/javascripts/jquery-ui.js' diff --git a/app/views/msip/personas/_fila_edad.html.erb b/app/views/msip/personas/_fila_edad.html.erb index 328287b..25b8f6a 100644 --- a/app/views/msip/personas/_fila_edad.html.erb +++ b/app/views/msip/personas/_fila_edad.html.erb @@ -1,21 +1,15 @@
- <% @anios = *(1900..Date.today.year) %> - <%= f.input :anionac, - collection: @anios %> + <%= render partial: "msip/personas/campo_anionac_caso", + locals: { f: f, fvictima: fvictima } %>
- <%= fvictima.input :edad, as: :integer %> + <%= render partial: "msip/personas/campo_edad_caso", + locals: { f: f, fvictima: fvictima } %>
- <%= fvictima.association :rangoedad, - collection: Msip::ModeloHelper.opciones_tabla_basica( - Sivel2Gen::Rangoedad, fvictima, :rangoedad - ), - include_blank: false, - label_method: :nombre, - value_method: :id - %> + <%= render partial: "msip/personas/campo_rangoedad_caso", + locals: { f: f, fvictima: fvictima } %>
diff --git a/app/views/sivel2_gen/actos/create.turbo_stream.erb b/app/views/sivel2_gen/actos/create.turbo_stream.erb deleted file mode 100644 index 5871bdc..0000000 --- a/app/views/sivel2_gen/actos/create.turbo_stream.erb +++ /dev/null @@ -1,17 +0,0 @@ -<%= simple_form_for @caso do |form| %> - <%= form.simple_fields_for :acto, - child_index: params[:index] do |ce_form| %> - <%= turbo_stream.replace "agregar-acto" do %> - <%= form.submit "Agregar Acto", - formaction: main_app.crear_acto_path(ce_form.index.to_i + 1), - formmethod: :post, - formnovalidate: true, - class: 'btn btn-sm btn-primary agregar-ce', - id: "agregar-acto" %> - <% end %> - - <%= turbo_stream.append "actos_marco" do %> - <%= render "/sivel2_gen/casos/acto_con_fecha_campos", f: ce_form %> - <% end %> - <% end %> -<% end %> diff --git a/app/views/sivel2_gen/actos/destroy.html.erb b/app/views/sivel2_gen/actos/destroy.html.erb deleted file mode 100644 index 456581b..0000000 --- a/app/views/sivel2_gen/actos/destroy.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -<%= fields model: @caso do |form| %> - <%= form.simple_fields_for :acto, - child_index: params[:index] do |ce_form| %> - <%= turbo_frame_tag "acto_#{ce_form.index}" do %> - <%= ce_form.hidden_field :id, value: params[:id] %> - <%= ce_form.hidden_field :_destroy, value: true %> - <% end %> - <% end %> -<% end %> diff --git a/app/views/sivel2_gen/casos/_actos.html.erb b/app/views/sivel2_gen/casos/_actos.html.erb index 9bfeff3..3c8b69f 100644 --- a/app/views/sivel2_gen/casos/_actos.html.erb +++ b/app/views/sivel2_gen/casos/_actos.html.erb @@ -1,9 +1,5 @@ -
-
Actos Individuales
- <%= render partial: 'sivel2_gen/casos/actos_con_fecha', locals: {f: f} %> - -
-
+
+<%= render partial: "actos_individuales", locals: {f: f} %> diff --git a/db/migrate/20230330020817_activa_uniciada_ids.rb b/db/migrate/20230330020817_activa_unicidad_ids.rb similarity index 93% rename from db/migrate/20230330020817_activa_uniciada_ids.rb rename to db/migrate/20230330020817_activa_unicidad_ids.rb index 1082338..db6278d 100644 --- a/db/migrate/20230330020817_activa_uniciada_ids.rb +++ b/db/migrate/20230330020817_activa_unicidad_ids.rb @@ -1,4 +1,4 @@ -class ActivaUniciadaIds < ActiveRecord::Migration[7.0] +class ActivaUnicidadIds < ActiveRecord::Migration[7.0] def up execute <<-SQL UPDATE msip_persona SET tdocumento_id=11, numerodocumento=id diff --git a/db/structure.sql b/db/structure.sql index 2ede043..ab996a4 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1584,343 +1584,6 @@ CREATE SEQUENCE public.cargoestado_id_seq ALTER SEQUENCE public.cargoestado_id_seq OWNED BY public.cargoestado.id; --- --- Name: msip_persona_id_seq; Type: SEQUENCE; Schema: public; Owner: - --- - -CREATE SEQUENCE public.msip_persona_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - --- --- Name: msip_persona; Type: TABLE; Schema: public; Owner: - --- - -CREATE TABLE public.msip_persona ( - id integer DEFAULT nextval('public.msip_persona_id_seq'::regclass) NOT NULL, - nombres character varying(100) NOT NULL COLLATE public.es_co_utf_8, - apellidos character varying(100) NOT NULL COLLATE public.es_co_utf_8, - anionac integer, - mesnac integer, - dianac integer, - sexo character(1) DEFAULT 'S'::bpchar NOT NULL, - numerodocumento character varying(100) NOT NULL, - created_at timestamp without time zone, - updated_at timestamp without time zone, - pais_id integer, - nacionalde integer, - tdocumento_id integer NOT NULL, - departamento_id integer, - municipio_id integer, - centropoblado_id integer, - ultimo_departamento_trabajo_id integer, - ultima_regionpago_id integer, - ultimo_correo_trabajo character varying(128), - ultimo_celular_trabajo character varying(128), - ultima_entidad_id integer, - ultimo_cargoestado_id integer, - fecha_desafiliacion_aportante date, - CONSTRAINT persona_check CHECK (((dianac IS NULL) OR (((dianac >= 1) AND (((mesnac = 1) OR (mesnac = 3) OR (mesnac = 5) OR (mesnac = 7) OR (mesnac = 8) OR (mesnac = 10) OR (mesnac = 12)) AND (dianac <= 31))) OR (((mesnac = 4) OR (mesnac = 6) OR (mesnac = 9) OR (mesnac = 11)) AND (dianac <= 30)) OR ((mesnac = 2) AND (dianac <= 29))))), - CONSTRAINT persona_mesnac_check CHECK (((mesnac IS NULL) OR ((mesnac >= 1) AND (mesnac <= 12)))), - CONSTRAINT persona_sexo_check CHECK (((sexo = 'S'::bpchar) OR (sexo = 'F'::bpchar) OR (sexo = 'M'::bpchar))) -); - - --- --- Name: sivel2_gen_caso_id_seq; Type: SEQUENCE; Schema: public; Owner: - --- - -CREATE SEQUENCE public.sivel2_gen_caso_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - --- --- Name: sivel2_gen_caso; Type: TABLE; Schema: public; Owner: - --- - -CREATE TABLE public.sivel2_gen_caso ( - id integer DEFAULT nextval('public.sivel2_gen_caso_id_seq'::regclass) NOT NULL, - titulo character varying(50), - fecha date NOT NULL, - hora character varying(10), - duracion character varying(10), - memo text NOT NULL, - grconfiabilidad character varying(5), - gresclarecimiento character varying(5), - grimpunidad character varying(8), - grinformacion character varying(8), - bienes text, - intervalo_id integer DEFAULT 5, - created_at timestamp without time zone, - updated_at timestamp without time zone, - ubicacion_id integer, - ayudafasol character varying(1024), - codigofasol character varying(32), - marbetefasol character varying(256), - observacionfasol character varying(1024) -); - - --- --- Name: sivel2_gen_victima_id_seq; Type: SEQUENCE; Schema: public; Owner: - --- - -CREATE SEQUENCE public.sivel2_gen_victima_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - --- --- Name: sivel2_gen_victima; Type: TABLE; Schema: public; Owner: - --- - -CREATE TABLE public.sivel2_gen_victima ( - hijos integer, - profesion_id integer DEFAULT 22 NOT NULL, - rangoedad_id integer DEFAULT 6 NOT NULL, - filiacion_id integer DEFAULT 10 NOT NULL, - sectorsocial_id integer DEFAULT 15 NOT NULL, - organizacion_id integer DEFAULT 16 NOT NULL, - vinculoestado_id integer DEFAULT 38 NOT NULL, - caso_id integer NOT NULL, - organizacionarmada integer DEFAULT 35 NOT NULL, - anotaciones character varying(1000), - persona_id integer NOT NULL, - etnia_id integer DEFAULT 1 NOT NULL, - iglesia_id integer DEFAULT 1, - orientacionsexual character(1) DEFAULT 'S'::bpchar NOT NULL, - created_at timestamp without time zone, - updated_at timestamp without time zone, - id integer DEFAULT nextval('public.sivel2_gen_victima_id_seq'::regclass) NOT NULL, - cargoestado_id integer DEFAULT 1, - entidad_id integer, - detallevinculoestado character varying(512), - CONSTRAINT victima_hijos_check CHECK (((hijos IS NULL) OR ((hijos >= 0) AND (hijos <= 100)))), - CONSTRAINT victima_orientacionsexual_check CHECK (((orientacionsexual = 'B'::bpchar) OR (orientacionsexual = 'G'::bpchar) OR (orientacionsexual = 'H'::bpchar) OR (orientacionsexual = 'I'::bpchar) OR (orientacionsexual = 'L'::bpchar) OR (orientacionsexual = 'O'::bpchar) OR (orientacionsexual = 'S'::bpchar) OR (orientacionsexual = 'T'::bpchar))) -); - - --- --- Name: cben1; Type: VIEW; Schema: public; Owner: - --- - -CREATE VIEW public.cben1 AS - SELECT caso.id AS caso_id, - subv.victima_id, - subv.persona_id, - 1 AS npersona, - ((EXTRACT(year FROM caso.fecha) || '-'::text) || lpad((EXTRACT(month FROM caso.fecha))::text, 2, '0'::text)) AS mes - FROM public.sivel2_gen_caso caso, - public.sivel2_gen_victima victima, - ( SELECT sivel2_gen_victima.persona_id, - max(sivel2_gen_victima.id) AS victima_id - FROM public.sivel2_gen_victima - GROUP BY sivel2_gen_victima.persona_id) subv, - public.msip_persona persona - WHERE ((subv.victima_id = victima.id) AND (caso.id = victima.caso_id) AND ((persona.anionac IS NULL) OR (persona.anionac = ANY (ARRAY[1922, 1931, 1933, 1935, 1937, 1938, 1939, 1940, 1941, 1942, 1943, 1944, 1945, 1946, 1947, 1948, 1949, 1950, 1951, 1952, 1953, 1954, 1955, 1956, 1957, 1958, 1959, 1960, 1961, 1962, 1963, 1964, 1965, 1966, 1967, 1968, 1969, 1970, 1971, 1972, 1973, 1974, 1975, 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1993, 2000]))) AND (victima.etnia_id = ANY (ARRAY[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110])) AND (victima.filiacion_id = ANY (ARRAY[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 101])) AND ((((EXTRACT(year FROM caso.fecha))::text || '-'::text) || lpad((EXTRACT(month FROM caso.fecha))::text, 2, '0'::text)) = ANY (ARRAY['1983-04'::text, '1983-09'::text, '1985-04'::text, '1985-06'::text, '1985-07'::text, '1985-08'::text, '1985-11'::text, '1986-10'::text, '1987-08'::text, '1987-10'::text, '1987-11'::text, '1987-12'::text, '1988-02'::text, '1988-05'::text, '1988-09'::text, '1988-11'::text, '1989-01'::text, '1989-03'::text, '1989-04'::text, '1989-05'::text, '1989-06'::text, '1989-07'::text, '1989-08'::text, '1989-10'::text, '1989-11'::text, '1990-01'::text, '1990-04'::text, '1990-05'::text, '1990-06'::text, '1990-07'::text, '1990-08'::text, '1990-10'::text, '1991-01'::text, '1991-04'::text, '1991-09'::text, '1991-10'::text, '1991-11'::text, '1991-12'::text, '1992-01'::text, '1992-02'::text, '1992-03'::text, '1992-04'::text, '1992-05'::text, '1992-06'::text, '1992-07'::text, '1992-09'::text, '1992-10'::text, '1992-11'::text, '1992-12'::text, '1993-01'::text, '1993-02'::text, '1993-03'::text, '1993-04'::text, '1993-07'::text, '1993-09'::text, '1993-11'::text, '1993-12'::text, '1994-01'::text, '1994-03'::text, '1994-04'::text, '1994-05'::text, '1994-06'::text, '1994-07'::text, '1994-09'::text, '1994-10'::text, '1994-11'::text, '1995-01'::text, '1995-05'::text, '1995-06'::text, '1995-07'::text, '1995-08'::text, '1995-09'::text, '1995-10'::text, '1995-11'::text, '1995-12'::text, '1996-02'::text, '1996-03'::text, '1996-04'::text, '1996-05'::text, '1996-06'::text, '1996-07'::text, '1996-08'::text, '1996-09'::text, '1996-10'::text, '1996-12'::text, '1997-01'::text, '1997-02'::text, '1997-03'::text, '1997-04'::text, '1997-05'::text, '1997-06'::text, '1997-07'::text, '1997-08'::text, '1997-09'::text, '1997-10'::text, '1997-11'::text, '1997-12'::text, '1998-01'::text, '1998-02'::text, '1998-03'::text, '1998-04'::text, '1998-05'::text, '1998-06'::text, '1998-07'::text, '1998-08'::text, '1998-09'::text, '1998-10'::text, '1998-11'::text, '1998-12'::text, '1999-01'::text, '1999-02'::text, '1999-03'::text, '1999-04'::text, '1999-05'::text, '1999-06'::text, '1999-07'::text, '1999-08'::text, '1999-09'::text, '1999-10'::text, '1999-11'::text, '1999-12'::text, '2000-01'::text, '2000-02'::text, '2000-03'::text, '2000-04'::text, '2000-05'::text, '2000-06'::text, '2000-07'::text, '2000-08'::text, '2000-09'::text, '2000-11'::text, '2000-12'::text, '2001-01'::text, '2001-02'::text, '2001-03'::text, '2001-04'::text, '2001-05'::text, '2001-06'::text, '2001-07'::text, '2001-08'::text, '2001-09'::text, '2001-10'::text, '2001-11'::text, '2002-01'::text, '2002-02'::text, '2002-03'::text, '2002-04'::text, '2002-05'::text, '2002-06'::text, '2002-07'::text, '2002-08'::text, '2002-09'::text, '2002-10'::text, '2002-11'::text, '2002-12'::text, '2003-01'::text, '2003-02'::text, '2003-03'::text, '2003-04'::text, '2003-05'::text, '2003-06'::text, '2003-07'::text, '2003-08'::text, '2003-10'::text, '2003-11'::text, '2003-12'::text, '2004-01'::text, '2004-02'::text, '2004-03'::text, '2004-04'::text, '2004-05'::text, '2004-06'::text, '2004-07'::text, '2004-09'::text, '2004-10'::text, '2004-11'::text, '2004-12'::text, '2005-01'::text, '2005-02'::text, '2005-03'::text, '2005-04'::text, '2005-05'::text, '2005-06'::text, '2005-07'::text, '2005-08'::text, '2005-09'::text, '2005-10'::text, '2005-11'::text, '2005-12'::text, '2006-01'::text, '2006-02'::text, '2006-03'::text, '2006-04'::text, '2006-05'::text, '2006-06'::text, '2006-07'::text, '2006-08'::text, '2006-09'::text, '2006-10'::text, '2006-11'::text, '2006-12'::text, '2007-01'::text, '2007-02'::text, '2007-03'::text, '2007-04'::text, '2007-05'::text, '2007-06'::text, '2007-07'::text, '2007-08'::text, '2007-09'::text, '2007-10'::text, '2007-11'::text, '2007-12'::text, '2008-01'::text, '2008-02'::text, '2008-03'::text, '2008-04'::text, '2008-05'::text, '2008-07'::text, '2008-08'::text, '2008-09'::text, '2008-10'::text, '2008-11'::text, '2009-01'::text, '2009-02'::text, '2009-03'::text, '2009-04'::text, '2009-05'::text, '2009-06'::text, '2009-07'::text, '2009-08'::text, '2009-10'::text, '2009-11'::text, '2009-12'::text, '2010-01'::text, '2010-02'::text, '2010-03'::text, '2010-04'::text, '2010-06'::text, '2010-07'::text, '2010-08'::text, '2010-09'::text, '2010-10'::text, '2010-11'::text, '2010-12'::text, '2011-01'::text, '2011-02'::text, '2011-03'::text, '2011-04'::text, '2011-05'::text, '2011-06'::text, '2011-07'::text, '2011-08'::text, '2011-09'::text, '2011-10'::text, '2011-11'::text, '2011-12'::text, '2012-01'::text, '2012-02'::text, '2012-03'::text, '2012-04'::text, '2012-05'::text, '2012-06'::text, '2012-07'::text, '2012-08'::text, '2012-09'::text, '2012-11'::text, '2012-12'::text, '2013-01'::text, '2013-02'::text, '2013-04'::text, '2013-05'::text, '2013-06'::text, '2013-07'::text, '2013-08'::text, '2013-09'::text, '2013-10'::text, '2013-11'::text, '2013-12'::text, '2014-01'::text, '2014-02'::text, '2014-03'::text, '2014-04'::text, '2014-05'::text, '2014-06'::text, '2014-07'::text, '2014-08'::text, '2014-12'::text, '2015-01'::text, '2015-02'::text, '2015-04'::text, '2015-05'::text, '2015-06'::text, '2015-07'::text, '2015-09'::text, '2015-10'::text, '2015-11'::text, '2016-05'::text, '2016-09'::text, '2016-11'::text, '2017-01'::text, '2017-03'::text, '2017-08'::text, '2017-11'::text, '2018-04'::text, '2018-05'::text, '2018-06'::text, '2018-07'::text, '2018-09'::text, '2018-10'::text, '2018-11'::text, '2019-03'::text, '2019-05'::text, '2019-11'::text, '2019-12'::text, '2020-02'::text, '2020-05'::text, '2020-10'::text, '2021-01'::text, '2021-03'::text, '2021-09'::text, '2022-03'::text, '2022-05'::text, '2022-06'::text, '2022-07'::text, '2022-12'::text, '2023-05'::text])) AND (victima.organizacion_id = ANY (ARRAY[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 101])) AND (victima.profesion_id = ANY (ARRAY[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 101, 102])) AND (victima.rangoedad_id = ANY (ARRAY[1, 2, 3, 4, 5, 6])) AND (victima.sectorsocial_id = ANY (ARRAY[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16])) AND (persona.sexo = ANY (ARRAY['F'::bpchar, 'M'::bpchar, 'S'::bpchar])) AND (persona.id = victima.persona_id)); - - --- --- Name: msip_centropoblado_id_seq; Type: SEQUENCE; Schema: public; Owner: - --- - -CREATE SEQUENCE public.msip_centropoblado_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - --- --- Name: msip_centropoblado; Type: TABLE; Schema: public; Owner: - --- - -CREATE TABLE public.msip_centropoblado ( - cplocal_cod integer, - tcentropoblado_id character varying(10) DEFAULT 'CP'::character varying NOT NULL, - nombre character varying(500) COLLATE public.es_co_utf_8, - fechacreacion date DEFAULT '2001-01-01'::date NOT NULL, - fechadeshabilitacion date, - latitud double precision, - longitud double precision, - created_at timestamp without time zone, - updated_at timestamp without time zone, - municipio_id integer, - id integer DEFAULT nextval('public.msip_centropoblado_id_seq'::regclass) NOT NULL, - observaciones character varying(5000) COLLATE public.es_co_utf_8, - ultvigenciaini date, - ultvigenciafin date, - svgruta character varying, - svgcdx integer, - svgcdy integer, - svgcdancho integer, - svgcdalto integer, - svgrotx double precision, - svgroty double precision, - CONSTRAINT msip_centropoblado_check CHECK (((fechadeshabilitacion IS NULL) OR (fechadeshabilitacion >= fechacreacion))) -); - - --- --- Name: msip_departamento_id_seq; Type: SEQUENCE; Schema: public; Owner: - --- - -CREATE SEQUENCE public.msip_departamento_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - --- --- Name: msip_departamento; Type: TABLE; Schema: public; Owner: - --- - -CREATE TABLE public.msip_departamento ( - deplocal_cod integer, - nombre character varying(500) COLLATE public.es_co_utf_8, - fechacreacion date DEFAULT CURRENT_DATE NOT NULL, - fechadeshabilitacion date, - latitud double precision, - longitud double precision, - created_at timestamp without time zone, - updated_at timestamp without time zone, - pais_id integer NOT NULL, - id integer DEFAULT nextval('public.msip_departamento_id_seq'::regclass) NOT NULL, - observaciones character varying(5000) COLLATE public.es_co_utf_8, - codiso character varying(6), - catiso character varying(64), - codreg integer, - ultvigenciaini date, - ultvigenciafin date, - svgruta character varying, - svgcdx integer, - svgcdy integer, - svgcdancho integer, - svgcdalto integer, - svgrotx double precision, - svgroty double precision, - CONSTRAINT departamento_check CHECK (((fechadeshabilitacion IS NULL) OR (fechadeshabilitacion >= fechacreacion))) -); - - --- --- Name: msip_municipio_id_seq; Type: SEQUENCE; Schema: public; Owner: - --- - -CREATE SEQUENCE public.msip_municipio_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - --- --- Name: msip_municipio; Type: TABLE; Schema: public; Owner: - --- - -CREATE TABLE public.msip_municipio ( - munlocal_cod integer, - nombre character varying(500) COLLATE public.es_co_utf_8, - fechacreacion date DEFAULT CURRENT_DATE NOT NULL, - fechadeshabilitacion date, - latitud double precision, - longitud double precision, - created_at timestamp without time zone, - updated_at timestamp without time zone, - departamento_id integer, - id integer DEFAULT nextval('public.msip_municipio_id_seq'::regclass) NOT NULL, - observaciones character varying(5000) COLLATE public.es_co_utf_8, - codreg integer, - ultvigenciaini date, - ultvigenciafin date, - tipomun character varying(32), - svgruta character varying, - svgcdx integer, - svgcdy integer, - svgcdancho integer, - svgcdalto integer, - svgrotx double precision, - svgroty double precision, - CONSTRAINT municipio_check CHECK (((fechadeshabilitacion IS NULL) OR (fechadeshabilitacion >= fechacreacion))) -); - - --- --- Name: msip_ubicacion_id_seq; Type: SEQUENCE; Schema: public; Owner: - --- - -CREATE SEQUENCE public.msip_ubicacion_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - --- --- Name: msip_ubicacion; Type: TABLE; Schema: public; Owner: - --- - -CREATE TABLE public.msip_ubicacion ( - id integer DEFAULT nextval('public.msip_ubicacion_id_seq'::regclass) NOT NULL, - tsitio_id integer DEFAULT 1 NOT NULL, - caso_id integer NOT NULL, - latitud double precision, - longitud double precision, - sitio character varying(500) COLLATE public.es_co_utf_8, - lugar character varying(500) COLLATE public.es_co_utf_8, - created_at timestamp without time zone, - updated_at timestamp without time zone, - pais_id integer, - departamento_id integer, - municipio_id integer, - centropoblado_id integer -); - - --- --- Name: cben2; Type: VIEW; Schema: public; Owner: - --- - -CREATE VIEW public.cben2 AS - SELECT cben1.caso_id, - cben1.victima_id, - cben1.persona_id, - cben1.npersona, - cben1.mes, - ubicacion.departamento_id, - departamento.deplocal_cod AS departamento_divipola, - departamento.nombre AS departamento_nombre, - ubicacion.municipio_id, - ((departamento.deplocal_cod * 1000) + municipio.munlocal_cod) AS municipio_divipola, - municipio.nombre AS municipio_nombre, - ubicacion.centropoblado_id, - centropoblado.cplocal_cod AS centropoblado_divipola, - centropoblado.nombre AS centropoblado_nombre - FROM (((((public.cben1 - JOIN public.sivel2_gen_caso caso ON ((cben1.caso_id = caso.id))) - LEFT JOIN public.msip_ubicacion ubicacion ON ((caso.ubicacion_id = ubicacion.id))) - LEFT JOIN public.msip_departamento departamento ON ((ubicacion.departamento_id = departamento.id))) - LEFT JOIN public.msip_municipio municipio ON ((ubicacion.municipio_id = municipio.id))) - LEFT JOIN public.msip_centropoblado centropoblado ON ((ubicacion.centropoblado_id = centropoblado.id))) - GROUP BY cben1.caso_id, cben1.victima_id, cben1.persona_id, cben1.npersona, cben1.mes, ubicacion.departamento_id, departamento.deplocal_cod, departamento.nombre, ubicacion.municipio_id, ((departamento.deplocal_cod * 1000) + municipio.munlocal_cod), municipio.nombre, ubicacion.centropoblado_id, centropoblado.cplocal_cod, centropoblado.nombre; - - -- -- Name: msip_grupoper_id_seq; Type: SEQUENCE; Schema: public; Owner: - -- @@ -1969,6 +1632,53 @@ CREATE TABLE public.msip_orgsocial ( ); +-- +-- Name: msip_persona_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.msip_persona_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: msip_persona; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.msip_persona ( + id integer DEFAULT nextval('public.msip_persona_id_seq'::regclass) NOT NULL, + nombres character varying(100) NOT NULL COLLATE public.es_co_utf_8, + apellidos character varying(100) NOT NULL COLLATE public.es_co_utf_8, + anionac integer, + mesnac integer, + dianac integer, + sexo character(1) DEFAULT 'S'::bpchar NOT NULL, + numerodocumento character varying(100) NOT NULL, + created_at timestamp without time zone, + updated_at timestamp without time zone, + pais_id integer, + nacionalde integer, + tdocumento_id integer NOT NULL, + departamento_id integer, + municipio_id integer, + centropoblado_id integer, + ultimo_departamento_trabajo_id integer, + ultima_regionpago_id integer, + ultimo_correo_trabajo character varying(128), + ultimo_celular_trabajo character varying(128), + ultima_entidad_id integer, + ultimo_cargoestado_id integer, + fecha_desafiliacion_aportante date, + etnia_id integer DEFAULT 1 NOT NULL, + CONSTRAINT persona_check CHECK (((dianac IS NULL) OR (((dianac >= 1) AND (((mesnac = 1) OR (mesnac = 3) OR (mesnac = 5) OR (mesnac = 7) OR (mesnac = 8) OR (mesnac = 10) OR (mesnac = 12)) AND (dianac <= 31))) OR (((mesnac = 4) OR (mesnac = 6) OR (mesnac = 9) OR (mesnac = 11)) AND (dianac <= 30)) OR ((mesnac = 2) AND (dianac <= 29))))), + CONSTRAINT persona_mesnac_check CHECK (((mesnac IS NULL) OR ((mesnac >= 1) AND (mesnac <= 12)))), + CONSTRAINT persona_sexo_check CHECK (((sexo = 'S'::bpchar) OR (sexo = 'F'::bpchar) OR (sexo = 'M'::bpchar))) +); + + -- -- Name: msip_tdocumento; Type: TABLE; Schema: public; Owner: - -- @@ -3759,10 +3469,115 @@ ALTER SEQUENCE public.cor1440_gen_valorcampotind_id_seq OWNED BY public.cor1440_ -- --- Name: sivel2_gen_acto_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- Name: msip_departamento_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.msip_departamento_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: msip_departamento; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.msip_departamento ( + deplocal_cod integer, + nombre character varying(500) COLLATE public.es_co_utf_8, + fechacreacion date DEFAULT CURRENT_DATE NOT NULL, + fechadeshabilitacion date, + latitud double precision, + longitud double precision, + created_at timestamp without time zone, + updated_at timestamp without time zone, + pais_id integer NOT NULL, + id integer DEFAULT nextval('public.msip_departamento_id_seq'::regclass) NOT NULL, + observaciones character varying(5000) COLLATE public.es_co_utf_8, + codiso character varying(6), + catiso character varying(64), + codreg integer, + ultvigenciaini date, + ultvigenciafin date, + svgruta character varying, + svgcdx integer, + svgcdy integer, + svgcdancho integer, + svgcdalto integer, + svgrotx double precision, + svgroty double precision, + CONSTRAINT departamento_check CHECK (((fechadeshabilitacion IS NULL) OR (fechadeshabilitacion >= fechacreacion))) +); + + +-- +-- Name: msip_ubicacion_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.msip_ubicacion_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: msip_ubicacion; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.msip_ubicacion ( + id integer DEFAULT nextval('public.msip_ubicacion_id_seq'::regclass) NOT NULL, + tsitio_id integer DEFAULT 1 NOT NULL, + caso_id integer NOT NULL, + latitud double precision, + longitud double precision, + sitio character varying(500) COLLATE public.es_co_utf_8, + lugar character varying(500) COLLATE public.es_co_utf_8, + created_at timestamp without time zone, + updated_at timestamp without time zone, + pais_id integer, + departamento_id integer, + municipio_id integer, + centropoblado_id integer +); + + +-- +-- Name: sivel2_gen_acto_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.sivel2_gen_acto_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: sivel2_gen_acto; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.sivel2_gen_acto ( + presponsable_id integer NOT NULL, + categoria_id integer NOT NULL, + persona_id integer NOT NULL, + caso_id integer NOT NULL, + created_at timestamp without time zone, + updated_at timestamp without time zone, + id integer DEFAULT nextval('public.sivel2_gen_acto_id_seq'::regclass) NOT NULL, + fecha date NOT NULL +); + + +-- +-- Name: sivel2_gen_caso_id_seq; Type: SEQUENCE; Schema: public; Owner: - -- -CREATE SEQUENCE public.sivel2_gen_acto_id_seq +CREATE SEQUENCE public.sivel2_gen_caso_id_seq START WITH 1 INCREMENT BY 1 NO MINVALUE @@ -3771,18 +3586,29 @@ CREATE SEQUENCE public.sivel2_gen_acto_id_seq -- --- Name: sivel2_gen_acto; Type: TABLE; Schema: public; Owner: - +-- Name: sivel2_gen_caso; Type: TABLE; Schema: public; Owner: - -- -CREATE TABLE public.sivel2_gen_acto ( - presponsable_id integer NOT NULL, - categoria_id integer NOT NULL, - persona_id integer NOT NULL, - caso_id integer NOT NULL, +CREATE TABLE public.sivel2_gen_caso ( + id integer DEFAULT nextval('public.sivel2_gen_caso_id_seq'::regclass) NOT NULL, + titulo character varying(50), + fecha date NOT NULL, + hora character varying(10), + duracion character varying(10), + memo text NOT NULL, + grconfiabilidad character varying(5), + gresclarecimiento character varying(5), + grimpunidad character varying(8), + grinformacion character varying(8), + bienes text, + intervalo_id integer DEFAULT 5, created_at timestamp without time zone, updated_at timestamp without time zone, - id integer DEFAULT nextval('public.sivel2_gen_acto_id_seq'::regclass) NOT NULL, - fecha date NOT NULL + ubicacion_id integer, + ayudafasol character varying(1024), + codigofasol character varying(32), + marbetefasol character varying(256), + observacionfasol character varying(1024) ); @@ -3837,6 +3663,47 @@ CREATE TABLE public.sivel2_gen_supracategoria ( ); +-- +-- Name: sivel2_gen_victima_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.sivel2_gen_victima_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: sivel2_gen_victima; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.sivel2_gen_victima ( + hijos integer, + profesion_id integer DEFAULT 22 NOT NULL, + rangoedad_id integer DEFAULT 6 NOT NULL, + filiacion_id integer DEFAULT 10 NOT NULL, + sectorsocial_id integer DEFAULT 15 NOT NULL, + organizacion_id integer DEFAULT 16 NOT NULL, + vinculoestado_id integer DEFAULT 38 NOT NULL, + caso_id integer NOT NULL, + organizacionarmada integer DEFAULT 35 NOT NULL, + anotaciones character varying(1000), + persona_id integer NOT NULL, + iglesia_id integer DEFAULT 1, + orientacionsexual character(1) DEFAULT 'S'::bpchar NOT NULL, + created_at timestamp without time zone, + updated_at timestamp without time zone, + id integer DEFAULT nextval('public.sivel2_gen_victima_id_seq'::regclass) NOT NULL, + cargoestado_id integer DEFAULT 1, + entidad_id integer, + detallevinculoestado character varying(512), + CONSTRAINT victima_hijos_check CHECK (((hijos IS NULL) OR ((hijos >= 0) AND (hijos <= 100)))), + CONSTRAINT victima_orientacionsexual_check CHECK (((orientacionsexual = 'B'::bpchar) OR (orientacionsexual = 'G'::bpchar) OR (orientacionsexual = 'H'::bpchar) OR (orientacionsexual = 'I'::bpchar) OR (orientacionsexual = 'L'::bpchar) OR (orientacionsexual = 'O'::bpchar) OR (orientacionsexual = 'S'::bpchar) OR (orientacionsexual = 'T'::bpchar))) +); + + -- -- Name: cvt1; Type: VIEW; Schema: public; Owner: - -- @@ -4517,6 +4384,48 @@ CREATE SEQUENCE public.msip_bitacora_id_seq ALTER SEQUENCE public.msip_bitacora_id_seq OWNED BY public.msip_bitacora.id; +-- +-- Name: msip_centropoblado_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.msip_centropoblado_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: msip_centropoblado; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.msip_centropoblado ( + cplocal_cod integer, + tcentropoblado_id character varying(10) DEFAULT 'CP'::character varying NOT NULL, + nombre character varying(500) COLLATE public.es_co_utf_8, + fechacreacion date DEFAULT '2001-01-01'::date NOT NULL, + fechadeshabilitacion date, + latitud double precision, + longitud double precision, + created_at timestamp without time zone, + updated_at timestamp without time zone, + municipio_id integer, + id integer DEFAULT nextval('public.msip_centropoblado_id_seq'::regclass) NOT NULL, + observaciones character varying(5000) COLLATE public.es_co_utf_8, + ultvigenciaini date, + ultvigenciafin date, + svgruta character varying, + svgcdx integer, + svgcdy integer, + svgcdancho integer, + svgcdalto integer, + svgrotx double precision, + svgroty double precision, + CONSTRAINT msip_centropoblado_check CHECK (((fechadeshabilitacion IS NULL) OR (fechadeshabilitacion >= fechacreacion))) +); + + -- -- Name: msip_centropoblado_histvigencia; Type: TABLE; Schema: public; Owner: - -- @@ -4696,6 +4605,42 @@ CREATE SEQUENCE public.msip_etiqueta_persona_id_seq ALTER SEQUENCE public.msip_etiqueta_persona_id_seq OWNED BY public.msip_etiqueta_persona.id; +-- +-- Name: msip_etnia; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.msip_etnia ( + id bigint NOT NULL, + nombre character varying(500) NOT NULL COLLATE public.es_co_utf_8, + descripcion character varying(1000), + observaciones character varying(5000), + fechacreacion date NOT NULL, + fechadeshabilitacion date, + created_at timestamp(6) without time zone NOT NULL, + updated_at timestamp(6) without time zone NOT NULL, + CONSTRAINT etnia_check CHECK (((fechadeshabilitacion IS NULL) OR (fechadeshabilitacion >= fechacreacion))) +); + + +-- +-- Name: msip_etnia_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.msip_etnia_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: msip_etnia_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE public.msip_etnia_id_seq OWNED BY public.msip_etnia.id; + + -- -- Name: msip_fuenteprensa_id_seq; Type: SEQUENCE; Schema: public; Owner: - -- @@ -4803,6 +4748,49 @@ CREATE SEQUENCE public.msip_homonimo_id_seq ALTER SEQUENCE public.msip_homonimo_id_seq OWNED BY public.msip_homonimo.id; +-- +-- Name: msip_municipio_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.msip_municipio_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: msip_municipio; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.msip_municipio ( + munlocal_cod integer, + nombre character varying(500) COLLATE public.es_co_utf_8, + fechacreacion date DEFAULT CURRENT_DATE NOT NULL, + fechadeshabilitacion date, + latitud double precision, + longitud double precision, + created_at timestamp without time zone, + updated_at timestamp without time zone, + departamento_id integer, + id integer DEFAULT nextval('public.msip_municipio_id_seq'::regclass) NOT NULL, + observaciones character varying(5000) COLLATE public.es_co_utf_8, + codreg integer, + ultvigenciaini date, + ultvigenciafin date, + tipomun character varying(32), + svgruta character varying, + svgcdx integer, + svgcdy integer, + svgcdancho integer, + svgcdalto integer, + svgrotx double precision, + svgroty double precision, + CONSTRAINT municipio_check CHECK (((fechadeshabilitacion IS NULL) OR (fechadeshabilitacion >= fechacreacion))) +); + + -- -- Name: msip_mundep_sinorden; Type: VIEW; Schema: public; Owner: - -- @@ -6255,30 +6243,13 @@ CREATE SEQUENCE public.sivel2_gen_etnia_id_seq CACHE 1; --- --- Name: sivel2_gen_etnia; Type: TABLE; Schema: public; Owner: - --- - -CREATE TABLE public.sivel2_gen_etnia ( - id integer DEFAULT nextval('public.sivel2_gen_etnia_id_seq'::regclass) NOT NULL, - nombre character varying(500) NOT NULL COLLATE public.es_co_utf_8, - descripcion character varying(1000), - fechacreacion date NOT NULL, - fechadeshabilitacion date, - created_at timestamp without time zone, - updated_at timestamp without time zone, - observaciones character varying(5000), - CONSTRAINT etnia_check CHECK (((fechadeshabilitacion IS NULL) OR (fechadeshabilitacion >= fechacreacion))) -); - - -- -- Name: sivel2_gen_etnia_victimacolectiva; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE public.sivel2_gen_etnia_victimacolectiva ( - etnia_id integer NOT NULL, - victimacolectiva_id integer NOT NULL + victimacolectiva_id integer NOT NULL, + etnia_id integer DEFAULT 1 NOT NULL ); @@ -7479,6 +7450,13 @@ ALTER TABLE ONLY public.msip_estadosol ALTER COLUMN id SET DEFAULT nextval('publ ALTER TABLE ONLY public.msip_etiqueta_persona ALTER COLUMN id SET DEFAULT nextval('public.msip_etiqueta_persona_id_seq'::regclass); +-- +-- Name: msip_etnia id; Type: DEFAULT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.msip_etnia ALTER COLUMN id SET DEFAULT nextval('public.msip_etnia_id_seq'::regclass); + + -- -- Name: msip_grupo id; Type: DEFAULT; Schema: public; Owner: - -- @@ -8493,6 +8471,14 @@ ALTER TABLE ONLY public.msip_etiqueta ADD CONSTRAINT msip_etiqueta_pkey PRIMARY KEY (id); +-- +-- Name: msip_etnia msip_etnia_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.msip_etnia + ADD CONSTRAINT msip_etnia_pkey PRIMARY KEY (id); + + -- -- Name: msip_fuenteprensa msip_fuenteprensa_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -9021,14 +9007,6 @@ ALTER TABLE ONLY public.sivel2_gen_estadocivil ADD CONSTRAINT sivel2_gen_estadocivil_pkey PRIMARY KEY (id); --- --- Name: sivel2_gen_etnia sivel2_gen_etnia_pkey; Type: CONSTRAINT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.sivel2_gen_etnia - ADD CONSTRAINT sivel2_gen_etnia_pkey PRIMARY KEY (id); - - -- -- Name: sivel2_gen_etnia_victimacolectiva sivel2_gen_etnia_victimacolectiva_pkey1; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -9468,6 +9446,13 @@ CREATE INDEX index_msip_orgsocial_on_grupoper_id ON public.msip_orgsocial USING CREATE INDEX index_msip_orgsocial_on_pais_id ON public.msip_orgsocial USING btree (pais_id); +-- +-- Name: index_msip_persona_on_etnia_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_msip_persona_on_etnia_id ON public.msip_persona USING btree (etnia_id); + + -- -- Name: index_msip_solicitud_usuarionotificar_on_solicitud_id; Type: INDEX; Schema: public; Owner: - -- @@ -9825,13 +9810,6 @@ CREATE INDEX sivel2_gen_obs_fildep_u_idx ON public.sivel2_gen_observador_filtrod CREATE INDEX sivel2_gen_victima_id_caso ON public.sivel2_gen_victima USING btree (caso_id); --- --- Name: sivel2_gen_victima_id_etnia; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX sivel2_gen_victima_id_etnia ON public.sivel2_gen_victima USING btree (etnia_id); - - -- -- Name: sivel2_gen_victima_id_filiacion; Type: INDEX; Schema: public; Owner: - -- @@ -10432,14 +10410,6 @@ ALTER TABLE ONLY public.sivel2_gen_caso_etiqueta ADD CONSTRAINT etiquetacaso_id_etiqueta_fkey FOREIGN KEY (etiqueta_id) REFERENCES public.msip_etiqueta(id); --- --- Name: sivel2_gen_etnia_victimacolectiva etnia_victimacolectiva_etnia_id_fkey1; Type: FK CONSTRAINT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.sivel2_gen_etnia_victimacolectiva - ADD CONSTRAINT etnia_victimacolectiva_etnia_id_fkey1 FOREIGN KEY (etnia_id) REFERENCES public.sivel2_gen_etnia(id); - - -- -- Name: sivel2_gen_etnia_victimacolectiva etnia_victimacolectiva_victimacolectiva_id_fkey1; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -10952,6 +10922,14 @@ ALTER TABLE ONLY public.cor1440_gen_valorcampotind ADD CONSTRAINT fk_rails_4f2fc96457 FOREIGN KEY (campotind_id) REFERENCES public.cor1440_gen_campotind(id); +-- +-- Name: sivel2_gen_etnia_victimacolectiva fk_rails_4fafec807e; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.sivel2_gen_etnia_victimacolectiva + ADD CONSTRAINT fk_rails_4fafec807e FOREIGN KEY (etnia_id) REFERENCES public.msip_etnia(id); + + -- -- Name: cor1440_gen_caracterizacionpf fk_rails_4fcf0ffb4f; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -11728,6 +11706,14 @@ ALTER TABLE ONLY public.cor1440_gen_plantillahcm_proyectofinanciero ADD CONSTRAINT fk_rails_d56d245f70 FOREIGN KEY (proyectofinanciero_id) REFERENCES public.cor1440_gen_proyectofinanciero(id); +-- +-- Name: msip_persona fk_rails_d5b92f1c45; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.msip_persona + ADD CONSTRAINT fk_rails_d5b92f1c45 FOREIGN KEY (etnia_id) REFERENCES public.msip_etnia(id); + + -- -- Name: cor1440_gen_actividad_orgsocial fk_rails_da8fc6a5af; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -12392,14 +12378,6 @@ ALTER TABLE ONLY public.sivel2_gen_victima ADD CONSTRAINT victima_id_caso_fkey FOREIGN KEY (caso_id) REFERENCES public.sivel2_gen_caso(id); --- --- Name: sivel2_gen_victima victima_id_etnia_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.sivel2_gen_victima - ADD CONSTRAINT victima_id_etnia_fkey FOREIGN KEY (etnia_id) REFERENCES public.sivel2_gen_etnia(id); - - -- -- Name: sivel2_gen_victima victima_id_filiacion_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -12495,6 +12473,16 @@ ALTER TABLE ONLY public.sivel2_gen_victimacolectiva_vinculoestado SET search_path TO "$user", public; INSERT INTO "schema_migrations" (version) VALUES +('20240319141612'), +('20240312182320'), +('20240305165644'), +('20240221015729'), +('20240221002426'), +('20240220233356'), +('20240220164637'), +('20240220111410'), +('20240219221519'), +('20240219220944'), ('20231208203424'), ('20231208162022'), ('20231205205600'), diff --git a/yarn.lock b/yarn.lock index 1757df5..890dc35 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3,55 +3,55 @@ "@ampproject/remapping@^2.2.0": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" - integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg== + version "2.3.0" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4" + integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw== dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.24" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" - integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.1", "@babel/code-frame@^7.24.2": + version "7.24.2" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae" + integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ== dependencies: - "@babel/highlight" "^7.23.4" - chalk "^2.4.2" + "@babel/highlight" "^7.24.2" + picocolors "^1.0.0" "@babel/compat-data@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98" - integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.1.tgz#31c1f66435f2a9c329bb5716a6d6186c516c3742" + integrity sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA== "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.2", "@babel/core@^7.8.0": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.9.tgz#b028820718000f267870822fec434820e9b1e4d1" - integrity sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw== + version "7.24.3" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.3.tgz#568864247ea10fbd4eff04dda1e05f9e2ea985c3" + integrity sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ== dependencies: "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.23.5" - "@babel/generator" "^7.23.6" + "@babel/code-frame" "^7.24.2" + "@babel/generator" "^7.24.1" "@babel/helper-compilation-targets" "^7.23.6" "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.23.9" - "@babel/parser" "^7.23.9" - "@babel/template" "^7.23.9" - "@babel/traverse" "^7.23.9" - "@babel/types" "^7.23.9" + "@babel/helpers" "^7.24.1" + "@babel/parser" "^7.24.1" + "@babel/template" "^7.24.0" + "@babel/traverse" "^7.24.1" + "@babel/types" "^7.24.0" convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.3" semver "^6.3.1" -"@babel/generator@^7.23.6", "@babel/generator@^7.7.2": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e" - integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw== +"@babel/generator@^7.24.1", "@babel/generator@^7.7.2": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.1.tgz#e67e06f68568a4ebf194d1c6014235344f0476d0" + integrity sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A== dependencies: - "@babel/types" "^7.23.6" - "@jridgewell/gen-mapping" "^0.3.2" - "@jridgewell/trace-mapping" "^0.3.17" + "@babel/types" "^7.24.0" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" "@babel/helper-annotate-as-pure@^7.22.5": @@ -93,11 +93,11 @@ "@babel/types" "^7.22.5" "@babel/helper-module-imports@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0" - integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w== + version "7.24.3" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz#6ac476e6d168c7c23ff3ba3cf4f7841d46ac8128" + integrity sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg== dependencies: - "@babel/types" "^7.22.15" + "@babel/types" "^7.24.0" "@babel/helper-module-transforms@^7.23.3": version "7.23.3" @@ -110,10 +110,10 @@ "@babel/helper-split-export-declaration" "^7.22.6" "@babel/helper-validator-identifier" "^7.22.20" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" - integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.8.0": + version "7.24.0" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a" + integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w== "@babel/helper-simple-access@^7.22.5": version "7.22.5" @@ -130,42 +130,43 @@ "@babel/types" "^7.22.5" "@babel/helper-string-parser@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" - integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e" + integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ== "@babel/helper-validator-identifier@^7.22.20": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== -"@babel/helper-validator-option@^7.22.15", "@babel/helper-validator-option@^7.23.5": +"@babel/helper-validator-option@^7.23.5": version "7.23.5" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307" integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw== -"@babel/helpers@^7.23.9": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.9.tgz#c3e20bbe7f7a7e10cb9b178384b4affdf5995c7d" - integrity sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ== +"@babel/helpers@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.1.tgz#183e44714b9eba36c3038e442516587b1e0a1a94" + integrity sha512-BpU09QqEe6ZCHuIHFphEFgvNSrubve1FtyMton26ekZ85gRGi6LrTF7zArARp2YvyFxloeiRmtSCq5sjh1WqIg== dependencies: - "@babel/template" "^7.23.9" - "@babel/traverse" "^7.23.9" - "@babel/types" "^7.23.9" + "@babel/template" "^7.24.0" + "@babel/traverse" "^7.24.1" + "@babel/types" "^7.24.0" -"@babel/highlight@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b" - integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A== +"@babel/highlight@^7.24.2": + version "7.24.2" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.2.tgz#3f539503efc83d3c59080a10e6634306e0370d26" + integrity sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA== dependencies: "@babel/helper-validator-identifier" "^7.22.20" chalk "^2.4.2" js-tokens "^4.0.0" + picocolors "^1.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.9.tgz#7b903b6149b0f8fa7ad564af646c4c38a77fc44b" - integrity sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.24.0", "@babel/parser@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.1.tgz#1e416d3627393fab1cb5b0f2f1796a100ae9133a" + integrity sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -203,11 +204,11 @@ "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-jsx@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473" - integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz#3f6ca04b8c841811dbc3c5c5f837934e0d626c10" + integrity sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" @@ -259,18 +260,18 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.7.2": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz#24f460c85dbbc983cd2b9c4994178bcc01df958f" - integrity sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz#b3bcc51f396d15f3591683f90239de143c076844" + integrity sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" -"@babel/plugin-transform-react-display-name@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.23.3.tgz#70529f034dd1e561045ad3c8152a267f0d7b6200" - integrity sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw== +"@babel/plugin-transform-react-display-name@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.1.tgz#554e3e1a25d181f040cf698b93fd289a03bfdcdb" + integrity sha512-mvoQg2f9p2qlpDQRBC7M3c3XTr0k7cp/0+kFKKO/7Gtu0LSw16eKB+Fabe2bDT/UpsyasTBBkAnbdsLrkD5XMw== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-react-jsx-development@^7.22.5": version "7.22.5" @@ -279,7 +280,7 @@ dependencies: "@babel/plugin-transform-react-jsx" "^7.22.5" -"@babel/plugin-transform-react-jsx@^7.22.15", "@babel/plugin-transform-react-jsx@^7.22.5": +"@babel/plugin-transform-react-jsx@^7.22.5", "@babel/plugin-transform-react-jsx@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz#393f99185110cea87184ea47bcb4a7b0c2e39312" integrity sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA== @@ -290,62 +291,62 @@ "@babel/plugin-syntax-jsx" "^7.23.3" "@babel/types" "^7.23.4" -"@babel/plugin-transform-react-pure-annotations@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.23.3.tgz#fabedbdb8ee40edf5da96f3ecfc6958e3783b93c" - integrity sha512-qMFdSS+TUhB7Q/3HVPnEdYJDQIk57jkntAwSuz9xfSE4n+3I+vHYCli3HoHawN1Z3RfCz/y1zXA/JXjG6cVImQ== +"@babel/plugin-transform-react-pure-annotations@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.24.1.tgz#c86bce22a53956331210d268e49a0ff06e392470" + integrity sha512-+pWEAaDJvSm9aFvJNpLiM2+ktl2Sn2U5DdyiWdZBxmLc6+xGt88dvFqsHiAiDS+8WqUwbDfkKz9jRxK3M0k+kA== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/preset-react@^7.14.5": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.23.3.tgz#f73ca07e7590f977db07eb54dbe46538cc015709" - integrity sha512-tbkHOS9axH6Ysf2OUEqoSZ6T3Fa2SrNH6WTWSPBboxKzdxNc9qOICeLXkNG0ZEwbQ1HY8liwOce4aN/Ceyuq6w== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.24.1.tgz#2450c2ac5cc498ef6101a6ca5474de251e33aa95" + integrity sha512-eFa8up2/8cZXLIpkafhaADTXSnl7IsUFCYenRWrARBz0/qZwcT0RBXpys0LJU4+WfPoF2ZG6ew6s2V6izMCwRA== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-validator-option" "^7.22.15" - "@babel/plugin-transform-react-display-name" "^7.23.3" - "@babel/plugin-transform-react-jsx" "^7.22.15" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-validator-option" "^7.23.5" + "@babel/plugin-transform-react-display-name" "^7.24.1" + "@babel/plugin-transform-react-jsx" "^7.23.4" "@babel/plugin-transform-react-jsx-development" "^7.22.5" - "@babel/plugin-transform-react-pure-annotations" "^7.23.3" + "@babel/plugin-transform-react-pure-annotations" "^7.24.1" "@babel/runtime@^7.12.5": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.9.tgz#47791a15e4603bb5f905bc0753801cf21d6345f7" - integrity sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.1.tgz#431f9a794d173b53720e69a6464abc6f0e2a5c57" + integrity sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ== dependencies: regenerator-runtime "^0.14.0" -"@babel/template@^7.22.15", "@babel/template@^7.23.9", "@babel/template@^7.3.3": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.23.9.tgz#f881d0487cba2828d3259dcb9ef5005a9731011a" - integrity sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA== +"@babel/template@^7.22.15", "@babel/template@^7.24.0", "@babel/template@^7.3.3": + version "7.24.0" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.0.tgz#c6a524aa93a4a05d66aaf31654258fae69d87d50" + integrity sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA== dependencies: "@babel/code-frame" "^7.23.5" - "@babel/parser" "^7.23.9" - "@babel/types" "^7.23.9" + "@babel/parser" "^7.24.0" + "@babel/types" "^7.24.0" -"@babel/traverse@^7.23.9", "@babel/traverse@^7.7.2": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.9.tgz#2f9d6aead6b564669394c5ce0f9302bb65b9d950" - integrity sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg== +"@babel/traverse@^7.24.1", "@babel/traverse@^7.7.2": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c" + integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ== dependencies: - "@babel/code-frame" "^7.23.5" - "@babel/generator" "^7.23.6" + "@babel/code-frame" "^7.24.1" + "@babel/generator" "^7.24.1" "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-function-name" "^7.23.0" "@babel/helper-hoist-variables" "^7.22.5" "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.23.9" - "@babel/types" "^7.23.9" + "@babel/parser" "^7.24.1" + "@babel/types" "^7.24.0" debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.3.3": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002" - integrity sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q== +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.24.0", "@babel/types@^7.3.3": + version "7.24.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf" + integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w== dependencies: "@babel/helper-string-parser" "^7.23.4" "@babel/helper-validator-identifier" "^7.22.20" @@ -477,9 +478,9 @@ integrity sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA== "@fortawesome/fontawesome-free@^6.4.2": - version "6.5.1" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz#55cc8410abf1003b726324661ce5b0d1c10de258" - integrity sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw== + version "6.5.2" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz#310fe90cb5a8dee9698833171b98e7835404293d" + integrity sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q== "@hotwired/stimulus@^3.2.2": version "3.2.2" @@ -684,34 +685,34 @@ "@types/yargs" "^16.0.0" chalk "^4.0.0" -"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" - integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== +"@jridgewell/gen-mapping@^0.3.5": + version "0.3.5" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36" + integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg== dependencies: - "@jridgewell/set-array" "^1.0.1" + "@jridgewell/set-array" "^1.2.1" "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/trace-mapping" "^0.3.24" "@jridgewell/resolve-uri@^3.1.0": version "3.1.2" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== -"@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== +"@jridgewell/set-array@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280" + integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A== "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14": version "1.4.15" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== -"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.22" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz#72a621e5de59f5f1ef792d0793a82ee20f645e4c" - integrity sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw== +"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": + version "0.3.25" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" + integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== dependencies: "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" @@ -861,9 +862,9 @@ integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== "@types/node@*": - version "20.11.19" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.19.tgz#b466de054e9cb5b3831bee38938de64ac7f81195" - integrity sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ== + version "20.12.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.3.tgz#d6658c2c7776c1cad93534bb45428195ed840c65" + integrity sha512-sD+ia2ubTeWrOu+YMF+MTAB7E+O7qsMqAbMfW7DG3K1URwhZ5hN1pLlRVGbf4wDFzSfikL05M17EyorS86jShw== dependencies: undici-types "~5.26.4" @@ -1020,9 +1021,9 @@ anymatch@^3.0.3: picomatch "^2.0.4" apexcharts@^3.29.0: - version "3.46.0" - resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.46.0.tgz#ee0afd44a7df94e038c4cc0160ece21a0da387f5" - integrity sha512-ELAY6vj8JQD7QLktKasTzwm9Wt0qxqfQSo+3QWS7G7I774iK8HCkG1toGsqJH0mkK6PtYBtnSIe66uUcwoCw1w== + version "3.48.0" + resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.48.0.tgz#cf0e18f4551b04a242d81942c965c15547f5f1b6" + integrity sha512-Lhpj1Ij6lKlrUke8gf+P+SE6uGUn+Pe1TnCJ+zqrY0YMvbqM3LMb1lY+eybbTczUyk0RmMZomlTa2NgX2EUs4Q== dependencies: "@yr/monotone-cubic-spline" "^1.0.3" svg.draggable.js "^2.2.2" @@ -1146,9 +1147,9 @@ bootstrap-datepicker@^1.10.0: jquery ">=3.4.0 <4.0.0" bootstrap@^5.3.2: - version "5.3.2" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.2.tgz#97226583f27aae93b2b28ab23f4c114757ff16ae" - integrity sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g== + version "5.3.3" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.3.tgz#de35e1a765c897ac940021900fcbb831602bac38" + integrity sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg== brace-expansion@^1.1.7: version "1.1.11" @@ -1226,9 +1227,9 @@ camelcase@^6.2.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001587: - version "1.0.30001587" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001587.tgz#a0bce920155fa56a1885a69c74e1163fc34b4881" - integrity sha512-HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA== + version "1.0.30001605" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001605.tgz#ca12d7330dd8bcb784557eb9aa64f0037870d9d6" + integrity sha512-nXwGlFWo34uliI9z3n6Qc0wZaf7zaZWA1CPZ169La5mV3I/gem7bst0vr5XQH5TJXZIMfDeZyOrZnSlVzKxxHQ== chalk@^2.4.2: version "2.4.2" @@ -1503,9 +1504,9 @@ domexception@^2.0.1: webidl-conversions "^5.0.0" electron-to-chromium@^1.4.668: - version "1.4.673" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.673.tgz#1f077d9a095761804aec7ec6346c3f4b69b56534" - integrity sha512-zjqzx4N7xGdl5468G+vcgzDhaHkaYgVcf9MqgexcTqsl2UHSCmOj/Bi3HAprg4BZCpC7HyD8a6nZl6QAZf72gw== + version "1.4.724" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.724.tgz#e0a86fe4d3d0e05a4d7b032549d79608078f830d" + integrity sha512-RTRvkmRkGhNBPPpdrgtDKvmOEYTrPlXDfc0J/Nfq5s29tEahAwhiX4mmhNzj6febWMleulxVYPh7QwCSL/EldA== emittery@^0.8.1: version "0.8.1" @@ -1658,9 +1659,9 @@ fast-json-stable-stringify@^2.0.0: integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== fast-xml-parser@^4.1.3: - version "4.3.4" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.4.tgz#385cc256ad7bbc57b91515a38a22502a9e1fca0d" - integrity sha512-utnwm92SyozgA3hhH2I8qldf2lBqm6qHOICawRNRFu1qMe3+oqr+GcXjGqTmXTMGE5T4eC03kr/rlh5C1IRdZA== + version "4.3.6" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.6.tgz#190f9d99097f0c8f2d3a0e681a10404afca052ff" + integrity sha512-M2SovcRxD4+vC493Uc2GZVcZaj66CCJhWurC4viynVSTvrpErCShNcDz1lAho6n9REQKvL/ll4A4/fw6Y9z8nw== dependencies: strnum "^1.0.5" @@ -1796,9 +1797,9 @@ has-flag@^4.0.0: integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== hasown@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.1.tgz#26f48f039de2c0f8d3356c223fb8d50253519faa" - integrity sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA== + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== dependencies: function-bind "^1.1.2" @@ -2001,9 +2002,9 @@ istanbul-lib-source-maps@^4.0.0: source-map "^0.6.1" istanbul-reports@^3.1.3: - version "3.1.6" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.6.tgz#2544bcab4768154281a2f0870471902704ccaa1a" - integrity sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg== + version "3.1.7" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz#daed12b9e1dca518e15c056e1e537e741280fa0b" + integrity sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g== dependencies: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" @@ -2606,9 +2607,9 @@ mimic-fn@^2.1.0: integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== mini-css-extract-plugin@^2.4.3: - version "2.8.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.0.tgz#1aeae2a90a954b6426c9e8311eab36b450f553a0" - integrity sha512-CxmUYPFcTgET1zImteG/LZOy/4T5rTojesQXkSNBiquhydn78tfbCE9sjIjnJ/UcjNjOC1bphTCCW5rrS7cXAg== + version "2.8.1" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.1.tgz#75245f3f30ce3a56dbdd478084df6fe475f02dc7" + integrity sha512-/1HDlyFRxWIZPI1ZpgqlZ8jMw/1Dp/dl3P0L1jtZ+zVcHqwPhGwaJwKL00WVgfnBy6PWCde9W65or7IIETImuA== dependencies: schema-utils "^4.0.0" tapable "^2.2.1" @@ -2802,23 +2803,23 @@ popper.js@^2.0.0-next.4: integrity sha512-rwX+OiRozGJyNzo+b39WE1yh1VE7+FuDAbMIP1j3hUQN4DP0WEOEbRlHC7dDgoIDpBQSm5rr+nCoPktbQCNhFQ== postcss-modules-extract-imports@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" - integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== + version "3.1.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz#b4497cb85a9c0c4b5aabeb759bb25e8d89f15002" + integrity sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q== postcss-modules-local-by-default@^4.0.0: - version "4.0.4" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz#7cbed92abd312b94aaea85b68226d3dec39a14e6" - integrity sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q== + version "4.0.5" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz#f1b9bd757a8edf4d8556e8d0f4f894260e3df78f" + integrity sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw== dependencies: icss-utils "^5.0.0" postcss-selector-parser "^6.0.2" postcss-value-parser "^4.1.0" postcss-modules-scope@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz#32cfab55e84887c079a19bbb215e721d683ef134" - integrity sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA== + version "3.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz#a43d28289a169ce2c15c00c4e64c0858e43457d5" + integrity sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ== dependencies: postcss-selector-parser "^6.0.4" @@ -2830,9 +2831,9 @@ postcss-modules-values@^4.0.0: icss-utils "^5.0.0" postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: - version "6.0.15" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz#11cc2b21eebc0b99ea374ffb9887174855a01535" - integrity sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw== + version "6.0.16" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz#3b88b9f5c5abd989ef4e2fc9ec8eedd34b20fb04" + integrity sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -2843,13 +2844,13 @@ postcss-value-parser@^4.1.0: integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== postcss@^8.2.10, postcss@^8.2.15: - version "8.4.35" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.35.tgz#60997775689ce09011edf083a549cea44aabe2f7" - integrity sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA== + version "8.4.38" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e" + integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A== dependencies: nanoid "^3.3.7" picocolors "^1.0.0" - source-map-js "^1.0.2" + source-map-js "^1.2.0" pretty-format@^27.5.1: version "27.5.1" @@ -3079,10 +3080,10 @@ sortablejs@^1.14.0: resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.15.2.tgz#4e9f7bda4718bd1838add9f1866ec77169149809" integrity sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA== -source-map-js@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== +source-map-js@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" + integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== source-map-support@^0.5.6: version "0.5.21"