it-logica-application-backbone 1.0.44 → 1.0.45

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.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.0.44
1
+ 1.0.45
@@ -30,21 +30,25 @@ class TableBuilder
30
30
  summarize_page = ""
31
31
  summarize_page += '<tr class="summarize_page">'
32
32
  # todo make sure functions collumn got skipped when placement is different, eg. on the end
33
+ summarize_page += '<td class="summarize" colspan="2"><span class="label">Celkem na stránce: </span></td>' if TableBuilder.obj.checkboxes?
33
34
  summarize_page += '<td class="summarize"></td>' if functions_present
34
- summarize_page += '<td class="summarize"></td>' if TableBuilder.obj.checkboxes?
35
+ col_count = 0
35
36
  for col in TableBuilder.obj.columns
36
37
  do (col) ->
37
- summarize_page += '<td class="summarize">'
38
- if col.summarize_page? || col.summarize_page_value?
39
- summarize_page_present = true
40
- summarize_page += '<div class="summarize_page">'
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">'
43
- summarize_page += if col.summarize_page_value? then col.summarize_page_value else 0
44
- summarize_pagel += '</span>'
45
- summarize_page += '</div>'
46
-
47
- summarize_page += '</td>'
38
+ col_count += 1
39
+ # the sumarize label has 2 colspan, so it has to be without 1 first column if there is no function column
40
+ unless col_count == 1 && !functions_present
41
+ summarize_page += '<td class="summarize">'
42
+ if col.summarize_page? || col.summarize_page_value?
43
+ summarize_page_present = true
44
+ summarize_page += '<div class="summarize_page">'
45
+ summarize_page += if col.summarize_page_label? then col.summarize_page_label else ''
46
+ summarize_page += '<span class="value">'
47
+ summarize_page += if col.summarize_page_value? then col.summarize_page_value else 0
48
+ summarize_pagel += '</span>'
49
+ summarize_page += '</div>'
50
+
51
+ summarize_page += '</td>'
48
52
  summarize_page += '</tr>'
49
53
 
50
54
 
@@ -54,20 +58,27 @@ class TableBuilder
54
58
  summarize_all_present = false
55
59
  summarize_all = ""
56
60
  summarize_all += '<tr class="summarize_all">'
57
- summarize_all += '<td class="summarize"></td>' if functions_present
58
- summarize_all += '<td class="summarize"></td>' if TableBuilder.obj.checkboxes?
61
+
62
+ summarize_all += '<td class="summarize" colspan="2"><span class="label">Celkem: </span></td>' if TableBuilder.obj.checkboxes?
63
+ #it has colspan 2 so there is no function column
64
+ #summarize_all += '<td class="summarize"></td>' if functions_present
65
+
66
+ col_count = 0
59
67
  for col in TableBuilder.obj.columns
60
68
  do (col) ->
61
- summarize_all += '<td class="summarize">'
62
- if col.summarize_all? || col.summarize_all_value?
63
- summarize_all_present = true
64
- summarize_all += '<div class="summarize_all">'
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">'
67
- summarize_all += if col.summarize_all_value? then col.summarize_all_value else 0
68
- summarize_all += '</span>'
69
- summarize_all += '</div>'
70
- summarize_all += '</td>'
69
+ col_count += 1
70
+ # the sumarize label has 2 colspan, so it has to without 1 first column if there is no function column
71
+ unless col_count == 1 && !functions_present
72
+ summarize_all += '<td class="summarize">'
73
+ if col.summarize_all? || col.summarize_all_value?
74
+ summarize_all_present = true
75
+ summarize_all += '<div class="summarize_all">'
76
+ summarize_all += if col.summarize_all_label? then col.summarize_all_label else ''
77
+ summarize_all += '<span class="value">'
78
+ summarize_all += if col.summarize_all_value? then col.summarize_all_value else 0
79
+ summarize_all += '</span>'
80
+ summarize_all += '</div>'
81
+ summarize_all += '</td>'
71
82
  summarize_all += '</tr>'
72
83
 
73
84
  TableBuilder.html += summarize_all if summarize_all_present
@@ -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.44"
8
+ s.version = "1.0.45"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Ladas"]
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.44
4
+ version: 1.0.45
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-09-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: htmlentities
16
- requirement: &69091980 !ruby/object:Gem::Requirement
16
+ requirement: &77658850 !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: *69091980
24
+ version_requirements: *77658850
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: shoulda
27
- requirement: &69091550 !ruby/object:Gem::Requirement
27
+ requirement: &77658360 !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: *69091550
35
+ version_requirements: *77658360
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rdoc
38
- requirement: &69091170 !ruby/object:Gem::Requirement
38
+ requirement: &77657940 !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: *69091170
46
+ version_requirements: *77657940
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: bundler
49
- requirement: &69090780 !ruby/object:Gem::Requirement
49
+ requirement: &77657450 !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: *69090780
57
+ version_requirements: *77657450
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: jeweler
60
- requirement: &69090410 !ruby/object:Gem::Requirement
60
+ requirement: &77656920 !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: *69090410
68
+ version_requirements: *77656920
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: simplecov
71
- requirement: &69864040 !ruby/object:Gem::Requirement
71
+ requirement: &77656390 !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: *69864040
79
+ version_requirements: *77656390
80
80
  description: longer description of your gem
81
81
  email: ladislav.smola@it-logica.cz
82
82
  executables: []
@@ -591,7 +591,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
591
591
  version: '0'
592
592
  segments:
593
593
  - 0
594
- hash: 220523985
594
+ hash: -211265489
595
595
  required_rubygems_version: !ruby/object:Gem::Requirement
596
596
  none: false
597
597
  requirements: