decidim-meetings 0.0.8.1 → 0.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/controllers/decidim/meetings/meeting_widgets_controller.rb +1 -0
- data/app/controllers/decidim/meetings/meetings_controller.rb +8 -8
- data/app/helpers/decidim/meetings/map_helper.rb +9 -9
- data/app/models/decidim/meetings/meeting.rb +1 -1
- data/app/views/decidim/meetings/meeting_widgets/show.html.erb +8 -17
- data/config/locales/fr.yml +95 -1
- data/lib/decidim/meetings/feature.rb +7 -0
- metadata +12 -12
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 10310591e17cdbc120f83562dcd1d1bebe7b77b0
|
|
4
|
+
data.tar.gz: dd60ae30b8c198b4ba74096c707542865c3b4414
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 720a4ae74c3c839f239a4a56b4dd87b12820c21331f4d49296700a466c304a24b59054461778f85401ecbc9f2c50718af492970bfe1f27122233f7538a4b3c26
|
|
7
|
+
data.tar.gz: a647e5ad326579a4ec12789b7e474d8a9927c46e845c1d57b75c068d163e20089f17505f41a1a8494a0a6df6ada1bf83b9c349829769cf3e870d41b4bb921dc1
|
|
@@ -11,14 +11,14 @@ module Decidim
|
|
|
11
11
|
helper_method :meetings, :geocoded_meetings, :meeting
|
|
12
12
|
|
|
13
13
|
def index
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
14
|
+
return unless search.results.empty? && params.dig("filter", "date") != "past"
|
|
15
|
+
|
|
16
|
+
@past_meetings = search_klass.new(search_params.merge(date: "past"))
|
|
17
|
+
unless @past_meetings.results.empty?
|
|
18
|
+
params[:filter] ||= {}
|
|
19
|
+
params[:filter][:date] = "past"
|
|
20
|
+
@forced_past_meetings = true
|
|
21
|
+
@search = @past_meetings
|
|
22
22
|
end
|
|
23
23
|
end
|
|
24
24
|
|
|
@@ -9,15 +9,15 @@ module Decidim
|
|
|
9
9
|
def meetings_data_for_map(geocoded_meetings)
|
|
10
10
|
geocoded_meetings.map do |meeting|
|
|
11
11
|
meeting.slice(:latitude, :longitude, :address).merge(title: translated_attribute(meeting.title),
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
12
|
+
description: translated_attribute(meeting.description),
|
|
13
|
+
startTimeDay: l(meeting.start_time, format: "%d"),
|
|
14
|
+
startTimeMonth: l(meeting.start_time, format: "%B"),
|
|
15
|
+
startTimeYear: l(meeting.start_time, format: "%Y"),
|
|
16
|
+
startTime: "#{meeting.start_time.strftime("%H:%M")} - #{meeting.end_time.strftime("%H:%M")}",
|
|
17
|
+
icon: icon("meetings", width: 40, height: 70, remove_icon_class: true),
|
|
18
|
+
location: translated_attribute(meeting.location),
|
|
19
|
+
locationHints: translated_attribute(meeting.location_hints),
|
|
20
|
+
link: meeting_path(meeting))
|
|
21
21
|
end
|
|
22
22
|
end
|
|
23
23
|
end
|
|
@@ -16,7 +16,7 @@ module Decidim
|
|
|
16
16
|
|
|
17
17
|
validates :title, presence: true
|
|
18
18
|
|
|
19
|
-
geocoded_by :address, http_headers:
|
|
19
|
+
geocoded_by :address, http_headers: ->(proposal) { { "Referer" => proposal.feature.organization.host } }
|
|
20
20
|
|
|
21
21
|
def closed?
|
|
22
22
|
closed_at.present?
|
|
@@ -1,18 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
<%= render partial: "decidim/meetings/meetings/tags", locals: { meeting: model } %>
|
|
10
|
-
<div class="address card__extra">
|
|
11
|
-
<div class="address__icon">
|
|
12
|
-
<%= icon "meetings", remove_icon_class: true, width: 40, height: 70 %>
|
|
13
|
-
</div>
|
|
14
|
-
<%= render partial: "decidim/shared/address_details", locals: { icon_name: "meetings", geolocalizable: model } %>
|
|
15
|
-
</div>
|
|
16
|
-
</div>
|
|
17
|
-
</article>
|
|
1
|
+
<%= content_for(:title, translated_attribute(model.title)) %>
|
|
2
|
+
<%= render partial: "decidim/meetings/meetings/datetime", locals: { meeting: model } %>
|
|
3
|
+
<%== translated_attribute model.description %>
|
|
4
|
+
<div class="address card__extra">
|
|
5
|
+
<div class="address__icon">
|
|
6
|
+
<%= icon "meetings", remove_icon_class: true, width: 40, height: 70 %>
|
|
7
|
+
</div>
|
|
8
|
+
<%= render partial: "decidim/shared/address_details", locals: { icon_name: "meetings", geolocalizable: model } %>
|
|
18
9
|
</div>
|
data/config/locales/fr.yml
CHANGED
|
@@ -2,4 +2,98 @@ fr:
|
|
|
2
2
|
activemodel:
|
|
3
3
|
attributes:
|
|
4
4
|
close_meeting:
|
|
5
|
-
attendees_count: Nombre de participants
|
|
5
|
+
attendees_count: Nombre de participants
|
|
6
|
+
attending_organizations: Liste des organisations qui ont assisté à la rencontre
|
|
7
|
+
closing_report: Signaler
|
|
8
|
+
contributions_count: Nombre de contributions
|
|
9
|
+
proposal_ids: Propositions créées lors de la rencontre
|
|
10
|
+
meeting:
|
|
11
|
+
address: Adresse
|
|
12
|
+
decidim_category_id: Catégorie
|
|
13
|
+
decidim_scope_id: Domaine d'application
|
|
14
|
+
description: Description
|
|
15
|
+
end_time: Heure de fin
|
|
16
|
+
location: Lieu
|
|
17
|
+
location_hints: Indicateurs d’emplacement
|
|
18
|
+
start_time: Heure de début
|
|
19
|
+
title: Titre
|
|
20
|
+
decidim:
|
|
21
|
+
features:
|
|
22
|
+
meetings:
|
|
23
|
+
name: Rencontres
|
|
24
|
+
meetings:
|
|
25
|
+
actions:
|
|
26
|
+
attachments: Documents liés
|
|
27
|
+
close: Fermer
|
|
28
|
+
confirm_destroy: Êtes-vous sûr de vouloir supprimer cette rencontre?
|
|
29
|
+
destroy: Supprimer
|
|
30
|
+
edit: Modifier
|
|
31
|
+
new: Nouveau
|
|
32
|
+
preview: Aperçu
|
|
33
|
+
title: Actions
|
|
34
|
+
admin:
|
|
35
|
+
meeting_closes:
|
|
36
|
+
edit:
|
|
37
|
+
close: Fermer
|
|
38
|
+
title: Clore la rencontre
|
|
39
|
+
meetings:
|
|
40
|
+
close:
|
|
41
|
+
invalid: Il y a eu un problème au moment de clore cette réunion
|
|
42
|
+
success: Rencontre cloturée avec succès
|
|
43
|
+
create:
|
|
44
|
+
invalid: Il y a eu un problème lors de la création de cette rencontre
|
|
45
|
+
success: Rencontre créée avec succès
|
|
46
|
+
destroy:
|
|
47
|
+
success: La rencontre a été supprimée avec succès
|
|
48
|
+
edit:
|
|
49
|
+
update: Mettre à jour
|
|
50
|
+
index:
|
|
51
|
+
title: Rencontres
|
|
52
|
+
new:
|
|
53
|
+
create: Créer
|
|
54
|
+
title: Créer une rencontre
|
|
55
|
+
update:
|
|
56
|
+
invalid: Il y a eu un problème lors de la mise à jour de cette rencontre
|
|
57
|
+
success: Réncontre mise à jour avec succès
|
|
58
|
+
models:
|
|
59
|
+
meeting:
|
|
60
|
+
name: Rencontre
|
|
61
|
+
meetings:
|
|
62
|
+
filters:
|
|
63
|
+
category: Catégorie
|
|
64
|
+
category_prompt: Sélectionner une catégorie
|
|
65
|
+
date: Date
|
|
66
|
+
past: Passées
|
|
67
|
+
scopes: Domaines d'application
|
|
68
|
+
search: Rechercher
|
|
69
|
+
upcoming: À venir
|
|
70
|
+
filters_small_view:
|
|
71
|
+
close_modal: Fermer la fenêtre de dialogue
|
|
72
|
+
filter: Filtrer
|
|
73
|
+
filter_by: Filtrer par
|
|
74
|
+
unfold: Déplier
|
|
75
|
+
index:
|
|
76
|
+
view_meeting: Voir la rencontre
|
|
77
|
+
meetings:
|
|
78
|
+
no_meetings_warning: Aucune rencontre ne correspond à vos critères de recherche ou aucune rencontre n'est prévue.
|
|
79
|
+
upcoming_meetings_warning: À l'heure actuelle, il n'y a pas de rencontre planifiées, mais ici, vous trouverez une liste de toutes les réunions passées.
|
|
80
|
+
show:
|
|
81
|
+
attendees: Nombre de participants
|
|
82
|
+
contributions: Décompte des contributions
|
|
83
|
+
meeting_report: Compte rendu de la rencontre
|
|
84
|
+
organizations: Organisations participantes
|
|
85
|
+
models:
|
|
86
|
+
meeting:
|
|
87
|
+
fields:
|
|
88
|
+
closed: Clos
|
|
89
|
+
end_time: Heure de fin
|
|
90
|
+
map: Carte
|
|
91
|
+
start_time: Date de début
|
|
92
|
+
title: Titre
|
|
93
|
+
resource_links:
|
|
94
|
+
meetings_through_proposals:
|
|
95
|
+
meeting_results: 'Résultats associés :'
|
|
96
|
+
result_meetings: 'Rencontres connexes :'
|
|
97
|
+
proposals_from_meeting:
|
|
98
|
+
meeting_proposals: 'Propositions connexes :'
|
|
99
|
+
proposal_meetings: 'Rencontre connexes :'
|
|
@@ -16,6 +16,13 @@ Decidim.register_feature(:meetings) do |feature|
|
|
|
16
16
|
resource.template = "decidim/meetings/meetings/linked_meetings"
|
|
17
17
|
end
|
|
18
18
|
|
|
19
|
+
feature.register_stat :meetings_count, primary: true, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |features, start_at, end_at|
|
|
20
|
+
meetings = Decidim::Meetings::Meeting.where(feature: features)
|
|
21
|
+
meetings = meetings.where("created_at >= ?", start_at) if start_at.present?
|
|
22
|
+
meetings = meetings.where("created_at <= ?", end_at) if end_at.present?
|
|
23
|
+
meetings.count
|
|
24
|
+
end
|
|
25
|
+
|
|
19
26
|
feature.seeds do
|
|
20
27
|
Decidim::ParticipatoryProcess.all.each do |process|
|
|
21
28
|
next unless process.steps.any?
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: decidim-meetings
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0
|
|
4
|
+
version: 0.1.0
|
|
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: 2017-
|
|
13
|
+
date: 2017-05-18 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: decidim-core
|
|
@@ -18,14 +18,14 @@ dependencies:
|
|
|
18
18
|
requirements:
|
|
19
19
|
- - '='
|
|
20
20
|
- !ruby/object:Gem::Version
|
|
21
|
-
version: 0.0
|
|
21
|
+
version: 0.1.0
|
|
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.0
|
|
28
|
+
version: 0.1.0
|
|
29
29
|
- !ruby/object:Gem::Dependency
|
|
30
30
|
name: rectify
|
|
31
31
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -116,56 +116,56 @@ dependencies:
|
|
|
116
116
|
requirements:
|
|
117
117
|
- - '='
|
|
118
118
|
- !ruby/object:Gem::Version
|
|
119
|
-
version: 0.0
|
|
119
|
+
version: 0.1.0
|
|
120
120
|
type: :development
|
|
121
121
|
prerelease: false
|
|
122
122
|
version_requirements: !ruby/object:Gem::Requirement
|
|
123
123
|
requirements:
|
|
124
124
|
- - '='
|
|
125
125
|
- !ruby/object:Gem::Version
|
|
126
|
-
version: 0.0
|
|
126
|
+
version: 0.1.0
|
|
127
127
|
- !ruby/object:Gem::Dependency
|
|
128
128
|
name: decidim-proposals
|
|
129
129
|
requirement: !ruby/object:Gem::Requirement
|
|
130
130
|
requirements:
|
|
131
131
|
- - '='
|
|
132
132
|
- !ruby/object:Gem::Version
|
|
133
|
-
version: 0.0
|
|
133
|
+
version: 0.1.0
|
|
134
134
|
type: :development
|
|
135
135
|
prerelease: false
|
|
136
136
|
version_requirements: !ruby/object:Gem::Requirement
|
|
137
137
|
requirements:
|
|
138
138
|
- - '='
|
|
139
139
|
- !ruby/object:Gem::Version
|
|
140
|
-
version: 0.0
|
|
140
|
+
version: 0.1.0
|
|
141
141
|
- !ruby/object:Gem::Dependency
|
|
142
142
|
name: decidim-admin
|
|
143
143
|
requirement: !ruby/object:Gem::Requirement
|
|
144
144
|
requirements:
|
|
145
145
|
- - '='
|
|
146
146
|
- !ruby/object:Gem::Version
|
|
147
|
-
version: 0.0
|
|
147
|
+
version: 0.1.0
|
|
148
148
|
type: :development
|
|
149
149
|
prerelease: false
|
|
150
150
|
version_requirements: !ruby/object:Gem::Requirement
|
|
151
151
|
requirements:
|
|
152
152
|
- - '='
|
|
153
153
|
- !ruby/object:Gem::Version
|
|
154
|
-
version: 0.0
|
|
154
|
+
version: 0.1.0
|
|
155
155
|
- !ruby/object:Gem::Dependency
|
|
156
156
|
name: decidim-results
|
|
157
157
|
requirement: !ruby/object:Gem::Requirement
|
|
158
158
|
requirements:
|
|
159
159
|
- - '='
|
|
160
160
|
- !ruby/object:Gem::Version
|
|
161
|
-
version: 0.0
|
|
161
|
+
version: 0.1.0
|
|
162
162
|
type: :development
|
|
163
163
|
prerelease: false
|
|
164
164
|
version_requirements: !ruby/object:Gem::Requirement
|
|
165
165
|
requirements:
|
|
166
166
|
- - '='
|
|
167
167
|
- !ruby/object:Gem::Version
|
|
168
|
-
version: 0.0
|
|
168
|
+
version: 0.1.0
|
|
169
169
|
description: ''
|
|
170
170
|
email:
|
|
171
171
|
- josepjaume@gmail.com
|