Coaching Summary Changes

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

webitm-dashboard/ibase/dashboard/sfa/ejb/CoachingSummaryEJB.java

@@ -93,7 +93,8 @@ public class CoachingSummaryEJB extends ValidatorEJB implements CoachingSummaryE
 			System.out.println("symbol is:"+symbol);
 			
 			query=	
-					"SELECT " + 
+					"select a.tran_id,a.from_date,a.to_date,a.regional_manager_code,a.regional_manager_name,a.assessor,a.assessor_name,a.assessee,a.assessee_name, " + 
+					"a.spec_details,a.eval_value,a.eval_date from(SELECT csd_eval.tran_id,csd_eval.from_date,csd_eval.to_date, " + 
 					"(CASE WHEN regionalMgr.emp_code IS NULL THEN 'VACANT' ELSE  regionalMgr.emp_code END)  AS regional_manager_code, " + 
 					"(CASE WHEN regionalMgr.emp_fname "+symbol+" regionalMgr.emp_lname IS NULL THEN 'VACANT' ELSE  regionalMgr.emp_fname "+symbol+" regionalMgr.emp_lname END)AS regional_manager_name, " + 
 					"empManger.emp_code assessor, " + 
@@ -135,7 +136,7 @@ public class CoachingSummaryEJB extends ValidatorEJB implements CoachingSummaryE
 					"AND config.survey_id      = '"+surveyId+"' " + 
 					"AND csd_eval.eval_date BETWEEN ? AND ? " + 
 					"UNION ALL " + 
-					"SELECT " + 
+					"SELECT csd_eval.tran_id,csd_eval.from_date,csd_eval.to_date, " + 
 					"(CASE WHEN regionalMgr.emp_code IS NULL THEN 'VACANT' ELSE  regionalMgr.emp_code END)  AS regional_manager_code, " + 
 					"(CASE WHEN regionalMgr.emp_fname "+symbol+"regionalMgr.emp_lname IS NULL THEN 'VACANT' ELSE  regionalMgr.emp_fname "+symbol+" regionalMgr.emp_lname END)AS regional_manager_name, " + 
 					"empManger.emp_code assessor, " + 
@@ -176,7 +177,7 @@ public class CoachingSummaryEJB extends ValidatorEJB implements CoachingSummaryE
 					"AND config.survey_id      = '"+surveyId+"' " + 
 					"AND csd_eval.eval_date BETWEEN ? AND ? " +
 					"UNION ALL "+
-					"SELECT " + 
+					"SELECT csd_eval.tran_id,csd_eval.from_date,csd_eval.to_date, " + 
 					"(CASE WHEN regionalMgr.emp_code IS NULL THEN 'VACANT' ELSE  regionalMgr.emp_code END)  AS regional_manager_code, " + 
 					"(CASE WHEN regionalMgr.emp_fname "+symbol+" regionalMgr.emp_lname IS NULL THEN 'VACANT' ELSE  regionalMgr.emp_fname "+symbol+" regionalMgr.emp_lname END)AS regional_manager_name, " + 
 					"empManger.emp_code assessor, " + 
@@ -197,7 +198,7 @@ public class CoachingSummaryEJB extends ValidatorEJB implements CoachingSummaryE
 					"WHERE " + 
 					"emp.emp_code IN "+getFormattedUserId(teamArgs)+" " + 
 					"AND csd_eval.tran_id__ref  = '"+surveyId+"' " + 
-					"AND csd_eval.eval_date BETWEEN ? AND ? ";
+					"AND csd_eval.eval_date BETWEEN ? AND ? )a order by a.tran_id,a.assessee,a.spec_details ";
 			
 			mStatement = mConnection.prepareStatement(query);
 			mStatement.setDate(1, java.sql.Date.valueOf(fromDate) );
@@ -236,7 +237,9 @@ public class CoachingSummaryEJB extends ValidatorEJB implements CoachingSummaryE
 			      rowDataVar.put("SPEC_DETAILS", E12GenericUtility.checkNull(mResultSet.getString("spec_details")));
 			      rowDataVar.put("EVAL_VALUE", E12GenericUtility.checkNull(mResultSet.getString("eval_value")));
 			      rowDataVar.put("EVAL_DATE",  e12genericUtil.getValidDateString( E12GenericUtility.checkNull(mResultSet.getDate("eval_date").toString()), e12genericUtil.getDBDateFormat(), e12genericUtil.getApplDateFormat()) );
-			      
+			      rowDataVar.put("EVAL_DATE_FROM_DATE",  e12genericUtil.getValidDateString( E12GenericUtility.checkNull(mResultSet.getDate("from_date").toString()), e12genericUtil.getDBDateFormat(), e12genericUtil.getApplDateFormat()) );
+			      rowDataVar.put("EVAL_DATE_TO_DATE",  e12genericUtil.getValidDateString( E12GenericUtility.checkNull(mResultSet.getDate("to_date").toString()), e12genericUtil.getDBDateFormat(), e12genericUtil.getApplDateFormat()) );
+
 			     
 			      returnJsonArr.add(rowDataVar);
 			      System.out.println("returnJsonArr is:["+returnJsonArr+"]");