From ad492d4589462f878ca9f11cae5ced55229dff8b Mon Sep 17 00:00:00 2001 From: Gail Matsushima Date: Fri, 13 Nov 2015 20:25:18 -1000 Subject: [PATCH 1/2] need help on calculator.js --- js/calculator.js | 106 ++++++++++++++++++++++++++++++++++++++++++++ js/cash_register.js | 35 +++++++++++++++ 2 files changed, 141 insertions(+) diff --git a/js/calculator.js b/js/calculator.js index e69de29..0796ee7 100644 --- a/js/calculator.js +++ b/js/calculator.js @@ -0,0 +1,106 @@ + + +var calculator = { + + display: document.getElementById("Display"), + number: function () { + if (document.querySelectorAll("button.number, button.decimal")){ + return number.parseFloat(); + } + }, + memory: 0, + total: 0 +}; +//how to create number as a passable argument? +//how to incorporate parseFloat()? + +for (var i = 0; i < calculator.number.length; i++) { + calculator.number[i].onclick = appendCalc; +} + +function appendCalc (number) { + calculator.display.innerHTML += this.innerHTML; +} + + // function load (number) { + // if (typeof number !== "number") { + // return "error error!"; + // } + // total = number; + // return total; + // } + + // function getTotal (number) { + // var equal = document.querySelector("button.equals"); + // var total = equal.onclick.parseFloat(addTotal).calculator.display.innerHTML; + // if (equal.onclick) { + // return total; + // } + // } + + // var plus = document.querySelector("button.add"); + // plus.onclick = addMe; + + function addMe (number) { + if (number) { + console.log (alert("hello")); + } + //calculator.display.innerHTML = number + plus + total; + } + + //for (var i=0; i < number.length; i++) { + // newNumber = Math.floor(Math.random() * number.length); + // addTotal = newNumber + "+ plus" + number; + // return addTotal; + + // } else if (number !== number) { + // console.log("not a number"); + // } + // } + + function minus (number) { + + total = total - number; + return total; + } + + function multiply (number) { + + total = total * number; + return total; + } + + function divide (number) { + + total = total / number; + return total; + } + + function recallMemory (number) { + + return memory; + } + + function saveMemory (number) { + + memory = total; + return memory; + } + + function clearMemory (number) { + + memory = 0; + return memory; + } + + + + + + + + + + + + diff --git a/js/cash_register.js b/js/cash_register.js index e69de29..06bbc50 100644 --- a/js/cash_register.js +++ b/js/cash_register.js @@ -0,0 +1,35 @@ + + +var cashRegister = { + display: document.getElementById("Display"), + numbersOnReg: document.querySelectorAll("button.number, button.decimal"), + symbolsOnReg: document.querySelectorAll("button.add, button.subtract, button.divide, button.multiply, button.equals"), +}; + +for (var i = 0; i < cashRegister.numbersOnReg.length; i++) { + cashRegister.numbersOnReg[i].onclick = appendReg; +} + +for (var i = 0; i < cashRegister.symbolsOnReg.length; i++) { + cashRegister.symbolsOnReg[i].onclick = appendReg; +} + +function appendReg () { + cashRegister.display.innerHTML += this.innerHTML; +} + +var clearButton = document.querySelector('button.clear'); + clearButton.onclick = clearDisplay; + +function clearDisplay () { + cashRegister.display.innerHTML = ""; +} + +// var balance = document.querySelector('button.getBalance'); +// getBalance.onclick = balanceDisplay; + +// function balanceDisplay () { +// cashRegister.display.innerHTML += innerHTML; +// } + + From d11c7e2010eee956bb327cdf65ff35c30d712e2e Mon Sep 17 00:00:00 2001 From: Gail Matsushima Date: Sat, 14 Nov 2015 08:52:14 -1000 Subject: [PATCH 2/2] index.html file --- index.html | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/index.html b/index.html index e69de29..173c8b0 100644 --- a/index.html +++ b/index.html @@ -0,0 +1,42 @@ + + + +Cash Monnney +

Cash Register

+ +
+
+ + + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ +
+ + + + + \ No newline at end of file