decidim-proposals 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46488da07b1fcedae339ac996a3dc7ad7630921508b2005fba0b0b63bbbfa011
-  data.tar.gz: fc7d5e4b59980364fe7dd953c03f960f88d2787c9b45ef1020b6902e4cd876bd
+  metadata.gz: 2e2beae792f2e71369afee5770fce30f6ec7b4b2baf3e89da9cd905c2c99a1e9
+  data.tar.gz: b4faeabfaa6b595a48acb8fb0e320bb404c746da7fb1fe0229b8888efa39b0ad
 SHA512:
-  metadata.gz: ae9957d68d71430799891dfd79205582cc36ee916803ec3842aa0dcae7189ba0d95a726147b731717f933447e40c203816311661201fd9fbdf6be25091a890b9
-  data.tar.gz: cab36522bfa9fdbcd6f66439ea39b83a191f0a3a67ce2d63a5d293c0bb6af83abfa0374a65cebdcde921ac882af640c9b8950e197673e1af7db65cf2e9f74b0f
+  metadata.gz: 18a69a6b8e6ce11c8a91acb8f6370111140612b3e33f62d73de4424d2834691c2f84074adac3c63fa77049954c4285f66876a12748216c4e2ddba55888253a8e
+  data.tar.gz: 2dc55deb9e785df8f31b8b3fc940a09049688b2fa96ec38ab55687428edd2b977433e186e6cebafdf4d98205687d65c89c758a39e92d44d6cf11d30657ae7308

data/app/assets/javascripts/decidim/proposals/admin/proposals.es6

@@ -4,18 +4,31 @@ $(document).ready(function () {
     return $('.table-list .js-check-all-proposal:checked').length
   }
 
+  let selectedProposalsNotPublishedAnswerCount = function() {
+    return $('.table-list [data-published-state=false] .js-check-all-proposal:checked').length
+  }
+
   window.selectedProposalsCountUpdate = function() {
-    if(selectedProposalsCount() == 0){
+    const selectedProposals = selectedProposalsCount();
+    const selectedProposalsNotPublishedAnswer = selectedProposalsNotPublishedAnswerCount();
+    if(selectedProposals == 0){
       $("#js-selected-proposals-count").text("")
     } else {
-      $("#js-selected-proposals-count").text(selectedProposalsCount());
+      $("#js-selected-proposals-count").text(selectedProposals);
     }
 
-    if(selectedProposalsCount() >= 2) {
+    if(selectedProposals >= 2) {
       $('button[data-action="merge-proposals"]').parent().show();
     } else {
       $('button[data-action="merge-proposals"]').parent().hide();
     }
+
+    if(selectedProposalsNotPublishedAnswer > 0) {
+      $('button[data-action="publish-answers"]').parent().show();
+      $('#js-form-publish-answers-number').text(selectedProposalsNotPublishedAnswer);
+    } else {
+      $('button[data-action="publish-answers"]').parent().hide();
+    }
   }
 
   let showBulkActionsButton = function() {
@@ -24,7 +37,7 @@ $(document).ready(function () {
     }
   }
 
-  let hideBulkActionsButton = function(force = false) {
+  window.hideBulkActionsButton = function(force = false) {
     if(selectedProposalsCount() == 0 || force == true){
       $("#js-bulk-actions-button").addClass('hide');
       $("#js-bulk-actions-dropdown").removeClass('is-open');
@@ -35,12 +48,12 @@ $(document).ready(function () {
     $("#js-other-actions-wrapper").removeClass('hide');
   }
 
-  let hideOtherActionsButtons = function() {
+  window.hideOtherActionsButtons = function() {
     $("#js-other-actions-wrapper").addClass('hide');
   }
 
   window.hideBulkActionForms = function() {
-    return $(".js-bulk-action-form").addClass('hide');
+    $(".js-bulk-action-form").addClass('hide');
   }
 
   if ($('.js-bulk-action-form').length) {
@@ -57,8 +70,8 @@ $(document).ready(function () {
         })
 
         $(`#js-${action}-actions`).removeClass('hide');
-        hideBulkActionsButton(true);
-        hideOtherActionsButtons();
+        window.hideBulkActionsButton(true);
+        window.hideOtherActionsButtons();
       }
     })
 
@@ -71,7 +84,7 @@ $(document).ready(function () {
         showBulkActionsButton();
       } else {
         $(".js-check-all-proposal").closest('tr').removeClass('selected');
-        hideBulkActionsButton();
+        window.hideBulkActionsButton();
       }
 
       selectedProposalsCountUpdate();
@@ -96,12 +109,12 @@ $(document).ready(function () {
         showBulkActionsButton();
         $(this).closest('tr').addClass('selected');
       } else {
-        hideBulkActionsButton();
+        window.hideBulkActionsButton();
         $(this).closest('tr').removeClass('selected');
       }
 
       if ($('.js-check-all-proposal:checked').length === 0) {
-        hideBulkActionsButton();
+        window.hideBulkActionsButton();
       }
 
       $('.js-bulk-action-form').find(".js-proposal-id-"+proposal_id).prop('checked', checked);

data/app/cells/decidim/proposals/cost_report/show.erb

@@ -0,0 +1,35 @@
+<div id="proposal-costs" class="card card--secondary" data-toggler=".expanded-text">
+  <div class="card__content">
+    <div class="mb-s">
+      <div class="data-title">
+        <h3 class="data-title__over">
+          <%= t("decidim.proposals.proposals.show.estimated_cost") %>
+        </h3>
+        <div>
+          <strong class="data-title__main">
+            <%= cost %>
+          </strong>
+        </div>
+        <div class="data-title__sub">
+          <%= execution_period %>
+        </div>
+      </div>
+    </div>
+    <div id="execution-cost-short" class="text-toggle__short">
+      <%= cost_report_short %>
+      <% if needs_text_toggle? %>
+      <button class="muted-link" data-toggle="proposal-costs">
+        <%= t("decidim.proposals.proposals.show.read_more") %>
+      </button>
+      <% end %>
+    </div>
+    <% if needs_text_toggle? %>
+    <div id="execution-cost-long" class="text-toggle__long">
+      <%= cost_report %>
+      <button class="muted-link" data-toggle="proposal-costs">
+        <%= t("decidim.proposals.proposals.show.read_less") %>
+      </button>
+    </div>
+    <% end %>
+  </div>
+</div>

data/app/cells/decidim/proposals/cost_report_cell.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Proposals
+    # This cell renders the cost report for a proposal.
+    class CostReportCell < Decidim::ViewModel
+      include ActionView::Helpers::NumberHelper
+      include Decidim::SanitizeHelper
+      include Decidim::LayoutHelper
+      include ProposalCellsHelper
+
+      private
+
+      def cost
+        number_to_currency(model.cost)
+      end
+
+      def cost_report
+        decidim_sanitize(translated_attribute(model.cost_report).html_safe)
+      end
+
+      def needs_text_toggle?
+        cost_report != cost_report_short
+      end
+
+      def cost_report_short
+        decidim_sanitize(
+          html_truncate(
+            translated_attribute(model.cost_report).html_safe,
+            length: 200
+          )
+        )
+      end
+
+      def execution_period
+        decidim_sanitize(translated_attribute(model.execution_period).html_safe)
+      end
+    end
+  end
+end

data/app/cells/decidim/proposals/proposal_m_cell.rb

@@ -27,7 +27,7 @@ module Decidim
       end
 
       def has_badge?
-        answered? || withdrawn? || emendation?
+        published_state? || withdrawn?
       end
 
       def has_link_to_resource?
@@ -94,6 +94,14 @@ module Decidim
       def can_be_followed?
         !model.withdrawn?
       end
+
+      def has_image?
+        model.attachments.first.present? && model.attachments.first.file.content_type.start_with?("image") && model.component.settings.allow_card_image
+      end
+
+      def resource_image_path
+        model.attachments.first.url if has_image?
+      end
     end
   end
 end

data/app/cells/decidim/proposals/proposal_tags/show.erb

@@ -1,25 +1,27 @@
 <figure>
-  <figcaption class="text-uppercase">
-    <strong>
-      <%= t("filed_as", scope: "decidim.proposals.proposals.tags") %>
-    </strong>
-  </figcaption>
-
-  <ul>
+  <ul class="tags tags--proposal tags--list">
     <% if category.present? %>
       <li>
-        <%= link_to translated_attribute(category.name), resource_locator(model).index(filter: { category_id: category.id }) %>
+        <%= link_to translated_attribute(category.name), resource_locator(model).index(filter: { category_id: [category.id.to_s] }) %>
         <% if previous_category.present? && show_previous_category? %>
           &nbsp;
           <small class="text-small">
-            <%= t("changed_from", scope: "decidim.proposals.proposals.tags", previous_category: "#{previous_category.translated_name}").html_safe %>
+            <%= t("changed_from", scope: "decidim.proposals.proposals.tags", previous_name: "#{previous_category.translated_name}").html_safe %>
           </small>
         <% end %>
       </li>
     <% end %>
 
     <% if has_visible_scopes?(model) %>
-      <li><%= link_to translated_attribute(scope.name), resource_locator(model).index(filter: { scope_id: [scope.id] }) %></li>
+      <li>
+        <%= link_to translated_attribute(scope.name), resource_locator(model).index(filter: { scope_id: [scope.id] }) %>
+        <% if previous_scope.present? && show_previous_scope? %>
+          &nbsp;
+          <small class="text-small">
+            <%= t("changed_from", scope: "decidim.proposals.proposals.tags", previous_name: "#{translated_attribute(previous_scope.name)}").html_safe %>
+          </small>
+        <% end %>
+      </li>
     <% end %>
   </ul>
 </figure>

data/app/cells/decidim/proposals/proposal_tags_cell.rb

@@ -11,6 +11,7 @@ module Decidim
       property :category
       property :previous_category
       property :scope
+      property :previous_scope
 
       def show
         render if has_category_or_scopes?
@@ -22,6 +23,10 @@ module Decidim
         options[:show_previous_category].to_s != "false"
       end
 
+      def show_previous_scope?
+        options[:show_previous_scope].to_s != "false"
+      end
+
       def has_category_or_scopes?
         category.present? || has_visible_scopes?(model)
       end

data/app/commands/decidim/proposals/admin/answer_proposal.rb

@@ -23,16 +23,19 @@ module Decidim
         def call
           return broadcast(:invalid) if form.invalid?
 
-          answer_proposal
-          notify_followers
-          increment_score
+          store_initial_proposal_state
+
+          transaction do
+            answer_proposal
+            notify_proposal_answer
+          end
 
           broadcast(:ok)
         end
 
         private
 
-        attr_reader :form, :proposal
+        attr_reader :form, :proposal, :initial_has_state_published, :initial_state
 
         def answer_proposal
           Decidim.traceability.perform_action!(
@@ -40,55 +43,30 @@ module Decidim
             proposal,
             form.current_user
           ) do
-            proposal.update!(
-              state: @form.state,
-              answer: @form.answer,
-              answered_at: Time.current
-            )
-          end
-        end
+            attributes = {
+              state: form.state,
+              answer: form.answer,
+              answered_at: Time.current,
+              cost: form.cost,
+              cost_report: form.cost_report,
+              execution_period: form.execution_period
+            }
 
-        def notify_followers
-          return if (proposal.previous_changes.keys & %w(state)).empty?
+            attributes[:state_published_at] = Time.current if !initial_has_state_published && form.publish_answer?
 
-          if proposal.accepted?
-            publish_event(
-              "decidim.events.proposals.proposal_accepted",
-              Decidim::Proposals::AcceptedProposalEvent
-            )
-          elsif proposal.rejected?
-            publish_event(
-              "decidim.events.proposals.proposal_rejected",
-              Decidim::Proposals::RejectedProposalEvent
-            )
-          elsif proposal.evaluating?
-            publish_event(
-              "decidim.events.proposals.proposal_evaluating",
-              Decidim::Proposals::EvaluatingProposalEvent
-            )
+            proposal.update!(attributes)
           end
         end
 
-        def publish_event(event, event_class)
-          Decidim::EventsManager.publish(
-            event: event,
-            event_class: event_class,
-            resource: proposal,
-            affected_users: proposal.notifiable_identities,
-            followers: proposal.followers - proposal.notifiable_identities
-          )
-        end
+        def notify_proposal_answer
+          return if !initial_has_state_published && !form.publish_answer?
 
-        def increment_score
-          return unless proposal.accepted?
+          NotifyProposalAnswer.call(proposal, initial_state)
+        end
 
-          proposal.coauthorships.find_each do |coauthorship|
-            if coauthorship.user_group
-              Decidim::Gamification.increment_score(coauthorship.user_group, :accepted_proposals)
-            else
-              Decidim::Gamification.increment_score(coauthorship.author, :accepted_proposals)
-            end
-          end
+        def store_initial_proposal_state
+          @initial_has_state_published = proposal.published_state?
+          @initial_state = proposal.state
         end
       end
     end

data/app/commands/decidim/proposals/admin/assign_proposals_to_valuator.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A command with all the business logic to assign proposals to a given
+      # valuator.
+      class AssignProposalsToValuator < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # form - A form object with the params.
+        def initialize(form)
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) unless form.valid?
+
+          assign_proposals
+          broadcast(:ok)
+        rescue ActiveRecord::RecordInvalid
+          broadcast(:invalid)
+        end
+
+        private
+
+        attr_reader :form
+
+        def assign_proposals
+          transaction do
+            form.proposals.flat_map do |proposal|
+              find_assignment(proposal) || assign_proposal(proposal)
+            end
+          end
+        end
+
+        def find_assignment(proposal)
+          Decidim::Proposals::ValuationAssignment.find_by(
+            proposal: proposal,
+            valuator_role: form.valuator_role
+          )
+        end
+
+        def assign_proposal(proposal)
+          Decidim.traceability.create!(
+            Decidim::Proposals::ValuationAssignment,
+            form.current_user,
+            proposal: proposal,
+            valuator_role: form.valuator_role
+          )
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/proposals/admin/create_proposal.rb

@@ -39,6 +39,7 @@ module Decidim
             create_proposal
             create_attachment if process_attachments?
             create_gallery if process_gallery?
+            link_author_meeeting if form.created_in_meeting?
             send_notification
           end
 
@@ -73,6 +74,10 @@ module Decidim
           }
         end
 
+        def link_author_meeeting
+          proposal.link_resources(form.author, "proposals_from_meeting")
+        end
+
         def send_notification
           Decidim::EventsManager.publish(
             event: "decidim.events.proposals.proposal_published",

data/app/commands/decidim/proposals/admin/notify_proposal_answer.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A command to notify about the change of the published state for a proposal.
+      class NotifyProposalAnswer < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # proposal - The proposal to write the answer for.
+        # initial_state - The proposal state before the current process.
+        def initialize(proposal, initial_state)
+          @proposal = proposal
+          @initial_state = initial_state.to_s
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :noop when the answer is not published or the state didn't changed.
+        # - :ok when everything is valid.
+        #
+        # Returns nothing.
+        def call
+          if proposal.published_state? && state_changed?
+            transaction do
+              increment_score
+              notify_followers
+            end
+          end
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :proposal, :initial_state
+
+        def state_changed?
+          initial_state != proposal.state.to_s
+        end
+
+        def notify_followers
+          if proposal.accepted?
+            publish_event(
+              "decidim.events.proposals.proposal_accepted",
+              Decidim::Proposals::AcceptedProposalEvent
+            )
+          elsif proposal.rejected?
+            publish_event(
+              "decidim.events.proposals.proposal_rejected",
+              Decidim::Proposals::RejectedProposalEvent
+            )
+          elsif proposal.evaluating?
+            publish_event(
+              "decidim.events.proposals.proposal_evaluating",
+              Decidim::Proposals::EvaluatingProposalEvent
+            )
+          end
+        end
+
+        def publish_event(event, event_class)
+          Decidim::EventsManager.publish(
+            event: event,
+            event_class: event_class,
+            resource: proposal,
+            affected_users: proposal.notifiable_identities,
+            followers: proposal.followers - proposal.notifiable_identities
+          )
+        end
+
+        def increment_score
+          if proposal.accepted?
+            proposal.coauthorships.find_each do |coauthorship|
+              Decidim::Gamification.increment_score(coauthorship.user_group || coauthorship.author, :accepted_proposals)
+            end
+          elsif initial_state == "accepted"
+            proposal.coauthorships.find_each do |coauthorship|
+              Decidim::Gamification.decrement_score(coauthorship.user_group || coauthorship.author, :accepted_proposals)
+            end
+          end
+        end
+      end
+    end
+  end
+end