W15LKAT004, Updated the file for size code values.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101366 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-wms/module-resource/web/js/prodWiz_Edit.js

@@ -2,7 +2,7 @@
 	var selectedCode = new Array();
 	var global_date_format = "";
 	// Changed by Sneha on 07-04-2016, for item description [Start]
-	var itemDescr = "";
+	var valueFromServlet = "";
 	var httpRequestNew;
 	var isServerBusyNew = false;
 	var parserNew;
@@ -212,7 +212,7 @@
 		// Changed by Sneha on 01/04/2016 for Size, Color, Dimension [Start]
 		else if(field == "size_code_descr")
 		{
-			fieldValue = document.getElementById("Detail3.1.size_item_code").value +","+document.getElementById("Detail3."+ dbID +".phy_attrib_1").value;
+			fieldValue = document.getElementById("Detail3.1.size_item_code").value +","+document.getElementById("Detail3.1.phy_attrib_1").value;
 			flag = "A";
 		}
 		else if(field == "color_codes")
@@ -226,14 +226,13 @@
 			fieldValue = document.getElementById("Detail3."+ dbID +".phy_attrib_3").value;
 			flag = "A";
 		}
-		// Changed by Sneha on 01/04/2016 for Size, Color, Dimension [End]
-
 		//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="+fieldName+"&IDNUM="+idNum+"&FIELDVALUE="+fieldValue+","+"&FLAG="+flag;
+				+"&FIELDS="+field+"&DBID="+dbID+"&FIELDNAME="+escape(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' );		
 	}
 	
@@ -324,12 +323,19 @@
 		// Changed by Sneha on 30/03/2016 for dispaly of color, dimension, size [Start]
 		else if (field == "color_codes") 
 		{
-			
 			document.getElementById("Detail3."+idNum+".phy_attrib_2").value = fieldId;
 			document.getElementById("Detail3."+idNum+".color_code_descr").value = fieldValue;
 			document.getElementById("Detail3."+idNum+".color_codes").value = fieldId;
 			document.getElementById("color_code_descr."+idNum).innerHTML = fieldValue;
 			
+			// Item Description
+			var color = document.getElementById("Detail3."+idNum+".color_code_descr").value;
+			var size = document.getElementById("Detail3."+idNum+".size_code_descr").value;
+			var phyAttribute3 = document.getElementById("Detail3."+idNum+".phy_attrib_3").value;
+			
+			var descr = valueFromServlet + " " + size + " " + color + " " + phyAttribute3;
+			document.getElementById("Detail3."+idNum+".descr").value = descr;
+			
 		}
 		else if (field == "dimension_desc") 
 		{
@@ -338,12 +344,12 @@
 			document.getElementById("Detail3."+idNum+".dimension_desc").value = fieldValue;
 			document.getElementById("dimension_desc."+idNum).innerHTML = fieldValue;
 			
-			// Description
+			// Item Description
 			var color = document.getElementById("Detail3."+idNum+".color_code_descr").value;
 			var size = document.getElementById("Detail3."+idNum+".size_code_descr").value;
 			var phyAttribute3 = document.getElementById("Detail3."+idNum+".phy_attrib_3").value;
 			
-			var descr = itemDescr + " " + size + " " + color + " " + phyAttribute3;
+			var descr = valueFromServlet + " " + size + " " + color + " " + phyAttribute3;
 			document.getElementById("Detail3."+idNum+".descr").value = descr;
 		}
 		else if (field == "size_code_descr") 
@@ -351,6 +357,14 @@
 			document.getElementById("Detail3."+idNum+".phy_attrib_1").value = fieldId;
 			document.getElementById("Detail3."+idNum+".size_code_descr").value = fieldValue;
 			document.getElementById("size_code_descr."+idNum).innerHTML = fieldValue;
+			
+			// Item Description
+			var color = document.getElementById("Detail3."+idNum+".color_code_descr").value;
+			var size = document.getElementById("Detail3."+idNum+".size_code_descr").value;
+			var phyAttribute3 = document.getElementById("Detail3."+idNum+".phy_attrib_3").value;
+			
+			var descr = valueFromServlet + " " + size + " " + color + " " + phyAttribute3;
+			document.getElementById("Detail3."+idNum+".descr").value = descr;
 		}
 		
 		// Changed by Sneha on 30/03/2016 for dispaly of color, dimension, size [End]
@@ -366,7 +380,7 @@
 		var seldbID ="";
 		
 		var field = document.getElementById("value").value;
-		
+
 		selectedCode = $.unique( selectedCode );
 		selectedCode.reverse();
 		
@@ -525,7 +539,7 @@
 	function setCheckedPopup( obj )
 	{
 		var field = document.getElementById("value").value;
-
+		
 		var chkCnt = 0;
 		
 		if (field == "language_desc" ||field == "site_codes" || field == "color_codes" || field == "dimension_desc" || field == "item_category" )
@@ -619,7 +633,6 @@
 	function checkBoxVisibility() 
 	{
 		var field = document.getElementById("value").value;
-		alert(field);
 		if (field == "language_desc" ||field == "site_codes" || field == "color_codes" || field == "dimension_desc" || field == "item_category")
 		{
 			document.getElementById("chkAll").style.visibility = "visible";
@@ -1462,6 +1475,7 @@
     	var maxId = $('#SKUItemId tbody tr').length;
 		var barCodes = [];
 		
+		
 		for( dbID = 1; dbID <= maxId; dbID++)
 		{
 			if (document.getElementById("Detail"+formNo+"."+dbID+".selectbox").checked)
@@ -1550,11 +1564,21 @@
 				}
 				barCodes.push(document.getElementById("Detail"+formNo+"."+dbID+".item_barcode").value);
 				}
-				// Added by Samadhan on 28/12/2015 for check duplicate barcodes end
-
+				// Added by Samadhan on 28/12/2015 for check duplicate barcodes end			
 			}
-			
 		}
+		//Changed by Sneha on 26-04-2016, validation for size, color, dimension [Start]
+		var itemCode = document.getElementById("Detail3.1.item_code").value;
+		getItmAttribute(itemCode, maxId, "GET_ITEM_ATTRIBUTE");	
+		alert("valueFromServlet---"+valueFromServlet);
+		if(valueFromServlet == "Y")
+		{
+			alert("Size, Color, Dimension cannot be same as exisiting Item.");
+			document.getElementById("Detail3."+maxId+".size_code_pophelp").focus();
+			return false;
+		}
+		//Changed by Sneha on 26-04-2016, validation for size, color, dimension [End]
+		
 		document.getElementById("action").value = actionValue;
 		document.getElementById(actionValue).style.pointerEvents = 'none';
 		return true;
@@ -1686,8 +1710,8 @@
 		
 		//alert("itemCode---"+itemCode);	
 		itmparntChangeNew(itemCode, "GET_ITEM_DESCR");
-		//alert("itemDescr---"+itemDescr);
-		var color = "Color&nbsp;Codes";
+		//alert("valueFromServlet---"+valueFromServlet);
+
 		var chkbox = "Y";
 		var row = "<tr>"
 						+"<td>";
@@ -1704,10 +1728,10 @@
 									+"value='false' onClick='setChecked(this)' style='visibility: hidden; width: 0px;' />";
 							}
 							var row = row 
-						+" </td>" 
+						+"</td>" 
 						// Item Description
 						+ "<td>"
-							+"<input type='text' class='editInputClass' value='"+itemDescr+"' name='Detail3."+maxRowId+".descr' " 
+							+"<input type='text' class='editInputClass' value='"+valueFromServlet+"' name='Detail3."+maxRowId+".descr' " 
 								+"id='Detail3."+maxRowId+".descr' maxlength='90' style='width: 100%;' />"
 								
 							+"<input type='hidden' class='editInputClass' name='Detail3."+maxRowId+".item_code' " 
@@ -1732,10 +1756,13 @@
 						
 						// Size	
 						+"<td>"
-							+"<input type='hidden'  value='"+itemCode+"' name='Detail3.1.size_item_code'  " 
+							+"<input type='hidden' value='"+itemCode+"' name='Detail3.1.size_item_code'  " 
 								+"id='Detail3.1.size_item_code' ISCHANGED='false' readOnly = '1' />"
 						
-							+"<input type='hidden' class='editInputClass' name='Detail3."+maxRowId+".phy_attrib_1' value='"+phyAttribute1+"'" 
+							+"<input type='hidden' value='"+phyAttribute1+"' name='Detail3.1.phy_attrib_1' " 
+								+"id='Detail3.1.phy_attrib_1' ISCHANGED='false' readOnly = '1' />"
+								
+							+"<input type='hidden' class='editInputClass' name='Detail3."+maxRowId+".phy_attrib_1' "
 								+"id='Detail3."+maxRowId+".phy_attrib_1' ISCHANGED='false' readOnly = '1' />"
 							
 							+"<input type='hidden' class='editInputClass' name='Detail3."+maxRowId+".size_code_descr'" 
@@ -1748,7 +1775,7 @@
 							+"<div style='float:right; width: 10%;'>"
 								+"<a href=javascript:callListJSP('"+maxRowId+"','"+loginCode+"','size_code_descr','Size&nbsp;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	' />"
+									+"<img src='/ibase/webitm/images/DD/popup1.png' style='margin-left: -5px;' title='Select Size Codes' />"
 								+"</a>"
 							+"</div>"
 						+"</td>"
@@ -1769,7 +1796,7 @@
 							+"</div>"
 							
 							+"<div style='float:right; width: 8%;'>"
-								+"<a href=javascript:callListJSP('"+maxRowId+"','"+loginCode+"','color_codes','"+color+"','"+maxRowId+"'); " 
+								+"<a href=javascript:callListJSP('"+maxRowId+"','"+loginCode+"','color_codes','Color&nbsp;Codes','"+maxRowId+"'); " 
 									+"style='float: left;text-decoration: none;' id = 'Detail3."+maxRowId+".color_codes_pophelp' >"
 									+"<img src='/ibase/webitm/images/DD/popup1.png' style='margin-left: -5px;' title='Select Color Codes' />"
 								+"</a>"
@@ -1939,6 +1966,7 @@
 		
 		$('#SKUItemId tbody').append(row);
 		
+		
 	}	
 	
 	function itmparntChangeNew(itemCode, action)	
@@ -1949,6 +1977,22 @@
 		makeRequestNew( url, setColumnValues);
 	}
 	
+	function getItmAttribute(itemCode, maxId, action)	
+	{
+		//alert('itemCode:'+itemCode);
+		//alert('action'+action);
+
+		var phyAttribute1 = document.getElementById("Detail3."+ maxId +".phy_attrib_1").value;
+		var phyAttribute2 = document.getElementById("Detail3."+ maxId +".phy_attrib_2").value;
+		var phyAttribute3 = document.getElementById("Detail3."+ maxId +".phy_attrib_3").value;
+		
+		//alert("phyAttribute1 in getItmAttribute =======>>" + phyAttribute1);
+		
+		var url = "/ibase/ProdWizItemChangeServlet?ITEMCODE="+itemCode+"&PHYATTRIBUTE1="+phyAttribute1+"&PHYATTRIBUTE2="+phyAttribute2+"&PHYATTRIBUTE3="+phyAttribute3+"&ACTION="+action;
+		makeRequestNew( url, setColumnValues);
+		
+	}
+	
 	function makeRequestNew( url, setColumnValues )
 	{
 		var sURL = unescape(window.location);
@@ -1998,7 +2042,7 @@
 		  		var parser = new DOMParser();
 		  		xmldoc = httpRequestNew.responseText;
 		  		//alert("xmldoc======>>"+xmldoc);
-		  		itemDescr = xmldoc; 
+		  		valueFromServlet = xmldoc; 
 			}
 			catch(e)
 			{

webitm-wms/module-resource/web/js/prodWiz_Popup.js

@@ -628,7 +628,7 @@
 	{
 		var field = document.getElementById("value").value;
 		var chkCnt = 0;
-		
+
 		/*alert("selectedCode in : ["+ selectedCode +"]");*/
 
 		// changed by Sneha on 08-04-2016, for single selection for color, dimension, size, tax in pophelp [Start]
@@ -732,7 +732,7 @@
 	{
 		
 		var field = document.getElementById("value").value;
-		
+
 		// 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);