#212 Infiniscroll on project activities

djangoproject/core/services/activity_services.py

@@ -4,9 +4,9 @@
 __author__ = 'tony'
 
 
-def get_latest_activity(project_id):
+def get_latest_activity(project_id, offset):
     query = ActionLog.objects.all()
     if project_id:
         query = query.filter(Q(project__id=project_id) & (~Q(action__in=['ADD_ISSUE_COMMENT', 'EDIT_ISSUE_COMMENT'])))
     query = query.order_by('-creationDate')
-    return query[0:10]
+    return query[offset: offset + 10], query.count()

djangoproject/core/views/json_views.py

@@ -50,7 +50,6 @@ def get_offers(request):
 
 
 def list_issue_cards(request):
-
     project_id = None
     if 'project_id' in request.GET:
         project_id = int(request.GET.get('project_id'))
@@ -109,8 +108,13 @@ def toggle_watch(request):
 
 def latest_activity(request):
     project_id = int(request.GET.get('project_id')) if 'project_id' in request.GET else None
-    activities = activity_services.get_latest_activity(project_id)
-    return HttpResponse(json.dumps([activity.to_dict_json() for activity in activities]))
+    offset = int(request.GET.get('offset'))
+    activities, count = activity_services.get_latest_activity(project_id, offset)
+    result = {
+        'count': count,
+        'activities': [activity.to_dict_json() for activity in activities],
+    }
+    return HttpResponse(json.dumps(result))
 
 
 def _convert_offers_to_dict(offers):

djangoproject/statfiles/static/js/activitylist/activitylist.html

@@ -24,6 +24,7 @@
             </div>
             <div ng-switch-when="CHANGE_OFFER">
                 <span title="{[{ activity.creationDate }]}"> {[{ activity.when }]}</span><br>
+                <img ng-src="{[{activity.user_image}]}"> {[{ activity.user_screenname }]}
                 has changed his offer on issue <a href="{[{ activity.issue.link }]}">{[{ activity.issue.title }]} </a>
                 <a href="#">More...</a>
             </div>
@@ -73,4 +74,8 @@
             </div>
         </div>
     </div>
+    <div ng-show="loading"><img src="/static/img2/ajax-loader.gif"></div>
+    <div ng-show="show_more()">
+        <button ng-click="more()">More...</button>
+    </div>
 </div>

djangoproject/statfiles/static/js/activitylist/activitylist.js

@@ -31,6 +31,8 @@ mod.directive('activitylist', function() {
         templateUrl: '/static/js/activitylist/activitylist.html',
         controller: function ($scope, FSApi) {
 
+            $scope.activities = [];
+
             var instrument = function(activity){
                 try{
                     activity.new_dic = JSON.parse(activity.new_json);
@@ -40,16 +42,27 @@ mod.directive('activitylist', function() {
                 }
             };
 
-            FSApi.get_latest_activity($scope.projectId).onResult(function(result){
-                $scope.activities=result;
-                for(var i=0; i < $scope.activities.length; i++){
-                    instrument($scope.activities[i])
-                }
-                $scope.$digest();
-            });
+            var more = function(){
+                $scope.loading = true;
+                FSApi.get_latest_activity($scope.projectId, $scope.activities.length).onResult(function(result){
+                    $scope.loading = false;
+                    $scope.activities = $scope.activities.concat(result.activities);
+                    $scope.count = result.count;
+                    for(var i=0; i < $scope.activities.length; i++){
+                        instrument($scope.activities[i])
+                    }
+                    $scope.$digest();
+                });
+            };
+
+            more();
+
+            $scope.show_more = function(){
+                return $scope.activities.length < $scope.count;
+            };
 
-            $scope.describe = function(activity){
-                return 'Action = ' + activity.action + '/ Entity = ' + activity.entity + '/ Old Value = ' + activity.old_json + '/ New Value = ' + activity.new_json;
+            $scope.more = function(){
+                more();
             }
         }
     }

djangoproject/statfiles/static/js/fsapi.js

@@ -35,9 +35,10 @@ fsapi_mod.factory('FSApi', function(){
         return fs_ajax_async_result($.get, '/core/json/list_issue_cards', params)
     }
 
-    function get_latest_activity(project_id){
+    function get_latest_activity(project_id, offset){
         var params = {
-            project_id: project_id
+            project_id: project_id,
+            offset: offset
         };
         return fs_ajax_async_result($.get, '/core/json/latest_activity', params)
     }