mirror of
https://github.com/System-End/hackatime.git
synced 2026-04-19 19:55:16 +00:00
Add start_date/end_date
This commit is contained in:
parent
f73d268d42
commit
f2c4bd6a9d
2 changed files with 22 additions and 5 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -43,3 +43,6 @@
|
|||
|
||||
.idea
|
||||
.DS_Store
|
||||
|
||||
node_modules/
|
||||
public/vite-dev
|
||||
|
|
@ -206,11 +206,24 @@ module Api
|
|||
user = find_user_by_id
|
||||
return unless user
|
||||
|
||||
date = parse_date_param
|
||||
return unless date
|
||||
if params[:start_date].present? || params[:end_date].present?
|
||||
start_time = begin
|
||||
Date.parse(params[:start_date]).beginning_of_day.utc
|
||||
rescue
|
||||
10.years.ago.utc
|
||||
end
|
||||
end_time = begin
|
||||
Date.parse(params[:end_date]).end_of_day.utc
|
||||
rescue
|
||||
Date.current.end_of_day.utc
|
||||
end
|
||||
else
|
||||
date = parse_date_param
|
||||
return unless date
|
||||
|
||||
start_time = date.beginning_of_day.utc
|
||||
end_time = date.end_of_day.utc
|
||||
start_time = date.beginning_of_day.utc
|
||||
end_time = date.end_of_day.utc
|
||||
end
|
||||
|
||||
heartbeats = user.heartbeats
|
||||
.where(time: start_time..end_time)
|
||||
|
|
@ -219,7 +232,8 @@ module Api
|
|||
render json: {
|
||||
user_id: user.id,
|
||||
username: user.display_name,
|
||||
date: date.iso8601,
|
||||
start_date: start_time.to_date.iso8601,
|
||||
end_date: end_time.to_date.iso8601,
|
||||
timezone: user.timezone,
|
||||
heartbeats: heartbeats.map do |hb|
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue