it-logica-application-backbone 1.0.33 → 1.0.34

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.33
1
+ 1.0.34
@@ -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.33"
8
+ s.version = "1.0.34"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Ladas"]
@@ -357,13 +357,9 @@ module ModelMixins
357
357
  end
358
358
  end
359
359
 
360
- if !params.blank? && (params['date_from'] || params['number_from'])
360
+ if !params.blank? && (params['date_from'])
361
361
  from_hash = params['date_from']
362
- if from_hash.blank?
363
- from_hash = params['number_from']
364
- else
365
- from_hash.merge!(params['number_from']) unless params['number_from'].blank?
366
- end
362
+
367
363
  from_hash.each_pair do |i, v|
368
364
  i = i.gsub(/___unknown___\./, "") #some cleaning job
369
365
  unless v.blank?
@@ -377,19 +373,62 @@ module ModelMixins
377
373
  cond_str += " AND " unless cond_str.blank?
378
374
  cond_id = "date_from_#{i.gsub(/\./, '_')}"
379
375
  cond_str += "#{i} >= :#{cond_id}" #OR guest_email LIKE :find"
380
- cond_hash.merge!({cond_id.to_sym => "#{v}"})
376
+ v = Time.parse(v) # queries to database has to be in utc date
377
+ cond_hash.merge!({cond_id.to_sym => "#{v.utc}"})
381
378
  end
382
379
  end
383
380
  end
384
381
  end
385
382
 
386
- if !params.blank? && (params['date_to'] || params['number_to'])
383
+ if !params.blank? && (params['date_to'])
387
384
  to_hash = params['date_to']
388
- if to_hash.blank?
389
- to_hash = params['number_to']
390
- else
391
- to_hash.merge!(params['number_to']) unless params['number_to'].blank?
385
+
386
+ to_hash.each_pair do |i, v|
387
+ i = i.gsub(/___unknown___\./, "") #some cleaning job
388
+ unless v.blank?
389
+ if i.match(/^.*?___sql_expression___.*$/i)
390
+ i = i.gsub(/___sql_expression___\./, "") #some cleaning job
391
+ having_cond_str += " AND " unless having_cond_str.blank?
392
+ cond_id = "date_to_#{i.gsub(/\./, '_')}"
393
+ having_cond_str += "#{i} <= :#{cond_id}" #OR guest_email LIKE :find"
394
+ having_cond_hash.merge!({cond_id.to_sym => "#{v}"})
395
+ else
396
+ cond_str += " AND " unless cond_str.blank?
397
+ cond_id = "date_to_#{i.gsub(/\./, '_')}"
398
+ cond_str += "#{i} <= :#{cond_id}" #OR guest_email LIKE :find"
399
+ v = Time.parse(v) # queries to database has to be in utc date
400
+ cond_hash.merge!({cond_id.to_sym => "#{v.utc}"})
401
+ end
402
+ end
403
+ end
404
+ end
405
+
406
+
407
+ if !params.blank? && (params['number_from'])
408
+ from_hash = params['number_from']
409
+
410
+ from_hash.each_pair do |i, v|
411
+ i = i.gsub(/___unknown___\./, "") #some cleaning job
412
+ unless v.blank?
413
+ if i.match(/^.*?___sql_expression___.*$/i)
414
+ i = i.gsub(/___sql_expression___\./, "") #some cleaning job
415
+ having_cond_str += " AND " unless having_cond_str.blank?
416
+ cond_id = "date_from_#{i.gsub(/\./, '_')}"
417
+ having_cond_str += "#{i} >= :#{cond_id}" #OR guest_email LIKE :find"
418
+ having_cond_hash.merge!({cond_id.to_sym => "#{v}"})
419
+ else
420
+ cond_str += " AND " unless cond_str.blank?
421
+ cond_id = "date_from_#{i.gsub(/\./, '_')}"
422
+ cond_str += "#{i} >= :#{cond_id}" #OR guest_email LIKE :find"
423
+ cond_hash.merge!({cond_id.to_sym => "#{v}"})
424
+ end
425
+ end
392
426
  end
427
+ end
428
+
429
+ if !params.blank? && (params['number_to'])
430
+ to_hash = params['number_to']
431
+
393
432
  to_hash.each_pair do |i, v|
394
433
  i = i.gsub(/___unknown___\./, "") #some cleaning job
395
434
  unless v.blank?
@@ -409,6 +448,7 @@ module ModelMixins
409
448
  end
410
449
  end
411
450
 
451
+
412
452
  #items = self.joins("LEFT OUTER JOIN intranet_text_pages ON resource_id = intranet_text_pages.id").where(cond_str, cond_hash).paginate(:page => params[:page], :per_page => per_page).order(order_by).selection(settings)
413
453
  #if params[:page].to_i > items.total_pages && items.total_pages > 0
414
454
  # params[:page] = 1
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.33
4
+ version: 1.0.34
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-09-13 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: htmlentities
16
- requirement: &77498870 !ruby/object:Gem::Requirement
16
+ requirement: &71370050 !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: *77498870
24
+ version_requirements: *71370050
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: shoulda
27
- requirement: &77498490 !ruby/object:Gem::Requirement
27
+ requirement: &71369730 !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: *77498490
35
+ version_requirements: *71369730
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rdoc
38
- requirement: &77497730 !ruby/object:Gem::Requirement
38
+ requirement: &71368910 !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: *77497730
46
+ version_requirements: *71368910
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: bundler
49
- requirement: &77519900 !ruby/object:Gem::Requirement
49
+ requirement: &70780380 !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: *77519900
57
+ version_requirements: *70780380
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: jeweler
60
- requirement: &77518910 !ruby/object:Gem::Requirement
60
+ requirement: &70779330 !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: *77518910
68
+ version_requirements: *70779330
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: simplecov
71
- requirement: &77518460 !ruby/object:Gem::Requirement
71
+ requirement: &70778790 !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: *77518460
79
+ version_requirements: *70778790
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: 978516881
580
+ hash: -939288579
581
581
  required_rubygems_version: !ruby/object:Gem::Requirement
582
582
  none: false
583
583
  requirements: