Skip to content

B
business-java
Commit 4c5e7fc8 authored by steurwadkar's avatar steurwadkar
Browse files
Options

F17ABAS001 GST API calling web part commit 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106135 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5e060c4d
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 91 deletions
webitm-gst/module-resource/web/js/GSTDataSubmitWiz.js
View file @ 4c5e7fc8
...@@ -399,10 +399,11 @@ function OTPGenerated(retVal) ...@@ -399,10 +399,11 @@ function OTPGenerated(retVal)
var msgNode = xmlDoc.getElementsByTagName("message")[0]; var msgNode = xmlDoc.getElementsByTagName("message")[0];
var msg = msgNode.childNodes[0].nodeValue; var msg = msgNode.childNodes[0].nodeValue;
alert(msg); alert(msg);
document.getElementById("otpInputDiv").style.display = "block";
document.getElementById("Detail1.1.otp").focus();
if(msg.indexOf("Error") == -1) if(msg.indexOf("Error") == -1)
{ {
document.getElementById("otpInputDiv").style.display = "block";
document.getElementById("Detail1.1.otp").focus();
isOtpGenerated = true; isOtpGenerated = true;
startTimer(10); startTimer(10);
} }
...@@ -578,86 +579,6 @@ function setTitlenImg(retVal) ...@@ -578,86 +579,6 @@ function setTitlenImg(retVal)
document.getElementById("titleText").innerHTML = title; document.getElementById("titleText").innerHTML = title;
document.getElementById("titleImg").setAttribute("src","/ibase/images/menuImages/web/Galaxy/"+img); document.getElementById("titleImg").setAttribute("src","/ibase/images/menuImages/web/Galaxy/"+img);
} }
/*function setSummaryTotal()
{
var totalRecCnt = 0, totalRecValue = 0, totalTaxValue = 0, totalIGST = 0, totalCGST = 0, totalSGST = 0, totalCess = 0;
var summaryTable = document.getElementById("dataSummaryTable");
var dataRows = summaryTable.rows;
for(var i=1; i<dataRows.length-1; i++)
{
var dataCells = summaryTable.rows[i].cells;
for(var j=1; j<dataCells.length; j++)
{
var cellData = parseInt(dataCells[j].innerHTML);
if(j == 1)
{
totalRecCnt += cellData;
}
if(j == 2)
{
totalRecValue += cellData;
}
if(j == 3)
{
totalTaxValue += cellData;
}
if(j == 4)
{
totalIGST += cellData;
}
if(j == 5)
{
totalCGST += cellData;
}
if(j == 6)
{
totalSGST += cellData;
}
if(j == 7)
{
totalCess += cellData;
}
}
}
console.log("totalRecCnt["+totalRecCnt+"] totalRecValue["+totalRecValue+"]totalTaxValue["+totalTaxValue+"]totalIGST["+totalIGST+"]totalCGST["+totalCGST+"]totalSGST["+totalSGST+"]totalCess["+totalCess+"]");
var lastRowCells = summaryTable.rows[dataRows.length-1].cells;console.log(lastRowCells);
for(var i=1; i<lastRowCells.length; i++)
{
if(i == 1)
{
lastRowCells[i].innerHTML = "<b>"+totalRecCnt+"</b>";
}
if(i == 2)
{
lastRowCells[i].innerHTML = "<b>"+totalRecValue+"</b>";
}
if(i == 3)
{
lastRowCells[i].innerHTML = "<b>"+totalTaxValue+"</b>";
}
if(i == 4)
{
lastRowCells[i].innerHTML = "<b>"+totalIGST+"</b>";
}
if(i == 5)
{
lastRowCells[i].innerHTML = "<b>"+totalCGST+"</b>";
}
if(i == 6)
{
lastRowCells[i].innerHTML = "<b>"+totalSGST+"</b>";
}
if(i == 7)
{
lastRowCells[i].innerHTML = "<b>"+totalCess+"</b>";
}
}
}*/
function setSummaryTotal() function setSummaryTotal()
{ {
var totalsByCol = [0, 0, 0, 0, 0, 0, 0]; var totalsByCol = [0, 0, 0, 0, 0, 0, 0];
...@@ -689,4 +610,19 @@ function setSummaryTotal() ...@@ -689,4 +610,19 @@ function setSummaryTotal()
} }
}); });
}); });
}
function validateDetailForm()
{
var pendingDataTable = document.getElementById("pendingDataTable");
if(pendingDataTable != undefined)
{
var tableRows = pendingDataTable.rows;
if(tableRows.length > 0)
{
alert("Please save all data to GSTN server before submitting.");
return false;
}
}
} }
\ No newline at end of file
webitm-gst/module-resource/web/xsl/wizard/gstsalesdata_submit1_wiz_en_US_A.xsl
View file @ 4c5e7fc8
...@@ -132,6 +132,10 @@ ...@@ -132,6 +132,10 @@
<div class="eachField"> <div class="eachField">
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$state_descr}" name="Detail1.{normalize-space($dbID)}.state_descr" id="Detail1.{normalize-space($dbID)}.state_descr" tabIndex="-1" readOnly="true" style="width:150px;"/></div> <div class="inputDiv"><input type="text" class="editDisplayClass" value="{$state_descr}" name="Detail1.{normalize-space($dbID)}.state_descr" id="Detail1.{normalize-space($dbID)}.state_descr" tabIndex="-1" readOnly="true" style="width:150px;"/></div>
</div> </div>
<div class="eachField" style="float:right;">
<div class="labelDiv">Gross turnover<span style="color:red;">*</span> : </div>
<div class="inputDiv"><input type="text" class="input_editable" value="{$gross_turnover}" name="Detail1.{normalize-space($dbID)}.gross_turnover" id="Detail1.{normalize-space($dbID)}.gross_turnover" tabIndex="30" style="text-align:right;padding-right:4px;width:120px;" onblur="checkValidInput(this);" onkeypress="return isNumberKey(event);"/></div>
</div>
</div> </div>
<div class="eachLineFields"> <div class="eachLineFields">
<div class="eachField"> <div class="eachField">
...@@ -187,7 +191,7 @@ ...@@ -187,7 +191,7 @@
<input type="hidden" value="1" name="FORM_NO" ID="FORM_NO" /> <input type="hidden" value="1" name="FORM_NO" ID="FORM_NO" />
<input type="hidden" value="gstsalesdata_submit" name="OBJ_NAME" /> <input type="hidden" value="gstsalesdata_submit" name="OBJ_NAME" />
<input type="hidden" value="" name="action" id="action" /> <input type="hidden" value="" name="action" id="action" />
<input type="submit" style="cursor:hand;margin-left:20px;" value="Next" onclick="setActionVal('next');displayWaitImg();return validateHeaderForm();" class="button" title='Next' id="next"/> <input type="submit" style="cursor:hand;margin-left:20px;" value="Next" onclick="setActionVal('next');return validateHeaderForm();" class="button" title='Next' id="next"/>
</div> </div>
</div> </div>
<div id="buttonreplacement"> <div id="buttonreplacement">
......
webitm-gst/module-resource/web/xsl/wizard/gstsalesdata_submit2_wiz_en_US_A.xsl
View file @ 4c5e7fc8
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
<script type="text/javascript" src="/ibase/webitm/js/jquery.ui.menu.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/jquery.ui.autocomplete.js"></script>
<link href="/ibase/webitm/css/htmlWizard.css" rel="stylesheet"/>
<link href="/ibase/webitm/css/Standard/default.css" rel="stylesheet"/>
<link href="/ibase/webitm/css/Galaxy/galaxy-theme.css" rel="stylesheet"/> <link href="/ibase/webitm/css/Galaxy/galaxy-theme.css" rel="stylesheet"/>
<link href="/ibase/webitm/css/Standard/default.css" rel="stylesheet"/>
<link href="/ibase/webitm/css/htmlWizard.css" rel="stylesheet"/>
<link href="/ibase/webitm/css/GSTDataSubmitWiz.css" rel="stylesheet"/> <link href="/ibase/webitm/css/GSTDataSubmitWiz.css" rel="stylesheet"/>
<link href="/ibase/webitm/css/jquery.datetimepicker.css" rel="stylesheet"/> <link href="/ibase/webitm/css/jquery.datetimepicker.css" rel="stylesheet"/>
...@@ -177,13 +177,16 @@ ...@@ -177,13 +177,16 @@
<div class="inputFormDiv" style="display:none;"> <div class="inputFormDiv" style="display:none;">
<div class="eachLineFields"> <div class="eachLineFields">
<div class="eachField">
<div class="inputDiv"><input type="checkbox" value="true" checked="checked" name="Detail2.{normalize-space($dbID)}.selectbox" id="Detail2.{normalize-space($dbID)}.selectbox" tabIndex="-1"/></div>
</div>
<div class="eachField"> <div class="eachField">
<div class="labelDiv">Auth token : </div> <div class="labelDiv">Auth token : </div>
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$auth_token}" name="Detail2.{normalize-space($dbID)}.auth_token" id="Detail1.{normalize-space($dbID)}.auth_token" tabIndex="-1"/></div> <div class="inputDiv"><input type="text" class="editDisplayClass" value="{$auth_token}" name="Detail2.{normalize-space($dbID)}.auth_token" id="Detail2.{normalize-space($dbID)}.auth_token" tabIndex="-1"/></div>
</div> </div>
<div class="eachField"> <div class="eachField">
<div class="labelDiv">Auth sek : </div> <div class="labelDiv">Auth sek : </div>
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$auth_sek}" name="Detail2.{normalize-space($dbID)}.auth_sek" id="Detail1.{normalize-space($dbID)}.auth_sek" tabIndex="-1" readOnly="true" style="width:224px;"/></div> <div class="inputDiv"><input type="text" class="editDisplayClass" value="{$auth_sek}" name="Detail2.{normalize-space($dbID)}.auth_sek" id="Detail2.{normalize-space($dbID)}.auth_sek" tabIndex="-1" readOnly="true" style="width:224px;"/></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -192,10 +195,10 @@ ...@@ -192,10 +195,10 @@
<xsl:for-each select="pending_data"> <xsl:for-each select="pending_data">
<button class="accordion1" type="button"> <button class="accordion1" type="button">
<div class="iconDiv">P</div> <div class="iconDiv">P</div>
Data pending to save on GSTN server Pending data to save on GSTN server till date
</button> </button>
<div class="panel1"> <div class="panel1" id="pendingDataPanel">
<table class="tableClass"> <table class="tableClass" id="pendingDataTable">
<thead class="table-head"> <thead class="table-head">
<tr> <tr>
<th nowrap="true" style="border-left:0px solid black !important;" align="left">Document number</th> <th nowrap="true" style="border-left:0px solid black !important;" align="left">Document number</th>
...@@ -820,7 +823,7 @@ ...@@ -820,7 +823,7 @@
<input type="hidden" value="2" name="FORM_NO" ID="FORM_NO" /> <input type="hidden" value="2" name="FORM_NO" ID="FORM_NO" />
<input type="hidden" value="gstsalesdata_submit" name="OBJ_NAME" /> <input type="hidden" value="gstsalesdata_submit" name="OBJ_NAME" />
<input type="hidden" value="" name="action" id="action" /> <input type="hidden" value="" name="action" id="action" />
<input type="submit" style="cursor:hand;margin-left:20px;" value="Finish" onclick="setActionVal('finish');return displayWaitImg();return validateHeaderForm();" class="button" title='Finish' id="finish"/> <input type="submit" style="cursor:hand;margin-left:20px;" value="Finish" onclick="setActionVal('finish');return validateDetailForm();" class="button" title='Finish' id="finish"/>
</div> </div>
</div> </div>
<div id="buttonreplacement"> <div id="buttonreplacement">
......
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