Skip to content

B
business-java
Commit aa7330dc authored by pchavan's avatar pchavan
Browse files
Options

Add to show calender and date. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@190893 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 61724154
Show whitespace changes
Inline Side-by-side
Showing with 198 additions and 151 deletions
webitm-fin/module-resource/Xsl/bank_reconciliation_wiz1_wiz_en_US_A.xsl
View file @ aa7330dc
...@@ -12,6 +12,33 @@ ...@@ -12,6 +12,33 @@
<body > <body >
<script type="text/javascript" src="/ibase/webitm/js/ITMWizardCalendar.js"></script> <script type="text/javascript" src="/ibase/webitm/js/ITMWizardCalendar.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/BankRecoWiz.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery-1.10.2.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery-ui-1.10.4.custom.min.js"></script>
<link href="/ibase/webitm/css/DD/jquery-ui-1.10.4.custom.min.css" rel="stylesheet"/>
<script type="text/javascript" src="/ibase/webitm/js/jquery.ui.core.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery.ui.widget.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery.ui.position.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery.ui.menu.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery.ui.autocomplete.js"></script>
<!-- <script type="text/javascript" src="/ibase/webitm/js/SavexWizardCalendar.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/SavexWizard.js"></script> -->
<script language="Javascript" src="/ibase/webitm/js/jquery.datetimepicker.full.js"></script>
<link type="text/css" rel="stylesheet" href="/ibase/webitm/css/jquery.datetimepicker.css"/>
<link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"/>
<link rel="stylesheet" href="/resources/demos/style.css"/>
<script src="https://code.jquery.com/jquery-1.12.4.js"></script>
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
<script> <script>
<![CDATA[ <![CDATA[
var calendertop = 100; var calendertop = 100;
...@@ -99,6 +126,13 @@ ...@@ -99,6 +126,13 @@
</script> </script>
<script>
$( function() {
$( "#valid_upto" )datepicker({ dateFormat: 'dd-MMM-yyyy' });
} );
</script>
<style type="text/css"> <style type="text/css">
.tableClass .tableClass
...@@ -131,6 +165,7 @@ ...@@ -131,6 +165,7 @@
<xsl:for-each select="//Detail1"> <xsl:for-each select="//Detail1">
<xsl:variable name="site_code"><xsl:value-of select="site_code"/></xsl:variable> <xsl:variable name="site_code"><xsl:value-of select="site_code"/></xsl:variable>
<xsl:variable name="bank_code"><xsl:value-of select="bank_code"/></xsl:variable> <xsl:variable name="bank_code"><xsl:value-of select="bank_code"/></xsl:variable>
<xsl:variable name="valid_upto"><xsl:value-of select="valid_upto"/></xsl:variable>
<xsl:variable name="site_descr"><xsl:value-of select="site_descr"/></xsl:variable> <xsl:variable name="site_descr"><xsl:value-of select="site_descr"/></xsl:variable>
<xsl:variable name="bank_descr"><xsl:value-of select="bank_descr"/></xsl:variable> <xsl:variable name="bank_descr"><xsl:value-of select="bank_descr"/></xsl:variable>
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable> <xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
...@@ -149,13 +184,13 @@ ...@@ -149,13 +184,13 @@
</tr> --> </tr> -->
<!-- Added by Dadaso pawar [Start]--> <!-- Added by Dadaso pawar [Start]-->
<tr style="display:none;"> <tr>
<td class="td_leftAlign" nowrap="true"> <td class="td_leftAlign" nowrap="true">
<strong>site Code:</strong> <strong>site Code:</strong>
</td> </td>
<td class="td_leftAlign"> <td class="td_leftAlign">
<input type="text" class="input_editable" size="15" value="{$site_code}" name="Detail1.{normalize-space($dbID)}.site_code" id="Detail1.{normalize-space($dbID)}.site_code" maxlength="10" ISCHANGED="false"/> <input type="text" class="input_editable" size="15" value="{$site_code}" name="Detail1.{normalize-space($dbID)}.site_code" id="Detail1.{normalize-space($dbID)}.site_code" maxlength="10" ISCHANGED="false"/>
<a href="javascript:callPopUpJSP('bank_code');"> <img src="/ibase/webitm/images/Standard/e12_pophelp_16.jpg" border="0"/> </a> <a href="javascript:callPopUpJSP('site_code');"> <img src="/ibase/webitm/images/Standard/e12_pophelp_16.jpg" border="0"/> </a>
<!-- <a href="javascript:callSundryPopUpJSP( 'bank_code' ,'bank_code');"> <img src="/ibase/webitm/images/Standard/e12_pophelp_16.jpg" border="0"/> </a> --> <!-- <a href="javascript:callSundryPopUpJSP( 'bank_code' ,'bank_code');"> <img src="/ibase/webitm/images/Standard/e12_pophelp_16.jpg" border="0"/> </a> -->
</td> </td>
</tr> </tr>
...@@ -194,6 +229,36 @@ ...@@ -194,6 +229,36 @@
</tr> </tr>
<!-- Added by Dadaso pawar [End]--> <!-- Added by Dadaso pawar [End]-->
<!--Added By Priyankac [START]-->
<tr>
<td class="td_leftAlign" nowrap="true">
<strong>Date Upto:</strong>
</td>
<!--<td>
<input type="text" class="input_editable" size="15" value="{$valid_upto}" name="Detail1..valid_upto" id="valid_upto"/>
<input type="text" class="input_editable" size="12" value="{$valid_upto}" name="validupto" id="validupto" onkeydown = "return false;" maxlength="8" tabindex="30"/>
<img border="0" src="/ibase/webitm/images/calender.png" style = "margin-bottom:-5px;margin-left:3px;cursor: hand;" id="validupto" name="validupto" onClick="javascript:Datepicker()"/>
</td> -->
<td class="tdS_rightAlignS" nowrap="true" width="5%" style="padding-left:0px;" >
<input type="text" class="input_editable" size="20" value="{$valid_upto}" name="Detail1.{normalize-space($dbID)}.valid_upto" id="Detail1.{normalize-space($dbID)}.valid_upto" maxlength="11" ISCHANGED="false"/>
</td>
<td class="tdS_leftAlignS" width="85%" style="padding-left:0px;">
<img border="0" src="/ibase/webitm/images/calender.png" style = "margin-bottom:-5px;margin-left:3px;cursor: hand;" id="orderdate" name="orderdate" onClick="selectedObj = 'Detail1.{normalize-space($dbID)}.valid_upto'; javascript:show_calendar('Detail1.{normalize-space($dbID)}.valid_upto','','','dd-MMM-yyyy');"/>
<!-- <img border="0" src="/ibase/webitm/images/calender.png" onClick="selectedObj = 'Detail1.{normalize-space($dbID)}.valid_upto'; javascript:show_calendar('Detail1.{normalize-space($dbID)}.valid_upto','','','dd-MMM-yyyy');"/> -->
</td>
</tr>
<!--Added By PriyankaC [END]-->
</xsl:for-each> </xsl:for-each>
<tr> <tr>
...@@ -203,6 +268,8 @@ ...@@ -203,6 +268,8 @@
<input type="hidden" value="" name="action" id="action" /> <input type="hidden" value="" name="action" id="action" />
<input type="submit" style="cursor:hand" value="Next" name = "Next" id = "Next" title='' onclick="return setActionVal('Next')"/> <input type="submit" style="cursor:hand" value="Next" name = "Next" id = "Next" title='' onclick="return setActionVal('Next')"/>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -244,6 +311,7 @@ ...@@ -244,6 +311,7 @@
</td> </td>
<td class="td_leftAlign" nowrap="true" valign="bottom"> <td class="td_leftAlign" nowrap="true" valign="bottom">
<input type="checkbox" name="forceSave" value="false" onClick="setChecked(this)"/> <input type="checkbox" name="forceSave" value="false" onClick="setChecked(this)"/>
</td> </td>
</tr> </tr>
</xsl:if> </xsl:if>
......
webitm-fin/module-resource/js/BankRecoWiz.js
View file @ aa7330dc
var returnValueStr = false; var returnValueStr = false;
//alert("============JS=@@@@@@@@@@@==================="); //alert("============JS=@@@@@@@@@@@===================");
function finishAction( value , frm) function finishAction( value , frm)
{ {
...@@ -20,7 +23,7 @@ function finishAction( value , frm) ...@@ -20,7 +23,7 @@ function finishAction( value , frm)
var siteCode=document.getElementById("site_code").value; var siteCode=document.getElementById("site_code").value;
//alert("siteCode :"+siteCode); //alert("siteCode :"+siteCode);
var bankCode=document.getElementById("bank_code").value; var bankCode=document.getElementById("bank_code").value;
//alert("bankCode :"+bankCode);
/*var chgUser=document.getElementById("chg_user").value; /*var chgUser=document.getElementById("chg_user").value;
alert("chgUser :"+chgUser); alert("chgUser :"+chgUser);
var chgTerm=document.getElementById("chg_term").value; var chgTerm=document.getElementById("chg_term").value;
...@@ -55,85 +58,43 @@ function finishAction( value , frm) ...@@ -55,85 +58,43 @@ function finishAction( value , frm)
} else { } else {
return false; return false;
}*/ }*/
} }
function flterAction( value, frm) function flterAction( value , frm)
{ {
document.getElementById("action").value = value;
console.log("value:::" + value); document.getElementById("action").value = value;
var filterData = document.getElementById("filterData").value; var filterData = document.getElementById("filterData").value;
//alert("filterData :"+filterData); //alert("filterData :"+filterData);
var filterList = document.getElementById("filterList").value; var filterList = document.getElementById("filterList").value;
console.log("filterList :"+filterList); //alert("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( 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 && 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) if(filterData.trim().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 samplItem = [];
var method = "post"; var method = "post";
var path="/ibase/webitm/jsp/BankRecoFilterWiz.jsp"; var path="/ibase/webitm/jsp/BankRecoFilterWiz.jsp";
var bankCode=document.getElementById("bank_code").value; var bankCode=document.getElementById("bank_code").value;
if(bankCode.length == 0){ var siteCode=document.getElementById("site_code").value;
var bankCode=document.getElementById("bank_code_new").value; //alert("validUpto.. :"+validUpto);
} // var validUpto=document.getElementById("valid_upto").value;
var siteCode = document.getElementById("site_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;*/
if(siteCode.length == 0){ /* var siteCodeFrDescr= document.getElementById("site_code_fr_descr").value;
var siteCode=document.getElementById("site_code_new").value; var siteCodeToDescr= document.getElementById("site_code_to_descr").value;*/
} //alert("sundryCodeTo :"+sundryCodeTo);
console.log("bank code ::" + bankCode);
console.log("site code ::" + siteCode);
var valueXmlString = " <?xml version = \"1.0\"?> <Root> <header> <editFlag> "; var valueXmlString = " <?xml version = \"1.0\"?> <Root> <header> <editFlag> ";
valueXmlString += " </editFlag> </header> "; valueXmlString += " </editFlag> </header> ";
...@@ -141,10 +102,22 @@ function flterAction( value, frm) ...@@ -141,10 +102,22 @@ function flterAction( value, frm)
valueXmlString += " <Detail1>"; valueXmlString += " <Detail1>";
valueXmlString += " <bank_code>"+bankCode+"</bank_code> "; valueXmlString += " <bank_code>"+bankCode+"</bank_code> ";
valueXmlString += " <site_code>"+siteCode+"</site_code> "; valueXmlString += " <site_code>"+siteCode+"</site_code> ";
//valueXmlString += " <valid_upto>"+validUpto+"</valid_upto> ";
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_data>"+filterData+"</filter_data> ";
valueXmlString += " <filter_list>"+filterList+"</filter_list> "; valueXmlString += " <filter_list>"+filterList+"</filter_list> ";
valueXmlString += " <fr_date>"+fromDate+"</fr_date> "; valueXmlString += " <site_code_fr_descr>"+siteCodeFrDescr+"</site_code_fr_descr> ";
valueXmlString += " <to_dt>"+toDate+"</to_dt> "; valueXmlString += " <site_code_to_descr>"+siteCodeToDescr+"</site_code_to_descr> ";*/
valueXmlString += " </Detail1> "; valueXmlString += " </Detail1> ";
valueXmlString += getXMLDataValues(frm); valueXmlString += getXMLDataValues(frm);
valueXmlString += " </Root> "; valueXmlString += " </Root> ";
...@@ -154,84 +127,40 @@ function flterAction( value, frm) ...@@ -154,84 +127,40 @@ function flterAction( value, frm)
post_to_url5(path, samplItem, method); post_to_url5(path, samplItem, method);
}else if(filterList == "none" && 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;
} }
var siteCode = document.getElementById("site_code").value; else if(filterList == "amt_bc" && filterData.trim().length == 0)
{
if(siteCode.length == 0){ alert("Please enter amount");
var siteCode=document.getElementById("site_code_new").value;
} }
else if(filterList == "ref_date" && filterData.trim().length == 0)
console.log("bank code ::" + bankCode); {
console.log("site code ::" + siteCode); alert("Please enter Refernce Date");
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(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;
} }
var siteCode = document.getElementById("site_code").value; else if(filterList == "ref_no" && filterData.trim().length == 0 )
{
if(siteCode.length == 0){ alert("Please enter cheque no");
var siteCode=document.getElementById("site_code_new").value;
} }
/*else if(filterList == "BILL_NO" && filterData.trim().length == 0 )
console.log("bank code ::" + bankCode); {
console.log("site code ::" + siteCode); alert("Please enter BILL NO.");
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 == "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");
}*/
return false;
} }
...@@ -457,7 +386,7 @@ function getCheckedValues(frm) { ...@@ -457,7 +386,7 @@ function getCheckedValues(frm) {
function getXMLDataValues(frm) function getXMLDataValues(frm)
{ {
console.log("form::: "+ frm);
var xmlData = "<Detail2>"; var xmlData = "<Detail2>";
var bankCode = document.getElementById("bank_code").value; var bankCode = document.getElementById("bank_code").value;
//var siteR = document.getElementById("site_code_to").value; //var siteR = document.getElementById("site_code_to").value;
...@@ -625,7 +554,7 @@ function getXMLDataValues(frm) ...@@ -625,7 +554,7 @@ function getXMLDataValues(frm)
returnValueStr = false; returnValueStr = false;
}*/ }*/
xmlData += "</Detail2>"; xmlData += "</Detail2>";
console.log("xmlData !!!!: " + xmlData); //alert("xmlData !!!!: " + xmlData);
return xmlData; return xmlData;
} }
...@@ -728,7 +657,57 @@ function post_to_url5(path, params, method) { ...@@ -728,7 +657,57 @@ function post_to_url5(path, params, method) {
document.body.appendChild(form); document.body.appendChild(form);
form.submit(); form.submit();
return false;
//alert("submit!!!"); //alert("submit!!!");
} }
//Added By PriyankaC on 18-SEP-2018 to show Calendar and set date.[START]
function show_calendar() {
p_item = arguments[0]; // text box which will contain date
if (arguments[1] == "" || arguments[1] == null)
p_month = new String(gNow.getMonth());
else
p_month = arguments[1];
if (arguments[2] == "" || arguments[2] == null)
p_year = new String(gNow.getFullYear().toString());
else
p_year = arguments[2];
if (arguments[3] == "" || arguments[3] == null)
p_format = "dd-MMM-yyyy";
//p_format = "DD/MM/YY";
else
p_format = arguments[3];
//Modified by ganesh[15/03/2013] [To increase width and height of calender][Start]
/*vWinCal = window.open("", "Calendar",
"width=250,height=220,status=no,resizable=no,top="+calendertop+",left="+calenderleft);*/
vWinCal = window.open("", "Calendar",
"width=305,height=270,status=no,resizable=no,top="+calendertop+",left="+calenderleft);
//Modified by ganesh[15/03/2013] [To increase width and height of calender][End]
global_date_type = arguments[4];
vWinCal.opener = self;
ggWinCal = vWinCal;
Build(p_item, p_month, p_year, p_format);
return false ;
}
function Build(p_item, p_month, p_year, p_format) {
var p_WinCal = ggWinCal;
gCal = new Calendar(p_item, p_WinCal, p_month, p_year, p_format);
// Customize your Calendar here..
gCal.gBGColor="white";
gCal.gLinkColor="black";
gCal.gTextColor="black";
gCal.gHeaderColor="darkgreen";
gDate = gCal.format_data( new Date().getDate() );
// Choose appropriate show function
if (gCal.gYearly) gCal.showY();
else { gCal.show(); }
}
//Added By PriyankaC on 18-SEP-2018 to show Calendar and set date.[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