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

[Mihir Soni]

Now , user will be able to start calculation with operators

Now, if user clicks on Operator first , the formula will start with 0 , instead of not allowing user to start calculation with operators.

Testing Scenario :-
1) Open Calculator
2) Press any operator
3) Press new operands
4) Result

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

FAILED: Continuous integration, rev:138
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/86/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/377/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/78
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/86
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/86
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/78

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

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Thanks a lot Mihir for the branch. However, his requires some design team input. As it is now, I agree with the comments in the bug that this should be working differently.

If I want to do 0 x 3 = 0 I believe I should enter the 0 explicitly.

review: Needs Fixing

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

FAILED: Continuous integration, rev:138
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/88/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/386
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/80
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/88
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/88
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/80

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

As described in the bug report, that is not really the behavior wanted.

The behavior wanted is to actually do as it is working already: to not do anything if an operator is pressed before an operand.

I'm sorry you spent time on that Mihir, but unfortunately I will have to reject this change.

review: Disapprove

Unmerged revisions

138. By Mihir Soni on 2013-08-17

enabled formula start with 0

=== modified file 'Simple/SimplePage.qml'
--- Simple/SimplePage.qml	2013-08-12 12:13:12 +0000
+++ Simple/SimplePage.qml	2013-08-17 21:31:51 +0000
@@ -39,7 +39,10 @@
             if(last.type === CALC.T_NUMBER || last.type === CALC.T_UNARY_MINUS){
                 screenFormula[screenFormula.length - 1]._number += last.value.toString();
             } else if (last.type === CALC.T_OPERATOR){
-
+                formula.push("0"); // User has entered first operator, so push 0 in formula
+                screenFormula[screenFormula.length - 1]._number += "0";
+                formula.push(visual) // Push the acutal formula
+                screenFormula.push({_text:'', _operation: last.value.toString(), _number: ''})
             }
             else {
                 screenFormula.push({_text:'', _operation: last.value.toString(), _number: ''})