Updated the js for Product Wizard Trade mark pophelp.

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

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

@@ -240,6 +240,24 @@
 		}
 		//Changed by wasim on 02-08-2016 for tax chapter pop help [END]
 		
+		//Changed by Sneha on 17-10-2016 for trade mark pop help [Start]
+		else if (field == "trade_mark_parent") 
+		{
+			flag = "A";
+			field = "trade_mark";
+			fieldValue = document.getElementById("Detail2.1.trade_mark").value;
+		}
+		
+		else if (field == "trade_mark") 
+		{
+			flag = "A";
+			fieldValue = document.getElementById("Detail3."+ dbID +".trade_mark").value;
+
+		}
+		
+		
+		//Changed by Sneha on 17-10-2016 for trade mark pop help [End]
+		
 		//var url = "/ibase/webitm/jsp/ProdWizardItemTypeList.jsp?LOGIN_ID="+loginId
 		//			+"&FIELDS="+field+"&DBID="+dbID+"&FIELDNAME="+fieldName+"&IDNUM="+idNum+"&FIELDVALUE="+fieldValue+",";
 		
@@ -433,6 +451,22 @@
 			}
 		}
 	 	//CHanged by wasim on 03-08-2016 for tax chapter pop help [END]
+		
+		//Changed by Sneha on 17-10-2016 for trade mark pop help [Start]
+		else if (field == "trade_mark") 
+		{
+			if(idNum == 0)
+			{
+				document.getElementById("Detail2.1.trade_mark").value = fieldValue;
+			}
+			else if(idNum != 0)
+			{
+				document.getElementById("Detail3."+ idNum +".trade_mark").value = fieldValue;
+				document.getElementById("trade_mark."+ idNum).innerHTML = fieldValue;
+			}
+			
+		}
+		//Changed by Sneha on 17-10-2016 for trade mark pop help [End]
 	}
 
 	/**
@@ -1913,6 +1947,7 @@
 		
 		var taxChap = document.getElementById("Detail3."+rowId+".tax_chap").value;//Changed by wasim on 03-08-2016 for tax chapter
 		
+		
 		//alert("itemCode---"+itemCode);	
 		//itmparntChangeNew(itemCode, "GET_ITEM_DESCR");
 		//alert("valueFromServlet for GET_ITEM_DESCR --->>"+valueFromServlet);

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

@@ -139,9 +139,24 @@
 		else if (field == "tax_chapII") 
 		{
 			field = "tax_chap";
-			fieldValue = document.getElementById("Detail2."+dbID+".tax_chap").value;
+			fieldValue = document.getElementById("Detail2.1.tax_chap").value;
 		}
 		//Changed by wasim on 02-08-2016 for tax chapter pop help [END]
+		
+		// Changed by Sneha on 17-10-2016, for trade mark pophelp [Start]
+		else if (field == "trade_mark") 
+		{ 
+			if (idNum == 0)
+			{
+				fieldValue = document.getElementById("Detail1.1.trade_mark").value;
+			}
+			else if(idNum != 0)
+			{
+				fieldValue = document.getElementById("Detail2."+ idNum +".trade_mark").value;
+			}
+		}
+		// Changed by Sneha on 17-10-2016, for trade mark pophelp [End]
+		
 		/*$.ajax({
 			  async: false,
 			  url: url,
@@ -157,7 +172,7 @@
 				alert("Records Not Found!", "Operation Failed!");
 			}
 		});*/
-		
+
 		var url = "/ibase/webitm/jsp/ProdWizardItemTypeList.jsp?LOGIN_ID="+loginId
 					+"&FIELDS="+field+"&DBID="+dbID+"&FIELDNAME="+fieldName+"&IDNUM="+idNum+"&FIELDVALUE="+fieldValue+",";
 		
@@ -465,6 +480,21 @@
 			}
 		}
 	 	//CHanged by wasim on 03-08-2016 for tax chapter pop help [END]
+	 	
+	 	// Changed by Sneha on 17-10-2016, for trade mark pophelp [Start]
+		else if (field == "trade_mark") 
+		{	
+			if (idNum == 0)
+			{
+				document.getElementById("Detail1.1.trade_mark").value = fieldValue;
+			}
+			else if(idNum != 0)
+			{
+				document.getElementById("Detail2."+ idNum +".trade_mark").value = fieldValue;
+				document.getElementById("trade_mark."+ idNum).innerHTML = fieldValue;
+			}
+		}
+	 	// Changed by Sneha on 17-10-2016, for trade mark pophelp [End]
 	}
 
 	/**
@@ -496,7 +526,7 @@
 		
 		selectedCode = $.unique( selectedCode );
 		selectedCode.reverse();
-		
+
 		for( var i = 0; i < selectedCode.length; i++)
 		{
 			seldbID = seldbID + selectedCode[i];
@@ -547,6 +577,13 @@
 			    {
 			        return false;
 			    }
+			    //Changed by Sneha on 18-10-2016, for no selection in pophelp [Start]
+			    else
+			    {
+			    	idNum = document.getElementById("idNum").value;
+			    	check = "0";
+			    }
+			    //Changed by Sneha on 18-10-2016, for no selection in pophelp [End]
 			}
 		}
 		else
@@ -598,6 +635,7 @@
 		
 		if (check == 0)
 		{
+			//alert("fieldValue------->>"+fieldValue+ "] field=====>>"+field + "] idNum=====>>" + idNum);
 			window.opener.displayValue( fieldId, fieldValue, seldbID, field, idNum );
 			window.close();
 		}