Skip to content

Fix/add timezone offset summary endpoint#169 #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jun 18, 2020
Merged

Fix/add timezone offset summary endpoint#169 #173

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d1413ee
feat: :construction: add query param time-offset to summary endpoint
Angeluz-07 Jun 9, 2020
d100863
fix: :recycle: make method elapsed time of class TimeEntryModel
Angeluz-07 Jun 10, 2020
0a687a2
fix(worked-time): :building_construction: add classes for daterange g…
Angeluz-07 Jun 12, 2020
8278201
fix: add offset to init query daterange
Angeluz-07 Jun 17, 2020
96bec02
fix: change timezones in memory
Angeluz-07 Jun 17, 2020
e0cbe9f
fix: move in_range method from TimEntry to worked time module
Angeluz-07 Jun 17, 2020
85ee35f
fix: add function to cut off time-entries that partially belongs to a…
Angeluz-07 Jun 18, 2020
725bfe5
fix: make init date_range in utc
Angeluz-07 Jun 18, 2020
f113edb
fix: filtered time_entries by value.
Angeluz-07 Jun 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix: filtered time_entries by value.
  • Loading branch information
@Angeluz-07
Angeluz-07 committed Jun 18, 2020
commit f113edbe79e4d002e5bf2bb3c6e3070ab1912a9b
13 changes: 7 additions & 6 deletions utils/worked_time.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import pytz
from datetime import datetime, timedelta, timezone
from utils.time import datetime_str, str_to_datetime
from copy import deepcopy


class DateRange:
Expand Down Expand Up @@ -83,7 +84,7 @@ def filter_time_entries(time_entries, dr: DateRange):
)
in_range = start <= te_start <= end or start <= te_end <= end
if in_range:
result.append(t)
result.append(deepcopy(t))
return result


Expand All @@ -95,29 +96,29 @@ def cut_time_entries_out_of_range(time_entries, dr):
str_to_datetime(t.end_date),
)
if te_start < start:
t.start = datetime_str(start)
t.start_date = datetime_str(start)
if end < te_end:
t.end = datetime_str(end)
t.end_date = datetime_str(end)


def worked_time_in_day(time_entries, tz):
dr = DayDateRange(tz)
day_time_entries = filter_time_entries(time_entries, dr)
cut_time_entries_out_of_range(time_entries, dr)
cut_time_entries_out_of_range(day_time_entries, dr)
return WorkedTime(day_time_entries).summary()


def worked_time_in_week(time_entries, tz):
dr = WeekDateRange(tz)
week_time_entries = filter_time_entries(time_entries, dr)
cut_time_entries_out_of_range(time_entries, dr)
cut_time_entries_out_of_range(week_time_entries, dr)
return WorkedTime(week_time_entries).summary()


def worked_time_in_month(time_entries, tz):
dr = MonthDateRange(tz)
month_time_entries = filter_time_entries(time_entries, dr)
cut_time_entries_out_of_range(time_entries, dr)
cut_time_entries_out_of_range(month_time_entries, dr)
return WorkedTime(month_time_entries).summary()


Expand Down