decidim-sortitions 0.14.4 → 0.15.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/images/decidim/sortitions/icon.svg +2 -3
- data/config/locales/fi.yml +2 -2
- data/config/locales/hu.yml +1 -1
- data/db/migrate/20181017110803_make_sortitions_authors_polymorphic.rb +24 -0
- data/lib/decidim/sortitions/test/factories.rb +4 -4
- data/lib/decidim/sortitions/version.rb +1 -1
- metadata +14 -13
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: dde81e483335b141130e42b1c05ee5489841ad13b5cc33642d294d0ed2d30f0f
|
|
4
|
+
data.tar.gz: '080d5bf881c3aed349f10752f26d9accbf0eb68d0dd30be0bd05094a8dd48c05'
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3696c837ba7969fa8947578d7bdba5a0fd6160a4757cff9ccc59045e061ea3c74e04b7e7338a39b6183d7315184b3bb216905a27ba8435d933717e6215567ef2
|
|
7
|
+
data.tar.gz: d8f069c2aac49dab51c84f6858779bc22000bf9d6f35266835d39cd58a6b79ebae718170449e0734fb7d797fc8798198b08f005aa44525689bdedf55cd139737
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="8" height="8" data-icon="aperture" viewBox="0 0
|
|
2
|
-
<path d="
|
|
3
|
-
/>
|
|
1
|
+
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="8" height="8" data-icon="aperture" viewBox="0 0 34 34">
|
|
2
|
+
<path d="M17 0c9.389 0 17 7.611 17 17s-7.611 17-17 17S0 26.389 0 17 7.611 0 17 0zm0 1.889C8.654 1.889 1.889 8.654 1.889 17S8.654 32.111 17 32.111 32.111 25.346 32.111 17 25.346 1.889 17 1.889zm11.865 10.74a3.15 3.15 0 1 1-6.3 0 3.15 3.15 0 0 1 6.3 0zm-1.89 0a1.26 1.26 0 1 0-2.521 0 1.26 1.26 0 0 0 2.522 0zM15.25 19.136a.944.944 0 0 1 1.89 0v1.792a5.71 5.71 0 1 1-11.423 0v-1.792a.944.944 0 0 1 1.89 0v1.792a3.822 3.822 0 1 0 7.643 0v-1.792zm5.841-6.974l.018.019a.941.941 0 0 1-.02 1.335l-2.514 2.44a.944.944 0 0 1-1.316-1.355l.843-.818a6.237 6.237 0 0 0-6.177 6.23.944.944 0 0 1-1.889 0c0-4.492 3.653-8.12 8.12-8.12h.041l-.958-.986a.944.944 0 0 1 1.355-1.316l2.497 2.571a.941.941 0 0 0-.66-.268h-2.234z"/>
|
|
4
3
|
</svg>
|
data/config/locales/fi.yml
CHANGED
|
@@ -126,10 +126,10 @@ fi:
|
|
|
126
126
|
any_category: kaikista aihepiireistä
|
|
127
127
|
cancelled: Peruttu satunnaisvalinta
|
|
128
128
|
candidate_proposal_ids: Satunnaisvalintaehdotusten järjestys ja tunnukset
|
|
129
|
-
candidate_proposals_info: 'Valinta tehtiin seuraavien ehdotusten (%{category_label}) välillä, seuraavilla
|
|
129
|
+
candidate_proposals_info: 'Valinta tehtiin seuraavien ehdotusten (%{category_label}) välillä, seuraavilla tunnisteilla (valitut ehdotukset lihavoituna) '
|
|
130
130
|
category: aihepiiristä %{category}
|
|
131
131
|
dice_result: "(1) Noppatulos"
|
|
132
|
-
introduction: 'Tämä sivu sisältää satunnaisvalinnan
|
|
132
|
+
introduction: 'Tämä sivu sisältää satunnaisvalinnan %{reference} tulokset. Tämän satunnaisvalinnan avulla %{target_items} tulosta on valittu satunnaisesti ja yhtäläisellä todennäköisyysjakaumalla alla esitetyistä ehdotuksista. Tällä sivulla näkyy tulosten lisäksi ne tarvittavat lisätiedot, joiden avulla valinta voidaan toistaa ja varmentaa. Tämän satunnaisvalinnan laadun avain on kaksinkertainen satunnaisuus, jonka antaa noppan heitto (todistajien todistama) ja täsmällinen valinnan ajankohta. Nämä tiedot antavat syötteen algoritmille, joka tuottaa satunnaisen valinnan. Satunnaisvalinnan aikajako on niin tarkka (sekunneissa), että ihmisen on mahdotonta hallita sitä, jolloin saadaan kaksinkertainen "hallitsematon" syöte oikeudenmukaisen tuloksen takaamiseksi. '
|
|
133
133
|
mathematical_result: Tulos (1) x (2)
|
|
134
134
|
proposals_selected_by_sortition: Ehdotukset, jotka on valittu satunnaisvalinnassa
|
|
135
135
|
sortition_reproducibility_details: Satunnaisvalinnan toisinnettavuustiedot
|
data/config/locales/hu.yml
CHANGED
|
@@ -126,7 +126,7 @@ hu:
|
|
|
126
126
|
any_category: minden kategóriából
|
|
127
127
|
cancelled: Törölt sorsolás
|
|
128
128
|
candidate_proposal_ids: Sorsolásos javaslatok sorrendje és azonosítói
|
|
129
|
-
candidate_proposals_info: 'Sorsolásos módszer a következő
|
|
129
|
+
candidate_proposals_info: 'Sorsolásos módszer a következő javaslatokat vette figyelembe: (%{category_label}), ezzekel az azonosítókkal (a kiválasztott javaslatok vastagon kiemelve) '
|
|
130
130
|
category: a(z) %{category} kategóriából
|
|
131
131
|
dice_result: "(1) dobókocka eredmény"
|
|
132
132
|
introduction: 'Ez az oldal a következő sorsolás eredményeit tartalmazza: %{reference}. A módszer segítségével %{target_items} véletlenszerű eredményt kaptunk az alábbi javaslatokhoz, az egyenlő valószínűségi eloszlás elvét követve. Az oldalon található adatok - az eredményekkel együtt - minden olyan információt tartalmaznak, amelyek garantálják az eljárás megbízhatóságát és reprodukálhatóságát. Ennek a sorsolásos módszernek az egyik erőssége a kétlépcsős véletlenszerűségben rejlik, amelyet egyfelől a dobókocka feldobása, másfelől a sorsolás pontos időpontjának rögzítése biztosít. Ez utóbbiak ráadásul olyannyira pontosak, hogy azt emberek nem tudják ellenőrizni. Ez a dupla véletlenszerűség garantálja tehát a megbízható eredményeket. '
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
class MakeSortitionsAuthorsPolymorphic < ActiveRecord::Migration[5.2]
|
|
4
|
+
def change
|
|
5
|
+
add_column :decidim_sortitions_sortitions, :decidim_author_type, :string
|
|
6
|
+
|
|
7
|
+
Decidim::Sortitions::Sortition.reset_column_information
|
|
8
|
+
Decidim::Sortitions::Sortition.includes(:author).find_each do |sortition|
|
|
9
|
+
author = if sortition.decidim_author_id.present?
|
|
10
|
+
Decidim::User.find(sortition.decidim_author_id)
|
|
11
|
+
else
|
|
12
|
+
sortition.organization
|
|
13
|
+
end
|
|
14
|
+
sortition.author = author
|
|
15
|
+
sortition.save!
|
|
16
|
+
end
|
|
17
|
+
|
|
18
|
+
add_index :decidim_sortitions_sortitions,
|
|
19
|
+
[:decidim_author_id, :decidim_author_type],
|
|
20
|
+
name: "index_decidim_sortitions_sortitions_on_decidim_author"
|
|
21
|
+
change_column_null :decidim_sortitions_sortitions, :decidim_author_id, false
|
|
22
|
+
change_column_null :decidim_sortitions_sortitions, :decidim_author_type, false
|
|
23
|
+
end
|
|
24
|
+
end
|
|
@@ -15,7 +15,7 @@ FactoryBot.define do
|
|
|
15
15
|
component { create(:sortition_component) }
|
|
16
16
|
decidim_proposals_component { create(:proposal_component, organization: component.organization) }
|
|
17
17
|
|
|
18
|
-
title {
|
|
18
|
+
title { generate_localized_title }
|
|
19
19
|
author do
|
|
20
20
|
create(:user, :admin, organization: component.organization) if component
|
|
21
21
|
end
|
|
@@ -23,14 +23,14 @@ FactoryBot.define do
|
|
|
23
23
|
dice { Faker::Number.between(1, 6).to_i }
|
|
24
24
|
target_items { Faker::Number.between(1, 5).to_i }
|
|
25
25
|
request_timestamp { Time.now.utc }
|
|
26
|
-
witnesses { Decidim::Faker::Localized.wrapped("<p>", "</p>") {
|
|
27
|
-
additional_info { Decidim::Faker::Localized.wrapped("<p>", "</p>") {
|
|
26
|
+
witnesses { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
|
|
27
|
+
additional_info { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
|
|
28
28
|
selected_proposals { create_list(:proposal, target_items, component: decidim_proposals_component).pluck(:id) }
|
|
29
29
|
candidate_proposals { selected_proposals }
|
|
30
30
|
|
|
31
31
|
trait :cancelled do
|
|
32
32
|
cancelled_on { Time.now.utc }
|
|
33
|
-
cancel_reason { Decidim::Faker::Localized.wrapped("<p>", "</p>") {
|
|
33
|
+
cancel_reason { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
|
|
34
34
|
cancelled_by_user { create(:user, :admin, organization: component.organization) if component }
|
|
35
35
|
end
|
|
36
36
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: decidim-sortitions
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.15.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Juan Salvador Perez Garcia
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-
|
|
11
|
+
date: 2018-11-12 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: decidim-admin
|
|
@@ -16,56 +16,56 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - '='
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 0.
|
|
19
|
+
version: 0.15.0
|
|
20
20
|
type: :runtime
|
|
21
21
|
prerelease: false
|
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
23
|
requirements:
|
|
24
24
|
- - '='
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
|
-
version: 0.
|
|
26
|
+
version: 0.15.0
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: decidim-comments
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
30
30
|
requirements:
|
|
31
31
|
- - '='
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version: 0.
|
|
33
|
+
version: 0.15.0
|
|
34
34
|
type: :runtime
|
|
35
35
|
prerelease: false
|
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
|
37
37
|
requirements:
|
|
38
38
|
- - '='
|
|
39
39
|
- !ruby/object:Gem::Version
|
|
40
|
-
version: 0.
|
|
40
|
+
version: 0.15.0
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: decidim-core
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
44
44
|
requirements:
|
|
45
45
|
- - '='
|
|
46
46
|
- !ruby/object:Gem::Version
|
|
47
|
-
version: 0.
|
|
47
|
+
version: 0.15.0
|
|
48
48
|
type: :runtime
|
|
49
49
|
prerelease: false
|
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
|
51
51
|
requirements:
|
|
52
52
|
- - '='
|
|
53
53
|
- !ruby/object:Gem::Version
|
|
54
|
-
version: 0.
|
|
54
|
+
version: 0.15.0
|
|
55
55
|
- !ruby/object:Gem::Dependency
|
|
56
56
|
name: decidim-proposals
|
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
|
58
58
|
requirements:
|
|
59
59
|
- - '='
|
|
60
60
|
- !ruby/object:Gem::Version
|
|
61
|
-
version: 0.
|
|
61
|
+
version: 0.15.0
|
|
62
62
|
type: :runtime
|
|
63
63
|
prerelease: false
|
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
|
65
65
|
requirements:
|
|
66
66
|
- - '='
|
|
67
67
|
- !ruby/object:Gem::Version
|
|
68
|
-
version: 0.
|
|
68
|
+
version: 0.15.0
|
|
69
69
|
- !ruby/object:Gem::Dependency
|
|
70
70
|
name: social-share-button
|
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -86,14 +86,14 @@ dependencies:
|
|
|
86
86
|
requirements:
|
|
87
87
|
- - '='
|
|
88
88
|
- !ruby/object:Gem::Version
|
|
89
|
-
version: 0.
|
|
89
|
+
version: 0.15.0
|
|
90
90
|
type: :development
|
|
91
91
|
prerelease: false
|
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
|
93
93
|
requirements:
|
|
94
94
|
- - '='
|
|
95
95
|
- !ruby/object:Gem::Version
|
|
96
|
-
version: 0.
|
|
96
|
+
version: 0.15.0
|
|
97
97
|
description: This module makes possible to select amont a set of proposal by sortition
|
|
98
98
|
email:
|
|
99
99
|
- jsperezg@gmail.com
|
|
@@ -194,6 +194,7 @@ files:
|
|
|
194
194
|
- db/migrate/20180108132729_rename_sortitions_table.rb
|
|
195
195
|
- db/migrate/20180322082150_fix_sortitions_feature.rb
|
|
196
196
|
- db/migrate/20180322085145_fix_sortitions_proposal_feature.rb
|
|
197
|
+
- db/migrate/20181017110803_make_sortitions_authors_polymorphic.rb
|
|
197
198
|
- lib/decidim/sortitions.rb
|
|
198
199
|
- lib/decidim/sortitions/admin.rb
|
|
199
200
|
- lib/decidim/sortitions/admin_engine.rb
|
|
@@ -221,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
221
222
|
version: '0'
|
|
222
223
|
requirements: []
|
|
223
224
|
rubyforge_project:
|
|
224
|
-
rubygems_version: 2.7.
|
|
225
|
+
rubygems_version: 2.7.6
|
|
225
226
|
signing_key:
|
|
226
227
|
specification_version: 4
|
|
227
228
|
summary: Decidim sortitions module
|