decidim-consultations 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff506c38c6b06db1b9808179b026a8006005953a838a755b2aa35199ca21ddca
-  data.tar.gz: 74a3e27294dcd785ab8715af19e1916a8cac783ff32b5ec4f1a7630f3d0e2cc6
+  metadata.gz: 49594bb7fc09735417652233890356d9c46211a7b4ddb6db30810ff2c6642e29
+  data.tar.gz: 26af188d66c4fd24dac2073734df4e44bb3e5973c61da151e6357bfd79cdb6d7
 SHA512:
-  metadata.gz: 6d056d32c2d73fa7b063e325a2500bba46eed44d53a3ae210b5f428657842e49a70086d242590c6c4c42b065e53a2779059e153f14bbfb44dc92c87af5f54936
-  data.tar.gz: a017e9a30ead1bbe76add0b27b529a9be9733678ec4db26f9dfcaf3d6c76d2edbdf44f08bbd8b0b8e1a5e229e9b5f35398db6f75dc492ce884b6f185052b36f9
+  metadata.gz: cd8ebe2d9701e95856f6a8f719d40e45604e7ddff55b295c1049f2b0407543161a69f61e1265fe81a9f5b9ae1f2479143630eff70baa393e5e827bbfe9596283
+  data.tar.gz: 6cac02425807edd81733577ebd9b53c341552f4156c7b54132248ba7fb55bb40e18b04e7f0aa5abfbbb55936184d7fdeb86ed3b7a3c2c36239f2b3aa75bf1a78

data/app/controllers/concerns/decidim/consultations/admin/filterable.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Consultations
+    module Admin
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          private
+
+          def base_query
+            collection
+          end
+
+          def filters
+            [:published_at_null]
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/consultations/admin/consultations_controller.rb

@@ -5,12 +5,13 @@ module Decidim
     module Admin
       # Controller in charge of managing consultation related requests
       class ConsultationsController < Decidim::Consultations::Admin::ApplicationController
+        include Decidim::Consultations::Admin::Filterable
         helper_method :current_consultation, :current_participatory_space
 
         # GET /admin/consultations
         def index
           enforce_permission_to :read, :consultation
-          @consultations = collection
+          @consultations = filtered_collection
         end
 
         # GET /admin/consultations/new

data/app/models/decidim/consultation.rb

@@ -96,5 +96,10 @@ module Decidim
     def closed?
       !active?
     end
+
+    # Allow ransacker to search for a key in a hstore column (`title`.`en`)
+    ransacker :title do |parent|
+      Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
+    end
   end
 end

data/app/types/decidim/consultations/consultation_question_type.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Consultations
+    # This type represents a consultation.
+    ConsultationQuestionType = GraphQL::ObjectType.define do
+      interfaces [
+        -> { Decidim::Core::ScopableInterface },
+        -> { Decidim::Core::AttachableInterface },
+        -> { Decidim::Comments::CommentableInterface }
+      ]
+
+      name "ConsultationQuestion"
+      description "A consultation question"
+
+      field :id, !types.ID, "Internal ID of the question"
+      field :title, Decidim::Core::TranslatedFieldType, "Title of the question"
+      field :subtitle, Decidim::Core::TranslatedFieldType, "The subtitle of this question"
+      field :slug, !types.String, "Slug of the question"
+      field :createdAt, !Decidim::Core::DateTimeType, "The time this question was created", property: :created_at
+      field :updatedAt, !Decidim::Core::DateTimeType, "The time this question was updated", property: :updated_at
+      field :publishedAt, !Decidim::Core::DateTimeType, "The time this question was published", property: :published_at
+
+      field :components, types[Decidim::Core::ComponentInterface] do
+        description "Lists the components this space contains."
+
+        resolve ->(participatory_space, _args, _ctx) {
+                  Decidim::Component.where(
+                    participatory_space: participatory_space
+                  ).published
+                }
+      end
+
+      field :bannerImage, types.String, "The banner image for this question", property: :banner_image
+      field :heroImage, types.String, "The hero image for this question", property: :hero_image
+
+      field :whatIsDecided, Decidim::Core::TranslatedFieldType, "What is decided in this question", property: :what_is_decided
+      field :promoterGroup, Decidim::Core::TranslatedFieldType, "The promoter group of this question", property: :promoter_group
+      field :participatoryScope, Decidim::Core::TranslatedFieldType, "The participatory scope of this question", property: :participatory_scope
+      field :questionContext, Decidim::Core::TranslatedFieldType, "The context for this question", property: :question_context
+      field :reference, types.String, "The reference for this question", property: :reference
+      field :hashtag, types.String, "The hashtag of this question", property: :hashtag
+      field :votesCount, types.Int, "The number of votes in this question", property: :votes_count
+      field :originScope, Decidim::Core::TranslatedFieldType, "The origin scope of this question", property: :origin_scope
+      field :originTitle, Decidim::Core::TranslatedFieldType, "The origin title of this question", property: :origin_title
+      field :originUrl, types.String, "The origin URL for this question", property: :origin_url
+      field :iFrameUrl, types.String, "The iframe URL for this question", property: :i_frame_url
+      field :externalVoting, types.Boolean, "If the question has external voting", property: :external_voting
+      field :responsesCount, types.Int, "The number of responses for this question", property: :responses_count
+      field :order, types.Int, "The order in which the question should be represented", property: :order
+      field :maxVotes, types.Int, "The maximum number of votes in this question", property: :max_votes
+      field :minVotes, types.Int, "The minimum number of votes in this question", property: :min_votes
+      field :responseGroupsCount, types.Int, "The number of group responses for this question", property: :response_groups_count
+      field :instructions, Decidim::Core::TranslatedFieldType, "Instructions for this question", property: :instructions
+    end
+  end
+end

data/app/types/decidim/consultations/consultation_type.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Consultations
+    # This type represents a consultation.
+    ConsultationType = GraphQL::ObjectType.define do
+      interfaces [
+        -> { Decidim::Core::ParticipatorySpaceInterface }
+      ]
+
+      name "Consultation"
+      description "A consultation"
+
+      field :subtitle, Decidim::Core::TranslatedFieldType, "The subtitle of this consultation"
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this consultation"
+      field :slug, !types.String, "Slug of this consultation"
+      field :createdAt, !Decidim::Core::DateTimeType, "The time this consultation was created", property: :created_at
+      field :updatedAt, !Decidim::Core::DateTimeType, "The time this consultation was updated", property: :updated_at
+      field :publishedAt, !Decidim::Core::DateTimeType, "The time this consultation was published", property: :published_at
+
+      field :introductoryVideoUrl, types.String, "The introductory video url for this consultation", property: :introductory_video_url
+      field :introductoryImage, types.String, "The introductory image for this consultation", property: :introductory_image
+      field :bannerImage, types.String, "The banner image for this consultation", property: :banner_image
+      field :highlightedScope, Decidim::Core::ScopeApiType, "This is the highlighted scope of this consultation", property: :highlighted_scope
+      field :startVotingDate, Decidim::Core::DateType, "Start date of the voting for this consultation", property: :start_voting_date
+      field :endVotingDate, Decidim::Core::DateType, "End date of the voting for this consultation", property: :end_voting_date
+      field :resultsPublishedAt, Decidim::Core::DateType, "Date when the results have been published", property: :results_published_at
+
+      field :questions, types[Decidim::Consultations::ConsultationQuestionType], ""
+    end
+  end
+end

data/app/views/decidim/consultations/admin/consultations/index.html.erb

@@ -1,4 +1,4 @@
-<div class="card" id="consultations">
+<div class="card with-overflow" id="consultations">
   <div class="card-divider">
     <h2 class="card-title">
       <%= t "decidim.admin.titles.consultations" %>
@@ -6,13 +6,14 @@
                   ["new", "consultation"], class: "button tiny button--title" if allowed_to? :create, :consultation %>
     </h2>
   </div>
+  <%= admin_filter_selector %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
         <thead>
           <tr>
             <th><%= t("models.consultation.fields.title", scope: "decidim.admin") %></th>
-            <th><%= t("models.consultation.fields.created_at", scope: "decidim.admin") %></th>
+            <th><%= sort_link(query, :created_at, t("models.consultation.fields.created_at", scope: "decidim.admin"), default_order: :desc) %></th>
             <th class="table-list__actions">
               <%= t("models.consultation.fields.published", scope: "decidim.admin") %>
             </th>

data/config/locales/el.yml

@@ -0,0 +1 @@
+el:

data/lib/decidim/consultations/participatory_space.rb

@@ -10,6 +10,8 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
     Decidim::Consultation.where(organization: organization)
   end
 
+  participatory_space.query_type = "Decidim::Consultations::ConsultationType"
+
   participatory_space.context(:public) do |context|
     context.engine = Decidim::Consultations::Engine
     context.layout = "layouts/decidim/question"

data/lib/decidim/consultations/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     def self.version
-      "0.20.1"
+      "0.21.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-consultations
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 description: Extends Decidim adding a first level public consultation component
 email:
 - jsperezg@gmail.com
@@ -131,6 +131,7 @@ files:
 - app/constraints/decidim/consultations/current_component.rb
 - app/constraints/decidim/consultations/current_question.rb
 - app/controllers/concerns/decidim/consultations/admin/consultation_admin.rb
+- app/controllers/concerns/decidim/consultations/admin/filterable.rb
 - app/controllers/concerns/decidim/consultations/admin/question_admin.rb
 - app/controllers/concerns/decidim/consultations/needs_consultation.rb
 - app/controllers/concerns/decidim/consultations/needs_question.rb
@@ -184,6 +185,8 @@ files:
 - app/queries/decidim/consultations/organization_consultations.rb
 - app/queries/decidim/consultations/organization_questions.rb
 - app/services/decidim/consultations/consultation_search.rb
+- app/types/decidim/consultations/consultation_question_type.rb
+- app/types/decidim/consultations/consultation_type.rb
 - app/views/decidim/consultations/_consultation.html.erb
 - app/views/decidim/consultations/admin/consultations/_form.html.erb
 - app/views/decidim/consultations/admin/consultations/edit.html.erb
@@ -250,6 +253,7 @@ files:
 - config/locales/cs.yml
 - config/locales/de.yml
 - config/locales/el-GR.yml
+- config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
 - config/locales/es-MX.yml