Skip to content

B
business-java
Commit bd4db1e7 authored by pbhosale's avatar pbhosale
Browse files
Options

[Updated on 10-01-2020] 

emp_complete21.xml
w_emp_complete.sql
w_emp_other_detail.sql
w_emp_temp.sql
PayrollSinglePrc.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@214950 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4c8fa033
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 117 deletions
webitm-adm/module-resource/SQL/w_emp_temp.sql
View file @ bd4db1e7
...@@ -321,8 +321,6 @@ Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGH ...@@ -321,8 +321,6 @@ Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGH
update POPHELP set AUTO_FILL_LEN = '3', AUTO_MIN_LENGTH = 2 , HELP_OPTION = 2 where MOD_NAME = 'W_EMP_TEMP'; update POPHELP set AUTO_FILL_LEN = '3', AUTO_MIN_LENGTH = 2 , HELP_OPTION = 2 where MOD_NAME = 'W_EMP_TEMP';
----------------------------------------------------[18/10/19][END] ----------------------------------------------------[18/10/19][END]
...@@ -342,6 +340,23 @@ delete from obj_actions where OBJ_NAME = 'emp_temp' and TITLE = 'Copy Transactio ...@@ -342,6 +340,23 @@ delete from obj_actions where OBJ_NAME = 'emp_temp' and TITLE = 'Copy Transactio
----------------------------------------------------[31/12/19][END] ----------------------------------------------------[31/12/19][END]
------------------------------------------------------- [06/01/2020][START]
update OBJ_ACTIONS set DISPLAY_MODE = 1 where OBJ_NAME = 'emp_temp' and TITLE = 'Export2XLS';
update OBJ_ACTIONS set DISPLAY_MODE = 1 where OBJ_NAME = 'emp_temp' and TITLE = 'Toggle With Held';
------------------------------------------------------- [06/01/2020][END]
------------------------------------------------------- [10/01/2020][START]
Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGHT,CHG_DATE,CHG_USER,CHG_TERM,DIST_OPT,FILTER_STRING,SQL_INPUT,DEFAULT_COL,POP_ALIGN,QUERY_MODE,PAGE_CONTEXT,POPHELP_COLS,POPHELP_SOURCE,MULTI_OPT,HELP_OPTION,POPUP_XSL_NAME,AUTO_FILL_LEN,THUMB_OBJ,THUMB_IMAGE_COL,THUMB_ALT_COL,AUTO_MIN_LENGTH,OBJ_NAME__DS,DATA_MODEL_NAME,VALIDATE_DATA,ITEM_CHANGE,MSG_NO,FILTER_EXPR,LAYOUT) values ('ACCT_CODE__SAL','W_EMP_TEMP','SELECT DESCR AS DESCRIPTION , ACCT_CODE AS ACCT_CODE FROM ACCOUNTS WHERE ACTIVE =''Y'' AND ( UPPER(DESCR) LIKE UPPER(''%?%'') or UPPER(acct_code) LIKE UPPER(''%?%''))',null,'Account List',null,null,to_date('17-08-15','DD-MM-RR'),'BASE ','BASE ','1',null,':acct_code__sal,:acct_code__sal',2,null,null,null,null,null,null,'2',null,'3','AcctImages','acct_code','description','2 ',null,null,null,null,null,null,null);
Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGHT,CHG_DATE,CHG_USER,CHG_TERM,DIST_OPT,FILTER_STRING,SQL_INPUT,DEFAULT_COL,POP_ALIGN,QUERY_MODE,PAGE_CONTEXT,POPHELP_COLS,POPHELP_SOURCE,MULTI_OPT,HELP_OPTION,POPUP_XSL_NAME,AUTO_FILL_LEN,THUMB_OBJ,THUMB_IMAGE_COL,THUMB_ALT_COL,AUTO_MIN_LENGTH,OBJ_NAME__DS,DATA_MODEL_NAME,VALIDATE_DATA,ITEM_CHANGE,MSG_NO,FILTER_EXPR,LAYOUT) values ('STATE_CODE__DOMICILE','W_EMP_TEMP','SELECT STATE_CODE,DESCR,COUNT_CODE FROM STATE','Hotel Data','State Code',0,0,to_date('20-05-13','DD-MM-RR'),'VENKAT ','BASE ','1',null,null,null,null,null,null,null,null,null,'2',null,'3','StateImages','state_code','descr','2 ',null,null,null,null,null,null,null);
------------------------------------------------------- [10/01/2020][END]
......
webitm-adm/src/ibase/webitm/ejb/adm/PayrollSinglePrc.java
View file @ bd4db1e7
...@@ -6,6 +6,8 @@ Auther : Poonam ...@@ -6,6 +6,8 @@ Auther : Poonam
package ibase.webitm.ejb.adm; package ibase.webitm.ejb.adm;
import java.io.IOException; import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
...@@ -13,10 +15,19 @@ import java.sql.ResultSet; ...@@ -13,10 +15,19 @@ import java.sql.ResultSet;
import java.sql.Timestamp; import java.sql.Timestamp;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean; import ibase.utility.UserInfoBean;
...@@ -54,6 +65,7 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca ...@@ -54,6 +65,7 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
String retErrStr = ""; String retErrStr = "";
String fileNameStartWith = ""; String fileNameStartWith = "";
String activity = ""; String activity = "";
String errSplit = "";
Connection conn = null; Connection conn = null;
Connection logConn = null; Connection logConn = null;
hrLogWriter = new HRLogWriter(); hrLogWriter = new HRLogWriter();
...@@ -101,8 +113,34 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca ...@@ -101,8 +113,34 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
{ {
conn.rollback(); conn.rollback();
System.out.println("Connection has been rollback..!!!!!"); System.out.println("Connection has been rollback..!!!!!");
retStr = itmDBAccessEJB.getErrorString("", retErrStr, userId, "", logConn); //Modified By Poonam B[10-01-2020][START][To display proper msg onscreen]
System.out.println("retStr :::::" +retStr); if( retErrStr.indexOf("\t") !=-1)
{
System.out.println("Inside Tab");
String arr[] = retErrStr.split("\t");
errSplit = arr[0];
}
else if(retErrStr.indexOf(" ")!=-1)
{
System.out.println("Inside Space");
String arr[] = retErrStr.split(" ");
errSplit = arr[0];
}
else
{
errSplit = retErrStr;
}
System.out.println("errSplit::::"+errSplit.trim());
String errStr = retErrStr.substring( errSplit.length());
errStr = errStr.trim();
System.out.println("errStr :::::" +errStr);
retStr = itmDBAccessEJB.getErrorString("", errSplit, userId, "", conn);
System.out.println("retStr:: :::::" +retStr);
Document doc = StringToDocument( retStr );
updateErrorDom(doc, errStr);
retStr = DocumentToString( doc );
System.out.println("final retStr:: "+retStr);
//Modified By Poonam B[10-01-2020][END][To display proper msg onscreen]
//hrLogWriter.gbfErrWrite("","", "", retErrStr,"E", logConn); //hrLogWriter.gbfErrWrite("","", "", retErrStr,"E", logConn);
} }
else else
...@@ -989,4 +1027,74 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca ...@@ -989,4 +1027,74 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
{ {
return input == null ? "" : input; return input == null ? "" : input;
} }
//Modified By Poonam B[10-01-2020][START][To display proper msg onscreen]
private void updateErrorDom(Document doc, String additionalErrStr)
{
System.out.println("Inside updateErrorDom..........");
try
{
Node errorNode = doc.getElementsByTagName("error").item(0);
genericUtility.removeWhitespaces(errorNode);
NodeList nodeList = errorNode.getChildNodes();
System.out.println(nodeList.getLength());
for (int i = 0; i < nodeList.getLength(); i++)
{
System.out.println("--------- "+i+" -----");
Element element = (Element) nodeList.item(i);
Node node = nodeList.item(i);
String nodeName = node.getNodeName();
System.out.println(nodeName);
if ("description".equals(nodeName))
{
String prvErrStr = node.getFirstChild().getNodeValue();
System.out.println( prvErrStr );
element.setTextContent(prvErrStr+"\n"+additionalErrStr);;
return;
}
}
}
catch (Exception e) {
}
}
private Document StringToDocument(String strXml) throws Exception
{
Document doc = null;
try
{
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder builder = factory.newDocumentBuilder();
StringReader strReader = new StringReader(strXml);
InputSource is = new InputSource(strReader);
doc = (Document) builder.parse(is);
}
catch (Exception e)
{
e.printStackTrace();
throw e;
}
return doc;
}
private String DocumentToString(Document doc) throws Exception
{
System.out.println("Inside DocumentToString..........");
try
{
TransformerFactory tf = TransformerFactory.newInstance();
Transformer transformer = tf.newTransformer();
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
StringWriter writer = new StringWriter();
transformer.transform(new DOMSource(doc), new StreamResult(writer));
String output = writer.getBuffer().toString();
System.out.println("output::::" +output);
return output;
}
catch (Exception e) {
e.printStackTrace();
return "";
}
}
//Modified By Poonam B[10-01-2020][END][To display proper msg onscreen]
} }
\ No newline at end of file
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