decidim-accountability 0.27.10 → 0.28.0.rc4

data/app/packs/stylesheets/accountability.scss

@@ -0,0 +1,169 @@
+.accountability {
+  &__status {
+    @apply flex flex-col gap-3 w-full;
+
+    &-container {
+      @apply w-full last:[&>*]:flex last:[&>*]:gap-1;
+    }
+
+    &-title {
+      @apply font-semibold text-secondary text-lg [&+*]:mt-auto;
+    }
+
+    &-progress {
+      @apply w-full h-4 rounded overflow-hidden bg-white [&>*]:bg-success [&>*]:h-full;
+    }
+
+    &-value {
+      @apply flex justify-between items-baseline gap-1 text-gray-2;
+
+      > :first-child {
+        @apply text-4xl font-bold;
+      }
+
+      > :last-child:not(:only-child) {
+        @apply text-sm truncate;
+      }
+    }
+
+    &__home {
+      @apply gap-4 p-6 bg-white drop-shadow-[0_4px_6px_rgba(211,211,211,0.25)];
+    }
+
+    &__home &-title {
+      @apply text-xl text-gray-2;
+    }
+
+    &__home &-progress {
+      @apply bg-background;
+    }
+
+    &__home &-value > :first-child {
+      @apply text-[48px];
+    }
+
+    &__background {
+      @apply bg-background p-4;
+    }
+
+    &__border {
+      @apply border-2 border-background rounded p-4;
+    }
+
+    &__border &-progress {
+      @apply invisible;
+    }
+
+    &__border &-title {
+      @apply text-md text-secondary;
+    }
+
+    &__parent {
+      @apply p-4 gap-1 bg-white drop-shadow-[0_4px_6px_rgba(211,211,211,0.25)];
+    }
+
+    &__parent &-progress {
+      @apply hidden;
+    }
+
+    &__parent &-value > :first-child {
+      @apply text-xl;
+    }
+
+    &__child {
+      @apply mt-4 p-4 bg-white drop-shadow-[0_4px_6px_rgba(211,211,211,0.25)];
+    }
+
+    &__child &-title {
+      @apply text-md;
+    }
+
+    &__child &-progress {
+      @apply bg-background;
+    }
+
+    &__child &-value > :first-child {
+      @apply text-3xl;
+    }
+
+    &__project &-title {
+      @apply text-gray-2 text-md font-normal;
+    }
+  }
+
+  &__grid {
+    @apply grid md:grid-cols-3 items-start gap-x-10 gap-y-8 md:gap-y-16;
+
+    & > :nth-child(even) {
+      @apply grid md:col-span-2;
+    }
+
+    /* display the titles only for the first two rows in desktop */
+    & > :nth-child(1) &-title,
+    & > :nth-child(2) &-title {
+      @apply md:block;
+    }
+
+    &-title {
+      @apply block md:hidden mb-8 text-gray-2 uppercase font-semibold;
+    }
+
+    .flash {
+      @apply m-0;
+    }
+  }
+
+  &__subgrid {
+    @apply grid md:grid-cols-2 gap-6;
+  }
+
+  &__progress {
+    @apply ml-auto rounded px-3 md:px-6 py-4 bg-background font-bold text-gray-2 text-xl w-full md:w-auto min-w-[120px] grid place-items-center;
+  }
+
+  &__project {
+    &-aside {
+      @apply bg-background p-4 rounded divide-y divide-gray-3 [&>*]:py-4 first:[&>*]:pt-0 last:[&>*]:pb-0;
+
+      &-item {
+        @apply text-gray-2 space-y-1.5;
+
+        > :first-child {
+          @apply text-sm flex items-center gap-1;
+        }
+
+        > :last-child {
+          @apply text-md font-semibold;
+        }
+      }
+    }
+
+    &-timeline {
+      @apply flex flex-col gap-6;
+
+      &-entry {
+        @apply flex items-start gap-2 relative before:absolute before:w-px before:-z-10 before:left-3 before:bg-gray-3 before:h-[calc(100%+1.5rem)] last:before:h-6 before:-top-3 first:before:top-3;
+
+        &-number {
+          @apply rounded-full w-6 h-6 bg-background grid place-items-center text-gray-2 text-lg font-semibold;
+        }
+
+        &-attributes {
+          @apply text-gray-2 text-sm;
+
+          > :first-child {
+            @apply text-lg font-semibold;
+          }
+        }
+      }
+    }
+
+    &-list {
+      @apply space-y-6;
+    }
+  }
+
+  &__filters {
+    @apply w-full space-y-10;
+  }
+}

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

@@ -10,6 +10,7 @@ module Decidim
           permission_action.allow! if can_perform_actions_on?(:result, result)
           permission_action.allow! if can_perform_actions_on?(:status, status)
           permission_action.allow! if can_perform_actions_on?(:timeline_entry, timeline_entry)
+          permission_action.allow! if can_perform_actions_on?(:import_projects, nil)
 
           permission_action
         end
@@ -32,13 +33,23 @@ module Decidim
           return unless permission_action.subject == subject
           return false if can_create_grandchildren_results?
 
-          case permission_action.action
-          when :create, :create_children
-            true
-          when :update, :destroy
-            resource.present?
+          case permission_action.subject
+          when :import_projects
+            case permission_action.action
+            when :create, :new
+              true if defined?(Decidim::Budgets::Project)
+            else
+              false
+            end
           else
-            false
+            case permission_action.action
+            when :create, :create_children
+              true
+            when :update, :destroy
+              resource.present?
+            else
+              false
+            end
           end
         end
 

data/app/presenters/decidim/accountability/admin_log/result_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Accountability::Result`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/presenters/decidim/accountability/admin_log/status_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Accountability::Status`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/presenters/decidim/accountability/admin_log/timeline_entry_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Accountability::TimelineEntry`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/queries/decidim/accountability/metrics/results_metric_manage.rb

@@ -21,7 +21,7 @@ module Decidim
                                                            participatory_space_type: space_type,
                                                            participatory_space_id: space_id,
                                                            related_object_type: "Decidim::Component",
-                                                           related_object_id: related_object_id)
+                                                           related_object_id:)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
             record.save!
           end

data/app/services/decidim/accountability/results_calculator.rb

@@ -25,7 +25,7 @@ module Decidim
         @results ||= begin
           query = Result.where(
             parent_id: nil,
-            component: component
+            component:
           )
           query = query.with_any_scope(scope_id) if scope_id
           query = query.with_any_category(category_id) if category_id

data/app/services/decidim/accountability/results_csv_importer.rb

@@ -20,7 +20,7 @@ module Decidim
         @extra_context = {
           current_component: component,
           current_organization: component.organization,
-          current_user: current_user,
+          current_user:,
           current_participatory_space: component.participatory_space
         }
         @matches_ids = []
@@ -31,7 +31,7 @@ module Decidim
 
         ActiveRecord::Base.transaction do
           i = 1
-          csv = CSV.new(@csv_file, headers: true, col_sep: ";")
+          csv = CSV.new(@csv_file, headers: true, col_sep: Decidim.default_csv_col_sep)
           while (row = csv.shift).present?
             i += 1
             next if row.empty?

data/app/views/decidim/accountability/admin/import_results/new.html.erb

@@ -1,27 +1,31 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= form_tag(import_results_path, multipart: true, class: "form new_import") do %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title">
-        <%= t(".title") %>
-      </h2>
-    </div>
-
-    <div class="card-section">
-      <div class="mb-s">
-        <p><%= t(".info",
-                 link_new_status: new_status_path,
-                 link_new_result: new_result_path,
-                 link_export_csv: link_to(t(".download_export"),exports_path(current_component, id: "results", format: "CSV"), method: :post)
-                ).try("html_safe") %></p>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title") %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= form_for(@form, url: import_results_path, html: { class: "form form-defaults import_projects" }) do |form| %>
+      <div class="card py-4">
+        <div class="card-section space-y-4 prose max-w-full">
+          <div class="row column">
+            <p><%= t(".info",
+                     link_new_status: new_status_path,
+                     link_new_result: new_result_path,
+                     link_export_csv: link_to(t(".download_export"),exports_path(current_component, id: "results", format: "CSV"), method: :post)
+                   ).try("html_safe") %></p>
+          </div>
+          <div class="row column">
+            <%= form.upload :file, button_class: "button button__sm button__transparent-secondary" %>
+          </div>
+        </div>
       </div>
-      <div class="row column">
-        <%= file_field_tag :csv_file %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= submit_tag t(".import"), class: "button button__sm button__secondary" %>
+        </div>
       </div>
-    </div>
+    <% end %>
   </div>
-
-  <div class="button--double form-general-submit">
-    <%= submit_tag t(".import"), class: "button" %>
-  </div>
-<% end %>
+</div>

data/app/views/decidim/accountability/admin/projects_import/new.html.erb

@@ -0,0 +1,45 @@
+<% add_decidim_page_title(t(".title")) %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title") %>
+  </h2>
+</div>
+
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= form_for(@form, url: projects_import_index_path(@accountability), html: { class: "form form-defaults import_projects" }) do |f| %>
+      <% if @form.origin_components.any? %>
+        <div class="form__wrapper">
+          <div class="card pt-4">
+            <div class="card-section">
+              <div class="row column">
+                <%= f.select :origin_component_id, @form.origin_components_collection, prompt: t(".select_component"), label: t(".origin_component_id") %>
+              </div>
+              <div class="row column">
+                <% @form.origin_components.each do |component| %>
+                  <small id="component_<%= component.id %>" class="help-text hide
+                    <%= " form-error is-visible" if @form.selected_projects_count(component).zero? %>">
+                    <%= t(".new_items", count: @form.selected_projects_count(component)) %>
+                  </small>
+                <% end %>
+              </div>
+              <div class="row column">
+                <%= f.check_box :import_all_selected_projects, label: t(".import_all_selected_projects") %>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="item__edit-sticky">
+          <div class="item__edit-sticky-container">
+            <%= f.submit t(".create"), class: "button button__sm button__secondary" %>
+          </div>
+        </div>
+      <% else %>
+        <p><%= t(".no_components") %></p>
+      <% end %>
+    <% end %>
+  </div>
+</div>
+
+<%= append_javascript_pack_tag "decidim_accountability_admin_imports" %>

data/app/views/decidim/accountability/admin/results/_form.html.erb

@@ -1,71 +1,71 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= title %></h2>
-  </div>
-
-  <div class="card-section">
-    <div class="row column">
-      <%= form.translated :text_field, :title, autofocus: true %>
-    </div>
-
-    <div class="row column">
-      <%= form.translated :editor, :description %>
-    </div>
+<div class="form__wrapper">
+  <div class="card pt-4">
 
-    <% if @form.parent_id %>
+    <div class="card-section">
+      <div class="row column">
+        <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
+      </div>
 
       <div class="row column">
-        <%= form.select :parent_id, parent_results.map{|result| [translated_attribute(result.title), result.id] }, include_blank: true %>
+        <%= form.translated :editor, :description, aria: { label: :description } %>
       </div>
 
-    <% else %>
+      <% if @form.parent_id %>
 
-      <% if current_component.has_subscopes? %>
         <div class="row column">
-          <%= scopes_picker_field form, :decidim_scope_id, root: current_component.scope %>
+          <%= form.select :parent_id, parent_results.map { |result| [translated_attribute(result.title), result.id] }, include_blank: true %>
         </div>
-      <% end %>
 
-      <div class="row column">
-        <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: true, disable_parents: false %>
-      </div>
+      <% else %>
 
-    <% end %>
+        <% if current_component.has_subscopes? %>
+          <div class="row column">
+            <%= scopes_select_field form, :decidim_scope_id, root: current_component.scope %>
+          </div>
+        <% end %>
 
-    <div class="row">
-      <div class="columns xlarge-6">
-        <%= form.date_field :start_date %>
-      </div>
+        <div class="row column">
+          <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: true, disable_parents: false %>
+        </div>
 
-      <div class="columns xlarge-6">
-        <%= form.date_field :end_date %>
-      </div>
-    </div>
+      <% end %>
+
+      <div class="row">
+        <div class="columns">
+          <%= form.date_field :start_date %>
+        </div>
 
-    <div class="row">
-      <div class="columns xlarge-6">
-        <%= form.select :decidim_accountability_status_id, statuses.map{|status| [translated_attribute(status.name), status.id, { "data-progress" => status.progress }] }, include_blank: true %>
+        <div class="columns">
+          <%= form.date_field :end_date %>
+        </div>
       </div>
 
-      <div class="columns xlarge-6">
-        <%= form.number_field :progress %>
+      <div class="row">
+        <div class="columns">
+          <%= form.select :decidim_accountability_status_id, statuses.map { |status| [translated_attribute(status.name), status.id, { "data-progress" => status.progress }] }, include_blank: true %>
+        </div>
+
+        <div class="columns">
+          <%= form.number_field :progress %>
+        </div>
       </div>
-    </div>
 
     <% if Decidim::Accountability.enable_proposal_linking %>
       <div class="row column">
-        <%= proposals_picker(form, :proposals, proposals_picker_results_path) %>
+        <%= render partial: "decidim/proposals/proposals/proposals_picker", locals: { form:, field: :proposals } %>
       </div>
     <% end %>
 
-    <div class="row column">
-      <% if @form.projects %>
-        <%= form.select :project_ids,
-                        @form.projects,
-                        {},
-                        { multiple: true, class: "chosen-select" } %>
-      <% end %>
-    </div>
+      <div class="row column">
+        <% if @form.projects %>
+          <%= form.select :project_ids,
+                          @form.projects,
+                          {},
+                          { multiple: true, class: "chosen-select" } %>
+        <% end %>
+      </div>
 
+    </div>
   </div>
+
 </div>

data/app/views/decidim/accountability/admin/results/edit.html.erb

@@ -1,10 +1,21 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form, html: { class: "form edit_result" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title") %>
+  </h2>
+</div>
 
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".update") %>
-  </div>
-<% end %>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+     <%= decidim_form_for(@form, html: { class: "form form-defaults edit_result" }) do |f| %>
+       <%= render partial: "form", object: f %>
+       <div class="item__edit-sticky">
+         <div class="item__edit-sticky-container">
+          <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
+         </div>
+       </div>
+     <% end %>
+   </div>
+</div>
 
-<%= javascript_pack_tag "decidim_accountability_admin" %>
+<%= append_javascript_pack_tag "decidim_accountability_admin" %>