decidim-reporting_proposals 0.2.0

data/app/jobs/decidim/reporting_proposals/assign_proposal_valuators_job.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    class AssignProposalValuatorsJob < ApplicationJob
+      queue_as :default
+      attr_reader :resource
+
+      def perform(data)
+        @resource = data[:resource]
+
+        return if valuator_roles.blank?
+
+        unless data[:event_class] == "Decidim::Proposals::Admin::UpdateProposalCategoryEvent"
+          return unless data[:extra][:participatory_space]
+          return if data[:extra][:type] == "admin"
+        end
+
+        valuator_roles.each do |valuator_role|
+          Decidim::Proposals::Admin::AssignProposalsToValuator.call(form(valuator_role)) do
+            on(:ok) do
+              Rails.logger.info("Automatically assigned valuator #{valuator_role.user.name} to proposal ##{resource.id}")
+            end
+            on(:invalid) do
+              Rails.logger.warn("Couldn't automatically assign valuator #{valuator_role.user.name} to proposal ##{resource.id}")
+            end
+          end
+        end
+      end
+
+      def form(valuator_role)
+        Decidim::Proposals::Admin::ValuationAssignmentForm.from_params(
+          id: valuator_role.id,
+          proposal_ids: [resource.id]
+        ).with_context(
+          current_component: resource.component,
+          current_user: resource.organization.users.first # first admin for the traceability
+        )
+      end
+
+      # get valuators from categories
+      def valuator_roles
+        @valuator_roles ||= category.valuator_roles
+      end
+
+      def category
+        @category ||= resource.category
+      end
+    end
+  end
+end

data/app/models/concerns/decidim/reporting_proposals/category_override.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    module CategoryOverride
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :category_valuators,
+                 class_name: "Decidim::ReportingProposals::CategoryValuator",
+                 foreign_key: :decidim_category_id,
+                 dependent: :destroy
+
+        def valuator_roles
+          category_valuators.map(&:valuator_role)
+        end
+
+        def valuator_users
+          category_valuators.map(&:user)
+        end
+
+        def valuator_names
+          valuator_users.map(&:name)
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/decidim/reporting_proposals/participatory_space_role_config/valuator_override.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    module ParticipatorySpaceRoleConfig
+      module ValuatorOverride
+        extend ActiveSupport::Concern
+
+        included do
+          def accepted_components
+            [:proposals, :reporting_proposals]
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/decidim/reporting_proposals/participatory_space_user_role_override.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    module ParticipatorySpaceUserRoleOverride
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :category_valuators,
+                 class_name: "Decidim::ReportingProposals::CategoryValuator",
+                 foreign_key: :valuator_role_id,
+                 dependent: :destroy
+
+        # there is a bug in decidim that does not clean records from ValuationAssignment when removing Space roles
+        # This is a workaround to clean them manually
+        # It might be possible that we need to change this when this is solved:
+        # https://github.com/decidim/decidim/issues/10353
+        has_many :proposal_valuation_assignments,
+                 class_name: "Decidim::Proposals::ValuationAssignment",
+                 foreign_key: :valuator_role_id,
+                 dependent: :destroy
+      end
+    end
+  end
+end

data/app/models/decidim/reporting_proposals/category_valuator.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    class CategoryValuator < ApplicationRecord
+      self.table_name = "decidim_reporting_proposals_category_valuators"
+
+      belongs_to :category,
+                 foreign_key: "decidim_category_id",
+                 class_name: "Decidim::Category"
+
+      belongs_to :valuator_role,
+                 polymorphic: true
+
+      delegate :user, to: :valuator_role
+
+      validate :category_belongs_to_same_participatory_space
+
+      private
+
+      def category_belongs_to_same_participatory_space
+        return if category.participatory_space == valuator_role.participatory_space
+
+        errors.add(:category, :invalid)
+      end
+    end
+  end
+end

data/app/overrides/decidim/admin/categories/_form/add_valuators_field.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_bottom ".card-section" -->
+
+<%= render "decidim/reporting_proposals/admin/categories/valuators_field", form: form %>

data/app/overrides/decidim/admin/categories/index/add_table_column_name.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_before ".actions" -->
+
+<%= render "decidim/reporting_proposals/admin/categories/column_valuators" %>

data/app/overrides/decidim/admin/categories/index/add_valuators.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_before ".table-list__actions" -->
+
+<%= render "decidim/reporting_proposals/admin/categories/valuators", category: defined?(subcategory) ? subcategory : category %>

data/app/overrides/decidim/proposals/admin/proposal_notes/_proposal_notes/add_edit_link.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_after "erb[loud]:contains('l note.created_at, format: :decidim_short')" -->
+
+<%= render "decidim/proposals/admin/proposal_notes/editing_note", note: note %>

data/app/overrides/decidim/proposals/admin/proposal_notes/_proposal_notes/add_links_to_note.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- replace "erb[loud]:contains('simple_format note.body')" -->
+
+<%= render partial: "decidim/proposals/admin/proposal_notes/proposal_notes_body", locals: { note: note } %>

data/app/overrides/decidim/proposals/admin/proposals/_proposal-tr/add_td_hide_action.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_bottom ".table-list__actions" -->
+
+<%= render "decidim/reporting_proposals/admin/proposals/proposal_td_hide", proposal: proposal %>

data/app/overrides/decidim/proposals/admin/proposals/_proposal-tr/add_valuators_name.html.erb.deface

@@ -0,0 +1,9 @@
+<!-- replace "erb[loud]:contains('proposal.valuation_assignments.count')" -->
+
+<% count = proposal.valuation_assignments.count %>
+<% if count.zero? %>
+  0
+<% else %>
+	<%= proposal.valuation_assignments.first&.valuator_role&.user&.name %>
+	<%= "(+#{(count - 1)})" if count > 1 %>
+<% end %>

data/app/overrides/decidim/proposals/admin/proposals/_proposal-tr/replace_td_title.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- replace_contents "td[3]" -->
+
+<%= render "decidim/reporting_proposals/admin/proposals/proposal_td_title", proposal: proposal %>

data/app/overrides/decidim/proposals/admin/proposals/show/add_photo_management.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_after ".card[1]" -->
+
+<%= render partial: "decidim/reporting_proposals/admin/proposals/photos" %>

data/app/overrides/decidim/proposals/admin/proposals/show/add_send_email_btn.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_after "erb[loud]:contains('current_or_new_conversation_path_with(presented_author)')" -->
+
+<%= render partial: "decidim/proposals/admin/proposals/send_email_button", locals: { presented_author: presented_author }%>

data/app/overrides/decidim/proposals/admin/proposals/show/remove_photos.html.erb.deface

@@ -0,0 +1,4 @@
+<!-- replace "erb[silent]:contains('if proposal.photos.any?')" -->
+
+<% if nil %>
+	

data/app/overrides/decidim/proposals/admin/proposals/show/replace_valuators.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- replace "erb[silent]:contains('if proposal.valuators.any?')" -->
+
+<% if true %>

data/app/overrides/decidim/proposals/proposals/_proposal_similar/add_distance_badge.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_before ".card__header" -->
+
+<% if geocoding_comparison? %>
+	<span class="label secondary float-right"><%= icon("location") %> <%= t("away", scope: "decidim.reporting_proposals.proposals.compare.geocoding", meters: distance(1000 * @proposal.distance_from([proposal.latitude, proposal.longitude], :km))) %></span>
+<% end %>

data/app/overrides/decidim/proposals/proposals/_wizard_header/replace_title.html.erb.deface

@@ -0,0 +1,14 @@
+<!-- replace ".section-heading" -->
+
+<% if geocoding_comparison? && action_name == "compare" %>
+	<h2 class="section-heading">
+	  <%= t("title", scope: "decidim.reporting_proposals.proposals.compare.geocoding") %>
+	  <%= "(#{@similar_proposals.count})" if @similar_proposals.present? %>
+	</h2>
+	<p><%= t("description", scope: "decidim.reporting_proposals.proposals.compare.geocoding", meters: distance) %></p>
+<% else %>
+	<h2 class="section-heading">
+	  <%= proposal_wizard_step_title action_name %>
+	  <%= "(#{@similar_proposals.count})" if @similar_proposals.present? %>
+	</h2>
+<% end %>

data/app/overrides/decidim/proposals/proposals/edit/add_user_group.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_before ".actions" -->
+
+<%= render partial: "decidim/reporting_proposals/proposals/user_group", locals: { form: form } if reporting_proposal? %>

data/app/overrides/decidim/proposals/proposals/edit/replace_javascript.html.erb.deface

@@ -0,0 +1,8 @@
+<!-- replace "erb[loud]:contains('javascript_pack_tag')" -->
+
+<% if reporting_proposal? %>
+  <%= javascript_pack_tag "decidim_reporting_proposals" %>
+  <%= stylesheet_pack_tag "decidim_reporting_proposals" %>
+<% else %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>

data/app/overrides/decidim/proposals/proposals/edit/replace_partial_edit_form_fields.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- replace "erb[loud]:contains('edit_form_fields')" -->
+
+<%= render "decidim/#{reporting_proposal? ? 'reporting_proposals/proposals/reporting_proposal_fields' : 'proposals/proposals/edit_form_fields'}", form: form %>

data/app/overrides/decidim/proposals/proposals/edit_draft/add_user_group.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_before ".row.column.flex-center" -->
+
+<%= render partial: "decidim/reporting_proposals/proposals/user_group", locals: { form: form } if reporting_proposal? %>

data/app/overrides/decidim/proposals/proposals/edit_draft/replace_javascript.html.erb.deface

@@ -0,0 +1,8 @@
+<!-- replace "erb[loud]:contains('javascript_pack_tag')" -->
+
+<% if reporting_proposal? %>
+  <%= javascript_pack_tag "decidim_reporting_proposals" %>
+  <%= stylesheet_pack_tag "decidim_reporting_proposals" %>
+<% else %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>

data/app/overrides/decidim/proposals/proposals/edit_draft/replace_partial_edit_form_fields.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- replace "erb[loud]:contains('edit_form_fields')" -->
+
+<%= render "decidim/#{reporting_proposal? ? 'reporting_proposals/proposals/reporting_proposal_fields' : 'proposals/proposals/edit_form_fields'}", form: form %>

data/app/overrides/decidim/proposals/proposals/index/add_additional_button.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_before "erb[silent]:contains('if component_settings.collaborative_drafts_enabled?')" -->
+
+<%= render partial: "decidim/proposals/proposals/additional_button" %>

data/app/overrides/decidim/proposals/proposals/new/remove_title.html.erb.deface

@@ -0,0 +1 @@
+<!-- remove ".hashtags__container" -->

data/app/overrides/decidim/proposals/proposals/new/replace_body.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_after "erb[loud]:contains('form_required_explanation')" -->
+
+<%= render "decidim/reporting_proposals/proposals/#{reporting_proposal? ? 'reporting_proposal_fields' : 'new_proposal_fields'}", form: form %>

data/app/overrides/decidim/proposals/proposals/new/replace_javascript.html.erb.deface

@@ -0,0 +1,8 @@
+<!-- replace "erb[loud]:contains('javascript_pack_tag')" -->
+
+<% if reporting_proposal? %>
+  <%= javascript_pack_tag "decidim_reporting_proposals" %>
+  <%= stylesheet_pack_tag "decidim_reporting_proposals" %>
+<% else %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>

data/app/overrides/decidim/proposals/proposals/show/add_additional_button.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_bottom ".m-bottom" -->
+
+<%= render partial: "decidim/reporting_proposals/proposals/additional_button_for_show" %>

data/app/overrides/layouts/decidim/_process_header_steps/always_show_new_proposals.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- replace "erb[loud]:contains('button small button--sc show-for-medium')" -->
+
+<%= link_to(cta_text, step_cta_url(participatory_process), class: "button small button--sc") %>

data/app/packs/entrypoints/decidim_reporting_proposals.js

@@ -0,0 +1,6 @@
+import "src/decidim/proposals/utils"
+import "src/decidim/reporting_proposals/proposals/add_proposal"
+import "stylesheets/decidim/reporting_proposals/proposals/add_proposal.scss";
+
+// Images
+require.context("../images", true)

data/app/packs/entrypoints/decidim_reporting_proposals_camera.js

@@ -0,0 +1,2 @@
+import "src/decidim/reporting_proposals/user_camera_inputs.js"
+import "stylesheets/decidim/reporting_proposals/user_camera_inputs.scss";

data/app/packs/entrypoints/decidim_reporting_proposals_geocoding.js

@@ -0,0 +1,2 @@
+import "src/decidim/reporting_proposals/reverse_geocoding.js"
+import "stylesheets/decidim/reporting_proposals/geocoding_addons.scss";

data/app/packs/entrypoints/decidim_reporting_proposals_js_validations.js

@@ -0,0 +1 @@
+import "src/decidim/reporting_proposals/proposal_extra_validations.js"

data/app/packs/entrypoints/decidim_reporting_proposals_list_component_admin.js

@@ -0,0 +1 @@
+import "stylesheets/decidim/reporting_proposals/list_component_admin.scss";

data/app/packs/entrypoints/decidim_reporting_proposals_manage_component_admin.js

@@ -0,0 +1 @@
+import "stylesheets/decidim/reporting_proposals/manage_component_admin.scss";

data/app/packs/src/decidim/reporting_proposals/proposal_extra_validations.js

@@ -0,0 +1,89 @@
+$(() => {
+
+  const $title = $('input[name="proposal[title]"]');
+  const $body = $('[name="proposal[body]"]');
+  let quill;
+  try {
+    quill = window.Quill.find(document.querySelector(".editor-container"));
+  } catch (e) {
+    console.log("Quill not found");
+  }
+  const $form = $title.closest("form");
+
+  const findError = ($field, prop) => {
+    let $closest = $field.closest("label");
+    if (!$closest.length) {
+      $closest = $field.closest(".editor");
+    }
+    // console.log("findError", $closest, $field, prop);
+    let search = `.form-error.${prop}`;
+    if (!prop) {
+      search = ".form-error"
+    }
+    let $error = $closest.find(search);
+    if ($error.length === 0) {
+      $error = $(`<span class="${search.replace(/\./g, " ")}"></span>`).appendTo($closest);
+    }
+    return $error;
+  };
+
+  const clearErrors = ($field, prop) => {
+    findError($field, prop).remove();
+  };
+  
+  const addError = ($field, options, prop) => {
+    // console.log("addError", $field, options, prop)
+    let $error = findError($field, prop);
+    $error.addClass("is-visible");
+    if (options && options[prop]) {
+      $error.html(options[prop].error);
+    }
+    else {$error.html(Decidim.ProposalRules.genericError);}
+  };
+  
+  const validate = ($field, value, options) => {
+    // console.log("validate", $field, value, options);
+
+    // validate caps if needed
+    const minLen = $field.attr("minlength");
+
+    if (options && options.caps.enabled) {
+      if (value.charAt(0) !== value.charAt(0).toUpperCase()) {
+        addError($field, options, "caps");
+        return false;
+      }
+    }
+    if (minLen && value.length < minLen) {
+      addError($field);
+      return false;
+    }
+    return true;
+  }
+  
+  if ($title.length > 0) {
+    $title.change(() => {
+      clearErrors($title, "caps");
+    });
+    if (quill) {
+      // on change quill
+      quill.on("text-change", () => {
+        clearErrors($body, "caps");
+        clearErrors($body);
+      });
+    } else {
+      $body.change(() => {
+        clearErrors($body, "caps");
+      });
+    }
+    $form.on("submit", (ev) => {
+      if (!validate($title, $title.val(), Decidim.ProposalRules.title)) {
+        ev.preventDefault();
+      }
+      if (!validate($body, quill
+        ? quill.getText()
+        : $body.val(), Decidim.ProposalRules.body)) {
+        ev.preventDefault();
+      }
+    });
+  }
+});

data/app/packs/src/decidim/reporting_proposals/proposals/add_proposal.js

@@ -0,0 +1,66 @@
+import attachGeocoding from "src/decidim/geocoding/attach_input"
+
+$(() => {
+  const $checkbox = $("input:checkbox[name$='[has_no_address]']");
+  const $hasAdressInput = $("input[name$='[has_address]']");
+  const $addressInput = $("#address_input");
+  const $addressInputField = $("input[name='proposal[address]']");
+  const $map = $("#address_map");
+  let latFieldName = "proposal[latitude]";
+  let longFieldName = "proposal[longitude]";
+  const $labelInput = $("label[for='proposal_address']");
+  const $buttonLocation = $(".user-device-location button");
+
+  $map.hide();
+
+  // Handle no address checkbox in reverse, mandatory by default instead of default decidim
+  if ($checkbox.length > 0) {
+    const toggleInput = () => {
+      $hasAdressInput.val($checkbox[0].checked
+        ? 0
+        : 1);
+
+      if ($checkbox[0].checked) {
+        const $formError = $labelInput.find('span.form-error[style="display: block;"]');
+
+        $map.hide();
+        $addressInputField.prop("disabled", true);
+        $addressInputField.removeClass("is-invalid-input");
+        $labelInput.removeClass("is-invalid-label");
+        $buttonLocation.prop("disabled", true);
+        $buttonLocation.removeClass("loading-spinner");
+        $formError.attr("style", "display:none;");
+
+      } else {
+        if ($(`input[name='${latFieldName}']`).val()) {
+          $map.show();
+        }
+        $addressInputField.prop("disabled", false);
+        $buttonLocation.prop("disabled", false);
+      }
+    }
+    toggleInput();
+    $checkbox.on("change", toggleInput);
+  }
+
+  if ($addressInput.length > 0) {
+    const ctrl = $("[data-decidim-map]").data("map-controller");
+    ctrl.setEventHandler("coordinates", (ev) => {
+      $(`input[name='${latFieldName}']`).val(ev.lat);
+      $(`input[name='${longFieldName}']`).val(ev.lng);
+    });
+
+    attachGeocoding($addressInputField, null, (coordinates) => {
+      $map.show();
+      // Remove previous marker when user updates address in address field
+      ctrl.removeMarker();
+      ctrl.addMarker({
+        latitude: coordinates[0],
+        longitude: coordinates[1],
+        address: $addressInputField.val()
+      });
+    });
+  }
+
+
+});

data/app/packs/src/decidim/reporting_proposals/reverse_geocoding.js

@@ -0,0 +1,54 @@
+$(() => {
+  const info = ($target, msg) => {
+    const $label = $target.closest("label")
+    $label.find(".form-error").remove();
+    if (msg) {
+      $('<span class="form-error"/>').text(msg).appendTo($label).show();
+    }
+  };
+
+  const setLocating = ($button, enable) => {
+    if (enable) {
+      $button.addClass("loading-spinner");
+      $button.attr("disabled", true);
+    } else {
+      $button.removeClass("loading-spinner");
+      $button.attr("disabled", false);
+    }
+  }
+
+  $(".user-device-location button").on("click", (e) => {
+    const $this = $(e.target);
+    if ($this.is(":disabled")) {
+      return;
+    }
+
+    const $input = $(`#${e.target.dataset.input}`);
+    const errorNoLocation = e.target.dataset.errorNoLocation;
+    const errorUnsupported = e.target.dataset.errorUnsupported;
+    const url = e.target.dataset.url;
+
+    if (navigator.geolocation) {
+      setLocating($this, true);
+      navigator.geolocation.getCurrentPosition((position) => {
+        const coordinates  = [position.coords.latitude, position.coords.longitude];
+        // reverse geolocation
+        $.post(url, { latitude: coordinates[0], longitude: coordinates[1] }, (data) => {
+          $input.val(data.address)
+        })
+        setLocating($this, false);
+        $input.trigger(
+          "geocoder-suggest-coordinates.decidim",
+          [coordinates]
+        );
+      }, (evt) => { 
+        info($input, `${errorNoLocation} ${evt.message}`);
+        $this.attr("disabled", false);
+      }, {
+        enableHighAccuracy: true
+      });
+    } else {
+      info($input, errorUnsupported);
+    }
+  });
+});

data/app/packs/src/decidim/reporting_proposals/user_camera_inputs.js

@@ -0,0 +1,49 @@
+$(() => {
+  $('input[type="file"]').each((_i, el) => {
+    const $input = $(el);
+    const $inputField = $input.closest(".row.column");
+    const $button = $inputField.find("button:first");
+    const $checkbox = $inputField.find("input:checkbox[name$='[has_no_image]']");
+    const $formError = $inputField.find("span.form-error")
+    const $labelInput = $("label[for='proposal_add_photos']")
+
+    const removeErrors = () => {
+      $input.removeClass("is-invalid-input");
+      $formError.removeClass("is-visible");
+      $labelInput.removeClass("is-invalid-label");
+    };
+
+    const toggleInput = () => {
+      if ($checkbox[0].checked) {
+        removeErrors();
+        $input.prop("disabled", true);
+        $button.prop("disabled", true);
+      } else {
+        $input.prop("disabled", false);
+        $button.prop("disabled", false);
+      }
+    }
+
+    $input.attr("accept", "image/*");
+
+    $button.on("click", () => {
+      console.log("click button")
+      $input.attr("capture", "camera");
+      $input.click();
+      $input.removeAttr("capture", "camera");
+    });
+
+    $input.on("click", () => {
+      console.log("click", $input);
+      $input.one("blur", () => {
+        console.log("blur", $input);
+        removeErrors();
+      });
+    });
+
+    if ($checkbox.length > 0) {
+      $checkbox.on("change", toggleInput);
+      toggleInput();
+    }
+  });
+}); 

data/app/packs/stylesheets/decidim/reporting_proposals/geocoding_addons.scss

@@ -0,0 +1,34 @@
+.input-group.has-tribute {
+  position: relative;
+
+  .tribute-container {
+    margin-top: 2.3rem;
+  }
+}
+
+.user-device-location {
+  button {
+    max-height: 3rem;
+
+    &.loading-spinner {
+      position: relative;
+      margin: 0 !important;
+
+      &::before {
+        position: absolute;
+        top: 6px;
+        left: 12px;
+      }
+    }
+  }
+
+  @media only screen and (max-width: 596px) {
+    display: block !important;
+    margin-top: 1rem;
+    margin-bottom: -.5rem;
+
+    button {
+      border-radius: 4px !important;
+    }
+  }
+}