decidim-proposals 0.30.0.rc2 → 0.30.0

data/app/packs/stylesheets/decidim/proposals/proposals.scss

@@ -122,7 +122,8 @@
         }
       }
 
-      .card__proposals-votes {
+      .card__proposals-votes,
+      .card__proposals-votes-hidden {
         @apply flex md:flex-col lg:flex-row bg-[#F5F5F5] justify-around md:flex-[0.6] lg:flex-[0.8] items-center md:items-stretch lg:items-center lg:min-w-[196px] h-[68px] md:h-auto lg:h-[68px];
 
         button {
@@ -138,6 +139,14 @@
 
           .proposals__aside-progress {
             @apply flex flex-col w-[80%] items-center md:order-1 lg:order-none md:flex-[1_1_100%] lg:flex-none;
+
+            .progress-bar {
+              @apply bg-[#D3D5D9] border-white border border-solid;
+
+              > :first-child {
+                @apply outline outline-white;
+              }
+            }
           }
 
           .progress-bar {
@@ -149,6 +158,10 @@
               span {
                 @apply text-sm;
               }
+
+              > :last-child::before {
+                @apply content-['/'] mx-1;
+              }
             }
           }
         }
@@ -228,7 +241,8 @@
         }
       }
 
-      .card__proposals-votes {
+      .card__proposals-votes,
+      .card__proposals-votes-hidden {
         @apply flex bg-[#F5F5F5EE] justify-around items-center px-4 h-[68px];
 
         button {
@@ -244,6 +258,14 @@
 
           .proposals__aside-progress {
             @apply flex flex-col-reverse w-[80%] items-center;
+
+            .progress-bar {
+              @apply bg-[#D3D5D9] border-white border border-solid;
+
+              > :first-child {
+                @apply outline outline-white;
+              }
+            }
           }
 
           .progress-bar {
@@ -253,6 +275,10 @@
               span {
                 @apply text-sm;
               }
+
+              > :last-child::before {
+                @apply content-['/'] mx-1;
+              }
             }
 
             &__units {
@@ -374,3 +400,9 @@
     @apply lg:col-start-2 lg:col-span-10;
   }
 }
+
+.card__proposals-item {
+  & + & {
+    @apply mt-6;
+  }
+}

data/app/services/decidim/proposals/proposal_builder.rb

@@ -63,6 +63,7 @@ module Decidim
           "created_at",
           "updated_at",
           "state",
+          "decidim_proposals_proposal_state_id",
           "state_published_at",
           "answer",
           "answered_at",

data/app/views/decidim/proposals/admin/import_proposals_mailer/notify_failure.html.erb

@@ -0,0 +1 @@
+<p><%= t(".body", origin_component_name: translated_attribute(@origin_component.name), target_component_name: translated_attribute(@target_component.name)) %></p>

data/app/views/decidim/proposals/admin/import_proposals_mailer/notify_success.html.erb

@@ -0,0 +1,2 @@
+<p><%= t(".body", origin_component_name: translated_attribute(@origin_component.name), target_component_name: translated_attribute(@target_component.name)) %></p>
+<p><%= t(".added_proposals", count: @count) %></p>

data/app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb

@@ -23,12 +23,10 @@
       morphdom($remainingVotesCount[0], '<%= j(render partial: "decidim/proposals/proposals/remaining_votes_count").strip.html_safe %>');
     }
 
-    <% if remaining_votes_count_for(current_user) == 0 %>
+    <% if remaining_votes_count_for_user == 0 %>
       $notVotedButtons.attr('disabled', true);
-      $notVotedButtons.text('<%= t("decidim.proposals.proposals.vote_button.no_votes_remaining") %>');
     <% else %>
       $notVotedButtons.attr('disabled', false);
-      $notVotedButtons.text('<%= t("decidim.proposals.proposals.vote_button.vote") %>');
     <% end %>
   }());
 <% end %>
@@ -44,9 +42,8 @@
       morphdom($votingRules[0], '<%= j(render partial: "decidim/proposals/proposals/voting_rules").strip.html_safe %>');
     }
 
-    <% if remaining_minimum_votes_count_for(current_user).zero? %>
+    <% if minimum_votes_per_user_enabled? && remaining_minimum_votes_count_for_user.zero? %>
       $votingRulesNode.prepend(`<%= j(render partial: "decidim/proposals/proposals/notification_alert_box").strip.html_safe %>`)
-
     <% end %>
     if ($exitProposalModal[0]) {
       morphdom($exitProposalModal[0], '<%= j(render partial: "decidim/proposals/proposals/exit_modal").strip.html_safe %>')
@@ -56,7 +53,7 @@
     }
 
     if ($remainingVotesNotification[0]) {
-      morphdom($remainingVotesNotification[0], '<%= j(render partial: "decidim/proposals/proposals/remaining_votes_notification").strip.html_safe %>')
+      morphdom($remainingVotesNotification[0], '<%= j(render partial: "decidim/proposals/proposals/remaining_votes_notification").strip.html_safe %>');
     }
   }());
 <% end %>

data/app/views/decidim/proposals/proposals/_exit_modal.html.erb

@@ -1,11 +1,11 @@
 <%= decidim_modal id: "exit-proposal-notification" do %>
-  <div data-dialog-container data-minimum-votes-reached="<%= remaining_minimum_votes_count_for(current_user).zero? %>" data-minimum-votes-count="<%= minimum_votes_per_user - remaining_minimum_votes_count_for(current_user) %>">
+  <div data-dialog-container data-minimum-votes-reached="<%= remaining_minimum_votes_count_for_user.zero? %>" data-minimum-votes-count="<%= minimum_votes_per_user - remaining_minimum_votes_count_for_user %>">
     <%= icon "information-line" %>
     <h3 class="h3 text-base" id="dialog-title-exit-proposal-notification" tabindex="-1" data-dialog-title>
-      <%= t("title", scope: "decidim.proposals.exit_modal", number: remaining_minimum_votes_count_for(current_user)) %>
+      <%= t("title", scope: "decidim.proposals.exit_modal", number: remaining_minimum_votes_count_for_user) %>
     </h3>
     <p id="dialog-desc-budget-modal">
-      <%= t("message", scope: "decidim.proposals.exit_modal", number: remaining_minimum_votes_count_for(current_user)) %>
+      <%= t("message", scope: "decidim.proposals.exit_modal", number: remaining_minimum_votes_count_for_user) %>
     </p>
   </div>
   <div data-dialog-actions>

data/app/views/decidim/proposals/proposals/_proposal.html.erb

@@ -1 +1 @@
-<%= card_for proposal, from: proposal, size: card_size %>
+<%= card_for proposal, from: proposal, size: card_size, show_voting: %>

data/app/views/decidim/proposals/proposals/_proposals.html.erb

@@ -8,7 +8,7 @@
   <%= cell("decidim/announcement", params[:filter].present? ? t(".empty_filters") : t(".empty")) %>
 <% else %>
   <div class="flex items-center justify-between">
-    <h2 class="h5 md:h3 decorator"><%= t("count", scope: "decidim.proposals.proposals.index", count: @proposals.total_count) %></h2>
+    <h2 class="h5 md:h3 decorator" aria-live="polite" aria-atomic="true"><%= t("count", scope: "decidim.proposals.proposals.index", count: @proposals.total_count) %></h2>
     <div class="view-layout__links flex view_mode__links">
       <%= toggle_view_mode_link(@view_mode, "list", t("list_mode", scope: "decidim.proposals.proposals.index"), params) %>
       <%= toggle_view_mode_link(@view_mode, "grid", t("grid_mode", scope: "decidim.proposals.proposals.index"), params) %>
@@ -18,7 +18,7 @@
   <%= order_selector available_orders, i18n_scope: "decidim.proposals.proposals.orders" %>
 
   <div class="<%= proposals_container_class(@view_mode) %>">
-    <%= render partial: "proposal", collection: @proposals, as: :proposal, locals: { card_size: card_size_for_view_mode(@view_mode) } %>
+    <%= render partial: "proposal", collection: @proposals, as: :proposal, locals: { card_size: card_size_for_view_mode(@view_mode), show_voting: true } %>
   </div>
 
   <%= decidim_paginate @proposals %>

data/app/views/decidim/proposals/proposals/_remaining_votes_count.html.erb

@@ -1,3 +1,3 @@
 <div data-remaining-votes-count="true">
-  <%= t("votes", scope: "decidim.proposals.proposals.voting_rules.vote_limit", number: remaining_minimum_votes_count_for(current_user)) %>
+  <%= t("votes", scope: "decidim.proposals.proposals.voting_rules.vote_limit", number: remaining_minimum_votes_count_for_user) %>
 </div>

data/app/views/decidim/proposals/proposals/_remaining_votes_notification.html.erb

@@ -1,12 +1,12 @@
 <%= alert_box(
   message(
     content_tag(:div, class: "") do
-      concat content_tag(:strong, t("already_vote.title", scope: "decidim.proposals.proposals.voting_rules", number: remaining_minimum_votes_count_for(current_user)))
-      concat content_tag(:p, t("already_vote.description", scope: "decidim.proposals.proposals.voting_rules", number: remaining_minimum_votes_count_for(current_user)))
+      concat content_tag(:strong, t("already_vote.title", scope: "decidim.proposals.proposals.voting_rules", number: remaining_minimum_votes_count_for_user))
+      concat content_tag(:p, t("already_vote.description", scope: "decidim.proposals.proposals.voting_rules", number: remaining_minimum_votes_count_for_user))
       concat link_to(t("already_vote.see_other_proposals", scope: "decidim.proposals.proposals.voting_rules"), proposals_path, class: "no-modal")
     end
   ),
   :secondary,
   true,
-  { id: "remaining-votes-notification", class: "flash secondary #{"hidden" unless remaining_minimum_votes_count_for(current_user).positive?}" }
+  { id: "remaining-votes-notification", class: "flash secondary #{"hidden" unless remaining_minimum_votes_count_for_user.positive?}" }
 ) %>

data/app/views/decidim/proposals/proposals/_vote_button.html.erb

@@ -17,7 +17,7 @@
           <% end %>
         <% end %>
       <% else %>
-        <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
+        <% if proposal_voted_by_user?(proposal) %>
           <%= action_authorized_button_to(
             :vote,
             proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list:),
@@ -42,7 +42,7 @@
           <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
             <%= content_tag :button, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: button_classes, data: { "proposal-vote-button": true }, disabled: true %>
           <% else %>
-            <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
+            <% if vote_limit_enabled? && remaining_votes_count_for_user == 0 %>
               <%= content_tag :button, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: button_classes, data: { "proposal-vote-button": true }, disabled: true %>
             <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
               <%= content_tag :button, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: button_classes, data: { "proposal-vote-button": true }, disabled: true %>

data/app/views/decidim/proposals/proposals/_votes_count.html.erb

@@ -1,4 +1,4 @@
-<% if !current_settings.votes_hidden? && current_component.participatory_space.can_participate?(current_user) %>
+<% if !current_settings.votes_hidden? && (current_component.participatory_space.can_participate?(current_user) || current_user.admin?) %>
   <% if component_settings.participatory_texts_enabled? && from_proposals_list %>
     <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_votes_count", locals: { proposal:, from_proposals_list: true } %>
   <% else %>

data/app/views/decidim/proposals/proposals/_voting_rules.html.erb

@@ -1,31 +1,34 @@
 <% if show_voting_rules? %>
-  <% announcement_body = capture do %>
-    <div class="editor-content">
-      <ul class="mt-0 mb-2">
-        <% if vote_limit_enabled? %>
-          <li><%= t(".vote_limit.description", limit: component_settings.vote_limit) %></li>
-        <% end %>
+  <div class="item_voting_rules">
+    <%= render partial: "decidim/proposals/proposals/remaining_votes_notification" %>
+    <% announcement_body = capture do %>
+      <div class="editor-content">
+        <ul class="mt-0 mb-2">
+          <% if vote_limit_enabled? %>
+            <li><%= t(".vote_limit.description", limit: component_settings.vote_limit) %></li>
+          <% end %>
 
-        <% if proposal_limit_enabled? %>
-          <li><%= t(".proposal_limit.description", limit: proposal_limit) %></li>
-        <% end %>
+          <% if proposal_limit_enabled? %>
+            <li><%= t(".proposal_limit.description", limit: proposal_limit) %></li>
+          <% end %>
 
-        <% if threshold_per_proposal_enabled? %>
-          <li><%= t(".threshold_per_proposal.description", limit: threshold_per_proposal) %></li>
-        <% end %>
+          <% if threshold_per_proposal_enabled? %>
+            <li><%= t(".threshold_per_proposal.description", limit: threshold_per_proposal) %></li>
+          <% end %>
 
-        <% if can_accumulate_votes_beyond_threshold? %>
-          <li><%= t(".can_accumulate_votes_beyond_threshold.description", limit: threshold_per_proposal) %></li>
-        <% end %>
+          <% if can_accumulate_votes_beyond_threshold? %>
+            <li><%= t(".can_accumulate_votes_beyond_threshold.description", limit: threshold_per_proposal) %></li>
+          <% end %>
 
-        <% if minimum_votes_per_user_enabled? %>
-          <li>
-            <%= t(".minimum_votes_per_user.description", votes: minimum_votes_per_user) %>
-          </li>
-        <% end %>
-      </ul>
-    </div>
-  <% end %>
+          <% if minimum_votes_per_user_enabled? %>
+            <li>
+              <%= t(".minimum_votes_per_user.description", votes: minimum_votes_per_user) %>
+            </li>
+          <% end %>
+        </ul>
+      </div>
+    <% end %>
 
-  <%= cell("decidim/announcement", { title: t(".title"), body: announcement_body }, id: "voting-rules") %>
+    <%= cell("decidim/announcement", { title: t(".title"), body: announcement_body }, id: "voting-rules") %>
+  </div>
 <% end %>

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

@@ -43,12 +43,7 @@
   <% end %>
 
   <%= render partial: "decidim/shared/component_announcement" %>
-
-  <% if show_voting_rules? %>
-    <section class="layout-main__section">
-      <%= render partial: "voting_rules" %>
-    </section>
-  <% end %>
+  <%= render partial: "voting_rules" %>
 
   <section id="proposals" class="layout-main__section layout-main__heading">
     <%= render partial: "proposals" %>

data/app/views/decidim/proposals/proposals/participatory_texts/_proposal_vote_button.html.erb

@@ -14,7 +14,7 @@
         <% end %>
       <% end %>
     <% else %>
-      <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
+      <% if proposal_voted_by_user?(proposal) %>
         <%= action_authorized_button_to(
           :vote,
           proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list:),
@@ -38,7 +38,7 @@
         <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
           <%= content_tag :span, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: "column button light button--sc disabled", disabled: true %>
         <% else %>
-          <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
+          <% if vote_limit_enabled? && remaining_votes_count_for_user == 0 %>
             <%= content_tag :span, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: "column button light button--sc", disabled: true %>
           <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
             <%= content_tag :span, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: "column button light button--sc disabled", disabled: true %>

data/app/views/decidim/proposals/proposals/participatory_texts/_proposal_votes_count.html.erb

@@ -12,7 +12,7 @@
       </button>
     <% end %>
   <% else %>
-    <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
+    <% if proposal_voted_by_user?(proposal) %>
       <button type="button" name="button" class="column button success button--sc" id="proposal-<%= proposal.id %>-votes-count">
         <%= proposal.proposal_votes_count || 0 %>
       </button>
@@ -22,7 +22,7 @@
           <%= proposal.proposal_votes_count || 0 %>
         </button>
       <% else %>
-        <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
+        <% if vote_limit_enabled? && remaining_votes_count_for_user == 0 %>
           <button type="button" name="button" class="column button button--sc" disabled id="proposal-<%= proposal.id %>-votes-count">
             <%= proposal.proposal_votes_count || 0 %>
           </button>

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

@@ -41,7 +41,7 @@ extra_admin_link(
 <%= render layout: "layouts/decidim/shared/layout_item", locals: { back_path: component_settings.participatory_texts_enabled? ? main_component_path(current_component) : proposals_path } do %>
 
   <section class="layout-main__section layout-main__heading">
-    <% if show_voting_rules? && remaining_minimum_votes_count_for(current_user).positive? && current_component.participatory_space.can_participate?(current_user) %>
+    <% if show_voting_rules? && remaining_minimum_votes_count_for_user.positive? && current_component.participatory_space.can_participate?(current_user) %>
       <%= render partial: "exit_modal" %>
     <% end %>
 

data/config/locales/ar.yml

@@ -198,6 +198,8 @@ ar:
     events:
       proposals:
         admin:
+          proposal_assigned_to_valuator:
+            email_outro: تلقيت هذا الإشعار لأنك تستطيع تقييم الاقتراح.
           proposal_note_created:
             email_outro: تلقيت هذا الإشعار لأنك تستطيع تقييم الاقتراح.
             email_subject: ترك شخص ملاحظة على الاقتراح %{resource_title}.
@@ -297,6 +299,7 @@ ar:
         title: اقتراحات
       votes:
         object: أصوات
+        title: الأصوات
     participatory_spaces:
       highlighted_proposals:
         see_all: شاهد الكل
@@ -385,7 +388,6 @@ ar:
           index:
             actions: أفعال
             assign_to_valuator: أسنِده إلى مُقيِّم
-            assign_to_valuator_button: تعيين
             cancel: إلغاء
             merge: دمج في واحدة جديدة
             merge_button: دمج
@@ -397,7 +399,6 @@ ar:
             split_button: انشق، مزق
             title: اقتراحات
             unassign_from_valuator: إلغاء الإسناد مِن المُقيِّم
-            unassign_from_valuator_button: إلغاء الإسناد
             update: تحديث
           new:
             create: إنشاء
@@ -631,7 +632,6 @@ ar:
           text_banner: أنت تتطلع على قائمة الاقتراحات المسحوبة من قبل مؤلفيها. %{go_back_link}.
         new:
           send: استمر
-          title: إنشاء اقتراحك
         orders:
           label: 'ترتيب المقترحات حسب:'
           most_commented: الأكثر تعليقًا عليها

data/config/locales/bg.yml

@@ -222,6 +222,8 @@ bg:
     events:
       proposals:
         admin:
+          proposal_assigned_to_valuator:
+            email_outro: Получихте известие, защото можете да оценяте предложението.
           proposal_note_created:
             email_outro: Получихте известие, защото можете да оценяте предложението.
             email_subject: Някой е направил бележка в предложението %{resource_title}.
@@ -351,7 +353,6 @@ bg:
         title: Гласове
     participatory_spaces:
       highlighted_proposals:
-        last: Позледни предложения
         see_all: Виж всички предложения
     proposals:
       actions:
@@ -467,7 +468,6 @@ bg:
           index:
             actions: Активности
             assign_to_valuator: Възлагане на оценител
-            assign_to_valuator_button: Възлагане
             cancel: Отказ
             merge: Сливане в едно ново
             merge_button: Сливане
@@ -481,7 +481,6 @@ bg:
             statuses: Статуси
             title: Предложения
             unassign_from_valuator: Отнемане възложеното на оценителя
-            unassign_from_valuator_button: Отнемане на възложеното
             update: Актуализация
           new:
             create: Създаване
@@ -511,7 +510,6 @@ bg:
         proposals_imports:
           create:
             invalid: Възникна проблем при импортирането на предложенията.
-            success: "%{number} предложения бяха импортирани успешно."
           new:
             create: Импортиране на предложения
             no_components: Няма други компоненти на предложения в това пространство за участие, от които да се импортират предложенията.
@@ -734,7 +732,6 @@ bg:
           text_banner: Разглеждате списъка с предложения, оттеглени от своите автори. %{go_back_link}.
         new:
           send: Продължи
-          title: Създайте Ваше предложение
         orders:
           label: 'Подреждане на предложенията по:'
           most_commented: Най-коментирани
@@ -782,7 +779,6 @@ bg:
         update:
           title: Актуализиране на предложението
         vote_button:
-          already_voted: Вече гласувано
           already_voted_hover: Оттегляне на гласа
           maximum_votes_reached: Лимитът за гласуване е достигнат
           no_votes_remaining: Няма останали гласове

data/config/locales/bs-BA.yml

@@ -35,6 +35,8 @@ bs:
     events:
       proposals:
         admin:
+          proposal_assigned_to_valuator:
+            email_outro: Dobili ste ovo obaveštenje jer možete da procenite predlog.
           proposal_note_created:
             email_outro: Dobili ste ovo obaveštenje jer možete da procenite predlog.
             email_subject: Neko je ostavio poruku na predlogu %{resource_title}.
@@ -46,10 +48,8 @@ bs:
         proposals:
           index:
             assign_to_valuator: Dodeli procenjivaču
-            assign_to_valuator_button: Dodeli
             publish_answers: Objavi odgovore
             unassign_from_valuator: Oduzmi od procenjivača
-            unassign_from_valuator_button: Od dodeli
           show:
             amendments_count: Broj izmena
             assigned_valuators: Dodeljeni procenjivači