generate_timesheet: period interval

Author: clstaudt

tests/test_invoice.py

@@ -52,7 +52,7 @@ def test_generate_invoice(
             timesheet = timetracking.generate_timesheet(
                 source=demo_calendar_timetracking,
                 project=project,
-                period=period,
+                period_start=period,
                 item_description=project.title,
             )
             if not timesheet.empty:

tests/test_timetracking.py

@@ -30,7 +30,7 @@ def test_generate_timesheet(
             timesheet = timetracking.generate_timesheet(
                 source=demo_calendar_timetracking,
                 project=project,
-                period=period,
+                period_start=period,
                 item_description=project.title,
             )
             assert (timesheet.empty) or (timesheet.total >= pandas.Timedelta("0 hours"))

tuttle/timetracking.py

@@ -24,13 +24,20 @@
 def generate_timesheet(
     source,
     project: Project,
-    period: str,
+    period_start: str,
+    period_end: str = None,
     date: datetime.date = datetime.date.today(),
     comment: str = "",
     group_by: str = None,
     item_description: str = None,
     as_dataframe: bool = False,
 ) -> Timesheet:
+    if period_end:
+        period = (period_start, period_end)
+        period_str = f"{period_start} - {period_end}"
+    else:
+        period = period_start
+        period_str = f"{period_start}"
     # convert cal to data
     timetracking_data = None
     if issubclass(type(source), Calendar):
@@ -41,9 +48,13 @@ def generate_timesheet(
         schema.time_tracking.validate(timetracking_data)
     else:
         raise ValueError(f"unknown source: {source}")
-    ts_table = (
-        timetracking_data.loc[period].query(f"tag == '{project.tag}'").sort_index()
-    )
+    tag_query = f"tag == '{project.tag}'"
+    if period_end:
+        ts_table = (
+            timetracking_data.loc[period_start:period_end].query(tag_query).sort_index()
+        )
+    else:
+        ts_table = timetracking_data.loc[period_start].query(tag_query).sort_index()
     # convert all-day entries
     ts_table.loc[ts_table["all_day"], "duration"] = (
         project.contract.unit.to_timedelta() * project.contract.units_per_workday
@@ -58,7 +69,7 @@ def generate_timesheet(
     # TODO: grouping
 
     ts = Timesheet(
-        title=f"{project.title} - {period}",
+        title=f"{project.title} - {period_str}",
         period=period,
         project=project,
         comment=comment,