decidim 0.0.8.1 → 0.1.0

data/decidim-meetings/spec/spec_helper.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
 require "decidim/dev/test/base_spec_helper"

data/decidim-pages/config/locales/fr.yml

@@ -2,4 +2,21 @@ fr:
   decidim:
     features:
       pages:
-        name: Page
+        name: Page
+        settings:
+          global:
+            comments_enabled: Commentaires activés
+          step:
+            comments_blocked: Commentaires bloqués
+    pages:
+      admin:
+        models:
+          components:
+            body: Corps de texte
+        pages:
+          edit:
+            save: Mettre à jour
+            title: Modifier la page
+          update:
+            invalid: Il y a eu des erreurs lors de la sauvegarde de la page.
+            success: Page enregistrée avec succès.

data/decidim-pages/decidim-pages.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "decidim-core", Decidim.version
   s.add_dependency "decidim-comments", Decidim.version
-  s.add_dependency "rectify", "~> 0.8.0"
+  s.add_dependency "rectify", "~> 0.9.1"
 
   s.add_development_dependency "decidim-dev", Decidim.version
 end

data/decidim-pages/lib/decidim/pages/feature.rb

@@ -19,6 +19,13 @@ Decidim.register_feature(:pages) do |feature|
     end
   end
 
+  feature.register_stat :comments_count, tag: :comments do |features, start_at, end_at|
+    pages = Decidim::Pages::Page.where(feature: features)
+    pages = pages.where("created_at >= ?", start_at) if start_at.present?
+    pages = pages.where("created_at <= ?", end_at) if end_at.present?
+    Decidim::Comments::Comment.where(root_commentable: pages).count
+  end
+
   feature.settings(:global) do |settings|
     settings.attribute :comments_enabled, type: :boolean, default: true
   end

data/decidim-pages/spec/commands/create_page_spec.rb

@@ -30,9 +30,7 @@ module Decidim
           end
 
           it "creates a new page with the same name as the feature" do
-            expect(Page).to receive(:new).with({
-              feature: feature
-            }).and_call_original
+            expect(Page).to receive(:new).with(feature: feature).and_call_original
 
             expect do
               command.call

data/decidim-pages/spec/factories.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "decidim/core/test/factories"
 require "decidim/comments/test/factories"
 

data/decidim-pages/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
 require "decidim/dev/test/base_spec_helper"
 

data/decidim-proposals/app/commands/decidim/proposals/create_proposal_export.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+module Decidim
+  module Proposals
+    # A command with all the business logic when a user creates a new proposal.
+    class CreateProposalExport < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # form         - A form object with the params.
+      # current_user - The current user.
+      def initialize(participatory_process)
+        @participatory_process = participatory_process
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the proposal.
+      # - :invalid if the proposal wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) if participatory_process.invalid?
+
+        create_proposal_export
+        broadcast(:ok, export)
+      end
+
+      private
+
+      attr_reader :participatory_process
+
+      def create_proposal_export
+        ProposalsExporterJob.perform_later(participatory_process)
+      end
+    end
+  end
+end

data/decidim-proposals/app/controllers/decidim/proposals/admin/exports_controller.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+module Decidim
+  module Proposals
+    module Admin
+      # This controller allows admins to manage proposals in a participatory process.
+      class ExportsController < Admin::ApplicationController
+        def create
+          # call the new proposal export command
+          authorize! :read, Proposal
+          authorize! :export, Proposal
+
+          ExportJob.perform_later(
+            current_user,
+            current_feature,
+            params[:format]
+          )
+
+          flash[:notice] = t("decidim.proposals.exports.notice")
+          redirect_to :back
+        end
+      end
+    end
+  end
+end

data/decidim-proposals/app/controllers/decidim/proposals/proposal_votes_controller.rb

@@ -21,7 +21,9 @@ module Decidim
       def destroy
         authorize! :unvote, proposal
 
-        proposal.votes.where(author: current_user).delete_all
+        proposal.votes.where(author: current_user).destroy_all
+        proposal.reload
+
         @from_proposals_list = params[:from_proposals_list] == "true"
         render :update_buttons_and_counters
       end

data/decidim-proposals/app/controllers/decidim/proposals/proposal_widgets_controller.rb

@@ -3,7 +3,6 @@
 module Decidim
   module Proposals
     class ProposalWidgetsController < Decidim::WidgetsController
-      helper_method :model, :current_participatory_process
       helper Proposals::ApplicationHelper
 
       private
@@ -12,10 +11,6 @@ module Decidim
         @model ||= Proposal.where(feature: params[:feature_id]).find(params[:proposal_id])
       end
 
-      def current_participatory_process
-        @current_participatory_process ||= model.feature.participatory_process
-      end
-
       def iframe_url
         @iframe_url ||= proposal_proposal_widget_url(model)
       end

data/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb

@@ -31,7 +31,6 @@ module Decidim
 
         @proposals = @proposals.page(params[:page]).per(12)
         @proposals = reorder(@proposals)
-
       end
 
       def show

data/decidim-proposals/app/jobs/decidim/proposals/export_job.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+module Decidim
+  module Proposals
+    class ExportJob < ApplicationJob
+      queue_as :default
+
+      def perform(user, feature, format)
+        proposals = Proposal
+                    .where(feature: feature)
+                    .includes(:category, feature: { participatory_process: :organization })
+
+        export_data = Decidim::Exporters.const_get(format.upcase)
+                                        .new(proposals, ProposalSerializer).export
+
+        name = "proposals-#{I18n.localize(DateTime.now.to_date, format: :default)}-#{Time.now.seconds_since_midnight.to_i}"
+
+        ExportMailer.export(user, name, export_data).deliver_now
+      end
+    end
+  end
+end

data/decidim-proposals/app/models/decidim/proposals/proposal.rb

@@ -18,7 +18,7 @@ module Decidim
 
       validates :title, :body, presence: true
 
-      geocoded_by :address, http_headers: lambda { |proposal| { "Referer" => proposal.feature.organization.host } }
+      geocoded_by :address, http_headers: ->(proposal) { { "Referer" => proposal.feature.organization.host } }
 
       scope :accepted,   -> { where(state: "accepted") }
       scope :rejected,   -> { where(state: "rejected") }

data/decidim-proposals/app/queries/decidim/proposals/filtered_proposals.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+module Decidim
+  module Proposals
+    # A class used to find proposals filtered by features and a date range
+    class FilteredProposals < Rectify::Query
+      # Syntactic sugar to initialize the class and return the queried objects.
+      #
+      # features - An array of Decidim::Feature
+      # start_at - A date to filter resources created after it
+      # end_at - A date to filter resources created before it.
+      def self.for(features, start_at = nil, end_at = nil)
+        new(features, start_at, end_at).query
+      end
+
+      # Initializes the class.
+      #
+      # features - An array of Decidim::Feature
+      # start_at - A date to filter resources created after it
+      # end_at - A date to filter resources created before it.
+      def initialize(features, start_at = nil, end_at = nil)
+        @features = features
+        @start_at = start_at
+        @end_at = end_at
+      end
+
+      # Finds the Proposals scoped to an array of features and filtered
+      # by a range of dates.
+      def query
+        proposals = Decidim::Proposals::Proposal.where(feature: @features)
+        proposals = proposals.where("created_at >= ?", @start_at) if @start_at.present?
+        proposals = proposals.where("created_at <= ?", @end_at) if @end_at.present?
+        proposals
+      end
+    end
+  end
+end

data/decidim-proposals/app/services/decidim/proposals/proposal_serializer.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # This class serializes a Proposal so can be exported to CSV, JSON or other
+    # formats.
+    class ProposalSerializer
+      include Rails.application.routes.url_helpers
+      include Decidim::ResourceHelper
+
+      # Public: Initializes the serializer with a proposal.
+      def initialize(proposal)
+        @proposal = proposal
+      end
+
+      # Public: Exports a hash with the serialized data for this proposal.
+      def serialize
+        {
+          id: @proposal.id,
+          category: {
+            id: @proposal.category.try(:id),
+            name: @proposal.category.try(:name)
+          },
+          title: @proposal.title,
+          body: @proposal.body,
+          votes: @proposal.proposal_votes_count,
+          comments: @proposal.comments.count,
+          created_at: @proposal.created_at,
+          url: url,
+          feature: { id: feature.id },
+          meeting_urls: meetings
+        }
+      end
+
+      private
+
+      attr_reader :proposal
+
+      def feature
+        proposal.feature
+      end
+
+      def organization
+        feature.organization
+      end
+
+      def meetings
+        @proposal.linked_resources(:meetings, "proposals_from_meeting").map do |meeting|
+          decidim_resource_url(
+            meeting,
+            feature_id: feature,
+            participatory_process_id: participatory_process,
+            host: organization.host
+          )
+        end
+      end
+
+      def participatory_process
+        feature.participatory_process
+      end
+
+      def url
+        Decidim::Proposals::Engine.routes.url_helpers.proposal_url(
+          proposal,
+          feature_id: feature,
+          participatory_process_id: participatory_process,
+          host: organization.host
+        )
+      end
+    end
+  end
+end

data/decidim-proposals/app/views/decidim/proposals/admin/proposals/index.html.erb

@@ -3,9 +3,21 @@
     <h2 class="card-title">
       <%= t(".title") %>
 
-      <% if feature_settings.official_proposals_enabled %>
-        <%= link_to t("actions.new", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposal_path, class: 'button tiny button--title' if can? :manage, current_feature %>
-      <% end %>
+      <div class="button--title">
+
+        <% if feature_settings.official_proposals_enabled %>
+          <%= link_to t("actions.new", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposal_path, class: 'button tiny button--simple' if can? :manage, current_feature %>
+        <% end %>
+
+      <button class="exports dropdown tiny button button--simple" data-toggle="export-dropdown"><%= t "actions.export", scope: "decidim.proposals" %></button>
+      <div class="dropdown-pane" id="export-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
+        <ul class="vertical menu add-features">
+          <li class="exports--csv"><%= link_to "CSV", exports_path(feature_id: current_feature, participatory_process_id: current_participatory_process, format: :csv), method: :post %></li>
+          <li class="exports--json"><%= link_to "JSON", exports_path(feature_id: current_feature, participatory_process_id: current_participatory_process, format: :json), method: :post %></li>
+        </ul>
+      </div>
+
+      </div>
     </h2>
   </div>
 

data/decidim-proposals/app/views/decidim/proposals/proposal_widgets/show.html.erb

@@ -1,25 +1,4 @@
-<div class="column">
-  <article class="card card--proposal">
-    <div class="card__content">
-      <div class="card__header">
-        <%= link_to model do%>
-          <h5 class="card__title"><%= model.title %></h5>
-        <% end %>
-        <div class="card__author author-data author-data--small">
-          <div class="author-data__main">
-            <div class="author author--inline">
-              <span class="author__avatar author__avatar--small">
-                <%= image_tag model.author_avatar_url %>
-              </span>
-              <span class="author__name"><%= model.author_name %></span>
-              <%= l model.created_at, format: "%d/%m/%Y" %>
-            </div>
-          </div>
-        </div>
-      </div>
-      <%= render partial: "decidim/proposals/proposals/proposal_badge", locals: { proposal: model } %>
-      <p><%= truncate(model.body, length: 100) %></p>
-      <%= render partial: "decidim/proposals/proposals/tags", locals: { proposal: model } %>
-    </div>
-  </article>
-</div>
+<% content_for(:title, model.title) %>
+
+<%= render partial: "decidim/proposals/proposals/proposal_badge", locals: { proposal: model } %>
+<p><%= truncate(model.body, length: 100) %></p>

data/decidim-proposals/config/locales/ca.yml

@@ -29,9 +29,11 @@ ca:
             proposal_answering_enabled: Resposta oficial a propostes activades
             votes_blocked: Suports bloquejats
             votes_enabled: Suports habilitats
+            votes_hidden: Vots ocults (si els vots estan habilitats, marcant aquesta opció amagarà el nombre de vots)
     proposals:
       actions:
         answer: Respondre
+        export: Exporta
         new: Nova
         title: Accions
       admin:
@@ -67,6 +69,8 @@ ca:
       create:
         error: Hi ha hagut errors en desar la proposta.
         success: Proposta creada correctament.
+      exports:
+        notice: La seva exportació està actualment en curs. Rebràs un correu electrònic quan estigui complet.
       models:
         proposal:
           fields:

data/decidim-proposals/config/locales/en.yml

@@ -30,10 +30,12 @@ en:
             proposal_answering_enabled: Proposal answering enabled
             votes_blocked: Votes blocked
             votes_enabled: Votes enabled
-            votes_hidden: Votes hidden (if votes are enabled, checking this will hide the number of votes)
+            votes_hidden: Votes hidden (if votes are enabled, checking this will hide
+              the number of votes)
     proposals:
       actions:
         answer: Answer
+        export: Export
         new: New
         title: Actions
       admin:
@@ -69,6 +71,9 @@ en:
       create:
         error: There's been errors when saving the proposal.
         success: Proposal created successfully.
+      exports:
+        notice: Your export is currently in progress. You'll receive an email when
+          it's complete.
       models:
         proposal:
           fields:

data/decidim-proposals/config/locales/es.yml

@@ -29,9 +29,11 @@ es:
             proposal_answering_enabled: Respuesta a propuestas activadas
             votes_blocked: Votación bloqueada
             votes_enabled: Votos habilitados
+            votes_hidden: Votos ocultos (si los votos están habilitados, marcando esta opción ocultará el número de votos)
     proposals:
       actions:
         answer: Respuesta
+        export: Exportar
         new: Nueva
         title: Acciones
       admin:
@@ -67,6 +69,8 @@ es:
       create:
         error: Ha habido errores al guardar la propuesta.
         success: Propuesta creada correctamente.
+      exports:
+        notice: Su exportación está actualmente en curso. Recibirá un correo electrónico cuando esté completo.
       models:
         proposal:
           fields:

data/decidim-proposals/config/locales/fr.yml

@@ -2,4 +2,149 @@ fr:
   activemodel:
     attributes:
       proposal:
-        title: Titre
+        body: Corps de texte
+        category_id: Catégorie
+        scope_id: Domaine d'application
+        title: Titre
+        user_group_id: Créer une proposition en tant que
+      proposal_answer:
+        answer: Répondre
+  decidim:
+    features:
+      proposals:
+        actions:
+          create: Créer
+          vote: Voter
+        name: Propositions
+        settings:
+          global:
+            comments_enabled: Commentaires activés
+            geocoding_enabled: Géocodage activé
+            official_proposals_enabled: Propositions officielles activées
+            proposal_answering_enabled: Réponse aux propositions activée
+            vote_limit: Limite de vote
+          step:
+            comments_blocked: Commentaires bloqués
+            creation_enabled: Module propositions activé
+            proposal_answering_enabled: Réponse aux propositions activée
+            votes_blocked: Votes bloqués
+            votes_enabled: Votes activés
+            votes_hidden: Cacher les votes (si les votes sont activés, le compte des votes sera caché)
+    proposals:
+      actions:
+        answer: Répondre
+        export: Exporter
+        new: Nouveau
+        title: Actions
+      admin:
+        actions:
+          preview: Aperçu
+        models:
+          proposal:
+            name: Proposition
+        proposal_answers:
+          edit:
+            accepted: Publié
+            answer_proposal: Répondre
+            rejected: Refusée
+            title: Réponse à la proposition %{title}
+        proposals:
+          answer:
+            invalid: Il y a eu un problème concernant la réponse à cette proposition
+            success: La réponse à la proposition a publiée avec succès
+          create:
+            invalid: Il y a eu un problème lors de la création de cette proposition
+            success: Proposition créée avec succès
+          form:
+            select_a_category: Sélectionner une catégorie
+          index:
+            title: Propositions
+          new:
+            create: Créer
+            title: Créer une proposition
+      answers:
+        accepted: Publié
+        not_answered: Resté sans réponse
+        rejected: Refusée
+      create:
+        error: Il y a eu des erreurs lors de la sauvegarde de la proposition.
+        success: Proposition créée avec succès.
+      exports:
+        notice: Votre exportation est en cours. Vous recevrez un e-mail quand elle sera terminée.
+      models:
+        proposal:
+          fields:
+            category: Catégorie
+            official_proposal: Proposition officielle
+            scope: Domaine d'application
+            state: Etat
+            title: Titre
+      proposals:
+        count:
+          proposals_count:
+            one: 1 proposition
+            other: "%{count} propositions"
+        filters:
+          accepted: Publié
+          activity: Activité
+          all: Toutes
+          category: Catégorie
+          category_prompt: Sélectionner une catégorie
+          citizenship: Citoyenneté
+          official: Elu(e)
+          origin: Retour à l'original
+          rejected: Refusée
+          related_to: Liée à
+          scopes: Domaines d'application
+          search: Rechercher
+          state: État
+          voted: Voté
+        filters_small_view:
+          close_modal: Fermer la fenêtre de dialogue
+          filter: Filtrer
+          filter_by: Filtrer par
+          unfold: Déplier
+        index:
+          new_proposal: Nouvelle proposition
+          view_proposal: Voir la proposition
+        linked_proposals:
+          proposal_votes:
+            one: <span class="card--list__data__number">1</span>vote
+            other: <span class="card--list__data__number">%{count}</span>votes
+        new:
+          back: Retour
+          select_a_category: Veuillez sélectionner une catégorie
+          send: Envoyer
+          title: Nouvelle proposition
+        orders:
+          label: 'Classement des propositions par:'
+          most_voted: Les plus votées
+          random: Aléatoire
+          recent: Les plus récents
+        proposal:
+          view_proposal: Voir la proposition
+        show:
+          proposal_accepted_reason: 'Cette proposition a été acceptée parce que :'
+          proposal_rejected_reason: 'Cette proposition a été refusée parce que:'
+          report: Signaler
+        vote_button:
+          already_voted: Déjà voté
+          no_votes_remaining: Aucun vote restant
+          vote: Voter
+          votes_blocked: Votes désactivés
+        votes_count:
+          count:
+            one: VOTE
+            other: VOTES
+        votes_limit:
+          vote_limit:
+            description: Au lieu de voter autant de propositions que vous voulez, vous ne pouvez voter que jusqu'à %{limit} propositions.
+            left: Restant
+            title: Vous disposez de %{limit} votes à distribuer
+            votes: Votes
+    resource_links:
+      included_proposals:
+        proposal_projects: 'Proposition figurant dans ces projets :'
+        proposal_results: 'Proposition figurant dans ces résultats :'
+      proposals_from_meeting:
+        proposal_meetings: Rencontres connexes