Commit cdae83eb authored by steurwadkar's avatar steurwadkar

Changes made to generate wave task from distribution order

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@182679 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 76df3e9a
...@@ -11,6 +11,7 @@ var sorttable = ""; ...@@ -11,6 +11,7 @@ var sorttable = "";
var divArray = new Array(); var divArray = new Array();
var lastSerachSuggestionMap = {}; var lastSerachSuggestionMap = {};
var prevRemoveEnable = ""; var prevRemoveEnable = "";
var thumbImgColNames = ["image_path","add_click_event","thumb_ref_id","thumb_ref_ser","thumb_ref_id_descr"];
if (window.ActiveXObject) /*code for IE6, IE5*/ if (window.ActiveXObject) /*code for IE6, IE5*/
{ {
...@@ -124,6 +125,8 @@ function parseJsonData(result) ...@@ -124,6 +125,8 @@ function parseJsonData(result)
default_col = (result.getElementsByTagName('DEFAULT_COL')[0].childNodes[0].nodeValue) - 1; default_col = (result.getElementsByTagName('DEFAULT_COL')[0].childNodes[0].nodeValue) - 1;
} }
default_col = parseInt(default_col) + 5;
var detail = result.getElementsByTagName('DETAIL'); var detail = result.getElementsByTagName('DETAIL');
if (detail != undefined) if (detail != undefined)
{ {
...@@ -140,11 +143,11 @@ function parseJsonData(result) ...@@ -140,11 +143,11 @@ function parseJsonData(result)
{ {
id = nodes[default_col].childNodes[0].nodeValue; id = nodes[default_col].childNodes[0].nodeValue;
if ( nodes[j].childNodes[0].nodeValue != "" ) if ( nodes[j].childNodes[0] != undefined && nodes[j].childNodes[0].nodeValue != "" )
{ {
value = value + nodes[j].childNodes[0].nodeValue + " | "; value = value + nodes[j].childNodes[0].nodeValue + " | ";
} }
if ( nodes[j].childNodes[0].nodeValue != "" ) if ( nodes[j].childNodes[0] != undefined && nodes[j].childNodes[0].nodeValue != "" )
{ {
detailData = nodes[j].childNodes[0].nodeValue; detailData = nodes[j].childNodes[0].nodeValue;
} }
...@@ -152,7 +155,14 @@ function parseJsonData(result) ...@@ -152,7 +155,14 @@ function parseJsonData(result)
{ {
detailData = "-"; detailData = "-";
} }
searchData['imgPth'] = detail[i].attributes.imagePath.value.trim(); if("image_path" == nodes[j].nodeName)
{
searchData['imgPth'] = value.trim();
}
if(thumbImgColNames.includes(nodes[j].nodeName.trim()))
{
continue;
}
searchData['id'] = id.trim(); searchData['id'] = id.trim();
searchData['label'] = value.trim(); searchData['label'] = value.trim();
searchData['value'] = id.trim(); searchData['value'] = id.trim();
...@@ -541,9 +551,7 @@ function setItemChangeValues(retVal) ...@@ -541,9 +551,7 @@ function setItemChangeValues(retVal)
document.getElementById("Detail1.1."+nodeName).style.visibility = "visible"; document.getElementById("Detail1.1."+nodeName).style.visibility = "visible";
document.getElementById("Detail1.1."+nodeName).disabled=false; document.getElementById("Detail1.1."+nodeName).disabled=false;
document.getElementById("Detail1.1."+nodeName).readOnly = false; document.getElementById("Detail1.1."+nodeName).readOnly = false;
document.getElementById("Detail1.1."+nodeName).focus(); document.getElementById("Detail1.1."+nodeName).className = "input_editable";
document.getElementById("Detail1.1."+nodeName).value = "";
document.getElementById("Detail1.1."+nodeName).className = "editInputClass";
} }
} }
} }
......
...@@ -128,6 +128,7 @@ ...@@ -128,6 +128,7 @@
<xsl:for-each select="//Detail1"> <xsl:for-each select="//Detail1">
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable> <xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
<xsl:variable name="site_code"><xsl:value-of select="site_code"/></xsl:variable> <xsl:variable name="site_code"><xsl:value-of select="site_code"/></xsl:variable>
<xsl:variable name="wave_on"><xsl:value-of select="wave_on"/></xsl:variable>
<xsl:variable name="sort_order"><xsl:value-of select="sort_order"/></xsl:variable> <xsl:variable name="sort_order"><xsl:value-of select="sort_order"/></xsl:variable>
<xsl:variable name="item_ser__from"><xsl:value-of select="item_ser__from"/></xsl:variable> <xsl:variable name="item_ser__from"><xsl:value-of select="item_ser__from"/></xsl:variable>
<xsl:variable name="item_ser__to"><xsl:value-of select="item_ser__to"/></xsl:variable> <xsl:variable name="item_ser__to"><xsl:value-of select="item_ser__to"/></xsl:variable>
...@@ -141,6 +142,8 @@ ...@@ -141,6 +142,8 @@
<xsl:variable name="due_date__to"><xsl:value-of select="due_date__to"/></xsl:variable> <xsl:variable name="due_date__to"><xsl:value-of select="due_date__to"/></xsl:variable>
<xsl:variable name="sale_order__from"><xsl:value-of select="sale_order__from"/></xsl:variable> <xsl:variable name="sale_order__from"><xsl:value-of select="sale_order__from"/></xsl:variable>
<xsl:variable name="sale_order__to"><xsl:value-of select="sale_order__to"/></xsl:variable> <xsl:variable name="sale_order__to"><xsl:value-of select="sale_order__to"/></xsl:variable>
<xsl:variable name="dist_order__from"><xsl:value-of select="dist_order__from"/></xsl:variable>
<xsl:variable name="dist_order__to"><xsl:value-of select="dist_order__to"/></xsl:variable>
<xsl:variable name="cust_code__dlv__from"><xsl:value-of select="cust_code__dlv__from"/></xsl:variable> <xsl:variable name="cust_code__dlv__from"><xsl:value-of select="cust_code__dlv__from"/></xsl:variable>
<xsl:variable name="cust_code__dlv__to"><xsl:value-of select="cust_code__dlv__to"/></xsl:variable> <xsl:variable name="cust_code__dlv__to"><xsl:value-of select="cust_code__dlv__to"/></xsl:variable>
<xsl:variable name="credit_term__from"><xsl:value-of select="credit_term__from"/></xsl:variable> <xsl:variable name="credit_term__from"><xsl:value-of select="credit_term__from"/></xsl:variable>
...@@ -184,6 +187,18 @@ ...@@ -184,6 +187,18 @@
<a href="#" onclick="openSortOrdPopUp(event);" id="popUpIcon0" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png"/></a> <a href="#" onclick="openSortOrdPopUp(event);" id="popUpIcon0" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png"/></a>
</td> </td>
</tr> </tr>
<tr>
<td class="td_rightAlign" nowrap="true" valign="middle" >
Wave on :
</td>
<td class="td_leftAlign" >
<SELECT id='Detail1.{normalize-space($dbID)}.wave_on' NAME="Detail1.{normalize-space($dbID)}.wave_on" align="LEFT" TABINDEX="17" class="input_editable" style="width:116px;" onchange="callItemChange('wave_on');">
<OPTION value="S"><xsl:choose><xsl:when test="$wave_on='S'"><xsl:attribute name="selected"/></xsl:when></xsl:choose><![CDATA[Sales order]]></OPTION>
<OPTION value="D"><xsl:choose><xsl:when test="$wave_on='D'"><xsl:attribute name="selected"/></xsl:when></xsl:choose><![CDATA[Distribution order]]></OPTION>
</SELECT>
</td>
<td colspan="2"></td>
</tr>
<tr> <tr>
<td class="td_rightAlign" nowrap="true" valign="middle"> <td class="td_rightAlign" nowrap="true" valign="middle">
Item Series From: Item Series From:
...@@ -248,6 +263,22 @@ ...@@ -248,6 +263,22 @@
<a href="javascript:getListOfValues('SALE_ORDER','Detail1.{normalize-space($dbID)}.sale_order__to','{$site_code}');" id="popUpIcon8" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png" /></a> <a href="javascript:getListOfValues('SALE_ORDER','Detail1.{normalize-space($dbID)}.sale_order__to','{$site_code}');" id="popUpIcon8" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png" /></a>
</td> </td>
</tr> </tr>
<tr>
<td class="td_rightAlign" nowrap="true" valign="middle" >
Distribution Order From:
</td>
<td class="td_leftAlign" >
<input type="text" class="editDisplayClass" value="{$dist_order__from}" name="Detail1.{normalize-space($dbID)}.dist_order__from" id="Detail1.{normalize-space($dbID)}.dist_order__from" onblur="callItemChange('dist_order__from');" popupFldName="DIST_ORDER__FROM" onkeyup="getAutoPopupData(this);" tabIndex="93" onfocus="displayPopUpIcon('popUpIcon18');" disabled="true" readonly="true"/>
<a href="javascript:getListOfValues('DIST_ORDER__FROM','Detail1.{normalize-space($dbID)}.dist_order__from','{$site_code}');" id="popUpIcon18" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png" /></a>
</td>
<td class="td_rightAlign" nowrap="true" valign="middle" >
Distribution Order To:
</td>
<td class="td_leftAlign" >
<input type="text" class="editDisplayClass" value="{$dist_order__to}" name="Detail1.{normalize-space($dbID)}.dist_order__to" id="Detail1.{normalize-space($dbID)}.dist_order__to" onblur="callItemChange('dist_order__to');" popupFldName="DIST_ORDER__TO" onkeyup="getAutoPopupData(this);" tabIndex="98" onfocus="displayPopUpIcon('popUpIcon19');" disabled="true" readonly="true"/>
<a href="javascript:getListOfValues('DIST_ORDER__TO','Detail1.{normalize-space($dbID)}.dist_order__to','{$site_code}');" id="popUpIcon19" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png" /></a>
</td>
</tr>
<tr> <tr>
<td class="td_rightAlign" nowrap="true" valign="middle" > <td class="td_rightAlign" nowrap="true" valign="middle" >
Customer Code From: Customer Code From:
......
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