decidim-proposals 0.19.1 → 0.23.0

data/app/types/decidim/proposals/proposals_type.rb

@@ -8,26 +8,33 @@ module Decidim
       name "Proposals"
       description "A proposals component of a participatory space."
 
-      connection :proposals, ProposalType.connection_type do
-        resolve ->(component, _args, _ctx) {
-                  ProposalsTypeHelper.base_scope(component).includes(:component)
-                }
-      end
+      connection :proposals,
+                 type: ProposalType.connection_type,
+                 description: "List all proposals",
+                 function: ProposalListHelper.new(model_class: Proposal)
+
+      field :proposal,
+            type: ProposalType,
+            description: "Finds one proposal",
+            function: ProposalFinderHelper.new(model_class: Proposal)
+    end
 
-      field(:proposal, ProposalType) do
-        argument :id, !types.ID
+    class ProposalListHelper < Decidim::Core::ComponentListBase
+      argument :order, ProposalInputSort, "Provides several methods to order the results"
+      argument :filter, ProposalInputFilter, "Provides several methods to filter the results"
 
-        resolve ->(component, args, _ctx) {
-          ProposalsTypeHelper.base_scope(component).find_by(id: args[:id])
-        }
+      # only querying published posts
+      def query_scope
+        super.published
       end
     end
 
-    module ProposalsTypeHelper
-      def self.base_scope(component)
-        Proposal
-          .where(component: component)
-          .published
+    class ProposalFinderHelper < Decidim::Core::ComponentFinderBase
+      argument :id, !types.ID, "The ID of the proposal"
+
+      # only querying published posts
+      def query_scope
+        super.published
       end
     end
   end

data/app/validators/proposal_length_validator.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+# This validator takes care of ensuring the validated attributes are long enough
+# and not too long. The difference to the Rails length validator is that this
+# allows the minimum and maximum values to be lambdas allowing us to fetch the
+# maximum length dynamically for each proposals component.
+class ProposalLengthValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    return if value.blank?
+
+    validate_min_length(record, attribute, value)
+    validate_max_length(record, attribute, value)
+  end
+
+  private
+
+  def validate_min_length(record, attribute, value)
+    min = options[:minimum] || nil
+    min = min.call(record) if min.respond_to?(:call)
+    if min && min.positive? && value.length < min
+      record.errors.add(
+        attribute,
+        options[:message] || :too_short
+      )
+    end
+  end
+
+  def validate_max_length(record, attribute, value)
+    max = options[:maximum] || nil
+    max = max.call(record) if max.respond_to?(:call)
+    if max && max.positive? && value.length > max
+      record.errors.add(
+        attribute,
+        options[:message] || :too_long
+      )
+    end
+  end
+end

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

@@ -16,7 +16,7 @@
         <%= form.fields_for(:proposals) do |prop_form| %>
         <% proposal= @drafts[prop_form.index] %>
           <li class="accordion-item <%= proposal.article? ? "is-active" : nil %>" data-accordion-item>
-            <a href="#" class="accordion-title flex--sbc"><%= preview_participatory_text_section_title(proposal) %><span class="mr-m"><%= icon "menu", class: "icon--small" %></span></a>
+            <a href="#" class="accordion-title flex--sbc"><%= preview_participatory_text_section_title(proposal) %><span class="mr-m"><%= icon "menu", class: "icon--small", role: "img", "aria-hidden": true %></span></a>
             <div class="accordion-content" data-tab-content>
               <%= render "article-preview", { form: prop_form, proposal: proposal } %>
             </div>
@@ -35,6 +35,14 @@
 <% end -%>
 <script>
 $(window).on("load", function() {
+  // Not all browsers submit the buttons as form data.
+  $('button[name="save_draft"]').on("click", function(ev) {
+    ev.preventDefault();
+
+    var $form = $(this).parents("form");
+    $form.append('<input type="hidden" name="save_draft" value="true" />');
+    $form.submit();
+  });
   $( "#participatory-text" ).on( "sortupdate",
     function( event, ui ) {
       $('#participatory-text li').each(function(idx, li) {

data/app/views/decidim/proposals/admin/proposal_answers/_form.html.erb

@@ -0,0 +1,35 @@
+<%= decidim_form_for(@answer_form, url: proposal_proposal_answer_path(proposal, @answer_form), html: { class: "form edit_proposal_answer" }) do |f| %>
+  <div class="card" id="proposal-answer">
+    <div class="card-divider">
+      <h2 class="card-title"><%= t ".title", title: present(proposal).title %></h2>
+    </div>
+
+    <div class="card-section">
+      <div class="row column">
+        <%= f.collection_radio_buttons :internal_state, [["accepted", t(".accepted")], ["rejected", t(".rejected")], ["evaluating", t(".evaluating")]], :first, :last, prompt: true %>
+      </div>
+
+      <div class="row column">
+        <%= f.translated :editor, :answer, autofocus: true, rows: 15 %>
+      </div>
+
+      <% if current_component.current_settings.answers_with_costs? %>
+        <div class="row column">
+          <%= f.number_field :cost %>
+        </div>
+
+        <div class="row column">
+          <%= f.translated :editor, :cost_report, lines: 12 %>
+        </div>
+
+        <div class="row column">
+          <%= f.translated :editor, :execution_period, lines: 12 %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".answer_proposal") %>
+  </div>
+<% end %>

data/app/views/decidim/proposals/admin/proposal_notes/_form.html.erb

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, url: proposal_proposal_notes_path(proposal, @form), html: { class: "form new_proposal_note" }) do |f| %>
+<%= decidim_form_for(@notes_form, url: proposal_proposal_notes_path(proposal, @notes_form), html: { class: "form new_proposal_note" }) do |f| %>
   <div class="row column">
     <%= f.text_area :body, rows: 10, label: t(".note") %>
   </div>

data/app/views/decidim/proposals/admin/proposal_notes/_proposal_notes.html.erb

@@ -9,7 +9,7 @@
         <% proposal.notes.each do |note| %>
           <div class="card">
             <div class="card-divider">
-              <article class="comment">
+              <div class="comment">
                 <div class="comment__header">
                   <div class="author-data">
                     <div class="author-data__main">
@@ -23,7 +23,7 @@
                 <div class="comment__content">
                   <%= simple_format note.body %>
                 </div>
-              </article>
+              </div>
             </div>
           </div>
         <% end %>
@@ -36,7 +36,7 @@
             <h2 class="card-title"><%= t("leave_your_note", scope: "decidim.proposals.admin.proposal_notes") %></h2>
           </div>
           <div class="card-section">
-            <%= render "form" %>
+            <%= render "decidim/proposals/admin/proposal_notes/form" %>
           </div>
         </div>
       </div>

data/app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb

@@ -7,14 +7,20 @@
     <% end %>
     <%= link_to t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposals_import_path, class: "button tiny button--simple" if allowed_to? :import, :proposals %>
 
+    <% if allowed_to? :export, :proposals %>
+      <%= export_dropdown %>
+    <% end %>
+
     <% if allowed_to? :create, :proposal %>
       <%= link_to t("actions.new", scope: "decidim.proposals"), new_proposal_path, class: "button tiny button--simple" %>
     <% end %>
-
-    <%= export_dropdown %>
   </div>
 
   <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/recategorize" %>
+  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/scope-change" %>
   <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/merge" %>
   <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/split" %>
+  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/assign_to_valuator" %>
+  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/unassign_from_valuator" %>
+  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/publish_answers" %>
 </div>

data/app/views/decidim/proposals/admin/proposals/_form.html.erb

@@ -5,11 +5,11 @@
 
   <div class="card-section">
     <div class="row column hashtags__container">
-      <%= form.text_field :title, class: "js-hashtags", hashtaggable: true, value: form_presenter.title(extras: false).strip %>
+      <%= form.translated :text_field, :title, class: "js-hashtags", value: form_presenter.title(extras: false).strip, hashtaggable: true %>
     </div>
 
     <div class="row column hashtags__container">
-      <%= form.text_area :body, rows: 10, class: "js-hashtags", hashtaggable: true, value: form_presenter.body(extras: false).strip %>
+      <%= form.translated :editor, :body, hashtaggable: true, value: form_presenter.body(extras: false).strip %>
     </div>
 
     <% if @form.component_automatic_hashtags.any? %>
@@ -51,46 +51,26 @@
       </div>
     <% end %>
 
-    <% if component_settings.geocoding_enabled? %>
+    <% if @form.geocoding_enabled? %>
       <div class="row column">
-        <%= form.text_field :address %>
+        <%= form.geocoding_field :address %>
       </div>
     <% end %>
 
     <% if @form.categories&.any? %>
       <div class="row column">
-        <%= form.categories_select :category_id, @form.categories, prompt: t(".select_a_category") %>
+        <%= form.categories_select :category_id, @form.categories, include_blank: t(".select_a_category") %>
       </div>
     <% end %>
 
-    <% if current_participatory_space.has_subscopes? %>
+    <% if current_component.has_subscopes? %>
       <div class="row column">
-        <%= scopes_picker_field form, :scope_id %>
+        <%= scopes_picker_field form, :scope_id, root: current_component.scope %>
       </div>
     <% end %>
 
     <% if component_settings.attachments_allowed? %>
-      <div class="row column gallery__container">
-        <fieldset>
-          <legend><%= t(".gallery_legend") %></legend>
-
-          <% if @form.photos.any? %>
-            <% @form.photos.each do |photo| %>
-              <div class="callout gallery__item" data-closable>
-                <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: photo.file.file.filename %>
-                <%= form.hidden_field :photos, multiple: true, value: photo.id, id: "photo-#{photo.id}" %>
-                <button class="close-button" aria-label="Close" type="button" data-close>
-                  <span aria-hidden="true">&times;</span>
-                </button>
-              </div>
-            <% end %>
-          <% end %>
-
-          <div class="row column">
-            <%= form.file_field :add_photos, multiple: true, label: t(".add_images") %>
-          </div>
-        </fieldset>
-      </div>
+      <%= render partial: "decidim/admin/shared/gallery", locals: { form: form } %>
     <% end %>
 
     <% if component_settings.attachments_allowed? %>

data/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb

@@ -1,4 +1,4 @@
-<tr data-id="<%= proposal.id %>">
+<tr data-id="<%= proposal.id %>" <%= "data-published-state=false" if proposal.answered? && !proposal.published_state? %>>
   <td>
     <%= check_box_tag "proposal_ids_s[]", proposal.id, false, class: "js-check-all-proposal js-proposal-list-check  js-proposal-id-#{proposal.id}" %><br>
   </td>
@@ -6,47 +6,54 @@
     <%= proposal.id %><br>
   </td>
   <td>
-    <%= decidim_html_escape(present(proposal).title).html_safe %><br>
+    <%= link_to(
+     decidim_html_escape(present(proposal).title).html_safe,
+     proposal_path(proposal)
+    ) %><br>
   </td>
   <td>
     <% if proposal.category %>
       <%= translated_attribute proposal.category.name %>
     <% end %>
   </td>
-  <% if current_participatory_space.scopes_enabled? %>
-    <td>
-      <% if proposal.scope %>
-        <%= translated_attribute proposal.scope.name %>
-      <% else %>
-        <%= t("decidim.scopes.global") %>
-      <% end %>
-    </td>
-  <% end %>
+  <%= td_resource_scope_for(proposal.scope) %>
   <td>
     <strong class="<%= proposal_state_css_class proposal.state %>">
       <%= t("decidim/amendment", scope: "activerecord.models", count: 1) if proposal.emendation? %>
-      <%= humanize_proposal_state proposal.state %>
+      <%= proposal_complete_state proposal %>
     </strong>
   </td>
 
-  <% if current_settings.votes_enabled? %>
+  <% unless current_settings.publish_answers_immediately? %>
     <td>
-      <%= proposal.proposal_votes_count %>
+      <% if proposal.answered? && !proposal.emendation? %>
+        <%= humanize_boolean proposal.published_state? %>
+      <% else %>
+        -
+      <% end %>
     </td>
   <% end %>
 
-  <% if current_component.settings.comments_enabled? and !current_settings.comments_blocked? %>
+  <% if current_settings.votes_enabled? %>
     <td>
-      <%= proposal.comments.count %>
+      <%= proposal.proposal_votes_count %>
     </td>
   <% end %>
 
-  <% if allowed_to? :create, :proposal_note %>
+  <% if current_component.settings.comments_enabled? and !current_settings.comments_blocked? %>
     <td>
-      <%= proposal.proposal_notes_count %>
+      <%= proposal.comments_count %>
     </td>
   <% end %>
 
+  <td>
+    <%= proposal.proposal_notes_count %>
+  </td>
+
+  <td class="valuators-count">
+    <%= proposal.valuation_assignments.count %>
+  </td>
+
   <td>
     <%= l proposal.created_at, format: :decidim_short %>
   </td>
@@ -56,15 +63,7 @@
       <%= icon_link_to "pencil", edit_proposal_path(proposal), t("actions.edit_proposal", scope: "decidim.proposals"), class: "action-icon--edit-proposal" %>
     <% end %>
 
-    <% if allowed_to? :create, :proposal_note %>
-      <%= icon_link_to "chat", proposal_proposal_notes_path(proposal_id: proposal.id), t("actions.private_notes", scope: "decidim.proposals"), class: "action-icon--index-notes" %>
-    <% end %>
-
-    <% if allowed_to? :create, :proposal_answer and !proposal.emendation? %>
-      <%= icon_link_to "comment-square", edit_proposal_proposal_answer_path(proposal_id: proposal.id, id: proposal.id), t("actions.answer", scope: "decidim.proposals"), class: " icon--small" %>
-    <% else %>
-      <%= icon "comment-square", scope: "decidim.proposals.admin", class: "action-icon action-icon--disabled" %>
-    <% end %>
+    <%= icon_with_link_to_proposal(proposal) %>
 
     <%= resource_permissions_link(proposal) %>
 

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_assign_to_valuator.html.erb

@@ -0,0 +1,15 @@
+<div id="js-assign-proposals-to-valuator-actions" class="hide js-bulk-action-form">
+  <%= form_tag(valuation_assignment_path, method: :post, id: "js-form-assign-proposals-to-valuator", class: "flex--cc flex-gap--1") do %>
+    <div class="checkboxes hide">
+      <% proposals.each do |proposal| %>
+        <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
+      <% end %>
+    </div>
+
+    <%= bulk_valuators_select(current_participatory_space, t("decidim.proposals.admin.proposals.index.assign_to_valuator")) %>
+
+    <%= submit_tag(t("decidim.proposals.admin.proposals.index.assign_to_valuator_button"), id: "js-submit-assign-proposals-to-valuator", class: "button small button--simple float-left") %>
+
+    <button id="js-cancel-assign-proposals-to-valuator" class="button tiny clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+  <% end %>
+</div>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_dropdown.html.erb

@@ -1,7 +1,7 @@
 <div id="js-bulk-actions-wrapper">
   <button
     id="js-bulk-actions-button"
-    class="button button--nomargin tiny success light dropdown"
+    class="button button--nomargin tiny success light dropdown hide"
     type="button"
     data-toggle="js-bulk-actions-dropdown">
     <%= t("decidim.proposals.admin.proposals.index.actions") %>
@@ -21,6 +21,11 @@
           <%= t("decidim.proposals.admin.proposals.index.change_category") %>
         </button>
       </li>
+      <li>
+        <button type="button" data-action="scope-change-proposals">
+          <%= t("decidim.proposals.admin.proposals.index.change_scope") %>
+        </button>
+      </li>
       <li>
         <button type="button" data-action="merge-proposals">
           <%= t("decidim.proposals.admin.proposals.index.merge") %>
@@ -31,6 +36,21 @@
           <%= t("decidim.proposals.admin.proposals.index.split") %>
         </button>
       </li>
+      <li>
+        <button type="button" data-action="assign-proposals-to-valuator">
+          <%= t("decidim.proposals.admin.proposals.index.assign_to_valuator") %>
+        </button>
+      </li>
+      <li>
+        <button type="button" data-action="unassign-proposals-from-valuator">
+          <%= t("decidim.proposals.admin.proposals.index.unassign_from_valuator") %>
+        </button>
+      </li>
+      <li>
+        <button type="button" data-action="publish-answers">
+          <%= t("decidim.proposals.admin.proposals.index.publish_answers") %>
+        </button>
+      </li>
     </ul>
   </div>
 </div>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_publish_answers.html.erb

@@ -0,0 +1,14 @@
+<div id="js-publish-answers-actions" class="hide js-bulk-action-form">
+  <%= form_tag(publish_answers_proposals_path, method: :post, remote: true, id: "js-form-publish-answers", class: "flex--cc flex-gap--1") do %>
+    <div class="checkboxes hide">
+      <% proposals.each do |proposal| %>
+        <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
+      <% end %>
+    </div>
+    <p><%= t("decidim.proposals.admin.proposals.publish_answers.number_of_proposals", number: '<span id="js-form-publish-answers-number"></span>').html_safe %></p>
+
+    <%= submit_tag(t("decidim.proposals.admin.proposals.index.publish"), id: "js-submit-publish-answers", class: "button small button--simple float-left") %>
+
+    <button id="js-cancel-publish-answers" class="button tiny clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+  <% end %>
+</div>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_scope-change.html.erb

@@ -0,0 +1,25 @@
+<div id="js-scope-change-proposals-actions" class="hide js-bulk-action-form">
+  <%= form_tag(update_scope_proposals_path, method: :post, remote: true, id: "js-form-scope-change-proposals", class: "flex--cc flex-gap--1") do %>
+    <div class="checkboxes hide">
+      <% proposals.each do |proposal| %>
+        <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
+      <% end %>
+    </div>
+
+    <%= scopes_picker_tag(
+          :scope_id,
+          try(:current_participatory_space)&.scope,
+          field: t("models.proposal.fields.scope", scope: "decidim.proposals")
+        ) %>
+
+    <%= submit_tag(
+          t("decidim.proposals.admin.proposals.index.update_scope_button"),
+          id: "js-submit-scope-change-proposals",
+          class: "button small button--simple float-left"
+        ) %>
+
+    <button id="js-cancel-scope-change-proposals" class="button tiny clear compact js-cancel-bulk-action" type="button">
+      <%= t("decidim.proposals.admin.proposals.index.cancel") %>
+    </button>
+  <% end %>
+</div>