Commit 40cce2e6 authored by dpingle's avatar dpingle

* update component on [06/11/19]

w_cadre_ad.sql
CadreAdIC.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@211405 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a1552f5d
...@@ -127,12 +127,14 @@ update pophelp set THUMB_ALT_COL = 'DESCR', THUMB_IMAGE_COL= 'PAY_TABLE', THUMB_ ...@@ -127,12 +127,14 @@ update pophelp set THUMB_ALT_COL = 'DESCR', THUMB_IMAGE_COL= 'PAY_TABLE', THUMB_
------------------------------------------------------[30/10/19]End ------------------------------------------------------[30/10/19]End
------------------------------------------------------[05/11/19]Start ------------------------------------------------------[06/11/19]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) 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 ('CADRE_CODE','W_CADRE_AD','SELECT CADRE_CODE,DESCR FROM CADRE',null,'Cadres',null,null,to_date('22-10-00','DD-MM-RR'),'SUN ','HDP ','1',null,null,null,null,null,null,null,null,null,'2',null,'3','CadreImages','cadre_code','descr','2 ',null,null,null,null,null,null,null); values ('CADRE_CODE','W_CADRE_AD','SELECT CADRE_CODE,DESCR FROM CADRE',null,'Cadres',null,null,to_date('22-10-00','DD-MM-RR'),'SUN ','HDP ','1',null,null,null,null,null,null,null,null,null,'2',null,'3','CadreImages','cadre_code','descr','2 ',null,null,null,null,null,null,null);
------------------------------------------------------[05/11/19]End update messages set MSG_DESCR='Effective date or Expiry Date cannot be empty' where MSG_NO='VTDATE11';
------------------------------------------------------[06/11/19]End
...@@ -4,12 +4,10 @@ import java.rmi.RemoteException; ...@@ -4,12 +4,10 @@ import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import org.apache.commons.net.ntp.TimeStamp;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
...@@ -217,7 +215,7 @@ public class CadreAdIC extends ValidatorEJB implements CadreAdLocal,CadreAdRemot ...@@ -217,7 +215,7 @@ public class CadreAdIC extends ValidatorEJB implements CadreAdLocal,CadreAdRemot
if(expDateStr == null || expDateStr.trim().length() == 0) if(expDateStr == null || expDateStr.trim().length() == 0)
{ {
errList.add("VTDATE19"); errList.add("VTDATE11");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
if(effDateStr != null && expDateStr != null) if(effDateStr != null && expDateStr != null)
...@@ -413,25 +411,6 @@ public class CadreAdIC extends ValidatorEJB implements CadreAdLocal,CadreAdRemot ...@@ -413,25 +411,6 @@ public class CadreAdIC extends ValidatorEJB implements CadreAdLocal,CadreAdRemot
valueXmlString.append("<eff_date ><![CDATA[").append(effDateStr).append("]]></eff_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"); valueXmlString.append("<exp_date ><![CDATA[").append(expDateStr).append("]]></exp_date>\r\n");
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(payTable).append("]]></pay_table>\r\n");
}
if(cadreCode != null && cadreCode.trim().length() >0)
{
valueXmlString.append("<cadre_code protect=\"1\"><![CDATA[").append(cadreCode).append("]]></cadre_code>\r\n");
}
else
{
valueXmlString.append("<cadre_code protect=\"0\"><![CDATA[").append(cadreCode).append("]]></cadre_code>\r\n");
}
valueXmlString.append("<pay_table protect=\"1\"><![CDATA[").append(payTable).append("]]></pay_table>\r\n");
valueXmlString.append("<cadre_code protect=\"1\"><![CDATA[").append(cadreCode).append("]]></cadre_code>\r\n");
} }
if ("ad_code".equalsIgnoreCase(currentColumn)) 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