decidim-accountability 0.1.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d991e91f98dd70d9e581a95c8d09fcd3a01cc313
-  data.tar.gz: f4a462988114f23d035f702996d03079e36bb25c
+  metadata.gz: 0b787657f5b6b2118664acf3b7f0acbd065134c7
+  data.tar.gz: f341192e05929606d81304f08b84150fd51e667d
 SHA512:
-  metadata.gz: c653cad7b9950eae4ef3ba16962f9ca806fe2a165c208f4741a0907ff8e1b068198affef6f169d15f8294a0b39fa527096fa6a0d56b161f77f12590aa01b402a
-  data.tar.gz: b4a0c193586373ba14615f18d007aef3423c6b95a32fc14b4ba56b68486b211f6af08a17b92bbca82c27a164b9d9f0e182d65143104665d4692e183f319eb560
+  metadata.gz: 4f62563f678f48c654cdeb7874eab17b5aee5f973a9bd069819e7a8f1595bf69e6bd762ce2e83e643af38cee001516e52eb9d4b0b1a0106744012dc8def41982
+  data.tar.gz: 4dd031a50587ec0cc06432965b04e9950fc5aa01b5866ef08f3fb822df3a756e6bc6ac7ee3b34b787bf7ed4452912c91468227023bc86af3380d65ec5fdc28bf

data/README.md

@@ -1,13 +1,10 @@
 # Decidim::Accountability
 
-[![Build Status](https://www.travis-ci.org/decidim/decidim-accountability.svg?branch=master)](https://www.travis-ci.org/decidim/decidim-accountability)
-
-
 The Accountability module adds results to any participatory process. It adds a CRUD engine to the admin and public views scoped inside the participatory process. Accountability will link to related meetings and proposals and will be used to show the progress on the related proposals.
 
-It also has a CSV importer for results, you can read [here](doc/csv_importer.md) about how it works, the CSV columns and what they mean.
 
 ## Usage
+
 Accountability will be available as a Feature for a Participatory Process.
 
 ## Installation
@@ -22,23 +19,6 @@ And then execute:
 $ bundle
 ```
 
-## Migration from `Decidim::Results` module
-To migrate results from Decidim::Results to Decidim::Accountability you can use a rake task like [this one in decidim-barcelona](https://github.com/PopulateTools/decidim-barcelona/blob/accountability/lib/tasks/migrate_results_to_accountability.rake). The task asumes that the accountability feature for the process has already been created. It takes a process ID as an argument, and defaults to 1 if none is provided:
-```bash
-$ bundle exec rake migrate:results_to_accountability[PROCESS_ID]
-``` 
-
-
-## Local development setup
-Clone [decidim-barcelona](https://github.com/PopulateTools/decidim-barcelona), at the same directory level as this `decidim-accountability` clone, and then checkout the `accountability-localdev` branch.
-
-Inside the `decidim-barcelona` directory run:
-
-- `bundle exec rake db:setup`
-- `bundle exec rake test_data:load`
-
-Now you should be able to start a local server with `bundle exec rails s`.
-
 ## Contributing
 See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
 

data/app/assets/javascripts/decidim/accountability/accountability.js.es6

@@ -1,10 +1,10 @@
 // = require_self
 
 $(() => {
-  /* Show category list on click when we are on a small scren */
+  // Show category list on click when we are on a small scren
   if ($(window).width() < 768) {
-    $('.category--section').click((e) => {
-      $(e.currentTarget).next('.category--elements').toggleClass('active');
+    $('.category--section').click((event) => {
+      $(event.currentTarget).next('.category--elements').toggleClass('active');
     });
   }
 })

data/app/assets/javascripts/decidim/accountability/admin/accountability_admin.js

@@ -1,8 +1,9 @@
 // = require_self
 
 $("#result_decidim_accountability_status_id").change(function () {
-  progress = $(this).find(':selected').data('progress')
-  if (progress || progress == 0) {
+  /* eslint-disable no-invalid-this */
+  const progress = $(this).find(':selected').data('progress')
+  if (progress || progress === 0) {
     $("#result_progress").val(progress);
   }
 });

data/app/assets/stylesheets/decidim/accountability/accountability/_categories.scss

@@ -4,35 +4,35 @@
       border-bottom: 1px solid $medium-gray;
       padding-bottom: 1rem;
       margin-bottom: 1rem;
-      
+
       .icon--arrow-bottom {
         fill: lighten($dark-gray, 50);
       }
-      
+
       span {
         text-transform: uppercase;
         font-size: 1.15rem;
         color: lighten($dark-gray, 50);
       }
     }
-    
+
     .categories--group {
       margin-bottom: 2rem;
-      
+
       @include breakpoint(medium) {
         display: flex;
         margin-bottom: 4rem;
       }
-      
+
       .category--title {
         background: $white;
         padding: 1.5rem 2rem;
         min-height: 9rem;
-        
+
         @include breakpoint(medium) {
           height: calc(100% - 1.875rem);
         }
-        
+
         p {
           font-weight: 600;
           margin-bottom: 0.75rem;
@@ -44,7 +44,7 @@
         .progress-info {
           position: relative;
           margin-bottom: 1.5rem;
-          
+
           .progress-figure {
             display: inline-block;
           }
@@ -56,7 +56,7 @@
           }
         }
       }
-      
+
       .card__link {
         .category--line {
           background: $light-gray-dark;
@@ -65,12 +65,12 @@
           padding: 1rem;
           margin-bottom: 1.875rem;
           position: relative;
-          
+
           strong {
             font-weight: 600;
             color: $secondary;
           }
-          
+
           .progress-figure {
             position: absolute;
             bottom: 1rem;
@@ -96,12 +96,12 @@
 
     .category--elements.active {
       display: block !important;
-      
+
       .medium-4:first-child {
         margin-top: 1rem;
       }
     }
-    
+
     .progress-figure {
       color: lighten($dark-gray, 50);
     }

data/app/assets/stylesheets/decidim/accountability/accountability/_lines_breadcrumb.scss

@@ -1,25 +1,25 @@
 .lines-breadcrumb {
   margin-bottom: 2rem;
-  
+
   .breadcrumb--separator {
     color: darken($light-gray, 40);
     padding: 0 0.25rem;
   }
-  
+
   div {
     display: inline-block;
   }
-  
+
   a {
     font-weight: 600;
     color: $dark-gray;
   }
-  
+
   ul {
     list-style: none;
     margin-left: 0;
   }
-  
+
   .percentage {
     color: darken($light-gray, 40);
     font-weight: 400;

data/app/assets/stylesheets/decidim/accountability/accountability/_results.scss

@@ -32,7 +32,7 @@
         font-size: 2.5rem;
         font-weight: 300;
         color: lighten($dark-gray, 50);
-        
+
         @include breakpoint(medium) {
           font-size: 4rem;
         }
@@ -77,13 +77,13 @@
       min-width: 1.5rem;
       min-height: 1.5rem;
       margin-bottom: 0.5rem;
-      
+
       @include breakpoint(medium) {
         margin-right: 0.75rem;
         margin-top: 0.5rem;
       }
     }
-    
+
     @include breakpoint(medium) {
       flex-direction: row;
     }
@@ -112,7 +112,7 @@
       }
     }
   }
-  
+
   .result-description div {
     margin-bottom: 1rem;
   }
@@ -134,7 +134,7 @@
     width: 100%;
     margin: 0 0 3rem 0;
   }
-  
+
   .timeline {
     .timeline__info {
       background-color: transparent;

data/app/commands/decidim/accountability/admin/create_result.rb

@@ -37,7 +37,6 @@ module Decidim
             parent_id: @form.parent_id,
             title: @form.title,
             description: @form.description,
-            external_id: @form.external_id,
             start_date: @form.start_date,
             end_date: @form.end_date,
             progress: @form.progress,

data/app/commands/decidim/accountability/admin/update_result.rb

@@ -21,12 +21,8 @@ module Decidim
         def call
           return broadcast(:invalid) if form.invalid?
 
-          current_proposal_ids = result.linked_resources(:proposals, "included_proposals").pluck(:id).sort
-          form_proposal_ids = form.proposal_ids.reject(&:blank?).sort
-
           transaction do
             update_result
-            result.touch if form_proposal_ids != current_proposal_ids
             link_proposals
             link_meetings
           end
@@ -45,7 +41,6 @@ module Decidim
             parent_id: @form.parent_id,
             title: @form.title,
             description: @form.description,
-            external_id: @form.external_id,
             start_date: @form.start_date,
             end_date: @form.end_date,
             progress: @form.progress,

data/app/controllers/decidim/accountability/application_controller.rb

@@ -5,7 +5,7 @@ module Decidim
     # This controller is the abstract class from which all other controllers of
     # this engine inherit.
     #
-    # Note that it inherits from `Decidim::Components::BaseController`, which
+    # Note that it inherits from `Decidim::Features::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Features::BaseController
     end

data/app/controllers/decidim/accountability/results_controller.rb

@@ -7,14 +7,7 @@ module Decidim
       include FilterResource
       helper Decidim::WidgetUrlsHelper
 
-      helper_method :results, :result, :stats_calculator, :first_class_categories, :category, :progress_calculator, :count_calculator, :current_scope, :template_texts
-
-      def home
-      end
-
-      def csv
-        send_data CSVExporter.new(current_feature).export, filename: "results.csv", disposition: "attachment"
-      end
+      helper_method :results, :result, :stats_calculator, :first_class_categories, :category, :progress_calculator, :count_calculator, :current_scope
 
       private
 
@@ -68,10 +61,6 @@ module Decidim
       def current_scope
         params[:filter][:scope_id] if params[:filter]
       end
-
-      def template_texts
-        Decidim::Accountability::TemplateTexts.for(current_feature)
-      end
     end
   end
 end

data/app/forms/decidim/accountability/admin/result_form.rb

@@ -17,7 +17,6 @@ module Decidim
         attribute :start_date, Date
         attribute :end_date, Date
         attribute :progress, Float
-        attribute :external_id, String
         attribute :decidim_accountability_status_id, Integer
         attribute :parent_id, Integer
 
@@ -30,8 +29,6 @@ module Decidim
         validates :parent, presence: true, if: ->(form) { form.parent_id.present? }
         validates :status, presence: true, if: ->(form) { form.decidim_accountability_status_id.present? }
 
-        validate :external_id_uniqueness
-
         def map_model(model)
           self.proposal_ids = model.linked_resources(:proposals, "included_proposals").pluck(:id)
           self.decidim_category_id = model.category.try(:id)
@@ -60,14 +57,6 @@ module Decidim
         def status
           @status ||= Decidim::Accountability::Status.where(feature: current_feature, id: decidim_accountability_status_id).first
         end
-
-        private
-
-        def external_id_uniqueness
-          return if external_id.blank?
-          existing_with_external_id = Decidim::Accountability::Result.find_by(feature: current_feature, external_id: external_id)
-          errors.add(:external_id, :taken) if existing_with_external_id && existing_with_external_id.id != id
-        end
       end
     end
   end

data/app/helpers/decidim/accountability/application_helper.rb

@@ -9,7 +9,7 @@ module Decidim
       include Decidim::Comments::CommentsHelper
 
       def display_percentage(number)
-        return unless number.present?
+        return if number.blank?
 
         number_to_percentage(number, precision: 1, strip_insignificant_zeros: true, locale: I18n.locale)
       end
@@ -19,19 +19,20 @@ module Decidim
       end
 
       def active_class_if_current(scope)
-        %Q{class=active} if scope.to_s == current_scope.to_s
+        "class=active" if scope.to_s == current_scope.to_s
       end
 
       def categories_label
-        translated_attribute(template_texts.categories_label).presence || t("results.home.categories_label", scope: "decidim.accountability")
+        translated_attribute(feature_settings.categories_label).presence || t("results.home.categories_label", scope: "decidim.accountability")
       end
 
       def subcategories_label
-        translated_attribute(template_texts.subcategories_label).presence || t("results.home.subcategories_label", scope: "decidim.accountability")
+        translated_attribute(feature_settings.subcategories_label).presence || t("results.home.subcategories_label", scope: "decidim.accountability")
       end
 
       def heading_parent_level_results(count)
-        if text = translated_attribute(template_texts.heading_parent_level_results).presence
+        text = translated_attribute(feature_settings.heading_parent_level_results).presence
+        if text
           "#{count} #{text}"
         else
           t("results.count.results_count", scope: "decidim.accountability", count: count)
@@ -39,7 +40,8 @@ module Decidim
       end
 
       def heading_leaf_level_results(count)
-        if text = translated_attribute(template_texts.heading_leaf_level_results).presence
+        text = translated_attribute(feature_settings.heading_leaf_level_results).presence
+        if text
           "#{count} #{text}"
         else
           t("results.count.results_count", scope: "decidim.accountability", count: count)

data/app/models/decidim/accountability/result.rb

@@ -19,14 +19,13 @@ module Decidim
 
       belongs_to :status, foreign_key: "decidim_accountability_status_id", class_name: "Decidim::Accountability::Status", inverse_of: :results, optional: true
 
-      has_many :timeline_entries, -> { order(:entry_date) }, foreign_key: "decidim_accountability_result_id", class_name: "Decidim::Accountability::TimelineEntry", inverse_of: :result, dependent: :destroy
-
-      before_validation :remove_blank_values
+      has_many :timeline_entries, -> { order(:entry_date) }, foreign_key: "decidim_accountability_result_id",
+                                                             class_name: "Decidim::Accountability::TimelineEntry", inverse_of: :result, dependent: :destroy
 
       after_save :update_parent_progress, if: -> { parent_id.present? }
 
       def update_parent_progress
-        return unless parent.present?
+        return if parent.blank?
 
         parent.update_progress!
       end
@@ -55,12 +54,6 @@ module Decidim
       def comments_have_votes?
         true
       end
-
-      private
-
-      def remove_blank_values
-        self.external_id = nil if external_id.blank?
-      end
     end
   end
 end

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

@@ -7,9 +7,12 @@ module Decidim
     # find the results.
     class ResultSearch < ResourceSearch
       # Public: Initializes the service.
-      # feature     - A Decidim::Feature to get the results from.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of proposals to return per page.
+      #
+      # options - A hash of options to modify the search. These options will be
+      #          converted to methods by SearchLight so they can be used on filter
+      #          methods. (Default {})
+      #          * feature - A Decidim::Feature to get the results from.
+      #          * organization - A Decidim::Organization object.
       def initialize(options = {})
         super(Result.all, options)
       end

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

@@ -11,9 +11,7 @@ module Decidim
         @result = result
       end
 
-      def proposals_count
-        proposals.count
-      end
+      delegate :count, to: :proposals, prefix: true
 
       def votes_count
         return 0 unless proposals
@@ -32,9 +30,7 @@ module Decidim
         meetings.where("contributions_count > 0").sum(:contributions_count)
       end
 
-      def meetings_count
-        meetings.count
-      end
+      delegate :count, to: :meetings, prefix: true
 
       private