Merge pull request #128 from edx/cdodge/conflict-resolution

Cdodge/conflict resolution

.travis.yml

@@ -26,7 +26,3 @@ script:
     - pylint edx_proctoring --report=no
 
 after_success: coveralls
-
-branches:
-    only:
-      - master

edx_proctoring/static/proctoring/js/views/proctored_exam_attempt_view.js

@@ -136,12 +136,31 @@ var edx = edx || {};
         },
         render: function () {
             if (this.template !== null) {
+
+                var data_json = this.collection.toJSON()[0];
+
+                // calculate which pages ranges to display
+                // show no more than 5 pages at the same time
+                var start_page = data_json.pagination_info.current_page - 2;
+
+                if (start_page < 1) {
+                    start_page = 1;
+                }
+
+                var end_page = start_page + 4;
+
+                if (end_page > data_json.pagination_info.total_pages) {
+                    end_page = data_json.pagination_info.total_pages;
+                }
+
                 var data = {
-                    proctored_exam_attempts: this.collection.toJSON()[0].proctored_exam_attempts,
-                    pagination_info: this.collection.toJSON()[0].pagination_info,
-                    attempt_url: this.collection.toJSON()[0].attempt_url,
+                    proctored_exam_attempts: data_json.proctored_exam_attempts,
+                    pagination_info: data_json.pagination_info,
+                    attempt_url: data_json.attempt_url,
                     inSearchMode: this.inSearchMode,
-                    searchText: this.searchText
+                    searchText: this.searchText,
+                    start_page: start_page,
+                    end_page: end_page
                 };
                 _.extend(data, viewHelper);
                 var html = this.template(data);

edx_proctoring/static/proctoring/templates/student-proctored-exam-attempts.underscore

@@ -34,7 +34,7 @@
                         </a>
                     </li>
                     <% }%>
-                    <% for(var n = 1; n <= pagination_info.total_pages; n++) { %>
+                    <% for(var n = start_page; n <= end_page; n++) { %>
                         <li>
                             <a class="target-link <% if (pagination_info.current_page == n){ %> active <% } %>"
                             data-target-url="

setup.py

@@ -34,7 +34,7 @@ def load_requirements(*requirements_paths):
 
 setup(
     name='edx-proctoring',
-    version='0.6.3',
+    version='0.7.2',
     description='Proctoring subsystem for Open edX',
     long_description=open('README.md').read(),
     author='edX',