Skip to content

B
business-java
Commit 6ff4332a authored by steurwadkar's avatar steurwadkar
Browse files
Options

Dynamic attribute adding as per master definition 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@105176 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 608d4683
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 34 deletions
webitm-wms/ibase/webitm/ejb/wms/ItemTypeWizEJB.java
View file @ 6ff4332a
package ibase.webitm.ejb.wms;
import ibase.system.config.ConnDriver;
import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.*;
import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException;
import java.sql.*;
import java.util.ArrayList;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Timestamp;
import org.w3c.dom.*;
import org.w3c.dom.Document;
@javax.ejb.Stateless
public class ItemTypeWizEJB extends ValidatorEJB implements ItemTypeWizEJBLocal,ItemTypeWizEJBRemote
......@@ -362,9 +364,13 @@ public class ItemTypeWizEJB extends ValidatorEJB implements ItemTypeWizEJBLocal,
if(currentColumn.trim().equalsIgnoreCase("itm_default"))
{
sql = "SELECT A.ATTRIB_ID, A.DESCR, A.SH_DESCR, A.ACTIVE_YN, A.SORT_ORDER FROM ITM_ATTRIB_VAL A, ITEM_TYPE B " +
" WHERE UPPER(A.ATTRIB_CODE) = UPPER(B.PHY_ATTRIB_2) AND UPPER(A.ATTRIB_CODE) = UPPER(?) AND UPPER(B.ITEM_TYPE) = UPPER(?)";
//Commented and changed by Santosh on 29/03/2017 to display attributes details dynamically
//" WHERE UPPER(A.ATTRIB_CODE) = UPPER(B.PHY_ATTRIB_2) AND UPPER(A.ATTRIB_CODE) = UPPER(?) AND UPPER(B.ITEM_TYPE) = UPPER(?)";
" WHERE UPPER(A.ATTRIB_CODE) = UPPER(B.PHY_ATTRIB_1) AND UPPER(A.ATTRIB_CODE) = UPPER(?) AND UPPER(B.ITEM_TYPE) = UPPER(?)";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,color);
//Commented and changed by Santosh on 29/03/2017 to display attributes details dynamically
//pstmt.setString(1,color);
pstmt.setString(1,size);
pstmt.setString(2,itemType);
rs = pstmt.executeQuery();
while(rs.next())
......@@ -412,9 +418,13 @@ public class ItemTypeWizEJB extends ValidatorEJB implements ItemTypeWizEJBLocal,
if(currentColumn.trim().equalsIgnoreCase("itm_default"))
{
sql = "SELECT A.ATTRIB_ID, A.DESCR, A.SH_DESCR, A.ACTIVE_YN, A.SORT_ORDER FROM ITM_ATTRIB_VAL A, ITEM_TYPE B " +
" WHERE UPPER(A.ATTRIB_CODE) = UPPER(B.PHY_ATTRIB_1) AND UPPER(A.ATTRIB_CODE) = UPPER(?) AND UPPER(B.ITEM_TYPE) = UPPER(?)";
//Commented and changed by Santosh on 29/03/2017 to display attributes details dynamically
//" WHERE UPPER(A.ATTRIB_CODE) = UPPER(B.PHY_ATTRIB_1) AND UPPER(A.ATTRIB_CODE) = UPPER(?) AND UPPER(B.ITEM_TYPE) = UPPER(?)";
" WHERE UPPER(A.ATTRIB_CODE) = UPPER(B.PHY_ATTRIB_2) AND UPPER(A.ATTRIB_CODE) = UPPER(?) AND UPPER(B.ITEM_TYPE) = UPPER(?)";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,size);
//Commented and changed by Santosh on 29/03/2017 to display attributes details dynamically
//pstmt.setString(1,size);
pstmt.setString(1,color);
pstmt.setString(2,itemType);
rs = pstmt.executeQuery();
while(rs.next())
......
webitm-wms/module-resource/web/xsl/WIZARD/item_type_wiz1_wiz_en_US_A.xsl
View file @ 6ff4332a
......@@ -170,7 +170,9 @@ border: 1px solid #E7E7E7 !important;
<strong>Attribute1 :</strong>
</td>
<td class="td_leftAlign">
<input type="text" readonly = "1" class="input_editable" name="Detail1.{normalize-space($dbID)}.phy_attrib_2" value="{phy_attrib_2}" id="Detail1.{normalize-space($dbID)}.phy_attrib_2" maxlength="15" style="width: 30%;" />
<!--Changed by Santosh on 29/03/2017 for label and textbox mismatch issue -->
<!-- <input type="text" readonly = "1" class="input_editable" name="Detail1.{normalize-space($dbID)}.phy_attrib_2" value="{phy_attrib_2}" id="Detail1.{normalize-space($dbID)}.phy_attrib_2" maxlength="15" style="width: 30%;" /> -->
<input type="text" readonly = "1" class="input_editable" name="Detail1.{normalize-space($dbID)}.phy_attrib_1" value="{phy_attrib_1}" id="Detail1.{normalize-space($dbID)}.phy_attrib_1" maxlength="15" style="width: 30%;"/>
</td>
</tr>
<tr>
......@@ -178,7 +180,9 @@ border: 1px solid #E7E7E7 !important;
<strong>Attribute2 :</strong>
</td>
<td class="td_leftAlign">
<input type="text" readonly = "1" class="input_editable" name="Detail1.{normalize-space($dbID)}.phy_attrib_1" value="{phy_attrib_1}" id="Detail1.{normalize-space($dbID)}.phy_attrib_1" maxlength="15" style="width: 30%;"/>
<!--Changed by Santosh on 29/03/2017 for label and textbox mismatch issue -->
<!-- <input type="text" readonly = "1" class="input_editable" name="Detail1.{normalize-space($dbID)}.phy_attrib_1" value="{phy_attrib_1}" id="Detail1.{normalize-space($dbID)}.phy_attrib_1" maxlength="15" style="width: 30%;"/> -->
<input type="text" readonly = "1" class="input_editable" name="Detail1.{normalize-space($dbID)}.phy_attrib_2" value="{phy_attrib_2}" id="Detail1.{normalize-space($dbID)}.phy_attrib_2" maxlength="15" style="width: 30%;" />
</td>
</tr>
<tr>
......
webitm-wms/module-resource/web/xsl/WIZARD/item_type_wiz2_wiz_en_US_A.xsl
View file @ 6ff4332a
......@@ -31,8 +31,16 @@
<TABLE border="0" width="100%" height="2%" class="header_td" cellpadding="0" cellspacing="0" style="background-color: #f7f8fa;border-bottom: #6cf 3px solid;">
<TR>
<div class='contentHeaderLbl'><img src="/ibase/images/menuImages/web/Dailyactivityreport.png" onerror=" this.src= '/ibase/images/menuImages/errMenu.png' " style="position: absolute; margin-left: -20px;margin-top:9px; height: 20px; width: 20px;"/>
<TD class="header_main" nowrap="true" align="left" valign="middle" style="padding-left: 10px;font-size:16px;" width="2%" >
Color Attribute Details:
<TD class="header_main" nowrap="true" align="left" valign="middle" style="padding-left: 10px;font-size:16px;" width="2%" >
<!--Added and changed by Santosh on 29/03/2017 for dynamic labels Start -->
<xsl:for-each select="//Detail2">
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
<!-- Color Attribute Details: -->
<xsl:if test="$dbID = 0">
<xsl:value-of select="phy_attrib_1"/> Attribute Details:
</xsl:if>
</xsl:for-each>
<!--Added and changed by Santosh on 29/03/2017 for dynamic labels End -->
</TD>
</div>
</TR>
......@@ -40,7 +48,15 @@
<table id="ItemTypeDetail" class="headertableClass" cellspacing="0" width="100%">
<thead class="table-head">
<tr >
<th class="tHeader">Color&#160;Code</th>
<!--Added and changed by Santosh on 29/03/2017 for dynamic labels Start -->
<xsl:for-each select="//Detail2">
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
<xsl:if test="$dbID = 0">
<!-- <th class="tHeader">Color&#160;Code</th> -->
<th class="tHeader"><xsl:value-of select="phy_attrib_1"/>&#160;Code</th>
</xsl:if>
</xsl:for-each>
<!--Added and changed by Santosh on 29/03/2017 for dynamic labels End -->
<th class="tHeader">Description</th>
<th class="tHeader">Short&#160;Description</th>
<th class="tHeader">Active</th>
......@@ -222,17 +238,25 @@
<div style="overflow:hidden; height: 350px;">
<table class='tableClass' id="SKUitemAttId"
style="text-align: center; width: 350px; margin: 0 auto;">
<!--Added and changed by Santosh on 29/03/2017 for dynamic labels Start -->
<xsl:for-each select="//Detail2">
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
<xsl:if test="$dbID = 0">
<TR>
<div class='contentHeaderLbl'><img src="/ibase/images/menuImages/web/Dailyactivityreport.png" onerror=" this.src= '/ibase/images/menuImages/errMenu.png' " style="position: absolute; margin-left: -20px;margin-top:0px; height: 20px; width: 20px;"/>
<TD class="header_main" nowrap="true" align="left" valign="middle" style="padding-left: 20px;font-size:16px;" width="2%" >
New Color Details
<TD class="header_main" nowrap="true" align="left" valign="middle" style="padding-left: 20px;font-size:16px;" width="2%" >
<!--Changed by Santosh on 29/03/2017 for dynamic labels -->
<!-- New Color Details -->
New <xsl:value-of select="phy_attrib_1"/> Details
</TD>
</div>
</TR>
<tbody class='table-body' style="border-top: #6cf 3px solid;">
<tr>
<td class="td_rightAlign" nowrap="true">Color Code :</td>
<!--Changed by Santosh on 29/03/2017 for dynamic labels -->
<!-- <td class="td_rightAlign" nowrap="true">Color Code :</td> -->
<td class="td_rightAlign" nowrap="true"><xsl:value-of select="phy_attrib_1"/> Code :</td>
<td class="td_leftAlign" style="width:20%;">
<input type="text"
class="input_editable" style="text-align: left;" id="p_attrib_id"
......@@ -285,13 +309,18 @@
</td>
</tr>
<tr>
<td class="td_rightAlign" nowrap="true">Color Group :</td>
<!--Changed by Santosh on 29/03/2017 for dynamic labels -->
<!-- <td class="td_rightAlign" nowrap="true">Color Group :</td> -->
<td class="td_rightAlign" nowrap="true"><xsl:value-of select="phy_attrib_1"/> Group :</td>
<td class="td_leftAlign" style="width:10%;">
<textarea rows="2"
class="input_editable" style="text-align: left; width: 91%;" id="p_group_type" value="{p_group_type}"
maxlength="60" />
<a href="javascript:callListJSP(1,'','COLOR', 'Codes', 0);"
<!-- Added by Santosh on 29/03/2017 for dynamic phy attributes -->
<xsl:variable name="phyAttribVal"><xsl:value-of select="phy_attrib_1"/></xsl:variable>
<xsl:variable name="upperCaseValue"><xsl:value-of select="translate($phyAttribVal,'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/></xsl:variable>
<a href="javascript:callListJSP(1,'','{$upperCaseValue}', 'Codes', 0);"
style="float: right;text-decoration: none;">
<img src="/ibase/webitm/images/pophelp.png" style="margin-left: -18px;" title="Select Codes" />
</a>
......@@ -300,6 +329,8 @@
</tbody>
</xsl:if>
</xsl:for-each>
</table>
<input type="hidden" id="idNumPack" />
<div class="popDiv" style="margin-top: 20px; height:6px; margin-left: 16px;">
......
webitm-wms/module-resource/web/xsl/WIZARD/item_type_wiz3_wiz_en_US_A.xsl
View file @ 6ff4332a
......@@ -31,8 +31,16 @@
<TABLE border="0" width="100%" height="2%" class="header_td" cellpadding="0" cellspacing="0" style="background-color: #f7f8fa;border-bottom: #6cf 3px solid;">
<TR>
<div class='contentHeaderLbl'><img src="/ibase/images/menuImages/web/Dailyactivityreport.png" onerror=" this.src= '/ibase/images/menuImages/errMenu.png' " style="position: absolute; margin-left: -20px;margin-top:9px; height: 20px; width: 20px;"/>
<TD class="header_main" nowrap="true" align="left" valign="middle" style="padding-left: 10px;font-size:16px;" width="2%" >
Size Attribute Details:
<TD class="header_main" nowrap="true" align="left" valign="middle" style="padding-left: 10px;font-size:16px;" width="2%" >
<!--Added and changed by Santosh on 29/03/2017 for dynamic labels Start -->
<xsl:for-each select="//Detail3">
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
<!-- Size Attribute Details: -->
<xsl:if test="$dbID = 0">
<xsl:value-of select="phy_attrib_2"/> Attribute Details:
</xsl:if>
</xsl:for-each>
<!--Added and changed by Santosh on 29/03/2017 for dynamic labels End -->
</TD>
</div>
</TR>
......@@ -40,7 +48,15 @@
<table id="ItemTypeDetail" class="headertableClass" cellspacing="0" width="100%">
<thead class="table-head">
<tr >
<th class="tHeader">Size&#160;Code</th>
<!--Added and changed by Santosh on 29/03/2017 for dynamic labels Start -->
<xsl:for-each select="//Detail3">
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
<xsl:if test="$dbID = 0">
<!-- <th class="tHeader">Size&#160;Code</th> -->
<th class="tHeader"><xsl:value-of select="phy_attrib_2"/>&#160;Code</th>
</xsl:if>
</xsl:for-each>
<!--Added and changed by Santosh on 29/03/2017 for dynamic labels End -->
<th class="tHeader">Description</th>
<th class="tHeader">Short&#160;Description</th>
<th class="tHeader">Active</th>
......@@ -210,17 +226,25 @@
<div style="overflow:hidden; height: 350px;">
<table class='tableClass' id="SKUitemAttId"
style="text-align: center; width: 350px; margin: 0 auto;">
<!--Added and changed by Santosh on 29/03/2017 for dynamic labels Start -->
<xsl:for-each select="//Detail3">
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
<xsl:if test="$dbID = 0">
<TR>
<div class='contentHeaderLbl'><img src="/ibase/images/menuImages/web/Dailyactivityreport.png" onerror=" this.src= '/ibase/images/menuImages/errMenu.png' " style="position: absolute; margin-left: -20px;margin-top:0px; height: 20px; width: 20px;"/>
<TD class="header_main" nowrap="true" align="left" valign="middle" style="padding-left: 20px;font-size:16px;" width="2%" >
New Size Details
<!--Changed by Santosh on 29/03/2017 for dynamic labels -->
<!-- New Size Details -->
New <xsl:value-of select="phy_attrib_2"/> Details
</TD>
</div>
</TR>
<tbody class='table-body' style="border-top: #6cf 3px solid;">
<tr>
<td class="td_rightAlign" nowrap="true">Size Code :</td>
<!--Changed by Santosh on 29/03/2017 for dynamic labels -->
<!-- <td class="td_rightAlign" nowrap="true">Size Code :</td> -->
<td class="td_rightAlign" nowrap="true"><xsl:value-of select="phy_attrib_2"/> Code :</td>
<td class="td_leftAlign" style="width:20%;">
<input type="text"
class="input_editable" style="text-align: left;" id="p_attrib_id"
......@@ -273,19 +297,27 @@
</td>
</tr>
<tr>
<td class="td_rightAlign" nowrap="true">Size Group :</td>
<!--Changed by Santosh on 29/03/2017 for dynamic labels -->
<!-- <td class="td_rightAlign" nowrap="true">Size Group :</td> -->
<td class="td_rightAlign" nowrap="true"><xsl:value-of select="phy_attrib_2"/> Group :</td>
<td class="td_leftAlign" style="width:10%;">
<textarea rows="2"
class="input_editable" style="text-align: left; width: 91%;" id="p_group_type" value="{p_group_type}"
maxlength="60" />
<!-- Added by Santosh on 29/03/2017 for dynamic phy attributes -->
<xsl:variable name="phyAttribVal"><xsl:value-of select="phy_attrib_2"/></xsl:variable>
<xsl:variable name="upperCaseValue"><xsl:value-of select="translate($phyAttribVal,'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/></xsl:variable>
<a href="javascript:callListJSP(1,'','SIZE', 'Codes', 0);"
<a href="javascript:callListJSP(1,'','{$upperCaseValue}', 'Codes', 0);"
style="float: right;text-decoration: none;">
<img src="/ibase/webitm/images/pophelp.png" style="margin-left: -18px;" title="Select Codes" />
</a>
</td>
</tr>
</tbody>
</xsl:if>
</xsl:for-each>
</table>
<input type="hidden" id="idNumPack" />
<div class="popDiv" style="margin-top: 20px; height:6px; margin-left: 16px;">
......
webitm-wms/module-resource/web/xsl/WIZARD/item_type_wiz4_wiz_en_US_A.xsl
View file @ 6ff4332a
......@@ -31,8 +31,16 @@
<TABLE border="0" width="100%" height="2%" class="header_td" cellpadding="0" cellspacing="0" style="background-color: #f7f8fa;border-bottom: #6cf 3px solid;">
<TR>
<div class='contentHeaderLbl'><img src="/ibase/images/menuImages/web/Dailyactivityreport.png" onerror=" this.src= '/ibase/images/menuImages/errMenu.png' " style="position: absolute; margin-left: -20px;margin-top:9px; height: 20px; width: 20px;"/>
<TD class="header_main" nowrap="true" align="left" valign="middle" style="padding-left: 10px;font-size:16px;" width="2%" >
Dimension Attribute Details:
<TD class="header_main" nowrap="true" align="left" valign="middle" style="padding-left: 10px;font-size:16px;" width="2%" >
<!--Added and changed by Santosh on 29/03/2017 for dynamic labels Start -->
<xsl:for-each select="//Detail4">
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
<!-- Dimension Attribute Details: -->
<xsl:if test="$dbID = 0">
<xsl:value-of select="phy_attrib_3"/> Attribute Details:
</xsl:if>
</xsl:for-each>
<!--Added and changed by Santosh on 29/03/2017 for dynamic labels End -->
</TD>
</div>
</TR>
......@@ -40,7 +48,15 @@
<table id="ItemTypeDetail" class="headertableClass" cellspacing="0" width="100%">
<thead class="table-head">
<tr >
<th class="tHeader">Dimension&#160;Code</th>
<!--Added and changed by Santosh on 29/03/2017 for dynamic labels Start -->
<xsl:for-each select="//Detail4">
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
<xsl:if test="$dbID = 0">
<!-- <th class="tHeader">Dimension&#160;Code</th> -->
<th class="tHeader"><xsl:value-of select="phy_attrib_3"/>&#160;Code</th>
</xsl:if>
</xsl:for-each>
<!--Added and changed by Santosh on 29/03/2017 for dynamic labels End -->
<th class="tHeader">Description</th>
<th class="tHeader">Short&#160;Description</th>
<th class="tHeader">Active</th>
......@@ -209,17 +225,25 @@
<div style="overflow:hidden; height: 350px;">
<table class='tableClass' id="SKUitemAttId"
style="text-align: center; width: 350px; margin: 0 auto;">
<!--Added and changed by Santosh on 29/03/2017 for dynamic labels Start -->
<xsl:for-each select="//Detail4">
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
<xsl:if test="$dbID = 0">
<TR>
<div class='contentHeaderLbl'><img src="/ibase/images/menuImages/web/Dailyactivityreport.png" onerror=" this.src= '/ibase/images/menuImages/errMenu.png' " style="position: absolute; margin-left: -20px;margin-top:0px; height: 20px; width: 20px; float: initial;"/>
<TD class="header_main" nowrap="true" align="left" valign="middle" style="padding-left: 20px;font-size:16px;" width="2%" >
New Dimension Details
<!--Changed by Santosh on 29/03/2017 for dynamic labels -->
<!-- New Dimension Details -->
New <xsl:value-of select="phy_attrib_3"/> Details
</TD>
</div>
</TR>
<tbody class='table-body' style="border-top: #6cf 3px solid;">
<tr>
<td class="td_rightAlign" nowrap="true">Dimension Code :</td>
<!--Changed by Santosh on 29/03/2017 for dynamic labels -->
<!-- <td class="td_rightAlign" nowrap="true">Dimension Code :</td> -->
<td class="td_rightAlign" nowrap="true"><xsl:value-of select="phy_attrib_3"/> Code :</td>
<td class="td_leftAlign" style="width:20%;">
<input type="text"
class="input_editable" style="text-align: left;" id="p_attrib_id"
......@@ -272,19 +296,27 @@
</td>
</tr>
<tr>
<td class="td_rightAlign" nowrap="true">Dimension Group :</td>
<!--Changed by Santosh on 29/03/2017 for dynamic labels -->
<!-- <td class="td_rightAlign" nowrap="true">Dimension Group :</td> -->
<td class="td_rightAlign" nowrap="true"><xsl:value-of select="phy_attrib_3"/> Group :</td>
<td class="td_leftAlign" style="width:10%;">
<textarea rows="2"
class="input_editable" style="text-align: left; width: 91%;" id="p_group_type" value="{p_group_type}"
maxlength="60" />
<!-- Added by Santosh on 29/03/2017 for dynamic phy attributes -->
<xsl:variable name="phyAttribVal"><xsl:value-of select="phy_attrib_3"/></xsl:variable>
<xsl:variable name="upperCaseValue"><xsl:value-of select="translate($phyAttribVal,'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/></xsl:variable>
<a href="javascript:callListJSP(1,'','DIMENSION', 'Codes', 0);"
<a href="javascript:callListJSP(1,'','{$upperCaseValue}', 'Codes', 0);"
style="float: right;text-decoration: none;">
<img src="/ibase/webitm/images/pophelp.png" style="margin-left: -18px;" title="Select Codes" />
</a>
</td>
</tr>
</tbody>
</xsl:if>
</xsl:for-each>
</table>
<input type="hidden" id="idNumPack" />
<div class="popDiv" style="margin-top: 20px; height:6px; margin-left: 16px;">
......
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