Merge branch 'diggyk-master'

dropbox · Sep 16, 2015 · e23d1f0 · e23d1f0
2 parents 0917264 + bb9125d
commit e23d1f0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/hermes/webapp/src/css/main.css b/hermes/webapp/src/css/main.css
@@ -47,9 +47,10 @@ h1 {
 .quest-list {
     background: #fff5cc;
     padding: 0px;
-    -webkit-border-radius: 0px 5px 5px 0px;
-    -moz-border-radius: 0px 5px 5px 0px;
-    border-radius: 0px 5px 5px 0px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: #fce897 solid 1px;
 }
 
 
@@ -66,7 +67,7 @@ h1 {
 
 .quest-list-filter {
     padding: 10px 10px 20px 10px;
-    border-bottom: #d0d4d9 2px dashed;
+    border-bottom: #fce897 2px dotted;
 }
 
 .quest-list-filter input {
@@ -87,7 +88,7 @@ h1 {
 
 .quest-list-entry {
     padding: 10px 10px 20px 10px;
-    border-bottom: #d0d4d9 1px solid;
+    border-bottom: #fce897 1px solid;
 }
 
 .quest-list-entry:last-child {
@@ -137,4 +138,4 @@ h1 {
     padding-right: 15px;
     padding-top: 5px;
     padding-bottom: 5px;
-}
+}
diff --git a/hermes/webapp/src/js/controllers/questStatusCtrl.js b/hermes/webapp/src/js/controllers/questStatusCtrl.js
@@ -150,6 +150,11 @@
          * @param quest
          */
         function analyzeLabors(ownerData, questData) {
+            if (!ownerData || !questData) {
+                vm.errorMessage = "Failed to load data.  Please try again.";
+                return;
+            }
+
             // keep the latest labor with an given id or starting_labor_id
             // FIXME: This should all be done by the backend but isn't supported yet
             var laborsUnique  = {};

diff --git a/hermes/webapp/src/js/services/hermesService.js b/hermes/webapp/src/js/services/hermesService.js
@@ -36,8 +36,8 @@
                 return response.data;
             }
 
-            function getQuestsFailed() {
-                console.error("API call to get open Quests failed. " + error.code);
+            function getQuestsFailed(error) {
+                console.error("API call to get open Quests failed. " + error.status + " " + error.statusText);
             }
         }
 
@@ -54,8 +54,8 @@
                 return response.data;
             }
 
-            function getQuestFailed() {
-                console.error("API call to get details of Quest " + id + " failed: " + error.code);
+            function getQuestFailed(error) {
+                console.error("API call to get details of Quest " + id + " failed: "  + error.status + " " + error.statusText);
             }
         }
 
@@ -68,8 +68,8 @@
                 return response.data.results;
             }
 
-            function getOwnersFailed() {
-                console.error("API to get owners failed: " + error.code);
+            function getOwnersFailed(error) {
+                console.error("API to get owners failed: " + error.status + " " + error.statusText);
             }
         }
 
@@ -84,7 +84,7 @@
             }
 
             function getFatesFailed(error) {
-                console.error("API call to get Fates failed. " + error.code)
+                console.error("API call to get Fates failed. "  + error.status + " " + error.statusText)
             }
         }
 

diff --git a/hermes/webapp/src/templates/questStatus.html b/hermes/webapp/src/templates/questStatus.html
@@ -3,11 +3,11 @@
         <div class="col-md-3 quest-list">
             <div class="quest-list-filter">
                 <div>
-                    <strong>Filtering Options</strong>
+                    <label for="creatorFilter">Filter by Creator</label>
                 </div>
                 <div class="row">
                     <div class="col-md-10">
-                        <input type="text" ng-model="qc.filterByCreator" />
+                        <input id="creatorFilter" type="text" ng-model="qc.filterByCreator" />
                     </div>
                     <div class="col-md-2">
                         <button ng-click="qc.runNewFilter()">GO</button>
@@ -88,4 +88,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>