decidim-proposals 0.19.1 → 0.23.0

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

@@ -0,0 +1,15 @@
+<div id="js-unassign-proposals-from-valuator-actions" class="hide js-bulk-action-form">
+  <%= form_tag(valuation_assignment_path, method: :delete, id: "js-form-unassign-proposals-from-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.unassign_from_valuator")) %>
+
+    <%= submit_tag(t("decidim.proposals.admin.proposals.index.unassign_from_valuator_button"), id: "js-submit-unassign-proposals-from-valuator", class: "button small button--simple float-left") %>
+
+    <button id="js-cancel-unassign-proposals-from-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/index.html.erb

@@ -1,4 +1,4 @@
-<div class="card">
+<div class="card with-overflow">
   <div class="card-divider">
     <h2 class="card-title flex--sbc">
       <div>
@@ -8,6 +8,7 @@
       <%= render partial: "bulk-actions" %>
     </h2>
   </div>
+  <%= admin_filter_selector(:proposals) %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
@@ -26,34 +27,42 @@
               <%= sort_link(query, :category_name, t("models.proposal.fields.category", scope: "decidim.proposals") ) %>
             </th>
 
-            <% if current_participatory_space.scopes_enabled? %>
+            <% if resource_with_scopes_enabled? %>
               <th>
                 <%= sort_link(query, :scope_name, t("models.proposal.fields.scope", scope: "decidim.proposals") ) %>
               </th>
             <% end %>
 
             <th>
-              <%= sort_link(query, :state, t("models.proposal.fields.state", scope: "decidim.proposals") ) %>
+              <%= sort_link(query, :state, [:state, :is_emendation], t("models.proposal.fields.state", scope: "decidim.proposals") ) %>
             </th>
 
-            <% if current_settings.votes_enabled? %>
+            <% unless current_settings.publish_answers_immediately? %>
               <th>
-                <%= sort_link(query, :proposal_votes_count, t("models.proposal.fields.votes", scope: "decidim.proposals") ) %>
+                <%= sort_link(query, :state_published, t("models.proposal.fields.published_answer", scope: "decidim.proposals") ) %>
               </th>
             <% end %>
 
-            <% if current_component.settings.comments_enabled? and !current_settings.comments_blocked? %>
+            <% if current_settings.votes_enabled? %>
               <th>
-                <%= sort_link(query, :commentable_comments_count, t("models.proposal.fields.comments", scope: "decidim.proposals") ) %>
+                <%= sort_link(query, :proposal_votes_count, t("models.proposal.fields.votes", scope: "decidim.proposals") ) %>
               </th>
             <% end %>
 
-            <% if allowed_to? :create, :proposal_note %>
+            <% if current_component.settings.comments_enabled? and !current_settings.comments_blocked? %>
               <th>
-                <%= sort_link(query, :proposal_notes_count, t("models.proposal.fields.notes", scope: "decidim.proposals") ) %>
+                <%= sort_link(query, :comments_count, t("models.proposal.fields.comments", scope: "decidim.proposals") ) %>
               </th>
             <% end %>
 
+            <th>
+              <%= sort_link(query, :proposal_notes_count, t("models.proposal.fields.notes", scope: "decidim.proposals") ) %>
+            </th>
+
+            <th>
+              <%= sort_link(query, :valuation_assignments_count, t("models.proposal.fields.valuators", scope: "decidim.proposals") ) %>
+            </th>
+
             <th>
               <%= sort_link(query, :published_at, t("models.proposal.fields.published_at", scope: "decidim.proposals") ) %>
             </th>

data/app/views/decidim/proposals/admin/proposals/publish_answers.js.erb

@@ -0,0 +1,12 @@
+$("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
+
+<% proposal_ids.each do |id| %>
+  $(".table-list [data-id='<%= id %>']")
+    .replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
+<% end %>
+
+$(".js-check-all").prop('checked', false);
+$(".js-check-all-proposal").prop('checked', false);
+window.hideBulkActionForms()
+window.showOtherActionsButtons();
+window.selectedProposalsCountUpdate();

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

@@ -0,0 +1,186 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= link_to "#{t ".proposals"} > ", proposals_path %>
+      <%= decidim_html_escape(present(proposal).title).html_safe %>
+
+      <% if allowed_to? :edit, :proposal, proposal: proposal %>
+        <%= icon_link_to "pencil", edit_proposal_path(proposal), t("actions.edit_proposal", scope: "decidim.proposals"), class: "action-icon--edit-proposal" %>
+      <% end %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <strong><%= t ".link" %>:</strong>  <%= link_to resource_locator(proposal).url, resource_locator(proposal).path %>
+    </div>
+
+    <div class="row column">
+      <strong><%= t ".authors" %>:</strong>
+        <ul id="proposal-authors-list">
+          <% coauthor_presenters_for(proposal).each do |presented_author| %>
+            <li>
+              <%= link_to_if(
+                presented_author.profile_path.present?,
+                presented_author.name,
+                presented_author.profile_path,
+                target: :blank
+              ) %>
+              <% if presented_author.can_be_contacted? && presented_author.nickname != present(current_user).nickname %>
+                <%= icon_link_to "envelope-closed", current_or_new_conversation_path_with(presented_author), t("decidim.contact"), class:"action-icon--new" %>
+              <% end %>
+            </li>
+          <% end %>
+        </ul>
+    </div>
+
+    <div class="row column">
+      <strong><%= t ".body" %>:</strong> <%= simple_format(present(proposal).body(strip_tags: true)) %>
+    </div>
+
+    <div class="row column">
+      <strong><%= t ".created_at" %>:</strong> <%= l proposal.created_at, format: :decidim_short %>
+    </div>
+
+    <div class="row column">
+      <strong><%= t ".votes_count" %>:</strong> <%= proposal.proposal_votes_count %>
+    </div>
+
+    <div class="row column">
+      <strong><%= t ".votes_ranking" %>:</strong> <%= i18n_votes_ranking_for(proposal) %>
+    </div>
+
+    <div class="row column">
+      <strong><%= t ".endorsements_count" %>:</strong> <%= proposal.endorsements_count %>
+    </div>
+
+    <div class="row column">
+      <strong><%= t ".endorsements_ranking" %>:</strong> <%= i18n_endorsements_ranking_for(proposal) %>
+    </div>
+
+    <div class="row column">
+      <strong><%= t ".amendments_count" %>:</strong> <%= proposal.amendments.count %>
+    </div>
+
+    <div class="row column">
+      <strong><%= t ".comments_count" %>:</strong> <%= proposal.comments_count %>
+      <ul id="proposal-comments-alignment-count">
+        <li><strong><%= t ".comments_positive_count" %>:</strong> <%= proposal.comments.positive.count %></li>
+        <li><strong><%= t ".comments_neutral_count" %>:</strong> <%= proposal.comments.neutral.count %></li>
+        <li><strong><%= t ".comments_negative_count" %>:</strong> <%= proposal.comments.negative.count %></li>
+      </ul>
+    </div>
+
+    <div class="row column">
+      <strong><%= t ".endorsers" %>:</strong>
+        <ul id="proposal-endorsers-list">
+          <% presented_endorsers = endorsers_presenters_for(proposal).to_a %>
+          <% presented_endorsers.first(5).each do |presented_endorser| %>
+            <li>
+              <%= link_to_if(
+                presented_endorser.profile_path.present?,
+                presented_endorser.name,
+                presented_endorser.profile_path,
+                target: :blank
+              ) %>
+            </li>
+          <% end %>
+          <% if presented_endorsers.count > 5 %>
+            <li>
+              <%= link_to(
+                  t(".n_more_endorsers", count: presented_endorsers.count - 5),
+                  resource_locator(proposal).path
+              ) %>
+            </li>
+          <% end %>
+        </ul>
+    </div>
+
+    <div class="row column">
+      <strong><%= t ".related_meetings" %>:</strong>
+        <ul id="related-meetings">
+          <% proposal.linked_resources(:meetings, "proposals_from_meeting").each do |meeting| %>
+            <% presented_meeting = present(meeting) %>
+            <li>
+              <%= link_to presented_meeting.title, presented_meeting.profile_path %>
+            </li>
+          <% end %>
+        </ul>
+    </div>
+
+    <% if proposal.documents.any? %>
+      <div class="row column">
+        <strong><%= t ".documents" %>:</strong>
+          <ul id="documents">
+            <% proposal.documents.each do |document| %>
+              <li>
+                <%= link_to translated_attribute(document.title), document.url %>
+                <small><%= document.file_type %> <%= number_to_human_size(document.file_size) %></small>
+              </li>
+            <% end %>
+          </ul>
+      </div>
+    <% end %>
+
+    <% if proposal.photos.any? %>
+      <div class="row column">
+        <strong><%= t(".photos") %>:</strong>
+        <div id="photos" class="gallery row">
+          <% proposal.photos.each do |photo| %>
+            <%= link_to photo.big_url, target: "_blank", rel: "noopener" do %>
+              <%= image_tag photo.thumbnail_url, class:"thumbnail", alt: strip_tags(translated_attribute(photo.title)) %>
+            <% end %>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+
+  </div>
+</div>
+
+<% if proposal.valuators.any? %>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t ".valuators" %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <strong><%= t ".assigned_valuators" %>:</strong>
+      <ul id="valuators">
+        <% proposal.valuation_assignments.each do |assignment| %>
+          <% presented_valuator = present(assignment.valuator) %>
+            <li>
+              <%= link_to(
+                presented_valuator.name,
+                presented_valuator.profile_path,
+                target: :blank
+              ) %>
+
+              <% if allowed_to? :unassign_from_valuator, :proposals, valuator: assignment.valuator %>
+                <%= icon_link_to(
+                  "circle-x",
+                  proposal_valuation_assignment_path(proposal, assignment.valuator_role),
+                  t(".remove_assignment"),
+                  method: :delete,
+                  data: { confirm: t(".remove_assignment_confirmation") },
+                  class: "red-icon"
+                ) %>
+              <% end %>
+            </li>
+        <% end %>
+      </ul>
+    </div>
+  </div>
+</div>
+<% end %>
+
+<% if allowed_to?(:create, :proposal_note, proposal: proposal) %>
+  <%= render "decidim/proposals/admin/proposal_notes/proposal_notes" %>
+<% end %>
+
+<% if allowed_to?(:create, :proposal_answer, proposal: proposal) && !proposal.emendation? %>
+  <%= render "decidim/proposals/admin/proposal_answers/form" %>
+<% end %>

data/app/views/decidim/proposals/admin/proposals/update_category.js.erb

@@ -11,7 +11,7 @@
 <% if flash.now[:notice].present? %>
   $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
 
-  <% @proposal_ids.each do |id| %>
+  <% proposal_ids.each do |id| %>
     $(".table-list [data-id='<%= id %>']")
       .replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
   <% end %>
@@ -19,7 +19,8 @@
   $("#js-form-recategorize-proposals #category_id").removeClass("is-invalid-input")
   $(".js-check-all").prop('checked', false);
   $(".js-check-all-proposal").prop('checked', false);
-  window.hideRecategorizeProposalActions()
+  window.hideBulkActionsButton();
+  window.hideBulkActionForms();
   window.showOtherActionsButtons();
   window.selectedProposalsCountUpdate();
 <% end %>

data/app/views/decidim/proposals/admin/proposals/update_scope.js.erb

@@ -0,0 +1,27 @@
+<% if flash.now[:error].present? %>
+  $("#js-form-scope-change-proposals #scope_id").addClass("is-invalid-input")
+  $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{alert}, text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
+<% end %>
+
+<% if flash.now[:alert].present? %>
+  $("#js-form-scope-change-proposals #scope_id").removeClass("is-invalid-input")
+  $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{warning}, text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
+<% end %>
+
+<% if flash.now[:notice].present? %>
+  $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
+
+  <% @proposal_ids.each do |id| %>
+    $(".table-list [data-id='<%= id %>']")
+      .replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
+  <% end %>
+
+  $("#js-form-scope-change-proposals #scope_id").removeClass("is-invalid-input")
+  $(".js-check-all").prop('checked', false);
+  $(".js-check-all-proposal").prop('checked', false);
+
+  window.hideBulkActionForms();
+  window.hideBulkActionsButton();
+  window.showOtherActionsButtons();
+  window.selectedProposalsCountUpdate();
+<% end %>

data/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb

@@ -1,9 +1,11 @@
+<%= form_required_explanation %>
+
 <div class="field hashtags__container">
-  <%= form.text_field :title, class: "js-hashtags", hashtaggable: true, value: form_presenter.title %>
+  <%= form.text_field :title, class: "js-hashtags", value: form_presenter.title %>
 </div>
 
 <div class="field hashtags__container">
-  <%= form.text_area :body, rows: 10, class: "js-hashtags", hashtaggable: true, value: form_presenter.body(extras: false).strip %>
+  <%= form.text_area :body, rows: 10, class: "js-hashtags", value: form_presenter.body(extras: false).strip %>
 </div>
 
 <% if @form.component_automatic_hashtags.any? %>
@@ -21,7 +23,7 @@
 
 <% if @form.component_suggested_hashtags.any? %>
   <div class="field">
-    <%= form.label :suggested_hashtags %>
+    <%= form.label :suggested_hashtags, nil, for: nil %>
     <div class="checkboxes hashtags">
       <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map {|hashtag| [hashtag.downcase, "##{hashtag}"]}, :first, :last do |option|
         option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
@@ -30,29 +32,29 @@
   </div>
 <% end %>
 
-<% if component_settings.geocoding_enabled? %>
+<% if @form.geocoding_enabled? %>
   <div class="field">
     <%= form.check_box :has_address, checked: form_has_address? %>
   </div>
 
   <div class="field" id="address_input">
-    <%= form.text_field :address %>
+    <%= form.geocoding_field :address %>
   </div>
 <% end %>
 
 <% if @form.categories&.any? %>
   <div class="field">
-    <%= form.categories_select :category_id, @form.categories, prompt: t("decidim.proposals.collaborative_drafts.edit.select_a_category") %>
+    <%= form.categories_select :category_id, @form.categories, include_blank: t("decidim.proposals.collaborative_drafts.edit.select_a_category") %>
   </div>
 <% end %>
 
-<% if current_participatory_space.has_subscopes? %>
+<% if current_component.has_subscopes? %>
   <div class="field">
-    <%= scopes_picker_field form, :scope_id %>
+    <%= scopes_picker_field form, :scope_id, root: current_component.scope %>
   </div>
 <% end %>
 
-<% if  current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
+<% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
   <div class="field">
     <%= user_group_select_field form, :user_group_id %>
   </div>

data/app/views/decidim/proposals/collaborative_drafts/_filters.html.erb

@@ -1,29 +1,31 @@
+<%= render partial: "decidim/shared/filter_form_help", locals: { skip_to_id: "collaborative_drafts" } %>
+
 <%= filter_form_for filter do |form| %>
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search") %>
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
-          <button type="submit" class="button button--muted">
-            <%= icon "magnifying-glass", aria_label: t(".search") %>
+          <button type="submit" class="button" aria-controls="collaborative_drafts">
+            <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
           </button>
         </div>
       </div>
     </div>
   </div>
 
-  <%= form.collection_radio_buttons :state, collaborative_drafts_states_collection, :first, :last, legend_title: t(".state") %>
+  <%= form.check_boxes_tree :state, filter_collaborative_drafts_state_values, legend_title: t(".state"), "aria-controls": "collaborative_drafts" %>
 
   <% if linked_classes_for(Decidim::Proposals::CollaborativeDraft).any? %>
-    <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::CollaborativeDraft), :first, :last, legend_title: t(".related_to") %>
+    <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::CollaborativeDraft), :first, :last, { legend_title: t(".related_to") }, "aria-controls": "collaborative_drafts" %>
   <% end %>
 
-  <% if current_participatory_space.has_subscopes? %>
-    <%= scopes_picker_filter form, :scope_id %>
+  <% if current_component.has_subscopes? %>
+    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "collaborative_drafts" %>
   <% end %>
 
   <% if current_component.categories.any? %>
-    <%= form.categories_select :category_id, current_component.categories, legend_title: t(".category"), disable_parents: false, label: false, prompt: t(".category_prompt") %>
+    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "collaborative_drafts" %>
   <% end %>
 
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>

data/app/views/decidim/proposals/collaborative_drafts/_new_collaborative_draft_button.html.erb

@@ -1,11 +1,11 @@
 <% if current_settings.creation_enabled %>
-  <%= action_authorized_link_to :create, new_collaborative_draft_path, class: "title-action__action button small hollow", data: { "redirect_url" => new_collaborative_draft_path } do %>
+  <%= action_authorized_link_to :create, new_collaborative_draft_path, class: "title-action__action button small", data: { "redirect_url" => new_collaborative_draft_path } do %>
     <%= t(".new_collaborative_draft") %>
-    <%= icon "plus" %>
+    <%= icon "plus", role: "img", "aria-hidden": true %>
   <% end %>
 <% else %>
-  <span class="title-action__action button small hollow disabled">
+  <span class="title-action__action button small disabled">
     <%= t(".new_collaborative_draft") %>
-    <%= icon "plus" %>
+    <%= icon "plus", role: "img", "aria-hidden": true %>
   </span>
 <% end %>

data/app/views/decidim/proposals/collaborative_drafts/_reject_request_access_form.html.erb

@@ -4,7 +4,7 @@
     <%= form.hidden_field :state, value: @collaborative_draft.state %>
     <%= form.hidden_field :requester_user_id, value: requester.id %>
     <%= button_tag type: "submit", data: { disable: true }, title: reject_request_button_label do %>
-      <%= icon "x", class: "icon--small muted ml-xs" %>
+      <%= icon "x", class: "icon--small muted ml-xs", aria_label: reject_request_button_label, role: "img" %>
     <% end %>
   <% end %>
 <% end %>