decidim-budgets 0.19.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6d8d13e020844efb51e9fbf69025c2f50e8e4ce55e6126ec10a38dc4ea25cc6
-  data.tar.gz: fb963e40341a1881b465fba889de2d33fc292854433e0712ee4753ba5f11e969
+  metadata.gz: a52564133c108bcd32c5b1f4729eb4e8430708fbc59dab774f90f07c517f5a01
+  data.tar.gz: e3cc8184fdba7e909b34b89e1ad94955a99134521aed3e4222096b8d10f8f934
 SHA512:
-  metadata.gz: ba9214e3e9470af3e1844b8f5df22a1de1a3c23641d2c3eef49ccafaf3f8f3f3ce91197892634afce3555e02cfbd1fb0695ec2f853adc5c9adb2f26f084f1c34
-  data.tar.gz: dd8b4e38291f91988dd706640717851b89a1ccd2c43bb57eab93abbae327fd5af6c0ceb277de0227f5e3e56e9f84c179cd7226c11743fbd2177035e036f97950
+  metadata.gz: f3711ec5978d688a91da72965fa96141cd3ae37a15a709e9529bd7d7a15416313339ebbdfbbf3524fa1a4ee4f734b4a8ac82460ea5bc96732bd92ffea3cfe63c
+  data.tar.gz: ee3b9d5b2ca5ab49f195c3ebc76dc7579ce85d2dfed11e591a5ad1ca56fe4e16e9fa77dd19479e1c0af016aed5b5dbcbf4a8789b6be64bc9ddef975573c10e73

data/app/assets/images/decidim/budgets/icon.svg

@@ -1,11 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 36 36" style="enable-background:new 0 0 36 36;" xml:space="preserve">
-  <g>
-    <path d="M18,36C8.1,36,0,27.9,0,18S8.1,0,18,0s18,8.1,18,18S27.9,36,18,36z M18,2C9.2,2,2,9.2,2,18s7.2,16,16,16s16-7.2,16-16 S26.8,2,18,2z"/>
-  </g>
-  <g>
-    <g>
-      <path d="M17.1,28.3c-5.3,0-9.9-4.4-9.9-9.8c0-5.5,4.9-9.5,9.3-9.5H18v9h9v0.9C27,23.2,22.7,28.3,17.1,28.3z M16,10.7 c-4,0.6-6.5,3.7-6.5,7.6c0,4.3,3.6,8,7.7,8c3.9,0,7-3.3,7.6-6.3H16V10.7z"/>
-    </g>
-    <path d="M30,16H20V6h0.6c4.5,0,9.4,4.4,9.4,8.9V16z M22,14h5.5C27,11,24,8.6,22,8V14z"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" x="0" y="0" enable-background="new 0 0 36 36" viewBox="0 0 36 36" xml:space="preserve"><g><path d="M18,36C8.1,36,0,27.9,0,18S8.1,0,18,0s18,8.1,18,18S27.9,36,18,36z M18,2C9.2,2,2,9.2,2,18s7.2,16,16,16s16-7.2,16-16 S26.8,2,18,2z"/></g><g><g><path d="M17.1,28.3c-5.3,0-9.9-4.4-9.9-9.8c0-5.5,4.9-9.5,9.3-9.5H18v9h9v0.9C27,23.2,22.7,28.3,17.1,28.3z M16,10.7 c-4,0.6-6.5,3.7-6.5,7.6c0,4.3,3.6,8,7.7,8c3.9,0,7-3.3,7.6-6.3H16V10.7z"/></g><path d="M30,16H20V6h0.6c4.5,0,9.4,4.4,9.4,8.9V16z M22,14h5.5C27,11,24,8.6,22,8V14z"/></g></svg>

data/app/assets/javascripts/decidim/budgets/projects.js.es6

@@ -5,7 +5,7 @@ $(() => {
   const $projects = $("#projects, #project");
   const $budgetSummaryTotal = $(".budget-summary__total");
   const $budgetExceedModal = $("#budget-excess");
-
+  const $budgetSummary = $(".budget-summary__progressbox");
   const totalBudget = parseInt($budgetSummaryTotal.attr("data-total-budget"), 10);
 
   const cancelEvent = (event) => {
@@ -13,17 +13,39 @@ $(() => {
     event.preventDefault();
   };
 
-  $projects.on("click", ".budget--list__action", (event) => {
-    const currentBudget = parseInt($(".budget-summary__progressbox").attr("data-current-budget"), 10);
+  $projects.on("click", ".budget-list__action", (event) => {
+    const currentBudget = parseInt($budgetSummary.attr("data-current-budget"), 10);
     const $currentTarget = $(event.currentTarget);
     const projectBudget = parseInt($currentTarget.attr("data-budget"), 10);
 
     if ($currentTarget.attr("disabled")) {
       cancelEvent(event);
 
-    } else if ($currentTarget.attr("data-add") && ((currentBudget + projectBudget) > totalBudget)) {
+    } else if (($currentTarget.attr("data-add") === "true") && ((currentBudget + projectBudget) > totalBudget)) {
       $budgetExceedModal.foundation("toggle");
       cancelEvent(event);
     }
   });
+
+  if ($("#order-progress [data-toggle=budget-confirm]").length > 0) {
+    const safeUrl = $(".budget-summary").attr("data-safe-url").split("?")[0];
+    $(document).on("click", "a", (event) => {
+      window.exitUrl = event.currentTarget.href;
+    });
+    $(document).on("submit", "form", (event) => {
+      window.exitUrl = event.currentTarget.action;
+    });
+
+    window.onbeforeunload = () => {
+      const currentBudget = parseInt($budgetSummary.attr("data-current-budget"), 10);
+      const exitUrl = window.exitUrl;
+      window.exitUrl = null;
+
+      if (currentBudget === 0 || (exitUrl && exitUrl.startsWith(safeUrl))) {
+        return null;
+      }
+
+      return "";
+    }
+  }
 });

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

@@ -1,36 +1,159 @@
-.budget-list__title{
-  @include breakpoint(smallmedium down){
-    font-size: $global-font-size;
-  }
-}
+.budget-list{
+  margin-bottom: 2rem;
 
-.budget-list__data{
-  flex-basis: 9rem;
+  &__item{
+    padding: 0;
+    background: $card-bg;
+    border: $border;
+    border-bottom: 0;
+    overflow: hidden;
+    display: flex;
 
-  @include breakpoint(medium){
-    flex-direction: row;
-    flex-basis: 16rem;
+    &: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;
+    }
   }
-}
 
-.budget-list__data--added{
-  background-color: tint($success, 80%);
-}
+  &__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 / 2;
+
+    @include breakpoint(medium){
+      width: 6rem;
+      height: 4rem;
+      flex-shrink: 0;
+      margin: $card-padding;
+      margin-right: 0;
+    }
 
-.budget-list__number{
-  @include breakpoint(medium down){
-    font-size: 1rem;
+    img{
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+      object-position: center;
+    }
   }
 
-  @include breakpoint(medium){
+  &__text{
+    padding: $card-padding-small / 2;
     flex-grow: 1;
+
+    @include breakpoint(medium){
+      padding: $card-padding;
+      display: flex;
+      align-items: center;
+    }
+  }
+
+  &__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 / 2;
+    background: $card-secondary-bg;
+
+    @include breakpoint(medium){
+      min-width: 7rem;
+      flex-direction: row;
+      justify-content: flex-end;
+      flex-basis: 12rem;
+      padding: 1rem $card-padding;
+    }
+
+    &: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;
-    margin-right: 1rem;
-    margin-bottom: 0;
-    text-align: right;
   }
-}
 
-.budget--list__action{
-  margin-bottom: 0;
+  &__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;
+    }
+  }
 }

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

@@ -0,0 +1,5 @@
+<div class="budget-list__data <%= data_class %>">
+  <%= project_data_number %>
+  <%= project_data_vote_button %>
+  <%= project_data_votes %>
+</div>

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

@@ -0,0 +1,3 @@
+<span class="card--list__data__number budget-list__number show-for-medium">
+  <%= budget_to_currency(model.budget) %>
+</span>

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

@@ -0,0 +1,15 @@
+<%= action_authorized_button_to "vote",
+      order_line_item_path(project_id: model),
+      method: vote_button_method,
+      remote: true,
+      class: "button tiny budget-list__action #{vote_button_class}",
+      data: {
+        add: !resource_added?,
+        disable: true,
+        budget: model.budget,
+        "redirect-url": resource_path
+      },
+      disabled: vote_button_disabled?,
+      title: vote_button_label do %>
+  <%= icon(resource_added? ? "x" : "check", class: "icon--small", aria_label: vote_button_label, role: "img") %>
+<% end %>

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

@@ -0,0 +1,7 @@
+<% if current_settings.show_votes? %>
+  <div class="card__support" style="width: 7em">
+    <span>
+      <%= t("decidim.budgets.projects.project.count", count: model.confirmed_orders_count) %>
+    </span>
+  </div>
+<% end %>

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

@@ -0,0 +1,5 @@
+<% 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

@@ -0,0 +1,17 @@
+<div class="budget-list__text">
+  <div>
+    <%= link_to resource_path, class: "card__link" do %>
+      <h5 class="card__title budget-list__title">
+        <%= resource_title %>
+      </h5>
+    <% end %>
+
+    <div class="show-for-medium">
+      <%= cell "decidim/tags", model, context: { extra_classes: ["tags--project"] } %>
+    </div>
+
+    <span class="budget-list__data__number budget-list__number hide-for-medium">
+      <%= budget_to_currency(model.budget) %>
+    </span>
+  </div>
+</div>

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

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

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

@@ -0,0 +1,86 @@
+# 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, to: :parent_controller
+
+      def project_image
+        render
+      end
+
+      def project_text
+        render
+      end
+
+      def project_data
+        render
+      end
+
+      def project_data_number
+        render
+      end
+
+      def project_data_votes
+        render
+      end
+
+      def project_data_vote_button
+        render
+      end
+
+      private
+
+      def resource_path
+        resource_locator(model).path
+      end
+
+      def resource_title
+        translated_attribute model.title
+      end
+
+      def resource_added?
+        current_order && current_order.projects.include?(model)
+      end
+
+      def data_class
+        return "budget-list__data--added" if resource_added?
+      end
+
+      def vote_button_disabled?
+        !current_settings.votes_enabled? || current_order_checked_out? || !current_participatory_space.can_participate?(current_user)
+      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,10 +1,10 @@
 <div class="card__icondata">
   <ul class="card-data">
     <li class="card-data__item">
-      <%= icon "euro-outline", class: "icon--big" %>
+      <%= icon "euro-outline", class: "icon--big", role: "img", "aria-hidden": true %>
     </li>
     <li class="card-data__item">
-      <div class="text-left text-uppercase">
+      <div class="text-left">
         <strong class="heading4"><%= budget_to_currency model.budget %></strong>
       </div>
     </li>

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

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

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

@@ -6,6 +6,9 @@ module Decidim
       # This command is executed when the user creates a Project from the admin
       # panel.
       class CreateProject < Rectify::Command
+        include ::Decidim::AttachmentMethods
+        include ::Decidim::GalleryMethods
+
         def initialize(form)
           @form = form
         end
@@ -16,9 +19,15 @@ module Decidim
         def call
           return broadcast(:invalid) if @form.invalid?
 
+          if process_gallery?
+            build_gallery
+            return broadcast(:invalid) if gallery_invalid?
+          end
+
           transaction do
             create_project
             link_proposals
+            create_gallery if process_gallery?
           end
 
           broadcast(:ok)
@@ -26,23 +35,24 @@ module Decidim
 
         private
 
-        attr_reader :project
+        attr_reader :form, :project, :gallery
 
         def create_project
           @project = Decidim.traceability.create!(
             Project,
-            @form.current_user,
-            scope: @form.scope,
-            category: @form.category,
-            component: @form.current_component,
-            title: @form.title,
-            description: @form.description,
-            budget: @form.budget
+            form.current_user,
+            scope: form.scope,
+            category: form.category,
+            component: form.current_component,
+            title: form.title,
+            description: form.description,
+            budget: form.budget
           )
+          @attached_to = @project
         end
 
         def proposals
-          @proposals ||= project.sibling_scope(:proposals).where(id: @form.proposal_ids)
+          @proposals ||= project.sibling_scope(:proposals).where(id: form.proposal_ids)
         end
 
         def link_proposals