File tree Expand file tree Collapse file tree 2 files changed +11
-11
lines changed
time_tracker_api/time_entries Expand file tree Collapse file tree 2 files changed +11
-11
lines changed Original file line number Diff line number Diff line change @@ -113,12 +113,6 @@ def elapsed_time(self) -> timedelta:
113113 end_datetime = str_to_datetime (self .end_date )
114114 return end_datetime - start_datetime
115115
116- def in_range (self , start_date : datetime , end_date : datetime ) -> bool :
117- return (
118- start_date <= str_to_datetime (self .start_date ) <= end_date
119- and start_date <= str_to_datetime (self .end_date ) <= end_date
120- )
121-
122116 def __add__ (self , other ):
123117 if type (other ) is ProjectCosmosDBModel :
124118 time_entry = self .__class__
Original file line number Diff line number Diff line change @@ -76,11 +76,17 @@ def summary(self):
7676
7777
7878def filter_time_entries (time_entries , dr : DateRange ):
79- return [
80- t
81- for t in time_entries
82- if t .in_range (start_date = dr .start (), end_date = dr .end ())
83- ]
79+ start , end = dr .start (), dr .end ()
80+ result = []
81+ for t in time_entries :
82+ te_start , te_end = (
83+ str_to_datetime (t .start_date ),
84+ str_to_datetime (t .end_date ),
85+ )
86+ in_range = start <= te_start <= end or start <= te_end <= end
87+ if in_range :
88+ result .append (t )
89+ return result
8490
8591
8692def worked_time_in_day (time_entries , tz ):
You can’t perform that action at this time.
0 commit comments