Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed timing issues.

Browse source
This commit is contained in:
Martin Edenhofer 2015-10-20 11:31:08 +02:00
parent 76637f55a2
commit 12e3bcaa80
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/controllers/reports_controller.rb
View file

@ -23,9 +23,9 @@ class ReportsController < ApplicationController
created = aggs(start, stop, 'minute', 'created_at') created = aggs(start, stop, 'minute', 'created_at')
closed = aggs(start, stop, 'minute', 'close_time') closed = aggs(start, stop, 'minute', 'close_time')
elsif params[:timeRange] == 'day' elsif params[:timeRange] == 'day'
start = Date.parse("#{params[:year]}-#{params[:month]}-#{params[:day]}").iso8601 date = Date.parse("#{params[:year]}-#{params[:month]}-#{params[:day]}").to_s
start = "#{start}T00:00:00Z" start = "#{date}T00:00:00Z"
stop = "#{start}T23:59:59Z" stop = "#{date}T23:59:59Z"
created = aggs(start, stop, 'hour', 'created_at') created = aggs(start, stop, 'hour', 'created_at')
closed = aggs(start, stop, 'hour', 'close_time') closed = aggs(start, stop, 'hour', 'close_time')
elsif params[:timeRange] == 'week' elsif params[:timeRange] == 'week'
@ -61,9 +61,9 @@ class ReportsController < ApplicationController
start = (Time.zone.now - 60.minutes).iso8601 start = (Time.zone.now - 60.minutes).iso8601
stop = Time.zone.now.iso8601 stop = Time.zone.now.iso8601
elsif params[:timeRange] == 'day' elsif params[:timeRange] == 'day'
start = Date.parse("#{params[:year]}-#{params[:month]}-#{params[:day]}").iso8601 date = Date.parse("#{params[:year]}-#{params[:month]}-#{params[:day]}").to_s
start = "#{start}T00:00:00Z" start = "#{date}T00:00:00Z"
stop = "#{start}T23:59:59Z" stop = "#{date}T23:59:59Z"
elsif params[:timeRange] == 'week' elsif params[:timeRange] == 'week'
start = Date.commercial(params[:year], params[:week]).iso8601 start = Date.commercial(params[:year], params[:week]).iso8601
stop = Date.parse(start).end_of_week stop = Date.parse(start).end_of_week
@ -86,10 +86,14 @@ class ReportsController < ApplicationController
end end
def aggs(range_start, range_end, interval, field) def aggs(range_start, range_end, interval, field)
interval_es = interval
if interval == 'week'
interval_es = 'day'
end
result = SearchIndexBackend.aggs( result = SearchIndexBackend.aggs(
{ {
}, },
[range_start, range_end, field, interval], [range_start, range_end, field, interval_es],
['Ticket'], ['Ticket'],
) )
data = [] data = []
@ -119,12 +123,13 @@ class ReportsController < ApplicationController
end end
next if !item['doc_count'] next if !item['doc_count']
next if item['key_as_string'] !~ /#{start_string}/ next if item['key_as_string'] !~ /#{start_string}/
next if match
match = true match = true
data.push [counter, item['doc_count']] data.push [counter, item['doc_count']]
if interval == 'month' if interval == 'month'
start = start.next_month start = start.next_month
elsif interval == 'week' elsif interval == 'week'
start = start.next_week start = start.next_day
elsif interval == 'day' elsif interval == 'day'
start = start.next_day start = start.next_day
elsif interval == 'hour' elsif interval == 'hour'
@ -138,7 +143,7 @@ class ReportsController < ApplicationController
if interval == 'month' if interval == 'month'
start = start.next_month start = start.next_month
elsif interval == 'week' elsif interval == 'week'
start = start.next_week start = start.next_day
elsif interval == 'day' elsif interval == 'day'
start = start + 1.day start = start + 1.day
elsif interval == 'hour' elsif interval == 'hour'