decidim-participatory_processes 0.25.2 → 0.26.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes/filters_small_view.erb +3 -3
- data/app/cells/decidim/participatory_process_groups/content_blocks/title/show.erb +1 -1
- data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/single_process.erb +1 -1
- data/app/commands/decidim/participatory_processes/admin/create_participatory_process.rb +25 -20
- data/app/controllers/decidim/participatory_processes/admin/participatory_process_groups_controller.rb +2 -7
- data/app/controllers/decidim/participatory_processes/admin/participatory_process_user_roles_controller.rb +12 -4
- data/app/controllers/decidim/participatory_processes/participatory_process_groups_controller.rb +1 -1
- data/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb +4 -4
- data/app/models/decidim/participatory_process_user_role.rb +20 -0
- data/app/queries/decidim/participatory_processes/organization_promoted_participatory_process_groups.rb +16 -0
- data/app/services/decidim/participatory_processes/participatory_process_search.rb +1 -1
- data/app/views/decidim/participatory_processes/admin/participatory_process_groups/index.html.erb +1 -1
- data/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/index.html.erb +7 -7
- data/app/views/decidim/participatory_processes/admin/participatory_processes/index.html.erb +1 -1
- data/app/views/decidim/participatory_processes/participatory_processes/_promoted_process.html.erb +1 -1
- data/app/views/decidim/participatory_processes/participatory_processes/_promoted_process_group.html.erb +1 -1
- data/app/views/decidim/participatory_processes/participatory_processes/show.html.erb +3 -3
- data/config/locales/fi.yml +1 -1
- data/config/locales/fr.yml +13 -13
- data/config/locales/ja.yml +3 -3
- data/config/locales/lb-LU.yml +108 -0
- data/config/locales/pt-BR.yml +1 -1
- data/config/locales/val-ES.yml +1 -0
- data/lib/decidim/participatory_processes/admin_engine.rb +3 -1
- data/lib/decidim/participatory_processes/engine.rb +1 -1
- data/lib/decidim/participatory_processes/version.rb +1 -1
- metadata +15 -14
- data/app/views/decidim/participatory_processes/admin/participatory_process_groups/show.html.erb +0 -30
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f987a0428cc521c80f64cb0ea33c846e3554306a6627087a16f8fd752ab14f08
|
4
|
+
data.tar.gz: 6c97963c46683bf0cecd57f1708156bf841e52fba63f45085eb63c33a197ee91
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9048bbb753317c874e711d4067917eaf674127a22a639815b811e3d304833af3dfb3b0361569258166040bb59ca90431ee62baddfe6b0e8e72067089ea8303a7
|
7
|
+
data.tar.gz: 3a66e14a2b0170cfe99bd8207b668d859405d83032c8c89375f080685d73b2ab96561987bd6a1e3e9f7fbf3418c80e60ea164713cd1cc9b74d4c006f18873501
|
@@ -1,13 +1,13 @@
|
|
1
1
|
<div class="filters-controls hide-for-mediumlarge">
|
2
|
-
<button data-open="filter-box" class="filters-controls__trigger">
|
2
|
+
<button data-open="filter-box" class="filters-controls__trigger" aria-controls="filter-box" aria-haspopup="dialog">
|
3
3
|
<%= t("filter", scope: "decidim.searches.filters_small_view") %>
|
4
4
|
<%= icon "caret-bottom", class: "icon--small float-right", aria_label: t("unfold", scope: "decidim.searches.filters_small_view"), role: "img" %>
|
5
5
|
</button>
|
6
6
|
</div>
|
7
7
|
|
8
|
-
<div class="reveal" id="filter-box" data-reveal>
|
8
|
+
<div class="reveal" id="filter-box" data-reveal role="dialog" aria-modal="true" aria-labelledby="filter-box-label">
|
9
9
|
<div class="reveal__header">
|
10
|
-
<h3 class="reveal__title"><%= t("filter_by", scope: "decidim.searches.filters_small_view") %>:</h3>
|
10
|
+
<h3 id="filter-box-label" class="reveal__title"><%= t("filter_by", scope: "decidim.searches.filters_small_view") %>:</h3>
|
11
11
|
<button class="close-button" data-close aria-label="<%= 't("close_modal", scope: "decidim.searches.filters_small_view")' %>" type="button">
|
12
12
|
<span aria-hidden="true">×</span>
|
13
13
|
</button>
|
@@ -2,7 +2,7 @@
|
|
2
2
|
<h2 class="heading2"><%= translated_attribute(participatory_process_group.title) %></h2>
|
3
3
|
<div class="row">
|
4
4
|
<div class="columns medium-9">
|
5
|
-
<%=
|
5
|
+
<%= decidim_sanitize_editor translated_attribute(participatory_process_group.description) %>
|
6
6
|
<div class="row">
|
7
7
|
<div class="column medium-2 text-muted">
|
8
8
|
<%= icon "grid-three-up", role: "img", "aria-hidden": true, class: "mr-xs" %>
|
@@ -14,7 +14,7 @@
|
|
14
14
|
<%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card__link" do %>
|
15
15
|
<h2 class="card__title" id="<%= title_id %>"><%= decidim_html_escape(translated_attribute(process.title)) %></h2>
|
16
16
|
<% end %>
|
17
|
-
<%=
|
17
|
+
<%= decidim_sanitize_editor translated_attribute(process.short_description) %>
|
18
18
|
<%= link_to decidim_participatory_processes.participatory_process_path(process), class: "button small hollow" do %>
|
19
19
|
<span class="show-for-sr"><%= decidim_html_escape(translated_attribute(process.title)) %></span>
|
20
20
|
<%= t("more_information", scope: i18n_scope) %>
|
@@ -40,7 +40,30 @@ module Decidim
|
|
40
40
|
attr_reader :form, :process
|
41
41
|
|
42
42
|
def create_participatory_process
|
43
|
-
@process = ParticipatoryProcess.new
|
43
|
+
@process = ParticipatoryProcess.new
|
44
|
+
@process.assign_attributes(attributes)
|
45
|
+
|
46
|
+
return process unless process.valid?
|
47
|
+
|
48
|
+
transaction do
|
49
|
+
process.save!
|
50
|
+
|
51
|
+
log_process_creation(process)
|
52
|
+
|
53
|
+
process.steps.create!(
|
54
|
+
title: TranslationsHelper.multi_translation(
|
55
|
+
"decidim.admin.participatory_process_steps.default_title",
|
56
|
+
form.current_organization.available_locales
|
57
|
+
),
|
58
|
+
active: true
|
59
|
+
)
|
60
|
+
|
61
|
+
process
|
62
|
+
end
|
63
|
+
end
|
64
|
+
|
65
|
+
def attributes
|
66
|
+
{
|
44
67
|
organization: form.current_organization,
|
45
68
|
title: form.title,
|
46
69
|
subtitle: form.subtitle,
|
@@ -66,25 +89,7 @@ module Decidim
|
|
66
89
|
start_date: form.start_date,
|
67
90
|
end_date: form.end_date,
|
68
91
|
participatory_process_group: form.participatory_process_group
|
69
|
-
|
70
|
-
|
71
|
-
return process unless process.valid?
|
72
|
-
|
73
|
-
transaction do
|
74
|
-
process.save!
|
75
|
-
|
76
|
-
log_process_creation(process)
|
77
|
-
|
78
|
-
process.steps.create!(
|
79
|
-
title: TranslationsHelper.multi_translation(
|
80
|
-
"decidim.admin.participatory_process_steps.default_title",
|
81
|
-
form.current_organization.available_locales
|
82
|
-
),
|
83
|
-
active: true
|
84
|
-
)
|
85
|
-
|
86
|
-
process
|
87
|
-
end
|
92
|
+
}
|
88
93
|
end
|
89
94
|
|
90
95
|
def log_process_creation(process)
|
@@ -14,11 +14,6 @@ module Decidim
|
|
14
14
|
enforce_permission_to :read, :process_group
|
15
15
|
end
|
16
16
|
|
17
|
-
def show
|
18
|
-
enforce_permission_to :read, :process_group, process_group: participatory_process_group
|
19
|
-
render layout: "decidim/admin/participatory_process_group"
|
20
|
-
end
|
21
|
-
|
22
17
|
def new
|
23
18
|
enforce_permission_to :create, :process_group
|
24
19
|
@form = form(ParticipatoryProcessGroupForm).instance
|
@@ -31,7 +26,7 @@ module Decidim
|
|
31
26
|
CreateParticipatoryProcessGroup.call(@form) do
|
32
27
|
on(:ok) do |participatory_process_group|
|
33
28
|
flash[:notice] = I18n.t("participatory_processes_group.create.success", scope: "decidim.admin")
|
34
|
-
redirect_to
|
29
|
+
redirect_to edit_participatory_process_group_path(participatory_process_group)
|
35
30
|
end
|
36
31
|
|
37
32
|
on(:invalid) do
|
@@ -56,7 +51,7 @@ module Decidim
|
|
56
51
|
UpdateParticipatoryProcessGroup.call(@participatory_process_group, @form) do
|
57
52
|
on(:ok) do |participatory_process_group|
|
58
53
|
flash[:notice] = I18n.t("participatory_process_groups.update.success", scope: "decidim.admin")
|
59
|
-
redirect_to
|
54
|
+
redirect_to edit_participatory_process_group_path(participatory_process_group)
|
60
55
|
end
|
61
56
|
|
62
57
|
on(:invalid) do
|
@@ -7,10 +7,11 @@ module Decidim
|
|
7
7
|
#
|
8
8
|
class ParticipatoryProcessUserRolesController < Decidim::Admin::ApplicationController
|
9
9
|
include Concerns::ParticipatoryProcessAdmin
|
10
|
+
include Decidim::Admin::Officializations::Filterable
|
10
11
|
|
11
12
|
def index
|
12
13
|
enforce_permission_to :read, :process_user_role
|
13
|
-
@participatory_process_user_roles =
|
14
|
+
@participatory_process_user_roles = filtered_collection
|
14
15
|
end
|
15
16
|
|
16
17
|
def new
|
@@ -90,11 +91,18 @@ module Decidim
|
|
90
91
|
|
91
92
|
private
|
92
93
|
|
94
|
+
def search_field_predicate
|
95
|
+
:name_or_nickname_or_email_cont
|
96
|
+
end
|
97
|
+
|
98
|
+
def filters
|
99
|
+
[:invitation_accepted_at_present, :last_sign_in_at_present]
|
100
|
+
end
|
101
|
+
|
93
102
|
def collection
|
94
103
|
@collection ||= Decidim::ParticipatoryProcessUserRole
|
95
|
-
.
|
96
|
-
.where(participatory_process: current_participatory_process)
|
97
|
-
.order(:role, "decidim_users.name")
|
104
|
+
.joins(:user)
|
105
|
+
.where(participatory_process: current_participatory_process) # .order(:role, "decidim_users.name")
|
98
106
|
end
|
99
107
|
end
|
100
108
|
end
|
@@ -73,7 +73,7 @@ module Decidim
|
|
73
73
|
end
|
74
74
|
|
75
75
|
def promoted_participatory_process_groups
|
76
|
-
@promoted_participatory_process_groups ||=
|
76
|
+
@promoted_participatory_process_groups ||= OrganizationPromotedParticipatoryProcessGroups.new(current_organization)
|
77
77
|
end
|
78
78
|
|
79
79
|
def promoted_collection
|
@@ -89,12 +89,12 @@ module Decidim
|
|
89
89
|
end
|
90
90
|
|
91
91
|
def participatory_processes
|
92
|
-
@participatory_processes ||= filtered_processes.groupless
|
92
|
+
@participatory_processes ||= filtered_processes.groupless.includes(attachments: :file_attachment)
|
93
93
|
end
|
94
94
|
|
95
95
|
def participatory_process_groups
|
96
|
-
@participatory_process_groups ||=
|
97
|
-
|
96
|
+
@participatory_process_groups ||= OrganizationParticipatoryProcessGroups.new(current_organization).query
|
97
|
+
.where(id: filtered_processes.grouped.group_ids)
|
98
98
|
end
|
99
99
|
|
100
100
|
def stats
|
@@ -20,6 +20,26 @@ module Decidim
|
|
20
20
|
Decidim::ParticipatoryProcesses::AdminLog::ParticipatoryProcessUserRolePresenter
|
21
21
|
end
|
22
22
|
|
23
|
+
ransacker :name do
|
24
|
+
Arel.sql(%{("decidim_users"."name")::text})
|
25
|
+
end
|
26
|
+
|
27
|
+
ransacker :nickname do
|
28
|
+
Arel.sql(%{("decidim_users"."nickname")::text})
|
29
|
+
end
|
30
|
+
|
31
|
+
ransacker :email do
|
32
|
+
Arel.sql(%{("decidim_users"."email")::text})
|
33
|
+
end
|
34
|
+
|
35
|
+
ransacker :invitation_accepted_at do
|
36
|
+
Arel.sql(%{("decidim_users"."invitation_accepted_at")::text})
|
37
|
+
end
|
38
|
+
|
39
|
+
ransacker :last_sign_in_at do
|
40
|
+
Arel.sql(%{("decidim_users"."last_sign_in_at")::text})
|
41
|
+
end
|
42
|
+
|
23
43
|
private
|
24
44
|
|
25
45
|
# Private: check if the process and the user have the same organization
|
@@ -0,0 +1,16 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module ParticipatoryProcesses
|
5
|
+
# This query class filters participatory process groups given an organization.
|
6
|
+
class OrganizationPromotedParticipatoryProcessGroups < Rectify::Query
|
7
|
+
def initialize(organization)
|
8
|
+
@organization = organization
|
9
|
+
end
|
10
|
+
|
11
|
+
def query
|
12
|
+
PromotedParticipatoryProcessGroups.new.query.where(organization: @organization)
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
@@ -19,7 +19,7 @@ module Decidim
|
|
19
19
|
query.upcoming.order(start_date: :asc)
|
20
20
|
else # Assume 'all'
|
21
21
|
timezone = ActiveSupport::TimeZone.find_tzinfo(Time.zone.name).identifier
|
22
|
-
query.order(Arel.sql("ABS(start_date - (CURRENT_DATE at time zone '#{timezone}')::date)"))
|
22
|
+
query.order(Arel.sql("ABS(start_date - (CURRENT_DATE at time zone '#{timezone}')::date)").to_s)
|
23
23
|
end
|
24
24
|
end
|
25
25
|
end
|
data/app/views/decidim/participatory_processes/admin/participatory_process_groups/index.html.erb
CHANGED
@@ -29,7 +29,7 @@
|
|
29
29
|
<tr>
|
30
30
|
<td>
|
31
31
|
<% if group.promoted? %>
|
32
|
-
<span data-tooltip class="icon-state icon-highlight"
|
32
|
+
<span data-tooltip class="icon-state icon-highlight" data-disable-hover="false" title="<%= t("models.participatory_process.fields.promoted", scope: "decidim.admin") %>">
|
33
33
|
<%= icon "star" %>
|
34
34
|
</span>
|
35
35
|
<% end %>
|
data/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/index.html.erb
CHANGED
@@ -9,17 +9,17 @@
|
|
9
9
|
<% end %>
|
10
10
|
</h2>
|
11
11
|
</div>
|
12
|
-
|
12
|
+
<%= admin_filter_selector %>
|
13
13
|
<div class="card-section">
|
14
14
|
<div class="table-scroll">
|
15
|
-
<table class="stack">
|
15
|
+
<table class="stack table-list">
|
16
16
|
<thead>
|
17
17
|
<tr>
|
18
|
-
<th><%= t("models.participatory_process_user_role.fields.name", scope: "decidim.admin") %></th>
|
19
|
-
<th><%= t("models.participatory_process_user_role.fields.email", scope: "decidim.admin") %></th>
|
20
|
-
<th><%= t("models.user.fields.
|
21
|
-
<th><%= t("models.user.fields.invitation_accepted_at", scope: "decidim.admin") %></th>
|
22
|
-
<th><%= t("models.participatory_process_user_role.fields.role", scope: "decidim.admin") %></th>
|
18
|
+
<th><%= sort_link(query, :name,t("models.participatory_process_user_role.fields.name", scope: "decidim.admin"), default_order: :desc) %></th>
|
19
|
+
<th><%= sort_link(query, :email, t("models.participatory_process_user_role.fields.email", scope: "decidim.admin"), default_order: :desc) %></th>
|
20
|
+
<th><%= sort_link(query, :last_sign_in_at, t("models.user.fields.last_sign_in_at", scope: "decidim.admin"), default_order: :desc) %></th>
|
21
|
+
<th><%= sort_link(query, :invitation_accepted_at, t("models.user.fields.invitation_accepted_at", scope: "decidim.admin"), default_order: :desc) %></th>
|
22
|
+
<th><%= sort_link(query, :role, t("models.participatory_process_user_role.fields.role", scope: "decidim.admin"), default_order: :desc) %></th>
|
23
23
|
<th class="actions"></th>
|
24
24
|
</tr>
|
25
25
|
</thead>
|
@@ -70,7 +70,7 @@
|
|
70
70
|
<tr>
|
71
71
|
<td>
|
72
72
|
<% if process.promoted? %>
|
73
|
-
<span data-tooltip class="icon-state icon-highlight"
|
73
|
+
<span data-tooltip class="icon-state icon-highlight" data-disable-hover="false" title="<%= t("models.participatory_process.fields.promoted", scope: "decidim.admin") %>">
|
74
74
|
<%= icon "star" %>
|
75
75
|
</span>
|
76
76
|
<% end %>
|
data/app/views/decidim/participatory_processes/participatory_processes/_promoted_process.html.erb
CHANGED
@@ -5,7 +5,7 @@
|
|
5
5
|
<%= link_to participatory_process_path(promoted_process), class: "card__link" do %>
|
6
6
|
<h2 class="card__title"><%= decidim_html_escape(translated_attribute(promoted_process.title)).html_safe %></h2>
|
7
7
|
<% end %>
|
8
|
-
<%=
|
8
|
+
<%= decidim_sanitize_editor html_truncate(translated_attribute(promoted_process.short_description), length: 630, separator: "...") %>
|
9
9
|
<%= link_to participatory_process_path(promoted_process), class: "button small hollow card__button" do %>
|
10
10
|
<span class="show-for-sr"><%= decidim_html_escape(translated_attribute(promoted_process.title)) %></span>
|
11
11
|
<%= t("participatory_processes.promoted_process.more_info", scope: "layouts.decidim") %>
|
@@ -6,7 +6,7 @@
|
|
6
6
|
<%= link_to participatory_process_group_path(promoted_process_group), class: "card__link" do %>
|
7
7
|
<h2 class="card__title"><%= decidim_html_escape(translated_attribute(promoted_process_group.title)) %></h2>
|
8
8
|
<% end %>
|
9
|
-
<%=
|
9
|
+
<%= decidim_sanitize_editor html_truncate(translated_attribute(promoted_process_group.description), length: 630, separator: "...") %>
|
10
10
|
<%= link_to participatory_process_group_path(promoted_process_group), class: "button small hollow card__button" do %>
|
11
11
|
<span class="show-for-sr"><%= decidim_html_escape(translated_attribute(promoted_process_group.title)) %></span>
|
12
12
|
<%= t("participatory_processes.promoted_process_group.more_info", scope: "layouts.decidim") %>
|
@@ -31,9 +31,9 @@
|
|
31
31
|
<%= render partial: "participatory_process_group" %>
|
32
32
|
<% end %>
|
33
33
|
<div class="lead">
|
34
|
-
<%=
|
34
|
+
<%= decidim_sanitize_editor translated_attribute(current_participatory_space.short_description) %>
|
35
35
|
</div>
|
36
|
-
<%=
|
36
|
+
<%= decidim_sanitize_editor translated_attribute(current_participatory_space.description) %>
|
37
37
|
</div>
|
38
38
|
<%= attachments_for current_participatory_space %>
|
39
39
|
<%= render_hook(:participatory_space_highlighted_elements) %>
|
@@ -143,7 +143,7 @@
|
|
143
143
|
</div>
|
144
144
|
|
145
145
|
<% if current_participatory_space.show_statistics? %>
|
146
|
-
|
146
|
+
<%= cell "decidim/statistics", stats.collection %>
|
147
147
|
<% end %>
|
148
148
|
|
149
149
|
<% if current_participatory_space.show_metrics? %>
|
data/config/locales/fi.yml
CHANGED
data/config/locales/fr.yml
CHANGED
@@ -71,8 +71,8 @@ fr:
|
|
71
71
|
activerecord:
|
72
72
|
models:
|
73
73
|
decidim/participatory_process:
|
74
|
-
one:
|
75
|
-
other:
|
74
|
+
one: Concertation
|
75
|
+
other: Concertations
|
76
76
|
decidim/participatory_process_group:
|
77
77
|
one: Groupe de concertations
|
78
78
|
other: Groupes de concertations
|
@@ -225,13 +225,13 @@ fr:
|
|
225
225
|
destroy:
|
226
226
|
success: Utilisateur supprimé avec succès de cette concertation.
|
227
227
|
edit:
|
228
|
-
title: Mettre à jour l'administrateur
|
228
|
+
title: Mettre à jour l'administrateur de la concertation
|
229
229
|
update: Mettre à jour
|
230
230
|
index:
|
231
231
|
process_admins_title: Administrateurs de la concertation
|
232
232
|
new:
|
233
233
|
create: Créer
|
234
|
-
title: Nouvel administrateur
|
234
|
+
title: Nouvel administrateur de la concertation
|
235
235
|
update:
|
236
236
|
error: Une erreur s'est produite lors de la mise à jour d'un utilisateur pour cette concertation.
|
237
237
|
success: L'utilisateur a été mis à jour avec succès pour cette concertation.
|
@@ -288,10 +288,10 @@ fr:
|
|
288
288
|
events:
|
289
289
|
participatory_process:
|
290
290
|
role_assigned:
|
291
|
-
email_intro: Vous avez été assigné en tant que %{role} pour
|
292
|
-
email_outro: Vous avez reçu cette notification parce que vous êtes %{role}
|
291
|
+
email_intro: Vous avez été assigné en tant que %{role} pour la concertation "%{resource_title}".
|
292
|
+
email_outro: Vous avez reçu cette notification parce que vous êtes %{role} de la concertation "%{resource_title}".
|
293
293
|
email_subject: Vous avez été assigné comme %{role} pour "%{resource_title}".
|
294
|
-
notification_title: Vous avez été assigné en tant que %{role} pour
|
294
|
+
notification_title: Vous avez été assigné en tant que %{role} pour la concertation <a href="%{resource_url}">%{resource_title}</a>.
|
295
295
|
step_activated:
|
296
296
|
email_intro: 'L''étape %{resource_title} vient d''être activée pour %{participatory_space_title}. Vous pouvez désormais la consulter sur cette page :'
|
297
297
|
email_outro: Vous venez de recevoir cette notification car vous suivez %{participatory_space_title}. Vous pouvez à tout moment arrêter de recevoir ces notifications en suivant le lien précédent.
|
@@ -305,8 +305,8 @@ fr:
|
|
305
305
|
help:
|
306
306
|
participatory_spaces:
|
307
307
|
participatory_processes:
|
308
|
-
contextual: "<p>
|
309
|
-
page: "<p>
|
308
|
+
contextual: "<p>Une <strong>concertation</strong> est une séquence d'activités de participation (par exemple remplir un sondage, puis faire des propositions, les discuter en face-à-face ou en ligne, et enfin les hiérarchiser) dans le but de définir et de prendre une décision sur un sujet spécifique.</p> <p>Exemples de processus participatifs: un processus d’élection des membres du comité (où les candidatures sont d'abord présentées, puis débattues et finalement une candidature est choisie), les budgets participatifs (où les propositions sont faites, évaluées économiquement et votées selon l'argent disponible), un processus de planification stratégique, la rédaction collaborative d'un règlement ou d'une norme, la conception d'un espace urbain ou la production d'un plan de politique publique.</p>\n"
|
309
|
+
page: "<p>Une <strong>concertation</strong> est une séquence d'activités de participation (par exemple remplir un sondage, puis faire des propositions, les discuter en face-à-face ou en ligne, et enfin les hiérarchiser) dans le but de définir et de prendre une décision sur un sujet spécifique.</p> <p>Exemples de processus participatifs: un processus d’élection des membres du comité (où les candidatures sont d'abord présentées, puis débattues et finalement une candidature est choisie), les budgets participatifs (où les propositions sont faites, évaluées économiquement et votées selon l'argent disponible), un processus de planification stratégique, la rédaction collaborative d'un règlement ou d'une norme, la conception d'un espace urbain ou la production d'un plan de politique publique.</p>\n"
|
310
310
|
title: Qu'est-ce qu'une concertation ?
|
311
311
|
menu:
|
312
312
|
processes: Concertations
|
@@ -327,7 +327,7 @@ fr:
|
|
327
327
|
html_3:
|
328
328
|
name: Bloc HTML 3
|
329
329
|
metadata:
|
330
|
-
developer_group:
|
330
|
+
developer_group: Mis en avant par
|
331
331
|
name: Métadonnées
|
332
332
|
participatory_scope: Objectifs
|
333
333
|
participatory_structure: Modalités de décision
|
@@ -427,9 +427,9 @@ fr:
|
|
427
427
|
no_active_nor_upcoming: Aucune concertation active ni à venir
|
428
428
|
no_active_nor_upcoming_callout: Il n'y a pas de concertations actives ni à venir. Voici une liste des concertations passées.
|
429
429
|
names:
|
430
|
-
active:
|
431
|
-
all:
|
432
|
-
past:
|
430
|
+
active: Actives
|
431
|
+
all: Toutes
|
432
|
+
past: Passées
|
433
433
|
upcoming: À venir
|
434
434
|
see: Voir
|
435
435
|
index:
|
data/config/locales/ja.yml
CHANGED
@@ -84,7 +84,7 @@ ja:
|
|
84
84
|
configure: 設定
|
85
85
|
confirm_destroy: 削除の確認
|
86
86
|
destroy: 削除
|
87
|
-
duplicate:
|
87
|
+
duplicate: 複製
|
88
88
|
edit: 編集
|
89
89
|
filter:
|
90
90
|
all_processes: すべての参加型プロセスを表示
|
@@ -142,9 +142,9 @@ ja:
|
|
142
142
|
name: 参加型プロセス管理者
|
143
143
|
roles:
|
144
144
|
admin: 管理者
|
145
|
-
collaborator:
|
145
|
+
collaborator: コラボレーター
|
146
146
|
moderator: モデレーター
|
147
|
-
valuator:
|
147
|
+
valuator: 評価者
|
148
148
|
user:
|
149
149
|
fields:
|
150
150
|
invitation_accepted_at: 招待が承認されました
|
data/config/locales/lb-LU.yml
CHANGED
@@ -1 +1,109 @@
|
|
1
1
|
lb:
|
2
|
+
activemodel:
|
3
|
+
attributes:
|
4
|
+
participatory_process:
|
5
|
+
announcement: Ukënnegung
|
6
|
+
area_id: Bereich
|
7
|
+
banner_image: Banner-Bild
|
8
|
+
copy_categories: Kategorien kopieren
|
9
|
+
copy_components: Komponenten kopieren
|
10
|
+
copy_steps: Phasen kopieren
|
11
|
+
decidim_area_id: Bereich
|
12
|
+
description: Beschreibung
|
13
|
+
developer_group: Promoter-Gruppe
|
14
|
+
domain: Domäne
|
15
|
+
end_date: Enddatum
|
16
|
+
hashtag: Hashtag
|
17
|
+
hero_image: Hauptbild
|
18
|
+
local_area: Organisationsbereich
|
19
|
+
meta_scope: Bereichs-Metadaten
|
20
|
+
participatory_process_group_id: Prozessgruppe
|
21
|
+
participatory_scope: Was wird entschieden
|
22
|
+
participatory_structure: Wie wird es entschieden
|
23
|
+
promoted: Hervorgehoben
|
24
|
+
published_at: Veröffentlicht unter
|
25
|
+
related_process_ids: Ähnliche Beteiligungsprozesse
|
26
|
+
scope_id: Themenbereich
|
27
|
+
scope_type_max_depth_id: Umfang-Filtertiefe
|
28
|
+
scopes_enabled: Themenbereiche aktiviert
|
29
|
+
short_description: Kurzbeschreibung
|
30
|
+
show_metrics: Metriken anzeigen
|
31
|
+
show_statistics: Statistiken anzeigen
|
32
|
+
slug: URL-Slug
|
33
|
+
start_date: Ufanksdatum
|
34
|
+
subtitle: Ënnertitel
|
35
|
+
target: Wer nimmt teil
|
36
|
+
title: Titel
|
37
|
+
weight: Bestellposition
|
38
|
+
participatory_process_group:
|
39
|
+
description: Beschreibung
|
40
|
+
developer_group: Gruppe der Unterstützer
|
41
|
+
group_url: Website
|
42
|
+
hashtag: Hashtag
|
43
|
+
hero_image: Bild
|
44
|
+
local_area: Organisationsbereich
|
45
|
+
meta_scope: Informationen zum Bereich
|
46
|
+
participatory_process_ids: Ähnliche Beteiligungsprozesse
|
47
|
+
participatory_scope: Was wird entschieden
|
48
|
+
participatory_structure: Wie wird es entschieden
|
49
|
+
target: Wer nimmt teil
|
50
|
+
title: Titel
|
51
|
+
participatory_process_step:
|
52
|
+
cta_path: '"Call to Action"-Pfad'
|
53
|
+
cta_text: Call to Action-Text
|
54
|
+
description: Beschreibung
|
55
|
+
end_date: Enddatum
|
56
|
+
short_description: Kurzbeschreibung
|
57
|
+
decidim:
|
58
|
+
admin:
|
59
|
+
models:
|
60
|
+
participatory_process_step:
|
61
|
+
fields:
|
62
|
+
end_date: Enddatum
|
63
|
+
start_date: Ufanksdatum
|
64
|
+
title: Titel
|
65
|
+
name: Beteiligungsprozess Phase
|
66
|
+
participatory_process_user_role:
|
67
|
+
fields:
|
68
|
+
email: E-Mail
|
69
|
+
name: Numm
|
70
|
+
role: Rolle
|
71
|
+
name: Partizipativer Prozessbenutzer
|
72
|
+
roles:
|
73
|
+
admin: Administrator
|
74
|
+
collaborator: Mitarbeiter
|
75
|
+
moderator: Moderator
|
76
|
+
valuator: Schätzer
|
77
|
+
user:
|
78
|
+
fields:
|
79
|
+
invitation_accepted_at: Einladung akzeptiert am
|
80
|
+
invitation_sent_at: Einladung gesendet am
|
81
|
+
participatory_process_copies:
|
82
|
+
new:
|
83
|
+
copy: Kopieren
|
84
|
+
select: Wählen Sie aus, welche Daten Sie duplizieren möchten
|
85
|
+
title: Beteiligungsprozess duplizieren
|
86
|
+
participatory_process_group_landing_page:
|
87
|
+
edit:
|
88
|
+
active_content_blocks: Aktive Inhaltsblöcke
|
89
|
+
inactive_content_blocks: Inaktive Inhaltsblöcke
|
90
|
+
participatory_process_group_landing_page_content_blocks:
|
91
|
+
edit:
|
92
|
+
update: Aktualisieren
|
93
|
+
participatory_process_groups:
|
94
|
+
destroy:
|
95
|
+
error: Beim Löschen der Beteiligungsprozessgruppe ist ein Fehler aufgetreten.
|
96
|
+
success: Beteiligungsprozess erfolgreich gelöscht.
|
97
|
+
edit:
|
98
|
+
title: Prozessgruppe bearbeiten
|
99
|
+
update: Aktualisieren
|
100
|
+
new:
|
101
|
+
create: Erstellen
|
102
|
+
title: Neue Prozessgruppe
|
103
|
+
update:
|
104
|
+
error: Beim Aktualisieren dieser partizipativen Prozessgruppe ist ein Fehler aufgetreten.
|
105
|
+
success: Partizipative Prozessgruppe wurde erfolgreich aktualisiert.
|
106
|
+
participatory_process_groups:
|
107
|
+
content_blocks:
|
108
|
+
stats:
|
109
|
+
name: Aktivität
|
data/config/locales/pt-BR.yml
CHANGED
@@ -0,0 +1 @@
|
|
1
|
+
val:
|
@@ -145,7 +145,7 @@ module Decidim
|
|
145
145
|
|
146
146
|
Decidim.content_blocks.register(:participatory_process_group_homepage, :highlighted_meetings) do |content_block|
|
147
147
|
content_block.cell = "decidim/meetings/content_blocks/highlighted_meetings"
|
148
|
-
content_block.public_name_key = "decidim.meetings.content_blocks.
|
148
|
+
content_block.public_name_key = "decidim.meetings.content_blocks.upcoming_meetings.name"
|
149
149
|
content_block.default!
|
150
150
|
end
|
151
151
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: decidim-participatory_processes
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.26.0.rc1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Josep Jaume Rey Peroy
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date:
|
13
|
+
date: 2022-01-24 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: decidim-core
|
@@ -18,56 +18,56 @@ dependencies:
|
|
18
18
|
requirements:
|
19
19
|
- - '='
|
20
20
|
- !ruby/object:Gem::Version
|
21
|
-
version: 0.
|
21
|
+
version: 0.26.0.rc1
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
25
25
|
requirements:
|
26
26
|
- - '='
|
27
27
|
- !ruby/object:Gem::Version
|
28
|
-
version: 0.
|
28
|
+
version: 0.26.0.rc1
|
29
29
|
- !ruby/object:Gem::Dependency
|
30
30
|
name: decidim-admin
|
31
31
|
requirement: !ruby/object:Gem::Requirement
|
32
32
|
requirements:
|
33
33
|
- - '='
|
34
34
|
- !ruby/object:Gem::Version
|
35
|
-
version: 0.
|
35
|
+
version: 0.26.0.rc1
|
36
36
|
type: :development
|
37
37
|
prerelease: false
|
38
38
|
version_requirements: !ruby/object:Gem::Requirement
|
39
39
|
requirements:
|
40
40
|
- - '='
|
41
41
|
- !ruby/object:Gem::Version
|
42
|
-
version: 0.
|
42
|
+
version: 0.26.0.rc1
|
43
43
|
- !ruby/object:Gem::Dependency
|
44
44
|
name: decidim-dev
|
45
45
|
requirement: !ruby/object:Gem::Requirement
|
46
46
|
requirements:
|
47
47
|
- - '='
|
48
48
|
- !ruby/object:Gem::Version
|
49
|
-
version: 0.
|
49
|
+
version: 0.26.0.rc1
|
50
50
|
type: :development
|
51
51
|
prerelease: false
|
52
52
|
version_requirements: !ruby/object:Gem::Requirement
|
53
53
|
requirements:
|
54
54
|
- - '='
|
55
55
|
- !ruby/object:Gem::Version
|
56
|
-
version: 0.
|
56
|
+
version: 0.26.0.rc1
|
57
57
|
- !ruby/object:Gem::Dependency
|
58
58
|
name: decidim-meetings
|
59
59
|
requirement: !ruby/object:Gem::Requirement
|
60
60
|
requirements:
|
61
61
|
- - '='
|
62
62
|
- !ruby/object:Gem::Version
|
63
|
-
version: 0.
|
63
|
+
version: 0.26.0.rc1
|
64
64
|
type: :development
|
65
65
|
prerelease: false
|
66
66
|
version_requirements: !ruby/object:Gem::Requirement
|
67
67
|
requirements:
|
68
68
|
- - '='
|
69
69
|
- !ruby/object:Gem::Version
|
70
|
-
version: 0.
|
70
|
+
version: 0.26.0.rc1
|
71
71
|
description: Participatory processes component for decidim.
|
72
72
|
email:
|
73
73
|
- josepjaume@gmail.com
|
@@ -219,6 +219,7 @@ files:
|
|
219
219
|
- app/queries/decidim/participatory_processes/organization_participatory_processes.rb
|
220
220
|
- app/queries/decidim/participatory_processes/organization_prioritized_participatory_process_groups.rb
|
221
221
|
- app/queries/decidim/participatory_processes/organization_prioritized_participatory_processes.rb
|
222
|
+
- app/queries/decidim/participatory_processes/organization_promoted_participatory_process_groups.rb
|
222
223
|
- app/queries/decidim/participatory_processes/organization_published_participatory_processes.rb
|
223
224
|
- app/queries/decidim/participatory_processes/participatory_processes_by_group.rb
|
224
225
|
- app/queries/decidim/participatory_processes/prioritized_participatory_processes.rb
|
@@ -241,7 +242,6 @@ files:
|
|
241
242
|
- app/views/decidim/participatory_processes/admin/participatory_process_groups/edit.html.erb
|
242
243
|
- app/views/decidim/participatory_processes/admin/participatory_process_groups/index.html.erb
|
243
244
|
- app/views/decidim/participatory_processes/admin/participatory_process_groups/new.html.erb
|
244
|
-
- app/views/decidim/participatory_processes/admin/participatory_process_groups/show.html.erb
|
245
245
|
- app/views/decidim/participatory_processes/admin/participatory_process_imports/_form.html.erb
|
246
246
|
- app/views/decidim/participatory_processes/admin/participatory_process_imports/new.html.erb
|
247
247
|
- app/views/decidim/participatory_processes/admin/participatory_process_steps/_form.html.erb
|
@@ -346,6 +346,7 @@ files:
|
|
346
346
|
- config/locales/ti-ER.yml
|
347
347
|
- config/locales/tr-TR.yml
|
348
348
|
- config/locales/uk.yml
|
349
|
+
- config/locales/val-ES.yml
|
349
350
|
- config/locales/vi-VN.yml
|
350
351
|
- config/locales/vi.yml
|
351
352
|
- config/locales/zh-CN.yml
|
@@ -429,11 +430,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
429
430
|
version: '2.7'
|
430
431
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
431
432
|
requirements:
|
432
|
-
- - "
|
433
|
+
- - ">"
|
433
434
|
- !ruby/object:Gem::Version
|
434
|
-
version:
|
435
|
+
version: 1.3.1
|
435
436
|
requirements: []
|
436
|
-
rubygems_version: 3.1.
|
437
|
+
rubygems_version: 3.1.6
|
437
438
|
signing_key:
|
438
439
|
specification_version: 4
|
439
440
|
summary: Decidim participatory processes module
|
data/app/views/decidim/participatory_processes/admin/participatory_process_groups/show.html.erb
DELETED
@@ -1,30 +0,0 @@
|
|
1
|
-
<dl>
|
2
|
-
<%= display_for participatory_process_group,
|
3
|
-
:title,
|
4
|
-
:description,
|
5
|
-
:hashtag,
|
6
|
-
:group_url,
|
7
|
-
:developer_group,
|
8
|
-
:local_area,
|
9
|
-
:meta_scope,
|
10
|
-
:target,
|
11
|
-
:participatory_scope,
|
12
|
-
:participatory_structure %>
|
13
|
-
|
14
|
-
<dt><%= display_label(participatory_process_group, :participatory_processes) %></dt>
|
15
|
-
<% if participatory_process_group.participatory_processes.any? %>
|
16
|
-
<dd>
|
17
|
-
<ul>
|
18
|
-
<% participatory_process_group.participatory_processes.each do |participatory_process| %>
|
19
|
-
<li><%= translated_attribute participatory_process.title %></li>
|
20
|
-
<% end %>
|
21
|
-
</ul>
|
22
|
-
</dd>
|
23
|
-
<% end %>
|
24
|
-
<dt><%= display_label(participatory_process_group, :hero_image) %></dt>
|
25
|
-
<dd>
|
26
|
-
<% if participatory_process_group.hero_image.attached? %>
|
27
|
-
<%= image_tag participatory_process_group.attached_uploader(:hero_image).path %>
|
28
|
-
<% end %>
|
29
|
-
</dd>
|
30
|
-
</dl>
|