rtt 0.0.0.11 → 0.0.0.12
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +1 -1
- data/db/rtt.sqlite3 +0 -0
- data/lib/rtt/query_builder.rb +6 -6
- data/rtt.gemspec +1 -1
- metadata +3 -3
data/Rakefile
CHANGED
@@ -3,7 +3,7 @@ require 'echoe'
|
|
3
3
|
|
4
4
|
# PACKAGING ============================================================
|
5
5
|
|
6
|
-
Echoe.new('rtt', '0.0.0.
|
6
|
+
Echoe.new('rtt', '0.0.0.12') do |p|
|
7
7
|
p.description = 'RTT is a tool for tracking time'
|
8
8
|
p.url = 'http://github.com/marklazz/rtt'
|
9
9
|
p.author = 'Marcelo Giorgi'
|
data/db/rtt.sqlite3
CHANGED
Binary file
|
data/lib/rtt/query_builder.rb
CHANGED
@@ -12,12 +12,12 @@ module Rtt
|
|
12
12
|
|
13
13
|
def rtt_build_conditions options
|
14
14
|
conditions = options
|
15
|
-
conditions[:date.gte] = Date.parse(options
|
16
|
-
conditions[:date.lte] = Date.parse(options
|
17
|
-
conditions[:date] = Date.parse(options
|
18
|
-
conditions[:user] = { :nickname => options
|
19
|
-
conditions[:project] = { :name => options
|
20
|
-
conditions.deep_merge!({ :project => { :client => { :name => options
|
15
|
+
conditions[:date.gte] = Date.parse(options.delete(:from)) if options[:from]
|
16
|
+
conditions[:date.lte] = Date.parse(options.delete(:to)) if options[:to]
|
17
|
+
conditions[:date] = Date.parse(options.delete(:date)) if options[:date]
|
18
|
+
conditions[:user] = { :nickname => options.delete(:nickname) } if options[:nickname]
|
19
|
+
conditions[:project] = { :name => options.delete(:project) } if options[:project]
|
20
|
+
conditions.deep_merge!({ :project => { :client => { :name => options.delete(:client) } }}) if options[:client]
|
21
21
|
conditions
|
22
22
|
end
|
23
23
|
end
|
data/rtt.gemspec
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rtt
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 87
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 0
|
9
9
|
- 0
|
10
|
-
-
|
11
|
-
version: 0.0.0.
|
10
|
+
- 12
|
11
|
+
version: 0.0.0.12
|
12
12
|
platform: ruby
|
13
13
|
authors:
|
14
14
|
- Marcelo Giorgi
|