decidim-accountability 0.21.0 → 0.22.0

data/config/locales/sv.yml

@@ -35,6 +35,7 @@ sv:
         confirm_destroy: Vill du radera detta %{name}?
         destroy: Radera
         edit: Redigera
+        import_csv: Importera CSV
         new: Ny %{name}
         preview: Förhandsvisa
         timeline_entries: Projektutveckling
@@ -42,6 +43,15 @@ sv:
       admin:
         exports:
           results: Resultat
+        import_results:
+          new:
+            import: Importera
+            info: "<p>Vi rekommenderar att du följer dessa steg:</p><ol><li>Skapa statusar för de resultat som du vill lägga till (<a href='%{link_new_status}' target='_blank'>länk</a>)</li><li>Skapa minst ett resultat manuellt genom denna Admin panel (<a href='%{link_new_result}' target='_blank'>länk</a>) innan du använder Importera, för att ha en bättre förståelse för formatet och vad du behöver för att fylla i.</li><li>Ladda ner exporten med CSV-format (%{link_export_csv})</li><li>Gör ändringarna lokalt. Du kan bara ändra följande kolumner i CSV:</li></ol><ul><li><b>kategori/id:</b> ID för kategorin</li><li><b>omfattning/id:</b> ID för omfattningen</li><li><b>förälder/id:</b> ID för föräldern (för relaterade resultat). Valfri</li><li><b>title/I18N:</b> Titel på X språk</li><li><b>beskrivning/I18N:</b> Beskrivning på X språk</li><li><b>start_date:</b> datum när resultatet startar exekvering (format YYYY-MM-DD)</li><li><b>end_date:</b> datum när resultatet slutar exekvering (format YYYY-MM-DD)</li><li><b>status/id:</b> ID för status för detta resultat</li><li><b>fortskrider:</b> Procent (från 0 till 100) av exekveringen</li><li><b>förslag_ids:</b> internt ID för de relaterade förslagen (separerade med komma). Det konverteras automatiskt till <span class='attribute-name'>proposal_url</span></li></ul>"
+            link: länk
+            title: Importera resultat från CSV
+        imports:
+          create:
+            success: Filen har börjat importera. Du kommer att få ett e-postmeddelande inom de närmaste minuterna med resultatet av importen
         models:
           result:
             name: Resultat
@@ -58,17 +68,11 @@ sv:
           edit:
             title: Redigera resultat
             update: Uppdatera resultat
-          form:
-            add_proposal: Lägg till förslag
           index:
             title: Resultat
           new:
             create: Skapa resultat
             title: Nytt resultat
-          proposals:
-            close: Stäng
-            current_selection: Aktuellt urval
-            select: Välj
           update:
             invalid: Det gick inte att uppdatera det här resultatet
             success: Resultatet har uppdaterats
@@ -117,6 +121,13 @@ sv:
         value_types:
           parent_presenter:
             not_found: 'Föräldraposten hittades inte i databasen (ID: %{id})'
+      import_mailer:
+        import:
+          errors: Fel
+          errors_present: Det gick inte att importera resultat
+          row_number: Rad
+          subject: Lyckad import av resultat
+          success: Lyckad import av resultat. Du kan granska resultaten i administrationsgränssnittet.
       last_activity:
         new_result_at_html: "<span>Nytt resultat på %{link}</span>"
       models:
@@ -157,30 +168,16 @@ sv:
         show:
           stats:
             attendees: Deltagare
-            back_to_result: Gå tillbaka till resultatet
+            back_to_resource: Gå tillbaka till resultatet
             comments: Kommentarer
             contributions: Bidrag
             last_edited_by: Senast ändrad av
             last_updated_at: Senast uppdaterad den
             meetings: Möten
-            number_of_versions: Versioner
             proposals: Förslag
-            show_all_versions: Visa alla versioner
-            version_author: Versionsförfattare
-            version_created_at: Version skapad
-            version_number: Versionsnummer
-            version_number_out_of_total: "%{current_version} av %{total_count}"
-            votes: Stöder
+            votes: Stöd
         timeline:
           title: Projektutveckling
-      versions:
-        index:
-          changes_at_title: Ändringar vid "%{title}"
-          title: Versioner
-        show:
-          changes_at_title: Ändringar vid "%{title}"
-        version:
-          version_index: Version %{index}
     components:
       accountability:
         name: Ansvarsskyldighet
@@ -199,7 +196,7 @@ sv:
       accountability:
         proposal_linked:
           email_intro: 'Förslaget "%{proposal_title}" har tagits med i ett resultat. Visa det från den här sidan:'
-          email_outro: Du har fått den här meddelandet eftersom du följer "%{proposal_title}". Du kan sluta att ta emot meddelanden genom att följa föregående länk.
+          email_outro: Du har fått det här meddelandet eftersom du följer "%{proposal_title}". Du kan sluta att ta emot meddelanden genom att följa föregående länk.
           email_subject: En uppdatering till %{proposal_title}
           notification_title: Förslaget <a href="%{proposal_path}">%{proposal_title}</a> har tagits med i resultatet <a href="%{resource_path}">%{resource_title}</a>.
         result_progress_updated:
@@ -218,7 +215,7 @@ sv:
           results: Resultat
     participatory_spaces:
       highlighted_results:
-        see_all: Visa alla (%{count})
+        see_all: Se alla resultat (%{count})
     resource_links:
       included_projects:
         result_project: Projekt som ingår i detta resultat

data/config/locales/tr-TR.yml

@@ -58,17 +58,11 @@ tr:
           edit:
             title: Sonucu düzenle
             update: Sonuç güncelle
-          form:
-            add_proposal: Teklif ekle
           index:
             title: Sonuçlar
           new:
             create: Sonuç oluştur
             title: Yeni sonuç
-          proposals:
-            close: Kapat
-            current_selection: Şu anki seçim
-            select: seçmek
           update:
             invalid: Bu sonucu güncellerken bir sorun oluştu
             success: Sonuç başarıyla güncellendi
@@ -157,30 +151,16 @@ tr:
         show:
           stats:
             attendees: Katılımcılar
-            back_to_result: Sonuca geri dön
+            back_to_resource: Sonuca geri dön
             comments: Yorumlar
             contributions: Katılımlar
             last_edited_by: Tarafından düzenlenmiş Son
             last_updated_at: 'Son güncelleme tarihi:'
             meetings: Toplantılar
-            number_of_versions: Sürümler
             proposals: Teklif
-            show_all_versions: Tüm sürümleri göster
-            version_author: Sürüm yazarı
-            version_created_at: '''De oluşturulan sürüm'
-            version_number: Versiyon numarası
-            version_number_out_of_total: "%{current_version} üzerinden %{total_count}"
             votes: Destekler
         timeline:
           title: Proje evrimi
-      versions:
-        index:
-          changes_at_title: '"%{title}" daki değişiklikler'
-          title: Sürümler
-        show:
-          changes_at_title: '"%{title}" daki değişiklikler'
-        version:
-          version_index: Sürüm %{index}
     components:
       accountability:
         name: Hesap verebilirlik
@@ -216,9 +196,6 @@ tr:
       participatory_process_groups:
         highlighted_results:
           results: Sonuçlar
-    participatory_spaces:
-      highlighted_results:
-        see_all: Tümünü gör (%{count})
     resource_links:
       included_projects:
         result_project: Bu sonuca dahil edilen projeler

data/config/locales/uk.yml

@@ -59,17 +59,11 @@ uk:
           edit:
             title: Редагувати підсумки
             update: Оновити підсумки
-          form:
-            add_proposal: Додати пропозицію
           index:
             title: Підсумки
           new:
             create: Створити підсумки
             title: Додати підсумки
-          proposals:
-            close: Закрити
-            current_selection: Поточний вибір
-            select: Оберіть
           update:
             invalid: При спробі оновити ці підсумки сталася помилка
             success: Підсумки успішно оновлено
@@ -158,30 +152,16 @@ uk:
         show:
           stats:
             attendees: Учасники
-            back_to_result: Повернутися до підсумків
+            back_to_resource: Повернутися до підсумків
             comments: Коментарів
             contributions: Внесені пропозиції
             last_edited_by: Останній раз редагувалося
             last_updated_at: Останній раз оновлювалося
             meetings: Зустрічі
-            number_of_versions: Версії
             proposals: Пропозиції
-            show_all_versions: Показати всі версії
-            version_author: Автор версії
-            version_created_at: 'Версію створено:'
-            version_number: Номер версії
-            version_number_out_of_total: "%{current_version} з %{total_count}"
             votes: Підтримує
         timeline:
           title: Розвиток проекту
-      versions:
-        index:
-          changes_at_title: Зміни в "%{title}"
-          title: Версії
-        show:
-          changes_at_title: Зміни в "%{title}"
-        version:
-          version_index: Версія %{index}
     components:
       accountability:
         name: Звітність

data/db/migrate/20200320105903_index_foreign_keys_in_decidim_accountability_results.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimAccountabilityResults < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_accountability_results, :external_id
+  end
+end

data/lib/decidim/accountability/admin_engine.rb

@@ -14,11 +14,12 @@ module Decidim
       routes do
         resources :statuses
         resources :results, except: [:show] do
+          get :proposals_picker, on: :collection
+
           resources :timeline_entries, except: [:show]
-          collection do
-            get :proposals
-          end
         end
+        get :import_results, to: "import_results#new"
+        post :import_results, to: "import_results#create"
         root to: "results#index"
       end
 

data/lib/decidim/accountability/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-accountability version.
   module Accountability
     def self.version
-      "0.21.0"
+      "0.22.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-accountability
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,42 +18,48 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: searchlight
   requirement: !ruby/object:Gem::Requirement
@@ -74,98 +80,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 description: An accountability component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -193,14 +199,17 @@ files:
 - app/cells/decidim/accountability/highlighted_results_for_component/show.erb
 - app/cells/decidim/accountability/highlighted_results_for_component_cell.rb
 - app/cells/decidim/accountability/result_activity_cell.rb
+- app/commands/decidim/accountability/admin/create_imported_result.rb
 - app/commands/decidim/accountability/admin/create_result.rb
 - app/commands/decidim/accountability/admin/create_status.rb
 - app/commands/decidim/accountability/admin/create_timeline_entry.rb
 - app/commands/decidim/accountability/admin/destroy_result.rb
+- app/commands/decidim/accountability/admin/update_imported_result.rb
 - app/commands/decidim/accountability/admin/update_result.rb
 - app/commands/decidim/accountability/admin/update_status.rb
 - app/commands/decidim/accountability/admin/update_timeline_entry.rb
 - app/controllers/decidim/accountability/admin/application_controller.rb
+- app/controllers/decidim/accountability/admin/import_results_controller.rb
 - app/controllers/decidim/accountability/admin/results_controller.rb
 - app/controllers/decidim/accountability/admin/statuses_controller.rb
 - app/controllers/decidim/accountability/admin/timeline_entries_controller.rb
@@ -215,6 +224,9 @@ files:
 - app/forms/decidim/accountability/admin/timeline_entry_form.rb
 - app/helpers/decidim/accountability/application_helper.rb
 - app/helpers/decidim/accountability/breadcrumb_helper.rb
+- app/jobs/application_job.rb
+- app/jobs/decidim/accountability/admin/import_results_csv_job.rb
+- app/mailers/decidim/accountability/import_mailer.rb
 - app/models/decidim/accountability/application_record.rb
 - app/models/decidim/accountability/result.rb
 - app/models/decidim/accountability/status.rb
@@ -228,15 +240,17 @@ files:
 - app/services/decidim/accountability/result_search.rb
 - app/services/decidim/accountability/result_stats_calculator.rb
 - app/services/decidim/accountability/results_calculator.rb
+- app/services/decidim/accountability/results_csv_importer.rb
 - app/types/decidim/accountability/accountability_type.rb
 - app/types/decidim/accountability/result_type.rb
 - app/types/decidim/accountability/status_type.rb
 - app/types/decidim/accountability/timeline_entry_type.rb
+- app/views/decidim/accountability/admin/import_results/new.html.erb
 - app/views/decidim/accountability/admin/results/_form.html.erb
-- app/views/decidim/accountability/admin/results/_proposals.html.erb
 - app/views/decidim/accountability/admin/results/edit.html.erb
 - app/views/decidim/accountability/admin/results/index.html.erb
 - app/views/decidim/accountability/admin/results/new.html.erb
+- app/views/decidim/accountability/admin/results/proposals_picker.html.erb
 - app/views/decidim/accountability/admin/shared/_subnav.html.erb
 - app/views/decidim/accountability/admin/statuses/_form.html.erb
 - app/views/decidim/accountability/admin/statuses/edit.html.erb
@@ -246,6 +260,7 @@ files:
 - app/views/decidim/accountability/admin/timeline_entries/edit.html.erb
 - app/views/decidim/accountability/admin/timeline_entries/index.html.erb
 - app/views/decidim/accountability/admin/timeline_entries/new.html.erb
+- app/views/decidim/accountability/import_mailer/import.html.erb
 - app/views/decidim/accountability/result_widgets/show.html.erb
 - app/views/decidim/accountability/results/_home_categories.html.erb
 - app/views/decidim/accountability/results/_home_header.html.erb
@@ -264,7 +279,6 @@ files:
 - app/views/decidim/accountability/results/index.html.erb
 - app/views/decidim/accountability/results/index.js.erb
 - app/views/decidim/accountability/results/show.html.erb
-- app/views/decidim/accountability/versions/_version.html.erb
 - app/views/decidim/accountability/versions/index.html.erb
 - app/views/decidim/accountability/versions/show.html.erb
 - app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_results.html.erb
@@ -272,9 +286,11 @@ files:
 - app/views/decidim/participatory_spaces/_result.html.erb
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
+- config/locales/bg-BG.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
+- config/locales/da-DK.yml
 - config/locales/de.yml
 - config/locales/el-GR.yml
 - config/locales/el.yml
@@ -283,22 +299,35 @@ files:
 - config/locales/es-MX.yml
 - config/locales/es-PY.yml
 - config/locales/es.yml
+- config/locales/et-EE.yml
 - config/locales/eu.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
+- config/locales/fr-CA.yml
 - config/locales/fr.yml
+- config/locales/ga-IE.yml
 - config/locales/gl.yml
+- config/locales/hr-HR.yml
 - config/locales/hu.yml
 - config/locales/id-ID.yml
 - config/locales/is-IS.yml
 - config/locales/it.yml
+- config/locales/ja-JP.yml
+- config/locales/lt-LT.yml
+- config/locales/lv-LV.yml
+- config/locales/mt-MT.yml
 - config/locales/nl.yml
 - config/locales/no.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/pt.yml
+- config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/sk-SK.yml
+- config/locales/sk.yml
+- config/locales/sl.yml
+- config/locales/sr-CS.yml
 - config/locales/sv.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -312,6 +341,7 @@ files:
 - db/migrate/20180305133145_rename_features_to_components_at_accountability.rb
 - db/migrate/20180508170210_add_weight_to_results.rb
 - db/migrate/20180508170647_add_external_id_to_results.rb
+- db/migrate/20200320105903_index_foreign_keys_in_decidim_accountability_results.rb
 - lib/decidim/accountability.rb
 - lib/decidim/accountability/admin.rb
 - lib/decidim/accountability/admin_engine.rb