This commit is contained in:
Kyle Spearrin 2017-12-15 14:53:57 -05:00
parent de3a9b9903
commit 8a3fb92bbe
2 changed files with 31 additions and 9 deletions

View File

@ -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;
});
}

View File

@ -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>