[hamster-applet] avoid microseconds, removed a forgotten select in get_facts

[Toms Baugis <tbaugis src gnome org>]

commit 6790ec136cc5d50a8f836e7c6f3f3ca57d3dfd6b
Author: Toms Bauģis <toms baugis gmail com>
Date:   Mon Nov 9 20:38:57 2009 +0000

    avoid microseconds, removed a forgotten select in get_facts

 hamster/db.py |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/hamster/db.py b/hamster/db.py
index 0bed313..934cc8f 100644
--- a/hamster/db.py
+++ b/hamster/db.py
@@ -258,6 +258,7 @@ class Storage(storage.Storage):
         if end_time - fact['start_time'] < datetime.timedelta(minutes = 1):
             self.__remove_fact(fact['id'])
         else:
+            end_time = end_time.replace(microsecond = 0)
             query = """
                        UPDATE facts
                           SET end_time = ?
@@ -471,22 +472,15 @@ class Storage(storage.Storage):
         facts = self.fetchall(query, (_("Unsorted"), datetime_from, datetime_to))
         res = []
 
-        today = dt.date.today()
-        yesterday = dt.date.today() - dt.timedelta(days = 1)
-        now = dt.datetime.now()
-        
-        # fetch last activity here - we will be looking it up for comparisons
-        last_activity = None
-        if date >= today >= end_date or abs(date - today).days < 2 \
-                                   or abs(end_date - today).days < 2:
-            last_activity = self.__get_last_activity()
-
         for fact in facts:
             # heuristics to assign tasks to proper days
+
+            # if fact has no end time, set the last minute of the day,
+            # or current time if fact has happened in last 24 hours
             if fact["end_time"]:
                 fact_end_time = fact["end_time"]
-            elif (today - fact["start_time"].date()) <= dt.timedelta(days=1):
-                fact_end_time = now
+            elif (dt.date.today() - fact["start_time"].date()) <= dt.timedelta(days=1):
+                fact_end_time = dt.datetime.now().replace(microsecond = 0)
             else:
                 fact_end_time = fact["start_time"].replace(hour=23, minute=59)