Skip to content

B
business-java
Commit b7e91648 authored by ngadkari's avatar ngadkari
Browse files
Options

changes in filter and buttons 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@203599 ce508802-f39f-4f6c-b175-0d175dae99d5
parent eaba2fb6
Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 12 deletions
webitm-fin/module-resource/Xsl/bank_reconciliation_wiz2_wiz_en_US_A.xsl
View file @ b7e91648
...@@ -242,7 +242,7 @@ function setDetail(value) ...@@ -242,7 +242,7 @@ function setDetail(value)
.doRGLOCN{width: 80px;height: 30px;text-align:left;} .doRGLOCN{width: 80px;height: 30px;text-align:left;}
.dcheckBox{width: 20px;height: 30px;text-align:left;} .dcheckBox{width: 20px;height: 30px;text-align:left;}
.dgPNO{width: 130px;height: 30px;text-align:left;} .dgPNO{width: 130px;height: 30px;text-align:left;}
.totalAmt{float:left;background:#D7E5F9;font-family:verdana;font-size:9pt;}
.fixed_headers { .fixed_headers {
...@@ -286,7 +286,7 @@ thead { ...@@ -286,7 +286,7 @@ thead {
<form name = "Wizard_Travel" > <form name = "Wizard_Travel" id="myform" onsubmit="return avoidFromSubmit(event)">
<xsl:variable name="site_code"><xsl:value-of select="/Root/Detail1/site_code"/></xsl:variable> <xsl:variable name="site_code"><xsl:value-of select="/Root/Detail1/site_code"/></xsl:variable>
<xsl:variable name="bank_code"><xsl:value-of select="/Root/Detail1/bank_code"/></xsl:variable> <xsl:variable name="bank_code"><xsl:value-of select="/Root/Detail1/bank_code"/></xsl:variable>
...@@ -359,9 +359,10 @@ thead { ...@@ -359,9 +359,10 @@ thead {
<option value="ref_no" selected="selected">Cheque No</option> <option value="ref_no" selected="selected">Cheque No</option>
<option value="ref_date" selected="selected">Cheque Date</option> <option value="ref_date" selected="selected">Cheque Date</option>
</select> </select>
</td> -
<td><input type="text" name="filterData" id="filterData" /></td> <input type="text" name="filterData" id="filterData" onkeyup="myFunction()" placeholder="Search..."/></td>
<td><input type="button" name="filter" id="filter" value="FILTER" onclick="return flterAction('filter',this.form)"/></td> <!--<td><input type="button" name="filter" id="filter" value="FILTER" onclick="return flterAction('filter',this.form)"/></td>-->
<td> <input type="button" name="filter" id="filter" value="Reset" onclick="resetForm();"/></td>
</tr> </tr>
</table> </table>
...@@ -378,7 +379,7 @@ thead { ...@@ -378,7 +379,7 @@ thead {
<div id ="left_menu_r"> <div id ="left_menu_r">
<table border="0" style="width: 560px;" cellspacing="1" cellpadding="1" > <table border="1" style="width: 580px;" cellspacing="1" cellpadding="1" ><!--border = 1 and width 580 done by nandkumar gadkari on 15/07/19 -->
<!-- <tr> <!-- <tr>
<td colspan="24" class="header_td" nowrap="true" align="left"><div class="detaildiv"><b><xsl:value-of select="/Root/Detail1/site_code_fr"/> [<xsl:value-of select="/Root/Detail1/site_code_fr_descr"/>]</b></div></td> <td colspan="24" class="header_td" nowrap="true" align="left"><div class="detaildiv"><b><xsl:value-of select="/Root/Detail1/site_code_fr"/> [<xsl:value-of select="/Root/Detail1/site_code_fr_descr"/>]</b></div></td>
</tr> --> </tr> -->
...@@ -490,7 +491,7 @@ thead { ...@@ -490,7 +491,7 @@ thead {
<xsl:if test="$tran_name = 'bankStatement'"> <xsl:if test="$tran_name = 'bankStatement'">
<tr> <tr>
<td class="td_leftAlign"><div class="dcheckBox"><input type="checkbox" name="checkbox1" value="{$cnt}" /></div></td> <td class="td_leftAlign"><div class="dcheckBox"><input type="checkbox" name="checkbox1" value="{$cnt}" onchange=" getCheckedAmountBS(this.form);" /></div></td><!--getCheckedAmountBS added by nandkumar gadkari on 15/07/19 -->
<td class="td_leftAlign" align="left"><div id="ref_no{$cnt}" class="drEFNo"><xsl:value-of select="ref_no"/></div></td> <td class="td_leftAlign" align="left"><div id="ref_no{$cnt}" class="drEFNo"><xsl:value-of select="ref_no"/></div></td>
<td class="td_leftAlign" align="left"><div id="ref_date{$cnt}" class="dtREFDATE"><xsl:value-of select="ref_date"/></div></td> <td class="td_leftAlign" align="left"><div id="ref_date{$cnt}" class="dtREFDATE"><xsl:value-of select="ref_date"/></div></td>
<td class="td_leftAlign" align="right"><div id="amt_bc{$cnt}" class="dcRAMT"><xsl:value-of select="amt_bc"/></div></td> <td class="td_leftAlign" align="right"><div id="amt_bc{$cnt}" class="dcRAMT"><xsl:value-of select="amt_bc"/></div></td>
...@@ -526,7 +527,7 @@ thead { ...@@ -526,7 +527,7 @@ thead {
</xsl:if> --> </xsl:if> -->
</xsl:for-each> </xsl:for-each>
<div id="amtTotBS" class="totalAmt"></div><!--added by nandkumar gadkari on 15/07/19 -->
</table> </table>
...@@ -679,7 +680,7 @@ thead { ...@@ -679,7 +680,7 @@ thead {
<tr> <tr>
<td class="td_leftAlign"><div class="dcheckBox"><input type="checkbox" name="checkbox1" value="{$cnt}" /></div></td> <td class="td_leftAlign"><div class="dcheckBox"><input type="checkbox" name="checkbox1" value="{$cnt}" onchange=" getCheckedAmountBT(this.form);"/></div></td><!--getCheckedAmountBT added by nandkumar gadkari on 15/07/19 -->
<!-- <td class="td_leftAlign" align="left"><div id="tran_name{$cnt}" class="drEFID"><xsl:value-of select="tran_name"/></div></td> --> <!-- <td class="td_leftAlign" align="left"><div id="tran_name{$cnt}" class="drEFID"><xsl:value-of select="tran_name"/></div></td> -->
<td class="td_leftAlign" align="left"><div id="ref_no{$cnt}" class="ddRAMT"><xsl:value-of select="ref_no"/></div></td> <td class="td_leftAlign" align="left"><div id="ref_no{$cnt}" class="ddRAMT"><xsl:value-of select="ref_no"/></div></td>
<td class="td_leftAlign" align="left"><div id="ref_date{$cnt}" class="dtREFDATE"><xsl:value-of select="ref_date"/></div></td> <td class="td_leftAlign" align="left"><div id="ref_date{$cnt}" class="dtREFDATE"><xsl:value-of select="ref_date"/></div></td>
...@@ -720,7 +721,7 @@ thead { ...@@ -720,7 +721,7 @@ thead {
</xsl:for-each> </xsl:for-each>
<div id="amtTotBT" class="totalAmt"></div> <!--added by nandkumar gadkari on 15/07/19 -->
</table> </table>
...@@ -823,3 +824,4 @@ thead { ...@@ -823,3 +824,4 @@ thead {
</html> </html>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>
webitm-fin/module-resource/js/BankRecoWiz.js
View file @ b7e91648
...@@ -2,8 +2,6 @@ var returnValueStr = false; ...@@ -2,8 +2,6 @@ var returnValueStr = false;
//alert("============JS=@@@@@@@@@@@==================="); //alert("============JS=@@@@@@@@@@@===================");
function finishAction( value , frm) function finishAction( value , frm)
{ {
...@@ -58,6 +56,8 @@ function finishAction( value , frm) ...@@ -58,6 +56,8 @@ function finishAction( value , frm)
} else { } else {
return false; return false;
}*/ }*/
} }
function flterAction( value , frm) function flterAction( value , frm)
...@@ -711,3 +711,144 @@ function post_to_url5(path, params, method) { ...@@ -711,3 +711,144 @@ function post_to_url5(path, params, method) {
else { gCal.show(); } else { gCal.show(); }
} }
//Added By PriyankaC on 18-SEP-2018 to show Calendar and set date.[END] //Added By PriyankaC on 18-SEP-2018 to show Calendar and set date.[END]
//added by nandkumar gadkari on 15/07/19 -----------start-------------
function getCheckedAmountBS(frm) {
var amtTotBS=0.0;
for (i = 0; i < frm.checkbox1.length; i++)
{
if (frm.checkbox1[i].checked)
{
cnt = frm.checkbox1[i].value;
var slipNoBT = document.getElementById("tran_name" + cnt).innerHTML;
if(slipNoBT == "bankStatement")
{
var amtBcBS = document.getElementById("amt_bc" + cnt).innerHTML;
console.log('amtBcBS ',amtBcBS);
amtTotBS=parseFloat(amtTotBS)+parseFloat(amtBcBS);
}
}
}//end of for loop
document.getElementById("amtTotBS").innerHTML = "Selected Amount:"+amtTotBS;
return amtTotBS;
}
function getCheckedAmountBT(frm) {
var amtTotBT=0.0;
for (i = 0; i < frm.checkbox1.length; i++)
{
if (frm.checkbox1[i].checked)
{
cnt = frm.checkbox1[i].value;
var slipNoBT = document.getElementById("tran_name" + cnt).innerHTML;
if(slipNoBT == "bankTransaction")
{
var amtBcBT = document.getElementById("amt_bc" + cnt).innerHTML;
console.log('amtBcBT ',amtBcBT);
amtTotBT=parseFloat(amtTotBT)+parseFloat(amtBcBT);
}
}
}//end of for loop
//alert("getCheckedAmountBT"+amtTotBT);
document.getElementById("amtTotBT").innerHTML = "Selected Amount:"+amtTotBT;
return amtTotBT;
}
function myFunction() {
// Declare variables
var input, filter, table, tr, td, i, txtValue,list,j;
input = document.getElementById("filterData");
filter = input.value.toUpperCase();
list = document.getElementById("filterList");
if(list.value =='amt_bc')
{
j=3;
}
if(list.value =='ref_no')
{
j=1;
}
if(list.value =='ref_date')
{
j=2;
}
table = document.getElementById("toSiteTable");
tr = table.getElementsByTagName("tr");
for (i = 0; i < tr.length; i++) {
td = tr[i].getElementsByTagName("td")[j];
if (td) {
txtValue = td.textContent || td.innerText;
if (txtValue.toUpperCase().indexOf(filter) > -1) {
tr[i].style.display = "";
} else {
tr[i].style.display = "none";
}
}
}
table = document.getElementById("frmSiteTable");
tr = table.getElementsByTagName("tr");
for (i = 0; i < tr.length; i++) {
td = tr[i].getElementsByTagName("td")[j];
if (td) {
txtValue = td.textContent || td.innerText;
if (txtValue.toUpperCase().indexOf(filter) > -1) {
tr[i].style.display = "";
} else {
tr[i].style.display = "none";
}
}
}
}
function resetForm() {
document.getElementById("myform").reset();
document.getElementById("amtTotBT").innerHTML ="";
document.getElementById("amtTotBS").innerHTML = "";
}
function avoidFromSubmit()
{
var input = document.getElementById("filterData");
if(input.value == null || input.value == "")
{
alert("Please enter a search value");
return false;
}
}
//added by nandkumar gadkari on 15/07/19 -----------end-------------
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