decidim-budgets 0.29.1 → 0.29.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5868363edf9819d119576efd444c8c51809e9f7e3b259855546160ffbf68b53e
-  data.tar.gz: d5600e4d6ebc920e5fa5ec585ce52a7e62007093eee26fa65e654fb095662dc5
+  metadata.gz: fb2c40b3a5eb29eb321fb61dd190aca4b01b62baa67c7d707a177a960533c9ff
+  data.tar.gz: 5ddc4377e8081598538121012523991c3448aba16923108b287557cf4d963932
 SHA512:
-  metadata.gz: 75ac62e677c12d2873ff528b33c2a81fd62482ad27fb8d89046227cbcb481da5a6c93ac2e47bc558871a09ef9d42e2a56b3787a4889569f4848666760e71fe5b
-  data.tar.gz: ffdc85aeec48d10700cdb21407edd2257c1f2abd2c0869f6980ed80577c483fd6a4f0800e8a2fbf8d8cd25fd4d17d5e54cbbf8192e855ebd07b9bcf469b3061e
+  metadata.gz: 83210fb9f507d38d1b00baee67316c5223f0e8faf1f7e2bd16d037cac9846d35e4d9c8160e2d7beee0a0ed801dec765f62919fa6019c447bcb6bde0fe0712d74
+  data.tar.gz: b275657a91a71f6fc8b16ca0001777fb2ebe420b7895ad081e8040edc585e66526ad8245e93c688b5a2bcb9cd898b1fc1555f6e2d00531bfaeee5de68d5519e6

data/app/cells/decidim/budgets/budgets_list/main_list.erb

@@ -1,5 +1,5 @@
 <h2 class="h5 md:h3 decorator"><%= t(:count, scope: i18n_scope, count: budgets.length) %></h2>
 
-<%= render partial: "decidim/shared/orders", formats: [:html], locals: { orders: AVAILABLE_ORDERS, i18n_scope: "decidim.budgets.budgets_list.orders" } %>
+  <%= render partial: "decidim/shared/orders", formats: [:html], locals: { orders: AVAILABLE_ORDERS, i18n_scope: "decidim.budgets.budgets_list.orders", css_class: "items-start ml-6", b_css_class: "!justify-start pb-0 pl-0" } %>
 
 <%= render :card_list %>

data/app/cells/decidim/budgets/budgets_list/show.erb

@@ -7,7 +7,7 @@
 <% end %>
 
 <% if budgets.where.not(id: voted.map(&:id)).exists? %>
-  <div id="budgets" class="card__list-list">
+  <div id="budgets" class="card__list-list !space-y-5 w-full">
     <%= main_list %>
   </div>
 <% end %>

data/app/commands/decidim/budgets/admin/import_proposals_to_budgets.rb

@@ -75,7 +75,7 @@ module Decidim
         end
 
         def all_proposals
-          Decidim::Proposals::Proposal.where(component: origin_component).accepted
+          Decidim::Proposals::Proposal.where(component: origin_component).published.not_hidden.not_withdrawn.accepted.order(:published_at)
         end
 
         def origin_component
@@ -87,9 +87,13 @@ module Decidim
           # because otherwise duplicates could be created until the component is
           # published.
           original_proposal.linked_resources(:projects, "included_proposals", component_published: false).any? do |project|
-            project.budget == form.budget
+            component_budgets.exists?(project.decidim_budgets_budget_id)
           end
         end
+
+        def component_budgets
+          @component_budgets ||= Decidim::Budgets::Budget.where(component: form.budget.component)
+        end
       end
     end
   end

data/app/forms/decidim/budgets/admin/budget_form.rb

@@ -11,7 +11,7 @@ module Decidim
 
         translatable_attribute :title, String
         attribute :weight, Integer, default: 0
-        translatable_attribute :description, String
+        translatable_attribute :description, Decidim::Attributes::RichText
         attribute :total_budget, Integer, default: 0
         attribute :decidim_scope_id, Integer
 

data/app/forms/decidim/budgets/admin/project_form.rb

@@ -11,7 +11,7 @@ module Decidim
         include Decidim::ApplicationHelper
 
         translatable_attribute :title, String
-        translatable_attribute :description, String
+        translatable_attribute :description, Decidim::Attributes::RichText
 
         attribute :address, String
         attribute :latitude, Float

data/app/forms/decidim/budgets/admin/project_import_proposals_form.rb

@@ -34,7 +34,7 @@ module Decidim
         end
 
         def scope
-          @scope ||= @scope_id ? current_component.scopes.find_by(id: @scope_id) : current_component.scope
+          @scope ||= @attributes["scope_id"].value ? current_component.scopes.find_by(id: @attributes["scope_id"].value) : current_component.scope
         end
 
         def scope_id

data/app/packs/stylesheets/budgets.scss

@@ -71,8 +71,12 @@
     }
   }
 
+  &__projects__container {
+    @apply -mt-12 sm:mt-0;
+  }
+
   &__card__list-project {
-    @apply ml-auto rounded py-3 px-6 bg-background w-[30%] min-w-[120px] grid grid-cols-1 md:grid-cols-2 md:place-items-center;
+    @apply ml-auto rounded py-3 px-4 bg-background w-[30%] min-w-[120px] flex flex-col justify-center items-center lg:flex-row lg:justify-around lg:place-items-center;
   }
 
   &__card__list-project__amount {
@@ -132,7 +136,7 @@
   }
 
   &__list--header {
-    @apply grid grid-cols-2;
+    @apply flex items-center justify-between -ml-2 md:ml-0;
   }
 
   &-list {

data/app/permissions/decidim/budgets/permissions.rb

@@ -18,6 +18,8 @@ module Decidim
             can_vote?(false) if can_vote_project?(project || order&.projects&.first)
           when :report
             permission_action.allow!
+          when :read
+            toggle_allow(project.visible?)
           end
         end
 

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

@@ -17,7 +17,7 @@
     <%= cell("decidim/budgets/budgets_header", current_workflow) %>
   </section>
 
-  <section class="layout-main__section layout-main__heading">
+  <section class="layout-main__section layout-main__heading flex flex-col items-start">
     <%= cell("decidim/budgets/budgets_list", current_workflow) %>
   </section>
 <% end %>

data/app/views/decidim/budgets/projects/_order.html.erb

@@ -1 +1 @@
-<%= order_selector available_orders, i18n_scope: "decidim.budgets.projects.orders" %>
+<%= order_selector available_orders, i18n_scope: "decidim.budgets.projects.orders", css_class: "items-start pl-4" %>

data/app/views/decidim/budgets/projects/_order_progress_summary_content.html.erb

@@ -26,7 +26,7 @@
         <div class="budget-summary__progressbar--meter" style="width: <%= current_order_budget_percent %>%"> </div>
       </div>
       <div class="budget-summary__progressbar-marks">
-        <span class="budget-summary__progressbar-legend" style="width: <%= current_order_budget_percent_minimum %>%;">
+        <span class="budget-summary__progressbar-legend">
           <strong id="order-total-budget<%= "-responsive" if responsive %>" class="budget-summary__progressbar-legend-strong">
             <%= render partial: "decidim/budgets/projects/order_total_budget" %>
           </strong>

data/app/views/decidim/budgets/projects/index.html.erb

@@ -1,4 +1,12 @@
-<% add_decidim_page_title t("decidim.budgets.projects.projects_for", name: translated_attribute(budget.title)) %>
+<% add_decidim_meta_tags(
+  description: translated_attribute(budget.description),
+  title: t("decidim.components.pagination.page_title",
+           component_name: t("decidim.budgets.projects.projects_for", name: translated_attribute(budget.title)),
+           current_page: projects.current_page,
+           total_pages: projects.total_pages ),
+  url: budget_url(budget),
+  resource: budget) %>
+
 <%= append_javascript_pack_tag "decidim_budgets" %>
 <%= append_stylesheet_pack_tag "decidim_budgets" %>
 
@@ -56,7 +64,7 @@
       </section>
     <% end %>
 
-    <section id="projects" class="layout-main__section layout-main__heading">
+    <section id="projects" class="layout-main__section layout-main__heading budget__projects__container">
       <%= render partial: "projects" %>
     </section>
   <% else %>

data/app/views/decidim/budgets/projects/index.js.erb

@@ -8,4 +8,14 @@ $order.html('<%= j(render partial: "order").strip.html_safe %>');
 $projectsCount.html('<%= j(render partial: "count").strip.html_safe %>');
 $orderFilterInput.val('<%= order %>');
 
+var $map = $("#map");
+var controller = $map.data("map-controller");
+if (controller) {
+  var markerData = JSON.parse('<%= escape_javascript projects_data_for_map(all_geocoded_projects).to_json.html_safe %>');
+  controller.clearMarkers();
+  if (markerData.length > 0){
+    controller.addMarkers(markerData);
+  }
+}
+
 document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: $projects[0] }));

data/app/views/decidim/budgets/projects/show.html.erb

@@ -1,15 +1,17 @@
 <% add_decidim_meta_tags(
-  title: translated_attribute(project.title),
-  description: translated_attribute(project.description)
-) %>
+     title: translated_attribute(project.title),
+     description: translated_attribute(project.description),
+     resource: project,
+     url: resource_locator([project.budget, project]).url
+   ) %>
 
 <%
-edit_link(
-  resource_locator([project.budget, project]).edit,
-  :update,
-  :project,
-  project:
-)
+  edit_link(
+    resource_locator([project.budget, project]).edit,
+    :update,
+    :project,
+    project:
+  )
 %>
 
 <%= append_javascript_pack_tag "decidim_budgets" %>
@@ -37,6 +39,7 @@ edit_link(
         </div>
       <% end %>
       <%= cell("decidim/budgets/project_selected_status", project, as_label: true) %>
+
       <h1 class="h1 decorator budget__definition-project__title editor-content">
         <%= decidim_sanitize translated_attribute project.title %>
       </h1>
@@ -67,8 +70,10 @@ edit_link(
         </div>
       <% end %>
     </section>
+
     <section class="layout-main__section layout-main__buttons" data-buttons>
       <%= cell "decidim/comments_button", nil %>
+
       <div class="ml-auto">
         <%= cell "decidim/budgets/project_tags", project %>
       </div>

data/config/locales/ar.yml

@@ -8,7 +8,6 @@ ar:
         total_budget: الميزانية الإجمالية
       project:
         decidim_category_id: الفئة
-        decidim_scope_id: نطاق
         description: وصف
         proposal_ids: المقترحات ذات الصلة
         title: عنوان
@@ -31,7 +30,6 @@ ar:
       actions:
         attachment_collections: المجلدات
         attachments: مرفقات
-        confirm_destroy: هل أنت متأكد أنك تريد حذف هذا المشروع؟
         destroy: حذف
         edit: تعديل
         edit_projects: إدارة المشاريع
@@ -117,7 +115,6 @@ ar:
             other: "%{count} مشاريع"
         filters:
           category: الفئة
-          scope: نطاق
           search: بحث
         show:
           budget: ميزانية
@@ -127,6 +124,7 @@ ar:
     components:
       budgets:
         actions:
+          comment: تعليق
           vote: تصويت
         name: الميزانيات
         settings:

data/config/locales/bg.yml

@@ -11,7 +11,7 @@ bg:
       project:
         budget_amount: Бюджетна сума
         decidim_category_id: Категория
-        decidim_scope_id: Сфера
+        decidim_scope_id: Обхват
         description: Описание
         proposal_ids: Свързани предложения
         proposals: Предложения
@@ -44,7 +44,6 @@ bg:
       actions:
         attachment_collections: Папки
         attachments: Прикачени файлове
-        confirm_destroy: Сигурни ли сте, че искате да изтриете този проект?
         destroy: Изтрий
         edit: Редактирай
         edit_projects: Обедини проекти

data/config/locales/bn-BD.yml

@@ -0,0 +1 @@
+bn:

data/config/locales/bs-BA.yml

@@ -0,0 +1,22 @@
+---
+bs:
+  decidim:
+    budgets:
+      order_summary_mailer:
+        order_summary:
+          selected_projects: 'Projekti koje ste izabrali su:'
+          subject: Glasali ste na prostoru za diskusiju %{space_name}
+      projects:
+        orders:
+          highest_cost: Najveća cena
+          label: Poređaj projekte po
+          lowest_cost: Najniža cena
+          most_voted: Najviše glasova
+          random: Slučajan redosled
+    components:
+      budgets:
+        settings:
+          global:
+            vote_minimum_budget_projects_number: Minimum projekata za glasanje
+            vote_rule_minimum_budget_projects_enabled: 'Omogući pravilo: Minimalni broj projekata o kojima se glasa'
+            vote_rule_threshold_percent_enabled: 'Omogući pravilo: Minimalni procenta budžeta'