Skip to content

B
business-java
Commit 4f5ab852 authored by ysawant's avatar ysawant
Browse files
Options

*Updated components of Employee Address Change Menu 

emp_add_chg11.xml
emp_add_chg21.xml
d_emp_add_chg_brow.srd
d_emp_add_chg_edit.srd
EmpAddChangeConfirm.java
EmpAddChgCnc.java
w_emp_add_chg_v1.sql
EmpAddChange.java
EmpAddChangeLocal.java
EmpAddChangeRemote.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@213273 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a1ef15ba
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3746 additions and 1102 deletions
webitm-adm/module-resource/SQL/w_emp_add_chg_v1.sql 0 → 100644
View file @ 4f5ab852
---------------------------------------------[START]
update obj_forms set disp_metadata='
<html>
<b style="white-space: normal !important; word-break: break-word;">{emp_fname} {emp_lname} <span class = "optional">[{emp_code}]</span></b>
<span style="float:right;"> <b>{tran_date} </b></span>
<br/> Emp Code :<b>({emp_code})</b> , Confirmed :<b> {confirmed}</b>,
<br/> Current City :<b>{cur_city}</b> , Current State :<b> {cur_state}</b> , Work Site :<b> {work_site}</b>
<span style="float:right;"> <b>{tran_id} </b></span>
</html>' where WIN_NAME='w_emp_add_chg';
update OBJ_ACTIONS set image='ibase/resource/objaction/add.svg', DISPLAY_MODE='2' where OBJ_NAME='emp_add_chg' and TITLE='Add';
update OBJ_ACTIONS set image='ibase/resource/objaction/edit.svg', DISPLAY_MODE='2' where OBJ_NAME='emp_add_chg' and TITLE='Edit';
update OBJ_ACTIONS set IMAGE='ibase/resource/objaction/exprtExl.svg',service_code='a',RIGHTS_CHAR='B',TITLE='Export2XLS',form_no='1',service_handler=null,placement = null,ACTION_TYPE='S',DISPLAY_MODE='1' where obj_name='emp_add_chg' and (DESCRIPTION = 'Export Excel' OR DESCRIPTION = 'Export To Excel');
update OBJ_ACTIONS set IMAGE='ibase/resource/objaction/Audit-trail.svg',RIGHTS_CHAR = 'X',SHOW_IN_PANEL = '1' ,DISPLAY_MODE = '2' where OBJ_NAME = 'emp_add_chg' and ( TITLE='View Audit' OR TITLE='Audit Trail' );
update OBJ_ACTIONS set image='ibase/resource/objaction/confirm.svg', DISPLAY_MODE='1', SHOW_CONFIRM='000' where OBJ_NAME='emp_add_chg'and TITLE='Confirm';
update OBJ_ACTIONS set image='ibase/resource/objaction/cancel.svg', DISPLAY_MODE='1', SHOW_CONFIRM='000' where OBJ_NAME='emp_add_chg' and TITLE='Cancel';
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 ('EMP_CODE','W_EMP_ADD_CHG','select trim(a.emp_fname)||'' ''||trim(a.emp_mname)||'' ''||trim(a.emp_lname) as Name, a.emp_code as Code from employee a where a.relieve_date is null and (upper(trim(a.emp_fname)||'' ''||trim(a.emp_mname)||'' ''||trim(a.emp_lname)) like upper(''%?%'') or a.emp_code like upper(''%?%'') ) and length(''?'') >= 3 union all select ''Please enter minimum 3 characters of employee name'' as Name, '' '' as Code from dual where ''?'' is null or length(''?'') < 3',null,'Employee Master',0,0,to_date('30-10-10','DD-MM-RR'),'VISHAL','VISHAL','0',null,':emp_code,:emp_code,:emp_code,:emp_code,:emp_code',2,null,null,null,null,null,null,'2',null,'3','EmpImages','code','name','2',null,null,null,null,null,null,null);
update POPHELP set SQL_STR='SELECT RTRIM(SH_DESCR) CUR_CITY FROM STATION WHERE SH_DESCR LIKE ''%?%'' AND LENGTH(''?'')>=3',DIST_OPT = '1',HELP_OPTION='2', SQL_INPUT=':cur_city,:cur_city', THUMB_OBJ='CityImages',THUMB_IMAGE_COL='cur_city',THUMB_ALT_COL='cur_city' where MOD_NAME='W_EMP_ADD_CHG' and FIELD_NAME='CUR_CITY';
update POPHELP set SQL_STR='SELECT RTRIM(SH_DESCR) PER_CITY FROM STATION WHERE SH_DESCR LIKE ''%?%'' AND LENGTH(''?'')>=3',DIST_OPT = '1',HELP_OPTION='2', SQL_INPUT=':per_city,:per_city', THUMB_OBJ='CityImages',THUMB_IMAGE_COL='per_city',THUMB_ALT_COL='per_city' where MOD_NAME='W_EMP_ADD_CHG' and FIELD_NAME='PER_CITY';
update POPHELP set AUTO_FILL_LEN = 3, AUTO_MIN_LENGTH = 2 , HELP_OPTION = 2 where MOD_NAME = 'W_EMP_ADD_CHG';
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION)
values ('ADCHGSUCC','Transaction Confirmed!','Operation successfully completed','P','Y',null,null,null,to_date('23-07-01','DD-MM-RR'),'SUN','96NAVEENK',null,null);
---------------------------------------------[END]
webitm-adm/src/ibase/webitm/ejb/adm/EmpAddChange.java 0 → 100644
View file @ 4f5ab852
This diff is collapsed.
webitm-adm/src/ibase/webitm/ejb/adm/EmpAddChangeLocal.java 0 → 100644
View file @ 4f5ab852
package ibase.webitm.ejb.adm;
import java.rmi.RemoteException;
import org.w3c.dom.Document;
import ibase.webitm.ejb.ValidatorLocal;
import ibase.webitm.utility.ITMException;
public interface EmpAddChangeLocal extends ValidatorLocal
{
public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
public String itemChanged(Document dom, Document dom1,Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
public String wfValData(String xmlString, String xmlString1,String xmlString2, String objContext, String editFlag,String xtraParams) throws RemoteException,ITMException ;
public String wfValData(Document dom, Document dom1, Document dom2,String objContext, String editFlag, String xtraParams)throws RemoteException, ITMException;
}
webitm-adm/src/ibase/webitm/ejb/adm/EmpAddChangeRemote.java 0 → 100644
View file @ 4f5ab852
package ibase.webitm.ejb.adm;
import java.rmi.RemoteException;
import org.w3c.dom.Document;
import ibase.webitm.ejb.ValidatorRemote;
import ibase.webitm.utility.ITMException;
public interface EmpAddChangeRemote extends ValidatorRemote
{
public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
public String itemChanged(Document dom, Document dom1,Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
public String wfValData(String xmlString, String xmlString1,String xmlString2, String objContext, String editFlag,String xtraParams) throws RemoteException,ITMException ;
public String wfValData(Document dom, Document dom1, Document dom2,String objContext, String editFlag, String xtraParams)throws RemoteException, ITMException;
}
webitm-adm/src/ibase/webitm/ejb/adm/adv/EmpAddChangeConfirm.java
View file @ 4f5ab852
...@@ -22,6 +22,7 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang ...@@ -22,6 +22,7 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang
Connection conn=null; Connection conn=null;
try try
{ {
System.out.println(":::Inside EmpAddChangeConfirm : confirm():::");
conn= getConnection(); conn= getConnection();
retString=postLogic(tranId, tranId, xtraParams, forcedFlag, conn); retString=postLogic(tranId, tranId, xtraParams, forcedFlag, conn);
System.out.println("retString from postLogic : "+retString); System.out.println("retString from postLogic : "+retString);
...@@ -72,6 +73,8 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang ...@@ -72,6 +73,8 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang
String userId=""; String userId="";
try try
{ {
System.out.println(":::Inside EmpAddChangeConfirm : postLogic():::");
userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode")); userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
if(asTranidFr.equalsIgnoreCase(asTranidTo)) if(asTranidFr.equalsIgnoreCase(asTranidTo))
...@@ -105,11 +108,13 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang ...@@ -105,11 +108,13 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang
if("Y".equalsIgnoreCase(lsConf)) if("Y".equalsIgnoreCase(lsConf))
{ {
System.out.println("::: if 'Y' :::");
errString=checkNull(itmDbAcess.getErrorString("", "VTMCONF1",userId, "", conn)); errString=checkNull(itmDbAcess.getErrorString("", "VTMCONF1",userId, "", conn));
return errString; return errString;
} }
else if("X".equalsIgnoreCase(lsConf)) else if("X".equalsIgnoreCase(lsConf))
{ {
System.out.println("::: if 'X' :::");
errString=checkNull(itmDbAcess.getErrorString("", "VTMCANL1",userId, "", conn)); errString=checkNull(itmDbAcess.getErrorString("", "VTMCANL1",userId, "", conn));
return errString; return errString;
} }
...@@ -240,12 +245,10 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang ...@@ -240,12 +245,10 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang
empCodeAprv = empCode; empCodeAprv = empCode;
} }
//update employee_add_change set confirmed = 'Y', conf_date = :ld_conf_date,where tran_id = :as_tran_id sql="update employee_add_change set confirmed = 'Y', conf_date = ? where tran_id = ?";
sql="update employee_add_change set confirmed = ?, conf_date = ? where tran_id = ?";
pstmt =conn.prepareStatement(sql); pstmt =conn.prepareStatement(sql);
pstmt.setString(1,"Y"); pstmt.setTimestamp(1, ldConfDate);
pstmt.setTimestamp(2, ldConfDate); pstmt.setString(2,tranId);
pstmt.setString(3,tranId);
count = pstmt.executeUpdate(); count = pstmt.executeUpdate();
if (pstmt != null) if (pstmt != null)
{ {
...@@ -298,7 +301,14 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang ...@@ -298,7 +301,14 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang
{ {
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
//Added Validation to show Successful Msg [Start]
if(count > 0)
{
errString=itmDbAcess.getErrorString("","ADCHGSUCC" , userId, "", conn);
break;
}
//Added Validation to show Successful Msg [End]
if(count != 1) if(count != 1)
{ {
errString=itmDbAcess.getErrorString("","DS000NR" , userId, "", conn); errString=itmDbAcess.getErrorString("","DS000NR" , userId, "", conn);
......
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