decidim-plans 0.16.6 → 0.16.7

data/app/controllers/decidim/plans/plans_controller.rb

@@ -15,7 +15,7 @@ module Decidim
       include Orderable
       include Paginable
 
-      helper_method :attached_proposals_picker_field
+      helper_method :attached_proposals_picker_field, :available_tags
 
       before_action :authenticate_user!, only: [:new, :create, :edit, :update, :withdraw, :preview, :publish, :close, :destroy]
       before_action :check_draft, only: [:new]
@@ -185,6 +185,10 @@ module Decidim
         redirect_to preview_plan_path(@plan)
       end
 
+      def available_tags
+        @available_tags ||= ComponentPlanTags.new(current_component).query
+      end
+
       def search_klass
         PlanSearch
       end
@@ -197,7 +201,8 @@ module Decidim
           category_id: "",
           state: "except_rejected",
           scope_id: nil,
-          related_to: ""
+          related_to: "",
+          tag_id: []
         }
       end
 

data/app/forms/decidim/plans/admin/tag_form.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Plans
+    module Admin
+      # A form object to be used when admin users want to create a plan.
+      class TagForm < Decidim::Form
+        include TranslatableAttributes
+        include Decidim::ApplicationHelper
+
+        mimic :tag
+
+        alias organization current_organization
+
+        translatable_attribute :name, String
+        attribute :back_to_plan, Boolean
+
+        validates :name, translatable_presence: true
+      end
+    end
+  end
+end

data/app/forms/decidim/plans/admin/taggings_form.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Plans
+    module Admin
+      # A form object to be used when admin users want to create a plan.
+      class TaggingsForm < Decidim::Form
+        include Decidim::ApplicationHelper
+
+        mimic :tagging
+
+        attribute :tags, Array[Integer]
+
+        def map_model(plan)
+          self.tags = plan.tags.map { |tag| tag.id }
+        end
+      end
+    end
+  end
+end

data/app/helpers/decidim/plans/attached_proposals_helper.rb

@@ -34,10 +34,26 @@ module Decidim
                     .find_resource_manifest(:proposals)
                     .try(:resource_scope, current_component)
                     &.order(title: :asc)
-                    &.where("title ilike ?", "%#{params[:term]}%")
                     &.where("state IS NULL OR state != ?", "rejected")
                     &.where&.not(published_at: nil)
-            render json: query.all.collect { |p| [present(p).title, p.id] }
+
+            # In case the search term starts with a hash character and contains
+            # only numbers, the user wants to search with the ID.
+            query = if params[:term] =~ /^#[0-9]+$/
+                      idterm = params[:term].sub(/#/, "")
+                      query&.where(
+                        "id::text like ?",
+                        "%#{idterm}%"
+                      )
+                    else
+                      query&.where("title ilike ?", "%#{params[:term]}%")
+                    end
+
+            proposals_list = query.all.collect do |p|
+              ["#{present(p).title} (##{p.id})", p.id]
+            end
+
+            render json: proposals_list
           end
         end
       end

data/app/helpers/decidim/plans/plan_cells_helper.rb

@@ -14,7 +14,7 @@ module Decidim
       include Decidim::TranslatableAttributes
       include Decidim::CardHelper
 
-      delegate :title, :state, :answered?, :withdrawn?, to: :model
+      delegate :title, :state, :closed?, :answered?, :withdrawn?, to: :model
 
       def has_actions?
         false

data/app/models/decidim/plans/plan.rb

@@ -37,6 +37,12 @@ module Decidim
 
       has_many :contents, foreign_key: :decidim_plan_id, dependent: :destroy
 
+      has_many :taggings,
+               class_name: "Decidim::Plans::PlanTagging",
+               foreign_key: :decidim_plan_id,
+               dependent: :destroy
+      has_many :tags, through: :taggings
+
       scope :open, -> { where(state: "open") }
       scope :accepted, -> { where(state: "accepted") }
       scope :rejected, -> { where(state: "rejected") }
@@ -106,6 +112,14 @@ module Decidim
         closed_at.present?
       end
 
+      # Public: Checks if the plan has been closed AND not yet answered. This is
+      #         interpreted as the plan waiting to be evaluated.
+      #
+      # Returns Boolean.
+      def waiting_for_evaluation?
+        closed? && !answered?
+      end
+
       # Public: Checks if the organization has given an answer for the plan.
       #
       # Returns Boolean.

data/app/models/decidim/plans/plan_tagging.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Plans
+    # A plan tagging is a record that maps the plans with the tags.
+    class PlanTagging < Plans::ApplicationRecord
+      belongs_to :plan, class_name: "Decidim::Plans::Plan", foreign_key: :decidim_plan_id
+      belongs_to :tag, class_name: "Decidim::Plans::Tag", foreign_key: :decidim_plans_tag_id
+
+      validates :plan, :tag, presence: true
+    end
+  end
+end

data/app/models/decidim/plans/tag.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Plans
+    # A tag is a record that allows providing metadata for the items to be
+    # tagged, i.e. the "taggables". In this context, only plans are taggable.
+    class Tag < Plans::ApplicationRecord
+      belongs_to :organization,
+                 foreign_key: "decidim_organization_id",
+                 class_name: "Decidim::Organization"
+      has_many :plan_taggings, foreign_key: :decidim_plans_tag_id, dependent: :destroy
+
+      validates :organization, presence: true
+
+      def plan_taggings_count
+        PlanTagging.where(tag: self).count
+      end
+    end
+  end
+end

data/app/permissions/decidim/plans/admin/permissions.rb

@@ -16,14 +16,16 @@ module Decidim
           return permission_action if permission_action.subject != :plan &&
                                       permission_action.subject != :plans &&
                                       permission_action.subject != :section &&
-                                      permission_action.subject != :sections
+                                      permission_action.subject != :sections &&
+                                      permission_action.subject != :plan_tag &&
+                                      permission_action.subject != :plan_tags
 
           case permission_action.action
-          when :create, :export_budgets
+          when :read, :create, :export_budgets
             permission_action.allow!
           when :edit, :update, :destroy
-            permission_action.allow! if plan.present? || section.present?
-          when :close
+            permission_action.allow! if plan.present? || section.present? || tag.present?
+          when :close, :edit_taggings
             permission_action.allow! if plan.present?
           end
 
@@ -36,6 +38,14 @@ module Decidim
           @plan ||= context.fetch(:plan, nil)
         end
 
+        def section
+          @section ||= context.fetch(:section, nil)
+        end
+
+        def tag
+          @tag ||= context.fetch(:tag, nil)
+        end
+
         def admin_plan_answering_is_enabled?
           current_settings.try(:plan_answering_enabled) &&
             component_settings.try(:plan_answering_enabled)

data/app/permissions/decidim/plans/permissions.rb

@@ -47,7 +47,7 @@ module Decidim
       end
 
       def can_edit_plan?
-        toggle_allow(plan.open? && !plan.closed? && plan.editable_by?(user))
+        toggle_allow(plan.open? && plan.editable_by?(user))
       end
 
       def can_withdraw_plan?
@@ -59,6 +59,8 @@ module Decidim
       end
 
       def can_close_plan?
+        return toggle_allow(false) unless component_settings.closing_allowed?
+
         toggle_allow(plan && plan.created_by?(user))
       end
 

data/app/presenters/decidim/plans/plan_presenter.rb

@@ -44,6 +44,10 @@ module Decidim
 
         "<dl>#{fields.join("\n")}</dl>".html_safe
       end
+
+      def display_mention
+        link_to title, plan_path
+      end
     end
   end
 end

data/app/queries/decidim/plans/component_plan_tags.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Plans
+    # This query class filters all assemblies given an organization.
+    class ComponentPlanTags < Rectify::Query
+      def initialize(component)
+        @component = component
+      end
+
+      def query
+        q = Decidim::Plans::Tag.joins(
+          "LEFT JOIN decidim_plans_plan_taggings ON decidim_plans_plan_taggings.decidim_plans_tag_id = decidim_plans_tags.id"
+        ).joins(
+          "LEFT JOIN decidim_plans_plans ON decidim_plans_plans.id = decidim_plans_plan_taggings.decidim_plan_id"
+        ).where(
+          decidim_plans_tags: {
+            decidim_organization_id: @component.organization.id
+          },
+          decidim_plans_plans: {
+            decidim_component_id: @component.id
+          }
+        ).having("COUNT(decidim_plans_plan_taggings.id) > 0")
+        .group("decidim_plans_tags.id")
+        .order(Arel.sql("name ->> '#{current_locale}' ASC"))
+      end
+
+      private
+
+      def current_locale
+        I18n.locale.to_s
+      end
+    end
+  end
+end

data/app/queries/decidim/plans/organization_tags.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Plans
+    # This query class filters all assemblies given an organization.
+    class OrganizationTags < Rectify::Query
+      def initialize(organization)
+        @organization = organization
+      end
+
+      def query
+        q = Decidim::Plans::Tag.where(
+          organization: @organization
+        )
+        q.order(Arel.sql("name ->> '#{current_locale}' ASC"))
+      end
+
+      private
+
+      def current_locale
+        I18n.locale.to_s
+      end
+    end
+  end
+end

data/app/services/decidim/plans/plan_search.rb

@@ -76,6 +76,12 @@ module Decidim
         query.where(id: from).or(query.where(id: to))
       end
 
+      def search_tag_id
+        return query unless tag_id.is_a? Array
+
+        query.joins(:tags).where(decidim_plans_tags: { id: tag_id })
+      end
+
       private
 
       # Internal: builds the needed query to search for a text in the organization's

data/app/views/decidim/plans/admin/plans/_plan-tr.html.erb

@@ -19,6 +19,13 @@
       <% end %>
     </td>
   <% end %>
+  <td>
+    <% plan.tags.each do |tag| %>
+      <span class="label secondary">
+        <%= translated_attribute(tag.name) %>
+      </span>
+    <% end %>
+  </td>
   <td>
     <strong class="<%= plan_state_css_class plan.state %>">
       <%= humanize_plan_state plan.state %>
@@ -32,7 +39,7 @@
   <% end %>
 
   <td>
-    <%= l plan.created_at, format: :decidim_short %>
+    <%= l plan.published_at, format: :decidim_short %>
   </td>
 
   <td class="table-list__actions">
@@ -40,7 +47,7 @@
       <%= icon_link_to "pencil", edit_plan_path(plan), t("actions.edit_plan", scope: "decidim.plans"), class: "action-icon--edit-plan" %>
     <% end %>
 
-    <% if allowed_to? :close, :plan, plan: plan %>
+    <% if !plan.answered? && allowed_to?(:close, :plan, plan: plan) %>
       <% if plan.closed? %>
         <%= icon_link_to "action-undo", reopen_plan_path(plan), t("actions.reopen_plan", scope: "decidim.plans"), method: :post, class: "action-icon--reopen-plan" %>
       <% else %>
@@ -48,6 +55,10 @@
       <% end %>
     <% end %>
 
+    <% if allowed_to? :edit_taggings, :plan, plan: plan %>
+      <%= icon_link_to "tag", taggings_plan_path(plan), t("actions.plan_taggings", scope: "decidim.plans"), class: "action-icon--plan-taggings" %>
+    <% end %>
+
     <% if allowed_to? :create, :plan_answer %>
       <%= icon_link_to "comment-square", edit_plan_plan_answer_path(plan_id: plan.id, id: plan.id), t("actions.answer", scope: "decidim.plans"), class: " icon--small" %>
     <% else %>

data/app/views/decidim/plans/admin/plans/index.html.erb

@@ -29,6 +29,10 @@
               </th>
             <% end %>
 
+            <th>
+              <%= t("models.plan.fields.tags", scope: "decidim.plans")%>
+            </th>
+
             <th>
               <%= sort_link(query, :state, t("models.plan.fields.state", scope: "decidim.plans") ) %>
             </th>
@@ -61,4 +65,9 @@
       <%= paginate plans, theme: "decidim" %>
     </div>
   </div>
+  <div class="card-divider">
+    <strong><%= t ".published_plans" %>:&nbsp;</strong><span><%= counts[:published] %></span>
+    <span>&nbsp;|&nbsp;</span>
+    <strong><%= t ".draft_plans" %>:&nbsp;</strong><span><%= counts[:drafts] %></span>
+  </div>
 </div>

data/app/views/decidim/plans/admin/plans/taggings.html.erb

@@ -0,0 +1,67 @@
+<div class="card" id="add-translations-search">
+  <div class="card-divider">
+    <h2 class="card-title flex--sbc">
+      <div>
+        <%= link_to "#{translated_attribute(plan.title)}", plans_path %>
+        &gt;
+        <%= t(".title") %>
+      </div>
+
+      <div class="flex--cc flex-gap--1">
+        <%= link_to t("actions.back", scope: "decidim.plans"), plans_path, class: "button hollow tiny button--simple" %>
+        <%= link_to t("actions.manage_tags", scope: "decidim.plans"), plan_tags_path(plan), class: "button tiny button--simple" if allowed_to? :create, :plan_tags %>
+      </div>
+    </h2>
+  </div>
+  <div class="card-section">
+    <div class="filters row" id="add-tags-search">
+      <div class="column medium-4">
+        <%= form_tag plan_tags_path(plan), method: :get do %>
+          <div class="filters__search">
+            <%= search_field_tag :term, nil, label: false, id: "data_picker-autocomplete", class: "input-group-field", placeholder: t(".search"), data: {
+              no_results_text: t(".no_results", name: "{{term}}"),
+              no_results_url: "#{new_plan_tag_path(plan, name: '', back_to_plan: 1)}{{term}}"
+            } %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<%= decidim_form_for(@form, url: update_taggings_plan_path(plan), html: { class: "form translations-form update_taggings plan_taggings_form_admin" }) do |f| %>
+  <div class="card hide" id="plan-tags-results" data-results="<%= plan.tags.collect { |t| [t.id, translated_attribute(t.name)] } %>">
+    <div class="card-section">
+      <div class="table-scroll">
+        <script type="text/template" class="decidim-template">
+          <tr>
+            <td>{{tag_id}}</td>
+            <td>{{tag_name}}</td>
+            <td>
+              <input type="hidden" name="tags[]" value="{{tag_id}}">
+              <%= icon_link_to "circle-x", "#", t("actions.destroy", scope: "decidim.plans"), class: "remove-tagging action-icon--remove" %>
+            </td>
+          </tr>
+        </script>
+
+        <table class="table-list">
+          <thead>
+            <tr>
+              <th><%= t("models.plan_tags.fields.id", scope: "decidim.plans") %></th>
+              <th><%= t("models.plan_tags.fields.name", scope: "decidim.plans") %></th>
+              <th></th>
+            </tr>
+          </thead>
+          <tbody>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".update") %>
+  </div>
+<% end %>
+
+<%= javascript_include_tag "decidim/plans/admin/plans" %>

data/app/views/decidim/plans/admin/tags/_form.html.erb

@@ -0,0 +1,21 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= link_to "#{translated_attribute(plan.title)}", plans_path %>
+      &gt;
+      <%= link_to t(".tags"), taggings_plan_path(plan) %>
+      &gt;
+      <%= title %>
+
+      <div class="button--title">
+        <%= link_to t("actions.back", scope: "decidim.plans"), taggings_plan_path(plan), class: "button hollow tiny button--simple" %>
+      </div>
+    </h2>
+  </div>
+
+  <%= form.hidden_field :back_to_plan %>
+
+  <div class="card-section">
+    <%= form.translated :text_field, :name %>
+  </div>
+</div>

data/app/views/decidim/plans/admin/tags/edit.html.erb

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, url: plan_tag_path(plan, @form), html: { class: "form plans-form new_plan plan_form_admin" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".update") %>
+  </div>
+<% end %>

data/app/views/decidim/plans/admin/tags/index.html.erb

@@ -0,0 +1,52 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title flex--sbc">
+      <div>
+        <%= link_to "#{translated_attribute(plan.title)}", plans_path %>
+        &gt;
+        <%= link_to t(".tags"), taggings_plan_path(plan) %>
+        &gt;
+        <%= t(".title") %>
+      </div>
+
+      <div class="flex--cc flex-gap--1">
+        <%= link_to t("actions.back", scope: "decidim.plans"), taggings_plan_path(plan), class: "button hollow tiny button--simple" %>
+        <%= link_to t("actions.new_tag", scope: "decidim.plans"), new_plan_tag_path(plan), class: "button tiny button--simple" if allowed_to? :create, :plan_tags %>
+      </div>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.plan_tags.fields.id", scope: "decidim.plans") %></th>
+            <th><%= t("models.plan_tags.fields.name", scope: "decidim.plans") %></th>
+            <th><%= t("models.plan_tags.fields.taggings_count", scope: "decidim.plans") %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% tags.each do |tag| %>
+            <tr>
+              <td><%= tag.id %></td>
+              <td><%= translated_attribute(tag.name) %></td>
+              <td><%= tag.plan_taggings_count %></td>
+              <td class="table-list__actions">
+                <% if allowed_to? :edit, :plan_tag, tag: tag %>
+                  <%= icon_link_to "pencil", edit_plan_tag_path(plan, tag), t("actions.edit", scope: "decidim.plans"), class: "action-icon--edit" %>
+                <% end %>
+
+                <% if allowed_to? :destroy, :plan_tag, tag: tag %>
+                  <%= icon_link_to "circle-x", plan_tag_path(plan, tag), t("actions.destroy", scope: "decidim.plans"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.plans") } %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+      <%= paginate tags, theme: "decidim" %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/plans/admin/tags/new.html.erb

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, url: plan_tags_path(plan, @form), html: { class: "form plans-form new_plan plan_form_admin" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".create") %>
+  </div>
+<% end %>

data/app/views/decidim/plans/plans/_evaluation_modal.html.erb

@@ -0,0 +1,22 @@
+<div class="reveal" id="evaluationModal" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t(".title") %></h3>
+    <button class="close-button" data-close aria-label="<%= t(".close") %>"
+      type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="row">
+    <div class="columns medium-8 medium-centered">
+      <p class="text-center">
+        <%= t(".description") %>
+      </p>
+
+      <div class="actions">
+        <button class="button expanded" data-close type="button">
+          <%= t(".button_text") %>
+        </button>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/decidim/plans/plans/_filters.html.erb

@@ -28,5 +28,9 @@
     <%= form.categories_select :category_id, current_component.categories, legend_title: t(".category"), disable_parents: false, label: false, prompt: t(".category_prompt") %>
   <% end %>
 
+  <% if available_tags.any? %>
+    <%= form.collection_check_boxes :tag_id, available_tags, ->(p) { "#{p.id}" }, ->(p) { translated_attribute(p.name) }, legend_title: t(".tag"), disable_parents: false, label: false, prompt: t(".tag_prompt") %>
+  <% end %>
+
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
 <% end %>

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

@@ -46,6 +46,11 @@
 
         <% if allowed_to?(:edit, :plan, plan: @plan) %>
           <%= link_to t("edit", scope:"decidim.plans.plans.show"), edit_plan_path(@plan), class: "button secondary hollow expanded button--sc mt-s", id: "plan_edit" %>
+        <% elsif @plan.editable_by?(current_user) && @plan.waiting_for_evaluation? %>
+          <span class="button secondary hollow expanded button--sc mt-s disabled" data-open="evaluationModal">
+            <%= t("edit", scope:"decidim.plans.plans.show") %>
+          </span>
+          <p><%= t("plan_waiting_for_evaluation", scope:"decidim.plans.plans.show") %></p>
         <% end %>
         <% if allowed_to?(:close, :plan, plan: @plan) && !@plan.closed? %>
           <%= link_to t("close", scope:"decidim.plans.plans.show"), close_plan_path(@plan), method: :post, class: "button secondary hollow expanded button--sc mt-s", id: "plan_close", data: { confirm: t("close_confirm", scope:"decidim.plans.plans.show") } %>
@@ -93,7 +98,7 @@
     <div class="section">
       <%== cell("decidim/plans/plan_m", @plan, full_badge: true).badge %>
       <%= render partial: "contents" %>
-      <%= cell "decidim/tags", @plan, context: { extra_classes: ["tags--plan"] } %>
+      <%= cell "decidim/plans/tags", @plan, context: { extra_classes: ["tags--plan"] } %>
     </div>
     <% if @plan.answered? && translated_attribute(@plan.answer).present? %>
       <% if @plan.accepted? %>
@@ -136,3 +141,6 @@
     url: decidim.report_path(sgid: @plan.to_sgid.to_s)
   }
 %>
+<% if @plan.editable_by?(current_user) && @plan.waiting_for_evaluation? %>
+  <%= render partial: "evaluation_modal" %>
+<% end %>

data/app/views/decidim/plans/shared/_attachments.html.erb

@@ -1,10 +1,10 @@
 <% if component_settings.attachments_allowed? %>
   <div class="multifield-fields attachments-container" data-placeholder-id="<%= blank_attachment.to_param %>">
-    <template>
+    <script type="text/template" class="decidim-template">
       <%= fields_for "#{form.object_name}[attachments][#{blank_attachment.to_param}]", blank_attachment do |attachment_form| %>
         <%= render partial: "decidim/plans/shared/attachment_fields", object: attachment_form, locals: { form: attachment_form, id: tabs_id_for_attachment(blank_attachment) } %>
       <% end %>
-    </template>
+    </script>
 
     <fieldset>
       <legend><%= t(".legend") %></legend>

data/app/views/decidim/plans/shared/_tags.html.erb

@@ -0,0 +1 @@
+<%= cell "decidim/plans/tags", resource, context: { extra_classes: [tags_class_extra] } %>