From 6cc0482bfb40b5d02f73bd39d1af1ce59cdc7797 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <jschorr@gmail.com>
Date: Mon, 9 Dec 2013 21:13:21 -0500
Subject: [PATCH] Make sure to properly load the entries for the last day

---
 data/model.py    | 2 +-
 endpoints/api.py | 5 +++--
 static/js/app.js | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/data/model.py b/data/model.py
index 57d9679c2..629d06700 100644
--- a/data/model.py
+++ b/data/model.py
@@ -1070,7 +1070,7 @@ def list_logs(user_or_organization_name, start_time, end_time, performer = None,
     return joined.where(
       User.username == user_or_organization_name,
       LogEntry.datetime >= start_time,
-      LogEntry.datetime <= end_time).order_by(LogEntry.datetime.desc())
+      LogEntry.datetime < end_time).order_by(LogEntry.datetime.desc())
 
 def log_action(kind_name, user_or_organization_name, performer=None, repository=None,
                access_token=None, ip=None, metadata={}, timestamp=None):
diff --git a/endpoints/api.py b/endpoints/api.py
index e0856b840..786393810 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -1773,7 +1773,7 @@ def get_logs(namespace, start_time, end_time, performer_name=None, repository=No
 
   if start_time:
     try:
-      start_time = datetime.strptime(start_time, '%m/%d/%Y')
+      start_time = datetime.strptime(start_time + ' UTC', '%m/%d/%Y %Z')
     except ValueError:
       start_time = None
 
@@ -1782,7 +1782,8 @@ def get_logs(namespace, start_time, end_time, performer_name=None, repository=No
 
   if end_time:
     try:
-      end_time = datetime.strptime(end_time, '%m/%d/%Y')
+      end_time = datetime.strptime(end_time + ' UTC', '%m/%d/%Y %Z')
+      end_time = end_time + timedelta(days=1)
     except ValueError:
       end_time = None
       
diff --git a/static/js/app.js b/static/js/app.js
index eebb1bedb..e5480dbf5 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -788,7 +788,7 @@ quayApp.directive('logsView', function () {
         }
 
         var twoWeeksAgo = getOffsetDate($scope.logEndDate, -14);
-        if ($scope.logStartDate >= $scope.logEndDate || $scope.logStartDate < twoWeeksAgo) {
+        if ($scope.logStartDate > $scope.logEndDate || $scope.logStartDate < twoWeeksAgo) {
           $scope.logStartDate = twoWeeksAgo;
         }