Skip to content

B
business-java
Commit 9531af50 authored by kdabholkar's avatar kdabholkar
Browse files
Options

commited new changes of Rate Logic and bug fixing for the same. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@174569 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 339e0149
Hide whitespace changes
Inline Side-by-side
Showing with 322 additions and 33 deletions
webitm-wms/module-resource/web/js/sorderWizard.js
View file @ 9531af50
......@@ -820,6 +820,8 @@ var sorttable = "";
var quantity=document.getElementById("Detail3."+x+".quantity").value;
var rate=document.getElementById("Detail3."+x+".rate").value;
console.log("rate_value"+rate);
//Added by wasim start
if (isNaN(parseFloat(quantity)) || quantity == "" || quantity == null)
{
......@@ -837,6 +839,7 @@ var sorttable = "";
{
document.getElementById("Detail3."+x+".rate").value = parseFloat(rate).toFixed(2);
}
//Added by wasim end
var amount=quantity * rate;
......@@ -855,6 +858,7 @@ var sorttable = "";
function setCheckedTrue()
{
var tot=document.getElementById("fld").value;
console.log("tot"+tot);
var count=0;
var flag = false;
for(var i=1;i<=tot; i++)
......@@ -1096,7 +1100,13 @@ var sorttable = "";
action = "ITEM_CHANGE";
fieldAction = field;
otherDetail = document.getElementById("cust_code").value +":"+ document.getElementById("order_type").value +":"+ document.getElementById("order_date").value +":"+ document.getElementById("due_date").value;
//Changes by Kaustubh on 15 Nov 2017 Start
// otherDetail = document.getElementById("cust_code").value +":"+ document.getElementById("order_type").value +":"+ document.getElementById("order_date").value +":"+ document.getElementById("due_date").value;
otherDetail = document.getElementById("cust_code").value +":"+ document.getElementById("order_type").value +":"+ document.getElementById("order_date").value +":"+ document.getElementById("due_date").value+":"+ document.getElementById("cust_code__dlv").value+":"+ document.getElementById("site_code").value;
//Changes by Kaustubh on 15 Nov 2017 Start
var tabs = document.getElementById("tabs").value;
var items="";
......@@ -1261,8 +1271,12 @@ var sorttable = "";
tabNum = index;
}
itmcode = itmcode +":"+ tabNum;
//changes by kaustubh on 16 nov 2017 start
var otherDetail = document.getElementById("cust_code").value +":"+ document.getElementById("order_type").value +":"+ document.getElementById("order_date").value +":"+ document.getElementById("due_date").value;;
//var otherDetail = document.getElementById("cust_code").value +":"+ document.getElementById("order_type").value +":"+ document.getElementById("order_date").value +":"+ document.getElementById("due_date").value;;
var otherDetail = document.getElementById("cust_code").value +":"+ document.getElementById("order_type").value +":"+ document.getElementById("order_date").value +":"+ document.getElementById("due_date").value+":"+ document.getElementById("cust_code__dlv").value+":"+ document.getElementById("site_code").value;
//changes by kaustubh on 16 nov 2017 end
var url = "/ibase/SorderWizHandlerServlet?ITEM_CODE="+itmcode+"&TRANTYPE=T&OTHER_DETAILS="+otherDetail+"&ACTION=PRODUCT_SET";
makeRequest( url, setColumnValues);
......@@ -1561,11 +1575,11 @@ var sorttable = "";
//To align table headr name to right and left [END]
if (tranType == "T")
{
{alert(1574);
pSetVal = pSetVal + "<th class='tHeader' align = "+alignHead+" >"+pSet[k].childNodes[0].nodeValue+"</th>";
}
else
{
{alert(1578);
if(k>1)
{
pSetVal = pSetVal + "<th class='tHeader' align = "+alignHead+" >"+pSet[k].childNodes[0].nodeValue+"</th>";
......@@ -1585,7 +1599,7 @@ var sorttable = "";
+tr+
"</table>" +
"</div>";
$('#matrixDiv'+y).remove();
$('#suppDtlDiv'+y).append(tempdata);
......@@ -1612,9 +1626,15 @@ var sorttable = "";
document.getElementById("rate"+y).innerHTML= " piece(s) @ "+ currCode +" "+ price +" (excluding tax) ";
document.getElementById("sum"+y).innerHTML = 0;
var itemParentRateTag = xmldoc.getElementsByTagName("item_parent_rate");
var itemParentRate = itemParentRateTag[0].childNodes[0].nodeValue;
document.getElementById("item_parent_rate"+t).innerHTML = itemParentRate;
var trueFlagValue = xmldoc.getElementsByTagName("trueFlag");
trueFlagValue1 = trueFlagValue[0].childNodes[0].nodeValue;
console.log("trueFlagValue1"+trueFlagValue1);
document.getElementById("tab_no"+t).value= tabNum;
......@@ -1623,7 +1643,7 @@ var sorttable = "";
openImage(this,y);
hideDivOnLoad = "0";
}
var trueFlagValue1='';
function appendSizesRow()
{
//$("#itemDtl").remove();
......@@ -1645,17 +1665,24 @@ var sorttable = "";
//function calQuantity(id,cols,row,qt,fld,t)
function calQuantity(id,cols,row,qt,fld,t,rate)
{
cols = cols-1;
//alert("id"+id);
// alert("cols"+cols);
//alert("row"+row);
var temp = "";
var final = 0;
var first = fld - qt;
first = first +1;
//alert("rate"+rate);
//alert("qt"+qt);
var firstId="Detail2."+first+".quantity";
var cnt = row * cols;
cnt = (first-1) + cnt;
//alert(cnt);
var remainder = parseInt(qt) % cols;
var quot = parseInt(qt) / cols;
......@@ -1671,34 +1698,48 @@ var sorttable = "";
//alert('Row='+quot);
}
//var loop = (cols*(quot-1)+1);
var loop = first+(cols*(quot-1));
//alert("loop"+loop);
var counter = loop+(cols-1);
//alert("counter"+counter);
//alert("rate"+rate);
var finalPrice = 0;
for(var f=loop;f<=counter;f++)
var no= 0;
var temp =0;
//alert("rate"+rate);
for(var f=loop;f<=counter;f++)
{
if(document.getElementById("Detail2."+f+".quantity") == undefined || document.getElementById("Detail2."+f+".quantity").value == "" || document.getElementById("Detail2."+f+".quantity").value == null)
if(document.getElementById("Detail2."+f+".quantity") == undefined ||document.getElementById("Detail2."+f+".quantity").value == "" || document.getElementById("Detail2."+f+".quantity").value == null)
{
console.log("inside break");
continue;
}
else
{
//final = final + parseInt(document.getElementById("Detail2."+f+".quantity").value);
//alert("f"+f);
//alert("rate"+rate);
final = final + parseFloat(document.getElementById("Detail2."+f+".quantity").value);
//getting rate from tooltip title
//var toolTip = document.getElementById("Detail2."+f+".quantity").title;
//var details = toolTip.split(":");
//var rate = details[3];
//finalPrice = parseInt(finalPrice) + ( parseInt(document.getElementById("Detail2."+f+".quantity").value) * parseInt(rate));
finalPrice = parseFloat(finalPrice) + ( parseFloat(document.getElementById("Detail2."+f+".quantity").value) * parseFloat(rate));
//finalPrice = parseFloat(finalPrice) + ( parseFloat(document.getElementById("Detail2."+f+".quantity").value) * parseFloat(rate));
finalPrice = parseFloat(finalPrice) + ( parseFloat(document.getElementById("Detail2."+f+".quantity").value) * parseFloat(document.getElementById("Detail2."+f+".rate").value) );
console.log("finalPrice1::",finalPrice);
}
}
document.getElementById("tab."+t+".fld."+quot+"").value = final;
......@@ -1710,6 +1751,7 @@ var sorttable = "";
{
//qty = qty + parseInt(document.getElementById("tab."+t+".fld."+i+"").value);
qty = qty + parseFloat(document.getElementById("tab."+t+".fld."+i+"").value);
console.log("qty"+qty);
//document.getElementById("display."+t+"").innerHTML = qty;
//document.getElementById("sum"+t+"").innerHTML = qty.toFixed(3);
//document.getElementById("pieces"+t+"").innerHTML = qty.toFixed(3);
......@@ -1890,6 +1932,7 @@ var sorttable = "";
function form3Pre()
{
document.getElementById("finish").style.display = "none"; // to undisplay
document.getElementById("previous").style.display = "none"; // to undisplay
document.getElementById("buttonreplacement").style.display = "";
......@@ -2028,7 +2071,7 @@ var sorttable = "";
}
}
}*/
//alert("Final XML String="+xmlString);
// alert("Final XML String="+xmlString);
document.getElementById("PRE_FORM_VAL2").value = xmlString;
setActionVal( "previous" );
......@@ -2198,7 +2241,13 @@ var sorttable = "";
function itmparntChangeNew( itmcode, tranType, DLVDate)
//function itmparntChangeNew(itemDetailStr)
{
var otherDetail = document.getElementById("cust_code").value +":"+ document.getElementById("order_type").value +":"+ document.getElementById("order_date").value +":"+ document.getElementById("due_date").value;
//changes by kaustubh on 16 nov start
//var otherDetail = document.getElementById("cust_code").value +":"+ document.getElementById("order_type").value +":"+ document.getElementById("order_date").value +":"+ document.getElementById("due_date").value;
var otherDetail = document.getElementById("cust_code").value +":"+ document.getElementById("order_type").value +":"+ document.getElementById("order_date").value +":"+ document.getElementById("due_date").value+":"+ document.getElementById("cust_code__dlv").value+":"+ document.getElementById("site_code").value;
//changes by kaustubh on 16 nov end
var url = "/ibase/SorderWizHandlerServlet?ITEM_CODE="+itmcode+"&DLV_DATE="+DLVDate+"&TRANTYPE="+tranType+"&ACTION=PRODUCT_SET&OTHER_DETAILS="+otherDetail;
makeRequestNew( url, setColumnValues);
......@@ -2446,6 +2495,8 @@ var sorttable = "";
var tool = xmldoc.getElementsByTagName("tooltip");
if (x.length > 0)
var sizesValue = new Array();
......@@ -2472,8 +2523,22 @@ var sorttable = "";
// var a = document.getElementById("totalquantity"+t).value=totQty ;
document.getElementById("item_parent_totalQuantity"+t).innerHTML=totQty1 ;
var trueValue = xmldoc.getElementsByTagName("trueFlag");
// console.log("setColumnValuesNew trueFlagValue1", trueValue,xmldoc);
// trueFlagValue1 = trueValue[0].childNodes[0].nodeValue;
// var a = document.getElementById("totalquantity"+t).value=totQty ;
document.getElementById("item_parent_totalQuantity"+t).innerHTML=totQty1 ;
/* var indRate= xmldoc.getElementsByTagName("rate");
var rate1 = indRate[0].childNodes[0].nodeValue;
// var a = document.getElementById("totalquantity"+t).value=totQty ;
var a = document.getElementById("Ind_rate"+t).innerHTML=rate1 ; */
//alert(a)
// alert("a"+a);
//added by kaustubh on 10 Nov 2017 end
......@@ -2538,6 +2603,7 @@ var sorttable = "";
{
xlen = sett.length-1;
tr = tr + "<input type='hidden' id='tab."+t+".fld."+fx+"' title='tab."+t+".fld."+fx+"' class='editDisplayClass' maxlength='0' ISCHANGED='false' readOnly = '1' style='width:75px; text-align: right; color:#555 !important;'/>";
fx++;
}
......@@ -2547,18 +2613,26 @@ var sorttable = "";
if (y[j].childNodes[0].nodeValue == '0' && tranType == "T")
{
tr = tr + "<td align = 'right' nowrap='true'><input type='text' id='tab."+t+".fld."+fx+"' title='tab."+t+".fld."+fx+"' maxlength='0' ISCHANGED='false' readOnly = '1' style='width:75px; text-align: right;background-color: transparent;border: none; color:#555 !important;'/></td>";
fx++;
}
else
{
var fld = document.getElementById("fld").value;
console.log("fld"+fld);
//var dte = document.getElementById("dlv_date"+t+"").value;
var dte = document.getElementById("dspdate"+t+"").value;
console.log("dte"+dte);
fld++;
document.getElementById("fld").value = fld;
var itemQty=y[j].childNodes[0].nodeValue;
var itemQtys = itemQty.split("~");
console.log("itemQtys"+itemQtys[0]);
console.log("itemQtys"+itemQtys[1]);
console.log("itemQtysDiscount"+itemQtys[2]);
console.log("itemQtysRate"+itemQtys[3]);
var details = tool[tip].childNodes[0].nodeValue.split(":");
var rate = details[3];
......@@ -2571,6 +2645,7 @@ var sorttable = "";
{
qtytr = +qtytr + 0;
tr = tr + "<td class='editTdClass' onclick='gotoChildTextbox(this);' nowrap='true'><input type='text' onchange='calQuantity(this.id,"+xlen+","+xrows+","+qt+","+fld+","+t+","+rate+"); sendInfo(this.id);' id='Detail2."+fld+".quantity' name='Detail2."+fld+".quantity' title='"+details[4]+"' onkeypress='return isQuantity(event)' maxlength='10' ISCHANGED='true' class='editInputClass editInputCur' style='width:100%;border:none;text-align: right; outline:none' value='' onfocus='setActiveTD(this);' /></td>";
console.log("new row check"+tr);
}
else
{
......@@ -2578,15 +2653,22 @@ var sorttable = "";
tr = tr + "<td class='editTdClass' onclick='gotoChildTextbox(this);' nowrap='true'><input type='text' onchange='calQuantity(this.id,"+xlen+","+xrows+","+qt+","+fld+","+t+","+rate+"); sendInfo(this.id);' id='Detail2."+fld+".quantity' name='Detail2."+fld+".quantity' title='"+details[4]+"' onkeypress='return isQuantity(event)' maxlength='10' ISCHANGED='true' class='editInputClass editInputCur' style='width:100%;border:none;text-align: right; outline:none' value='"+itemQtys[1]+"' onfocus='setActiveTD(this);' /></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' value = "+itemQtys[2]+" id='Detail2."+fld+".discount' name='Detail2."+fld+".discount' ></input>";
tr = tr + "<input type = 'hidden' value = "+itemQtys[3]+" id='Detail2."+fld+".rate' name='Detail2."+fld+".rate' ></input>";
//Tooltip login to get rate if quantity is present [START]
if(itemQtys[1] > 0)
{
//var details = tool[tip].childNodes[0].nodeValue.split(":");
finalPrice = parseInt(finalPrice) + ( parseInt(itemQtys[1]) * parseInt(rate));
// finalPrice = parseInt(finalPrice) + ( parseInt(itemQtys[1]) * parseInt(rate));
finalPrice = parseFloat(finalPrice) + ( parseInt(itemQtys[1]) * parseFloat(rate));
console.log("finalPrice11"+finalPrice);
}
//Tooltip login to get rate [END]
......@@ -2615,7 +2697,162 @@ var sorttable = "";
var pSet = xmldoc.getElementsByTagName("SET");
var pSetVal = "";
console.log("pSet"+pSet);
function xmlToJson(xml) {
// Create the return object
var obj = {};
if (xml.nodeType == 1) { // element
// do attributes
if (xml.attributes.length > 0) {
obj["@attributes"] = {};
for (var j = 0; j < xml.attributes.length; j++) {
var attribute = xml.attributes.item(j);
obj["@attributes"][attribute.nodeName] = attribute.nodeValue;
}
}
} else if (xml.nodeType == 3) { // text
obj = xml.nodeValue;
}
// do children
// If just one text node inside
if (xml.hasChildNodes() && xml.childNodes.length === 1 && xml.childNodes[0].nodeType === 3) {
obj = xml.childNodes[0].nodeValue;
}
else if (xml.hasChildNodes()) {
for(var i = 0; i < xml.childNodes.length; i++) {
var item = xml.childNodes.item(i);
var nodeName = item.nodeName;
if (typeof(obj[nodeName]) == "undefined") {
obj[nodeName] = xmlToJson(item);
} else {
if (typeof(obj[nodeName].push) == "undefined") {
var old = obj[nodeName];
obj[nodeName] = [];
obj[nodeName].push(old);
}
obj[nodeName].push(xmlToJson(item));
}
}
}
return obj;
}
/*
var pRates = xmldoc.getElementsByTagName("RATES");
alert("pRates1"+pRates);
var pRatesVal = "";
var jsonStr = "{";
var obj = null;
var pRatesLen = pRates[0].childNodes.length;alert(pRatesLen);
for (var i = 0; i < pRates.length; i++)
{
if (pRates[i].nodeName != null && pRates[i].nodeName != undefined)
{
console.log("xxx"+pRates[i].nodeName);
for (var j = 0; j < pRates[i].childNodes.length; j++)
{
console.log("yyy"+pRates[i].childNodes);
pRatesKey = pRates[i].childNodes[j].nodeName;
pRatesVal = pRates[i].childNodes[j].childNodes[0].nodeValue;
//obj.push({pRatesKey:pRatesVal});
//jsonStr = JSON.stringify(obj);
jsonStr += "\""+pRatesKey + "\":\"" + pRatesVal +"\"";
if(j<pRates[i].childNodes.length-1)
{
jsonStr+= ",";
}
}
}
}
jsonStr += "}";
console.log("jsonStr["+jsonStr+"]");
obj = JSON.parse(jsonStr);
console.log("jsonStrNew", obj);
var eachRates=xmldoc.getElementsByTagName("each_rate");
console.log("eachRates",eachRates);
*/
/*
for (var i = 0; i < eachRates.length; i++)
{
if (eachRates[i].nodeName != null && pRates[i].nodeName != undefined)
{
if(eachRates[i].childNodes[0].nodeName == "key")
{
pRatesKey = eachRates[i].childNodes[0].nodeValue;
}
else
{
pRatesVal = eachRates[i].childNodes[].nodeValue;
}
console.log("xxx"+pRates[i].nodeName);
for (var j = 0; j < pRates[i].childNodes.length; j++)
{
console.log("yyy"+pRates[i].childNodes);
pRatesKey = pRates[i].childNodes[j].nodeName;
pRatesVal = pRates[i].childNodes[j].childNodes[0].nodeValue;
//obj.push({pRatesKey:pRatesVal});
//jsonStr = JSON.stringify(obj);
jsonStr += "\""+pRatesKey + "\":\"" + pRatesVal +"\"";
if(j<pRates[i].childNodes.length-1)
{
jsonStr+= ",";
}
}
}
}
jsonStr += "}";
console.log("jsonStr["+jsonStr+"]");
obj = JSON.parse(jsonStr);
console.log("jsonStrNew", obj);
*/
var itemParentRateTag = xmldoc.getElementsByTagName("item_parent_rate");
var itemParentRate = itemParentRateTag[0].childNodes[0].nodeValue;
for (var k = 0; k < pSet.length; k++)
{
if (pSet[k].nodeName != null && pSet[k].nodeName != undefined)
......@@ -2638,17 +2875,49 @@ var sorttable = "";
if (tranType == "T")
{
pSetVal = pSetVal + "<th class='tHeader' align = '"+alignHead+"'>"+pSet[k].childNodes[0].nodeValue+"</th>";
/*var rateStr = "";
if(obj.hasOwnProperty(pSet[k].childNodes[0].nodeValue))
{
rateStr = "@" + obj[pSet[k].childNodes[0].nodeValue];
}*/
//alert(rateStr);
var rateStr = ""
if(k>2)
{
rateStr = ""+itemParentRate;
}
pSetVal = pSetVal + "<th class='tHeader' align = '"+alignHead+"'>"+pSet[k].childNodes[0].nodeValue +"</th>";
}
else
{
if(k>1)
{
pSetVal = pSetVal + "<th class='tHeader' align = '"+alignHead+"'>"+pSet[k].childNodes[0].nodeValue+"</th>";
pSetVal = pSetVal + "<th class='tHeader' align = '"+alignHead+"'>"+pSet[k].childNodes[0].nodeValue +"</th>";
}
}
}
}
//added by kaustubh on 16 Nov 2017
/* var pRates = xmldoc.getElementsByTagName("RATES");
console.log("pRates"+pRates);
for (var k = 0; k < pRates.length; k++)
{
if (pRates[k].nodeName != null && pRates[k].nodeName != undefined)
{
pSetVal = pSetVal + "<th class='tHeader' align = '"+alignHead+"'>"+pRates[k].childNodes[0].nodeValue+"</th>";
console.log("pSetVal"+pSetVal);
}
} */
// alert(pSetVal);
var tempdata="<div id='matrixDiv"+y+"'>" +
"<table id='itemDtl"+y+"' width='100%' class='headertableClass' style = 'border-top:none'>"+
......@@ -2697,11 +2966,14 @@ var sorttable = "";
document.getElementById("pieces"+t).innerHTML= totalQty;
document.getElementById("sum"+t).innerHTML = totalQty;
document.getElementById("rate"+t).innerHTML= " piece(s) @ "+ currCode +" "+ finalPrice +" (excluding tax)";
var itemParentRateTag = xmldoc.getElementsByTagName("item_parent_rate");
var itemParentRate = itemParentRateTag[0].childNodes[0].nodeValue;
//var itemParentRateTag = xmldoc.getElementsByTagName("item_parent_rate");
//var itemParentRate = itemParentRateTag[0].childNodes[0].nodeValue;
document.getElementById("item_parent_rate"+t).innerHTML = itemParentRate;
document.getElementById("tab_no"+t).value= tabNum;
}
......@@ -4112,15 +4384,32 @@ function getSidePanel(x)
"<td width = '10%'>" +
"<label id = 'item_parent_totalQuantity"+x+"'></label>"+
"<input type='hidden' id='totalquantity"+x+"' class='editDisplayClass' maxlength='0' ISCHANGED='false' readOnly = '1' style='width: 400px'/>"+
"</td>"+
"</td>";
"<td align='right' width = '10%'> Rate: " +
/* "<td align='right' width = '10%'>"+
"Rate :"+
"</td>"+
"<td width = '10%'>" +
"<label id = 'item_parent_rate"+x+"'></label>"+
"<label id = 'Ind_rate"+x+"'></label>"+
"<input type='hidden' id='indrate"+x+"' class='editDisplayClass' maxlength='0' ISCHANGED='false' readOnly = '1' style='width: 400px'/>"+
"</td>"+ */
/* if(trueFlagValue1 === "true"){
a+="<td align='right' width = '10%'> Rate: " ;
}
else{
a+="<td align='right' width = '10%'> Rate: " ;
}
*/
/* "<td align='right' width = '10%'> Rate: " +
"<td align='right' width = '10%'> " + */
a+="</td>"+
"<td width = '10%'>" +
"<label style=visibility:hidden; id = 'item_parent_rate"+x+"'></label>"+
"<input type='hidden' id='itmdescription"+x+"' class='editDisplayClass' maxlength='0' ISCHANGED='false' readOnly = '1' style='width: 400px'/>"+
"</td>"+
"</td>"+
"<td align = 'right' width = '20%'>"+
"Despatch Date: <input type='text' class='input_editable' size='8' value='' name='dspdate"+x+"' id='dspdate"+x+"' onkeydown = 'return false;' maxlength='8' placeholder = 'DD/MM/YY' onchange=\"javascript:setDespDate('"+x+"');\" /> "+
"<img border='0' src='/ibase/webitm/images/calender.png' style = 'margin-bottom:-5px;margin-left:-1px;cursor: hand;' id='dspdate"+x+"' name='dspdate"+x+"' onClick=\"javascript:setDate('dspdate"+x+"');\" /> "+
......
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