Commit 2064605e authored by caluka's avatar caluka

xsl changes done for order of display in requirement wizard transaction[MF3KSUN005]


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95738 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 516c3604
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
.td_leftAlign .td_leftAlign
{background:#D7E5F9;text-align:left;font-family:verdana;font-size:9pt} {background:#D7E5F9;text-align:left;font-family:verdana;font-size:9pt}
.td_leftAlign1
{background:#D7E5F9;text-align:center;font-family:verdana;font-size:9pt}
</style> </style>
...@@ -47,40 +49,22 @@ ...@@ -47,40 +49,22 @@
<xsl:variable name="site_code__fr"><xsl:value-of select="site_code__fr"/></xsl:variable> <xsl:variable name="site_code__fr"><xsl:value-of select="site_code__fr"/></xsl:variable>
<xsl:variable name="site_code__to"><xsl:value-of select="site_code__to"/></xsl:variable> <xsl:variable name="site_code__to"><xsl:value-of select="site_code__to"/></xsl:variable>
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable> <xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
<!--
<tr>
<td class="td_leftAlign" nowrap="true">
<strong>Period From :</strong>
</td>
<td class="td_leftAlign">
<input type="text" class="input_editable" size="15" value="{$date_from}" name="Detail1.{normalize-space($dbID)}.event_date" id="Detail1.{normalize-space($dbID)}.event_date" maxlength="8" ISCHANGED="false" onblur="checkDate(this)"/> ( DD/MM/YY )
<input type="text" class="input_editable" size="15" value="{$date_from}" name="Detail1.{normalize-space($dbID)}.date_from" id="Detail1.{normalize-space($dbID)}.date_from" maxlength="8" ISCHANGED="false" />
<img src="/ibase/webitm/images/Standard/e12_pophelp_16.jpg" onClick="selectedObj = 'Detail1.{normalize-space($dbID)}.date_from'; javascript:show_calendar('Detail1.{normalize-space($dbID)}.date_from','','','DD/MM/YY');"/>( DD/MM/YY )
</td>
<td class="td_leftAlign" nowrap="true">
<strong>Period To :</strong>
</td>
<td class="td_leftAlign">
<input type="text" class="input_editable" size="15" value="{$date_to}" name="Detail1.{normalize-space($dbID)}.date_to" id="Detail1.{normalize-space($dbID)}.date_to" maxlength="8" ISCHANGED="false" />
<img src="/ibase/webitm/images/Standard/e12_pophelp_16.jpg" onClick="selectedObj = 'Detail1.{normalize-space($dbID)}.date_to'; javascript:show_calendar('Detail1.{normalize-space($dbID)}.date_to','','','DD/MM/YY');"/>( DD/MM/YY )
</td>
</tr> -->
<tr> <tr>
<td class="td_leftAlign" nowrap="true"> <td class="td_leftAlign1" nowrap="true">
<strong>Site Code From :</strong> <strong>Site Code :</strong>
</td> </td>
<td class="td_leftAlign"> <td class="td_leftAlign1">
<input type="text" class="input_editable" size="15" value="{$site_code__fr}" name="Detail1.{normalize-space($dbID)}.site_code__fr" id="Detail1.{normalize-space($dbID)}.site_code__fr" maxlength="05" ISCHANGED="false" /> <input type="text" class="input_editable" size="15" value="{$site_code__fr}" name="Detail1.{normalize-space($dbID)}.site_code__fr" id="Detail1.{normalize-space($dbID)}.site_code__fr" maxlength="05" ISCHANGED="false" onFocus="blur();" />
<a href="javascript:callPopUpJSP('site_code__fr');"> <img src="/ibase/webitm/images/Standard/e12_pophelp_16.jpg" border="0"/> </a> <!-- <a href="javascript:callPopUpJSP('site_code__fr');"> <img src="/ibase/webitm/images/Standard/e12_pophelp_16.jpg" border="0"/> </a> -->
</td> </td>
<td class="td_leftAlign" nowrap="true"> <!-- <td class="td_leftAlign" nowrap="true">
<strong>Site Code To :</strong> <strong>Site Code To :</strong>
</td> </td> -->
<td class="td_leftAlign"> <td class="td_leftAlign">
<input type="text" class="input_editable" size="15" value="{$site_code__to}" name="Detail1.{normalize-space($dbID)}.site_code__to" id="Detail1.{normalize-space($dbID)}.site_code__to" maxlength="05" ISCHANGED="false" onblur="return upperCase(this.id)"/> <input type="hidden" class="input_editable" size="15" value="{$site_code__to}" name="Detail1.{normalize-space($dbID)}.site_code__to" id="Detail1.{normalize-space($dbID)}.site_code__to" maxlength="05" ISCHANGED="false" />
<a href="javascript:callPopUpJSP('site_code__to');"> <img src="/ibase/webitm/images/Standard/e12_pophelp_16.jpg" border="0"/> </a> <!-- <a href="javascript:callPopUpJSP('site_code__to');"> <img src="/ibase/webitm/images/Standard/e12_pophelp_16.jpg" border="0"/> </a> -->
</td> </td>
</tr> </tr>
......
...@@ -128,10 +128,10 @@ ...@@ -128,10 +128,10 @@
<xsl:variable name="bom_code"><xsl:value-of select="bom_code"/></xsl:variable> <xsl:variable name="bom_code"><xsl:value-of select="bom_code"/></xsl:variable>
<xsl:variable name="no_of_batch"><xsl:value-of select="no_of_batch"/></xsl:variable> <xsl:variable name="no_of_batch"><xsl:value-of select="no_of_batch"/></xsl:variable>
<xsl:variable name="quantity"><xsl:value-of select="quantity"/></xsl:variable> <xsl:variable name="quantity"><xsl:value-of select="quantity"/></xsl:variable>
<xsl:variable name="mpsorder"><xsl:value-of select="mpsorder"/></xsl:variable> <xsl:variable name="mpsorder"><xsl:value-of select="mpsorder"/></xsl:variable>
<xsl:variable name="batch_qty"><xsl:value-of select="batch_qty"/></xsl:variable>
<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="chkbox"><xsl:value-of select="@selected"/></xsl:variable> <xsl:variable name="chkbox"><xsl:value-of select="@selected"/></xsl:variable>
<!-- <xsl:value-of select="$chkbox"/> -->
<tr> <tr>
<td class="td_leftAlign"> <td class="td_leftAlign">
...@@ -141,52 +141,55 @@ ...@@ -141,52 +141,55 @@
<![CDATA[ orderVisit = parseInt("]]> <xsl:value-of select="order_of_visit"/><![CDATA[");]]> <![CDATA[ orderVisit = parseInt("]]> <xsl:value-of select="order_of_visit"/><![CDATA[");]]>
</script> </script>
<input type="checkbox" name="Detail2.{normalize-space($dbID)}.selectbox" id="Detail2.{normalize-space($dbID)}.selectbox" value="true" checked="Y" onClick="setCheckedPlace(this, '{normalize-space($dbID)}' )"/> <input type="checkbox" name="Detail2.{normalize-space($dbID)}.selectbox" id="Detail2.{normalize-space($dbID)}.selectbox" value="true" checked="Y" onClick="setCheckedPlace(this, '{normalize-space($dbID)}' )"/>
<!-- <input type="checkbox" name="Detail2.{normalize-space($dbID)}.selectbox" id="Detail2.{normalize-space($dbID)}.selectbox" value="true" /> -->
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<!-- <input type="checkbox" name="Detail2.{normalize-space($dbID)}.selectbox" id="Detail2.{normalize-space($dbID)}.selectbox" value="false" onClick="setCheckedPlace(this, '{normalize-space($dbID)}' ),deselectbox()"/> -->
<input type="checkbox" name="Detail2.{normalize-space($dbID)}.selectbox" id="Detail2.{normalize-space($dbID)}.selectbox" value="false" onClick="setCheckedPlace(this, '{normalize-space($dbID)}' )"/> <input type="checkbox" name="Detail2.{normalize-space($dbID)}.selectbox" id="Detail2.{normalize-space($dbID)}.selectbox" value="false" onClick="setCheckedPlace(this, '{normalize-space($dbID)}' )"/>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</td> </td>
<td class="td_leftAlign" align="left"> <td class="td_leftAlign" align="left">
<input type="text" name="Detail2.{normalize-space($dbID)}.site_code" id="Detail2.{normalize-space($dbID)}.site_code" value="{$site_code}" size="06" ISCHANGED="true"/> <input type="text" name="Detail2.{normalize-space($dbID)}.site_code" id="Detail2.{normalize-space($dbID)}.site_code" value="{$site_code}" size="06" ISCHANGED="true" readonly="readonly" tabindex="10" onFocus="blur();"/>
</td> </td>
<td class="td_leftAlign" align="left" > <td class="td_leftAlign" align="left" >
<input type="text" name="Detail2.{normalize-space($dbID)}.item_code" id="Detail2.{normalize-space($dbID)}.item_code" value="{$item_code}" size="10" ISCHANGED="true" onblur="return upperCase(this.id)" /> <input type="text" name="Detail2.{normalize-space($dbID)}.item_code" id="Detail2.{normalize-space($dbID)}.item_code" value="{$item_code}" size="10" ISCHANGED="true" onblur="return upperCase(this.id)" />
<a href="javascript:callPopHelpJSP( '{normalize-space($dbID)}','{normalize-space($item_code)}','{normalize-space($site_code)}' );"> <img src="/ibase/webitm/images/Standard/e12_pophelp_16.jpg" border="0"/> </a> <a href="javascript:callPopHelpJSP( '{normalize-space($dbID)}','{normalize-space($item_code)}','{normalize-space($site_code)}' );"> <img src="/ibase/webitm/images/Standard/e12_pophelp_16.jpg" border="0"/> </a>
</td> </td>
<td class="td_leftAlign" align="left" > <td class="td_leftAlign" align="left" >
<input type="text" name="Detail2.{normalize-space($dbID)}.item_descr" id="Detail2.{normalize-space($dbID)}.item_descr" value="{$item_descr}" size="20" ISCHANGED="true" readonly="readonly" tabindex="10"/> <input type="text" name="Detail2.{normalize-space($dbID)}.item_descr" id="Detail2.{normalize-space($dbID)}.item_descr" value="{$item_descr}" size="20" ISCHANGED="true" readonly="readonly" tabindex="10" onFocus="blur();"/>
</td> </td>
<td class="td_leftAlign" align="left" > <td class="td_leftAlign" align="left" >
<input type="text" name="Detail2.{normalize-space($dbID)}.unit" id="Detail2.{normalize-space($dbID)}.unit" value="{$unit}" size="5" ISCHANGED="true" readonly="readonly" tabindex="10"/> <input type="text" name="Detail2.{normalize-space($dbID)}.unit" id="Detail2.{normalize-space($dbID)}.unit" value="{$unit}" size="5" ISCHANGED="true" readonly="readonly" tabindex="10" onFocus="blur();"/>
</td> </td>
<td class="td_leftAlign" align="left" > <td class="td_leftAlign" align="left" >
<input type="text" name="Detail2.{normalize-space($dbID)}.bom_code" id="Detail2.{normalize-space($dbID)}.bom_code" value="{$bom_code}" size="10" ISCHANGED="true" readonly="readonly" tabindex="10"/> <input type="text" name="Detail2.{normalize-space($dbID)}.bom_code" id="Detail2.{normalize-space($dbID)}.bom_code" value="{$bom_code}" size="10" ISCHANGED="true" readonly="readonly" tabindex="10" onFocus="blur();"/>
</td> </td>
<td class="td_rightAlign" align="left" > <td class="td_rightAlign" align="left" >
<input type="text" style="text-align:right" name="Detail2.{normalize-space($dbID)}.no_of_batch" id="Detail2.{normalize-space($dbID)}.no_of_batch" value="{$no_of_batch}" size="10" ISCHANGED="true"/> <!-- <xsl:choose>
<xsl:when test="no_of_batch ='0'">
<input type="text" style="text-align:right" name="Detail2.{normalize-space($dbID)}.no_of_batch" id="Detail2.{normalize-space($dbID)}.no_of_batch" value="{$no_of_batch}" size="10" ISCHANGED="true" />
</xsl:when>
<xsl:otherwise>
<input type="text" style="text-align:right" name="Detail2.{normalize-space($dbID)}.no_of_batch" id="Detail2.{normalize-space($dbID)}.no_of_batch" value="{$no_of_batch}" size="10" ISCHANGED="true" readonly="readonly" onFocus="blur();" />
</xsl:otherwise>
</xsl:choose> -->
<input type="text" style="text-align:right" name="Detail2.{normalize-space($dbID)}.no_of_batch" id="Detail2.{normalize-space($dbID)}.no_of_batch" value="{$no_of_batch}" size="10" ISCHANGED="true" readonly="readonly" onFocus="blur();" />
</td> </td>
<td class="td_rightAlign" align="left"> <td class="td_rightAlign" align="left">
<input type="text" style="text-align:right" name="Detail2.{normalize-space($dbID)}.quantity" id="Detail2.{normalize-space($dbID)}.quantity" value="{$quantity}" size="10" ISCHANGED="true" onkeydown="isNumberKey(event)"/> <!-- <input type="text" style="text-align:right" name="Detail2.{normalize-space($dbID)}.quantity" id="Detail2.{normalize-space($dbID)}.quantity" value="{$quantity}" size="10" ISCHANGED="true" onkeydown="isNumberKey(event)"/> -->
<input type="text" style="text-align:right" name="Detail2.{normalize-space($dbID)}.quantity" id="Detail2.{normalize-space($dbID)}.quantity" value="{$quantity}" size="10" ISCHANGED="true" readonly="readonly" onFocus="blur();" onkeydown="isNumberKey(event)"/>
</td> </td>
<td class="td_leftAlign" align="left"> <td class="td_leftAlign" align="left">
<input type="hidden" name="Detail2.{normalize-space($dbID)}.mpsorder" id="Detail2.{normalize-space($dbID)}.mpsorder" value="{$mpsorder}" size="10" ISCHANGED="true" /> <input type="hidden" name="Detail2.{normalize-space($dbID)}.mpsorder" id="Detail2.{normalize-space($dbID)}.mpsorder" value="{$mpsorder}" size="10" ISCHANGED="true" />
</td> </td>
<td class="td_leftAlign" align="left">
<input type="hidden" name="Detail2.{normalize-space($dbID)}.batch_qty" id="Detail2.{normalize-space($dbID)}.batch_qty" value="{$batch_qty}" size="10" ISCHANGED="true" />
</td>
</tr> </tr>
</xsl:for-each> </xsl:for-each>
...@@ -200,10 +203,10 @@ ...@@ -200,10 +203,10 @@
<input type="hidden" value="" name="action" id="action" /> <input type="hidden" value="" name="action" id="action" />
<input type="submit" style="cursor:hand" value="Previous" id="Previous" name="Previous" title='' onclick="javascript:setActionVal('previous')"/> <input type="submit" style="cursor:hand" value="Previous" id="Previous" name="Previous" title='' onclick="javascript:setActionVal('previous')"/>
<input type="submit" style="cursor:hand" value="Next" id="Next" name="Next" title='' onclick="javascript:setActionVal('next')"/> <input type="submit" style="cursor:hand" value="Next" id="Next" name="Next" title='' onclick="javascript:setActionVal('next')"/>
<input type="button" style="cursor:hand" class="tableClass" value="Add" onclick="addRow('travelTable')" /> <input type="button" style="cursor:hand" class="tableClass" value="Add" onclick="addRow('travelTable')" />
<input type="button" style="cursor:hand" class="tableClass" value="Delete" onclick="deleteRowRecord('travelTable')" /> <input type="button" style="cursor:hand" class="tableClass" value="Delete" onclick="deleteRowRecord('travelTable')" />
</td> </td>
</tr> </tr>
......
...@@ -46,6 +46,7 @@ function setItemFromPophelp() ...@@ -46,6 +46,7 @@ function setItemFromPophelp()
unit= document.getElementById("DetailActCode."+dbID+".UNIT").value; unit= document.getElementById("DetailActCode."+dbID+".UNIT").value;
detail2dom= document.getElementById("DetailActCode."+dbID+".DOMID").value; detail2dom= document.getElementById("DetailActCode."+dbID+".DOMID").value;
bomCode = document.getElementById("DetailActCode."+dbID+".BOM_CODE").value; bomCode = document.getElementById("DetailActCode."+dbID+".BOM_CODE").value;
batchQty = document.getElementById("DetailActCode."+dbID+".BATCH_QTY").value;
} }
...@@ -60,6 +61,7 @@ function setItemFromPophelp() ...@@ -60,6 +61,7 @@ function setItemFromPophelp()
window.opener.setItemDescr(seldbID, itemDescr,detail2dom); window.opener.setItemDescr(seldbID, itemDescr,detail2dom);
window.opener.setUnit(seldbID, unit,detail2dom); window.opener.setUnit(seldbID, unit,detail2dom);
window.opener.setBomCode(seldbID, bomCode,detail2dom); window.opener.setBomCode(seldbID, bomCode,detail2dom);
window.opener.setBatchQty(seldbID, batchQty,detail2dom);
window.close(); window.close();
} }
...@@ -172,6 +174,9 @@ function setChecked( obj ) ...@@ -172,6 +174,9 @@ function setChecked( obj )
<td width="10%" class="header_td" nowrap="true" valign="bottom"> <td width="10%" class="header_td" nowrap="true" valign="bottom">
<strong>Bom Code</strong> <strong>Bom Code</strong>
</td> </td>
<td width="10%" class="header_td" nowrap="true" valign="bottom">
<strong>BATCH QUANTITY</strong>
</td>
</tr> </tr>
...@@ -182,6 +187,7 @@ function setChecked( obj ) ...@@ -182,6 +187,7 @@ function setChecked( obj )
<xsl:variable name="DOMID"><xsl:value-of select="DOMID"/></xsl:variable> <xsl:variable name="DOMID"><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="BOM_CODE"><xsl:value-of select="BOM_CODE"/></xsl:variable> <xsl:variable name="BOM_CODE"><xsl:value-of select="BOM_CODE"/></xsl:variable>
<xsl:variable name="BATCH_QTY"><xsl:value-of select="BATCH_QTY"/></xsl:variable>
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable> <xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
<SCRIPT> <SCRIPT>
<![CDATA[ var qtyR ; qtyR ="]]> <xsl:value-of select="$dbID"/> <![CDATA[ var qtyR ; qtyR ="]]> <xsl:value-of select="$dbID"/>
...@@ -223,14 +229,13 @@ function setChecked( obj ) ...@@ -223,14 +229,13 @@ function setChecked( obj )
<xsl:value-of select="BOM_CODE"/> <xsl:value-of select="BOM_CODE"/>
<input type="hidden" name="Detail4.{normalize-space($dbID)}.BOM_CODE" id = "DetailActCode.{normalize-space($dbID)}.BOM_CODE" value="{normalize-space($BOM_CODE)}" size="20" class="fieldcell_items" ISCHANGED="false"/> <input type="hidden" name="Detail4.{normalize-space($dbID)}.BOM_CODE" id = "DetailActCode.{normalize-space($dbID)}.BOM_CODE" value="{normalize-space($BOM_CODE)}" size="20" class="fieldcell_items" ISCHANGED="false"/>
</td> </td>
<td class="td_leftAlign">
<xsl:value-of select="BATCH_QTY"/>
<input type="hidden" name="Detail4.{normalize-space($dbID)}.BATCH_QTY" id = "DetailActCode.{normalize-space($dbID)}.BATCH_QTY" value="{normalize-space($BATCH_QTY)}" size="20" class="fieldcell_items" ISCHANGED="false"/>
</td>
<input type="hidden" name="Detail4.{normalize-space($dbID)}.DOMID" id = "DetailActCode.{normalize-space($dbID)}.DOMID" value="{normalize-space($DOMID)}" size="20" class="fieldcell_items" ISCHANGED="false"/> <input type="hidden" name="Detail4.{normalize-space($dbID)}.DOMID" id = "DetailActCode.{normalize-space($dbID)}.DOMID" value="{normalize-space($DOMID)}" size="20" class="fieldcell_items" ISCHANGED="false"/>
<!-- <input type="hidden" name="Detail4.{normalize-space($dbID)}.site_code" id = "DetailActCode.{normalize-space($dbID)}.site_code" value="{normalize-space($site_code)}" size="20" class="fieldcell_items" ISCHANGED="false"/> --> <!-- <input type="hidden" name="Detail4.{normalize-space($dbID)}.site_code" id = "DetailActCode.{normalize-space($dbID)}.site_code" value="{normalize-space($site_code)}" size="20" class="fieldcell_items" ISCHANGED="false"/> -->
</tr> </tr>
</xsl:for-each> </xsl:for-each>
</table> </table>
......
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