* updated srd, src, sql and xml

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


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

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

@@ -148,10 +148,22 @@ Insert into OBJ_ACTIONS (OBJ_NAME,LINE_NO,IMAGE,DESCRIPTION,SERVICE_CODE,INTERAC
 
 --------------------------------------------------[23/12/19]End
 
+--------------------------------------------------[27/01/20]Start
 
+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 ('PAYINVAILD','Invaild Pay table!!','Pay table No not present in master. ','E','Y',null,null,null,to_date('18-03-06','DD-MM-RR'),'TSD       ','TSD            ',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 ('PAYTBLNULL','Empty Pay table!!','Pay table can not be null','E','Y',null,null,null,to_date('18-03-06','DD-MM-RR'),'TSD       ','TSD            ',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 ('GRDCODNULL','Empty Grade code!!','Grade code cannot be null','E','Y',null,null,null,to_date('18-03-06','DD-MM-RR'),'TSD       ','TSD            ',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 ('GRDINVAILD','Invaild Grade code!!','Grade code No not present in master.','E','Y',null,null,null,to_date('18-03-06','DD-MM-RR'),'TSD       ','TSD            ',null,null);
 
 
+--------------------------------------------------[27/01/20]End
 
 

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

@@ -220,6 +220,82 @@ public class GradeAdIC extends ValidatorEJB implements GradeAdLocal,GradeAdRemot
 							}
 						}
 					}
+					
+					else if ("grade_code".equalsIgnoreCase(childNodeName))
+					{
+						gradeCode = checkNull(genericUtility.getColumnValue("grade_code", dom));
+					    
+						if (gradeCode == null || gradeCode.trim().length() == 0)
+						{
+							errList.add("GRDCODNULL");
+					        errFields.add(childNodeName.toLowerCase());
+						}
+						else
+						{
+							sql = "select count(*) as cnt from grade where grade_code = ?";
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1, gradeCode);
+							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)
+							{
+								errList.add("GRDINVAILD");
+								errFields.add(childNodeName.toLowerCase());
+							}
+						}
+					}
+					
+					else if ("pay_table".equalsIgnoreCase(childNodeName))
+					{
+						payTable = checkNull(genericUtility.getColumnValue("pay_table", dom));
+
+						if (payTable == null || payTable.trim().length() == 0)
+						{
+							errList.add("PAYTBLNULL");
+							errFields.add(childNodeName.toLowerCase());
+						}
+						else
+						{
+							sql = "select count(*) as cnt from Paytable where pay_table = ?";
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1, 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)
+							{
+								errList.add("PAYINVAILD");
+								errFields.add(childNodeName.toLowerCase());
+							}
+						}
+					}
 				}
 				break;
 			}
@@ -373,9 +449,28 @@ public class GradeAdIC extends ValidatorEJB implements GradeAdLocal,GradeAdRemot
 				if ("itm_default".equalsIgnoreCase(currentColumn)) 
 				{
 					payTable = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "pay_table");
-					gradeCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "grade_code");
-
+					if(payTable != null && payTable.trim().length() > 0 )
+					{
+						valueXmlString.append("<pay_table  protect=\"1\"><![CDATA[").append(payTable).append("]]></pay_table>\r\n");
+					}
+					else 
+					{
+						valueXmlString.append("<pay_table  protect=\"0\"><![CDATA[").append("").append("]]></pay_table>\r\n");
+					}
 					valueXmlString.append("<pay_table ><![CDATA[").append(payTable).append("]]></pay_table>\r\n");
+					
+					
+					gradeCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "grade_code");
+					System.out.println("gradeCode::::"+gradeCode);
+					if(gradeCode != null && gradeCode.trim().length() > 0 )
+					{
+						valueXmlString.append("<grade_code  protect=\"1\"><![CDATA[").append(gradeCode).append("]]></grade_code>\r\n");
+					}
+					else 
+					{
+						valueXmlString.append("<grade_code  protect=\"0\"><![CDATA[").append("").append("]]></grade_code>\r\n");
+					}
+					
 					valueXmlString.append("<grade_code ><![CDATA[").append(gradeCode).append("]]></grade_code>\r\n");
 
 					effDateStr = admCommon.getEnv("999999", "AD_EFFDATE", conn);