H1K0-dev/personal-home-calc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some bugs with fractionals

Browse Source
This commit is contained in:
Masahiko AMANO 2020-09-26 16:17:14 +03:00
parent f01cebd2c1
commit 971844f19f
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
script.js
View File

@ -1,15 +1,15 @@
var p1='0'; var n1='0';
var tp=''; var tp='';
var p2='0'; var n2='0';
var sol='0'; var sol='0';
var out='0'; var out='0';
var allow=true; var allow=true;
function calc() { function calc() {
out+='='; out+='=';
document.getElementById('prompt').innerHTML=out; document.getElementById('prompt').innerHTML=out;
var number1=p1; var number1=n1;
var oper=tp; var oper=tp;
var number2=p2; var number2=n2;
$.ajax({ $.ajax({
url: "calc.php", url: "calc.php",
type: "GET", type: "GET",
@ -22,7 +22,7 @@ function calc() {
} else { } else {
sol=response.result.toString() sol=response.result.toString()
if ((out+sol).length>14) { if ((out+sol).length>14) {
if (sol.includes('.')) {sol=sol.substr(0,14-out.length); if (sol.includes('.')) {sol=sol.substr(0,Math.max(14-out.length,sol.indexOf('.')+2));
} else { } else {
alert('Too large number to display!'); alert('Too large number to display!');
clr() clr()
@ -32,54 +32,55 @@ function calc() {
out+=sol; out+=sol;
document.getElementById('prompt').innerHTML=out; document.getElementById('prompt').innerHTML=out;
allow=false; allow=false;
p1='0'; n1='0';
tp=''; tp='';
p2='0'; n2='0';
} }
} }
}); });
} }
function numb(num) { function numb(num) {
if (num=='.') { if (num=='.') {
if (tp=='') {p1+='.';} else {p2+='.';} if (out[out.length-1]=='.') {return}
if (tp=='') {n1+='.';} else {n2+='.';}
out+='.'; out+='.';
document.getElementById('prompt').innerHTML=out; document.getElementById('prompt').innerHTML=out;
} else if (Number(p1)==0 && (tp=='')) { } else if (n1=='0' && (tp=='')) {
p1=num; n1=num;
out=String(p1); out=String(n1);
document.getElementById('prompt').innerHTML=out; document.getElementById('prompt').innerHTML=out;
} else if ((Number(p1)>0) && (tp=='')) { } else if ((n1!='0') && (tp=='')) {
p1+=num; n1+=num;
out=String(p1); out=String(n1);
document.getElementById('prompt').innerHTML=out; document.getElementById('prompt').innerHTML=out;
} else if (Number(p2)==0 && tp!='') { } else if (n2=='0' && tp!='') {
p2=num; n2=num;
out=String(p1)+tp+String(p2); out=String(n1)+tp+String(n2);
document.getElementById('prompt').innerHTML=out; document.getElementById('prompt').innerHTML=out;
} else if (Number(p2)>0 && tp!='') { } else if (n2!='0' && tp!='') {
p2+=num; n2+=num;
out=String(p1)+tp+String(p2); out=String(n1)+tp+String(n2);
document.getElementById('prompt').innerHTML=out; document.getElementById('prompt').innerHTML=out;
} }
} }
function oper(op) { function oper(op) {
if (tp!='') {alert('За раз можно использовать только одну операцию!');return;} if (tp!='') {alert('За раз можно использовать только одну операцию!');return;}
if (!allow) { if (!allow) {
p1=Number(sol); n1=Number(sol);
out=sol; out=sol;
allow=true; allow=true;
} }
// if (p1=='0' && p2=='0' && tp=='' && Number(document.getElementById('prompt').value)>0) { // if (n1=='0' && n2=='0' && tp=='' && Number(document.getElementById('prompt').value)>0) {
// p1=document.getElementById('prompt').innerHTML // n1=document.getElementById('prompt').innerHTML
// } // }
tp=op; tp=op;
out+=tp; out+=tp;
document.getElementById('prompt').innerHTML=out; document.getElementById('prompt').innerHTML=out;
} }
function clr() { function clr() {
p1='0'; n1='0';
tp=''; tp='';
p2='0'; n2='0';
sol='0'; sol='0';
out='0'; out='0';
allow=true; allow=true;