Updated

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

webitm-dis/ibase/webitm/ejb/dis/ProjectAmdIC.java

@@ -10,9 +10,11 @@ import java.rmi.RemoteException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Locale;
 
 import javax.ejb.Stateless;
 
@@ -61,17 +63,32 @@ public class ProjectAmdIC extends ValidatorEJB implements ProjectAmdICRemote, Pr
 		Node parentNode = null;
 		Node childNode = null;
 		String errString = "";
-		String userId = null;
+		String userId = null,getDate= "";
 		PreparedStatement pstmt=null;
 		ResultSet rs=null;
 		String childNodeName = null;
 		int ctr = 0, childNodeLength = 0, currentFormNo = 0;
 		Connection conn = null;
+		Date startDate = null;
+		
 		try {
 			ConnDriver con = new ConnDriver();
 			conn = con.getConnectDB("DriverITM");
 			userId = getValueFromXTRA_PARAMS(xtraParams, "loginsitecode");
 			GenericUtility genericUtility = GenericUtility.getInstance();
+		    DateFormat dateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat(),Locale.ENGLISH);
+
+			String projCode = genericUtility.getColumnValue("proj_code", dom);
+			getDate = " select start_date from project where proj_code=?";
+			pstmt = conn.prepareStatement(getDate);
+			pstmt.setString(1, projCode);
+			rs = pstmt.executeQuery();
+			if (rs.next()) {
+				startDate = rs.getDate("start_date");
+
+			}
+			callPstRs(pstmt, rs);
+			
 			if (objContext != null && objContext.trim().length() > 0) {
 				currentFormNo = Integer.parseInt(objContext);
 			}
@@ -85,12 +102,51 @@ public class ProjectAmdIC extends ValidatorEJB implements ProjectAmdICRemote, Pr
 					childNode = childNodeList.item(ctr);
 					childNodeName = childNode.getNodeName();
 					if (childNodeName.equalsIgnoreCase("end_date")) {
+						
 						if (childNode.getFirstChild() == null) {
 							errString = getErrorString("end_date", "POAMNDED", userId);
 							break;
+						}else
+						{
+							String asOnDateStr=  genericUtility.getColumnValue("end_date", dom);
+							java.util.Date asOnDate  =dateFormat.parse(asOnDateStr);
+							if(startDate.after(asOnDate))
+						
+							{
+								System.out.println("Error Msg");
+								errString = getErrorString("ext_end_date", "VTPRJAMD4", userId);
+							}
 						}
 
 					}
+					if (childNodeName.equalsIgnoreCase("ext_end_date")) {
+						
+						
+
+						if (childNode.getFirstChild() == null) {
+							errString = getErrorString("ext_end_date", "VTPRJAMD2", userId);
+							break;
+						}else
+						{
+							String extEndDateStr =  genericUtility.getColumnValue("ext_end_date", dom);
+							java.util.Date extEndDate  =dateFormat.parse(extEndDateStr);
+							if(startDate.after(extEndDate))
+							
+							{
+								System.out.println("Error Msg");
+								errString = getErrorString("ext_end_date", "VTPRJAMD3", userId);
+	
+							}
+						}
+					}
+					if (childNodeName.equalsIgnoreCase("amd_reason")) {
+						String amdReason = genericUtility.getColumnValue("amd_reason", dom);
+						System.out.println("amdReason::"+amdReason);
+						if (childNode.getFirstChild() == null || amdReason.trim().length() <=0) {
+							errString = getErrorString("amd_reason", "VTPRJAMD1", userId);
+							break;
+						}
+					}
 					if (childNodeName.equalsIgnoreCase("amd_date")) {
 						if (childNode.getFirstChild() == null) {
 							errString = getErrorString("amd_date", "POAMNDEE", userId);
@@ -98,7 +154,7 @@ public class ProjectAmdIC extends ValidatorEJB implements ProjectAmdICRemote, Pr
 						}
 					}
 					if (childNodeName.equalsIgnoreCase("proj_code")) {
-						if (childNode.getFirstChild() == null) {
+						if (childNode.getFirstChild() == null || projCode.trim().length() <=0) {
 							errString = getErrorString("proj_code", "POAMNDEF", userId);
 							break;
 						}
@@ -143,7 +199,7 @@ public class ProjectAmdIC extends ValidatorEJB implements ProjectAmdICRemote, Pr
 				
 			}
 		 catch (Exception e) {
-			System.out.println("Exception" + e.getMessage());
+			//System.out.println("Exception" + e.getMessage());
 			e.printStackTrace();
 			errString = e.getMessage();
 		} finally {
@@ -244,11 +300,11 @@ public class ProjectAmdIC extends ValidatorEJB implements ProjectAmdICRemote, Pr
 						String projCode = "";
 						projCode = genericUtility.getColumnValue("proj_code", dom2);
 						String projDescr = "";
-						Date projendDate = null;
+						Date projendDate = null,extEnddate = null,startDate= null;
 						String projapproxCost = "";
 						
 						try {
-							sql = " select descr, end_date, approx_cost, site_code from project where proj_code=?";
+							sql = " select descr, end_date, approx_cost, site_code,ext_end_date from project where proj_code=?";
 							pst = conn.prepareStatement(sql);
 							pst.setString(1, projCode);
 							rs = pst.executeQuery();
@@ -257,15 +313,25 @@ public class ProjectAmdIC extends ValidatorEJB implements ProjectAmdICRemote, Pr
 								projendDate = rs.getDate("end_date");
 								projapproxCost = rs.getString("approx_cost")==null?"0": rs.getString("approx_cost");
 								siteCode = rs.getString("site_code")==null?"": rs.getString("site_code");
+								extEnddate = rs.getDate("ext_end_date");
 							}
 							callPstRs(pst, rs);
 							
 								valueXmlString.append("<descr>").append("<![CDATA[" + projDescr + "]]>").append("</descr>");
 								if(projendDate != null) {
 									valueXmlString.append("<end_date_o>").append("<![CDATA[" + sdf.format(projendDate) + "]]>").append("</end_date_o>");
+									valueXmlString.append("<end_date>").append("<![CDATA[" + sdf.format(projendDate) + "]]>").append("</end_date>");
+
+								}
+								if(extEnddate != null) {
+									valueXmlString.append("<ext_end_date_o>").append("<![CDATA[" + sdf.format(extEnddate) + "]]>").append("</ext_end_date_o>");
+									valueXmlString.append("<ext_end_date>").append("<![CDATA[" + sdf.format(extEnddate) + "]]>").append("</ext_end_date>");
+
 								}
 										
 								valueXmlString.append("<approx_cost_o>").append("<![CDATA[" + projapproxCost + "]]>").append("</approx_cost_o>");
+								valueXmlString.append("<approx_cost>").append("<![CDATA[" + projapproxCost + "]]>").append("</approx_cost>");
+
 								if(siteCode.length() > 0){
 									valueXmlString.append("<site_code>").append("<![CDATA[" +  siteCode + "]]>").append("</site_code>");
 								} else {
@@ -282,7 +348,7 @@ public class ProjectAmdIC extends ValidatorEJB implements ProjectAmdICRemote, Pr
 						System.out.println("Azhar ::: ITMDEFAULT Called ::: Tajuddin");
 //						valueXmlString.append("<appr_by>").append("<![CDATA[" + loginCode + "]]>").append("</appr_by>");
 						valueXmlString.append("<amd_date>").append("<![CDATA[" + currentDate + "]]>").append("</amd_date>");
-						valueXmlString.append("<end_date>").append("<![CDATA[" + currentDate + "]]>").append("</end_date>");
+						//valueXmlString.append("<end_date>").append("<![CDATA[" + currentDate + "]]>").append("</end_date>");
 //						valueXmlString.append("<appr_date>").append("<![CDATA[" + currentDate + "]]>").append("</appr_date>");
 						valueXmlString.append("<site_code>").append("<![CDATA[" + loginSiteCode + "]]>").append("</site_code>");
 						valueXmlString.append("<confirmed><![CDATA[N]]></confirmed>");