Skip to content

B
business-java
Commit 08e30816 authored by dpingle's avatar dpingle
Browse files
Options

* Updated component on [30/10/19] 

grade_ad21.xml
w_grade_ad.sql
d_grade_allwdedn_brow.srd
d_grade_allwdedn_edit.srd
GradeAdIC.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@210693 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 49606690
Expand all Show whitespace changes
Inline Side-by-side
Showing with 166 additions and 110 deletions
webitm-adm/module-resource/SQL/w_grade_ad.sql
View file @ 08e30816
......@@ -15,8 +15,6 @@ Insert into ITM2MENU (APPLICATION,LEVEL_1,LEVEL_2,LEVEL_3,LEVEL_4,LEVEL_5,WIN_NA
----------------------------------------------------- OBJ_ACTIONS
Insert into OBJ_ACTIONS (OBJ_NAME,LINE_NO,RIGHTS_CHAR,INTERACTIVE,SERVICE_CODE,DESCRIPTION,TITLE,IMAGE,FORM_NO,SERVICE_HANDLER,PLACEMENT,ACTION_TYPE,TRAN_TYPE,CHG_DATE,CHG_TERM,CHG_USER,IS_CONFIRMATION_REQ,SEP_DUTY_OPT,RE_AUTH_OPT,SHOW_IN_PANEL,SWIPE_POSITION,MULTI_ROW_OPT,ACTION_ID,DEF_NODATA) values ('grade_ad',1,'A','a','a','Adding New','Add','add.gif','1',null,null,'S',null,null,null,null,null,null,null,null,null,null,null,null);
Insert into OBJ_ACTIONS (OBJ_NAME,LINE_NO,RIGHTS_CHAR,INTERACTIVE,SERVICE_CODE,DESCRIPTION,TITLE,IMAGE,FORM_NO,SERVICE_HANDLER,PLACEMENT,ACTION_TYPE,TRAN_TYPE,CHG_DATE,CHG_TERM,CHG_USER,IS_CONFIRMATION_REQ,SEP_DUTY_OPT,RE_AUTH_OPT,SHOW_IN_PANEL,SWIPE_POSITION,MULTI_ROW_OPT,ACTION_ID,DEF_NODATA) values ('grade_ad',2,'E','a','a','Editing Existing Record','Edit','edit.gif','1',null,null,'S',null,null,null,null,null,null,null,null,null,null,null,null);
Insert into OBJ_ACTIONS
(OBJ_NAME,LINE_NO,RIGHTS_CHAR,INTERACTIVE,SERVICE_CODE,DESCRIPTION,TITLE,IMAGE,FORM_NO,SERVICE_HANDLER,PLACEMENT,ACTION_TYPE,TRAN_TYPE,CHG_DATE,CHG_TERM,CHG_USER,IS_CONFIRMATION_REQ,SEP_DUTY_OPT,RE_AUTH_OPT,SHOW_IN_PANEL,SWIPE_POSITION,MULTI_ROW_OPT,ACTION_ID,DEF_NODATA) values ('grade_ad',3,'D','a','a','Deleting','Delete','delete.gif','1',null,null,'S',null,null,null,null,null,null,null,null,null,null,null,null);
Insert into OBJ_ACTION
(OBJ_NAME,LINE_NO,RIGHTS_CHAR,INTERACTIVE,SERVICE_CODE,DESCRIPTION,TITLE,IMAGE,FORM_NO,SERVICE_HANDLER,PLACEMENT,ACTION_TYPE,TRAN_TYPE,CHG_DATE,CHG_TERM,CHG_USER,IS_CONFIRMATION_REQ,SEP_DUTY_OPT,RE_AUTH_OPT,SHOW_IN_PANEL,SWIPE_POSITION,MULTI_ROW_OPT,ACTION_ID,DEF_NODATA) values ('grade_ad',21,'Q','1','audit_trail','View Audit Trail','View Audit','menu.bmp','1','1','1','U',null,null,null,null,null,null,null,null,null,null,null,null);
Insert into OBJ_ACTIONS
......@@ -92,20 +90,39 @@ Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,E
------------------------------------------------------[23/10/19]Start
update transetup set REF_SER ='G-AD' where TRAN_WINDOW = 'w_grade_ad';
------------------------------------------------------[30/10/19]Start
update obj_forms set disp_metadata=
'<html>
<span style="white-space: normal !important; word-break: break-word; "> <b>{ad_code}</b> , Grade Code <b>{grade_code}</b> <br/>
<span style="white-space: normal !important; word-break: break-word; "> {sh_descr} <b>{ad_code}</b> , Grade Code <b>{grade_code}</b> <br/>
Pay Table <b>{pay_table}</b> , Amount <b>{amount}</b>
</span>
<br/> <span style="float:right;"></span>
</html>' where win_name='w_grade_ad';
update itm2menu set ICON_PATH='GradewisePaystructure.png' , CLOSE_ICON='GradewisePaystructurewht.png' where WIN_NAME='w_grade_ad';
------------------------------------------------------[23/10/19]End
update obj_actions set IMAGE='ibase/resource/objaction/add.svg', DISPLAY_MODE=0 where OBJ_NAME='grade_ad' and LINE_NO=1;
update obj_actions set IMAGE='ibase/resource/objaction/edit.svg', DISPLAY_MODE=0 where OBJ_NAME='grade_ad' and LINE_NO=2;
update obj_actions set IMAGE='ibase/resource/objaction/Audit-trail.svg', DISPLAY_MODE=1 where OBJ_NAME='grade_ad' and LINE_NO=21;
update obj_actions set IMAGE='ibase/resource/objaction/exprtExl.svg',DESCRIPTION='Export To Excel',SERVICE_CODE='a',INTERACTIVE='a',RIGHTS_CHAR='B',TITLE='Export2XLS',ACTION_TYPE='S', DISPLAY_MODE=1 where OBJ_NAME='grade_ad' and LINE_NO=22;
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 ('AD_CODE','W_GRADE_AD','SELECT AD_CODE, DESCR FROM ALLWDEDN WHERE TYPE <> ''S''',null,null,0,0,to_date('08-12-01','DD-MM-RR'),'BASE ','97SYSTEM4 ','1',null,null,0,null,null,null,null,null,0,'2',null,'3','AdCodeImages','ad_code','descr','3 ',null,null,null,null,null,null,null);
Update transetup set TRAN_ID_COL='PAY_TABLE, GRADE_CODE, AD_CODE, EFF_DATE' ,REF_SER ='G-AD' WHERE TRAN_WINDOW='w_grade_ad';
update OBJ_FORMS set THUMB_ALT_COL = 'allwdedn_descr', THUMB_IMAGE_COL= 'ad_code', THUMB_OBJ = 'AdCodeImages' where WIN_NAME = 'w_grade_ad';
update TRANSETUP set THUMB_ALT_COL = 'allwdedn_descr', THUMB_IMAGE_COL= 'ad_code', THUMB_OBJ = 'AdCodeImages' where TRAN_WINDOW = 'w_grade_ad';
UPDATE OBJ_FORMS SET PARENT_KEY_COL ='PAY_TABLE,GRADE_CODE,AD_CODE' WHERE WIN_NAME='w_grade_ad';
------------------------------------------------------[30/10/19]End
webitm-adm/module-resource/metadata/grade_ad21.xml
View file @ 08e30816
......@@ -39,7 +39,7 @@
<color>536870912</color>
</Footer>
<Detail>
<height>388</height>
<height>456</height>
<color>536870912</color>
</Detail>
<TableDefinition>
......
webitm-adm/module-resource/srd/d_grade_allwdedn_edit.srd
View file @ 08e30816
......@@ -4,7 +4,7 @@ release 9;
datawindow(units=1 timer_interval=0 color=79741120 processing=0 HTMLDW=no print.printername="" print.documentname="" print.orientation = 0 print.margin.left = 24 print.margin.right = 24 print.margin.top = 24 print.margin.bottom = 24 print.paper.source = 0 print.paper.size = 0 print.canusedefaultprinter=yes print.prompt=no print.buttons=no print.preview.buttons=no print.cliptext=no print.overrideprintjob=no print.collate=yes hidegrayline=no )
summary(height=68 color="536870912" )
footer(height=58 color="536870912" )
detail(height=388 color="536870912" )
detail(height=456 color="536870912" )
table(column=(type=char(5) update=yes updatewhereclause=yes key=yes name=pay_table dbname="grade_ad.pay_table" )
column=(type=char(5) update=yes updatewhereclause=yes key=yes name=grade_code dbname="grade_ad.grade_code" )
column=(type=char(5) update=yes updatewhereclause=yes key=yes name=ad_code dbname="grade_ad.ad_code" )
......
webitm-adm/src/ibase/webitm/ejb/adm/GradeAdIC.java
View file @ 08e30816
......@@ -77,6 +77,8 @@ public class GradeAdIC extends ValidatorEJB implements GradeAdLocal,GradeAdRemot
String sql = "";
String effDateStr = "";
String expDateStr = "";
String gradeCode = "";
String payTable = "";
int currentFormNo = 0;
int noOfChilds = 0;
int cnt = 0;
......@@ -109,13 +111,6 @@ public class GradeAdIC extends ValidatorEJB implements GradeAdLocal,GradeAdRemot
System.out.println("noOfChilds--->>>" + noOfChilds);
for (counter = 0; counter < noOfChilds; counter++)
{
childNode = childList.item(counter);
childNodeName = childNode.getNodeName();
System.out.println("childNodeName>>>>>" + childNodeName);
System.out.println("childNode>>>>>>" + childNode);
System.out.println("counter>>>" + counter);
switch (currentFormNo)
{
case 1:
......@@ -138,6 +133,9 @@ public class GradeAdIC extends ValidatorEJB implements GradeAdLocal,GradeAdRemot
if ("ad_code".equalsIgnoreCase(childNodeName))
{
adCode = checkNull(genericUtility.getColumnValue("ad_code", dom));
gradeCode = checkNull(genericUtility.getColumnValue("grade_code", dom));
payTable = checkNull(genericUtility.getColumnValue("pay_table", dom));
sql=" select count(*) as cnt from allwdedn where ad_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, adCode);
......@@ -163,6 +161,35 @@ public class GradeAdIC extends ValidatorEJB implements GradeAdLocal,GradeAdRemot
errList.add("VMADC1");
errFields.add(childNodeName.toLowerCase());
}
else
{
sql = "select count(*) as cnt from grade_ad where ad_code = ? and grade_code=? and pay_table = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, adCode);
pstmt.setString(2, gradeCode);
pstmt.setString(3, payTable);
rs = pstmt.executeQuery();
if (rs.next())
{
cnt = rs.getInt("cnt");
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(cnt > 0 && !"E".equalsIgnoreCase(editFlag))
{
errList.add("VMADC4");
errFields.add(childNodeName.toLowerCase());
}
}
}
else if ("eff_date".equalsIgnoreCase(childNodeName))
{
......@@ -199,7 +226,7 @@ public class GradeAdIC extends ValidatorEJB implements GradeAdLocal,GradeAdRemot
}
break;
}
}
System.out.println("errStringXml.toString()---1= "+errStringXml.toString());
if (errList != null && errList.size() > 0)
{
......@@ -319,8 +346,8 @@ public class GradeAdIC extends ValidatorEJB implements GradeAdLocal,GradeAdRemot
int currentFormNo = 0;
String payTable = "";
String gradeCode= "";
String lsVarValue = "";
String lsVarValues = "";
String effDateStr = "";
String expDateStr = "";
String adCode = "";
String sql = "";
String mdescr = "";
......@@ -354,17 +381,28 @@ public class GradeAdIC extends ValidatorEJB implements GradeAdLocal,GradeAdRemot
valueXmlString.append("<pay_table ><![CDATA[").append(payTable).append("]]></pay_table>\r\n");
valueXmlString.append("<grade_code ><![CDATA[").append(gradeCode).append("]]></grade_code>\r\n");
lsVarValue = admCommon.getEnv("999999", "AD_EFFDATE", conn);
System.out.println("lsVarValue==["+lsVarValue+"]");
System.out.println("genericUtility.getApplDateFormat()==["+genericUtility.getApplDateFormat()+"]");
lsVarValue = genericUtility.getValidDateString(lsVarValue, genericUtility.getApplDateFormat());
System.out.println("lsVarValue==after["+lsVarValue+"]");
effDateStr = admCommon.getEnv("999999", "AD_EFFDATE", conn);
expDateStr = admCommon.getEnv("999999", "AD_EXPDATE", conn);
SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yy");
Date effDate = sdf.parse(effDateStr);
System.out.println("effDate:::"+effDate);
Date expDate = sdf.parse(expDateStr);
System.out.println("expDate:::"+expDate);
sdf = new SimpleDateFormat("dd/MM/yy");
effDateStr = sdf.format(effDate);
System.out.println("effDateStr:::"+effDateStr);
expDateStr = sdf.format(expDate);
System.out.println("expDateStr:::"+expDateStr);
lsVarValues = admCommon.getEnv("999999", "AD_EXPDATE", conn);
lsVarValues = genericUtility.getValidDateString(lsVarValues, genericUtility.getApplDateFormat());
valueXmlString.append("<eff_date ><![CDATA[").append(lsVarValue).append("]]></eff_date>\r\n");
valueXmlString.append("<exp_date ><![CDATA[").append(lsVarValues).append("]]></exp_date>\r\n");
valueXmlString.append("<eff_date ><![CDATA[").append(effDateStr).append("]]></eff_date>\r\n");
valueXmlString.append("<exp_date ><![CDATA[").append(expDateStr).append("]]></exp_date>\r\n");
}
else if ("ad_code".equalsIgnoreCase(currentColumn))
{
......
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