it-logica-application-backbone 1.0.6 → 1.0.7

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.
Files changed (6) hide show
  1. data/VERSION +1 -1
  2. data/app/assets/stylesheets/backbone_css/tables.css.scss +4 -0
  3. data/app/views/helpers/_build_table_wrapper.html.erb +18 -6
  4. data/it-logica-application-backbone.gemspec +1 -1
  5. data/lib/model_mixins/table_builder_class_methods.rb +41 -13
  6. metadata +14 -14
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.0.6
1
+ 1.0.7
data/app/assets/stylesheets/backbone_css/tables.css.scss CHANGED
@@ -23,6 +23,10 @@ table.table_special .input-small {
23
23
  color: $marked_item_color;
24
24
  }
25
25
 
26
+ table.table_special .input-small.input-mini {
27
+ width: 15px;
28
+ }
29
+
26
30
  table.table_special .input-small.datetime_class {
27
31
  width: 15px;
28
32
  }
data/app/views/helpers/_build_table_wrapper.html.erb CHANGED
@@ -9,9 +9,9 @@
9
9
  <% if !settings[:row].blank? && !settings[:row][:functions].blank? %>
10
10
  <th></th>
11
11
  <% end %>
12
- <% order_by_arr = settings[:params][:order_by].downcase.split(",") unless settings[:params][:order_by].blank? %>
12
+ <% order_by_arr = settings[:params][:order_by].downcase.split(",") unless settings[:params][:order_by].blank? %>
13
13
  <% settings[:columns].each do |col| %>
14
- <% order_asc_id = (col[:table].blank? || col[:name].blank?) ? "" : (col[:table] + "___" + col[:name] + "___asc") %>
14
+ <% order_asc_id = (col[:table].blank? || col[:name].blank?) ? "" : (col[:table] + "___" + col[:name] + "___asc") %>
15
15
  <% order_desc_id = (col[:table].blank? || col[:name].blank?) ? "" : (col[:table] + "___" + col[:name] + "___desc") %>
16
16
  <th class="<%= col[:class] %>">
17
17
  <div class="th_label">
@@ -45,10 +45,22 @@
45
45
  :onchange => "form_submit_watcher('#{settings[:form_id]}')",
46
46
  :multiple => true,
47
47
  :class => "multiselect_class") %></span>
48
- <% when :date %>
49
- <% saved_param = (!settings[:params].blank? && !settings[:params]['date_from'].blank? && !settings[:params]['date_from']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['date_from']["#{col[:table]}.#{col[:name]}"] : "" %>
48
+ <% when :number %>
49
+ <% saved_param = (!settings[:params].blank? && !settings[:params]['date_from'].blank? && !settings[:params]['date_from']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['date_from']["#{col[:table]}.#{col[:name]}"] : "" %>
50
+
51
+ <%= text_field_tag "number_from[#{col[:table]}.#{col[:name]}]", saved_param, {:class => "input-small input-mini #{settings[:form_id] + '_column_find'}",
52
+ :onchange => "form_submit_watcher('#{settings[:form_id]}')",
53
+ :title => "Vetší nebo rovno"} %>
54
+ <% saved_param = (!settings[:params].blank? && !settings[:params]['date_to'].blank? && !settings[:params]['date_to']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['date_to']["#{col[:table]}.#{col[:name]}"] : "" %>
55
+ <%#= label_tag "date_to[#{col[:table]}.#{col[:name]}]", "Do", :class => "datetime_class_label" %>
56
+ <%= text_field_tag "number_to[#{col[:table]}.#{col[:name]}]", saved_param, {:class => "input-small input-mini",
57
+ :onchange => "form_submit_watcher('#{settings[:form_id]}')",
58
+ :title => "Menší nebo rovno"} %>
59
+ <span></span>
60
+ <% when :date %>
61
+ <% saved_param = (!settings[:params].blank? && !settings[:params]['date_from'].blank? && !settings[:params]['date_from']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['date_from']["#{col[:table]}.#{col[:name]}"] : "" %>
50
62
  <%#= label_tag "date_from[#{col[:table]}.#{col[:name]}]", "Od", :class => "datetime_class_label" %>
51
- <%= text_field_tag "date_from[#{col[:table]}.#{col[:name]}]", saved_param, {:class => "datetime_class input-small",
63
+ <%= text_field_tag "date_from[#{col[:table]}.#{col[:name]}]", saved_param, {:class => "datetime_class input-small #{settings[:form_id] + '_column_find'}",
52
64
  :onchange => "form_submit_watcher('#{settings[:form_id]}')",
53
65
  :title => "Datum od"} %>
54
66
  <% saved_param = (!settings[:params].blank? && !settings[:params]['date_to'].blank? && !settings[:params]['date_to']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['date_to']["#{col[:table]}.#{col[:name]}"] : "" %>
@@ -57,7 +69,7 @@
57
69
  :onchange => "form_submit_watcher('#{settings[:form_id]}')",
58
70
  :title => "Datum do"} %>
59
71
  <span></span>
60
- <% else %>
72
+ <% else %>
61
73
  <% end %>
62
74
  </span>
63
75
  </div>
data/it-logica-application-backbone.gemspec CHANGED
@@ -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.6"
8
+ s.version = "1.0.7"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Ladas"]
data/lib/model_mixins/table_builder_class_methods.rb CHANGED
@@ -205,7 +205,7 @@ module ModelMixins
205
205
  if i.match(/^.*?___sql_expression___.*$/i)
206
206
  i = i.gsub(/___sql_expression___\./, "") #some cleaning job
207
207
 
208
- having_cond_str += " AND " unless cond_str.blank?
208
+ having_cond_str += " AND " unless having_cond_str.blank?
209
209
  cond_id = "find_#{i.gsub(/\./, '_')}"
210
210
  having_cond_str += "#{i} LIKE :#{cond_id}" #OR guest_email LIKE :find"
211
211
  having_cond_hash.merge!({cond_id.to_sym => "%#{v}%"})
@@ -235,26 +235,54 @@ module ModelMixins
235
235
  end
236
236
  end
237
237
 
238
- if !params.blank? && params['date_from']
239
- params['date_from'].each_pair do |i, v|
238
+ if !params.blank? && (params['date_from'] || params['number_from'])
239
+ from_hash = params['date_from']
240
+ if from_hash.blank?
241
+ from_hash = params['number_from']
242
+ else
243
+ from_hash.merge!(params['number_from']) unless params['number_from'].blank?
244
+ end
245
+ from_hash.each_pair do |i, v|
240
246
  i = i.gsub(/___unknown___\./, "") #some cleaning job
241
247
  unless v.blank?
242
- cond_str += " AND " unless cond_str.blank?
243
- cond_id = "date_from_#{i.gsub(/\./, '_')}"
244
- cond_str += "#{i} >= :#{cond_id}" #OR guest_email LIKE :find"
245
- cond_hash.merge!({cond_id.to_sym => "#{v}"})
248
+ if i.match(/^.*?___sql_expression___.*$/i)
249
+ i = i.gsub(/___sql_expression___\./, "") #some cleaning job
250
+ having_cond_str += " AND " unless having_cond_str.blank?
251
+ cond_id = "date_from_#{i.gsub(/\./, '_')}"
252
+ having_cond_str += "#{i} >= :#{cond_id}" #OR guest_email LIKE :find"
253
+ having_cond_hash.merge!({cond_id.to_sym => "#{v}"})
254
+ else
255
+ cond_str += " AND " unless cond_str.blank?
256
+ cond_id = "date_from_#{i.gsub(/\./, '_')}"
257
+ cond_str += "#{i} >= :#{cond_id}" #OR guest_email LIKE :find"
258
+ cond_hash.merge!({cond_id.to_sym => "#{v}"})
259
+ end
246
260
  end
247
261
  end
248
262
  end
249
263
 
250
- if !params.blank? && params['date_to']
251
- params['date_to'].each_pair do |i, v|
264
+ if !params.blank? && (params['date_to'] || params['number_to'])
265
+ to_hash = params['date_to']
266
+ if to_hash.blank?
267
+ to_hash = params['number_to']
268
+ else
269
+ to_hash.merge!(params['number_to']) unless params['number_to'].blank?
270
+ end
271
+ to_hash.each_pair do |i, v|
252
272
  i = i.gsub(/___unknown___\./, "") #some cleaning job
253
273
  unless v.blank?
254
- cond_str += " AND " unless cond_str.blank?
255
- cond_id = "date_to_#{i.gsub(/\./, '_')}"
256
- cond_str += "#{i} <= :#{cond_id}" #OR guest_email LIKE :find"
257
- cond_hash.merge!({cond_id.to_sym => "#{v}"})
274
+ if i.match(/^.*?___sql_expression___.*$/i)
275
+ i = i.gsub(/___sql_expression___\./, "") #some cleaning job
276
+ having_cond_str += " AND " unless having_cond_str.blank?
277
+ cond_id = "date_to_#{i.gsub(/\./, '_')}"
278
+ having_cond_str += "#{i} <= :#{cond_id}" #OR guest_email LIKE :find"
279
+ having_cond_hash.merge!({cond_id.to_sym => "#{v}"})
280
+ else
281
+ cond_str += " AND " unless cond_str.blank?
282
+ cond_id = "date_to_#{i.gsub(/\./, '_')}"
283
+ cond_str += "#{i} <= :#{cond_id}" #OR guest_email LIKE :find"
284
+ cond_hash.merge!({cond_id.to_sym => "#{v}"})
285
+ end
258
286
  end
259
287
  end
260
288
  end
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.6
4
+ version: 1.0.7
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-08-03 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: htmlentities
16
- requirement: &74655360 !ruby/object:Gem::Requirement
16
+ requirement: &79206700 !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: *74655360
24
+ version_requirements: *79206700
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: shoulda
27
- requirement: &74654940 !ruby/object:Gem::Requirement
27
+ requirement: &78559150 !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: *74654940
35
+ version_requirements: *78559150
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rdoc
38
- requirement: &74176350 !ruby/object:Gem::Requirement
38
+ requirement: &78558850 !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: *74176350
46
+ version_requirements: *78558850
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: bundler
49
- requirement: &74176070 !ruby/object:Gem::Requirement
49
+ requirement: &78558570 !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: *74176070
57
+ version_requirements: *78558570
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: jeweler
60
- requirement: &74175780 !ruby/object:Gem::Requirement
60
+ requirement: &78558310 !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: *74175780
68
+ version_requirements: *78558310
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: simplecov
71
- requirement: &74175470 !ruby/object:Gem::Requirement
71
+ requirement: &78557980 !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: *74175470
79
+ version_requirements: *78557980
80
80
  description: longer description of your gem
81
81
  email: ladislav.smola@it-logica.cz
82
82
  executables: []
@@ -570,7 +570,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
570
570
  version: '0'
571
571
  segments:
572
572
  - 0
573
- hash: -1038174595
573
+ hash: -43345519
574
574
  required_rubygems_version: !ruby/object:Gem::Requirement
575
575
  none: false
576
576
  requirements: