Updated in leave master on [21/08/2019]

w_leave.sql
LeavesIC.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@205591 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-adm/module-resource/SQL/w_leave.sql

@@ -8,6 +8,8 @@ null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,
 
 update obj_forms set SCR_FLAG='F' where win_name='w_leave';
 
+
+
 ------------------------------------------------------ ITM2MENU
 Insert into ITM2MENU (APPLICATION,LEVEL_1,LEVEL_2,LEVEL_3,LEVEL_4,LEVEL_5,WIN_NAME,DESCR,COMMENTS,MENU_PATH,ICON_PATH,CLOSE_ICON,OPEN_ICON,OBJ_TYPE,CHG_DATE,CHG_TERM,CHG_USER,MOB_DEPLOY,DEFAULT_STATE,DEF_ACTION) values ('HRM',2,10,1,0,0,'w_leave','Leaves',null,'HRM.2.10.1.0.0',null,null,null,'M',null,null,null,null,null,null);
 update itm2menu set OBJ_TYPE='T' , MOB_DEPLOY='B', ENT_TYPES='0  ' where win_name='w_leave';
@@ -24,6 +26,7 @@ update OBJ_ACTIONS set image='ibase/resource/objaction/exprtExl.svg' where OBJ_N
 update OBJ_ACTIONS set image='ibase/resource/objaction/exprtExl.svg' where OBJ_NAME='leave' and LINE_NO=22;
 
 
+
 ----------------------------------------------------- SYSTEM_EVENTS
 update system_events set comp_type = 'JB', comp_name = 'ibase.webitm.ejb.adm.LeavesIC', service_code = 'poic_default_ejb' where event_code = 'post_item_change' and obj_name = 'leave';
 update system_events set comp_type = 'JB', comp_name = 'ibase.webitm.ejb.adm.LeavesIC', service_code = 'prv_default_ejb' where event_code = 'pre_validate' and obj_name = 'leave';
@@ -73,12 +76,16 @@ Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,E
 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 ('VMNUMBER1 ','Invalid Data Entered !','Minimum  allowed leaves  can not be greater than maximum allowed leaves.','E','Y',null,null,null,to_date('22-10-00','DD-MM-RR'),'SUN       ','HDP            ',null,null);
 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 ('VTLVE1    ','Invalid balance option','For payable type of leaves balance maintain must be ''Yes''','W','Y',null,null,null,to_date('21-05-10','DD-MM-RR'),'VISHAL    ','VISHAL         ',null,null);
 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 ('VTLVUNIT  ','Invalid Leave Unit!','Leave Unit can not be null or empty or other than "D" or "H".','E','Y',null,null,null,null,null,null,null,null);
+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
+('VMNUMBER2 ','Negative Data Entered !','Negative Data can not insert.','E','Y',null,null,null,to_date('22-10-00','DD-MM-RR'),'SUN       ','HDP            ',null,null);
+
 
------------------------------------------------------ Dipesh [20/08/2019] Start
 
+----------------------------------------------------- Dipesh [20/08/2019] 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 ('AD_CODE__ENCH','W_LEAVE','SELECT AD_CODE AS AD_CODE__ENCH, DESCR FROM ALLWDEDN',null,'Allowance/Deduction',0,0,to_date('22-OCT-00','DD-MON-RR'),'SUN       ','HDP            ','1',null,null,null,null,null,null,null,null,1,'2',null,'3','AdCodeImages','ad_code','descr','2    ',null,null,null,null,null,null,null);
 
+
 delete obj_actions where obj_name='leave' and line_no='3';
 delete obj_actions where obj_name='leave' and line_no='8';
 delete obj_actions where obj_name='leave' and line_no='41';
@@ -101,17 +108,33 @@ Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,E
 UPDATE messages SET msg_str = 'Invalid Allow./Deduction code!' WHERE MSG_NO='VEADN1';
 
 update pophelp set multi_opt=null where MOD_NAME='W_LEAVE' and field_name='AD_CODE__ENCH';
-
 ----------------------------------------------------- Dipesh [20/08/2019] End
 
+
+
 ----------------------------------------------------- Dipesh [21/08/2019] Start
 
 Insert into GENMST (FLD_NAME,MOD_NAME,DESCR,ERROR_CD,BLANK_OPT,FLD_TYPE,FLD_MIN,FLD_MAX,VAL_TYPE,CHG_DATE,CHG_USER,CHG_TERM,VAL_TABLE,SQL_INPUT,FLD_WIDTH,UDF_USAGE_1,UDF_USAGE_2,UDF_USAGE_3,VAL_STAGE,OBJ_NAME,FORM_NO,ACTION) 
 values ('MAX_TIMES','W_LEAVE','Validation for max time','VMNUMBER2 ','N','C','select ( case when ? < 0 then 1 else 0 end )  from dual','0','Q',to_date('16-10-08','DD-MM-RR'),'VIKAS     ','08ANMISVIKAS   ',null,':0.max_times',5,null,null,null,null,null,'X','edit');
 
 
+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 ('VMLVECD4  ','Convert To Not Found...','This Convert To does not exsist in the master.Please first define it.','E','Y',null,null,null,to_date('22-10-00','DD-MM-RR'),'SUN       ','HDP            ',null,null);
+
+
 ----------------------------------------------------- Dipesh [21/08/2019] End
 
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+

webitm-adm/src/ibase/webitm/ejb/adm/LeavesIC.java

@@ -498,10 +498,12 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
 						else if (childNodeName.equalsIgnoreCase("encashable"))
 						{
 							encashable = checkNull(genericUtility.getColumnValue("encashable", dom));
-							if (encashable.trim().equalsIgnoreCase("C")) {
+							if (encashable.trim().equalsIgnoreCase("C"))
+							{
 								lveCodeConvert = checkNull(genericUtility.getColumnValue("lve_code__convert", dom));
-								if (lveCodeConvert == null || lveCodeConvert.trim().length() == 0) {
-									errList.add("VMLVECD1");
+								if (lveCodeConvert == null || lveCodeConvert.trim().length() == 0) 
+								{
+									errList.add("VMLVECD4");
 									errFields.add(childNodeName.toLowerCase());
 								}
 							}
@@ -584,26 +586,30 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1, lveCodeConvert);
 								rs = pstmt.executeQuery();
-								if (rs.next()) {
+								if (rs.next()) 
+								{
 									cnt = rs.getInt("cnt");
 								}
 								System.out.println("cnt:::: " + cnt);
-								if (rs != null) {
+								if (rs != null) 
+								{
 									rs.close();
 									rs = null;
 								}
-								if (pstmt != null) {
+								if (pstmt != null) 
+								{
 									pstmt.close();
 									pstmt = null;
 								}
-								if (cnt > 0) {
+								if (cnt > 0)
+								{
 									if (lveCodeConvert.trim().equalsIgnoreCase(lveCode.trim())) {
 										errList.add("VMLVECD2");
 										errFields.add(childNodeName.toLowerCase());
 									} 
 								}
 								else {
-									errList.add("VMLVECD1");
+									errList.add("VMLVECD4");
 									errFields.add(childNodeName.toLowerCase());
 								}
 							}