Changes to correct code after UT

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

webitm-fin/ibase/webitm/ejb/fin/BudgetGrpAcctGenPrc.java

@@ -73,7 +73,12 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 			 this.closeResources(pstmt, rs);
 			 sql = null;
 			 
-			 if(confirmed!=null&&confirmed.equalsIgnoreCase("N")){
+			 if(confirmed==null){
+				 
+				 confirmed = "N";		// Code will assume confirmed as N if confirmed value read is null
+				 
+			 }
+			 else if(confirmed!=null&&confirmed.equalsIgnoreCase("N")){
 				
 				 errString = itmDBAccessEJB.getErrorString("","VTBUDACCNC",chgUser);
 				 return errString;
@@ -101,11 +106,21 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 					budgetGrpCode = rs.getString(1);
 					budgetAmt =  rs.getFloat(2);
 				 }
+				 
 				 if(budgetGrpCode!=null)
 					 budgetGrpCode = budgetGrpCode.trim();
 				 
 				 System.out.println("\n budgetGrpCode "+budgetGrpCode+"\t budgetAmt : "+budgetAmt);
 				 
+				 /*StringBuffer prefix = new StringBuffer();
+				 int zeros = 10 - budgetGrpCode.length();
+				 
+				 for(int j=1;j<=zeros;j++){
+					 prefix.append("0");
+				 }
+				 
+				 budgetGrpCode = prefix.toString()+budgetGrpCode;*/
+				 
 				 this.closeResources(pstmt, rs);
 				 sql = null;
 				 
@@ -132,6 +147,14 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 				 
 				 System.out.println("\n acctPrd "+acctPrd+"  prdCode : "+prdCode+"  finEntity: "+finEntity+"  siteCode : "+siteCode+"  fromDate: "+fromDate+"  todate: "+todate);
 				 
+				 if(acctPrd==null||prdCode==null||finEntity==null||siteCode==null||fromDate==null||todate==null){
+					 
+					 //Error : Required data not found from budgets
+					 errString = itmDBAccessEJB.getErrorString("","VTBUDINFNF",chgUser);
+					 return errString;
+					 
+				 }
+				 
 				 if(finEntity!=null)
 					 finEntity = finEntity.trim();
 				 
@@ -163,16 +186,6 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 				 this.closeResources(pstmt, rs);
 				 sql = null;
 				 
-				 // if condition to check whether budget accounting already generated for selected budget id
-				 
-				 if(cnt>0){
-					 
-					 // Error : Account already generated for selected budget ID
-					 errString = itmDBAccessEJB.getErrorString("","VTBUACEXST",chgUser);
-					 return errString;
-					 
-				 }else if(cnt==0){		// Code will insert budget accounting details in acctbudget table	
-					 
 					 Calendar currentDate = Calendar.getInstance();
 					 SimpleDateFormat simpleDateFormatObj = new SimpleDateFormat(genericUtility.getApplDateFormat());
 					 String systemDate = simpleDateFormatObj.format(currentDate.getTime());
@@ -199,6 +212,31 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 						 return errString;
 						 
 					 }else{
+						 
+						 // Code to check allocation percentage for a budget group code is 100 or not. If it is other than 100 system will give error
+					 	
+					 	 sql = "select sum(alloc_perc) from bud_group_det where bud_group_code = ?";
+					 	 pstmt = conn.prepareStatement(sql);
+						 pstmt.setString(1,budgetGrpCode);
+						 rs = pstmt.executeQuery();
+						
+						 int sumAllocPerc = 0;
+						 
+						 if(rs.next()){
+							 
+							 sumAllocPerc = rs.getInt(1);
+						 }
+						 
+						 if(sumAllocPerc!=100){
+
+							//Error : Allocation percentage for budget group code is not 100
+							errString = itmDBAccessEJB.getErrorString("","VTACPERERR",chgUser);
+							return errString;
+							 
+						 }
+						 this.closeResources(pstmt, rs);
+						 
+						 
 						 sql = "select dept_code, anal_code, cctr_code, alloc_perc, acct_code from bud_group_det where bud_group_code = ?";
 						 
 						 pstmt = conn.prepareStatement(sql);
@@ -207,9 +245,13 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 						 
 						 Float final_budget_amt = 0.00f;
 						 
-							 
 						 String sqlCurrCode = null;
 						 String currCode = null;
+						 
+						 conn.setAutoCommit(false);
+						 
+						 int cntExist = 0;
+						 
 						 while(rs.next()){
 						 
 							deptCode = rs.getString(1);
@@ -221,6 +263,17 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 							if(acctCode!=null)
 								acctCode = acctCode.trim();
 							
+							if(deptCode!=null)
+								deptCode = deptCode.trim();
+							
+							if(deptCode==null||analCode==null||cctrCode==null||acctCode==null){
+								 
+								//Error : Required data not found from budget group details
+								errString = itmDBAccessEJB.getErrorString("","VTBUDGRPNF",chgUser);
+								return errString;
+								 
+							 }
+							
 							sqlCurrCode = "select curr_code from accounts where acct_code= ?";
 							psStmtCCode = conn.prepareStatement(sqlCurrCode);
 							psStmtCCode.setString(1,acctCode);
@@ -228,13 +281,65 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 							rsCCode = psStmtCCode.executeQuery();
 							
 							if(rsCCode.next()){
-									currCode = rs.getString(1);
+								currCode = rsCCode.getString(1);
 							}
+							if(currCode!=null)
+								currCode = currCode.trim();
 							
 							System.out.println("\n deptCode: "+deptCode+"  analCode : "+analCode+"  cctrCode: "+cctrCode+"  allocPerc : "+allocPerc+"  acctCode: "+acctCode+"  currCode: "+currCode);
 							
 							this.closeResources(psStmtCCode, rsCCode);
 							
+							/*
+							 *    Code to check budget account already generated for given budget group code, budget_id,
+							 *    fin_entity,acct_code,cctr_code,anal_code,from_date,dept_code
+							 */
+							
+							this.closeResources(pstmt, rs);
+							
+							 sql =" select count(*) from acctbudget "+ 
+									 "where bud_group_code = ? "+
+									 "and budget_id = ? "+
+									 "and fin_entity = ? "+
+							 		 "and acct_code = ? "+
+							 		 "and cctr_code = ? "+
+							 		 "and anal_code = ? "+
+							 		 "and from_date= ? "+
+							 		 "and dept_code = ? ";
+							 
+							 pstmt = conn.prepareStatement(sql);
+							 pstmt.setString(1,budgetGrpCode);
+							 pstmt.setString(2,budgetId);
+							 pstmt.setString(3,finEntity);
+							 pstmt.setString(4,acctCode);
+							 pstmt.setString(5,cctrCode);
+							 pstmt.setString(6,analCode);
+							 pstmt.setDate(7,(java.sql.Date)fromDate);
+							 pstmt.setString(8,deptCode);
+
+							 rs = pstmt.executeQuery();
+							 
+							 if(rs.next())
+							 {
+								 cntExist = rs.getInt(1);
+							 }
+							 System.out.println("\n cntExist acct budget : "+cntExist);
+							 
+							 
+							 this.closeResources(pstmt, rs);
+							 sql = null;
+							 
+							 if(cntExist>0){
+								 
+								 // Error : Account already generated for selected budget group code, budget_id,
+								 //         fin_entity,acct_code,cctr_code,anal_code,from_date,dept_code
+								 
+								 errString = itmDBAccessEJB.getErrorString("","VTBUACEXST",chgUser);
+								 return errString;
+								 
+							 }
+							
+							//---------------------------------------------------------------------------
 							final_budget_amt = (budgetAmt * allocPerc)/100;
 							
 							System.out.println("\n final_budget_amt = (budgetAmt * allocPerc)/100");
@@ -268,21 +373,26 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 							pstmtInsert.setString(18,budgetGrpCode);
 							
 							System.out.println("sqlInsert ------>>: "+sqlInsert);
-								conn.setAutoCommit(false);
 							
-								int count = pstmtInsert.executeUpdate();
-								if(count > 0)					
-									conn.commit();						
+							int rowInserted = pstmtInsert.executeUpdate();
+							/*if(rowInserted > 0)					
+								conn.commit();	*/					
 							
-								System.out.println(count + " row(s) inserted in ACCTBUDGET table.");
+							System.out.println(rowInserted + " row(s) inserted in ACCTBUDGET table.");
 							sqlInsert = null;
 							
+							if(pstmtInsert!=null){
+								pstmtInsert.close();
+								pstmtInsert=null;
+							}
+							
+						 }			// while loop end
+						 conn.commit();
+						 System.out.println("Committed...");
 						 errString = itmDBAccessEJB.getErrorString("","VTBUDACSUC",chgUser);
 						 return errString;
-								
-							 }
 					  }				// End of else
-				 }
+				 
 			 }
              
 		}