Skip to content

Cash Register #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
theotran wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Cash Register #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3862d67
working on add function
theotran Nov 12, 2015
3fd8cef
got the add function to work, doing a pull request
theotran Nov 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Cash Register</title>
</head>
<body>
<div>
<div id="displayBox" type="button"></div><br></br>
<button id="b7" type="button">7</button>
<button id="b8" type="button">8</button>
<button id="b9" type="button">9</button>
<button id="divide" type="button">%</button>
<button id="clear" type="button">Clear</button><br></br>
<button id="b4" type="button">4</button>
<button id="b5" type="button">5</button>
<button id="b6" type="button">6</button>
<button id="bx" type="button">x</button>
<button id="getBalance" type="button">Get Balance</button><br></br>
<button id="b1" type="button">1</button>
<button id="b2" type="button">2</button>
<button id="b3" type="button">3</button>
<button id="minus" type="button">-</button>
<button id="depositCash" type="button">Deposit Cash</button><br></br>
<button id="b0" type="button">0</button>
<button id="b00" type="button">00</button>
<button id="decimal" type="button">.</button>
<button id="plus" type="button">+</button>
<button id="withdrawCash" type="button">Withdraw Cash</button><br></br>
<div style="text-indent: 83px">
<button id="b=" type="button">=</button>
</div>

</div>
<script src="./js/calculator.js"></script>
<script src="./js/cash_register.js"></script>
</body>
</html>
50 changes: 50 additions & 0 deletions js/calculator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@

var calculatorModule = (function () {
//total is private
var total = 0;
var calculator = {


clear: function (){
total = 0;
return total;
},

add: function (num){
total += num;
console.log(total);
return total;
},

subtract: function (num){
total -= num;
return total;
},

divide: function (num){
total /= num;
return total;
},

multiply: function (num){
total *= num;
return total;
},

equals: function (){
return total;
},

total: function (num) {
return total = num;

}

};
//anything after the return is a public variable
return calculator;

})();



126 changes: 126 additions & 0 deletions js/cash_register.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
console.log("test");



window.register = (function () {
var calc = calculatorModule;
//var saved;
var op = null;
var balance = 0;
var display = document.getElementById("displayBox");


document.getElementById("b7").addEventListener('click', function(){
concatDisplayNumbers(7);

});
document.getElementById("b8").addEventListener('click', function(){
validateInput();
concatDisplayNumbers(8);
});
document.getElementById("b9").addEventListener('click', function(){
validateInput();
concatDisplayNumbers(9);
});
document.getElementById("b4").addEventListener('click', function(){
concatDisplayNumbers(4);
});
document.getElementById("b5").addEventListener('click', function(){
concatDisplayNumbers(5);
});
document.getElementById("b6").addEventListener('click', function(){
concatDisplayNumbers(6);
});
document.getElementById("b1").addEventListener('click', function(){
concatDisplayNumbers(1);
});
document.getElementById("b2").addEventListener('click', function(){
concatDisplayNumbers(2);
});
document.getElementById("b3").addEventListener('click', function(){
concatDisplayNumbers(3);
});
document.getElementById("b0").addEventListener('click', function(){
concatDisplayNumbers(0);
});
document.getElementById("b00").addEventListener('click', function(){
concatDisplayNumbers('00');
});
document.getElementById("decimal").addEventListener('click', function(){
concatDisplayNumbers('.');
});
document.getElementById("depositCash").addEventListener('click', function(){

});

//addition
document.getElementById("plus").addEventListener('click', function(){
var displayVal = validateInput(display.innerHTML);
calc.add(displayVal);
op = "add";
display.innerHTML = "";
});

//subtraction
document.getElementById("minus").addEventListener('click', function(){
var displayVal = validateInput(display.innerHTML);
calc.subtract(displayVal);
op = "subtract";
display.innerHTML = "";

});

document.getElementById("b=").addEventListener('click', function(){
var displayVal = validateInput(display.innerHTML);
if (op == "add") {
calc.add(displayVal);
}
display.innerHTML = calc.equals();
calc.clear();


});

document.getElementById("clear").addEventListener('click', function(){
clearFunc();
});




function concatDisplayNumbers (number) {
if (display.innerHTML !== " ") {
display.innerHTML += number;
} else {
console.log("Display is empty");
display.innerHTML = number;
}
}


function clearFunc () {
console.log("clearrrr");
display.innerHTML = "";
}


function validateInput (numberString) {
var number = parseFloat(numberString);
if (isNaN(number)) {
return 0;
} else {
return number;
}


}


})();







20 changes: 20 additions & 0 deletions npm-debug.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
0 info it worked if it ends with ok
1 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'test' ]
2 info using npm@2.14.2
3 info using node@v4.0.0
4 verbose config Skipping project config: /Users/theotran/.npmrc. (matches userconfig)
5 verbose stack Error: ENOENT: no such file or directory, open '/Users/theotran/package.json'
5 verbose stack at Error (native)
6 verbose cwd /Users/theotran/Devleague/Cash-Register
7 error Darwin 12.2.1
8 error argv "/usr/local/bin/node" "/usr/local/bin/npm" "test"
9 error node v4.0.0
10 error npm v2.14.2
11 error path /Users/theotran/package.json
12 error code ENOENT
13 error errno -2
14 error syscall open
15 error enoent ENOENT: no such file or directory, open '/Users/theotran/package.json'
15 error enoent This is most likely not a problem with npm itself
15 error enoent and is related to npm not being able to find a file.
16 verbose exit [ -2, true ]