Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add conferences #19

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ base_path = "../" if File.basename(__dir__) == "development_app"
require_relative "#{base_path}lib/decidim/superspaces/version"

gem "decidim", Decidim::Superspaces::DECIDIM_VERSION
gem "decidim-conferences", Decidim::Superspaces::COMPAT_DECIDIM_VERSION
gem "decidim-superspaces", path: "."

gem "bootsnap", "~> 1.4"
Expand Down
7 changes: 7 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ PATH
remote: .
specs:
decidim-superspaces (0.1.0)
decidim-conferences (>= 0.28.0, < 0.29)
decidim-core (>= 0.28.0, < 0.29)

GEM
Expand Down Expand Up @@ -191,6 +192,11 @@ GEM
decidim-comments (0.28.4)
decidim-core (= 0.28.4)
redcarpet (~> 3.5, >= 3.5.1)
decidim-conferences (0.28.4)
decidim-core (= 0.28.4)
decidim-meetings (= 0.28.4)
wicked_pdf (~> 2.7)
wkhtmltopdf-binary (~> 0.12)
decidim-core (0.28.4)
active_link_to (~> 1.0)
acts_as_list (~> 1.0)
Expand Down Expand Up @@ -799,6 +805,7 @@ DEPENDENCIES
byebug (~> 11.0)
coveralls_reborn
decidim (= 0.28.4)
decidim-conferences (>= 0.28.0, < 0.29)
decidim-dev (= 0.28.4)
decidim-superspaces!
faker (~> 3.2)
Expand Down
10 changes: 8 additions & 2 deletions app/commands/decidim/superspaces/admin/create_superspace.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def call

attr_reader :form, :current_user

def create_associations(assemblies_ids, participatory_processes_ids)
def create_associations(assemblies_ids, participatory_processes_ids, conference_ids)
Decidim::Assembly.where(id: assemblies_ids).each do |assembly|
@superspace.superspaces_participatory_spaces.create!(
participatory_space: assembly
Expand All @@ -44,6 +44,12 @@ def create_associations(assemblies_ids, participatory_processes_ids)
participatory_space: process
)
end

Decidim::Conference.where(id: conference_ids).each do |conference|
@superspace.superspaces_participatory_spaces.create!(
participatory_space: conference
)
end
end

def create_superspace!
Expand All @@ -60,7 +66,7 @@ def create_superspace!
attributes
)

create_associations(form.assembly_ids, form.participatory_process_ids)
create_associations(form.assembly_ids, form.participatory_process_ids, form.conference_ids)
end
end
end
Expand Down
20 changes: 15 additions & 5 deletions app/commands/decidim/superspaces/admin/update_superspace.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,18 @@ def call
def update_superspace!
assembly_ids = form.assembly_ids
participatory_process_ids = form.participatory_process_ids
conference_ids = form.conference_ids
Decidim.traceability.update!(
superspace,
current_user,
title: form.title,
hero_image: form.hero_image,
locale: form.locale
)
update_associations(assembly_ids, participatory_process_ids)
update_associations(assembly_ids, participatory_process_ids, conference_ids)
end

def update_associations(assembly_ids, process_ids)
def update_associations(assembly_ids, process_ids, conference_ids)
@superspace.superspaces_participatory_spaces.destroy_all

if assembly_ids.present?
Expand All @@ -58,11 +59,20 @@ def update_associations(assembly_ids, process_ids)
end
end

return if process_ids.blank?
if process_ids.present?

Decidim::ParticipatoryProcess.where(id: process_ids).each do |process|
Decidim::ParticipatoryProcess.where(id: process_ids).each do |process|
@superspace.superspaces_participatory_spaces.create!(
participatory_space: process
)
end
end

return if conference_ids.blank?

Decidim::Conference.where(id: conference_ids).each do |conference|
@superspace.superspaces_participatory_spaces.create!(
participatory_space: process
participatory_space: conference
)
end
end
Expand Down
1 change: 1 addition & 0 deletions app/forms/decidim/superspaces/admin/superspace_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class SuperspaceForm < Decidim::Form
attribute :hero_image
attribute :assembly_ids
attribute :participatory_process_ids
attribute :conference_ids

validates :title, translatable_presence: true
validates :locale, presence: true
Expand Down
4 changes: 4 additions & 0 deletions app/models/decidim/superspaces/superspace.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ def participatory_processes
find_spaces_by_type("Decidim::ParticipatoryProcess")
end

def conferences
find_spaces_by_type("Decidim::Conference")
end

def self.log_presenter_class_for(_log) = Decidim::Superspaces::AdminLog::SuperspacePresenter

private
Expand Down
19 changes: 19 additions & 0 deletions app/views/decidim/superspaces/admin/superspaces/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,25 @@
</div>
</fieldset>
</div>
<div class="columns medium-6">
<fieldset class="participatory-spaces-group">
<legend><%= t("conferences", scope: "decidim.superspaces.models.superspace.fields") %></legend>
<div class="check-boxes">
<% Decidim::Conference.where(organization: current_organization).each do |process| %>
<div class="check-box">
<label>
<%= form.check_box :conference_ids,
{ multiple: true, label: false, checked:@superspace&.participatory_spaces&.include?(process) || false },
process.id %>
<span class="participatory-space-title">
<%= translated_attribute(process.title) %>
</span>
</label>
</div>
<% end %>
</div>
</fieldset>
</div>
</div>
</div>
</div>
Expand Down
9 changes: 9 additions & 0 deletions app/views/decidim/superspaces/superspaces/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@
<% end %>
</section>
<% end %>

<% if superspace.conferences.any? %>
<section id="processes-grid" class="layout-main__section layout-main__heading">
<h2 class="title-decorator"><%= t("participatory_processes", scope: "decidim.superspaces.superspaces.show") %></h2>
<% superspace.conferences.each do |conference| %>
<%= card_for conference, highlight: true, size: :g %>
<% end %>
</section>
<% end %>
<% end %>

<%= render partial: "language_selector" %>
1 change: 1 addition & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ en:
superspace:
fields:
assemblies: Assemblies
conferences: Conferences
created_at: Created at
locale: Language
participatory_processes: Participatory Processes
Expand Down
1 change: 1 addition & 0 deletions decidim-superspaces.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ Gem::Specification.new do |s|
end

s.add_dependency "decidim-core", Decidim::Superspaces::COMPAT_DECIDIM_VERSION
s.add_dependency "decidim-conferences", Decidim::Superspaces::COMPAT_DECIDIM_VERSION
end
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module Admin
let(:hero_image) { nil }
let(:assembly_ids) { nil }
let(:participatory_process_ids) { nil }

let(:conference_ids) { nil }
let(:invalid) { false }
let(:form) do
double(
Expand All @@ -25,7 +25,8 @@ module Admin
hero_image:,
locale:,
assembly_ids:,
participatory_process_ids:
participatory_process_ids:,
conference_ids:
)
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ module Admin
let(:hero_image) { nil }
let(:assembly_ids) { nil }
let(:participatory_process_ids) { nil }
let(:conference_ids) { nil }
let(:form) do
double(
invalid?: invalid,
Expand All @@ -25,7 +26,8 @@ module Admin
hero_image:,
locale:,
assembly_ids:,
participatory_process_ids:
participatory_process_ids:,
conference_ids:
)
end

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# frozen_string_literal: true

require "spec_helper"
require "decidim/conferences/test/factories"

module Decidim
module Superspaces
Expand All @@ -13,6 +14,7 @@ module Admin
let!(:superspaces) { create_list(:superspace, 10, organization:) }
let!(:assemblies) { create_list(:assembly, 10, organization:) }
let!(:participatory_processes) { create_list(:participatory_process, 10, organization:) }
let!(:conferences) { create_list(:conference, 10, organization:) }

before do
request.env["decidim.current_organization"] = organization
Expand Down Expand Up @@ -69,7 +71,8 @@ module Admin
},
locale:,
assembly_ids: [assemblies.first.id],
participatory_process_ids: [participatory_processes.first.id]
participatory_process_ids: [participatory_processes.first.id],
conference_ids: [conferences.first.id]
}
end

Expand Down Expand Up @@ -107,7 +110,8 @@ module Admin
},
locale:,
assembly_ids: [assemblies.first.id],
participatory_process_ids: [participatory_processes.first.id]
participatory_process_ids: [participatory_processes.first.id],
conference_ids: [conferences.first.id]
}
end

Expand Down
Loading