Bank reconcile deliverable's merged by azhar

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

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

@@ -176,7 +176,7 @@
 
 </style>
 
-<form name = "Wizard_Travel" METHOD="post" ACTION="/ibase/ITMWizardHandlerServlet" onSubmit="javascript:return validatePlace('2');">
+<form name = "Wizard_Travel" METHOD="post" ACTION="/ibase/ITMWizardHandlerServlet" onSubmit="{javascript:return validatePlace('2');} {return false;}">
 <!-- <xmp><xsl:copy-of select="*"/></xmp> -->
 <xsl:variable name="from_tran_date"><xsl:value-of select="/Root/Detail1/from_tran_date"/></xsl:variable>
 <xsl:variable name="to_tran_date"><xsl:value-of select="/Root/Detail1/to_tran_date"/></xsl:variable>

webitm-fin/module-resource/css/ResolFixedTableHeader.css

@@ -33,28 +33,29 @@
 { 
 	border-collapse: collapse;
 	padding: 2px 4px;
-	word-wrap: break-word;
+	word-wrap: normal;
 	border: 1px solid;
 	border-top-width: 0px;
 	border-left-width: 0px!important;
 	border-right-width: 1px; 
 	border-bottom-width: 1px;
 	overflow:hidden; 
-	word-wrap: break-word; 
+	word-wrap: normal; 
 	border-color: #fff ;
 }
 	        
 .ft_container table tr td 
 { 
+	width : 100%!important;
 	border-collapse: collapse; 
 	padding: 2px 4px; 
-	word-wrap: break-word; 
+	word-wrap: normal; 
 /* 	border-top-width: 1px;  */
 	border-left: 1px solid #fff; 
 /* 	border-right-width: 1px;  */
 	border-bottom: 1px solid #fff; 
 	overflow:hidden; 
-	word-wrap: break-word; 
+	word-wrap: normal; 
 	font-weight: normal !important; 
 	color: #000 !important;
 }

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

@@ -20,7 +20,7 @@ function finishAction( value , frm)
 	var siteCode=document.getElementById("site_code").value;
 	//alert("siteCode :"+siteCode);
 	var bankCode=document.getElementById("bank_code").value;
-	//alert("bankCode :"+bankCode);
+	
 	/*var chgUser=document.getElementById("chg_user").value;
 	alert("chgUser :"+chgUser);
 	var chgTerm=document.getElementById("chg_term").value;
@@ -55,63 +55,76 @@ function finishAction( value , frm)
 	} else {
 		return false;
 	}*/
+	
 }
 
-function flterAction( value , frm)
+function flterAction( value, frm)
 {  	
  
+ 
 	document.getElementById("action").value = value;
+	
+	console.log("value:::" + value);
 	var filterData = document.getElementById("filterData").value;
 	//alert("filterData :"+filterData);
 	var filterList = document.getElementById("filterList").value;
-	//alert("filterList :"+filterList);
+	console.log("filterList :"+filterList);
+	var fromDate = document.getElementById("from_date").value;
+	console.log("::from date:: " + fromDate);
+	
+	var toDate = document.getElementById("to_date").value;
+	console.log("::to date:: " + toDate);
+	
+	fromDate = fromDate == null ? "" : fromDate;
+	toDate = toDate == null ? "" : toDate;
+	
+	if( fromDate.length > 0 && toDate.length ==0){
+	
+	alert("Please enter to date");
 	
-	if(filterData.trim().length > 0)
+	}
+	if( fromDate.length == 0 && toDate.length > 0){
+	
+	alert("Please enter from date");
+	
+	}
+	
+	var frDt = new Date(fromDate);
+	console.log("formatted from date ::: " + frDt)
+	
+	var toDt = new Date(toDate);
+	console.log("formatted to date ::: " + toDt)
+	
+	if(filterData.trim().length > 0 && filterList !== "none")
 	{
-
 			var samplItem = [];
 			var method = "post";
 			var path="/ibase/webitm/jsp/BankRecoFilterWiz.jsp";
 		 	var bankCode=document.getElementById("bank_code").value;
-		 	//alert("bankCode :"+bankCode);
-		/*	var toTranDt=document.getElementById("to_tran_date").value;
-			var siteCodeFr=document.getElementById("site_code_fr").value;
-			var siteCodeTo= document.getElementById("site_code_to").value;
-			var chgUser=document.getElementById("chg_user").value;
-			var chgTerm=document.getElementById("chg_term").value;
-			var sundryTypeFr=document.getElementById("sundry_type_fr").value;
-			var sundryTypeTo= document.getElementById("sundry_type_to").value;
-			var sundryCodeFr=document.getElementById("sundry_code_fr").value;
-			var sundryCodeTo= document.getElementById("sundry_code_to").value;
-			var sundryCodeTo= document.getElementById("sundry_code_to").value;*/
-						
-		/*	var siteCodeFrDescr= document.getElementById("site_code_fr_descr").value;
-			var siteCodeToDescr= document.getElementById("site_code_to_descr").value;*/
-			//alert("sundryCodeTo :"+sundryCodeTo);
+			if(bankCode.length == 0){
+			var bankCode=document.getElementById("bank_code_new").value;
+			}
+			var siteCode = document.getElementById("site_code").value;
+			
+			if(siteCode.length == 0){
+			var siteCode=document.getElementById("site_code_new").value;
+			}
+			
+			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 += " <to_tran_date>"+toTranDt+"</to_tran_date> ";
-			valueXmlString += " <site_code_fr>"+siteCodeFr+"</site_code_fr> ";
-			valueXmlString += " <site_code_to>"+siteCodeTo+"</site_code_to> ";
-			valueXmlString += " <chg_user>"+chgUser+"</chg_user> ";
-			valueXmlString += " <chg_term>"+chgTerm+"</chg_term> ";
-			valueXmlString += " <sundry_type_fr>"+sundryTypeFr+"</sundry_type_fr> ";
-			valueXmlString += " <sundry_type_to>"+sundryTypeTo+"</sundry_type_to> ";
-			valueXmlString += " <sundry_code_fr>"+sundryCodeFr+"</sundry_code_fr> ";
-			valueXmlString += " <sundry_code_to>"+sundryCodeTo+"</sundry_code_to> ";
-			valueXmlString += " <filter_data>"+filterData+"</filter_data> ";
-			valueXmlString += " <filter_list>"+filterList+"</filter_list> ";
-			valueXmlString += " <site_code_fr_descr>"+siteCodeFrDescr+"</site_code_fr_descr> ";
-			valueXmlString += " <site_code_to_descr>"+siteCodeToDescr+"</site_code_to_descr> ";*/
+			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;
@@ -119,6 +132,46 @@ 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");
+	}
+			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;
+			}
+			var siteCode = document.getElementById("site_code").value;
+			
+			if(siteCode.length == 0){
+			var siteCode=document.getElementById("site_code_new").value;
+			}
+			
+			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);
 	}
 	else if(filterList == "amt_bc" && filterData.trim().length == 0)
 	{
@@ -132,27 +185,12 @@ function flterAction( value , frm)
 	{
 	  alert("Please enter cheque no");	
 	}
-	/*else if(filterList == "BILL_NO" && filterData.trim().length == 0 ) 
-	{
-	  alert("Please enter BILL NO.");	
-	}
-	else if(filterList == "DR_AMT" && filterData.trim().length == 0 ) 
-	{
-	  alert("Please enter DR Amount");	
-	}
-	else if(filterList == "CR_AMT" && filterData.trim().length == 0 ) 
-	{
-	  alert("Please enter CR Amount");	
-	}
-	else if(filterList == "SUNDRY-CODE" && filterData.trim().length == 0 ) 
-	{
-	  alert("Please enter Sundry Code");	
-	}
-	else if(filterList == "SUNDRY-TYPE" && filterData.trim().length == 0 ) 
-	{
-	  alert("Please enter Sundry Type");	
-	}*/
+	 if(frDt > toDt){
 	
+	alert("From date cannot be future date");
+	
+	}
+	 return false;
 }
 
 
@@ -378,7 +416,7 @@ function getCheckedValues(frm) {
 
 function getXMLDataValues(frm)
 {	
-	
+	console.log("form::: "+ frm);
 	var xmlData = "<Detail2>";
 	var bankCode = document.getElementById("bank_code").value;
 	//var siteR = document.getElementById("site_code_to").value;
@@ -546,7 +584,7 @@ function getXMLDataValues(frm)
 		returnValueStr = false;
 	}*/
 	xmlData += "</Detail2>";
-	//alert("xmlData !!!!: " + xmlData);
+	console.log("xmlData !!!!: " + xmlData);
 	return xmlData;
 }
 
@@ -649,6 +687,7 @@ function post_to_url5(path, params, method) {
 	document.body.appendChild(form);
 	
 	form.submit();
+	return false;
 	//alert("submit!!!");
 }
 

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

@@ -6,14 +6,21 @@
  
 function fixedTableHdr(tableClass, thClass, callFrom) 
 {
-
+console.log("tableclass::" + tableClass);
 	if (document.getElementsByClassName('tableClass') != null && document.getElementsByClassName('tableClass') != undefined) 
 	{
 		var tableClassLen = document.getElementsByClassName('tableClass').length;
+		//var rows = tableClassLen.rows;
+		//if(rows.length > 0){
+		
+		//var cells = rows[0].cells;
+		//}
 		//alert("tableClassLen :"+tableClassLen);
 		for (var i = 0; i < tableClassLen; i++) 
+		//for (var i = 0; i < cells.length; i++) 
 		{
 			var columnCount = document.getElementsByClassName('tableClass')[i].rows[0].cells.length;
+			//var columnCount = cells[i].colSpan;
 			
 			//alert("columnCount :"+columnCount);
 			

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

@@ -164,6 +164,7 @@ sorttable = {
 
   guessType: function(table, column) {
     // guess the type of a column based on its first non-blank row
+	console.log("table:: " + table)
     sortfn = sorttable.sort_alpha;
     for (var i=0; i<table.tBodies[0].rows.length; i++) {
       text = sorttable.getInnerText(table.tBodies[0].rows[i].cells[column]);

webitm-fin/module-resource/jsp/BankRecoFilterWiz.jsp

@@ -23,6 +23,8 @@
 	//String htmlData = ( new ibase.webitm.utility.GenericUtility() ).transformToString( xslFileName, selectedSampleItems, CommonConstants.APPLICATION_CONTEXT + File.separator + "temp", "Output", ".html" );
 	// String htmlData = MRPWizardBean.getSalesPersSampleItemList( salesPers, strgCode, selectedItems, selectedSampleItems );
 	String filterString = icrWizPrsSave.getFilterData(saveSampleData);
+	//String filterString = icrWizPrsSave.preSaveForm(saveSampleData,"filter","");
+	
 	
 	
 	

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

@@ -134,7 +134,7 @@
 		//parent.window.close();
 		//this.window.close();
 		
-		alert("Only REFNO_DATE_AMT key allowed for multiple Reconcilation..!!");
+		alert("Selected criteria of reconciliation not allowed..!!");
 		window.history.back();
 		//window.location = 'E12WizardPage.jsp?OBJ_NAME=bank_reconciliation_wiz&FORM_NO=1';