it-logica-application-backbone 1.0.29 → 1.0.30

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.0.29
1
+ 1.0.30
@@ -39,7 +39,9 @@ class TableBuilder
39
39
  summarize_page_present = true
40
40
  summarize_page += '<div class="summarize_page">'
41
41
  summarize_page += if col.summarize_page_label? then col.summarize_page_label else '<span class="label">Celkem na stránce: </span>'
42
+ summarize_page += '<span class="value">'
42
43
  summarize_page += if col.summarize_page_value? then col.summarize_page_value else 0
44
+ summarize_pagel += '</span>'
43
45
  summarize_page += '</div>'
44
46
 
45
47
  summarize_page += '</td>'
@@ -61,7 +63,9 @@ class TableBuilder
61
63
  summarize_all_present = true
62
64
  summarize_all += '<div class="summarize_all">'
63
65
  summarize_all += if col.summarize_all_label? then col.summarize_all_label else '<span class="label">Celkem: </span>'
66
+ summarize_all += '<span class="value">'
64
67
  summarize_all += if col.summarize_all_value? then col.summarize_all_value else 0
68
+ summarize_all += '</span>'
65
69
  summarize_all += '</div>'
66
70
  summarize_all += '</td>'
67
71
  summarize_all += '</tr>'
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "it-logica-application-backbone"
8
- s.version = "1.0.29"
8
+ s.version = "1.0.30"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Ladas"]
@@ -36,9 +36,10 @@ module ModelMixins
36
36
  items = not_selected_items.selection(settings)
37
37
  end
38
38
 
39
+ # todo when template passed, this code is not probably needed
39
40
  # the array of items, Will be filled with column method values, formatting values, etc.
40
41
  all_items = items.all # maybe can be done more optimal
41
- all_items_row_ids = all_items.collect{|x| x.row_id}.uniq
42
+ all_items_row_ids = all_items.collect { |x| x.row_id }.uniq
42
43
 
43
44
 
44
45
  if settings[:template].blank?
@@ -225,6 +226,21 @@ module ModelMixins
225
226
 
226
227
  #count = items.sum(col[:name])
227
228
  count = mysql_count.first[:sum_column]
229
+
230
+ format_method = nil
231
+
232
+ format_method = col[:format_method] unless col[:format_method].blank?
233
+ format_method = col[:global_format_method] unless col[:global_format_method].blank?
234
+
235
+ unless format_method.blank?
236
+ if object.respond_to?(:klass)
237
+ count = object.klass.new.send(format_method.to_sym, count)
238
+ else
239
+ count = object.new.send(format_method.to_sym, count)
240
+ end
241
+ end
242
+
243
+ count
228
244
  end
229
245
 
230
246
  def selection(settings)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: it-logica-application-backbone
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.29
4
+ version: 1.0.30
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-09-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: htmlentities
16
- requirement: &77590920 !ruby/object:Gem::Requirement
16
+ requirement: &76483000 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *77590920
24
+ version_requirements: *76483000
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: shoulda
27
- requirement: &77590540 !ruby/object:Gem::Requirement
27
+ requirement: &76482580 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *77590540
35
+ version_requirements: *76482580
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rdoc
38
- requirement: &77589720 !ruby/object:Gem::Requirement
38
+ requirement: &76481810 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '3.12'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *77589720
46
+ version_requirements: *76481810
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: bundler
49
- requirement: &77555340 !ruby/object:Gem::Requirement
49
+ requirement: &77458040 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 1.1.0
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *77555340
57
+ version_requirements: *77458040
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: jeweler
60
- requirement: &77554330 !ruby/object:Gem::Requirement
60
+ requirement: &77457140 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.8.4
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *77554330
68
+ version_requirements: *77457140
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: simplecov
71
- requirement: &77553870 !ruby/object:Gem::Requirement
71
+ requirement: &77456750 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *77553870
79
+ version_requirements: *77456750
80
80
  description: longer description of your gem
81
81
  email: ladislav.smola@it-logica.cz
82
82
  executables: []
@@ -577,7 +577,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
577
577
  version: '0'
578
578
  segments:
579
579
  - 0
580
- hash: 816424243
580
+ hash: 550119859
581
581
  required_rubygems_version: !ruby/object:Gem::Requirement
582
582
  none: false
583
583
  requirements: