Merge lp:~vthompson/dropping-letters/reset-game-and-set-high-score into lp:dropping-letters

[Victor Thompson]

Reset score when New game is selected and update the highscore, if applicable.

Reset score when New game is selected and update the highscore, if applicable.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:44
http://91.189.93.70:8080/job/dropping-letters-ci/6/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/dropping-letters-raring-amd64-ci/6
    SUCCESS: http://91.189.93.70:8080/job/dropping-letters-saucy-amd64-ci/6
    SUCCESS: http://91.189.93.70:8080/job/dropping-letters-trusty-amd64-ci/2
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/569

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/dropping-letters-ci/6/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Could I get this reviewed?

[Riccardo Padovani (rpadovani)]

Works as expected, thanks Victor!

review: Approve

[Victor Thompson (vthompson)]

Could this get a final review please?

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I played the game till the end (red vertical bar) and it certainly updated the best score, however pressing "New Game" did nothing.

review: Needs Fixing

[Victor Thompson (vthompson)]

I can merge trunk into this branch, but the issue you are seeing was fixed by lp:1266095 [1]

[1] https://code.launchpad.net/~vthompson/dropping-letters/restart-game-play/+merge/200467

[lp:~vthompson/dropping-letters/reset-game-and-set-high-score]

45. By Victor Thompson on 2014-04-22

Merge and resolve conflicts

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:45
http://91.189.93.70:8080/job/dropping-letters-ci/11/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/dropping-letters-raring-amd64-ci/11/console
    SUCCESS: http://91.189.93.70:8080/job/dropping-letters-saucy-amd64-ci/11
    SUCCESS: http://91.189.93.70:8080/job/dropping-letters-trusty-amd64-ci/7
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2182

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/dropping-letters-ci/11/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'dropping-letters.qml'
--- dropping-letters.qml	2014-01-26 21:02:38 +0000
+++ dropping-letters.qml	2014-04-22 00:56:25 +0000
@@ -23,6 +23,8 @@
         accum.text = "";
         droptimer.tickCount = 0;
         flipable.flipped = true;
+        bestscore.updateScore(main.score);
+        main.score = 0;
         droptimer.start();
         toolbar.opened = false;
     }
@@ -81,13 +83,8 @@
                 db.transaction(function(tx) {
                     // Create the database if it doesn't already exist
                     tx.executeSql('CREATE TABLE IF NOT EXISTS Scores(score INT, time TEXT)');
-                    var res = tx.executeSql('SELECT score from Scores order by score DESC LIMIT 1');
-                    if (res.rows.length === 0) {
-                        bestscore.updateScore(0);
-                    } else {
-                        bestscore.updateScore(res.rows.item(0).score);
-                    }
                 });
+                bestscore.updateScore(0);
             }
 
             states: [
@@ -192,10 +189,21 @@
                     fontSize: "large"
                     color: "#222222"
                     function updateScore(score) {
-                        if (score >= bestscore.bestsofar) {
-                            bestscore.text = "Best score: " + score;
+                        var db = LocalStorage.openDatabaseSync("dropping-letters", "1.0", "Dropping Letters", 1000);
+                        if (score > bestscore.bestsofar) {
+                            db.transaction(function(tx) {
+                                tx.executeSql("insert into Scores values (?,?)", [main.score, 0]);
+                            });
                             bestscore.bestsofar = score;
+                        } else if (score === 0) {
+                            db.transaction(function(tx) {
+                                var res = tx.executeSql('SELECT score from Scores order by score DESC LIMIT 1');
+                                if (res.rows.length > 0) {
+                                    bestscore.bestsofar = res.rows.item(0).score;
+                                }
+                            });
                         }
+                        bestscore.text = "Best score: " + bestscore.bestsofar
                     }
                 }
 
@@ -516,11 +524,7 @@
                             if (volume.supportsMedia) {
                                 gameover.play();
                             }
-                            var db = LocalStorage.openDatabaseSync("dropping-letters", "1.0", "Dropping Letters", 1000);
-                            db.transaction(function(tx) {
-                                tx.executeSql("insert into Scores values (?,?)", [main.score, 0]);
-                                bestscore.updateScore(main.score);
-                            });
+                            bestscore.updateScore(main.score);
                         }
                     }
                 }