Merge lp:~rpadovani/ubuntu-calculator-app/fix-database into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Riccardo Padovani]

Fix save of calcs in database

Fix save of calcs in database

[David Planella (dpm)]

The fix works well for me, but could you add a short description about what the problem was and why it's surfaced now? Thanks!

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

FAILED: Continuous integration, rev:144
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/68/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/79/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/67
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/67
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/67
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/67

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/68/rebuild

review: Needs Fixing (continuous-integration)

[Riccardo Padovani (rpadovani)]

In rev 140 was introduct a critical bug in DB storage[1]:
the Storage.saveCalculations was designed to save all calculations when the app was closed, so the function has an argoument (calculations) that is an array with all calculations.

After rev 140 the Storage.saveCalculations is called at every tearOff, so every time all array is saved.

If I put a console.log in Storage.saveCalculations that logs every time is called and the lenght of var calculations, and I do a calc, tear off, do a calc, tear off again and close the app, in rev 139 I have:
calculationCompleted
save
calc length 2

in rev 140 I have:
calculationCompleted
save
calc length1
newPush
calculationCompleted
save
calc length2

After my changes, the calc is saved every time, but the calculations array has only last calc, so we have not multiple calc saved.

[1]http://bazaar.launchpad.net/~ubuntu-calculator-dev/ubuntu-calculator-app/trunk/revision/140

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

FAILED: Continuous integration, rev:145
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/69/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/80/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/68
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/68
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/68
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/68

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/69/rebuild

review: Needs Fixing (continuous-integration)

[Mihir Soni (mihirsoni)]

I tried this on machine as I don't have device.

It is not saving data.

Steps to reproduce :-

1. Open calc from Terminal (locate to the main project directory & type ubuntu-calculator-app)
2. 2+2 = 4 (tear off)
3. 4+2 = 6 (tear off)
4. Press CTL+Z in terminal close the application
5. Reopen the application

The data is not being stored into database.

review: Needs Fixing

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

FAILED: Continuous integration, rev:144
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/70/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/85
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/69
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/69
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/69
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/69

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/70/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:144
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/71/
Executed test runs:
    None: http://91.189.93.70:8080/job/generic-mediumtests/88/console
    None: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/70/console
    None: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/70/console
    None: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/70/console
    None: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/70/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/71/rebuild

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:145
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/72/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/89
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/71
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/71
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/71
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/71

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/72/rebuild

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Great work Riccardo..Works perfect !!!

Thanks for your time :)

review: Approve

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected! Thanks for the fix.

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calculator-app-autolanding/17/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/145/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-autolanding/17
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-autolanding/17
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-autolanding/17
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-autolanding/17

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'Simple/SimplePage.qml'
--- Simple/SimplePage.qml	2013-08-28 13:36:33 +0000
+++ Simple/SimplePage.qml	2013-08-29 13:37:19 +0000
@@ -128,6 +128,8 @@
                     memory.setProperty(0, "timeStamp", currentDate.getTime());
                     memory.insert(0,{'dbId': -1, 'dateText': "", 'operators': [{_text:'', _operation:'', _number:''}], 'isLastItem': true, 'mainLabel': ''});
                     positionViewAtBeginning();
+
+                    return true;
                 }
             }
 
@@ -227,28 +229,29 @@
             }
             onMovementEnded: {
                 if (__toBeRefresh) {
-                    formulaView.addCurrentToMemory();
-                    clear();
-                    __toBeRefresh = false
-                    //Save the calculation when the user tears it off
-                    var calculations = []
-                    for(var i=1; i<memory.count; i++){
-                        var operators = memory.get(i).operators;
+                    if (formulaView.addCurrentToMemory()) {
+                        //Save the calculation when the user tears it off
+                        var calculations = []
+                        var operators = memory.get(1).operators;
+
                         var newop = [];
-                        if(operators.count !== undefined){
+                        if (operators.count !== undefined){
                             for(var j=0; j< operators.count; j++){
                                 newop.push(operators.get(j));
                             }
-                        }else{
+                        } else {
                             newop = operators
                         }
-                        var newElement = {'dbId': memory.get(i).dbId,
+                        var newElement = {'dbId': memory.get(1).dbId,
                             'isLastItem': false,
-                            'mainLabel': memory.get(i).mainLabel,
+                            'mainLabel': memory.get(1).mainLabel,
                             'operators': newop};
-                        calculations.push({"calc": newElement, "date": memory.get(i).timeStamp})
+                        calculations.push({"calc": newElement, "date": memory.get(1).timeStamp})
+
+                        storage.saveCalculations(calculations)
                     }
-                    storage.saveCalculations(calculations)
+                    clear();
+                    __toBeRefresh = false
                 }
             }
         }

=== modified file 'Storage.qml'
--- Storage.qml	2013-08-07 17:50:25 +0000
+++ Storage.qml	2013-08-29 13:37:19 +0000
@@ -98,15 +98,8 @@
         openDB();
         var res;
         db.transaction( function(tx){
-            for(var i=0; i<calculations.length; i++){
-                if(calculations[i].calc.dbId === -1) {
-                    var r = tx.executeSql('INSERT INTO Calculations(calc, insertDate) VALUES(?, ?)', [JSON.stringify(calculations[i].calc), calculations[i].date]);
-                    res = r.insertId;
-                } else {
-                    tx.executeSql('UPDATE Calculations SET calc = ? WHERE id = ?', [JSON.stringify(calculations[i].calc), calculations[i].calc.dbId]);
-                    res = calculations[i].calc.dbId;
-                }
-            }
+            var r = tx.executeSql('INSERT INTO Calculations(calc, insertDate) VALUES(?, ?)', [JSON.stringify(calculations[0].calc), calculations[0].date]);
+            res = r.insertId;
         });
         return res;
     }