Skip to content

B
business-java
Commit 8fdca6cb authored by wansari's avatar wansari
Browse files
Options

updated JS for not showing quantity zero in detail screen 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104349 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 34ee156a
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 36 deletions
webitm-wms/module-resource/web/js/sorderWizard.js
View file @ 8fdca6cb
...@@ -783,10 +783,17 @@ var sorttable = ""; ...@@ -783,10 +783,17 @@ var sorttable = "";
var charCode = (evt.which) ? evt.which : event.keyCode var charCode = (evt.which) ? evt.which : event.keyCode
if (charCode > 31 && (charCode < 48 || charCode > 57) ) if (charCode > 31 && (charCode < 48 || charCode > 57) )
{
if(charCode == 46)
{
console.log("Entered character is dot")
}
else
{ {
alert('Enter only numeric value'); alert('Enter only numeric value');
return false; return false;
} }
}
else else
{ {
return true; return true;
...@@ -999,21 +1006,6 @@ var sorttable = ""; ...@@ -999,21 +1006,6 @@ var sorttable = "";
} }
} }
function isNumeric(evt)
{
var charCode = (evt.which) ? evt.which : event.keyCode
if (charCode > 31 && (charCode < 48 || charCode > 57) )
{
alert('Enter only numeric value');
return false;
}
else
{
return true;
}
}
function specialCharValidate(id) function specialCharValidate(id)
{ {
if (isValidCharacter(id) == false) if (isValidCharacter(id) == false)
...@@ -1481,12 +1473,12 @@ var sorttable = ""; ...@@ -1481,12 +1473,12 @@ var sorttable = "";
if (tranType == "T") if (tranType == "T")
{ {
tr = tr + "<td><input type='text' onchange='calQuantity(this.id,"+xlen+","+xrows+","+qt+","+fld+","+t+"); sendInfo(this.id);' id='Detail2."+fld+".quantity' name='Detail2."+fld+".quantity' title='"+tool[tip].childNodes[0].nodeValue+"' onkeypress='return isQuantity(event)' maxlength='4' ISCHANGED='true' class='editInputClass' style='width:100%;border:none;text-align: right; outline:none'" + tr = tr + "<td><input type='text' onchange='calQuantity(this.id,"+xlen+","+xrows+","+qt+","+fld+","+t+"); sendInfo(this.id);' id='Detail2."+fld+".quantity' name='Detail2."+fld+".quantity' title='"+tool[tip].childNodes[0].nodeValue+"' onkeypress='return isQuantity(event)' maxlength='10' ISCHANGED='true' class='editInputClass' style='width:100%;border:none;text-align: right; outline:none'" +
" /></td>"; " /></td>";
} }
else else
{ {
tr = tr + "<td><input type='text' onchange='calQuantity(this.id,"+xlen+","+xrows+","+qt+","+fld+","+t+"); sendInfo(this.id);' id='Detail2."+fld+".quantity' name='Detail2."+fld+".quantity' title='"+tool[tip].childNodes[0].nodeValue+"' onkeypress='return isQuantity(event)' maxlength='4' ISCHANGED='true' class='editInputClass' style='width:100%;border:none;text-align: right; outline:none' value='1' " + tr = tr + "<td><input type='text' onchange='calQuantity(this.id,"+xlen+","+xrows+","+qt+","+fld+","+t+"); sendInfo(this.id);' id='Detail2."+fld+".quantity' name='Detail2."+fld+".quantity' title='"+tool[tip].childNodes[0].nodeValue+"' onkeypress='return isQuantity(event)' maxlength='10' ISCHANGED='true' class='editInputClass' style='width:100%;border:none;text-align: right; outline:none' value='1' " +
" /></td>"; " /></td>";
} }
...@@ -1658,14 +1650,16 @@ var sorttable = ""; ...@@ -1658,14 +1650,16 @@ var sorttable = "";
} }
else else
{ {
final = final + parseInt(document.getElementById("Detail2."+f+".quantity").value); //final = final + parseInt(document.getElementById("Detail2."+f+".quantity").value);
final = final + parseFloat(document.getElementById("Detail2."+f+".quantity").value);
//getting rate from tooltip title //getting rate from tooltip title
var toolTip = document.getElementById("Detail2."+f+".quantity").title; var toolTip = document.getElementById("Detail2."+f+".quantity").title;
var details = toolTip.split(":"); var details = toolTip.split(":");
var rate = details[3]; var rate = details[3];
finalPrice = parseInt(finalPrice) + ( parseInt(document.getElementById("Detail2."+f+".quantity").value) * parseInt(rate)); //finalPrice = parseInt(finalPrice) + ( parseInt(document.getElementById("Detail2."+f+".quantity").value) * parseInt(rate));
finalPrice = parseFloat(finalPrice) + ( parseFloat(document.getElementById("Detail2."+f+".quantity").value) * parseFloat(rate));
} }
} }
...@@ -1678,16 +1672,17 @@ var sorttable = ""; ...@@ -1678,16 +1672,17 @@ var sorttable = "";
{ {
if(document.getElementById("tab."+t+".fld."+i+"").value != "") if(document.getElementById("tab."+t+".fld."+i+"").value != "")
{ {
qty = qty + parseInt(document.getElementById("tab."+t+".fld."+i+"").value); //qty = qty + parseInt(document.getElementById("tab."+t+".fld."+i+"").value);
qty = qty + parseFloat(document.getElementById("tab."+t+".fld."+i+"").value);
//document.getElementById("display."+t+"").innerHTML = qty; //document.getElementById("display."+t+"").innerHTML = qty;
document.getElementById("sum"+t+"").innerHTML = qty; document.getElementById("sum"+t+"").innerHTML = qty.toFixed(3);
document.getElementById("pieces"+t+"").innerHTML = qty; document.getElementById("pieces"+t+"").innerHTML = qty.toFixed(3);
} }
} }
var currCode = document.getElementById("curr_code").value; var currCode = document.getElementById("curr_code").value;
document.getElementById("rate"+t+"").innerHTML = " pieces at "+ currCode +" "+ finalPrice +" (Excluding Tax)"; document.getElementById("rate"+t+"").innerHTML = " pieces at "+ currCode +" "+ finalPrice.toFixed(3) +" (Excluding Tax)";
} }
//Changed by samadhan on 03/02/2015 for fixed matxix table header Start //Changed by samadhan on 03/02/2015 for fixed matxix table header Start
...@@ -2476,12 +2471,12 @@ var sorttable = ""; ...@@ -2476,12 +2471,12 @@ var sorttable = "";
if (itemQtys[1] == "" || itemQtys[1] == "undefined" || itemQtys[1] == null ) if (itemQtys[1] == "" || itemQtys[1] == "undefined" || itemQtys[1] == null )
{ {
qtytr = +qtytr + 0; qtytr = +qtytr + 0;
tr = tr + "<td><input type='text' onchange='calQuantity(this.id,"+xlen+","+xrows+","+qt+","+fld+","+t+"); sendInfo(this.id);' id='Detail2."+fld+".quantity' name='Detail2."+fld+".quantity' title='"+tool[tip].childNodes[0].nodeValue+"' onkeypress='return isQuantity(event)' maxlength='4' ISCHANGED='true' class='editInputClass' style='width:100%;border:none;text-align: right; outline:none' value='"+0+"' /></td>"; tr = tr + "<td><input type='text' onchange='calQuantity(this.id,"+xlen+","+xrows+","+qt+","+fld+","+t+"); sendInfo(this.id);' id='Detail2."+fld+".quantity' name='Detail2."+fld+".quantity' title='"+tool[tip].childNodes[0].nodeValue+"' onkeypress='return isQuantity(event)' maxlength='10' ISCHANGED='true' class='editInputClass' style='width:100%;border:none;text-align: right; outline:none' value='' /></td>";
} }
else else
{ {
qtytr = +qtytr + +itemQtys[1]; qtytr = +qtytr + +itemQtys[1];
tr = tr + "<td><input type='text' onchange='calQuantity(this.id,"+xlen+","+xrows+","+qt+","+fld+","+t+"); sendInfo(this.id);' id='Detail2."+fld+".quantity' name='Detail2."+fld+".quantity' title='"+tool[tip].childNodes[0].nodeValue+"' onkeypress='return isQuantity(event)' maxlength='4' ISCHANGED='true' class='editInputClass' style='width:100%;border:none;text-align: right; outline:none' value='"+itemQtys[1]+"' /></td>"; tr = tr + "<td><input type='text' onchange='calQuantity(this.id,"+xlen+","+xrows+","+qt+","+fld+","+t+"); sendInfo(this.id);' id='Detail2."+fld+".quantity' name='Detail2."+fld+".quantity' title='"+tool[tip].childNodes[0].nodeValue+"' onkeypress='return isQuantity(event)' maxlength='10' ISCHANGED='true' class='editInputClass' style='width:100%;border:none;text-align: right; outline:none' value='"+itemQtys[1]+"' /></td>";
} }
tr = tr + "<input type = 'hidden' class = "+t+" value = "+tabNum+" id='Detail2."+fld+".line_no__contr' name='Detail2."+fld+".line_no__contr' ></input>"; tr = tr + "<input type = 'hidden' class = "+t+" value = "+tabNum+" id='Detail2."+fld+".line_no__contr' name='Detail2."+fld+".line_no__contr' ></input>";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment