decidim-conferences 0.28.6 → 0.29.0.rc1

data/config/locales/zh-TW.yml

@@ -110,11 +110,13 @@ zh-TW:
         destroy:
           success: 會議講者已成功刪除。
         edit:
+          title: 更新會議講者。
           update: 更新
         index:
           conference_speakers_title: 會議講者
         new:
           create: 建立
+          title: 新的會議講者。
         update:
           error: 更新會議講者時發生問題。
           success: 會議講者成功更新。
@@ -125,11 +127,13 @@ zh-TW:
         destroy:
           success: 會議管理員已成功刪除。
         edit:
+          title: 更新會議管理員。
           update: 更新
         index:
           conference_admins_title: 會議管理員
         new:
           create: 創建
+          title: 新增會議管理員。
         update:
           error: 更新此會議管理員時發生問題。
           success: 已成功更新會議管理員。
@@ -158,12 +162,20 @@ zh-TW:
       media_links:
         create:
           error: 創建新的媒體連結時出現問題。
+          success: 媒體連結創建成功。
+        destroy:
+          success: 媒體連結成功刪除。
         edit:
+          title: 更新媒體連結。
           update: 更新
+        index:
+          media_links_title: 媒體連結
         new:
           create: 創建
+          title: 媒體連結
         update:
           error: 更新此媒體連結時出現問題
+          success: 媒體連結已成功更新。
       menu:
         conferences: 研討會
         conferences_submenu:
@@ -175,9 +187,13 @@ zh-TW:
           conference_admins: 會議管理員
           conference_invites: 邀請
           conference_speakers: 講者
+          diploma: 出席證明書
+          media_links: 媒體連結
           moderations: 版主
           partners: 夥伴
+          registration_types: 註冊類型
           registrations: 註冊
+          user_registrations: 使用者註冊
       models:
         conference:
           fields:
@@ -206,6 +222,7 @@ zh-TW:
             date: 日期
             link: 連結
             title: 標題
+          name: 媒體連結
         partner:
           fields:
             link: 連結
@@ -231,6 +248,7 @@ zh-TW:
         destroy:
           success: 成功移除會議夥伴。
         edit:
+          title: 更新合作夥伴。
           update: 更新
         new:
           create: 創建
@@ -252,6 +270,7 @@ zh-TW:
         destroy:
           success: 此會議的註冊類型成功移除。
         edit:
+          title: 更新註冊類型。
           update: 更新
         new:
           create: 創建
@@ -313,14 +332,8 @@ zh-TW:
             non_user: 不存在的參與者。
             select_user: 選擇參與者
           index:
-            filter:
-              accepted: 已接受
-              all: 全部
-              rejected: 已拒絕
-              sent: 傳送
             invite_attendee: 邀請參與者
             invites: 邀請
-            search: 搜尋
           new:
             explanation: 參加者將被邀請加入會議。如果他們的電子郵件尚未註冊，他們也會被邀請加入該組織。
             invite: 邀請
@@ -344,6 +357,7 @@ zh-TW:
         diplomas:
           edit:
             save: 儲存
+            title: 出席證明書
         invite_join_conference_mailer:
           invite:
             decline: 拒絕邀請 '%{conference_title}'
@@ -363,6 +377,7 @@ zh-TW:
             diploma_html: 您將在附件中找到會議<a href="%{url}">%{title}</a>的出席證明書。
           diploma_user:
             attendance_verified_by: 出席驗證
+            certificate_of_attendance: 出席證明書
             certificate_of_attendance_description: 此證明憑證明 <strong>%{user}</strong> 於<strong>%{location}</strong>於<strong>%{start} - %{end}</strong>參加了<strong>%{title}</strong>活動
         send_diploma:
           error: 發送會議出席證明時發生問題。

data/db/migrate/20240613095855_add_published_at_to_conference_speakers.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPublishedAtToConferenceSpeakers < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_conference_speakers, :published_at, :datetime, index: true
+  end
+end

data/decidim-conferences.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version = Decidim::Conferences.version
   s.authors = ["Isaac Massot Gil"]
   s.email = ["isaac.mg@coditramuntana.com"]
-  s.license = "AGPL-3.0-or-later"
+  s.license = "AGPL-3.0"
   s.homepage = "https://decidim.org"
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.1.0"
+  s.required_ruby_version = "~> 3.2.0"
 
   s.name = "decidim-conferences"
   s.summary = "Decidim conferences module"
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency "decidim-core", Decidim::Conferences.version
   s.add_dependency "decidim-meetings", Decidim::Conferences.version
   s.add_dependency "wicked_pdf", "~> 2.7"
+  s.add_dependency "wkhtmltopdf-binary", "~> 0.12"
 
   s.add_development_dependency "decidim-admin", Decidim::Conferences.version
   s.add_development_dependency "decidim-dev", Decidim::Conferences.version

data/lib/decidim/api/conference_partner_type.rb

@@ -16,7 +16,7 @@ module Decidim
       field :updated_at, Decidim::Core::DateTimeType, "The time this partner was updated", null: true
 
       def logo
-        object.attached_uploader(:logo).url
+        object.attached_uploader(:logo).path
       end
     end
   end

data/lib/decidim/api/conference_speaker_type.rb

@@ -20,7 +20,7 @@ module Decidim
       field :updated_at, Decidim::Core::DateTimeType, "The time this member was updated", null: true
 
       def avatar
-        object.attached_uploader(:avatar).url
+        object.attached_uploader(:avatar).path
       end
     end
   end

data/lib/decidim/api/conference_type.rb

@@ -39,11 +39,15 @@ module Decidim
       field :media_links, [Decidim::Conferences::ConferenceMediaLinkType, { null: true }], "List of media links in this conference", null: true
 
       def hero_image
-        object.attached_uploader(:hero_image).url
+        object.attached_uploader(:hero_image).path
       end
 
       def banner_image
-        object.attached_uploader(:banner_image).url
+        object.attached_uploader(:banner_image).path
+      end
+
+      def speakers
+        object.speakers.published
       end
     end
   end

data/lib/decidim/conferences/admin_engine.rb

@@ -18,7 +18,12 @@ module Decidim
         resources :conferences, param: :slug, except: [:show, :destroy] do
           resource :publish, controller: "conference_publications", only: [:create, :destroy]
           resources :copies, controller: "conference_copies", only: [:new, :create]
-          resources :speakers, controller: "conference_speakers"
+          resources :speakers, controller: "conference_speakers" do
+            member do
+              put :publish
+              put :unpublish
+            end
+          end
           resources :partners, controller: "partners", except: [:show]
           resources :media_links, controller: "media_links"
           resources :registration_types, controller: "registration_types" do

data/lib/decidim/conferences/engine.rb

@@ -74,6 +74,7 @@ module Decidim
 
       initializer "decidim_conferences.menu" do
         Decidim::Conferences::Menu.register_menu!
+        Decidim::Conferences::Menu.register_mobile_menu!
         Decidim::Conferences::Menu.register_home_content_block_menu!
       end
 

data/lib/decidim/conferences/menu.rb

@@ -14,6 +14,17 @@ module Decidim
         end
       end
 
+      def self.register_mobile_menu!
+        Decidim.menu :mobile_menu do |menu|
+          menu.add_item :conferences,
+                        I18n.t("menu.conferences", scope: "decidim"),
+                        decidim_conferences.conferences_path,
+                        position: 2.8,
+                        if: Decidim::Conference.where(organization: current_organization).published.any?,
+                        active: :inclusive
+        end
+      end
+
       def self.register_home_content_block_menu!
         Decidim.menu :home_content_block_menu do |menu|
           menu.add_item :conferences,

data/lib/decidim/conferences/seeds.rb

@@ -17,7 +17,7 @@ module Decidim
         )
 
         2.times do |_n|
-          params = {
+          conference = Decidim::Conference.create!(
             title: Decidim::Faker::Localized.sentence(word_count: 5),
             slogan: Decidim::Faker::Localized.sentence(word_count: 2),
             slug: Decidim::Faker::Internet.unique.slug(words: nil, glue: "-"),
@@ -43,32 +43,13 @@ module Decidim
             registration_terms: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
               Decidim::Faker::Localized.paragraph(sentence_count: 3)
             end
-          }
-
-          conference = Decidim.traceability.perform_action!(
-            "publish",
-            Decidim::Conference,
-            organization.users.first,
-            visibility: "all"
-          ) do
-            Decidim::Conference.create!(params)
-          end
+          )
           conference.add_to_index_as_search_resource
 
           # Create users with specific roles
           Decidim::ConferenceUserRole::ROLES.each do |role|
             email = "conference_#{conference.id}_#{role}@example.org"
-
-            user = Decidim::User.find_or_initialize_by(email:)
-            user.update!(
-              name: ::Faker::Name.name,
-              nickname: ::Faker::Twitter.unique.screen_name,
-              password: "decidim123456789",
-              organization:,
-              confirmed_at: Time.current,
-              locale: I18n.default_locale,
-              tos_agreement: true
-            )
+            user = find_or_initialize_user_by(email:)
 
             Decidim::ConferenceUserRole.find_or_create_by!(
               user:,
@@ -103,6 +84,7 @@ module Decidim
               end,
               twitter_handle: ::Faker::Twitter.unique.screen_name,
               personal_url: ::Faker::Internet.url,
+              published_at: Time.current,
               conference:
             )
           end

data/lib/decidim/conferences/test/factories.rb

@@ -29,6 +29,7 @@ FactoryBot.define do
     start_date { 1.month.ago }
     end_date { 1.month.ago + 3.days }
     registration_terms { generate_localized_title(:conference_registration_terms, skip_injection:) }
+    registrations_enabled { true }
 
     trait :promoted do
       promoted { true }
@@ -164,6 +165,10 @@ FactoryBot.define do
                                                                            skip_injection: evaluator.skip_injection)
       end
     end
+
+    trait :published do
+      published_at { Time.current }
+    end
   end
 
   factory :conference_speaker_conference_meeting, class: "Decidim::ConferenceSpeakerConferenceMeeting" do

data/lib/decidim/conferences/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-conferences version.
   module Conferences
     def self.version
-      "0.28.6"
+      "0.29.0.rc1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-conferences
 version: !ruby/object:Gem::Version
-  version: 0.28.6
+  version: 0.29.0.rc1
 platform: ruby
 authors:
 - Isaac Massot Gil
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-29 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -52,34 +52,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: wkhtmltopdf-binary
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
 description: Conferences component for decidim.
 email:
 - isaac.mg@coditramuntana.com
@@ -89,7 +103,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/cells/decidim/conference_activity_cell.rb
 - app/cells/decidim/conferences/conference_cell.rb
 - app/cells/decidim/conferences/conference_dropdown_metadata_cell.rb
 - app/cells/decidim/conferences/conference_g_cell.rb
@@ -126,8 +139,10 @@ files:
 - app/commands/decidim/conferences/admin/export_conference_registrations.rb
 - app/commands/decidim/conferences/admin/invite_user_to_join_conference.rb
 - app/commands/decidim/conferences/admin/publish_conference.rb
+- app/commands/decidim/conferences/admin/publish_conference_speaker.rb
 - app/commands/decidim/conferences/admin/publish_registration_type.rb
 - app/commands/decidim/conferences/admin/send_conference_diplomas.rb
+- app/commands/decidim/conferences/admin/unpublish_conference_speaker.rb
 - app/commands/decidim/conferences/admin/unpublish_registration_type.rb
 - app/commands/decidim/conferences/admin/update_conference.rb
 - app/commands/decidim/conferences/admin/update_conference_speaker.rb
@@ -141,6 +156,7 @@ files:
 - app/constraints/decidim/conferences/current_component.rb
 - app/constraints/decidim/conferences/current_conference.rb
 - app/controllers/concerns/decidim/conferences/admin/conference_context.rb
+- app/controllers/concerns/decidim/conferences/admin/conferences_invites/filterable.rb
 - app/controllers/concerns/decidim/conferences/admin/filterable.rb
 - app/controllers/decidim/conferences/admin/application_controller.rb
 - app/controllers/decidim/conferences/admin/categories_controller.rb
@@ -191,8 +207,6 @@ files:
 - app/helpers/decidim/conferences/admin/conferences_helper.rb
 - app/helpers/decidim/conferences/conference_helper.rb
 - app/helpers/decidim/conferences/conference_program_helper.rb
-- app/helpers/decidim/conferences/media_attachments_helper.rb
-- app/helpers/decidim/conferences/partners_helper.rb
 - app/jobs/decidim/conferences/admin/send_conference_diploma_job.rb
 - app/jobs/decidim/conferences/upcoming_conference_notification_job.rb
 - app/mailers/decidim/conferences/admin/invite_join_conference_mailer.rb
@@ -254,8 +268,6 @@ files:
 - app/serializers/decidim/conferences/download_your_data_conference_registration_serializer.rb
 - app/uploaders/decidim/conferences/diploma_uploader.rb
 - app/uploaders/decidim/conferences/partner_logo_uploader.rb
-- app/uploaders/decidim/cw/conferences/diploma_uploader.rb
-- app/uploaders/decidim/cw/conferences/partner_logo_uploader.rb
 - app/views/decidim/conference_speakers/_conference_speaker.html.erb
 - app/views/decidim/conferences/_conference.html.erb
 - app/views/decidim/conferences/admin/conference_copies/_form.html.erb
@@ -309,7 +321,6 @@ files:
 - app/views/devise/mailer/join_conference.text.erb
 - app/views/layouts/decidim/admin/conference.html.erb
 - app/views/layouts/decidim/admin/conferences.html.erb
-- app/views/layouts/decidim/conference.html.erb
 - app/views/layouts/decidim/conferences/_conference_nav_item.html.erb
 - app/views/layouts/decidim/conferences/application.html.erb
 - app/views/layouts/decidim/diploma.html.erb
@@ -320,9 +331,6 @@ files:
 - config/locales/ar.yml
 - config/locales/bg-BG.yml
 - config/locales/bg.yml
-- config/locales/bn-BD.yml
-- config/locales/bs-BA.yml
-- config/locales/ca-IT.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
@@ -417,6 +425,7 @@ files:
 - db/migrate/20210310134942_add_followable_counter_cache_to_conferences.rb
 - db/migrate/20210408204953_allow_null_logo_column_in_decidim_conferences_partners_table.rb
 - db/migrate/20221116084952_add_weight_to_conferences.rb
+- db/migrate/20240613095855_add_published_at_to_conference_speakers.rb
 - decidim-conferences.gemspec
 - lib/decidim/api/conference_media_link_type.rb
 - lib/decidim/api/conference_partner_type.rb
@@ -436,7 +445,7 @@ files:
 - lib/decidim/conferences/version.rb
 homepage: https://decidim.org
 licenses:
-- AGPL-3.0-or-later
+- AGPL-3.0
 metadata:
   bug_tracker_uri: https://github.com/decidim/decidim/issues
   documentation_uri: https://docs.decidim.org/
@@ -451,14 +460,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Decidim conferences module

data/app/cells/decidim/conference_activity_cell.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # A cell to display when a conference has been created.
-  class ConferenceActivityCell < ActivityCell
-    def title
-      I18n.t("decidim.conferences.last_activity.new_conference")
-    end
-  end
-end

data/app/helpers/decidim/conferences/media_attachments_helper.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # A Helper to render and link to resources.
-  module Conferences
-    module MediaAttachmentsHelper
-      # Renders the attachment's title.
-      # Checks if the attachment's title is translated or not and use
-      # the correct render method.
-      #
-      # attachment - An Attachment object
-      #
-      # Returns String.
-      def attachment_title(attachment)
-        attachment.title.is_a?(Hash) ? translated_attribute(attachment.title) : attachment.title
-      end
-    end
-  end
-end

data/app/helpers/decidim/conferences/partners_helper.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # A Helper to render and link to partners for conferences.
-  module Conferences
-    module PartnersHelper
-      # conference - The model to render the partners
-      #
-      # Returns nothing.
-
-      # deprecated
-      def partners_for(conference)
-        render partial: "partners", locals: { conference: }
-      end
-    end
-  end
-end

data/app/uploaders/decidim/cw/conferences/diploma_uploader.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim::Cw
-  module Conferences
-    # This class deals with uploading the conference partner logo.
-    class DiplomaUploader < Decidim::Cw::ImageUploader
-      set_variants do
-        {
-          thumb: { resize_to_fit: [275, 90] }
-        }
-      end
-    end
-  end
-end

data/app/uploaders/decidim/cw/conferences/partner_logo_uploader.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim::Cw
-  module Conferences
-    # This class deals with uploading the conference partner logo.
-    class PartnerLogoUploader < Decidim::Cw::ImageUploader
-      set_variants do
-        {
-          thumb: { resize_to_fit: [200, 55] },
-          medium: { resize_to_fit: [600, 160] }
-        }
-      end
-    end
-  end
-end

data/app/views/layouts/decidim/conference.html.erb

@@ -1,17 +0,0 @@
-<% add_decidim_page_title(translated_attribute(current_component.name)) if try(:current_component) %>
-<% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
-<% add_decidim_meta_tags(
-  image_url: current_participatory_space.attached_uploader(:banner_image).path,
-  description: translated_attribute(current_participatory_space.short_description)
-) %>
-
-<%= append_javascript_pack_tag "decidim_conferences" %>
-<%= append_stylesheet_pack_tag "decidim_conferences" %>
-
-<%= render partial: "layouts/decidim/header/follow_space_menu_bar_button", locals: { participatory_space: current_participatory_space } %>
-
-<%= render "layouts/decidim/application" do %>
-  <%= yield %>
-<% end %>
-
-<% provide :meta_image_url, current_participatory_space.attached_uploader(:banner_image).path %>

data/config/locales/bn-BD.yml

@@ -1 +0,0 @@
-bn:

data/config/locales/bs-BA.yml

@@ -1,14 +0,0 @@
----
-bs:
-  decidim:
-    admin:
-      models:
-        conference_user_role:
-          roles:
-            valuator: Procenjivač
-    events:
-      conferences:
-        role_assigned:
-          email_intro: Imenovani ste na funkciju %{role} konferencije %{resource_title}.
-          email_outro: Dobili ste ovo obaveštenje zbog toga što ste %{role} konferencije %{resource_title}.
-          email_subject: Imenovani ste na funkciju %{role} %{resource_title}.