added solved mark to board; it works! gotta write more tests to prove it

buzzdecafe · Nov 8, 2013 · dfba854 · dfba854
1 parent eb877c8
commit dfba854
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 14 deletions.
diff --git a/app/js/controllers/boardCtrl.js b/app/js/controllers/boardCtrl.js
@@ -10,12 +10,6 @@ angular.module('kinghunt.controllers').
 
         $scope.setStatus = function(status) {
           $scope.status = status;
-          // side effects:
-          if (status.progress === "SOLVED") {
-            bookSvc.markSolved($scope.currentId, true);
-          } else if (status.progress === "FAILED") {
-            bookSvc.markSolved($scope.currentId, false);
-          }
         };
 
         $scope.pieces = ['q', 'r', 'b', 'n'];

diff --git a/app/js/directives/solvedMark.js b/app/js/directives/solvedMark.js
@@ -7,14 +7,14 @@ angular.module('kinghunt.directives').
       return {
         restrict: 'C',
         replace: true,
-        template: '<button class="pull-right btn btn-default"><span class="glyphicon {{ solved[problem.id] | toProblemClass }}"></span></button>',
+        template: '<button class="pull-right btn btn-default"><span class="glyphicon {{ problemSolved | toProblemClass }}"></span></button>',
         link: function(scope, element, attrs) {
           // update model
+          scope.problemSolved = bookSvc.isSolved(scope.problem.id);
           element.on('click', function(e) {
             var id = scope.problem.id;
-            var icon = element.find("span.glyphicon");
-            var solvedProblem = icon.is(".solved");
-            bookSvc.markSolved(id, !solvedProblem);
+            scope.problemSolved = !element.find("span.glyphicon").is(".solved");
+            bookSvc.markSolved(id, scope.problemSolved);
             scope.$apply();
           });
         }

diff --git a/app/js/services/bookSvc.js b/app/js/services/bookSvc.js
@@ -42,22 +42,40 @@ angular.module('kinghunt.services').
 
       getNext: function(id) {
         var problems = book.problems;
-        var i, flen;
+        var i, j, flen;
         for (i = 0, flen = problems.length; i < flen; i++) {
           if (problems[i].id === id) {
-            return (problems[i + 1]) ? problems[i + 1] : null;
+            if (skipSolved) {
+              for (j = i + 1; j < problems.length; j++) {
+                if (!solved[problems[j].id]) {
+                  return problems[j];
+                }
+              }
+            } else {
+              return (problems[i + 1]) ? problems[i + 1] : null;
+            }
           }
         }
+        return null;
       },
 
       getPrev: function(id) {
         var problems = book.problems;
-        var i, flen;
+        var i, j, flen;
         for (i = 0, flen = problems.length; i < flen; i++) {
           if (problems[i].id === id) {
-            return (problems[i - 1]) ? problems[i - 1] : null;
+            if (skipSolved) {
+              for (j = i - 1; j > -1; j--) {
+                if (!solved[problems[j].id]) {
+                  return problems[j];
+                }
+              }
+            } else {
+              return (problems[i - 1]) ? problems[i - 1] : null;
+            }
           }
         }
+        return null;
       },
 
       getSolved: function() {

diff --git a/app/partials/board.html b/app/partials/board.html
@@ -1,4 +1,5 @@
 <div class="info">
+  <button class="solvedMark"></button>
   <h4 id="goal">{{ problem.fen | whoseTurn }} to play and {{ goal | translateStipulation }}</h4>
   <div class="author">{{ problem.author }}</div>
   <div class="solveStatus"></div>