Merge pull request #60 from diggyk/master

Made the paginator better
dropbox · Oct 1, 2015 · 0135c09 · 0135c09
2 parents 59f96b3 + 9f92ff9
commit 0135c09
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 29 deletions.
diff --git a/hermes/version.py b/hermes/version.py
@@ -1 +1 @@
-__version__ = "0.4.7"
+__version__ = "0.4.8"
diff --git a/hermes/webapp/src/css/main.css b/hermes/webapp/src/css/main.css
@@ -468,6 +468,7 @@ button:disabled {
 .labor-left-panel-page-selector {
     clear: both;
     overflow: auto;
+    padding-bottom: 5px;
 }
 
 .labor-left-panel-page-selector ul {

diff --git a/hermes/webapp/src/js/controllers/laborStatusCtrl.js b/hermes/webapp/src/js/controllers/laborStatusCtrl.js
@@ -109,6 +109,31 @@
             }
         }
 
+        function pageFirst() {
+            pageSetting(1);
+        }
+
+        function pagePrev() {
+            var currentPage = parseInt(pageSetting());
+
+            if (currentPage > 1) {
+                pageSetting(currentPage - 1);
+            }
+        }
+
+        function pageNext() {
+            var currentPage = parseInt(pageSetting());
+            var maxPage = Math.floor((vm.totalLabors - 1) / vm.limit) + 1;
+            if (currentPage < maxPage) {
+                pageSetting(currentPage + 1);
+            }
+        }
+
+        function pageLast() {
+            var maxPage = Math.floor((vm.totalLabors - 1) / vm.limit) + 1;
+            pageSetting(maxPage);
+        }
+
         function pageValues() {
             var maxPage = Math.floor((vm.totalLabors - 1) / vm.limit);
             var options = [];
@@ -122,6 +147,10 @@
         vm.limitSetting = limitSetting;
         vm.limitValues = limitValues;
         vm.pageSetting = pageSetting;
+        vm.pageFirst = pageFirst;
+        vm.pagePrev = pagePrev;
+        vm.pageNext = pageNext;
+        vm.pageLast = pageLast;
         vm.pageValues = pageValues;
 
         ////////////////////////////////

diff --git a/hermes/webapp/src/js/controllers/questStatusCtrl.js b/hermes/webapp/src/js/controllers/questStatusCtrl.js
@@ -4,8 +4,6 @@
     function QuestStatusCtrl(hermesService, $q, $routeParams, $location) {
         var vm = this;
 
-        vm.initialized = false;
-
         vm.errorMessage = null;
         vm.filterByCreator = null;
         vm.queryInput = null;
@@ -26,8 +24,9 @@
         vm.newQuestSelection = newQuestSelection;
         vm.goToCreatePage = goToCreatePage;
 
-        if (!vm.initialized) {
-            vm.initialized = true;
+        if ($routeParams.questId) {
+            getOpenQuests();
+        } else {
             if ($routeParams.byQuery) {
                 vm.queryInput = $routeParams.byQuery;
             }
@@ -76,6 +75,31 @@
             }
         }
 
+        function pageFirst() {
+            pageSetting(1);
+        }
+
+        function pagePrev() {
+            var currentPage = parseInt(pageSetting());
+
+            if (currentPage > 1) {
+                pageSetting(currentPage - 1);
+            }
+        }
+
+        function pageNext() {
+            var currentPage = parseInt(pageSetting());
+            var maxPage = Math.floor((vm.totalQuests - 1) / vm.limit) + 1;
+            if (currentPage < maxPage) {
+                pageSetting(currentPage + 1);
+            }
+        }
+
+        function pageLast() {
+            var maxPage = Math.floor((vm.totalQuests - 1) / vm.limit) + 1;
+            pageSetting(maxPage);
+        }
+
         function pageValues() {
             var maxPage = Math.floor((vm.totalQuests - 1) / vm.limit);
             var options = [];
@@ -89,6 +113,10 @@
         vm.limitSetting = limitSetting;
         vm.limitValues = limitValues;
         vm.pageSetting = pageSetting;
+        vm.pageFirst = pageFirst;
+        vm.pagePrev = pagePrev;
+        vm.pageNext = pageNext;
+        vm.pageLast = pageLast;
         vm.pageValues = pageValues;
 
         ////////////////////////////////
@@ -175,7 +203,7 @@
             ]).then(function(data) {
                 vm.hostOwners = data[0];
                 vm.selectedQuestDetails = data[1];
-                $location.path('/v1/quests/' + quest.id, false);
+                $location.update_path('/v1/quests/' + quest.id, false);
                 analyzeLabors(data[0], data[1]);
             });
         }

diff --git a/hermes/webapp/src/templates/laborList.html b/hermes/webapp/src/templates/laborList.html
@@ -53,13 +53,13 @@
                 </div>
                 <div ng-if="lsc.laborData  && !lsc.errorMessage" class="labor-left-panel-page-selector">
                     <strong>Page:</strong>
-                    <ul>
-                        <li ng-click="lsc.pageSetting(pageVal)"
-                            ng-repeat="pageVal in lsc.pageValues()"
-                            ng-class="(lsc.pageSetting() == pageVal) ? 'selected' : ''">
-                            {{pageVal}}
-                        </li>
-                    </ul>
+                    <button style="float:none" type="button" ng-click="lsc.pageFirst()">First</button>
+                    <button style="float:none" type="button" ng-click="lsc.pagePrev()">Prev</button>
+                    <select style="margin-left: 0px;" ng-model="lsc.pageSetting"
+                            ng-model-options="lsc.limitOptions"
+                            ng-options="pageVal for pageVal in lsc.pageValues()"></select>
+                    <button style="float:none" type="button" ng-click="lsc.pageNext()">Next</button>
+                    <button style="float:none" type="button" ng-click="lsc.pageLast()">Last</button>
                 </div>
                 <div ng-if="lsc.errorMessage" class="error-message" ng-bind="lsc.errorMessage"></div>
             </div>
@@ -93,7 +93,11 @@
                 <div class="labor-list-row" ng-if="lsc.laborData  && !lsc.errorMessage"
                      ng-repeat="labor in (pageData = (lsc.laborData | limitTo:lsc.limit:lsc.offset)) track by labor.id">
                     <div class="quest-info" ng-if="labor.quest && labor.quest.id != pageData[$index-1].quest.id">
-                        <div class="title">Quest {{labor.quest.id}}</div>
+                        <div class="title">
+                            <a ng-href="/v1/quests/{{labor.quest.id}}">
+                            Quest {{labor.quest.id}}
+                            </a>
+                        </div>
                         <div class="info">Created by <a href="mailto:{{labor.quest.creator}}">{{labor.quest.creator}}</a></div>
                         <div class="details">
                             {{labor.quest.description}}
@@ -148,13 +152,13 @@
                 </div>
                 <div ng-if="lsc.laborData  && !lsc.errorMessage" class="labor-left-panel-page-selector">
                     <strong>Page:</strong>
-                    <ul>
-                        <li ng-click="lsc.pageSetting(pageVal)"
-                            ng-repeat="pageVal in lsc.pageValues()"
-                            ng-class="(lsc.pageSetting() == pageVal) ? 'selected' : ''">
-                            {{pageVal}}
-                        </li>
-                    </ul>
+                    <button style="float:none" type="button" ng-click="lsc.pageFirst()">First</button>
+                    <button style="float:none" type="button" ng-click="lsc.pagePrev()">Prev</button>
+                    <select style="margin-left: 0px;" ng-model="lsc.pageSetting"
+                            ng-model-options="lsc.limitOptions"
+                            ng-options="pageVal for pageVal in lsc.pageValues()"></select>
+                    <button style="float:none" type="button" ng-click="lsc.pageNext()">Next</button>
+                    <button style="float:none" type="button" ng-click="lsc.pageLast()">Last</button>
                 </div>
             </div>
         </div>

diff --git a/hermes/webapp/src/templates/questStatus.html b/hermes/webapp/src/templates/questStatus.html
@@ -47,15 +47,15 @@
                         </select>
                     </label>
                 </div>
-                <div class="quest-list-page-selector">
+                <div class="quest-list-page-selector" style="padding-bottom: 5px;">
                     <strong>Page:</strong>
-                    <ul>
-                        <li ng-click="qc.pageSetting(pageVal)"
-                            ng-repeat="pageVal in qc.pageValues()"
-                            ng-class="(qc.pageSetting() == pageVal) ? 'selected' : ''">
-                            {{pageVal}}
-                        </li>
-                    </ul>
+                    <button style="float:none" type="button" ng-click="qc.pageFirst()">First</button>
+                    <button style="float:none" type="button" ng-click="qc.pagePrev()">Prev</button>
+                    <select style="margin-left: 0px;" ng-model="qc.pageSetting"
+                            ng-model-options="qc.limitOptions"
+                            ng-options="pageVal for pageVal in qc.pageValues()"></select>
+                    <button style="float:none" type="button" ng-click="qc.pageNext()">Next</button>
+                    <button style="float:none" type="button" ng-click="qc.pageLast()">Last</button>
                 </div>
                 <div ng-if="qc.errorMessage" class="error-message" ng-bind="qc.errorMessage"></div>
             </div>