From 8a3fb92bbe7ba32d72743956879f087d842b4ac1 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 15 Dec 2017 14:53:57 -0500
Subject: [PATCH] paging

---
 .../organizationEventsController.js           | 32 ++++++++++++++-----
 .../views/organizationEvents.html             |  8 ++++-
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/app/organization/organizationEventsController.js b/src/app/organization/organizationEventsController.js
index db48948ae4..afe0d3f741 100644
--- a/src/app/organization/organizationEventsController.js
+++ b/src/app/organization/organizationEventsController.js
@@ -6,6 +6,7 @@
         $scope.events = [];
         $scope.orgUsers = [];
         $scope.loading = true;
+        $scope.continuationToken = null;
 
         var d = new Date();
         $scope.filterEnd = new Date(d.getFullYear(), d.getMonth(), d.getDate(), 23, 59);
@@ -17,7 +18,11 @@
         });
 
         $scope.refresh = function () {
-            loadEvents();
+            loadEvents(true);
+        };
+
+        $scope.next = function () {
+            loadEvents(false);
         };
 
         var i = 0,
@@ -44,13 +49,11 @@
 
                 $scope.orgUsers = users;
 
-                return loadEvents();
+                return loadEvents(true);
             });
         }
 
-        function loadEvents() {
-            $scope.loading = true;
-
+        function loadEvents(clearExisting) {
             var start = null, end = null;
             try {
                 var format = 'yyyy-MM-ddTHH:mm';
@@ -59,16 +62,24 @@
             } catch (e) { }
 
             if (!start || !end || end < start) {
-                $scope.loading = false;
                 alert('Invalid date range.');
                 return;
             }
 
+            if (clearExisting) {
+                $scope.continuationToken = null;
+                $scope.events = [];
+            }
+
+            $scope.loading = true;
             return apiService.events.listOrganization({
                 orgId: $state.params.orgId,
                 start: start,
-                end: end
+                end: end,
+                continuationToken: $scope.continuationToken
             }).$promise.then(function (list) {
+                $scope.continuationToken = list.ContinuationToken;
+
                 var events = [];
                 for (i = 0; i < list.Data.length; i++) {
                     var userId = list.Data[i].ActingUserId || list.Data[i].UserId;
@@ -81,7 +92,12 @@
                         date: list.Data[i].Date
                     });
                 }
-                $scope.events = events;
+                if ($scope.events && $scope.events.length > 0) {
+                    $scope.events = $scope.events.concat(events);
+                }
+                else {
+                    $scope.events = events;
+                }
                 $scope.loading = false;
             });
         }
diff --git a/src/app/organization/views/organizationEvents.html b/src/app/organization/views/organizationEvents.html
index 1bb0ac4e73..6adbf2248f 100644
--- a/src/app/organization/views/organizationEvents.html
+++ b/src/app/organization/views/organizationEvents.html
@@ -39,7 +39,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                        <tr ng-repeat="event in filteredEvents = (events | orderBy: ['-date'])">
+                        <tr ng-repeat="event in filteredEvents = (events)">
                             <td style="width: 210px; min-width: 100px;">
                                 {{event.date | date:'medium'}}
                             </td>
@@ -57,5 +57,11 @@
                 </table>
             </div>
         </div>
+        <div class="box-footer text-center" ng-show="continuationToken">
+            <button class="btn btn-link btn-block" ng-click="next()" ng-if="!loading">
+                Load more...
+            </button>
+            <i class="fa fa-fw fa-refresh fa-spin text-muted" ng-if="loading"></i>
+        </div>
     </div>
 </section>