surveyor_gui 0.1.1 → 0.1.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +5 -13
  2. data/CHANGELOG.md +5 -0
  3. data/app/facades/report_formatter.rb +4 -2
  4. data/app/views/surveyor_gui/reports/_repeater.html.haml +7 -12
  5. data/app/views/surveyor_gui/reports/_show_report.html.haml +3 -4
  6. data/app/views/surveyor_gui/reports/_single_question.html.haml +1 -1
  7. data/app/views/surveyor_gui/shared/_question_number.html.haml +5 -3
  8. data/lib/surveyor_gui/version.rb +1 -1
  9. metadata +55 -55
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- NmYyZmJiMjlkOTRkNjE5NWFlMzI5NGJlNzViOWQ4NDQwMTViYTcwNw==
5
- data.tar.gz: !binary |-
6
- MTRjYzJhZTBjNDQwNDI3NzRiOWY2OWJlMTZiNmJmY2YzODZiNWMwYw==
2
+ SHA1:
3
+ metadata.gz: 8e420e4ccc891f72ba01126fae7d74e2546442a5
4
+ data.tar.gz: 7f4fe8e49b7c012aed520acfecec64f4000e7977
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- MDI1ZmNmMGYyNjZkNmM5ZDIwOThkOTczYThmMGRhMDEwMGE3M2EwYmIxNmNk
10
- MmM4NTJkNjcxMDgyMzE2YTgxMzc2ODBhZGJjYmY0ODQ5Y2FkYWE5NjE4ZDFj
11
- NTAxNWEyNTJmMzM2YmM4M2U4NmEwNWU2ZDlhN2MzMzdmNjBjOWQ=
12
- data.tar.gz: !binary |-
13
- MzExNmJlMjNiYjAwOTliYzJiNTMxMjllMjMwYTgyOTNiNzY1YTFkOGNhY2Qy
14
- NWY5YzEzN2M5NmE3YTlmNGM0ZTU1Y2JkY2EwOTgxNTBmOTc3NjA0ZTgyNDNk
15
- YzNiMzYyMDZiMGMwM2I5NGY5M2NlMjFlNTRhMTA3MzVkNjM1NjI=
6
+ metadata.gz: 5a03835823bf532f54b1150ca3aae1403ce911633cc4fbdeb0844d47336b4e670efdeecae3bac00700e29c3b3f3203f905538e95c47bd6a049fb88693f5d9f75
7
+ data.tar.gz: 2975e07cc5ce7c6cf2a0de582c844b4f49d38afb1adae442f25489e2f767491bb18e3db81af2102721a74e88154cc6d752d667a580385989f7bacbe635791e7e
data/CHANGELOG.md CHANGED
@@ -1,5 +1,10 @@
1
1
  History for Surveyor
2
2
  ====================
3
+ 0.1.2
4
+ ------
5
+ ### Fixes
6
+
7
+ - Adds statistics back to repeating group questions
3
8
 
4
9
  0.1.1
5
10
  ------
data/app/facades/report_formatter.rb CHANGED
@@ -31,9 +31,11 @@ class ReportFormatter
31
31
 
32
32
  def format_stats(stat)
33
33
  if @question.question_type_id == :number
34
- STAT_FORMATS[@question.question_type_id] % stat
34
+ STAT_FORMATS[@question.question_type_id] % stat.to_f
35
+ elsif [:date, :datetime, :time].include? @question.question_type_id
36
+ format_time_stat(stat.to_f)
35
37
  else
36
- format_time_stat(stat)
38
+ stat
37
39
  end
38
40
  end
39
41
 
data/app/views/surveyor_gui/reports/_repeater.html.haml CHANGED
@@ -10,7 +10,8 @@
10
10
  %td
11
11
  = group_question.text
12
12
 
13
- - question_ids = question_group.questions.collect(&:id)
13
+ - questions = question_group.questions
14
+ - question_ids = questions.collect(&:id)
14
15
  - responses = @responses.where('responses.question_id in (?)', question_ids).map{|r| {response_set_id: r.response_set_id, question_id: r.question_id, response: r.response_value}}
15
16
  - @response_sets.each do |response_set|
16
17
  - (responses.select{|response| response[:response_set_id]==response_set.id}.count/question_ids.count).times do |index|
@@ -18,15 +19,9 @@
18
19
  %td
19
20
  %span.user_id
20
21
  = response_set.report_user_name
21
- - question_ids.each do |question_id|
22
+ - questions.each do |question|
22
23
  %td
23
- - if response = responses.select{|response| response[:response_set_id] == response_set.id && response[:question_id] == question_id}[index]
24
- = response[:response]
25
- %tr
26
- %td
27
-  
28
-
29
- - question_group.questions.each do |group_question|
30
- %table
31
- = render "graphs", q: group_question
32
- = render "surveyor_gui/shared/new_line"
24
+ - if response = responses.select{|response| response[:response_set_id] == response_set.id && response[:question_id] == question.id}[index]
25
+ - response_formatter = ReportFormatter.new(question, @responses)
26
+ = response_formatter.format_stats(response[:response])
27
+ = render "surveyor_gui/shared/new_line"
data/app/views/surveyor_gui/reports/_show_report.html.haml CHANGED
@@ -21,10 +21,9 @@
21
21
  - if ["default", "inline", "repeater"].include? q.question_group.display_type
22
22
  - if q.question_group.display_type == "repeater"
23
23
  = render "repeater", question_group: q.question_group
24
- - else
25
- - q.question_group.questions.each do |group_question|
26
- %table
27
- = render "single_question", q: group_question
24
+ - q.question_group.questions.each do |group_question|
25
+ %table
26
+ = render "single_question", q: group_question
28
27
  - elsif [:grid_one, :grid_any].include? q.question_type_id
29
28
  = render "grid", question_group: q.question_group, question_type: q.question_type_id
30
29
  - elsif q.question_type_id == :grid_dropdown
data/app/views/surveyor_gui/reports/_single_question.html.haml CHANGED
@@ -58,7 +58,7 @@
58
58
  = answer.text
59
59
  %td.table_number
60
60
  = @responses.where(question_id: q.id, answer_id: answer.id).count
61
- - else
61
+ - elsif !q.repeater?
62
62
  = render "surveyor_gui/shared/report_data", q: q, toggle: false
63
63
  = render "surveyor_gui/shared/new_line"
64
64
  - elsif q.question_type_id == :file
data/app/views/surveyor_gui/shared/_question_number.html.haml CHANGED
@@ -1,9 +1,11 @@
1
1
  %tr{:class => q.surveyresponse_class(@response_sets)}
2
2
  %td
3
3
   
4
- %td{colspan: "2", style: q.question_type_id==:label ? "font-weight: bold;" : "" }
5
- - if q.is_numbered? && !q.part_of_group?
4
+ - if q.is_numbered? && !q.part_of_group?
5
+ %td{colspan: "2", style: q.question_type_id==:label ? "font-weight: bold;" : "" }
6
6
  = @question_no.to_s + ") #{q.text}"
7
7
  - @question_no += 1
8
- - elsif !q.repeater?
8
+ - else
9
+ %td
10
+ %td{style: q.question_type_id==:label ? "font-weight: bold;" : "" }
9
11
  = q.text
data/lib/surveyor_gui/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module SurveyorGui
2
- VERSION = "0.1.1"
2
+ VERSION = "0.1.2"
3
3
  end
metadata CHANGED
@@ -1,349 +1,349 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: surveyor_gui
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kevin Jay
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-08-18 00:00:00.000000000 Z
11
+ date: 2014-08-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ! '>'
17
+ - - ">"
18
18
  - !ruby/object:Gem::Version
19
19
  version: 4.0.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
26
  version: 4.0.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: dynamic_form
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: 1.1.4
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
40
  version: 1.1.4
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: jquery-ui-sass-rails
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ! '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: '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
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: sqlite3
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ! '>='
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ! '>='
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: sass-rails
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ~>
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
75
  version: 4.0.2
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ~>
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: 4.0.2
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: coffee-rails
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ! '>='
87
+ - - ">="
88
88
  - !ruby/object:Gem::Version
89
89
  version: '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
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: uglifier
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ! '>='
101
+ - - ">="
102
102
  - !ruby/object:Gem::Version
103
103
  version: 1.0.3
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ! '>='
108
+ - - ">="
109
109
  - !ruby/object:Gem::Version
110
110
  version: 1.0.3
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: rspec-rails
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ~>
115
+ - - "~>"
116
116
  - !ruby/object:Gem::Version
117
117
  version: 2.14.2
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ~>
122
+ - - "~>"
123
123
  - !ruby/object:Gem::Version
124
124
  version: 2.14.2
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: capybara
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ~>
129
+ - - "~>"
130
130
  - !ruby/object:Gem::Version
131
131
  version: 2.2.1
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ~>
136
+ - - "~>"
137
137
  - !ruby/object:Gem::Version
138
138
  version: 2.2.1
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: launchy
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ~>
143
+ - - "~>"
144
144
  - !ruby/object:Gem::Version
145
145
  version: 2.4.2
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ~>
150
+ - - "~>"
151
151
  - !ruby/object:Gem::Version
152
152
  version: 2.4.2
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: poltergeist
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ~>
157
+ - - "~>"
158
158
  - !ruby/object:Gem::Version
159
159
  version: 1.5.0
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ~>
164
+ - - "~>"
165
165
  - !ruby/object:Gem::Version
166
166
  version: 1.5.0
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: capybara-webkit
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ! '>='
171
+ - - ">="
172
172
  - !ruby/object:Gem::Version
173
173
  version: '0'
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ! '>='
178
+ - - ">="
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: json_spec
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - ~>
185
+ - - "~>"
186
186
  - !ruby/object:Gem::Version
187
187
  version: 1.1.1
188
188
  type: :development
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ~>
192
+ - - "~>"
193
193
  - !ruby/object:Gem::Version
194
194
  version: 1.1.1
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: factory_girl
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
- - - ~>
199
+ - - "~>"
200
200
  - !ruby/object:Gem::Version
201
201
  version: 4.4.0
202
202
  type: :development
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
- - - ~>
206
+ - - "~>"
207
207
  - !ruby/object:Gem::Version
208
208
  version: 4.4.0
209
209
  - !ruby/object:Gem::Dependency
210
210
  name: database_cleaner
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
- - - ~>
213
+ - - "~>"
214
214
  - !ruby/object:Gem::Version
215
215
  version: 1.2.0
216
216
  type: :development
217
217
  prerelease: false
218
218
  version_requirements: !ruby/object:Gem::Requirement
219
219
  requirements:
220
- - - ~>
220
+ - - "~>"
221
221
  - !ruby/object:Gem::Version
222
222
  version: 1.2.0
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: rspec-retry
225
225
  requirement: !ruby/object:Gem::Requirement
226
226
  requirements:
227
- - - ! '>='
227
+ - - ">="
228
228
  - !ruby/object:Gem::Version
229
229
  version: '0'
230
230
  type: :development
231
231
  prerelease: false
232
232
  version_requirements: !ruby/object:Gem::Requirement
233
233
  requirements:
234
- - - ! '>='
234
+ - - ">="
235
235
  - !ruby/object:Gem::Version
236
236
  version: '0'
237
237
  - !ruby/object:Gem::Dependency
238
238
  name: surveyor
239
239
  requirement: !ruby/object:Gem::Requirement
240
240
  requirements:
241
- - - ~>
241
+ - - "~>"
242
242
  - !ruby/object:Gem::Version
243
243
  version: 1.4.1.pre
244
244
  type: :runtime
245
245
  prerelease: false
246
246
  version_requirements: !ruby/object:Gem::Requirement
247
247
  requirements:
248
- - - ~>
248
+ - - "~>"
249
249
  - !ruby/object:Gem::Version
250
250
  version: 1.4.1.pre
251
251
  - !ruby/object:Gem::Dependency
252
252
  name: will_paginate
253
253
  requirement: !ruby/object:Gem::Requirement
254
254
  requirements:
255
- - - ~>
255
+ - - "~>"
256
256
  - !ruby/object:Gem::Version
257
257
  version: 3.0.5
258
258
  type: :runtime
259
259
  prerelease: false
260
260
  version_requirements: !ruby/object:Gem::Requirement
261
261
  requirements:
262
- - - ~>
262
+ - - "~>"
263
263
  - !ruby/object:Gem::Version
264
264
  version: 3.0.5
265
265
  - !ruby/object:Gem::Dependency
266
266
  name: simple_form
267
267
  requirement: !ruby/object:Gem::Requirement
268
268
  requirements:
269
- - - ~>
269
+ - - "~>"
270
270
  - !ruby/object:Gem::Version
271
271
  version: 3.0.2
272
272
  type: :runtime
273
273
  prerelease: false
274
274
  version_requirements: !ruby/object:Gem::Requirement
275
275
  requirements:
276
- - - ~>
276
+ - - "~>"
277
277
  - !ruby/object:Gem::Version
278
278
  version: 3.0.2
279
279
  - !ruby/object:Gem::Dependency
280
280
  name: carrierwave
281
281
  requirement: !ruby/object:Gem::Requirement
282
282
  requirements:
283
- - - ! '>='
283
+ - - ">="
284
284
  - !ruby/object:Gem::Version
285
285
  version: '0'
286
286
  type: :runtime
287
287
  prerelease: false
288
288
  version_requirements: !ruby/object:Gem::Requirement
289
289
  requirements:
290
- - - ! '>='
290
+ - - ">="
291
291
  - !ruby/object:Gem::Version
292
292
  version: '0'
293
293
  - !ruby/object:Gem::Dependency
294
294
  name: colorbox-rails
295
295
  requirement: !ruby/object:Gem::Requirement
296
296
  requirements:
297
- - - ~>
297
+ - - "~>"
298
298
  - !ruby/object:Gem::Version
299
299
  version: 0.1.1
300
300
  type: :runtime
301
301
  prerelease: false
302
302
  version_requirements: !ruby/object:Gem::Requirement
303
303
  requirements:
304
- - - ~>
304
+ - - "~>"
305
305
  - !ruby/object:Gem::Version
306
306
  version: 0.1.1
307
307
  - !ruby/object:Gem::Dependency
308
308
  name: jquery-form-rails
309
309
  requirement: !ruby/object:Gem::Requirement
310
310
  requirements:
311
- - - ~>
311
+ - - "~>"
312
312
  - !ruby/object:Gem::Version
313
313
  version: 1.0.1
314
314
  type: :runtime
315
315
  prerelease: false
316
316
  version_requirements: !ruby/object:Gem::Requirement
317
317
  requirements:
318
- - - ~>
318
+ - - "~>"
319
319
  - !ruby/object:Gem::Version
320
320
  version: 1.0.1
321
321
  - !ruby/object:Gem::Dependency
322
322
  name: deep_cloneable
323
323
  requirement: !ruby/object:Gem::Requirement
324
324
  requirements:
325
- - - ~>
325
+ - - "~>"
326
326
  - !ruby/object:Gem::Version
327
327
  version: 2.0.0
328
328
  type: :runtime
329
329
  prerelease: false
330
330
  version_requirements: !ruby/object:Gem::Requirement
331
331
  requirements:
332
- - - ~>
332
+ - - "~>"
333
333
  - !ruby/object:Gem::Version
334
334
  version: 2.0.0
335
335
  - !ruby/object:Gem::Dependency
336
336
  name: lazy_high_charts
337
337
  requirement: !ruby/object:Gem::Requirement
338
338
  requirements:
339
- - - ! '>='
339
+ - - ">="
340
340
  - !ruby/object:Gem::Version
341
341
  version: '0'
342
342
  type: :runtime
343
343
  prerelease: false
344
344
  version_requirements: !ruby/object:Gem::Requirement
345
345
  requirements:
346
- - - ! '>='
346
+ - - ">="
347
347
  - !ruby/object:Gem::Version
348
348
  version: '0'
349
349
  description:
@@ -353,8 +353,8 @@ executables: []
353
353
  extensions: []
354
354
  extra_rdoc_files: []
355
355
  files:
356
- - .gitignore
357
- - .travis.yml
356
+ - ".gitignore"
357
+ - ".travis.yml"
358
358
  - CHANGELOG.md
359
359
  - Gemfile
360
360
  - LICENSE
@@ -650,17 +650,17 @@ require_paths:
650
650
  - lib
651
651
  required_ruby_version: !ruby/object:Gem::Requirement
652
652
  requirements:
653
- - - ! '>='
653
+ - - ">="
654
654
  - !ruby/object:Gem::Version
655
655
  version: '0'
656
656
  required_rubygems_version: !ruby/object:Gem::Requirement
657
657
  requirements:
658
- - - ! '>='
658
+ - - ">="
659
659
  - !ruby/object:Gem::Version
660
660
  version: '0'
661
661
  requirements: []
662
662
  rubyforge_project:
663
- rubygems_version: 2.2.2
663
+ rubygems_version: 2.4.1
664
664
  signing_key:
665
665
  specification_version: 4
666
666
  summary: A Rails gem to supply a front-end and reporting capability to the Surveyor