Adding assesment tree structure and graph structure seervlet

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

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

@@ -286,6 +286,7 @@ public class AssessMentEJB extends ValidatorEJB implements AssessMentEJBLocal,As
 		    String query = "";
 		    double resultAvg=0.0;
 		    String drAvgMain ="";
+		    String avg="";
 			query=	
 					"SELECT rp.entity_code,rp.entity_descr,"+
 					"SUM(CASE WHEN ((RESULT NOT LIKE '%[A-Z]%') OR (RESULT NOT LIKE '%[a-z]%')) "+ 
@@ -335,13 +336,15 @@ public class AssessMentEJB extends ValidatorEJB implements AssessMentEJBLocal,As
 					else
 					{
 						drAvgMain = Double.toString(resultAvg);
+						float chemAvgf = Float.parseFloat(drAvgMain);
+						avg = String.format("%.02f", chemAvgf);
 					}
 			  	}
 			      System.out.println("resultAvg is:"+drAvgMain);
 
 			      rowDataVar.put("ENTITY_CODE", entityCode);
 			      rowDataVar.put("ENTITY_DESCR", entityDescr);
-			      rowDataVar.put("RESULT_AVG",  drAvgMain);
+			      rowDataVar.put("RESULT_AVG",  avg);
 
 			      returnJsonArr.add(rowDataVar);
 			      System.out.println("returnJsonArr is:["+returnJsonArr+"]");

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

@@ -67,15 +67,17 @@ public class CoachingSummaryEJB extends ValidatorEJB implements CoachingSummaryE
 		    toDate = e12genericUtil.getValidDateString(toDate, e12genericUtil.getApplDateFormat(), e12genericUtil.getDBDateFormat());
 		    System.out.println("fromDateStr["+fromDate+"] toDateStr["+toDate+"]");
 			String query = ""; //$NON-NLS-1$
-			String symbol="";
+			String symbol="" ,employee="";
 			if("MSSQL".equalsIgnoreCase(CommonConstants.DB_NAME))
 			{
 				symbol="+' '+";
+				employee = "csd_eval.emp_code__eval = emp.emp_code";
 				
 			}
 			else
 			{
 				symbol="||' '||";
+				employee= "trim(csd_eval.emp_code__eval) = trim(emp.emp_code)";
 			}
 			
 			System.out.println("symbol is:"+symbol);
@@ -113,7 +115,7 @@ public class CoachingSummaryEJB extends ValidatorEJB implements CoachingSummaryE
 					"ON " + 
 					"empManger.report_to=regionalMgr.emp_code " + 
 					"WHERE " + 
-					"csd_eval.emp_code__eval = emp.emp_code " + 
+					""+employee+" " + 
 					"AND spec_table.appr_tblno = eval_type.table_eval " + 
 					"AND template.survey_templ = config.survey_templ " + 
 					"AND template.eval_type    = eval_type.eval_type " + 
@@ -154,7 +156,7 @@ public class CoachingSummaryEJB extends ValidatorEJB implements CoachingSummaryE
 					"ON " + 
 					"empManger.report_to=regionalMgr.emp_code " + 
 					"WHERE " + 
-					"csd_eval.emp_code__eval = emp.emp_code " + 
+					""+employee+" " + 
 					"AND spec_table.appr_tblno = eval_type.table_kra " + 
 					"AND template.survey_templ = config.survey_templ " + 
 					"AND template.eval_type    = eval_type.eval_type " + 
@@ -166,14 +168,14 @@ public class CoachingSummaryEJB extends ValidatorEJB implements CoachingSummaryE
 					"(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, " + 
-					"empManger.emp_fname + "+symbol+" +empManger.emp_lname AS assessor_name, " + 
+					"empManger.emp_fname "+symbol+" empManger.emp_lname AS assessor_name, " + 
 					"csd_eval.emp_code__eval AS assessee, " + 
 					"emp.emp_fname "+symbol+" emp.emp_lname AS assessee_name, " + 
 					"'Remarks' as spec_details, " + 
 					"csd_eval.remarks as eval_value, " + 
 					"csd_eval.eval_date " + 
 					"FROM " + 
-					"csd_eval csd_eval LEFT OUTER JOIN employee emp on csd_eval.emp_code__eval = emp.emp_code " + 
+					"csd_eval csd_eval LEFT OUTER JOIN employee emp on "+employee+" " + 
 					"LEFT OUTER JOIN employee empManger " + 
 					"ON " + 
 					"emp.report_to=empManger.emp_code " +