decidim-budgets 0.27.7 → 0.28.0.rc4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-budgets
 version: !ruby/object:Gem::Version
-  version: 0.27.7
+  version: 0.28.0.rc4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-16 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,70 +18,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.7
+        version: 0.28.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.7
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.7
+        version: 0.28.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.7
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.7
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.7
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.7
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.7
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.7
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.7
+        version: 0.28.0.rc4
 description: A budgets component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -98,28 +98,28 @@ files:
 - app/cells/decidim/budgets/budget_cell.rb
 - app/cells/decidim/budgets/budget_information_modal/show.erb
 - app/cells/decidim/budgets/budget_information_modal_cell.rb
+- app/cells/decidim/budgets/budget_list_item/projects_count.erb
 - app/cells/decidim/budgets/budget_list_item/show.erb
+- app/cells/decidim/budgets/budget_list_item/vote_action.erb
 - app/cells/decidim/budgets/budget_list_item_cell.rb
-- app/cells/decidim/budgets/budget_m/data.erb
-- app/cells/decidim/budgets/budget_m/footer.erb
-- app/cells/decidim/budgets/budget_m_cell.rb
+- app/cells/decidim/budgets/budget_metadata_cell.rb
+- app/cells/decidim/budgets/budget_s_cell.rb
 - app/cells/decidim/budgets/budgets_header/show.erb
 - app/cells/decidim/budgets/budgets_header_cell.rb
 - app/cells/decidim/budgets/budgets_list/card_list.erb
+- app/cells/decidim/budgets/budgets_list/main_list.erb
 - app/cells/decidim/budgets/budgets_list/show.erb
 - app/cells/decidim/budgets/budgets_list/voted.erb
 - app/cells/decidim/budgets/budgets_list_cell.rb
+- app/cells/decidim/budgets/limit_announcement/show.erb
 - app/cells/decidim/budgets/limit_announcement_cell.rb
 - app/cells/decidim/budgets/order_activity_cell.rb
 - app/cells/decidim/budgets/project_cell.rb
-- app/cells/decidim/budgets/project_list_item/project_data.erb
-- app/cells/decidim/budgets/project_list_item/project_image.erb
-- app/cells/decidim/budgets/project_list_item/project_text.erb
-- app/cells/decidim/budgets/project_list_item/show.erb
-- app/cells/decidim/budgets/project_list_item_cell.rb
-- app/cells/decidim/budgets/project_m/data.erb
-- app/cells/decidim/budgets/project_m/footer.erb
-- app/cells/decidim/budgets/project_m_cell.rb
+- app/cells/decidim/budgets/project_l/extra_data.erb
+- app/cells/decidim/budgets/project_l/metadata.erb
+- app/cells/decidim/budgets/project_l_cell.rb
+- app/cells/decidim/budgets/project_metadata_cell.rb
+- app/cells/decidim/budgets/project_s_cell.rb
 - app/cells/decidim/budgets/project_selected_status_cell.rb
 - app/cells/decidim/budgets/project_tags/show.erb
 - app/cells/decidim/budgets/project_tags_cell.rb
@@ -139,6 +139,7 @@ files:
 - app/commands/decidim/budgets/admin/update_project_category.rb
 - app/commands/decidim/budgets/admin/update_project_scope.rb
 - app/commands/decidim/budgets/admin/update_project_selection.rb
+- app/commands/decidim/budgets/admin/update_projects_budget.rb
 - app/commands/decidim/budgets/cancel_order.rb
 - app/commands/decidim/budgets/checkout.rb
 - app/commands/decidim/budgets/remove_line_item.rb
@@ -182,10 +183,7 @@ files:
 - app/packs/src/decidim/budgets/exit_handler.js
 - app/packs/src/decidim/budgets/progressFixed.js
 - app/packs/src/decidim/budgets/projects.js
-- app/packs/stylesheets/decidim/budgets/_budgets.scss
-- app/packs/stylesheets/decidim/budgets/budget/_budget-list.scss
-- app/packs/stylesheets/decidim/budgets/budget/_budget-meter.scss
-- app/packs/stylesheets/decidim/budgets/budget/_progress.scss
+- app/packs/stylesheets/budgets.scss
 - app/permissions/decidim/budgets/admin/permissions.rb
 - app/permissions/decidim/budgets/permissions.rb
 - app/presenters/decidim/budgets/admin_log/budget_presenter.rb
@@ -202,6 +200,7 @@ files:
 - app/views/decidim/budgets/admin/projects/_bulk-actions.html.erb
 - app/views/decidim/budgets/admin/projects/_form.html.erb
 - app/views/decidim/budgets/admin/projects/_project-tr.html.erb
+- app/views/decidim/budgets/admin/projects/bulk_actions/_budget-change.html.erb
 - app/views/decidim/budgets/admin/projects/bulk_actions/_change-selected.html.erb
 - app/views/decidim/budgets/admin/projects/bulk_actions/_dropdown.html.erb
 - app/views/decidim/budgets/admin/projects/bulk_actions/_recategorize.html.erb
@@ -209,26 +208,28 @@ files:
 - app/views/decidim/budgets/admin/projects/edit.html.erb
 - app/views/decidim/budgets/admin/projects/index.html.erb
 - app/views/decidim/budgets/admin/projects/new.html.erb
-- app/views/decidim/budgets/admin/projects/proposals_picker.html.erb
 - app/views/decidim/budgets/admin/projects/update_attribute.js.erb
 - app/views/decidim/budgets/admin/proposals_imports/new.html.erb
 - app/views/decidim/budgets/budgets/index.html.erb
+- app/views/decidim/budgets/budgets/index.js.erb
 - app/views/decidim/budgets/line_items/update_budget.js.erb
 - app/views/decidim/budgets/order_summary_mailer/order_summary.html.erb
+- app/views/decidim/budgets/projects/_addition_selector.html.erb
 - app/views/decidim/budgets/projects/_budget_confirm.html.erb
 - app/views/decidim/budgets/projects/_budget_excess.html.erb
 - app/views/decidim/budgets/projects/_budget_summary.html.erb
 - app/views/decidim/budgets/projects/_count.html.erb
 - app/views/decidim/budgets/projects/_exit_modal.html.erb
-- app/views/decidim/budgets/projects/_filters.html.erb
-- app/views/decidim/budgets/projects/_filters_small_view.html.erb
 - app/views/decidim/budgets/projects/_linked_projects.html.erb
-- app/views/decidim/budgets/projects/_order_progress.html.erb
-- app/views/decidim/budgets/projects/_order_selected_projects.html.erb
+- app/views/decidim/budgets/projects/_order.html.erb
+- app/views/decidim/budgets/projects/_order_progress_progressbar_marks_right.html.erb
+- app/views/decidim/budgets/projects/_order_progress_summary_content.html.erb
 - app/views/decidim/budgets/projects/_order_total_budget.html.erb
 - app/views/decidim/budgets/projects/_project.html.erb
 - app/views/decidim/budgets/projects/_project_budget_button.html.erb
 - app/views/decidim/budgets/projects/_projects.html.erb
+- app/views/decidim/budgets/projects/_projects_count.html.erb
+- app/views/decidim/budgets/projects/_projects_list.html.erb
 - app/views/decidim/budgets/projects/index.html.erb
 - app/views/decidim/budgets/projects/index.js.erb
 - app/views/decidim/budgets/projects/show.html.erb
@@ -266,7 +267,6 @@ files:
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
 - config/locales/gn-PY.yml
-- config/locales/he-IL.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -334,7 +334,6 @@ files:
 - db/migrate/20200827154129_add_commentable_counter_cache_to_projects.rb
 - db/migrate/20210310120613_add_followable_counter_cache_to_budgets.rb
 - db/migrate/20220428072638_add_geolocalization_fields_to_projects.rb
-- decidim-budgets.gemspec
 - lib/decidim/api/budget_type.rb
 - lib/decidim/api/budgets_type.rb
 - lib/decidim/api/project_type.rb
@@ -345,34 +344,39 @@ files:
 - lib/decidim/budgets/component.rb
 - lib/decidim/budgets/engine.rb
 - lib/decidim/budgets/project_serializer.rb
+- lib/decidim/budgets/seeds.rb
 - lib/decidim/budgets/seeds/Exampledocument.pdf
-- lib/decidim/budgets/seeds/city.jpeg
 - lib/decidim/budgets/test/factories.rb
 - lib/decidim/budgets/version.rb
 - lib/decidim/budgets/workflows.rb
 - lib/decidim/budgets/workflows/all.rb
 - lib/decidim/budgets/workflows/base.rb
 - lib/decidim/budgets/workflows/one.rb
-homepage: https://github.com/decidim/decidim
+homepage: https://decidim.org
 licenses:
 - AGPL-3.0
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/decidim/decidim/issues
+  documentation_uri: https://docs.decidim.org/
+  funding_uri: https://opencollective.com/decidim
+  homepage_uri: https://decidim.org
+  source_code_uri: https://github.com/decidim/decidim
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.5.14
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Decidim budgets module

data/app/cells/decidim/budgets/budget_m/data.erb

@@ -1,12 +0,0 @@
-<div class="card__icondata">
-  <ul class="card-data">
-    <li class="card-data__item">
-      <%= icon "euro-outline", class: "icon--big", role: "img", "aria-hidden": true %>
-    </li>
-    <li class="card-data__item">
-      <div class="text-left">
-        <strong class="heading4"><%= budget_to_currency model.total_budget %></strong>
-      </div>
-    </li>
-  </ul>
-</div>

data/app/cells/decidim/budgets/budget_m/footer.erb

@@ -1,5 +0,0 @@
-<div class="card__footer">
-  <div class="card__support">
-    <%= link_to t("view", scope: "decidim.budgets.budget"), resource_path, class: "card__button button button--sc small" %>
-  </div>
-</div>

data/app/cells/decidim/budgets/budget_m_cell.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Budgets
-    # This cell renders the Medium (:m) budget card
-    # for an given instance of a Decidim::Budgets::Budget
-    class BudgetMCell < Decidim::CardMCell
-      include ActiveSupport::NumberHelper
-      include Decidim::Budgets::ProjectsHelper
-
-      def statuses
-        []
-      end
-    end
-  end
-end

data/app/cells/decidim/budgets/project_list_item/project_data.erb

@@ -1,19 +0,0 @@
-<div class="budget-list__data <%= data_class %>">
-  <% if voting_finished? %>
-    <div class="budget-list__data__votes">
-      <%= cell("decidim/budgets/project_votes_count", model) %>
-
-      <%= cell("decidim/budgets/project_voted_hint", model, class: "display-block margin-top-1") %>
-    </div>
-  <% else %>
-    <span class="budget-list__data__number budget-list__number show-for-medium">
-      <%= budget_to_currency(model.budget_amount) %>
-
-      <%= cell("decidim/budgets/project_votes_count", model, layout: :one_line, class: "display-inline-block") %>
-
-      <%= cell("decidim/budgets/project_voted_hint", model, class: "display-block margin-top-1") if current_order_checked_out? && resource_added? %>
-    </span>
-
-    <%= cell("decidim/budgets/project_vote_button", model) if !current_order_checked_out? && voting_open? %>
-  <% end %>
-</div>

data/app/cells/decidim/budgets/project_list_item/project_image.erb

@@ -1,5 +0,0 @@
-<% if model.photos.first %>
-  <div class="budget-list__image">
-    <%= image_tag model.photos.first.thumbnail_url, alt: resource_title %>
-  </div>
-<% end %>

data/app/cells/decidim/budgets/project_list_item/project_text.erb

@@ -1,23 +0,0 @@
-<div class="budget-list__text card__text">
-  <div>
-    <%= link_to resource_path, class: "card__link" do %>
-      <h3 class="card__title budget-list__title">
-        <%= cell("decidim/budgets/project_selected_status", model) %>
-
-        <%= resource_title %>
-      </h3>
-    <% end %>
-
-    <div class="show-for-medium">
-      <%= cell "decidim/budgets/project_tags", model, context: { extra_classes: ["tags--project"] } %>
-    </div>
-
-    <div class="budget-list__data__number budget-list__number hide-for-medium">
-      <%= cell("decidim/budgets/project_votes_count",
-      model,
-      layout: :one_line) %>
-
-      <%= cell("decidim/budgets/project_voted_hint", model, class: "margin-left-1") if current_order_checked_out? && resource_added? %>
-    </div>
-  </div>
-</div>

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

@@ -1,5 +0,0 @@
-<div id="project-<%= model.id %>-item" class="budget-list__item">
-  <%= render :project_image %>
-  <%= render :project_text %>
-  <%= render :project_data %>
-</div>

data/app/cells/decidim/budgets/project_list_item_cell.rb

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Budgets
-    # This cell renders a horizontal project card
-    # for an given instance of a Project in a budget list
-    class ProjectListItemCell < Decidim::ViewModel
-      include ActiveSupport::NumberHelper
-      include Decidim::LayoutHelper
-      include Decidim::ActionAuthorizationHelper
-      include Decidim::Budgets::ProjectsHelper
-      include Decidim::Budgets::Engine.routes.url_helpers
-
-      delegate :current_user, :current_settings, :current_order, :current_component,
-               :current_participatory_space, :can_have_order?, :voting_open?, :voting_finished?, to: :parent_controller
-
-      private
-
-      def resource_path
-        resource_locator([model.budget, model]).path
-      end
-
-      def resource_title
-        decidim_escape_translated model.title
-      end
-
-      def resource_added?
-        current_order && current_order.projects.include?(model)
-      end
-
-      def resource_allocation
-        current_order.allocation_for(model)
-      end
-
-      def data_class
-        [].tap do |list|
-          list << "budget-list__data--added" if can_have_order? && resource_added?
-          list << "show-for-medium" if voting_finished? || (current_order_checked_out? && !resource_added?)
-        end.join(" ")
-      end
-
-      def vote_button_disabled?
-        current_user && !can_have_order?
-      end
-
-      def vote_button_class
-        return "success" if resource_added?
-
-        "hollow"
-      end
-
-      def vote_button_method
-        return :delete if resource_added?
-
-        :post
-      end
-
-      def vote_button_label
-        if resource_added?
-          return t(
-            "decidim.budgets.projects.project.remove",
-            resource_name: resource_title
-          )
-        end
-
-        t("decidim.budgets.projects.project.add", resource_name: resource_title)
-      end
-    end
-  end
-end

data/app/cells/decidim/budgets/project_m/data.erb

@@ -1,12 +0,0 @@
-<div class="card__icondata">
-  <ul class="card-data">
-    <li class="card-data__item">
-      <%= icon "euro-outline", class: "icon--big", role: "img", "aria-hidden": true %>
-    </li>
-    <li class="card-data__item">
-      <div class="text-left">
-        <strong class="heading4"><%= budget_to_currency model.budget_amount %></strong>
-      </div>
-    </li>
-  </ul>
-</div>

data/app/cells/decidim/budgets/project_m/footer.erb

@@ -1,5 +0,0 @@
-<div class="card__footer">
-  <div class="card__support">
-    <%= link_to t("view", scope: "decidim.budgets.projects.project"), resource_path, class: "card__button button button--sc small" %>
-  </div>
-</div>

data/app/cells/decidim/budgets/project_m_cell.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Budgets
-    # This cell renders the Medium (:m) project card
-    # for an given instance of a Project
-    class ProjectMCell < Decidim::CardMCell
-      include ActiveSupport::NumberHelper
-      include Decidim::Budgets::ProjectsHelper
-
-      private
-
-      def resource_icon
-        icon "projects", class: "icon--big"
-      end
-
-      def resource_path
-        resource_locator([model.budget, model]).path
-      end
-    end
-  end
-end

data/app/packs/stylesheets/decidim/budgets/_budgets.scss

@@ -1,3 +0,0 @@
-@import "stylesheets/decidim/budgets/budget/budget-list";
-@import "stylesheets/decidim/budgets/budget/budget-meter";
-@import "stylesheets/decidim/budgets/budget/progress";

data/app/packs/stylesheets/decidim/budgets/budget/_budget-list.scss

@@ -1,198 +0,0 @@
-.budget-list{
-  margin-bottom: 2rem;
-
-  &__item{
-    padding: 0;
-    background: $card-bg;
-    border: $border;
-    border-bottom: 0;
-    overflow: hidden;
-    display: flex;
-
-    &:first-child{
-      border-top-left-radius: $card-border-radius;
-      border-top-right-radius: $card-border-radius;
-    }
-
-    &:last-child{
-      border-bottom-left-radius: $card-border-radius;
-      border-bottom-right-radius: $card-border-radius;
-      border-bottom: $border;
-    }
-
-    &-cell{
-      display: grid;
-      grid-template-columns: 1fr 40px;
-
-      .budget-list__data{
-        grid-column: span 2;
-        background: none;
-      }
-
-      @include breakpoint(medium){
-        grid-template-columns: 1fr 40px 15em;
-        grid-template-rows: 1fr;
-
-        .budget-list__data{
-          background: $card-secondary-bg;
-          grid-column: 3;
-        }
-      }
-    }
-  }
-
-  &__image{
-    overflow: hidden;
-    width: 3.5em;
-    height: 3.5rem;
-    flex-shrink: 0;
-    margin-top: $card-padding-small * .7;
-    margin-bottom: $card-padding-small * .7;
-    margin-left: $card-padding-small * .5;
-
-    @include breakpoint(medium){
-      width: 6rem;
-      height: 4rem;
-      flex-shrink: 0;
-      margin: $card-padding;
-      margin-right: 0;
-    }
-
-    img{
-      width: 100%;
-      height: 100%;
-      object-fit: cover;
-      object-position: center;
-    }
-  }
-
-  &__text{
-    padding: $card-padding-small * .5;
-    flex-grow: 1;
-
-    @include breakpoint(medium){
-      padding: $card-padding;
-      display: flex;
-      align-items: center;
-
-      &.flex-horizontal{
-        flex-direction: column;
-        align-items: flex-start;
-      }
-    }
-
-    .card__text--status{
-      display: block;
-    }
-  }
-
-  &__data{
-    flex-shrink: 0;
-    align-self: stretch;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    text-align: center;
-    font-size: 85%;
-    line-height: 1;
-    color: $muted;
-    padding: $card-padding-small * .5;
-    background: $card-secondary-bg;
-
-    @include breakpoint(medium){
-      min-width: 7rem;
-      flex-direction: row;
-      justify-content: flex-end;
-      flex-basis: 14rem;
-      padding: 1rem $card-padding;
-    }
-
-    .loading-spinner{
-      margin: 0 !important;
-      position: relative;
-
-      &::before{
-        position: absolute;
-      }
-    }
-
-    &:last-child{
-      margin-bottom: 0;
-    }
-  }
-
-  &__data__icon{
-    .icon{
-      width: 20px;
-      height: 20px;
-      fill: $muted;
-    }
-
-    &:hover{
-      .icon{
-        fill: $anchor-color;
-      }
-    }
-  }
-
-  &__data__number{
-    @extend .card-data__item__number;
-
-    font-size: 1.5rem;
-    line-height: 1.2;
-  }
-
-  &__data__votes{
-    @extend .card-data__item__number;
-
-    @include breakpoint(medium){
-      flex-grow: 1;
-      font-size: 1.2rem;
-      margin-left: 1rem;
-      margin-right: 1rem;
-      margin-bottom: 0;
-      text-align: cemter;
-    }
-  }
-
-  &__data--added{
-    background-color: tint($success, 80%);
-  }
-
-  &__title{
-    font-size: $global-font-size;
-  }
-
-  &__number{
-    @include breakpoint(medium down){
-      font-size: 1rem;
-    }
-
-    @include breakpoint(medium){
-      flex-grow: 1;
-      font-size: 1.2rem;
-      margin-left: 1rem;
-      margin-right: 1rem;
-      margin-bottom: 0;
-      text-align: right;
-    }
-  }
-
-  &__action{
-    margin-bottom: 0;
-    border-radius: 50%;
-    align-self: center;
-    flex-shrink: 0;
-    width: 2em;
-    height: 2em;
-    padding: 0;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    &--disabled{
-      pointer-events: none;
-    }
-  }
-}