decidim-reporting_proposals 0.2.0 → 0.4.2

data/app/overrides/decidim/reported_mailer/report/add_link_to_admin.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_after ".email-instructions" -->
+
+<% if resource_admin_url.present? %>
+  <p><%= link_to t("admin_resource", scope: "decidim.reported_mailer.report"), resource_admin_url, target: "_blank" %></p>
+<% end %>

data/app/packs/entrypoints/decidim_templates_admin.js

@@ -0,0 +1 @@
+import "src/decidim/templates/admin/proposal_answer_template_chooser";

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

@@ -1,49 +1,47 @@
 $(() => {
-  $('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 $input = $("#proposal_add_photos");
+  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 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);
-      }
+  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/*");
+  $input.attr("accept", "image/*");
 
-    $button.on("click", () => {
-      console.log("click button")
-      $input.attr("capture", "camera");
-      $input.click();
-      $input.removeAttr("capture", "camera");
-    });
+  $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();
-      });
+  $input.on("click", () => {
+    console.log("click", $input);
+    $input.one("blur", () => {
+      console.log("blur", $input);
+      removeErrors();
     });
-
-    if ($checkbox.length > 0) {
-      $checkbox.on("change", toggleInput);
-      toggleInput();
-    }
   });
+
+  if ($checkbox.length > 0) {
+    $checkbox.on("change", toggleInput);
+    toggleInput();
+  }
 }); 

data/app/packs/src/decidim/templates/admin/proposal_answer_template_chooser.js

@@ -0,0 +1,27 @@
+$(() => {
+  $("#proposal_answer_template_chooser").change(() => {
+    const $dropDown =  $("#proposal_answer_template_chooser");
+    $dropDown.next("#template-error").remove();
+    if ($dropDown.val() === "") {
+      return;
+    }
+    $.getJSON($dropDown.data("url"), {
+      id: $dropDown.val(),
+      /* eslint camelcase: [0] */
+      proposal_id: $dropDown.data("proposal")
+    }).done((data) => {
+      $(`#proposal_answer_internal_state_${data.state}`).trigger("click");
+
+      const $editors = $dropDown.parent().parent().find(".editor-container");
+      $editors.each((index, element) => {
+        const localElement = $(element);
+        const $locale = localElement.siblings("input[type=hidden]").attr("id").replace("proposal_answer_answer_", "");
+        const editor = Quill.find(element);
+        const delta = editor.clipboard.convert(data.template[$locale]);
+        editor.setContents(delta);
+      });
+    }).fail((err) => {
+      $dropDown.after(`<p id="template-error" class="text-alert">${err.responseJSON.msg || err.responseJSON.error || err.responseJSON}</p>`);
+    });
+  });
+});

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

@@ -29,3 +29,34 @@
   border-radius: 50%;
   text-align: center;
 }
+
+//Variables
+
+/* Card address */
+.address {
+  display: flex;
+  padding: 1rem;
+}
+
+.address--alone {
+  flex-grow: 1;
+}
+
+.address__info {
+  display: flex;
+  flex-grow: 1;
+}
+
+.address__icon {
+  float: left;
+  display: flex;
+  align-self: center;
+  fill: var(--primary);
+}
+
+.address__details {
+  float: left;
+  max-width: 100%; //IE10 bug fix
+  padding-left: .5em;
+  align-self: center;
+}

data/app/presenters/concerns/decidim/resource_locator_presenter_override.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ResourceLocatorPresenterOverride
+    extend ActiveSupport::Concern
+
+    included do
+      # Generates and admin url only if the manifest has the property :admin_route_name defined
+      # this allows to distinct from resources that can be administrated from those that are not
+      def admin_url(options = {})
+        admin_member_route("url", options.merge(host: root_resource.organization.host))
+      end
+
+      private
+
+      def admin_member_route(route_type, options)
+        return if manifest_for(target).admin_route_name.blank?
+
+        options.merge!(options_for_polymorphic)
+        admin_route_proxy.send("#{admin_member_route_name}_#{route_type}", target, options)
+      end
+
+      def admin_member_route_name
+        if polymorphic?
+          admin_polymorphic_member_route_name
+        else
+          manifest_for(target).admin_route_name
+        end
+      end
+
+      def admin_polymorphic_member_route_name
+        return unless polymorphic?
+
+        resource.map { |record| manifest_for(record).admin_route_name }.join("_")
+      end
+    end
+  end
+end

data/app/resources/concerns/decidim/resource_manifest_override.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ResourceManifestOverride
+    extend ActiveSupport::Concern
+
+    included do
+      # The name of the named Rails route to create the url to admin the resource
+      # If it is not defined, the resource will be considered non-administrable
+      # and no link will be generated in some places
+      attribute :admin_route_name, String
+    end
+  end
+end

data/app/views/decidim/admin/hidden_resource_mailer/notify_mail.html.erb

@@ -0,0 +1,12 @@
+<p class="email-greeting"><%= t "hello", scope: "decidim.admin.hidden_resource_mailer.notify_mail" %></p>
+
+<p class="email-instructions"><%= t "body_1", scope: "decidim.admin.hidden_resource_mailer.notify_mail" %></p>
+
+<p><strong><%= t "reason", scope: "decidim.admin.hidden_resource_mailer.notify_mail", reason: h(@reason.join(", ")) %></strong></p>
+
+<p><strong><%= translated_attribute(@resource.title) %></strong></p>
+
+<p class="email-instructions">
+  <%= t "body_2", scope: "decidim.admin.hidden_resource_mailer.notify_mail" %>
+  <%= link_to @organization.name, decidim.root_url(host: @organization.host).html_safe %>
+</p>

data/app/views/decidim/proposals/admin/notification_answer_proposal_mailer/notify_proposal_author.html.erb

@@ -0,0 +1,7 @@
+<p class="email-greeting"><%= t("greeting", scope: "decidim.reporting_proposals.admin.notification_answer_proposal_mailer.notify_proposal_author", recipient: @recipient.name) %></p>
+
+<p class="email-instructions">
+  <%= sanitize t("email_body", scope: "decidim.reporting_proposals.admin.notification_answer_proposal_mailer.notify_proposal_author",
+        proposal_title: translated_attribute(@proposal.title),
+        answer_url: Decidim::ResourceLocatorPresenter.new(@proposal).url) %>
+</p>

data/app/views/decidim/proposals/admin/proposals/_address.html.erb

@@ -0,0 +1,13 @@
+<% if component_settings.geocoding_enabled? %>
+  <div class="row column">
+    <strong><%= t ".geolocated_at" %>:</strong>
+    <div class="address__info">
+      <div class="address__icon">
+        <%= icon "proposals", role: "img", "aria-hidden": true, width: 40, height: 70 %>
+      </div>
+      <div class="address__details">
+        <%= render partial: "decidim/shared/address_details", locals: { geolocalizable: proposal } %>
+      </div>
+    </div>
+  </div>
+<% end %>

data/app/views/decidim/proposals/admin/proposals_valuator_mailer/notify_proposals_valuator.html.erb

@@ -0,0 +1,17 @@
+<p class="email-greeting"><%= t(".greeting", name: @valuator_user.name) %></p>
+
+<p class="email-instructions"><%= t(".email_body") %></p>
+
+<p class="email-instructions">
+  <ul>
+    <% @proposals.each do |proposal| %>
+      <li class="mb-sm">
+        <span><%= translated_attribute(proposal.title) %></span>:
+        <%= sanitize link_to(t(".public_side"), Decidim::ResourceLocatorPresenter.new(proposal).url), tags: ["a"], attributes: ["href"] %>,
+        <%= sanitize link_to(t(".admin_panel"), Decidim::ResourceLocatorPresenter.new(proposal).admin_url), tags: ["a"], attributes: ["href"] %>
+      </li>
+    <% end %>
+  </ul>
+</p>
+
+<p class="email-closing"><%= t(".gratitude") %></p>

data/app/views/decidim/proposals/notification_publish_proposal_mailer/notify_proposal_author.html.erb

@@ -0,0 +1,7 @@
+<p class="email-greeting"><%= t("greeting", scope: "decidim.reporting_proposals.notification_publish_proposal_mailer.notify_proposal_author", recipient: @recipient.name) %></p>
+
+<p class="email-instructions">
+  <%= sanitize t("email_body", scope: "decidim.reporting_proposals.notification_publish_proposal_mailer.notify_proposal_author",
+                 proposal_title: translated_attribute(@proposal.title),
+                 answer_url: Decidim::ResourceLocatorPresenter.new(@proposal).url) %>
+</p>

data/app/views/decidim/proposals/proposals/index.js.erb

@@ -0,0 +1,19 @@
+var $proposals = $('#proposals');
+var $proposalsCount = $('#proposals-count');
+var $orderFilterInput = $('.order_filter');
+$proposals.html('<%= j(render partial: "proposals").strip.html_safe %>');
+$proposalsCount.html('<%= j(render partial: "count").strip.html_safe %>');
+$orderFilterInput.val('<%= order %>');
+
+var $dropdownMenu = $('.dropdown.menu', $proposals);
+$dropdownMenu.foundation();
+
+var markerData = JSON.parse('<%= escape_javascript proposals_data_for_map(search.results.select(&:geocoded_and_valid?))
+.to_json.html_safe %>');
+
+var $map = $("#map");
+var controller = $map.data("map-controller");
+if (controller) {
+  controller.clearMarkers();
+  controller.addMarkers(markerData);
+}

data/app/views/decidim/templates/admin/proposal_answer_templates/_form.html.erb

@@ -0,0 +1,34 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".template_title") %></h2>
+    <%= form.submit t(".save"), class: "button tiny button--title" %>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :text_field, :name %>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :editor, :description, rows: 15, label: t(".answer_template") %>
+      <%= t(".hint").html_safe %>
+      <ul>
+        <li><%= t(".hint1").html_safe %></li>
+        <li><%= t(".hint2").html_safe %></li>
+        <li><%= t(".hint3").html_safe %></li>
+      </ul>
+    </div>
+
+    <div class="row column">
+      <%= form.label :internal_state %>
+      <%= form.collection_radio_buttons :internal_state,
+                                     Decidim::Proposals::Proposal::POSSIBLE_STATES - %w(withdrawn),
+                                     :to_s,
+                                     ->(mode) { t(mode, scope: "decidim.proposals.admin.proposal_answers.form") } %>
+    </div>
+
+    <div class="row column">
+      <%= form.select :scope_for_availability, availability_options_for_select, help_text: t(".scope_for_availability_help") %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/templates/admin/proposal_answer_templates/_template_chooser.html.erb

@@ -0,0 +1,16 @@
+<% templates = Decidim::Templates::Template .where(
+  target: :proposal_answer,
+  templatable: [current_organization, current_component]
+).order(:templatable_id) %>
+<% if templates.any? %>
+  <div class="row column">
+    <%= javascript_pack_tag "decidim_templates_admin" %>
+
+    <select id="proposal_answer_template_chooser" data-locale="en" data-proposal="<%= proposal.id %>" data-url="<%= decidim_admin_templates.fetch_proposal_answer_templates_url %>">
+      <option value=""><%= t(".select_template") %></option>
+      <% templates.each do |template| %>
+        <option value="<%= template.id %>"><%= translated_attribute(template.name) %></option>
+      <% end %>
+    </select>
+  </div>
+<% end %>

data/app/views/decidim/templates/admin/proposal_answer_templates/edit.html.erb

@@ -0,0 +1,3 @@
+<%= decidim_form_for(@form, url: proposal_answer_template_path, html: { class: "form edit_proposal_answer_template" }) do |f| %>
+  <%= render partial: "form", object: f %>
+<% end %>

data/app/views/decidim/templates/admin/proposal_answer_templates/index.html.erb

@@ -0,0 +1,52 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t ".title" %>
+      <% if allowed_to?(:create, :template) %>
+        <%= link_to t("actions.new", scope: "decidim.admin", name: t("template.name", scope: "decidim.models").downcase), [:new, :proposal_answer_template], class: "button tiny button--title new" %>
+      <% end %>
+    </h2>
+  </div>
+  <div class="card-section">
+    <% if @templates.any? %>
+      <div class="table-scroll">
+        <table class="table-list questionnaire-templates">
+          <thead>
+          <tr>
+            <th><%= t("template.name", scope: "decidim.models") %></th>
+            <th><%= t(".internal_state") %></th>
+            <th><%= t(".scope_for_availability") %></th>
+            <th><%= t("template.fields.created_at", scope: "decidim.models") %></th>
+            <th></th>
+          </tr>
+          </thead>
+          <tbody>
+          <% @templates.each do |template| %>
+            <tr data-proposal_answer-id="<%= template.id %>">
+              <td><%= link_to_if allowed_to?(:update, :template, template: template) , translated_attribute(template.name), edit_proposal_answer_template_path(template) %></td>
+              <td> <%= t(template.field_values.dig("internal_state"), scope: "decidim.proposals.admin.proposal_answers.form") %></td>
+              <td><%= availability_option_as_text(template) %></td>
+              <td><%= l template.created_at, format: :long %></td>
+              <td class="table-list__actions">
+                <% if allowed_to?(:update, :template, template: template) %>
+                  <%= icon_link_to "pencil", edit_proposal_answer_template_path(template), t("actions.edit", scope: "decidim.admin"), class: "edit" %>
+                <% end %>
+                <% if allowed_to?(:copy, :template, template: template) %>
+                  <%= icon_link_to "clipboard", copy_proposal_answer_template_path(template), t("actions.duplicate", scope: "decidim.admin"), method: :post %>
+                <% end %>
+                <% if allowed_to?(:destroy, :template, template: template) %>
+                  <%= icon_link_to "circle-x", proposal_answer_template_path(template), t("actions.destroy", scope: "decidim.admin"), method: :delete, data: { confirm: t(".confirm_delete") }, class: "action-icon--remove" %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+
+          </tbody>
+        </table>
+        <%= paginate @templates, theme: "decidim" %>
+      </div>
+    <% else %>
+      <%= t("templates.empty", scope: "decidim.admin") %>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/templates/admin/proposal_answer_templates/new.html.erb

@@ -0,0 +1,6 @@
+<% content_for :title do %>
+  <%= t("templates", scope: "decidim.admin.titles") %>
+<% end %>
+<%= decidim_form_for(@form, url: proposal_answer_templates_path, html: { class: "form new_proposal_answer_template" }) do |f| %>
+  <%= render partial: "form", object: f %>
+<% end %>

data/config/assets.rb

@@ -9,5 +9,6 @@ Decidim::Webpacker.register_entrypoints(
   decidim_reporting_proposals_list_component_admin: "#{base_path}/app/packs/entrypoints/decidim_reporting_proposals_list_component_admin.js",
   decidim_reporting_proposals_geocoding: "#{base_path}/app/packs/entrypoints/decidim_reporting_proposals_geocoding.js",
   decidim_reporting_proposals_camera: "#{base_path}/app/packs/entrypoints/decidim_reporting_proposals_camera.js",
-  decidim_reporting_proposals_js_validations: "#{base_path}/app/packs/entrypoints/decidim_reporting_proposals_js_validations.js"
+  decidim_reporting_proposals_js_validations: "#{base_path}/app/packs/entrypoints/decidim_reporting_proposals_js_validations.js",
+  decidim_templates_admin: "#{base_path}/app/packs/entrypoints/decidim_templates_admin.js"
 )

data/config/i18n-tasks.yml

@@ -7,6 +7,9 @@ data:
   external:
     - "<%= %x[bundle info decidim-core --path].chomp %>/config/locales/%{locale}.yml"
     - "<%= %x[bundle info decidim-proposals --path].chomp %>/config/locales/%{locale}.yml"
+    - "<%= %x[bundle info decidim-admin --path].chomp %>/config/locales/%{locale}.yml"
+    - "<%= %x[bundle info decidim-participatory_processes --path].chomp %>/config/locales/%{locale}.yml"
+    - "<%= %x[bundle info decidim-templates --path].chomp %>/config/locales/%{locale}.yml"
 
 ignore_unused:
 

data/config/locales/ca.yml

@@ -6,7 +6,22 @@ ca:
         valuator_ids: Avaluadores assignades
       proposal:
         has_no_address: No té adreça
+        has_no_image: Sense imatge
+      template:
+        scope_for_availability: Limita la disponibilitat al component
   decidim:
+    admin:
+      hidden_resource_mailer:
+        notify_mail:
+          body_1: Un administrador ha esborrat la vostra proposta perquè ha estat denunciada.
+          body_2: Si penseu que ha estat un error, si us plau, contacteu els adminstradors de
+          hello: Hola,
+          reason: 'Motiu: %{reason}'
+          subject: La teva proposta ha estat amagada
+      templates:
+        fetch:
+          error: No s'ha trobat aquesta plantilla, potser ha estat esborrada?
+        missing_resource: "(recurs absent)"
     application:
       geocoding:
         unconfigured: La geocodificació no està configurada!
@@ -129,6 +144,15 @@ ca:
             votes_blocked: Suports bloquejats
             votes_enabled: Suports habilitats
             votes_hidden: Suports ocults (si els suports estan habilitats, marcant aquesta opció s'amagarà el nombre de suports)
+    events:
+      proposals:
+        proposal_published_for_admin:
+          admin_panel: panell d'administració
+          email_intro: '%{author} ha afegit la proposta <a href="%{resource_path}">%{resource_title}</a> a %{participatory_space_title}. Podeu administrar-la a %{admin_url}'
+          email_outro: Has rebut aquesta notificació perquè ets un administrador de l'espai participatiu "%{participatory_space_title}".
+          email_subject: Nova proposta "%{resource_title}" afegida a %{participatory_space_title}
+          notification_title: '%{author} ha afegit la proposta <a href="%{resource_path}">%{resource_title}</a> a %{participatory_space_title}. Podeu administrar-la a %{admin_url}'
+          notification_title_official: La proposta oficial <a href="%{resource_path}">%{resource_title}</a> a %{participatory_space_title}. Podeu administrar-la a %{admin_url}
     moderations:
       actions:
         hide: Amagar
@@ -140,8 +164,21 @@ ca:
     proposals:
       admin:
         proposals:
+          address:
+            geolocated_at: Geolocalització
           send_email_button:
-            send_mail: Send an email to user
+            send_mail: Envia un correu electrònic a l'usuari
+        proposals_valuator_mailer:
+          notify_proposals_valuator:
+            admin_panel: panell d'administració
+            email_body: Has estat assignat com a avaluador de les propostes llistades a sota. Això significa que s'ha confiat en tu per donar-hi resposta en els propoers dies.
+            gratitude: Gràcies per la teva ajuda!
+            greeting: Hola %{name},
+            public_side: lloc públic
+            subject: Nova proposta asignada per la teva avaluació
+    reported_mailer:
+      report:
+        admin_resource: Administra el recurs
     reporting_proposals:
       actions:
         answer_proposal: Resposta de la proposta
@@ -283,15 +320,23 @@ ca:
         exports:
           proposal_comments: Comentaris
           proposals: Propostes directes
+        notification_answer_proposal_mailer:
+          notify_proposal_author:
+            email_body: |
+              La teva proposta ha estat contestada.
+              Pots llegir la resposta aquí:<br>
+              <a href=%{answer_url} target="_blank">%{proposal_title}</a>
+            greeting: Hola, %{recipient}!
+            subject: La teva proposta ha estat contestada
         proposal_notes:
           modal:
-            body: Note
-            title: Edit note
-            update: Update
+            body: Nota
+            title: Edita la nota
+            update: Actualitza
           update:
-            edited: Edited
-            invalid: There was a problem updating the proposal note.
-            success: Proposal note successfully updated.
+            edited: Editada
+            invalid: Hi ha hagut un problema en actualitzar la nota.
+            success: Nota creada correctament.
         proposals:
           photo_form:
             action: Afageix imatge
@@ -356,6 +401,13 @@ ca:
           no_device_location: Ho sentim, no hem pogut detectar la teva localització.
         use_my_camera: Usa la meva càmera
         use_my_location: Usa la meva localització
+      notification_publish_proposal_mailer:
+        notify_proposal_author:
+          email_body: |
+            La teva proposta ha estat publicada.
+            Pots veure-la aquí: <a href=%{answer_url} target="_blank">%{proposal_title}</a>
+          greeting: Hola, %{recipient}!
+          subject: La teva proposta ha estat publicada
       proposals:
         compare:
           geocoding:
@@ -364,3 +416,25 @@ ca:
             title: Propostes properes
         form:
           image: Imatge/fotografia
+    templates:
+      admin:
+        proposal_answer_templates:
+          form:
+            answer_template: Plantilla de resposta
+            hint: "<strong>Suggeriment:</strong> Pots fer servir aquestes variables a qualsevol lloc a la plantilla de resposta i seran substituïdes pels valors en actiu quan es faci servir"
+            hint1: "<strong>%{organization}</strong> se substituirà pel nom de l'organització"
+            hint2: "<strong>%{name}</strong> se substituirà pel nom de l'autor"
+            hint3: "<strong>%{admin}</strong> se substituirà pel nom de l'administrador (el que està responent a la proposta)"
+            save: Desa
+            scope_for_availability_help: Noteu que només es llistaran els espais participatius que tinguin components de tipus "propostes".
+            template_title: Informació de la plantilla
+          index:
+            confirm_delete: Està segur que vol suprimir aquesta plantilla?
+            global_scope: Global (disponible a tot arreu)
+            internal_state: Estat intern
+            scope_for_availability: Àmbit
+            title: Respostes a la proposta
+          template_chooser:
+            select_template: Selecciona una plantilla de resposta
+      template_types:
+        proposal_answer_templates: Respostes a la proposta