decidim-debates 0.14.4 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cffc575926618ac267220181470ce59207a7d1103360f01eaa6d09864956502
-  data.tar.gz: d016a025c9b68660163048dec4635a1f5e1328d30b63ae0a401bc96d6c9a827c
+  metadata.gz: 15fb23d5efef39f3bff5c41225a7da4adef6c23393a8cbab88aa101e81c08849
+  data.tar.gz: f570167203c560fb84ca0ce63bde45f2f776ad301792731adf8d04b92f10ca5b
 SHA512:
-  metadata.gz: ca0c76948081cc2ec84e7bb3d7c01db5347de31f75b3eba73e5c7d96c725ebb58da0467eba214aad9d76f178b1f9525ff6ed0f558a1e09a066995b2685cd1dd7
-  data.tar.gz: 3b83bfef030e4f41ef0d9990e17335cd27afe7ec1817e8f00dc9019105e944813702b6129eb4eeaeb9f7c0ef43391e658fe4aa7943218774e68a2144269fd9e8
+  metadata.gz: 232d5182b8b0b3be5d6e0333a8854e7cd2853a1a567ea8368317c0479635592fc0a4fa05945b35635fc69b58b8c8e2a0abc853fa580f60908816bb744af45fcd
+  data.tar.gz: 6878ba51bd7922474acf629612a99081c1f51b6fb947bdee528fc987e6ef214e6eb4560d420dca7019a8846223795873246f9a5bdd4a5bfdb8464dd32c5d99b2

data/app/assets/config/decidim_debates_manifest.js

@@ -0,0 +1 @@
+//= link_tree ../images/decidim

data/app/assets/images/decidim/gamification/badges/commented_debates.svg

@@ -0,0 +1,78 @@
+<svg version="1.1" id="debates-svg"
+  xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+         y="0px" width="1080px" height="1080px" viewBox="0 0 1080 1080" enable-background="new 0 0 1080 1080" xml:space="preserve">
+  <g id="debates" class="stroke-primary">
+    <g id="bubble">
+      <path fill="none" stroke="#31536E" stroke-width="16" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+                M787.237,226.039H282.916c-21.99,0-39.815,17.825-39.815,39.815v18.882l-97.325,60.747h97.325
+                c0,21.989,17.826,39.815,39.815,39.815h504.321c21.989,0,39.814-17.826,39.814-39.815v-79.629
+                C827.052,243.864,809.227,226.039,787.237,226.039z"/>
+      <circle class="fill-primary" id="_x35_0-pct_17_" fill="#31536E" fill-opacity="0.5" cx="419.45" cy="304.983" r="28.217"/>
+      <circle class="fill-primary" id="_x35_0-pct_16_" fill="#31536E" fill-opacity="0.5" cx="525.623" cy="304.983" r="28.217"/>
+      <circle class="fill-primary" id="_x35_0-pct_15_" fill="#31536E" fill-opacity="0.5" cx="631.796" cy="304.983" r="28.217"/>
+    </g>
+    <g id="bubble_1_">
+      <path class="fill-primary" id="_x32_5-pct_16_" fill="#31536E" fill-opacity="0.25" d="M787.237,690.545H282.916c-25.857,0-46.894,21.036-46.894,46.894
+                v14.956l-93.995,58.67c-2.68,1.672-3.926,4.916-3.057,7.953c0.87,3.035,3.646,5.129,6.805,5.129h90.78
+                c3.422,22.511,22.908,39.814,46.36,39.814h504.321c25.856,0,46.892-21.036,46.892-46.894v-79.629
+                C834.129,711.581,813.094,690.545,787.237,690.545z"/>
+      <circle class="fill-primary" id="_x35_0-pct_12_" fill="#31536E" fill-opacity="0.5" cx="419.45" cy="776.567" r="28.217"/>
+      <circle class="fill-primary" id="_x35_0-pct_13_" fill="#31536E" fill-opacity="0.5" cx="525.623" cy="776.567" r="28.217"/>
+      <circle class="fill-primary" id="_x35_0-pct_14_" fill="#31536E" fill-opacity="0.5" cx="631.796" cy="776.567" r="28.217"/>
+    </g>
+    <g id="bubble_black">
+      <path class="fill-primary" fill="#31536E" d="M937.098,575.391l-101.198-66.172v-15.054c0-25.757-13.768-38.968-39.814-38.968H291.763
+                c-26.82,0-53.971,13.121-53.971,38.968v79.63c0,25.936,28.246,54.817,53.971,54.817h504.322c23.02,0,42.802-17.695,46.333-39.814
+                h90.806c3.131,0,5.89-2.26,6.784-5.26C940.902,580.536,939.719,577.104,937.098,575.391z"/>
+      <circle fill="#FFFFFF" fill-opacity="0.5" cx="641.854" cy="541.5" r="28.217"/>
+      <circle fill="#FFFFFF" fill-opacity="0.5" cx="535.682" cy="541.5" r="28.217"/>
+      <circle fill="#FFFFFF" fill-opacity="0.5" cx="429.509" cy="541.5" r="28.217"/>
+    </g>
+    <g id="stars_9" class="stars">
+      <path fill="#FFD92B" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+M731.204,149.355c0-14.688-18.667-35.355-35.354-35.355c15.354,0,35.354-20.333,35.354-35.355
+c0,15.022,16.666,35.355,35.354,35.355C747.537,114,731.204,134.667,731.204,149.355z"/>
+      <g>
+        <circle fill="#FFD92B" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" cx="937.586" cy="323.411" r="13.5"/>
+        <line fill="none" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="921.087" y1="306.676" x2="899.874" y2="285.463"/>
+        <line fill="none" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="955.028" y1="340.617" x2="976.241" y2="361.83"/>
+        <line fill="none" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="954.321" y1="307.383" x2="975.534" y2="286.17"/>
+        <line fill="none" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="921.087" y1="340.617" x2="899.874" y2="361.83"/>
+      </g>
+      <g>
+        <line fill="none" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="169.816" y1="626.094" x2="143.654" y2="652.258"/>
+        <line fill="none" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="134.462" y1="661.449" x2="108.299" y2="687.613"/>
+        <line fill="none" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="169.109" y1="687.613" x2="142.946" y2="661.449"/>
+        <line fill="none" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="133.755" y1="652.258" x2="107.592" y2="626.094"/>
+      </g>
+      <path fill="#FFD92B" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+M559.419,965.473c0,0-21.565,4.034-26.516,8.981c-4.948,4.948-8.982,26.517-8.982,26.517s-4.034-21.566-8.982-26.517
+c-4.948-4.947-26.516-8.981-26.516-8.981s22.077-4.547,26.516-8.983c4.438-4.438,8.982-26.515,8.982-26.515
+s4.034,21.564,8.982,26.515C537.852,961.438,559.419,965.473,559.419,965.473z"/>
+      <g>
+        <circle fill="#FFD92B" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" cx="949.705" cy="649.667" r="16.604"/>
+        <circle fill="#FFD92B" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" cx="913.805" cy="649.667" r="6.433"/>
+        <circle fill="#FFD92B" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" cx="949.705" cy="685.568" r="6.432"/>
+        <circle fill="#FFD92B" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" cx="985.605" cy="649.667" r="6.433"/>
+        <circle fill="#FFD92B" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" cx="949.705" cy="613.766" r="6.432"/>
+      </g>
+      <g>
+        <line fill="none" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="314.95" y1="78.973" x2="369.854" y2="133.878"/>
+        <line fill="none" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="369.854" y1="78.973" x2="314.95" y2="133.878"/>
+        <line fill="none" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="324.204" y1="106" x2="297.204" y2="106"/>
+        <line fill="none" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="362.204" y1="106" x2="389.204" y2="106"/>
+        <line fill="none" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="343.204" y1="125" x2="343.204" y2="152"/>
+        <line fill="none" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="343.204" y1="87" x2="343.204" y2="60"/>
+      </g>
+      <g>
+        <line fill="none" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="106.204" y1="356" x2="106.204" y2="435"/>
+        <line fill="none" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="145.204" y1="396" x2="66.204" y2="396"/>
+        <circle fill="#FFD92B" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" cx="86.204" cy="415.5" r="7.039"/>
+        <circle fill="#FFD92B" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" cx="86.204" cy="375.5" r="7.039"/>
+        <circle fill="#FFD92B" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" cx="126.204" cy="415.5" r="7.039"/>
+        <circle fill="#FFD92B" stroke="#31536E" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" cx="126.204" cy="375.5" r="7.039"/>
+      </g>
+    </g>
+  </g>
+</svg>

data/app/cells/decidim/debates/debate_activity_cell.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    # A cell to display when Debate has been created.
+    class DebateActivityCell < ActivityCell
+      def title
+        I18n.t(
+          "decidim.debates.last_activity.new_debate_at_html",
+          link: participatory_space_link
+        )
+      end
+    end
+  end
+end

data/app/commands/decidim/debates/admin/create_debate.rb

@@ -28,9 +28,7 @@ module Decidim
         attr_reader :debate, :form
 
         def create_debate
-          @debate = Decidim.traceability.create!(
-            Debate,
-            form.current_user,
+          params = {
             category: form.category,
             title: form.title,
             description: form.description,
@@ -38,7 +36,15 @@ module Decidim
             instructions: form.instructions,
             end_time: form.end_time,
             start_time: form.start_time,
-            component: form.current_component
+            component: form.current_component,
+            author: form.current_organization
+          }
+
+          @debate = Decidim.traceability.create!(
+            Debate,
+            form.current_user,
+            params,
+            visibility: "all"
           )
         end
 

data/app/commands/decidim/debates/create_debate.rb

@@ -37,13 +37,20 @@ module Decidim
       end
 
       def create_debate
-        @debate = Debate.create!(
+        params = {
           author: form.current_user,
           decidim_user_group_id: form.user_group_id,
           category: form.category,
           title: i18n_field(form.title),
           description: i18n_field(form.description),
           component: form.current_component
+        }
+
+        @debate = Decidim.traceability.create!(
+          Debate,
+          form.current_user,
+          params,
+          visibility: "public-only"
         )
       end
 

data/app/models/decidim/debates/debate.rb

@@ -31,7 +31,7 @@ module Decidim
       #
       # Returns a boolean.
       def official?
-        author.blank?
+        author.is_a?(Decidim::Organization)
       end
 
       # Public: Overrides the `reported_content_url` Reportable concern method.

data/app/permissions/decidim/debates/permissions.rb

@@ -24,7 +24,7 @@ module Decidim
 
       def can_create_debate?
         authorized?(:create) &&
-          current_settings&.creation_enabled?
+          current_settings&.creation_enabled? && component.participatory_space.can_participate?(user)
       end
     end
   end

data/app/presenters/decidim/debates/official_author_presenter.rb

@@ -29,6 +29,10 @@ module Decidim
       def deleted?
         false
       end
+
+      def can_be_contacted?
+        false
+      end
     end
   end
 end

data/app/services/decidim/debates/debate_search.rb

@@ -18,17 +18,16 @@ module Decidim
       # into a `text` type so that we can search.
       def search_search_text
         query
-          .where("title::text ILIKE ?", "%#{search_text}%")
-          .or(query.where("description::text ILIKE ?", "%#{search_text}%"))
+          .where("decidim_debates_debates.title::text ILIKE ?", "%#{search_text}%")
+          .or(query.where("decidim_debates_debates.description::text ILIKE ?", "%#{search_text}%"))
       end
 
       # Handle the origin filter
-      # The 'official' debates don't have an author ID
       def search_origin
         if origin == "official"
-          query.where(decidim_author_id: nil)
+          query.where(author: component.organization)
         elsif origin == "citizens"
-          query.where.not(decidim_author_id: nil)
+          query.where.not(decidim_author_type: "Decidim::Organization")
         else # Assume 'all'
           query
         end

data/app/views/decidim/debates/debates/index.html.erb

@@ -5,7 +5,7 @@
     <h2 id="debates-count" class="title-action__title section-heading">
       <%= render partial: "count" %>
     </h2>
-    <% if current_settings.creation_enabled? %>
+    <% if current_settings.creation_enabled? && current_component.participatory_space.can_participate?(current_user) %>
       <%= action_authorized_link_to :create, new_debate_path, class: "title-action__action button small hollow", data: { "redirect_url" => new_debate_path } do %>
         <%= t(".new_debate") %>
         <%= icon "plus" %>

data/app/views/decidim/debates/debates/new.html.erb

@@ -25,9 +25,9 @@
             </div>
           <% end %>
 
-          <% if current_user.user_groups.verified.any? %>
+          <% if Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
             <div class="field">
-              <%= form.select :user_group_id, current_user.user_groups.verified.map{|g| [g.name, g.id]}, prompt: current_user.name %>
+              <%= form.select :user_group_id, Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.map{|g| [g.name, g.id]}, prompt: current_user.name %>
             </div>
           <% end %>
 

data/config/locales/ca.yml

@@ -100,6 +100,8 @@ ca:
           close_window: Tanca la finestra
           share: Compartir
           share_link: Comparteix l'enllaç
+      last_activity:
+        new_debate_at_html: "<span>Nou debat a %{link}</span>"
       models:
         debate:
           fields:
@@ -132,3 +134,15 @@ ca:
           email_outro: Has rebut aquesta notificació perquè estàs seguint %{participatory_space_title}. Pots deixar de rebre notificacions seguint l'enllaç anterior.
           email_subject: Els debats ja estan disponibles a %{participatory_space_title}
           notification_title: Ja pots començar <a href="%{resource_path}">nous debats</a> a <a href="%{participatory_space_url}">%{participatory_space_title}</a>
+    gamification:
+      badges:
+        commented_debates:
+          conditions:
+            - Tria un debat obert per participar
+          description: Aquest distintiu es desbloqueja quan participes activament en els diferents debats deixant els teus comentaris.
+          description_another: Aquest usuari ha participat en %{score} debats.
+          description_own: Has participat en %{score} debats.
+          name: Debats
+          next_level_in: Participa en %{score} debats més per arribar al següent nivell!
+          unearned_another: Aquest usuari encara no ha participat en cap debat.
+          unearned_own: No has participat a cap debat encara.

data/config/locales/de.yml

@@ -100,6 +100,8 @@ de:
           close_window: Fenster schließen
           share: Aktie
           share_link: Einen Link teilen
+      last_activity:
+        new_debate_at_html: "<span>Neue Debatte bei %{link}</span>"
       models:
         debate:
           fields:
@@ -134,3 +136,15 @@ de:
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie %{participatory_space_title}. Sie können nach dem vorherigen Link keine Benachrichtigungen mehr erhalten.
           email_subject: Debatten jetzt in %{participatory_space_title}verfügbar
           notification_title: Sie können jetzt <a href="%{resource_path}">neue Debatten</a> in <a href="%{participatory_space_url}">%{participatory_space_title}</a>starten
+    gamification:
+      badges:
+        commented_debates:
+          conditions:
+            - Wählen Sie eine offene Debatte, an der Sie teilnehmen können
+          description: Dieses Abzeichen wird gewährt, wenn Sie aktiv an den verschiedenen Debatten teilnehmen, indem Sie Ihre Kommentare hinterlassen.
+          description_another: Dieser Benutzer hat an %{score} Debatten teilgenommen.
+          description_own: Sie haben an %{score} Debatten teilgenommen.
+          name: Debatten
+          next_level_in: Nimm an %{score} weiteren Debatten teil, um das nächste Level zu erreichen!
+          unearned_another: Dieser Benutzer hat noch keine Diskussionen geführt.
+          unearned_own: Sie haben bereits an Debatten teilgenommen.

data/config/locales/en.yml

@@ -101,6 +101,8 @@ en:
           close_window: Close window
           share: Share
           share_link: Share link
+      last_activity:
+        new_debate_at_html: "<span>New debate at %{link}</span>"
       models:
         debate:
           fields:
@@ -135,3 +137,15 @@ en:
           email_outro: You have received this notification because you are following %{participatory_space_title}. You can stop receiving notifications following the previous link.
           email_subject: Debates now available in %{participatory_space_title}
           notification_title: You can now start <a href="%{resource_path}">new debates</a> in <a href="%{participatory_space_url}">%{participatory_space_title}</a>
+    gamification:
+      badges:
+        commented_debates:
+          conditions:
+          - Choose an open debate to take part in
+          description: This badge is granted when you actively participate in the different debates by leaving your comments.
+          description_another: This user has participated in %{score} debates.
+          description_own: You have participated in %{score} debates.
+          name: Debates
+          next_level_in: Participate in %{score} more debates to reach the next level!
+          unearned_another: This user hasn't participated in any debate yet.
+          unearned_own: You haven't participated in any debates yet.

data/config/locales/es-PY.yml

@@ -100,6 +100,8 @@ es-PY:
           close_window: Cerrar ventana
           share: Compartir
           share_link: Compartir enlace
+      last_activity:
+        new_debate_at_html: "<span>Nuevo debate en %{link}</span>"
       models:
         debate:
           fields:
@@ -132,3 +134,15 @@ es-PY:
           email_outro: Has recibido esta notificación porque estás siguiendo %{participatory_space_title}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
           email_subject: Debates ahora disponibles en %{participatory_space_title}
           notification_title: Ahora puedes crear <a href="%{resource_path}">nuevos debates</a> en <a href="%{participatory_space_url}">%{participatory_space_title}</a>
+    gamification:
+      badges:
+        commented_debates:
+          conditions:
+            - Elige un debate abierto para participar.
+          description: Este distintivo se otorga cuando usted participa activamente en los diferentes debates dejando sus comentarios.
+          description_another: Este usuario ha participado en %{score} debates.
+          description_own: Usted ha participado en %{score} debates.
+          name: Debates
+          next_level_in: '¡Participe en %{score} debates más para alcanzar el siguiente nivel!'
+          unearned_another: Este usuario aún no ha participado en ningún debate.
+          unearned_own: Has participado en cualquier debate aún.

data/config/locales/es.yml

@@ -100,6 +100,8 @@ es:
           close_window: Cerrar ventana
           share: Compartir
           share_link: Compartir enlace
+      last_activity:
+        new_debate_at_html: "<span>Nuevo debate en %{link}</span>"
       models:
         debate:
           fields:
@@ -132,3 +134,15 @@ es:
           email_outro: Has recibido esta notificación porque estás siguiendo %{participatory_space_title}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
           email_subject: Debates ahora disponibles en %{participatory_space_title}
           notification_title: Ahora puedes crear <a href="%{resource_path}">nuevos debates</a> en <a href="%{participatory_space_url}">%{participatory_space_title}</a>
+    gamification:
+      badges:
+        commented_debates:
+          conditions:
+            - Elige un debate abierto para participar
+          description: Este distintivo se otorga cuando participes activamente en los diferentes debates dejando tus comentarios.
+          description_another: Este usuario ha participado en %{score} debates.
+          description_own: Has participado en %{score} debates.
+          name: Debates
+          next_level_in: '¡Participa en %{score} debates más para alcanzar el siguiente nivel!'
+          unearned_another: Este usuario aún no ha participado en ningún debate.
+          unearned_own: Aún no has participado en ningún debate.

data/config/locales/eu.yml

@@ -100,6 +100,8 @@ eu:
           close_window: Itxi leihoa
           share: Share
           share_link: Partekatu esteka
+      last_activity:
+        new_debate_at_html: "<span> %{link}</span>eztabaida berria"
       models:
         debate:
           fields:
@@ -132,3 +134,15 @@ eu:
           email_outro: Jakinarazpena jaso duzu %{participatory_space_title}jarraituz gero. Aurreko esteka jarraituz jakinarazpenak jasotzeari uztea erabaki dezakezu.
           email_subject: Debates orain eskuragarri %{participatory_space_title}
           notification_title: Orain <a href="%{resource_path}">eztabaida berriak hasi ditzakezu</a> <a href="%{participatory_space_url}">%{participatory_space_title}</a>
+    gamification:
+      badges:
+        commented_debates:
+          conditions:
+            - Aukeratu eztabaida irekia parte hartzeko
+          description: Txartel hau debekuei parte hartzeko modu aktiboan parte hartuz ematen da, zure iruzkinak utziz.
+          description_another: Erabiltzaile honek %{score} eztabaidatan parte hartu du.
+          description_own: '%{score} eztabaidetan parte hartu duzu.'
+          name: eztabaidak
+          next_level_in: Parte hartu %{score} eztabaidagai gehiago hurrengo mailara iristeko!
+          unearned_another: Erabiltzaile honek eztabaida batean parte hartu du oraindik.
+          unearned_own: Oraindik eztabaidetan parte hartu duzu.

data/config/locales/fi.yml

@@ -100,6 +100,8 @@ fi:
           close_window: Sulje ikkuna
           share: Jaa
           share_link: Jaa linkki
+      last_activity:
+        new_debate_at_html: "<span>Uusi keskustelu osoitteessa %{link}</span>"
       models:
         debate:
           fields:
@@ -133,3 +135,15 @@ fi:
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat %{participatory_space_title}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
           email_subject: Keskusteluja nyt käyettävissä kohdassa %{participatory_space_title}
           notification_title: Voit nyt aloittaa <a href="%{resource_path}">uusia keskusteluja</a> kohteessa <a href="%{participatory_space_url}">%{participatory_space_title}</a>
+    gamification:
+      badges:
+        commented_debates:
+          conditions:
+            - Valitse avoin keskustelu ja osallistu siihen
+          description: Tämä kunniamerkki myönnetään, kun osallistut aktiivisesti eri keskusteluihin.
+          description_another: Tämä käyttäjä on osallistunut %{score} keskusteluun.
+          description_own: Olet osallistunut %{score} keskusteluun.
+          name: Keskustelut
+          next_level_in: Osallistu vielä %{score} keskusteluun päästäksesi seuraavalle tasolle!
+          unearned_another: Tämä käyttäjä ei ole vielä osallistunut yhteenkään keskusteluun.
+          unearned_own: Et ole vielä osallistunut yhteenkään keskusteluun.

data/config/locales/fr.yml

@@ -100,6 +100,8 @@ fr:
           close_window: Fermer la fenêtre
           share: Partager
           share_link: Lien de partage
+      last_activity:
+        new_debate_at_html: "<span>Nouveau débat à %{link}</span>"
       models:
         debate:
           fields:
@@ -132,3 +134,15 @@ fr:
           email_outro: Vous avez reçu cette notification, car vous suivez %{participatory_space_title}. Vous pouvez arrêter de recevoir des notifications à partir du lien précédent.
           email_subject: Débats maintenant disponibles sur %{participatory_space_title}
           notification_title: Vous pouvez maintenant initier <a href="%{resource_path}">nouveaux débats</a> dans <a href="%{participatory_space_url}">%{participatory_space_title}</a>
+    gamification:
+      badges:
+        commented_debates:
+          conditions:
+            - Choisissez un débat ouvert pour participer à
+          description: Ce badge est attribué lorsque vous participez activement aux différents débats en laissant vos commentaires.
+          description_another: Cet utilisateur a participé à %{score} débats.
+          description_own: Vous avez participé à %{score} débats.
+          name: Des débats
+          next_level_in: Participez à %{score} autres débats pour atteindre le prochain niveau!
+          unearned_another: Cet utilisateur n'a encore participé à aucun débat.
+          unearned_own: Vous avez déjà participé à des débats.

data/config/locales/gl.yml

@@ -100,6 +100,8 @@ gl:
           close_window: Pechar ventá
           share: Comparte
           share_link: Compartir a ligazón
+      last_activity:
+        new_debate_at_html: "<span>Novo debate en %{link}</span>"
       models:
         debate:
           fields:
@@ -132,3 +134,15 @@ gl:
           email_outro: Recibiches esta notificación porque estás seguindo %{participatory_space_title}. Podes deixar de recibir notificacións seguindo a ligazón anterior.
           email_subject: Os debates agora están dispoñibles en %{participatory_space_title}
           notification_title: Agora podes comezar <a href="%{resource_path}">novos debates</a> en <a href="%{participatory_space_url}">%{participatory_space_title}</a>
+    gamification:
+      badges:
+        commented_debates:
+          conditions:
+            - Escolle un debate aberto para participar
+          description: Este distintivo é concedido cando participas activamente nos diferentes debates deixando os teus comentarios.
+          description_another: Este usuario participou en %{score} debates.
+          description_own: Participaches en %{score} debates.
+          name: Debates
+          next_level_in: '¡Participa en %{score} debates máis para alcanzar o seguinte nivel!'
+          unearned_another: Este usuario aínda non participou en ningún debate.
+          unearned_own: Participaches nos debates aínda.

data/config/locales/hu.yml

@@ -100,6 +100,8 @@ hu:
           close_window: Ablak bezárása
           share: Megosztás
           share_link: Link megosztása
+      last_activity:
+        new_debate_at_html: "<span>Új vita %{link}</span>"
       models:
         debate:
           fields:
@@ -133,3 +135,15 @@ hu:
           email_outro: 'Ezt az értesítést azért kaptad, mert ezt követed: "%{participatory_space_title}". Az értesítéseket a következő linkre kattintva kapcsolhatod ki.'
           email_subject: 'Viták létrehozása lehetséges itt: %{participatory_space_title}'
           notification_title: a href="%{resource_path}">Kezd új vitát</a> a(z) <a href="%{participatory_space_url}">%{participatory_space_title}</a> helyen
+    gamification:
+      badges:
+        commented_debates:
+          conditions:
+            - Válasszon nyílt vitát, hogy részt vegyen
+          description: Ezt a jelvényt akkor kapja meg, ha a különböző vitákban aktívan részt vesz az észrevételeinek elhagyásával.
+          description_another: Ez a felhasználó %{score} vitában vett részt.
+          description_own: Vettél részt %{score} vitában.
+          name: viták
+          next_level_in: Vegyen részt még %{score} vitában, hogy elérje a következő szintet!
+          unearned_another: Ez a felhasználó még nem vett részt vitában.
+          unearned_own: Vannak résztvevők a vitákban.

data/config/locales/it.yml

@@ -100,6 +100,8 @@ it:
           close_window: Chiudi la finestra
           share: Condividere
           share_link: Condividi il link
+      last_activity:
+        new_debate_at_html: "<span>Nuovo dibattito al %{link}</span>"
       models:
         debate:
           fields:
@@ -132,3 +134,15 @@ it:
           email_outro: Hai ricevuto questa notifica perché stai seguendo %{participatory_space_title}. È possibile interrompere la ricezione di notifiche seguendo il collegamento precedente.
           email_subject: Discussioni ora disponibili in %{participatory_space_title}
           notification_title: Ora puoi iniziare <a href="%{resource_path}">nuovi dibattiti</a> in <a href="%{participatory_space_url}">%{participatory_space_title}</a>
+    gamification:
+      badges:
+        commented_debates:
+          conditions:
+            - Scegli un dibattito aperto a cui partecipare
+          description: Questo badge è concesso quando partecipi attivamente ai diversi dibattiti lasciando i tuoi commenti.
+          description_another: Questo utente ha partecipato a %{score} dibattiti.
+          description_own: Hai partecipato a %{score} dibattiti.
+          name: dibattiti
+          next_level_in: Partecipa a %{score} altri dibattiti per raggiungere il livello successivo!
+          unearned_another: Questo utente non ha ancora partecipato a nessun dibattito.
+          unearned_own: Hai partecipato a qualche dibattito ancora.

data/config/locales/nl.yml

@@ -100,6 +100,8 @@ nl:
           close_window: Sluit venster
           share: Delen
           share_link: Link delen
+      last_activity:
+        new_debate_at_html: "<span>Nieuw debat op %{link}</span>"
       models:
         debate:
           fields:
@@ -133,3 +135,15 @@ nl:
           email_outro: Je hebt deze melding ontvangen omdat je %{participatory_space_title} volgt. Je kan de meldingen uitschakelen door te klikken op de voorgaande link.
           email_subject: Debatten zijn nu beschikbaar in %{participatory_space_title}
           notification_title: Je kan nu beginnen met <a href="%{resource_path}">nieuwe debatten</a> in <a href="%{participatory_space_url}">%{participatory_space_title}</a>
+    gamification:
+      badges:
+        commented_debates:
+          conditions:
+            - Kies een open debat om deel te nemen
+          description: Deze badge wordt toegekend wanneer u actief deelneemt aan de verschillende debatten door uw opmerkingen achter te laten.
+          description_another: Deze gebruiker heeft deelgenomen aan %{score} debatten.
+          description_own: Je hebt deelgenomen aan %{score} debatten.
+          name: debatten
+          next_level_in: Neem deel aan %{score} meer debatten om het volgende niveau te bereiken!
+          unearned_another: Deze gebruiker heeft nog geen deelgenomen aan een debat.
+          unearned_own: Je hebt nog deelgenomen aan debatten.

data/config/locales/pl.yml

@@ -104,6 +104,8 @@ pl:
           close_window: Zamknij okno
           share: Dzielić
           share_link: Udostępnij link
+      last_activity:
+        new_debate_at_html: "<span>Nowa debata na %{link}</span>"
       models:
         debate:
           fields:
@@ -136,3 +138,15 @@ pl:
           email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz %{participatory_space_title}. Możesz przestać otrzymywać powiadomienia po poprzednim linku.
           email_subject: Debaty są teraz dostępne w %{participatory_space_title}
           notification_title: Możesz teraz uruchomić <a href="%{resource_path}">nowych debat</a> w <a href="%{participatory_space_url}">%{participatory_space_title}</a>
+    gamification:
+      badges:
+        commented_debates:
+          conditions:
+            - Wybierz otwartą debatę, w której możesz wziąć udział
+          description: Ta odznaka jest przyznawana, gdy aktywnie uczestniczysz w różnych debatach, pozostawiając komentarze.
+          description_another: Ten użytkownik uczestniczył w %{score} debatach.
+          description_own: Brałeś udział w %{score} debatach.
+          name: Debaty
+          next_level_in: Weź udział w %{score} kolejnych debatach, aby przejść do następnego poziomu!
+          unearned_another: Ten użytkownik nie uczestniczył jeszcze w żadnej debacie.
+          unearned_own: Brałeś już udział w jakichkolwiek debatach.

data/config/locales/pt-BR.yml

@@ -100,6 +100,8 @@ pt-BR:
           close_window: Fechar janela
           share: Compartilhar
           share_link: Compartilhar link
+      last_activity:
+        new_debate_at_html: "<span>Novo debate em %{link}</span>"
       models:
         debate:
           fields:
@@ -132,3 +134,15 @@ pt-BR:
           email_outro: Você recebeu esta notificação porque está seguindo %{participatory_space_title}. Você pode parar de receber notificações após o link anterior.
           email_subject: Debates agora disponíveis em %{participatory_space_title}
           notification_title: Agora você pode começar <a href="%{resource_path}">novos debates</a> em <a href="%{participatory_space_url}">%{participatory_space_title}</a>
+    gamification:
+      badges:
+        commented_debates:
+          conditions:
+            - Escolha um debate aberto para participar
+          description: Este emblema é concedido quando você participa ativamente nos debates diferentes deixando seus comentários.
+          description_another: Este usuário participou em %{score} debates.
+          description_own: Você participou de %{score} debates.
+          name: Debates
+          next_level_in: Participe em mais %{score} debates para alcançar o próximo nível!
+          unearned_another: Este usuário ainda não participou de nenhum debate.
+          unearned_own: Você participou de algum debate ainda.

data/config/locales/pt.yml

@@ -100,6 +100,8 @@ pt:
           close_window: Janela fechada
           share: Compartilhar
           share_link: Compartilhar link
+      last_activity:
+        new_debate_at_html: "<span>Novo debate em %{link}</span>"
       models:
         debate:
           fields:
@@ -132,3 +134,15 @@ pt:
           email_outro: Você recebeu esta notificação porque está seguindo %{participatory_space_title}. Você pode parar de receber notificações após o link anterior.
           email_subject: Debates agora disponíveis em %{participatory_space_title}
           notification_title: Agora você pode começar <a href="%{resource_path}">novos debates</a> em <a href="%{participatory_space_url}">%{participatory_space_title}</a>
+    gamification:
+      badges:
+        commented_debates:
+          conditions:
+            - Escolha um debate aberto para participar
+          description: Este crachá é concedido quando você participa ativamente dos diferentes debates deixando seus comentários.
+          description_another: Este usuário participou em %{score} debates.
+          description_own: Você participou de %{score} debates.
+          name: Debates
+          next_level_in: Participe em mais %{score} debates para alcançar o próximo nível!
+          unearned_another: Este usuário ainda não participou de nenhum debate.
+          unearned_own: Você participou de algum debate ainda.

data/config/locales/sv.yml

@@ -100,6 +100,8 @@ sv:
           close_window: Stäng fönstret
           share: Dela
           share_link: Dela länk
+      last_activity:
+        new_debate_at_html: "<span>Ny debatt på %{link}</span>"
       models:
         debate:
           fields:
@@ -132,3 +134,15 @@ sv:
           email_outro: Du har fått den här notisen eftersom du följer %{participatory_space_title}. Du kan sluta ta emot notiser på föregående länk.
           email_subject: Debatter finns nu i %{participatory_space_title}
           notification_title: Nu kan du starta <a href="%{resource_path}">nya debatter</a> i <a href="%{participatory_space_url}">%{participatory_space_title}</a>
+    gamification:
+      badges:
+        commented_debates:
+          conditions:
+            - Välj en öppen debatt att delta i
+          description: Detta märke beviljas när du aktivt deltar i de olika debatterna genom att lämna dina kommentarer.
+          description_another: Den här användaren har deltagit i %{score} debatter.
+          description_own: Du har deltagit i %{score} debatter.
+          name: debatter
+          next_level_in: Delta i %{score} fler debatter för att nå nästa nivå!
+          unearned_another: Den här användaren har inte deltagit i någon debatt än.
+          unearned_own: Du har inte deltagit i några debatter än.

data/db/migrate/20181003081235_fix_user_groups_ids_on_debates.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class FixUserGroupsIdsOnDebates < ActiveRecord::Migration[5.2]
+  # rubocop:disable Rails/SkipsModelValidations
+  def change
+    Decidim::UserGroup.find_each do |group|
+      old_id = group.extended_data["old_user_group_id"]
+      next unless old_id
+
+      Decidim::Debates::Debate
+        .where(decidim_user_group_id: old_id)
+        .update_all(decidim_user_group_id: group.id)
+    end
+  end
+  # rubocop:enable Rails/SkipsModelValidations
+end

data/db/migrate/20181016132850_add_organization_as_author_to_debates.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class AddOrganizationAsAuthorToDebates < ActiveRecord::Migration[5.2]
+  class Debate < ApplicationRecord
+    self.table_name = :decidim_debates_debates
+    include Decidim::HasComponent
+  end
+  class User < ApplicationRecord
+    self.table_name = :decidim_users
+  end
+  def change
+    add_column :decidim_debates_debates, :decidim_author_type, :string
+
+    Debate.reset_column_information
+    Debate.find_each do |debate|
+      if debate.decidim_author_id.present?
+        debate.decidim_author_type = "Decidim::UserBaseEntity"
+      else
+        debate.decidim_author_id = debate.organization.id
+        debate.decidim_author_type = "Decidim::Organization"
+      end
+      debate.save!
+    end
+
+    add_index :decidim_debates_debates,
+              [:decidim_author_id, :decidim_author_type],
+              name: "index_decidim_debates_debates_on_decidim_author"
+    change_column_null :decidim_debates_debates, :decidim_author_id, false
+    change_column_null :decidim_debates_debates, :decidim_author_type, false
+  end
+end

data/lib/decidim/debates/component.rb

@@ -37,15 +37,29 @@ Decidim.register_component(:debates) do |component|
   component.actions = %w(create)
 
   component.seeds do |participatory_space|
-    component = Decidim::Component.create!(
+    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, :debates).i18n_name,
       manifest_name: :debates,
       published_at: Time.current,
       participatory_space: participatory_space
-    )
+    }
+
+    component = Decidim.traceability.perform_action!(
+      "publish",
+      Decidim::Component,
+      admin_user,
+      visibility: "all"
+    ) do
+      Decidim::Component.create!(params)
+    end
 
     3.times do
-      debate = Decidim::Debates::Debate.create!(
+      params = {
         component: component,
         category: participatory_space.categories.sample,
         title: Decidim::Faker::Localized.sentence(2),
@@ -56,7 +70,15 @@ Decidim.register_component(:debates) do |component|
           Decidim::Faker::Localized.paragraph(3)
         end,
         start_time: 3.weeks.from_now,
-        end_time: 3.weeks.from_now + 4.hours
+        end_time: 3.weeks.from_now + 4.hours,
+        author: component.organization
+      }
+
+      debate = Decidim.traceability.create!(
+        Decidim::Debates::Debate,
+        admin_user,
+        params,
+        visibility: "all"
       )
 
       Decidim::Comments::Seed.comments_for(debate)

data/lib/decidim/debates/engine.rb

@@ -30,6 +30,49 @@ module Decidim
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Debates::Engine.root}/app/cells")
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Debates::Engine.root}/app/views") # for partials
       end
+
+      initializer "decidim_debates.assets" do |app|
+        app.config.assets.precompile += %w(decidim_debates_manifest.js)
+      end
+
+      initializer "decidim.debates.commented_debates_badge" do
+        Decidim::Gamification.register_badge(:commented_debates) do |badge|
+          badge.levels = [1, 5, 10, 30, 50]
+
+          badge.valid_for = [:user, :user_group]
+
+          badge.reset = lambda do |user|
+            debates = Decidim::Comments::Comment.where(
+              author: user,
+              decidim_root_commentable_type: "Decidim::Debates::Debate"\
+            )
+            debates.pluck(:decidim_root_commentable_id).uniq.count
+          end
+        end
+
+        Decidim::Comments::CommentCreation.subscribe do |data|
+          comment = Decidim::Comments::Comment.find(data[:comment_id])
+          next unless comment.decidim_root_commentable_type == "Decidim::Debates::Debate"
+
+          if comment.user_group.present?
+            comments = Decidim::Comments::Comment.where(
+              decidim_root_commentable_id: comment.decidim_root_commentable_id,
+              decidim_root_commentable_type: comment.decidim_root_commentable_type,
+              user_group: comment.user_group
+            )
+
+            Decidim::Gamification.increment_score(comment.user_group, :commented_debates) if comments.count == 1
+          elsif comment.author.present?
+            comments = Decidim::Comments::Comment.where(
+              decidim_root_commentable_id: comment.decidim_root_commentable_id,
+              decidim_root_commentable_type: comment.decidim_root_commentable_type,
+              author: comment.author
+            )
+
+            Decidim::Gamification.increment_score(comment.author, :commented_debates) if comments.count == 1
+          end
+        end
+      end
     end
   end
 end

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

@@ -2,13 +2,14 @@
 
 FactoryBot.define do
   factory :debate, class: "Decidim::Debates::Debate" do
-    title { Decidim::Faker::Localized.sentence(3) }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
-    information_updates { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
-    instructions { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
+    title { generate_localized_title }
+    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    information_updates { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    instructions { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     start_time { 1.day.from_now }
     end_time { start_time.advance(hours: 2) }
     component { build(:component, manifest_name: "debates") }
+    author { component.try(:organization) }
 
     trait :open_ama do
       start_time { 1.day.ago }

data/lib/decidim/debates/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-debates version.
   module Debates
     def self.version
-      "0.14.4"
+      "0.15.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-debates
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -75,28 +75,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 description: A debates component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -109,7 +109,10 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- app/assets/config/decidim_debates_manifest.js
 - app/assets/images/decidim/debates/icon.svg
+- app/assets/images/decidim/gamification/badges/commented_debates.svg
+- app/cells/decidim/debates/debate_activity_cell.rb
 - app/cells/decidim/debates/debate_cell.rb
 - app/cells/decidim/debates/debate_m/footer.erb
 - app/cells/decidim/debates/debate_m/tags.erb
@@ -177,6 +180,8 @@ files:
 - db/migrate/20180122090505_add_user_group_author_to_debates.rb
 - db/migrate/20180305092347_drop_category_id_column.rb
 - db/migrate/20180305133556_rename_features_to_components_at_debates.rb
+- db/migrate/20181003081235_fix_user_groups_ids_on_debates.rb
+- db/migrate/20181016132850_add_organization_as_author_to_debates.rb
 - lib/decidim/debates.rb
 - lib/decidim/debates/admin.rb
 - lib/decidim/debates/admin_engine.rb
@@ -204,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Decidim debates module