smig/odin-codespace
1
0
Fork 0
mirror of https://gitea.smigz.com/smiggiddy/odin-codeprojects.git synced 2024-12-25 22:10:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2 from smiggiddy/patch-calculator

Browse source 
Patch calculator
This commit is contained in:
Mike 2023-10-14 07:52:35 -04:00 committed by GitHub
commit 9f764ac71f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
calculator/js/script.js
View file

@ -141,15 +141,18 @@ function handleOperatorClick(operatorClicked) {
return;
}
}
ops.operator = operatorClicked;
//TODO fix this conditional should be if numFlag and a check if = or additional ops
if(!ops.onSecondNumber ){
ops.numFlag = true;
} else if (ops.result !== undefined ) {
console.log('this is running the ops.result');
ops.firstNum = ops.result;
ops.onSecondNumber = true;
return
if (ops.result !== "" ) {
console.log('this is running the ops.result');
ops.firstNum = ops.result;
ops.onSecondNumber = true;
return
}
}
ops.onSecondNumber = !ops.onSecondNumber;
}
@ -185,9 +188,11 @@ function negateNumber(){
function percentageNumber() {
let percent;
if (!ops.numFlag || !ops.onSecondNumber) {
if ((!ops.numFlag || !ops.onSecondNumber)) {
percent = Number(ops.firstNum) / 100;
ops.firstNum = String(percent);
} else if (ops.result !== "" ) {
percent = Number(ops.result) / 100;
} else {
percent = Number(ops.secondNum) / 100;
ops.secondNum = String(percent);