Skip to content

B
business-java
Commit 934ca0dd authored by smestry's avatar smestry
Browse files
Options

Updated the Product wizard js for enter key disable 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@102411 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0693b14e
Show whitespace changes
Inline Side-by-side
Showing with 63 additions and 17 deletions
webitm-wms/module-resource/web/js/prodWiz_Common.js
View file @ 934ca0dd
......@@ -512,7 +512,7 @@
// Changed by Sneha on 08-07-2016, for special character [End]
function disableEnter()
{
if(event.keyCode == 13)
if(window.event.keyCode == 13)
{
//alert("Sneha");
return false;
......
webitm-wms/module-resource/web/js/prodWiz_Edit.js
View file @ 934ca0dd
......@@ -151,7 +151,6 @@
selectedCode = [];
var fieldValue = "";
var flag = ""; // Changed by Sneha on 08-04-2016
if (field == "iitem_parnt")
{
fieldValue = document.getElementById("Detail1.1.item_parnt").value;
......@@ -227,11 +226,13 @@
fieldValue = document.getElementById("Detail3."+ dbID +".phy_attrib_3").value;
flag = "A";
}
//var url = "/ibase/webitm/jsp/ProdWizardItemTypeList.jsp?LOGIN_ID="+loginId
// +"&FIELDS="+field+"&DBID="+dbID+"&FIELDNAME="+fieldName+"&IDNUM="+idNum+"&FIELDVALUE="+fieldValue+",";
var url = "/ibase/webitm/jsp/ProdWizardItemTypeList.jsp?LOGIN_ID="+loginId
+"&FIELDS="+field+"&DBID="+dbID+"&FIELDNAME="+escape(fieldName)+"&IDNUM="+idNum+"&FIELDVALUE="+fieldValue+","+"&FLAG="+flag;
+"&FIELDS="+field+"&DBID="+dbID+"&FIELDNAME="+fieldName+"&IDNUM="+idNum+"&FIELDVALUE="+fieldValue+","+"&FLAG="+flag;
// Changed by Sneha on 01/04/2016 for Size, Color, Dimension [End]
var win = window.open( url, 'Product Details', 'toolbar=no,status=yes,resizable=no,scrollbars=yes,left=100,top=50,width=500,height=550' );
......@@ -1740,10 +1741,32 @@
else if (document.getElementById("Detail"+formNo+"."+domNo+".item_type") != null && document.getElementById("Detail"+formNo+"."+domNo+".item_type").value == "")
{
alert("Please Select Product Type.");
document.getElementById("Detail"+formNo+"."+domNo+".item_type").focus();
//document.getElementById("Detail"+formNo+"."+domNo+".item_type").focus();
document.getElementById("Detail"+formNo+"."+domNo+".item_type_pophelp").focus();
return false;
}
//Changed by samadhan on 13/01/2015 for Product Type validation End
//Changed by Sneha on 12-07-2016, for Item description, location code, brand validation [Start]
else if (document.getElementById("Detail"+formNo+"."+domNo+".attr_value") != null && document.getElementById("Detail"+formNo+"."+domNo+".attr_value").value == "")
{
alert("Please Enter Item Description.");
document.getElementById("Detail"+formNo+"."+domNo+".attr_value").focus();
return false;
}
else if (document.getElementById("Detail"+formNo+"."+domNo+".loc_code") != null && document.getElementById("Detail"+formNo+"."+domNo+".loc_code").value == "")
{
alert("Please Select Location Code.");
document.getElementById("Detail"+formNo+"."+domNo+".loc_code_pophelp").focus();
return false;
}
else if (document.getElementById("Detail"+formNo+"."+domNo+".phy_attrib_24") != null && document.getElementById("Detail"+formNo+"."+domNo+".phy_attrib_24").value == "")
{
alert("Please Select Brand.");
document.getElementById("Detail"+formNo+"."+domNo+".phy_attrib_24_pophelp").focus();
return false;
}
//Changed by Sneha on 12-07-2016, for Item description, location code, brand validation [End]
else if (!setLanguageListDetails())
{
return false;
......@@ -1913,11 +1936,11 @@
+"id='Detail3."+maxRowId+".size_code_descr' ISCHANGED='false' readOnly = '1' />"
+"<div style='float:left;width: 80%;' id='size_code_descr."+maxRowId+"' contenteditable='false' onkeypress='return false;'"
+"onkeydown=javascript:openSearchPopup(event,'"+maxRowId+"','"+loginCode+"','size_code_descr','Size&nbsp;Codes','"+maxRowId+"');>"
+"onkeydown=javascript:openSearchPopup(event,'"+maxRowId+"','"+loginCode+"','size_code_descr','Size&#160;Codes','"+maxRowId+"');>"
+"</div>"
+"<div style='float:right; width: 10%;'>"
+"<a href=javascript:callListJSP('"+maxRowId+"','"+loginCode+"','size_code_descr','Size&nbsp;Codes','"+maxRowId+"'); "
+"<a href=javascript:callListJSP('"+maxRowId+"','"+loginCode+"','size_code_descr','Size&#160;Codes','"+maxRowId+"'); "
+"style='float: left;text-decoration: none;' id = 'Detail3."+maxRowId+".size_code_pophelp'>"
+"<img src='/ibase/webitm/images/DD/popup1.png' style='margin-left: -5px;' title='Select Size Codes' />"
+"</a>"
......@@ -1997,7 +2020,7 @@
+"id='Detail3."+maxRowId+".tax_descr' maxlength='10' value='"+taxDescr+"' >"
+"<div style='float:left;width: 85%;text-align:center;' id='tax."+maxRowId+"' contenteditable='false' onkeypress='return false;'"
+"onkeydown='javascript:openSearchPopup(event, '"+maxRowId+"','0','tax_desc', 'Tax Code', '"+maxRowId+"');'>"
+"onkeydown='javascript:openSearchPopup(event, '"+maxRowId+"','0','tax_desc', 'Tax&#160;Code', '"+maxRowId+"');'>"
+ taxDescr
+"</div>"
......@@ -2114,7 +2137,6 @@
//document.getElementById("Detail3."+ maxRowId +".descr").innerHTML = itemParntDescr;
document.getElementById("Detail3."+ maxRowId +".language_dtl").value = languageDtl;
document.getElementById("Detail3."+ maxRowId +".descr").focus();
}
function itmparntChangeNew(itemCode, action)
......
webitm-wms/module-resource/web/js/prodWiz_Form_I.js
View file @ 934ca0dd
......@@ -491,7 +491,7 @@
if (document.getElementById("Detail1.1.item_parnt").value == "")
{
alert("Please Enter Parent Code.");
document.getElementById("Detail1.1.item_parnt").focus(); // Changed by Sneha on 08-07-2016, focus
document.getElementById("Detail1.1.item_parnt").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
else if (document.getElementById("Detail1.1.item_parnt_desc").value == "")
......@@ -516,14 +516,16 @@
else if (document.getElementById("Detail1.1.item_type").value == "")
{
alert("Please Select Product Type.");
document.getElementById("Detail1.1.item_type").focus();
//document.getElementById("Detail1.1.item_type").focus();
document.getElementById("Detail1.1.item_type_pophelp").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
//Changed by samadhan on 13/01/2015 for Product Type validation end
else if (document.getElementById("Detail1.1.item_ser").value == "")
{
alert("Please Select Item Series.");
document.getElementById("Detail1.1.item_ser").focus();
//document.getElementById("Detail1.1.item_ser").focus();
document.getElementById("Detail1.1.item_ser_pophelp").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
/*else if (document.getElementById("Detail1.1.grp_code").value == "")
......@@ -535,13 +537,15 @@
else if (document.getElementById("Detail1.1.item_category").value == "")
{
alert("Please Select Item Category.");
document.getElementById("Detail1.1.item_category").focus();
//document.getElementById("Detail1.1.item_category").focus();
document.getElementById("Detail1.1.item_category_pophelp").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
else if (document.getElementById("Detail1.1.supp_code").value == "")
{
alert("Please Select Supplier.");
document.getElementById("Detail1.1.supp_code").focus();
//document.getElementById("Detail1.1.supp_code").focus();
document.getElementById("Detail1.1.supp_code_pophelp").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
else if (!setSuppListDetails())
......@@ -551,7 +555,15 @@
else if (document.getElementById("Detail1.1.site_codes").value == "")
{
alert("Please Select Site Availability.");
document.getElementById("Detail1.1.site_codes").focus();
//document.getElementById("Detail1.1.site_codes").focus();
document.getElementById("Detail1.1.site_codes_pophelp").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
else if (document.getElementById("Detail1.1.dimension_desc").value == "")
{
alert("Please Select Dimensions.");
//document.getElementById("Detail1.1.site_codes").focus();
document.getElementById("Detail1.1.dimension_desc_pophelp").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
else if (!setPriceListDetails())
......@@ -568,14 +580,16 @@
else if (document.getElementById("Detail1.1.color_codes").value == "")
{
alert("Please Select Color Availability.");
document.getElementById("Detail1.1.color_codes").focus();
//document.getElementById("Detail1.1.color_codes").focus();
document.getElementById("Detail1.1.color_code_descr_pophelp").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
//Changed by samadhan on 22/12/2015 for brand validation Start
else if (document.getElementById("Detail1.1.item_phy_attrib_24").value == "")
{
alert("Please Select Brand.");
document.getElementById("Detail1.1.item_phy_attrib_24").focus();
//document.getElementById("Detail1.1.item_phy_attrib_24").focus();
document.getElementById("Detail1.1.item_phy_attrib_24_pophelp").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
//Changed by samadhan on 22/12/2015 for brand validation end
......@@ -597,6 +611,7 @@
else if (document.getElementById("Detail1.1.loc_code").value == "")
{
alert("Location code can't be null");
document.getElementById("Detail1.1.loc_code_pophelp").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
//Added by Chetan Mahajan on date:05/02/2015 [ validation on loc_code] End
......@@ -613,52 +628,62 @@
else if (document.getElementById("Detail1.1.tax").value == "")
{
alert("Please Enter Tax ");
document.getElementById("Detail1.1.tax_desc_pophelp").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
//Added by parikshit Kumbhar on date: 29/06/2015 [D15CKAT031] [ length,width,height,shipper_size,net_weight,gross_weight] Start
else if ((document.getElementById("Detail1.1.item_length").value == "") || (document.getElementById("Detail1.1.item_length").value == "0.000"))
{
alert("Please Enter Length ");
document.getElementById("Detail1.1.item_length").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
else if ((document.getElementById("Detail1.1.item_width").value == "") || (document.getElementById("Detail1.1.item_width").value == "0.000"))
{
alert("Please Enter Width ");
document.getElementById("Detail1.1.item_width").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
else if ((document.getElementById("Detail1.1.item_height").value == "") || (document.getElementById("Detail1.1.item_height").value == "0.000"))
{
alert("Please Enter Height ");
document.getElementById("Detail1.1.item_height").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
else if ((document.getElementById("Detail1.1.item_gross_wt").value == "") || (document.getElementById("Detail1.1.item_gross_wt").value == "0.000"))
{
alert("Please Gross Weight ");
document.getElementById("Detail1.1.item_gross_wt").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
else if ((document.getElementById("Detail1.1.shipper_size").value == "") || (document.getElementById("Detail1.1.shipper_size").value == "0.000"))
{
alert("Please Enter shipper_size ");
document.getElementById("Detail1.1.shipper_size").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
else if ((document.getElementById("Detail1.1.case_length").value == "") || (document.getElementById("Detail1.1.case_length").value == "0.000"))
{
alert("Please Enter Case Length ");
document.getElementById("Detail1.1.case_length").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
else if ((document.getElementById("Detail1.1.case_width").value == "") || (document.getElementById("Detail1.1.case_width").value == "0.000"))
{
alert("Please Enter Case Width ");
document.getElementById("Detail1.1.case_width").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
else if ((document.getElementById("Detail1.1.size_height").value == "") || (document.getElementById("Detail1.1.size_height").value == "0.000"))
{
alert("Please Enter Case Height ");
document.getElementById("Detail1.1.size_height").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
else if ((document.getElementById("Detail1.1.case_gross_weight").value == "") || (document.getElementById("Detail1.1.case_gross_weight").value == "0.000"))
{
alert("Please Enter Case Gross Weight ");
document.getElementById("Detail1.1.case_gross_weight").focus(); // Changed by Sneha on 08-07-2016, for focus on validation
return false;
}
/*else if ((document.getElementById("Detail1.1.case_net_weight").value == "") || (document.getElementById("Detail1.1.case_net_weight").value == "0.000"))
......
webitm-wms/module-resource/web/js/prodWiz_Popup.js
View file @ 934ca0dd
......@@ -735,7 +735,6 @@
// changed by Sneha on 08-04-2016, for single selection for color, dimension, size, tax in pophelp [Start]
var flag = document.getElementById("flag").value;
//alert("field"+field);
//if (field == "language_desc" || field == "site_codes" || field == "color_codes" || field == "dimension_desc" || field == "item_category")
//{
......
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