decidim-meetings 0.27.8 → 0.28.0.rc4

data/config/locales/zh-TW.yml

@@ -60,8 +60,8 @@ zh-TW:
         meeting_agenda:
           attributes:
             base:
-              too_many_minutes: 這些項目的總時長超過了會議時間 %{count} 分鐘
-              too_many_minutes_child: 子項目的持續時間超過議程項目「%{parent_title}」的持續時間 %{count} 分鐘
+              too_many_minutes: 這些項目的總時長超過了會議時間 %{count} 分鐘.
+              too_many_minutes_child: 子項目的持續時間超過議程項目「%{parent_title}」的持續時間 %{count} 分鐘.
         meeting_registration_invite:
           attributes:
             email:
@@ -117,7 +117,6 @@ zh-TW:
           success: 成功複製會議。
         new:
           copy: 複製
-          select: 請選擇您想要複製的資料
           title: 複製會議
     components:
       meetings:
@@ -218,7 +217,6 @@ zh-TW:
           proposals_count:
             other: '該會議因有 %{count} 個相關提案而無法刪除:'
         manage_poll: 管理投票
-        new: 新會議
         preview: 預覽
         registrations: 註冊
         title: 操作
@@ -237,8 +235,8 @@ zh-TW:
             remove: 移除
             up: 往上
           create:
-            invalid: 建立議程時發生問題
-            success: 議程成功建立
+            invalid: 建立議程時發生問題.
+            success: 議程成功建立.
           edit:
             title: 編輯議程
             update: 更新
@@ -251,8 +249,8 @@ zh-TW:
             create: 建立
             title: 新的議程
           update:
-            invalid: 更新議程時發生問題
-            success: 議程已成功更新
+            invalid: 更新議程時發生問題.
+            success: 議程已成功更新.
         exports:
           answers: 回答
           meeting_comments: 評論
@@ -276,9 +274,10 @@ zh-TW:
             select_user: 選擇參與者
           index:
             filter:
+              accepted: 已接受
               all: 全部
+              rejected: 已拒絕
               sent: 傳送
-            filter_by: 篩選條件
             invite_attendee: 邀請的與會者
             invites: 邀請
             registrations_disabled: 你無法邀請參加者，因為註冊已被禁用。
@@ -289,15 +288,15 @@ zh-TW:
             title: 關閉會議
         meetings:
           close:
-            invalid: 關閉此會議時出現問題
-            success: 會議已成功關閉
+            invalid: 關閉此會議時出現問題.
+            success: 會議已成功關閉.
           create:
-            invalid: 建立會議時發生問題
+            invalid: 建立會議時發生問題.
             success: 會議已成功建立。請注意這仍未發佈，您需要手動發佈。
           destroy:
             invalid:
               proposals_count:
-                other: 該會議因有 %{count} 個相關提案而無法刪除
+                other: 該會議因有 %{count} 個相關提案而無法刪除.
             success: 會議已成功刪除
           edit:
             title: 編輯會議
@@ -319,7 +318,7 @@ zh-TW:
             title: 建立會議
           publish:
             invalid: 發佈此會議時出現問題。
-            success: 會議成功發佈
+            success: 會議成功發佈.
           service:
             description: 說明
             down: 向下
@@ -331,20 +330,17 @@ zh-TW:
             add_service: 新增服務
             services: 服務
           unpublish:
-            invalid: 取消發佈會議時出了問題
+            invalid: 取消發佈會議時出了問題.
             success: 會議已成功取消發佈。
           update:
-            invalid: 更新會議時發生問題
-            success: 會議成功更新
+            invalid: 更新會議時發生問題.
+            success: 會議成功更新.
         meetings_poll:
           form:
             title: 編輯 %{questionnaire_for} 投票問卷
           update:
-            invalid: 更新會議投票時出現問題
-            success: 會議投票調查已成功更新"
-        models:
-          meeting:
-            name: 會議
+            invalid: 更新會議投票時出現問題.
+            success: 會議投票已成功更新"
         registrations:
           edit:
             save: 儲存
@@ -388,11 +384,8 @@ zh-TW:
           all: 全部
         filter_meeting_space_values:
           all: 全部
-        filter_scope_values:
-          all: 全部
       calendar_modal:
         calendar_url: 行事曆 URL
-        close_window: 關閉視窗
         copy_calendar_url: 複製
         copy_calendar_url_clarification: 將日曆 URL 複製到剪貼板
         copy_calendar_url_copied: 已複製！
@@ -410,8 +403,6 @@ zh-TW:
       content_blocks:
         upcoming_meetings:
           name: 即將到來的會議
-          upcoming_meetings: 即將到來的會議
-          view_all_meetings: 檢視全部
       directory:
         meetings:
           index:
@@ -427,10 +418,11 @@ zh-TW:
         open_in_live_event_page: 在直播活動頁面開啟(附加投票選項)
         open_in_new_tab: 在新頁籤中開啟 URL
       last_activity:
-        meeting_updated_at_html: "<span>會議已更新，請查看連結：%{link}</span>"
-        new_meeting_at_html: "<span>在 %{link} 新增會議</span>"
+        meeting_updated: '會議已更新:'
+        new_meeting: '新會議:'
       layouts:
         live_event:
+          administrate: 管理員
           close: 關閉
           questions: 問題
       mailer:
@@ -451,7 +443,6 @@ zh-TW:
         calendar_modal:
           add_to_calendar: 新增至行事曆
           apple: 新增至 Apple 日曆
-          close_window: 關閉視窗
           full_details_html: 詳細內容請前往 %{link}
           google: 新增至 Google 日曆
           outlook: 添加到Outlook 行事曆
@@ -480,7 +471,6 @@ zh-TW:
             all: 全部
             official: 官方
             participants: 參與者
-          scope: 範圍
           search: 搜尋
           type: 類別
           type_values:
@@ -488,11 +478,6 @@ zh-TW:
             hybrid: 混合
             in_person: 親自
             online: 線上
-        filters_small_view:
-          close_modal: 關閉視窗
-          filter: 篩選
-          filter_by: 篩選條件
-          unfold: 展開
         form:
           address_help: '地址：用於地理編碼器找到位置'
           available_slots_help: 如果您有無限的可用名額，請將其設置為0。
@@ -512,8 +497,6 @@ zh-TW:
           see_all: 查看所有會議
           see_all_withdrawn: 查看所有撤回的會議
           text_banner: 您正在查看已被其作者撤回的會議列表。 %{go_back_link}。
-        meeting_minutes:
-          related_information: 相關信息
         meetings:
           no_meetings_warning: 沒有符合搜尋條件的會議或者目前沒有任何已排定的會議。
           upcoming_meetings_warning: 目前沒有安排的會議，但您可以在這裡找到所有過去的會議列表。
@@ -526,11 +509,8 @@ zh-TW:
           confirm: 確認
         show:
           attendees: 出席人數
-          back: 返回列表
-          close_meeting: 關閉會議
           contributions: 貢獻次數
-          date: 日期
-          edit_meeting: 編輯會議
+          join: 加入會議
           leave: 取消您的註冊
           leave_confirmation: 您確定要取消此次會議的註冊嗎？
           link_available_soon: 連結即將推出
@@ -546,7 +526,6 @@ zh-TW:
             validation_pending: 驗證待處理
           remaining_slots:
             other: "剩餘 %{count} 個位置"
-          view: 檢視
           visit_finished: 查看過去的會議
           withdraw_btn_hint: 您可以撤回您的會議，如果您改變了主意。會議不會被刪除，而是會顯示在已撤回的會議列表中。
           withdraw_confirmation_html: 您確定要撤回此會議嗎？<br><br><strong>此操作無法取消！</strong>
@@ -554,8 +533,6 @@ zh-TW:
         update:
           invalid: 更新會議時發生問題.
           success: 您已成功更新會議。
-      meetings_map:
-        view_meeting: 檢視會議
       models:
         invite:
           fields:
@@ -628,11 +605,9 @@ zh-TW:
         private_meeting: 私人會議
         transparent: 透明
         withdraw: 撤回
-      versions:
-        back_to_resource: 回到會議畫面
       withdraw:
-        error: 退出會議時發生錯誤
-        success: 會議已成功取消
+        error: 退出會議時發生錯誤.
+        success: 會議已成功撤回.
     metrics:
       meetings:
         description: 建立的會議次數
@@ -643,8 +618,6 @@ zh-TW:
         past_meetings: 過去的會議
         see_all: 檢視所有會議 (%{count})
         upcoming_meetings: 即將到來的會議
-      upcoming_meeting_for_card:
-        upcoming_meeting: 即將到來的會議
     resource_links:
       meetings_through_proposals:
         meeting_result: '相關結果：'

data/db/migrate/20201016065302_fix_meetings_registration_terms.rb

@@ -11,7 +11,7 @@ class FixMeetingsRegistrationTerms < ActiveRecord::Migration[5.2]
         next if meeting.official?
 
         # Since user-created meetings have no way to override the `registration_terms` field
-        # and it's supposed to use the component defaults,
+        # and it is supposed to use the component defaults,
         # we can safely override this.
         meeting.registration_terms = meeting.component.settings.default_registration_terms
         meeting.save!

data/db/migrate/20230427105701_change_types_and_registration_types_on_meetings.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class ChangeTypesAndRegistrationTypesOnMeetings < ActiveRecord::Migration[6.1]
+  class Meeting < ApplicationRecord
+    self.table_name = :decidim_meetings_meetings
+
+    TYPE_OF_MEETING = { in_person: 0, online: 10, hybrid: 20 }.freeze
+    REGISTRATION_TYPES = { registration_disabled: 0, on_this_platform: 10, on_different_platform: 20 }.freeze
+  end
+
+  def up
+    rename_column :decidim_meetings_meetings, :type_of_meeting, :old_type_of_meeting
+    rename_column :decidim_meetings_meetings, :registration_type, :old_registration_type
+    add_column :decidim_meetings_meetings, :type_of_meeting, :integer, default: 0, null: false
+    add_column :decidim_meetings_meetings, :registration_type, :integer, default: 0, null: false
+
+    Meeting.reset_column_information
+
+    Meeting::TYPE_OF_MEETING.each_pair do |status, index|
+      Meeting.where(old_type_of_meeting: status).update_all(type_of_meeting: index) # rubocop:disable Rails/SkipsModelValidations
+    end
+    Meeting::REGISTRATION_TYPES.each_pair do |status, index|
+      Meeting.where(old_registration_type: status).update_all(registration_type: index) # rubocop:disable Rails/SkipsModelValidations
+    end
+
+    remove_column :decidim_meetings_meetings, :old_type_of_meeting
+    remove_column :decidim_meetings_meetings, :old_registration_type
+  end
+
+  def down
+    rename_column :decidim_meetings_meetings, :type_of_meeting, :old_type_of_meeting
+    rename_column :decidim_meetings_meetings, :registration_type, :old_registration_type
+
+    add_column :decidim_meetings_meetings, :type_of_meeting, :string, default: null
+    add_column :decidim_meetings_meetings, :registration_type, :string, default: null
+
+    Meeting.reset_column_information
+
+    Meeting::TYPE_OF_MEETING.each_pair do |status, index|
+      Meeting.where(old_type_of_meeting: index).update_all(type_of_meeting: status) # rubocop:disable Rails/SkipsModelValidations
+    end
+    Meeting::REGISTRATION_TYPES.each_pair do |status, index|
+      Meeting.where(old_registration_type: index).update_all(registration_type: status) # rubocop:disable Rails/SkipsModelValidations
+    end
+
+    remove_column :decidim_meetings_meetings, :old_type_of_meeting
+    remove_column :decidim_meetings_meetings, :old_registration_type
+  end
+end

data/lib/decidim/meetings/admin_engine.rb

@@ -31,8 +31,8 @@ module Decidim
             end
           end
           resources :agenda, except: [:index, :destroy]
-          resources :attachment_collections
-          resources :attachments
+          resources :attachment_collections, except: [:show]
+          resources :attachments, except: [:show]
           resources :copies, controller: "meeting_copies", only: [:new, :create]
           resource :poll, only: [:edit, :update], controller: "meetings_poll"
         end

data/lib/decidim/meetings/component.rb

@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
-require "decidim/components/namer"
-
 Decidim.register_component(:meetings) do |component|
   component.engine = Decidim::Meetings::Engine
   component.admin_engine = Decidim::Meetings::AdminEngine
   component.icon = "media/images/decidim_meetings.svg"
+  component.icon_key = "map-pin-line"
   component.permissions_class_name = "Decidim::Meetings::Permissions"
 
   component.query_type = "Decidim::Meetings::MeetingsType"
   component.data_portable_entities = ["Decidim::Meetings::Registration"]
 
   component.on(:before_destroy) do |instance|
-    raise StandardError, "Can't remove this component" if Decidim::Meetings::Meeting.where(component: instance).any?
+    raise StandardError, "Cannot remove this component" if Decidim::Meetings::Meeting.where(component: instance).any?
   end
 
   component.register_resource(:meeting) do |resource|
@@ -97,220 +96,9 @@ Decidim.register_component(:meetings) do |component|
   end
 
   component.seeds do |participatory_space|
-    admin_user = Decidim::User.find_by(
-      organization: participatory_space.organization,
-      email: "admin@example.org"
-    )
-
-    params = {
-      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :meetings).i18n_name,
-      published_at: Time.current,
-      manifest_name: :meetings,
-      participatory_space: participatory_space
-    }
-
-    component = Decidim.traceability.perform_action!(
-      "publish",
-      Decidim::Component,
-      admin_user,
-      visibility: "all"
-    ) do
-      Decidim::Component.create!(params)
-    end
-
-    if participatory_space.scope
-      scopes = participatory_space.scope.descendants
-      global = participatory_space.scope
-    else
-      scopes = participatory_space.organization.scopes
-      global = nil
-    end
-
-    2.times do
-      start_time = Faker::Date.between(from: 20.weeks.ago, to: 20.weeks.from_now)
-      end_time = start_time + [rand(1..4).hours, rand(1..20).days].sample
-      params = {
-        component: component,
-        scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,
-        category: participatory_space.categories.sample,
-        title: Decidim::Faker::Localized.sentence(word_count: 2),
-        description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(sentence_count: 3)
-        end,
-        location: Decidim::Faker::Localized.sentence,
-        location_hints: Decidim::Faker::Localized.sentence,
-        start_time: start_time,
-        end_time: end_time,
-        address: "#{Faker::Address.street_address} #{Faker::Address.zip} #{Faker::Address.city}",
-        latitude: Faker::Address.latitude,
-        longitude: Faker::Address.longitude,
-        registrations_enabled: [true, false].sample,
-        available_slots: (10..50).step(10).to_a.sample,
-        author: participatory_space.organization,
-        registration_terms: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(sentence_count: 3)
-        end,
-        published_at: Faker::Boolean.boolean(true_ratio: 0.8) ? Time.current : nil
-      }
-
-      _hybrid_meeting = Decidim.traceability.create!(
-        Decidim::Meetings::Meeting,
-        admin_user,
-        params.merge(
-          title: Decidim::Faker::Localized.sentence(word_count: 2),
-          type_of_meeting: :hybrid,
-          online_meeting_url: "http://example.org"
-        ),
-        visibility: "all"
-      )
-
-      _online_meeting = Decidim.traceability.create!(
-        Decidim::Meetings::Meeting,
-        admin_user,
-        params.merge(
-          title: Decidim::Faker::Localized.sentence(word_count: 2),
-          type_of_meeting: :online,
-          online_meeting_url: "http://example.org"
-        ),
-        visibility: "all"
-      )
-
-      meeting = Decidim.traceability.create!(
-        Decidim::Meetings::Meeting,
-        admin_user,
-        params,
-        visibility: "all"
-      )
-
-      2.times do
-        Decidim::Meetings::Service.create!(
-          meeting: meeting,
-          title: Decidim::Faker::Localized.sentence(word_count: 2),
-          description: Decidim::Faker::Localized.sentence(word_count: 5)
-        )
-      end
-
-      Decidim::Forms::Questionnaire.create!(
-        title: Decidim::Faker::Localized.paragraph,
-        description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(sentence_count: 3)
-        end,
-        tos: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(sentence_count: 2)
-        end,
-        questionnaire_for: meeting
-      )
+    require "decidim/meetings/seeds"
 
-      2.times do |n|
-        email = "meeting-registered-user-#{meeting.id}-#{n}@example.org"
-        name = "#{Faker::Name.name} #{meeting.id} #{n}"
-        user = Decidim::User.find_or_initialize_by(email: email)
-
-        user.update!(
-          password: "decidim123456789",
-          password_confirmation: "decidim123456789",
-          name: name,
-          nickname: Faker::Twitter.unique.screen_name,
-          organization: component.organization,
-          tos_agreement: "1",
-          confirmed_at: Time.current,
-          personal_url: Faker::Internet.url,
-          about: Faker::Lorem.paragraph(sentence_count: 2)
-        )
-
-        Decidim::Meetings::Registration.create!(
-          meeting: meeting,
-          user: user
-        )
-      end
-
-      attachment_collection = Decidim::AttachmentCollection.create!(
-        name: Decidim::Faker::Localized.word,
-        description: Decidim::Faker::Localized.sentence(word_count: 5),
-        collection_for: meeting
-      )
-
-      Decidim::Attachment.create!(
-        title: Decidim::Faker::Localized.sentence(word_count: 2),
-        description: Decidim::Faker::Localized.sentence(word_count: 5),
-        attachment_collection: attachment_collection,
-        attached_to: meeting,
-        content_type: "application/pdf",
-        file: ActiveStorage::Blob.create_and_upload!(
-          io: File.open(File.join(__dir__, "seeds", "Exampledocument.pdf")),
-          filename: "Exampledocument.pdf",
-          content_type: "application/pdf",
-          metadata: nil
-        ) # Keep after attached_to
-      )
-      Decidim::Attachment.create!(
-        title: Decidim::Faker::Localized.sentence(word_count: 2),
-        description: Decidim::Faker::Localized.sentence(word_count: 5),
-        attached_to: meeting,
-        content_type: "image/jpeg",
-        file: ActiveStorage::Blob.create_and_upload!(
-          io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
-          filename: "city.jpeg",
-          content_type: "image/jpeg",
-          metadata: nil
-        ) # Keep after attached_to
-      )
-      Decidim::Attachment.create!(
-        title: Decidim::Faker::Localized.sentence(word_count: 2),
-        description: Decidim::Faker::Localized.sentence(word_count: 5),
-        attached_to: meeting,
-        content_type: "application/pdf",
-        file: ActiveStorage::Blob.create_and_upload!(
-          io: File.open(File.join(__dir__, "seeds", "Exampledocument.pdf")),
-          filename: "Exampledocument.pdf",
-          content_type: "application/pdf",
-          metadata: nil
-        ) # Keep after attached_to
-      )
-    end
-
-    authors = [
-      Decidim::UserGroup.where(decidim_organization_id: participatory_space.decidim_organization_id).verified.sample,
-      Decidim::User.where(decidim_organization_id: participatory_space.decidim_organization_id).all.sample
-    ]
-
-    authors.each do |author|
-      user_group = nil
-
-      if author.is_a?(Decidim::UserGroup)
-        user_group = author
-        author = user_group.users.sample
-      end
-
-      start_time = Faker::Date.between(from: 20.weeks.ago, to: 20.weeks.from_now)
-      params = {
-        component: component,
-        scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,
-        category: participatory_space.categories.sample,
-        title: Decidim::Faker::Localized.sentence(word_count: 2),
-        description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(sentence_count: 3)
-        end,
-        location: Decidim::Faker::Localized.sentence,
-        location_hints: Decidim::Faker::Localized.sentence,
-        start_time: start_time,
-        end_time: start_time + rand(1..4).hours,
-        address: "#{Faker::Address.street_address} #{Faker::Address.zip} #{Faker::Address.city}",
-        latitude: Faker::Address.latitude,
-        longitude: Faker::Address.longitude,
-        registrations_enabled: [true, false].sample,
-        available_slots: (10..50).step(10).to_a.sample,
-        author: author,
-        user_group: user_group
-      }
-
-      Decidim.traceability.create!(
-        Decidim::Meetings::Meeting,
-        authors[0],
-        params,
-        visibility: "all"
-      )
-    end
+    Decidim::Meetings::Seeds.new(participatory_space:).call
   end
 end
 

data/lib/decidim/meetings/content_blocks/registry_manager.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module ContentBlocks
+      class RegistryManager
+        def self.register!
+          Decidim.content_blocks.register(:homepage, :upcoming_meetings) do |content_block|
+            content_block.cell = "decidim/meetings/content_blocks/highlighted_meetings"
+            content_block.public_name_key = "decidim.meetings.content_blocks.upcoming_meetings.name"
+            content_block.default!
+          end
+        end
+      end
+    end
+  end
+end

data/lib/decidim/meetings/directory_engine.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "decidim/meetings/content_blocks/registry_manager"
+
 module Decidim
   module Meetings
     # This is the engine that runs on the public interface of `decidim-meetings`.
@@ -21,12 +23,8 @@ module Decidim
         nil
       end
 
-      initializer "decidim.meetings.content_blocks" do
-        Decidim.content_blocks.register(:homepage, :upcoming_meetings) do |content_block|
-          content_block.cell = "decidim/meetings/content_blocks/upcoming_meetings"
-          content_block.public_name_key = "decidim.meetings.content_blocks.upcoming_meetings.name"
-          content_block.default!
-        end
+      initializer "decidim_meetings_directory.content_blocks" do
+        Decidim::Meetings::ContentBlocks::RegistryManager.register!
       end
     end
   end