decidim-accountability 0.8.4 → 0.9.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (37) hide show
  1. checksums.yaml +5 -5
  2. data/app/assets/stylesheets/decidim/accountability/accountability/_cards.scss +8 -6
  3. data/app/assets/stylesheets/decidim/accountability/accountability/_categories.scss +33 -28
  4. data/app/assets/stylesheets/decidim/accountability/accountability/_lines_breadcrumb.scss +8 -8
  5. data/app/assets/stylesheets/decidim/accountability/accountability/_results.scss +51 -44
  6. data/app/assets/stylesheets/decidim/accountability/accountability/_versions.scss +5 -4
  7. data/app/commands/decidim/accountability/admin/create_result.rb +9 -0
  8. data/app/commands/decidim/accountability/admin/update_result.rb +9 -0
  9. data/app/forms/decidim/accountability/admin/result_form.rb +23 -7
  10. data/app/helpers/decidim/accountability/breadcrumb_helper.rb +1 -3
  11. data/app/services/decidim/accountability/result_search.rb +23 -0
  12. data/app/services/decidim/accountability/results_calculator.rb +9 -9
  13. data/app/views/decidim/accountability/admin/results/_form.html.erb +11 -1
  14. data/app/views/decidim/accountability/admin/results/index.html.erb +1 -1
  15. data/app/views/decidim/accountability/results/_nav_breadcrumb.html.erb +3 -3
  16. data/app/views/decidim/accountability/results/_scope_filters.html.erb +0 -1
  17. data/app/views/decidim/accountability/results/_show_parent.html.erb +0 -1
  18. data/app/views/decidim/accountability/results/_stats.html.erb +5 -1
  19. data/config/locales/ca.yml +3 -2
  20. data/config/locales/en.yml +3 -1
  21. data/config/locales/es.yml +4 -3
  22. data/config/locales/eu.yml +3 -1
  23. data/config/locales/fi.yml +39 -37
  24. data/config/locales/fr.yml +5 -3
  25. data/config/locales/gl.yml +176 -0
  26. data/config/locales/it.yml +3 -1
  27. data/config/locales/nl.yml +3 -1
  28. data/config/locales/pl.yml +3 -1
  29. data/config/locales/pt-BR.yml +176 -0
  30. data/config/locales/pt.yml +5 -3
  31. data/config/locales/ru.yml +20 -1
  32. data/config/locales/sv.yml +176 -0
  33. data/config/locales/uk.yml +11 -3
  34. data/lib/decidim/accountability/feature.rb +4 -0
  35. data/lib/decidim/accountability/version.rb +1 -1
  36. metadata +31 -29
  37. data/app/views/decidim/accountability/admin/shared/_extra.html.erb +0 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 7c5a2a2be11d4a95155cf0fc5e70823ef5052bb9
4
- data.tar.gz: bb620659249f0088d554e6f222eecb905daf7e27
2
+ SHA256:
3
+ metadata.gz: 860c70ffbf12fda8745e9c7dc35b64fb2c8b04d156508db8c442dfc8a7ab49a5
4
+ data.tar.gz: 48626b3d2f6a9bc64196cdc8bd3d5a10c6ec86d4ae80f939b8985d64c7b35980
5
5
  SHA512:
6
- metadata.gz: e61c56d629a919bbab404d10dfd66755e0eb4df8fc459fb72a214ac98f2eb94d6d2afdbe6afba107e5fb0b47e14697d2bcfc164d6feed2966301212e2405c67d
7
- data.tar.gz: f831583cde891197acb817fd5085d5e4694b882fa267b2b591d0d9322119d2fd99ede7bd22f3ed538a17b469bcd645c7d09ad8c040b2fe5762850e25ce7b5737
6
+ metadata.gz: eed49c1425cdfacd3f419ceb93f04435a099f422f5b6e89873c6bd165a9e56afff3868d639f51c5c660605459bd0a8ba2b9cce8f3b1fbc5d8105b622fdab3304
7
+ data.tar.gz: '0628eb8a1b4fc54a2b552d2dc921bc5cca33f6748d48d5c0f0bddb31d0ca36af86559043d55e5a1fd59fc45237340b983013b1489aecb99a19c1606a49776dd8'
data/app/assets/stylesheets/decidim/accountability/accountability/_cards.scss CHANGED
@@ -1,13 +1,15 @@
1
- .accountability {
2
- .card__link--block {
1
+ .accountability{
2
+ .card__link--block{
3
3
  display: block;
4
4
  }
5
- .card--list__data {
5
+
6
+ .card--list__data{
6
7
  min-width: 7rem;
7
8
  }
8
- .card--meta {
9
- span {
10
- margin-right: 0.5rem;
9
+
10
+ .card--meta{
11
+ span{
12
+ margin-right: .5rem;
11
13
  }
12
14
  }
13
15
  }
data/app/assets/stylesheets/decidim/accountability/accountability/_categories.scss CHANGED
@@ -1,64 +1,66 @@
1
- .accountability {
2
- .categories {
3
- .categories--header {
1
+ .accountability{
2
+ .categories{
3
+ .categories--header{
4
4
  border-bottom: 1px solid $medium-gray;
5
5
  padding-bottom: 1rem;
6
6
  margin-bottom: 1rem;
7
7
 
8
- .icon--arrow-bottom {
8
+ .icon--arrow-bottom{
9
9
  fill: lighten($dark-gray, 50);
10
10
  }
11
11
 
12
- span {
12
+ span{
13
13
  text-transform: uppercase;
14
14
  font-size: 1.15rem;
15
15
  color: lighten($dark-gray, 50);
16
16
  }
17
17
  }
18
18
 
19
- .categories--group {
19
+ .categories--group{
20
20
  margin-bottom: 2rem;
21
21
 
22
- @include breakpoint(medium) {
22
+ @include breakpoint(medium){
23
23
  display: flex;
24
24
  margin-bottom: 4rem;
25
25
  }
26
26
 
27
- .category--title {
27
+ .category--title{
28
28
  background: $white;
29
29
  padding: 1.5rem 2rem;
30
30
  min-height: 9rem;
31
31
 
32
- @include breakpoint(medium) {
32
+ @include breakpoint(medium){
33
33
  height: calc(100% - 1.875rem);
34
34
  }
35
35
 
36
- p {
36
+ p{
37
37
  font-weight: 600;
38
- margin-bottom: 0.75rem;
38
+ margin-bottom: .75rem;
39
39
  }
40
40
 
41
- .progress {
42
- margin-bottom: 0.5rem;
41
+ .progress{
42
+ margin-bottom: .5rem;
43
43
  }
44
- .progress-info {
44
+
45
+ .progress-info{
45
46
  position: relative;
46
47
  margin-bottom: 1.5rem;
47
48
 
48
- .progress-figure {
49
+ .progress-figure{
49
50
  display: inline-block;
50
51
  }
51
- .category--count {
52
+
53
+ .category--count{
52
54
  position: absolute;
53
55
  right: 0;
54
- top: 0.5rem;
56
+ top: .5rem;
55
57
  color: lighten($dark-gray, 50);
56
58
  }
57
59
  }
58
60
  }
59
61
 
60
- .card__link {
61
- .category--line {
62
+ .card__link{
63
+ .category--line{
62
64
  background: $light-gray-dark;
63
65
  border-radius: 4px;
64
66
  min-height: 9rem;
@@ -66,16 +68,17 @@
66
68
  margin-bottom: 1.875rem;
67
69
  position: relative;
68
70
 
69
- strong {
71
+ strong{
70
72
  font-weight: 600;
71
73
  color: $secondary;
72
74
  }
73
75
 
74
- .progress-figure {
76
+ .progress-figure{
75
77
  position: absolute;
76
78
  bottom: 1rem;
77
79
  }
78
- .category--count {
80
+
81
+ .category--count{
79
82
  color: lighten($dark-gray, 50);
80
83
  position: absolute;
81
84
  right: 1rem;
@@ -83,26 +86,28 @@
83
86
  font-size: 80%;
84
87
  }
85
88
  }
86
- &:hover {
87
- .category--count {
89
+
90
+ &:hover{
91
+ .category--count{
88
92
  color: lighten($dark-gray, 50);
89
93
  }
90
- strong {
94
+
95
+ strong{
91
96
  color: scale-color($anchor-color, $lightness: -14%);
92
97
  }
93
98
  }
94
99
  }
95
100
  }
96
101
 
97
- .category--elements.active {
102
+ .category--elements.active{
98
103
  display: block !important;
99
104
 
100
- .medium-4:first-child {
105
+ .medium-4:first-child{
101
106
  margin-top: 1rem;
102
107
  }
103
108
  }
104
109
 
105
- .progress-figure {
110
+ .progress-figure{
106
111
  color: lighten($dark-gray, 50);
107
112
  }
108
113
  }
data/app/assets/stylesheets/decidim/accountability/accountability/_lines_breadcrumb.scss CHANGED
@@ -1,29 +1,29 @@
1
- .lines-breadcrumb {
1
+ .lines-breadcrumb{
2
2
  margin-bottom: 2rem;
3
3
 
4
- .breadcrumb--separator {
4
+ .breadcrumb--separator{
5
5
  color: darken($light-gray, 40);
6
- padding: 0 0.25rem;
6
+ padding: 0 .25rem;
7
7
  }
8
8
 
9
- div {
9
+ div{
10
10
  display: inline-block;
11
11
  }
12
12
 
13
- a {
13
+ a{
14
14
  font-weight: 600;
15
15
  color: $dark-gray;
16
16
  }
17
17
 
18
- ul {
18
+ ul{
19
19
  list-style: none;
20
20
  margin-left: 0;
21
21
  }
22
22
 
23
- .percentage {
23
+ .percentage{
24
24
  color: darken($light-gray, 40);
25
25
  font-weight: 400;
26
- padding-left: 0.15rem;
26
+ padding-left: .15rem;
27
27
  display: inline-block;
28
28
  }
29
29
  }
data/app/assets/stylesheets/decidim/accountability/accountability/_results.scss CHANGED
@@ -1,111 +1,117 @@
1
- .accountability {
2
- .intro {
3
- ul {
1
+ .accountability{
2
+ .intro{
3
+ ul{
4
4
  margin-bottom: 1rem;
5
5
  }
6
- .progress-level {
6
+
7
+ .progress-level{
7
8
  background: $white;
8
9
  padding: 1.5rem 1.75rem;
9
10
 
10
- p {
11
+ p{
11
12
  font-weight: 600;
12
13
  text-transform: uppercase;
13
- margin-bottom: 0.25rem;
14
+ margin-bottom: .25rem;
14
15
  display: inline-block;
15
- margin-right: 0.5rem;
16
+ margin-right: .5rem;
16
17
  font-size: 1.25rem;
17
18
  }
18
19
 
19
- .icon {
20
+ .icon{
20
21
  background: lighten($dark-gray, 50);
21
22
  border-radius: 50%;
22
23
  fill: white;
23
- padding: 0.15rem;
24
+ padding: .15rem;
24
25
  }
25
26
 
26
- .progress {
27
+ .progress{
27
28
  max-width: 85%;
28
29
  margin-bottom: 0;
29
30
  }
30
31
 
31
- .progress-figure {
32
+ .progress-figure{
32
33
  font-size: 2.5rem;
33
34
  font-weight: 300;
34
35
  color: lighten($dark-gray, 50);
35
36
 
36
- @include breakpoint(medium) {
37
+ @include breakpoint(medium){
37
38
  font-size: 4rem;
38
39
  }
39
40
  }
40
41
  }
41
42
  }
42
43
 
43
- .scope-filters {
44
- div {
44
+ .scope-filters{
45
+ div{
45
46
  color: lighten($dark-gray, 50);
46
47
  text-transform: uppercase;
47
- margin-bottom: 0.15rem;
48
+ margin-bottom: .15rem;
48
49
  }
49
- span {
50
- margin-right: 0.5rem;
50
+
51
+ span{
52
+ margin-right: .5rem;
51
53
  }
52
- ul {
54
+
55
+ ul{
53
56
  display: inline;
54
57
  }
55
- li.active {
58
+
59
+ li.active{
56
60
  background-color: $medium-gray;
57
61
  }
58
62
  }
59
63
 
60
- .description {
64
+ .description{
61
65
  margin-bottom: 1rem;
62
66
  }
63
- .title-action {
64
- margin-bottom: 0.5rem;
67
+
68
+ .title-action{
69
+ margin-bottom: .5rem;
65
70
  }
66
71
  }
67
72
 
68
- .result-view {
69
- .title {
73
+ .result-view{
74
+ .title{
70
75
  display: flex;
71
76
  align-items: flex-start;
72
77
  margin-bottom: 1rem;
73
78
  flex-direction: column;
74
79
 
75
- .icon {
80
+ .icon{
76
81
  fill: $secondary;
77
82
  min-width: 1.5rem;
78
83
  min-height: 1.5rem;
79
- margin-bottom: 0.5rem;
84
+ margin-bottom: .5rem;
80
85
 
81
- @include breakpoint(medium) {
82
- margin-right: 0.75rem;
83
- margin-top: 0.5rem;
86
+ @include breakpoint(medium){
87
+ margin-right: .75rem;
88
+ margin-top: .5rem;
84
89
  }
85
90
  }
86
91
 
87
- @include breakpoint(medium) {
92
+ @include breakpoint(medium){
88
93
  flex-direction: row;
89
94
  }
90
95
  }
91
96
 
92
- .progress-level {
97
+ .progress-level{
93
98
  background: $white;
94
99
  border-radius: 4px;
95
100
  padding: 1.5rem;
96
101
  border: 1px solid $medium-gray;
97
102
 
98
- .progress-label {
103
+ .progress-label{
99
104
  display: flex;
100
105
  justify-content: space-between;
101
106
  align-items: flex-end;
102
- margin-bottom: 0.5rem;
107
+ margin-bottom: .5rem;
103
108
 
104
- .progress-text {
109
+ .progress-text{
105
110
  text-transform: uppercase;
106
111
  color: lighten($dark-gray, 30);
107
112
  }
108
- .progress-figure {
113
+
114
+ .progress-figure{
109
115
  line-height: 1;
110
116
  font-size: 2.25rem;
111
117
  font-weight: 600;
@@ -113,30 +119,31 @@
113
119
  }
114
120
  }
115
121
 
116
- .result-description div {
122
+ .result-description div{
117
123
  margin-bottom: 1rem;
118
124
  }
119
125
 
120
- .result-meta {
121
- margin-bottom: 0.5rem;
126
+ .result-meta{
127
+ margin-bottom: .5rem;
122
128
  font-size: 1.25rem;
123
129
 
124
- .result-meta--label {
130
+ .result-meta--label{
125
131
  font-weight: 600;
126
132
  color: lighten($dark-gray, 30);
127
133
  }
128
- .result-meta--data {
134
+
135
+ .result-meta--data{
129
136
  font-size: 1.15rem;
130
137
  }
131
138
  }
132
139
 
133
- hr {
140
+ hr{
134
141
  width: 100%;
135
- margin: 0 0 3rem 0;
142
+ margin: 0 0 3rem;
136
143
  }
137
144
 
138
- .timeline {
139
- .timeline__info {
145
+ .timeline{
146
+ .timeline__info{
140
147
  background-color: transparent;
141
148
  border: none;
142
149
  }
data/app/assets/stylesheets/decidim/accountability/accountability/_versions.scss CHANGED
@@ -1,8 +1,9 @@
1
- .diff {
2
- .addition {
1
+ .diff{
2
+ .addition{
3
3
  background-color: #e6ffed;
4
4
  }
5
- .removal {
6
- background-color: #ffeef0
5
+
6
+ .removal{
7
+ background-color: #ffeef0;
7
8
  }
8
9
  }
data/app/commands/decidim/accountability/admin/create_result.rb CHANGED
@@ -20,6 +20,7 @@ module Decidim
20
20
  create_result
21
21
  link_meetings
22
22
  link_proposals
23
+ link_projects
23
24
  end
24
25
 
25
26
  broadcast(:ok)
@@ -50,6 +51,10 @@ module Decidim
50
51
  @proposals ||= result.sibling_scope(:proposals).where(id: @form.proposal_ids)
51
52
  end
52
53
 
54
+ def projects
55
+ @projects ||= result.sibling_scope(:projects).where(id: @form.project_ids)
56
+ end
57
+
53
58
  def meeting_ids
54
59
  @meeting_ids ||= proposals.flat_map do |proposal|
55
60
  proposal.linked_resources(:meetings, "proposals_from_meeting").pluck(:id)
@@ -64,6 +69,10 @@ module Decidim
64
69
  result.link_resources(proposals, "included_proposals")
65
70
  end
66
71
 
72
+ def link_projects
73
+ result.link_resources(projects, "included_projects")
74
+ end
75
+
67
76
  def link_meetings
68
77
  result.link_resources(meetings, "meetings_through_proposals")
69
78
  end