changes in xsl and js files for bank reco merged in office

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

webitm-fin/module-resource/Xsl/bank_reconciliation_wiz2_wiz_en_US_A.xsl

@@ -381,10 +381,11 @@ thead {
 	
 	<td>
 	<select name="filterList" id="filterList">
-	<option value="none">None</option>
+	
 	<option value="amt_bc"><xsl:if test="$filterList='amt_bc'"><xsl:attribute name="selected">true</xsl:attribute></xsl:if>Amount</option>
 	<option value="ref_no"><xsl:if test="$filterList='ref_no'"><xsl:attribute name="selected">true</xsl:attribute></xsl:if>Cheque No</option>
 	<option value="ref_date"><xsl:if test="$filterList='ref_date'"><xsl:attribute name="selected">true</xsl:attribute></xsl:if>Cheque Date</option>
+	<option value="none">None</option>
 	</select>
 	</td>
 	<td><input type="text" name="filterData" id="filterData" value="{normalize-space($filterData)}"/></td>

webitm-fin/module-resource/js/BankRecoWiz.js

@@ -60,8 +60,6 @@ function finishAction( value , frm)
 
 function flterAction( value, frm)
 {  	
- 
- 
 	document.getElementById("action").value = value;
 	
 	console.log("value:::" + value);
@@ -95,7 +93,31 @@ function flterAction( value, frm)
 	var toDt = new Date(toDate);
 	console.log("formatted to date ::: " + toDt)
 	
-	if(filterData.trim().length > 0 && filterList !== "none")
+	if(filterData.trim().length > 0 && fromDate.length > 0 && filterList !== "none"){
+	alert("clear filter which is not required");
+	}
+	if(filterList == "none" && filterData.trim().length >0) {
+	alert("Filter value should be blank");
+	}
+	
+	 if(filterList == "amt_bc" && filterData.trim().length == 0 && fromDate.length == 0)
+	{
+		alert("Please enter amount");
+	}
+	 if(filterList == "ref_date" && filterData.trim().length == 0 && fromDate.length == 0)
+	{
+		alert("Please enter Refernce Date");
+	}
+	 if(filterList == "ref_no" && filterData.trim().length == 0 && fromDate.length == 0) 
+	{
+	  alert("Please enter cheque no");	
+	}
+	 if(frDt > toDt){
+	
+	alert("From date cannot be future date");
+	
+	}
+	if(filterData.trim().length > 0 && filterList.trim() !== "none" && fromDate.length == 0)
 	{
 			var samplItem = [];
 			var method = "post";
@@ -124,7 +146,7 @@ function flterAction( value, frm)
 			valueXmlString += " <fr_date>"+fromDate+"</fr_date> ";
 			valueXmlString += " <to_dt>"+toDate+"</to_dt> ";
 			valueXmlString += " </Detail1> ";
-			//valueXmlString += getXMLDataValues(frm);
+			valueXmlString += getXMLDataValues(frm);
 			valueXmlString += " </Root> "; 
 
 			samplItem["SAVE_SAMPLE_DATA"] = valueXmlString;
@@ -132,11 +154,7 @@ function flterAction( value, frm)
 	
 			post_to_url5(path, samplItem, method);	
 			
-	}else if(filterList == "none"){
-	
-	if(filterData.trim().length >0) {
-	alert("Filter value should be blank");
-	}
+	}else if(filterList == "none" && filterData.trim().length == 0){
 			var samplItem = [];
 			var method = "post";
 			var path="/ibase/webitm/jsp/BankRecoFilterWiz.jsp";
@@ -172,24 +190,47 @@ function flterAction( value, frm)
 			samplItem["RECONCILETYPE"] = reconciletype;	
 	
 			 post_to_url5(path, samplItem, method);
+	}else if(fromDate.length > 0 && filterData.trim().length == 0){
+	        
+			var samplItem = [];
+			var method = "post";
+			var path="/ibase/webitm/jsp/BankRecoFilterWiz.jsp";
+		 	var bankCode=document.getElementById("bank_code").value;
+			if(bankCode.length == 0){
+			var bankCode=document.getElementById("bank_code_new").value;
 			}
-	else if(filterList == "amt_bc" && filterData.trim().length == 0)
-	{
-		alert("Please enter amount");
-	}
-	else if(filterList == "ref_date" && filterData.trim().length == 0)
-	{
-		alert("Please enter Refernce Date");
-	}
-	else if(filterList == "ref_no" && filterData.trim().length == 0 ) 
-	{
-	  alert("Please enter cheque no");	
+			var siteCode = document.getElementById("site_code").value;
+			
+			if(siteCode.length == 0){
+			var siteCode=document.getElementById("site_code_new").value;
 			}
-	 if(frDt > toDt){
 			
-	alert("From date cannot be future date");
+			console.log("bank code ::" + bankCode);
+			console.log("site code ::" + siteCode);
+
+			
+			var valueXmlString = " <?xml version = \"1.0\"?> <Root> <header> <editFlag> ";
+			valueXmlString += " </editFlag> </header> ";
 			
+			valueXmlString += " <Detail1>";
+			valueXmlString += " <bank_code>"+bankCode+"</bank_code> ";
+			valueXmlString += " <site_code>"+siteCode+"</site_code> ";
+			valueXmlString += " <filter_data>"+filterData+"</filter_data> ";
+			valueXmlString += " <filter_list>"+filterList+"</filter_list> ";
+			valueXmlString += " <fr_date>"+fromDate+"</fr_date> ";
+			valueXmlString += " <to_dt>"+toDate+"</to_dt> ";
+			valueXmlString += " </Detail1> ";
+			valueXmlString += getXMLDataValues(frm);
+			valueXmlString += " </Root> "; 
+
+			samplItem["SAVE_SAMPLE_DATA"] = valueXmlString;
+			samplItem["RECONCILETYPE"] = reconciletype;	
+	
+			 post_to_url5(path, samplItem, method);
 	}
+	
+	
+	
 	 return false;
 }