From ca5417ae93e888b917373ff13d5a968df21b42ae Mon Sep 17 00:00:00 2001 From: mlncn Date: Mon, 3 May 2021 00:13:07 -0400 Subject: [PATCH] Fix both filtering and an opposite logic error and our newest feature is done --- pomodoro_to_harvest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pomodoro_to_harvest.py b/pomodoro_to_harvest.py index 9996cb5..5762933 100644 --- a/pomodoro_to_harvest.py +++ b/pomodoro_to_harvest.py @@ -33,7 +33,7 @@ timelog["recorded"] = pd.to_datetime(timelog["recorded"]).dt.tz_convert("US/East latest_recorded = settings.pomodoro_latest_recorded() if latest_recorded: - timelog = timelog.query("recorded>" + latest_recorded) + timelog = timelog[timelog.recorded > pd.to_datetime(latest_recorded)] timelog["time"] = 30 # A pomodoro started before 3am Eastern time is considered to be a continuation @@ -96,7 +96,7 @@ for preferred, alternatives in replacement_project_names.items(): # The fillna is essential or we drop entries with blank ('None') projects. tl = timelog.groupby(["date", timelog.project.fillna(""), "description"]).agg({"time": 'sum', "started": 'min', "recorded": 'max'}).reset_index() -if hasattr(sys, 'ps1'): +if not hasattr(sys, 'ps1'): tl.to_csv('harvest-ready.csv', index=False) settings.pomodoro_latest_recorded(tl.recorded.max()) else: