Merge lp:~mihirsoni/ubuntu-calculator-app/1188292 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Mihir Soni]

Instead of saving calculation while user close this application , Save calculation when user tear-off the calculation.

Save calculation when the user tears off the calculation.

[Ravi Vagadia (ravirdv)]

Hi Mihir,

Please remove

+ console.log("I am here");

Remaining changes look good.

Cheers,
Ravi Vagadia
[phone]
http://www.ravi.ws

On Wed, Aug 21, 2013 at 6:43 PM, Mihir Soni <email address hidden> wrote:

> The proposal to merge lp:~mihirsoni-123/ubuntu-calculator-app/1188292 into
> lp:ubuntu-calculator-app has been updated.
>
> Commit Message changed to:
>
> Instead of saving calculation while user close this application , Save
> calculation when user tear-off the calculation.
>
> For more details, see:
>
> https://code.launchpad.net/~mihirsoni-123/ubuntu-calculator-app/1188292/+merge/181294
> --
>
> https://code.launchpad.net/~mihirsoni-123/ubuntu-calculator-app/1188292/+merge/181294
> Your team Ubuntu Calculator Developers is requested to review the proposed
> merge of lp:~mihirsoni-123/ubuntu-calculator-app/1188292 into
> lp:ubuntu-calculator-app.
>

[David Planella (dpm)]

Thanks for the fix!

Just a few small nitpicks:

34 + //update the storage when user tear-off the calculation

Could you fix the comment to say "// Save the calculation when the user tears it off

39 + if(operators.count !== undefined){
40 + for(var j=0; j< operators.count; j++){
41 + newop.push(operators.get(j));
42 + }

I know you didn't introduce this change, but if you could fix the indentation of this for {} loop, it'd be great.

Thanks!

review: Needs Fixing

[David Planella (dpm)]

Looks good now and it works as expected on the device.

review: Approve

[David Planella (dpm)]

Note that while not related to this change, this merge proposal seems to uncover an issue with the app:

Once there are a few calculations saved and you start scrolling up, the app becomes unresponsive.

[Gustavo Pichorim Boiko (boiko)]

Actually as we are going to be saving when tearing off, we can be more selective on what we save: instead of saving everything every time, we can only save the calculations that were not yet saved and/or the ones that were modified, what do you think?

[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/1/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/11
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-autolanding/1
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-autolanding/1
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-autolanding/1
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-autolanding/1

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:141
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/40/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/26
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/39
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/39
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/39
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/39

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

7 Component.onDestruction: {

As the Component.onDestruction is empty now, we can remove it. Could you please fix that?

review: Needs Fixing

[lp:~mihirsoni/ubuntu-calculator-app/1188292]

142. By Mihir Soni on 2013-08-24

Removed on Destruction signal

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

PASSED: Continuous integration, rev:142
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/46/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/57
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/45
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/45
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/45
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/45

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Works as expected!

Great job Mihir, thanks :)

review: Approve

=== modified file 'Simple/SimplePage.qml'
--- Simple/SimplePage.qml	2013-08-12 12:13:12 +0000
+++ Simple/SimplePage.qml	2013-08-24 08:14:26 +0000
@@ -207,28 +207,6 @@
                 currentOperatorsChanged();
             }
 
-            Component.onDestruction: {
-                //update the storage
-                var calculations = []
-                for(var i=1; i<memory.count; i++){
-                    var operators = memory.get(i).operators;
-                    var newop = [];
-                    if(operators.count !== undefined){
-                    for(var j=0; j< operators.count; j++){
-                        newop.push(operators.get(j));
-                    }
-                    }else{
-                        newop = operators
-                    }
-                    var newElement = {'dbId': memory.get(i).dbId,
-                        'isLastItem': false,
-                        'mainLabel': memory.get(i).mainLabel,
-                        'operators': newop};
-                    calculations.push({"calc": newElement, "date": memory.get(i).timeStamp})
-                }
-                storage.saveCalculations(calculations)
-            }
-
             onMovementStarted: {
                 __wasAtYBegining = atYEnd
                 __initialContentY = contentY
@@ -248,6 +226,25 @@
                     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;
+                        var newop = [];
+                        if(operators.count !== undefined){
+                            for(var j=0; j< operators.count; j++){
+                                newop.push(operators.get(j));
+                            }
+                        }else{
+                            newop = operators
+                        }
+                        var newElement = {'dbId': memory.get(i).dbId,
+                            'isLastItem': false,
+                            'mainLabel': memory.get(i).mainLabel,
+                            'operators': newop};
+                        calculations.push({"calc": newElement, "date": memory.get(i).timeStamp})
+                    }
+                    storage.saveCalculations(calculations)
                 }
             }
         }