decidim-meetings 0.24.1 → 0.25.0.rc2

data/config/locales/tr-TR.yml

@@ -8,9 +8,12 @@ tr:
       close_meeting:
         attendees_count: Katılımcı sayısı
         attending_organizations: Katılan kuruluşların listesi
-        closing_report: Rapor
+        audio_url: Ses URL'si
+        closing_report: Dakika
+        closing_visible: Görünür
         contributions_count: Katkı sayısı
         proposal_ids: Toplantıda oluşturulan teklifler
+        video_url: Video URL'si
       meeting:
         address: Adres
         available_slots: Bu toplantı için mevcut yuvalar
@@ -33,11 +36,6 @@ tr:
         title: Başlık
         transparent: Şeffaf
         type_of_meeting: Tür
-      minutes:
-        audio_url: Ses URL'si
-        description: Açıklama
-        video_url: Video URL'si
-        visible: Görünür
     errors:
       models:
         meeting_agenda:
@@ -170,7 +168,6 @@ tr:
           proposals_count:
             one: 'Toplantı, kendisiyle ilişkilendirilmiş %{count} teklif içerdiğinden yok edilemez:'
             other: 'Toplantı, kendisiyle ilişkilendirilmiş %{count} teklif içerdiğinden yok edilemez:'
-        minutes: Dakika
         new: Yeni toplantı
         preview: Ön izleme
         registrations: Kayıtlar
@@ -247,7 +244,6 @@ tr:
             success: Toplantı başarıyla kapatıldı
           create:
             invalid: Bu toplantıyı oluştururken bir sorun oluştu
-            success: Toplantı başarıyla oluşturuldu
           destroy:
             invalid:
               proposals_count:
@@ -285,19 +281,6 @@ tr:
           update:
             invalid: Bu toplantı güncellenirken bir sorun oluştu
             success: Toplantı başarıyla güncellendi
-        minutes:
-          create:
-            invalid: Bu dakikalar oluşturulurken bir sorunla karşılaşıldı
-            success: Dakika başarıyla oluşturuldu
-          edit:
-            title: Dakikaları düzenleyin
-            update: Güncelle
-          new:
-            create: Oluştur
-            title: Dakika oluşturun
-          update:
-            invalid: Bu dakikalar güncellenirken bir sorun oluştu
-            success: Dakika başarıyla güncellendi
         models:
           meeting:
             name: Toplantı
@@ -337,9 +320,6 @@ tr:
           value_types:
             organizer_presenter:
               not_found: 'Organizatör veritabanında bulunamadı (ID: %{id})'
-        minutes:
-          create: "%{user_name}, %{space_name} alanında%{resource_name} toplantısının dakikalarını oluşturdu"
-          update: "%{user_name}, %{space_name} alanında %{resource_name} toplantısının dakikalarını güncelledi"
       calendar_modal:
         calendar_url: Takvim URL'si
         close_window: Pencereyi kapat
@@ -429,7 +409,6 @@ tr:
         index:
           new_meeting: Yeni toplantı
         meeting_minutes:
-          meeting_minutes: Görüşme süreleri
           related_information: İlgili bilgi
         meetings:
           no_meetings_warning: Hiçbir toplantı, arama kriterinizle eşleşmiyor veya planlanmış bir toplantı yok.
@@ -448,9 +427,8 @@ tr:
           contributions: Katkı sayımı
           date: Tarih
           edit_meeting: Toplantıyı Düzenle
-          going: Devam eden
           join: Toplantıya katıl
-          meeting_report: Toplantı Raporu
+          meeting_minutes: Görüşme süreleri
           no_slots_available: Kullanılabilir yer yok
           organizations: Katılan kuruluşlar
           registration_code_help_text: Kayıt kodunuz

data/config/locales/uk.yml

@@ -8,7 +8,8 @@ uk:
       close_meeting:
         attendees_count: Кількість учасників
         attending_organizations: Перелік організацій, які брали участь
-        closing_report: Звіт
+        closing_report: Протокол
+        closing_visible: Видимий
         contributions_count: Кількість внесених пропозицій
         proposal_ids: Пропозиції, вироблені під час зустрічі
       meeting:
@@ -27,9 +28,6 @@ uk:
         start_time: Час початку
         title: Назва
         transparent: Прозора
-      minutes:
-        description: Опис
-        visible: Видимий
     errors:
       models:
         meeting_agenda:
@@ -136,7 +134,6 @@ uk:
         confirm_destroy: Ви впевнені, що хочете видалити цю зустріч?
         destroy: Видалити
         edit: Редагувати
-        minutes: Протокол
         new: Додати зустріч
         preview: Попередній перегляд
         registrations: Реєстрації
@@ -211,7 +208,6 @@ uk:
             success: Зустріч успішно завершено
           create:
             invalid: При спробі додати цю зустріч сталася помилка
-            success: Зустріч успішно додано
           destroy:
             success: Зустріч успішно видалено
           edit:
@@ -234,18 +230,6 @@ uk:
           update:
             invalid: При спробі оновити цю зустріч сталася помилка
             success: Зустріч успішно оновлено
-        minutes:
-          create:
-            invalid: При спробі створити цей протокол сталася помилка
-            success: Протокол успішно створено
-          edit:
-            update: Оновити
-          new:
-            create: Додати
-            title: Додати протокол
-          update:
-            invalid: При спробі оновити цей протокол сталася помилка
-            success: Протокол успішно оновлено
         models:
           meeting:
             name: Зустріч
@@ -279,9 +263,6 @@ uk:
           value_types:
             organizer_presenter:
               not_found: 'Цього організатора не знайдено в базі даних (ID: %{id})'
-        minutes:
-          create: "%{user_name} створив протокол зустрічі %{resource_name} у просторі %{space_name}"
-          update: "%{user_name} оновив протокол зустрічі %{resource_name} у просторі %{space_name}"
       mailer:
         invite_join_meeting_mailer:
           invite:
@@ -302,7 +283,6 @@ uk:
           filter_by: 'Відібрати за ознакою:'
           unfold: Розгорнути
         meeting_minutes:
-          meeting_minutes: Протокол зустрічі
           related_information: Супутні відомості
         meetings:
           no_meetings_warning: Жодна зустріч не відповідає вашим критеріям пошуку, або жодних зустрічей не заплановано.
@@ -313,9 +293,8 @@ uk:
         show:
           attendees: Кількість учасників
           contributions: Кількість внесених пропозицій
-          going: Збираєтесь відвідати
           join: Долучитись до зустрічі
-          meeting_report: Звіт про зустріч
+          meeting_minutes: Протокол зустрічі
           no_slots_available: Не залишилось місць
           organizations: Організації, що приймають участь
           view: Переглянути

data/config/locales/zh-CN.yml

@@ -8,7 +8,8 @@ zh-CN:
       close_meeting:
         attendees_count: 参与者人数
         attending_organizations: 与会组织名单
-        closing_report: 报告
+        closing_report: 分钟
+        closing_visible: 可见
         contributions_count: 捐款数目
         proposal_ids: 会议上提出的建议
       meeting:
@@ -30,9 +31,6 @@ zh-CN:
         start_time: 开始时间
         title: 标题
         transparent: 透明的
-      minutes:
-        description: 描述
-        visible: 可见
     errors:
       models:
         meeting_agenda:
@@ -159,7 +157,6 @@ zh-CN:
         invalid_destroy:
           proposals_count:
             other: '会议不能被破坏，因为它有 %{count} 个建议与此相关联：'
-        minutes: 分钟
         new: 新会议
         preview: 预览
         registrations: 注册
@@ -235,7 +232,6 @@ zh-CN:
             success: 会议已成功关闭
           create:
             invalid: 创建此会议时出现问题
-            success: 会议已成功创建
           destroy:
             invalid:
               proposals_count:
@@ -264,18 +260,6 @@ zh-CN:
           update:
             invalid: 更新本次会议时出错
             success: 会议已成功更新
-        minutes:
-          create:
-            invalid: 创建这分钟时出错
-            success: 创建分钟成功
-          edit:
-            update: 更新
-          new:
-            create: 创建
-            title: 创建分钟
-          update:
-            invalid: 更新这分钟时出现问题
-            success: 分钟已成功更新
         models:
           meeting:
             name: 会议
@@ -314,9 +298,6 @@ zh-CN:
           value_types:
             organizer_presenter:
               not_found: '在数据库中找不到组织者 (ID: %{id})'
-        minutes:
-          create: "%{user_name} 在 %{space_name} 空间创建了会议记录 %{resource_name}"
-          update: "%{user_name} 更新了会议记录 %{resource_name} 在 %{space_name} 空间"
       calendar_modal:
         calendar_url: 日历 URL
         close_window: 关闭窗口
@@ -387,7 +368,6 @@ zh-CN:
         index:
           new_meeting: 新会议
         meeting_minutes:
-          meeting_minutes: 会议分钟
           related_information: 相关信息
         meetings:
           no_meetings_warning: 没有符合您搜索条件的会议，也没有安排任何会议。
@@ -405,9 +385,8 @@ zh-CN:
           contributions: 捐款计数
           date: 日期
           edit_meeting: 编辑会议
-          going: 去了
           join: 加入会议
-          meeting_report: 会议报告
+          meeting_minutes: 会议分钟
           no_slots_available: 无可用槽位
           organizations: B. 参加组织
           registration_code_help_text: 您的注册码

data/db/migrate/20210217124802_add_registration_custom_content_to_meetings.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddRegistrationCustomContentToMeetings < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_meetings_meetings, :customize_registration_email, :boolean, default: false, null: false
+    add_column :decidim_meetings_meetings, :registration_email_custom_content, :jsonb
+  end
+end

data/db/migrate/20210413050756_add_published_at_to_meetings.rb

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

data/db/migrate/20210413050917_update_published_at_to_existing_meetings.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# By default all existing meetings were published when created
+# This migration prevents un-publishing all existing meetings
+class UpdatePublishedAtToExistingMeetings < ActiveRecord::Migration[5.2]
+  class Meeting < ApplicationRecord
+    self.table_name = :decidim_meetings_meetings
+  end
+
+  def change
+    Meeting.reset_column_information
+
+    Meeting.find_each do |meeting|
+      if meeting.published_at.nil?
+        meeting.published_at = meeting.created_at
+        meeting.save!
+      end
+    end
+  end
+end

data/db/migrate/20210430123416_add_public_participation_to_decidim_meetings_registrations.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPublicParticipationToDecidimMeetingsRegistrations < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_meetings_registrations, :public_participation, :boolean, default: false
+  end
+end

data/db/migrate/20210506180226_merge_meetings_minutes_into_meetings_table.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+class MergeMeetingsMinutesIntoMeetingsTable < ActiveRecord::Migration[6.0]
+  class Minutes < ApplicationRecord
+    self.table_name = "decidim_meetings_minutes"
+
+    belongs_to :meeting, foreign_key: "decidim_meeting_id", class_name: "Meeting"
+  end
+
+  class Meeting < ApplicationRecord
+    self.table_name = "decidim_meetings_meetings"
+  end
+
+  def up
+    add_column :decidim_meetings_meetings, :minutes_description, :jsonb
+    add_column :decidim_meetings_meetings, :video_url, :string
+    add_column :decidim_meetings_meetings, :audio_url, :string
+    add_column :decidim_meetings_meetings, :minutes_visible, :boolean
+
+    Minutes.find_each do |minutes|
+      minutes.meeting.update!(
+        minutes_description: minutes.description,
+        video_url: minutes.video_url,
+        audio_url: minutes.audio_url,
+        minutes_visible: minutes.visible
+      )
+    end
+  end
+
+  def down
+    Meeting.find_each do |meeting|
+      next if meeting.video_url.blank? && meeting.audio_url.blank?
+
+      Minutes.find_or_create_by!(
+        decidim_meeting_id: meeting.id,
+        description: meeting.minutes_description,
+        video_url: meeting.video_url,
+        audio_url: meeting.audio_url,
+        visible: meeting.minutes_visible
+      )
+    end
+
+    remove_column :decidim_meetings_meetings, :minutes_description
+    remove_column :decidim_meetings_meetings, :video_url
+    remove_column :decidim_meetings_meetings, :audio_url
+    remove_column :decidim_meetings_meetings, :minutes_visible
+  end
+end

data/db/migrate/20210512055802_create_decidim_meetings_polls.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class CreateDecidimMeetingsPolls < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_meetings_polls do |t|
+      t.references :decidim_meeting, index: true
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210512100333_drop_decidim_meetings_minutes_table.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+class DropDecidimMeetingsMinutesTable < ActiveRecord::Migration[6.0]
+  class Minutes < ApplicationRecord
+    self.table_name = "decidim_meetings_minutes"
+  end
+
+  class ActionLog < ApplicationRecord
+    self.table_name = "decidim_action_logs"
+  end
+
+  class Version < ApplicationRecord
+    self.table_name = :versions
+  end
+
+  class Meeting < ApplicationRecord
+    self.table_name = "decidim_meetings_meetings"
+  end
+
+  def up
+    ActionLog.where(resource_type: "Decidim::Meetings::Minutes").each do |action_log|
+      minutes = Minutes.find_by(id: action_log.resource_id)
+      version = Version.find_by(id: action_log.version_id)
+
+      version_updates = {
+        item_type: "Decidim::Meetings::Meeting",
+        item_id: minutes.decidim_meeting_id
+      }
+      if version.object_changes.present?
+        version_updates[:object_changes] = version.object_changes
+                                                  .gsub("\ndescription:\n-\n-", "\nminutes_description:\n-\n-")
+                                                  .gsub("\ndescription:\n-\n-", "\nminutes_description:\n-\n-")
+      end
+
+      version.update!(version_updates)
+      action_log.update!(
+        resource_type: "Decidim::Meetings::Meeting",
+        resource_id: minutes.decidim_meeting_id,
+        action: "close"
+      )
+    end
+
+    drop_table :decidim_meetings_minutes
+  end
+
+  def down
+    create_table :decidim_meetings_minutes do |t|
+      t.references :decidim_meeting, index: true
+      t.jsonb :description
+      t.string :video_url
+      t.string :audio_url
+      t.boolean :visible
+
+      t.timestamps
+    end
+
+    Meeting.find_each do |meeting|
+      next if blank_minutes?(meeting)
+
+      Minutes.create!(
+        decidim_meeting_id: meeting.id,
+        description: meeting.minutes_description,
+        video_url: meeting.video_url,
+        audio_url: meeting.audio_url,
+        visible: meeting.minutes_visible
+      )
+    end
+  end
+end
+
+private
+
+def blank_minutes?(meeting)
+  meeting.video_url.blank? &&
+    meeting.audio_url.blank? &&
+    meeting.minutes_description.blank? || meeting.minutes_description.is_a?(Hash) && meeting.minutes_description.values.all?(&:blank?)
+end

data/db/migrate/20210518133236_merge_minutes_with_closing_report_in_meetings_table.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+class MergeMinutesWithClosingReportInMeetingsTable < ActiveRecord::Migration[6.0]
+  class Meeting < ApplicationRecord
+    self.table_name = "decidim_meetings_meetings"
+  end
+
+  def up
+    Meeting.find_each do |meeting|
+      check_close_data_presence(meeting)
+      check_closing_visibility(meeting)
+      merge_closing_report(meeting)
+
+      meeting.save!
+    end
+
+    rename_column :decidim_meetings_meetings, :minutes_visible, :closing_visible
+    remove_column :decidim_meetings_meetings, :minutes_description
+  end
+
+  def down
+    add_column :decidim_meetings_meetings, :minutes_description, :jsonb
+    rename_column :decidim_meetings_meetings, :closing_visible, :minutes_visible
+  end
+end
+
+private
+
+# Ensures close meeting if minutes_data exists
+def check_close_data_presence(meeting)
+  return if meeting.closed_at.present? || !minutes_data?(meeting)
+
+  meeting.closed_at = Time.current
+end
+
+# If meeting is closed and minutes data is blank the closing
+# should remain visible unless it has already been defined
+def check_closing_visibility(meeting)
+  return unless meeting.minutes_visible.nil?
+  return if minutes_data?(meeting) || meeting.closed_at.blank?
+
+  meeting.minutes_visible = true
+end
+
+# Ignore minutes_description if already exists a closing report or
+# minutes_description is blank
+def merge_closing_report(meeting)
+  return if meeting.closing_report.is_a?(Hash) && meeting.closing_report.values.any?(&:present?)
+  return unless meeting.minutes_description.is_a?(Hash) && meeting.minutes_description.values.any?(&:present?)
+
+  meeting.closing_report = meeting.minutes_description
+end
+
+def minutes_data?(meeting)
+  [meeting.video_url, meeting.audio_url].any?(&:present?) ||
+    meeting.minutes_description.is_a?(Hash) && meeting.minutes_description.values.any?(&:present?)
+end