Added new methods for task wise escore and time date wise graph

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

webitm-dashboard/ibase/dashboard/epa/ejb/EmpProductivity.java

@@ -163,7 +163,7 @@ private String checkNull(String str)
 * EJB Name           : EmpProductivity.java
 * Method Name        : getTopTimeAnalysisServlet(String,String,String,String,String,String)
 * Servlet Name       : TopTimeAnalysisServlet
-* Metadata xml Name  : efftimeanalysis.xml,timedistribution.xml
+* Metadata xml Name  : efftimeanalysis.xml
 * 
 * */
 @SuppressWarnings("unchecked")
@@ -214,51 +214,18 @@ public JSONObject getTopTimeAnalysisServlet(String dataSourceName,String frmPrd,
 			   topNosFilter = " AND D.RANK<="+topNos;
 		   }
    
-
-    	 /*	sql=" SELECT A.EMP_CODE,A.EMP_NAME,A.JOBID,A.SERVERT,A.OHT,A.JOBT,A.TOT_TIME,A.tot_time_min, "
-				+" dense_rank () OVER (ORDER BY (A.tot_time_min) asc) AS RANK  "
-				+" FROM (  "
-				+" select b.emp_code,b.EMP_NAME ,(b.jobid) jobid,trunc((b.servert/b.jobid),2) as servert,   "
-				+" trunc((b.oht/b.jobid),2) as oht,trunc((b.jobt/b.jobid),2) as jobt,trunc((b.tot_time/b.jobid),2) tot_time,  "
-				+" trunc((b.tot_time_min/b.jobid),2) as tot_time_min  "
-				+" from	( "
-				+" select a.EMP_CODE,a.EMP_NAME  ,  "
-				+" sum(a.jobid) jobid,sum(a.servert) servert,sum(a.oht) oht,  "
-				+" sum (a.jobt) jobt, sum(a.TOT_TIME) TOT_TIME ,sum(a.tot_time_min) tot_time_min  " 
-				+" from( "
-				+" select EMPLOYEE.EMP_CODE as emp_code,TBLEPA_DAYSCORE.WINNAME ,  "
-				+" (CASE WHEN Employee.emp_fname IS NULL THEN '' ELSE  "
-				+" TRIM(Employee.emp_fname) || ' ' END) || (CASE WHEN employee.emp_mname  IS  NULL  THEN ''  "
-				+" ELSE TRIM(Employee.emp_mname) || ' ' END) || (case when EMPLOYEE.EMP_LNAME  is  null  then '' else  "
-				+" TRIM(EMPLOYEE.EMP_LNAME) || ' ' end) as EMP_NAME ,	count(distinct tblEPA_dayScore.jobid)  jobid,  "
-				+" trunc((nvl(sum(tblEPA_dayScore.servert),0)/60),2) as servert,trunc((nvl(sum(tblEPA_dayScore.oh),0)/60),2) as oht,  "
-				+" trunc(	 (nvl(sum(tblEPA_dayScore.jobt),0)/60),2) as jobt,  "
-				+" trunc((nvl(sum(tblEPA_dayScore.servert),0)+nvl(sum(tblEPA_dayScore.oh),0)+nvl(sum(tblEPA_dayScore.jobt),0) ),2)  as tot_time,  "
-				+" trunc( (((nvl(sum(tblEPA_dayScore.servert),0)+nvl(sum(tblEPA_dayScore.oh),0)+nvl(sum(tblEPA_dayScore.jobt),0) ))/60),2) as tot_time_min  "
-				+" from TBLEPA_DAYSCORE,EMPLOYEE,  USERS ,transetup where trim(tblEPA_dayScore.userid) =trim(USERS.CODE)  "
-				+" and  USERS.entity_code = EMPLOYEE.EMP_CODE	 "
-				+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('" +frmPrd + "','dd/mm/yy')  "
-				+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('" +toPrd + "','dd/mm/yy')  "
-				+" and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) "
-				+" and transetup.function_type='"+functionType+"'  "
-				+" and USERS.usage_intensity='"+usageIntensity+"'" +empTaskFilter+empCodeFilter +deptCodeFilter 
-				+" and tblEPA_dayScore.jobid !='NA' and tblEPA_dayScore.ACtCode!='VIEW'  "
-				+" group by tblEPA_dayScore.userid,TBLEPA_DAYSCORE.WINNAME,EMPLOYEE.EMP_CODE,employee.emp_fname ,  "
-				+" employee.emp_mname,employee.emp_lname  "
-				+" ) a group by a.EMP_CODE,a.EMP_NAME "
-				+" ) B  "
-				+" )  A  where A.tot_time_min>0.04	 "+topNosFilter+" order by RANK  "; */
-    	   
-    	   sql=" select D.emp_code,D.emp_name,D.JOBID,D.servert,D.oht,D.jobt,D.tot_time_min,D.RANK from (" +
-    	   		"select c.emp_code,c.emp_name,c.JOBID,c.servert,c.oht,c.jobt,c.tot_time_min, "
+    	   sql="select D.emp_code,D.emp_name,D.JOBID,D.servert,D.oht,D.jobt,D.tot_time_min,D.RANK from ( "
+				+" select c.emp_code,c.emp_name,c.JOBID,c.servert,c.oht,c.jobt,c.tot_time_min, " 
 				+" dense_rank () OVER (ORDER BY (c.tot_time_min) asc) AS RANK " 
 				+" from( " 
 				+" select b.emp_code,b.emp_name,sum(b.jobid) jobid,TRUNC(AVG(b.servert/60),2) servert , " 
 				+" TRUNC(AVG(b.oht/60),2) OHT ,TRUNC(AVG(b.jobt/60),2) JOBT, TRUNC((AVG(B.OHT)/60+AVG(b.servert)/60+AVG(b.jobt)/60),2) tot_time_min, " 
 				+" AVG(b.noatt) noatt,AVG(b.success) success, AVG(b.fail) fail " 
 				+" from ( "
-    			   +" select A.EMP_CODE,A.LOGDATE,  "
-    			   +" A.EMP_NAME,count(a.jobid) jobid,trunc(AVG(A.SERVERT),2) SERVERT,trunc(AVG(A.OHT),2) OHT,trunc(AVG(JOBT),2) JOBT , "
+				//+" select w.EMP_CODE,w.WINNAME ,w.EMP_NAME,sum(w.jobid) jobid,trunc(AVG(w.SERVERT),2) SERVERT,trunc(AVG(w.OHT),2) OHT,trunc(AVG(w.JOBT),2) JOBT , " 
+				//+" trunc(AVG(w.noatt),2) noatt,trunc(AVG(w.success),2) success,trunc(AVG(w.fail),2) fail from ( " 
+				+" select A.EMP_CODE,A.LOGDATE,  a.WINNAME , "
+				+" A.EMP_NAME,count(a.jobid) jobid,trunc(AVG(A.SERVERT),2) SERVERT,trunc(AVG(A.OHT),2) OHT,trunc(AVG(a.JOBT),2) JOBT , " 
 				+" trunc(AVG(a.noatt),2) noatt,trunc(AVG(a.success),2) success,trunc(AVG(a.fail),2) fail " 
 				+" from( " 
 				+" select distinct tblEPA_dayScore.jobid  jobid,TBLEPA_DAYSCORE.LOGDATE,EMPLOYEE.EMP_CODE as emp_code,TBLEPA_DAYSCORE.WINNAME , "   
@@ -277,14 +244,15 @@ public JSONObject getTopTimeAnalysisServlet(String dataSourceName,String frmPrd,
 				+" 	and  USERS.entity_code = EMPLOYEE.EMP_CODE "	  
 				+" 	and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('" +frmPrd + "','dd/mm/yy') "  
 				+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('" +toPrd + "','dd/mm/yy') "   
-    			   +" and transetup.function_type='"+functionType+"'  and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) " 
-    			   +"  and USERS.usage_intensity='"+usageIntensity+"'" +empTaskFilter+empCodeFilter +deptCodeFilter 
+				+" and transetup.function_type='"+functionType+"' "  
+				+" and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) " 
+				+" and USERS.usage_intensity='"+usageIntensity+"' " +empTaskFilter+empCodeFilter +deptCodeFilter
 				+" and tblEPA_dayScore.jobid !='NA' and tblEPA_dayScore.ACtCode!='VIEW'  "
 				+" group by TBLEPA_DAYSCORE.logdate,tblEPA_dayScore.jobid, EMPLOYEE.EMP_CODE,TBLEPA_DAYSCORE.WINNAME, " 
 				+" Employee.emp_mname,Employee.emp_lname,Employee.emp_fname "
-    			   +" )a  GROUP BY A.LOGDATE,A.EMP_CODE, A.EMP_NAME "
-    			   +" )b GROUP BY b.emp_code,b.emp_name "
-    			   +" ) C ) D where D.tot_time_min>0.04  "+topNosFilter+" order by D.RANK asc ";
+				+" )a  GROUP BY A.LOGDATE,A.EMP_CODE, A.EMP_NAME ,a.winname " 
+				//")W  group by  w.EMP_CODE,w.WINNAME ,w.EMP_NAME "
+				+" )b GROUP BY b.emp_code,b.emp_name) C) D where D.tot_time_min>0.04 "+topNosFilter+" order by D.RANK asc ";
     	   
     	   pstmt = conn.prepareStatement(sql);
 		   rs = pstmt.executeQuery();
@@ -329,11 +297,11 @@ public JSONObject getTopTimeAnalysisServlet(String dataSourceName,String frmPrd,
 }
 /********** End of method getTopTimeAnalysisServlet()  ******/
 	
-/********** Start of method for Top Time Analysis 
+/********** Start of method for Worst Time Analysis 
 * EJB Name           : EmpProductivity.java
 * Method Name        : getWorstTimeAnalysisServlet(String,String,String,String,String,String)
 * Servlet Name       : WorstTimeAnalysisServlet
-* Metadata xml Name  : efftimeanalysis.xml,timedistribution.xml
+* Metadata xml Name  : efftimeanalysis.xml
 * 
 * */
 @SuppressWarnings("unchecked")
@@ -384,50 +352,19 @@ public JSONObject getWorstTimeAnalysisServlet(String dataSourceName,String frmPr
 			   topNosFilter = " AND D.RANK<="+topNos;
 		   }
     	  
-    	  	/*   sql=" SELECT A.EMP_CODE,A.EMP_NAME,A.JOBID,A.SERVERT,A.OHT,A.JOBT,A.TOT_TIME,A.tot_time_min, "
-				+" rank () OVER (ORDER BY (A.tot_time_min) desc) AS RANK  "
-				+" FROM (  "
-				+" select b.emp_code,b.EMP_NAME ,(b.jobid) jobid,trunc((b.servert/b.jobid),2) as servert,   "
-				+" trunc((b.oht/b.jobid),2) as oht,trunc((b.jobt/b.jobid),2) as jobt,trunc((b.tot_time/b.jobid),2) tot_time,  "
-				+" trunc((b.tot_time_min/b.jobid),2) as tot_time_min  "
-				+" from	( "
-				+" select a.EMP_CODE,a.EMP_NAME  ,  "
-				+" sum(a.jobid) jobid,sum(a.servert) servert,sum(a.oht) oht,  "
-				+" sum (a.jobt) jobt, sum(a.TOT_TIME) TOT_TIME ,sum(a.tot_time_min) tot_time_min  " 
-				+" from( "
-				+" select EMPLOYEE.EMP_CODE as emp_code,TBLEPA_DAYSCORE.WINNAME ,  "
-				+" (CASE WHEN Employee.emp_fname IS NULL THEN '' ELSE  "
-				+" TRIM(Employee.emp_fname) || ' ' END) || (CASE WHEN employee.emp_mname  IS  NULL  THEN ''  "
-				+" ELSE TRIM(Employee.emp_mname) || ' ' END) || (case when EMPLOYEE.EMP_LNAME  is  null  then '' else  "
-				+" TRIM(EMPLOYEE.EMP_LNAME) || ' ' end) as EMP_NAME ,	count(distinct tblEPA_dayScore.jobid)  jobid,  "
-				+" trunc((nvl(sum(tblEPA_dayScore.servert),0)/60),2) as servert,trunc((nvl(sum(tblEPA_dayScore.oh),0)/60),2) as oht,  "
-				+" trunc(	 (nvl(sum(tblEPA_dayScore.jobt),0)/60),2) as jobt,  "
-				+" trunc((nvl(sum(tblEPA_dayScore.servert),0)+nvl(sum(tblEPA_dayScore.oh),0)+nvl(sum(tblEPA_dayScore.jobt),0) ),2)  as tot_time,  "
-				+" trunc( (((nvl(sum(tblEPA_dayScore.servert),0)+nvl(sum(tblEPA_dayScore.oh),0)+nvl(sum(tblEPA_dayScore.jobt),0) ))/60),2) as tot_time_min  "
-				+" from TBLEPA_DAYSCORE,EMPLOYEE,  USERS ,transetup where trim(tblEPA_dayScore.userid) =trim(USERS.CODE)  "
-				+" and  USERS.entity_code = EMPLOYEE.EMP_CODE	 "
-				+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('" +frmPrd + "','dd/mm/yy')  "
-				+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('" +toPrd + "','dd/mm/yy')  "
-				+" and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) "
-				+" and transetup.function_type='"+functionType+"'  "
-				+" and USERS.usage_intensity='"+usageIntensity+"'" +empTaskFilter+empCodeFilter +deptCodeFilter 
-				+" and tblEPA_dayScore.jobid !='NA' and tblEPA_dayScore.ACtCode!='VIEW'  "
-				+" group by tblEPA_dayScore.userid,TBLEPA_DAYSCORE.WINNAME,EMPLOYEE.EMP_CODE,employee.emp_fname ,  "
-				+" employee.emp_mname,employee.emp_lname  "
-				+" ) a group by a.EMP_CODE,a.EMP_NAME "
-				+" ) B  "
-				+" )  A  where A.tot_time_min>0.04	 "+topNosFilter+" order by RANK  ";*/
-      	   
-    	   sql=" select D.emp_code,D.emp_name,D.JOBID,D.servert,D.oht,D.jobt,D.tot_time_min,D.RANK from ( " +
-    	   		"select c.emp_code,c.emp_name,c.JOBID,c.servert,c.oht,c.jobt,c.tot_time_min, "
+    	  	      	   
+    	   sql="select D.emp_code,D.emp_name,D.JOBID,D.servert,D.oht,D.jobt,D.tot_time_min,D.RANK from ( "
+   				+" select c.emp_code,c.emp_name,c.JOBID,c.servert,c.oht,c.jobt,c.tot_time_min, " 
    				+" dense_rank () OVER (ORDER BY (c.tot_time_min) desc) AS RANK " 
    				+" from( " 
    				+" select b.emp_code,b.emp_name,sum(b.jobid) jobid,TRUNC(AVG(b.servert/60),2) servert , " 
    				+" TRUNC(AVG(b.oht/60),2) OHT ,TRUNC(AVG(b.jobt/60),2) JOBT, TRUNC((AVG(B.OHT)/60+AVG(b.servert)/60+AVG(b.jobt)/60),2) tot_time_min, " 
    				+" AVG(b.noatt) noatt,AVG(b.success) success, AVG(b.fail) fail " 
    				+" from ( "
-    			   +" select A.EMP_CODE,A.LOGDATE,  "
-    			   +" A.EMP_NAME,count(a.jobid) jobid,trunc(AVG(A.SERVERT),2) SERVERT,trunc(AVG(A.OHT),2) OHT,trunc(AVG(JOBT),2) JOBT , "
+   				//+" select w.EMP_CODE,w.WINNAME ,w.EMP_NAME,sum(w.jobid) jobid,trunc(AVG(w.SERVERT),2) SERVERT,trunc(AVG(w.OHT),2) OHT,trunc(AVG(w.JOBT),2) JOBT , " 
+   				//+" trunc(AVG(w.noatt),2) noatt,trunc(AVG(w.success),2) success,trunc(AVG(w.fail),2) fail from ( " 
+   				+" select A.EMP_CODE,A.LOGDATE,  a.WINNAME , "
+   				+" A.EMP_NAME,count(a.jobid) jobid,trunc(AVG(A.SERVERT),2) SERVERT,trunc(AVG(A.OHT),2) OHT,trunc(AVG(a.JOBT),2) JOBT , " 
    				+" trunc(AVG(a.noatt),2) noatt,trunc(AVG(a.success),2) success,trunc(AVG(a.fail),2) fail " 
    				+" from( " 
    				+" select distinct tblEPA_dayScore.jobid  jobid,TBLEPA_DAYSCORE.LOGDATE,EMPLOYEE.EMP_CODE as emp_code,TBLEPA_DAYSCORE.WINNAME , "   
@@ -446,14 +383,15 @@ public JSONObject getWorstTimeAnalysisServlet(String dataSourceName,String frmPr
    				+" 	and  USERS.entity_code = EMPLOYEE.EMP_CODE "	  
    				+" 	and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('" +frmPrd + "','dd/mm/yy') "  
    				+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('" +toPrd + "','dd/mm/yy') "   
-    			   +" and transetup.function_type='"+functionType+"'  and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) " 
-    			   +"  and USERS.usage_intensity='"+usageIntensity+"'" +empTaskFilter+empCodeFilter +deptCodeFilter 
+   				+" and transetup.function_type='"+functionType+"' "  
+   				+" and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) " 
+   				+" and USERS.usage_intensity='"+usageIntensity+"' " +empTaskFilter+empCodeFilter +deptCodeFilter
    				+" and tblEPA_dayScore.jobid !='NA' and tblEPA_dayScore.ACtCode!='VIEW'  "
    				+" group by TBLEPA_DAYSCORE.logdate,tblEPA_dayScore.jobid, EMPLOYEE.EMP_CODE,TBLEPA_DAYSCORE.WINNAME, " 
    				+" Employee.emp_mname,Employee.emp_lname,Employee.emp_fname "
-    			   +" )a  GROUP BY A.LOGDATE,A.EMP_CODE, A.EMP_NAME "
-    			   +" )b GROUP BY b.emp_code,b.emp_name "
-    			   +" ) C )D where D.tot_time_min>0.04  "+topNosFilter+" order by D.RANK asc ";
+   				+" )a  GROUP BY A.LOGDATE,A.EMP_CODE, A.EMP_NAME ,a.winname " 
+   				//")W  group by  w.EMP_CODE,w.WINNAME ,w.EMP_NAME "
+   				+" )b GROUP BY b.emp_code,b.emp_name) C) D where D.tot_time_min>0.04 "+topNosFilter+" order by D.RANK asc ";
 			    	   
 				   
     	   pstmt = conn.prepareStatement(sql);
@@ -503,7 +441,7 @@ public JSONObject getWorstTimeAnalysisServlet(String dataSourceName,String frmPr
 * EJB Name           : EmpProductivity.java
 * Method Name        : getTopEfficiencyAnalysisServlet
 * Servlet Name       : TopEfficiencyAnalysisServlet
-* Metadata xml Name  : efftimeanalysis.xml,escoredistribution.xml
+* Metadata xml Name  : efftimeanalysis.xml
 * 
 * */
 @SuppressWarnings("unchecked")
@@ -553,30 +491,20 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 			   System.out.println("topNos" + topNos);
 			   topNosFilter = " where D.rank<="+topNos;
 		   }
-    	   /*sql=" select b.emp_code,b.emp_name,b.rn,cast(b.score as decimal(10,2)) as Escore "
-    			   +"  from  (  select a.EMP_CODE,a.emp_name,a.SCORE,  rank() over(order by (a.score)  desc ) as rn  "
-    			   +"  from (         select EMPLOYEE.EMP_CODE as emp_code,(CASE WHEN Employee.emp_fname IS NULL THEN '' ELSE   "
-			+" TRIM(Employee.emp_fname) || ' ' END) ||  "
-			+"  (CASE WHEN employee.emp_mname  IS  NULL  THEN '' ELSE TRIM(Employee.emp_mname) || ' ' END) ||   "
-			+"   (case when EMPLOYEE.EMP_LNAME  is  null  then '' else  TRIM(EMPLOYEE.EMP_LNAME) || ' ' end) as EMP_NAME ,           nvl(  AVG(tblEPA_dayScore.escore) ,0) as score " 
-			+"   from TBLEPA_DAYSCORE,EMPLOYEE,  USERS,transetup     where trim(tblEPA_dayScore.userid) =trim(USERS.CODE)  "
-			+"  AND   USERS.entity_code = EMPLOYEE.EMP_CODE     and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('" +frmPrd + "','dd/mm/yy') "    
-			+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('" + toPrd + "','dd/mm/yy')   and USERS.usage_intensity='"+usageIntensity+"' " 
-			+" and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) "	 
-			+" and transetup.function_type='"+functionType+"' "			
-			 +  empTaskFilter+"   AND  TBLEPA_DAYSCORE.ESCORE > 0 "   +empCodeFilter +deptCodeFilter
-			+"  group by EMPLOYEE.EMP_CODE,employee.emp_fname ,employee.emp_mname,employee.emp_lname  ) a  )   B " + topNosFilter +"  order by RN ";
-    	  */
-    	   sql=" select d.emp_code,d.emp_name,d.JOBID, d.escore,d.rank from ( " +
-    	   		"select c.emp_code,c.emp_name,c.JOBID, c.escore,  "
+    	 
+    	   sql="select d.emp_code,d.emp_name,d.JOBID, d.escore,d.rank " 
+				+" from ( " 
+				+" select c.emp_code,c.emp_name,c.JOBID, c.escore, "  
 				+" dense_rank () OVER (ORDER BY (c.escore) desc) AS RANK "  
 				+" from( "  
 				+" select b.emp_code,b.emp_name,sum(b.jobid) jobid,trunc(AVG(b.escore),2) escore "  
 				+" from ( " 
+				//+" select w.emp_code,w.emp_name,w.winname,sum(w.jobid) jobid,trunc(AVG(w.escore),2) escore "
+				//+" from ( " 
 				+" select A.EMP_CODE,A.LOGDATE, "   
-				+" A.EMP_NAME,count(a.jobid) jobid ,trunc(AVG(a.escore),2) escore  "
+				+" A.EMP_NAME,count(a.jobid) jobid ,trunc(AVG(a.escore),2) escore ,a.WINNAME "
 				+" from( "  
-				+" select  tblEPA_dayScore.jobid  jobid,TBLEPA_DAYSCORE.LOGDATE,EMPLOYEE.EMP_CODE as emp_code, "
+				+" select distinct tblEPA_dayScore.jobid  jobid,TBLEPA_DAYSCORE.LOGDATE,EMPLOYEE.EMP_CODE as emp_code, " 
 				+" TBLEPA_DAYSCORE.WINNAME , "  
 				+" (CASE WHEN Employee.emp_fname IS NULL THEN '' ELSE TRIM(Employee.emp_fname) || ' ' END) || "  
 				+" (CASE WHEN employee.emp_mname  IS  NULL  THEN '' "    
@@ -586,24 +514,26 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 				+" from TBLEPA_DAYSCORE,EMPLOYEE,USERS,transetup "  
 				+" where trim(tblEPA_dayScore.userid) =trim(USERS.CODE) "   
 				+" and  USERS.entity_code = EMPLOYEE.EMP_CODE "
-						+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('" + frmPrd + "','dd/mm/yy')   " 
-						+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('" + toPrd + "','dd/mm/yy')  "  
+				+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('"+frmPrd+"','dd/mm/yy') "   
+				+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('"+toPrd+"','dd/mm/yy') "   
 				+" and transetup.function_type='"+functionType+"' " 
 						+" and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) " 
 						+" and USERS.usage_intensity='"+usageIntensity+"' and tblEPA_dayScore.escore>0 "
-						+empTaskFilter+empCodeFilter +deptCodeFilter
 				+" and tblEPA_dayScore.jobid !='NA' and tblEPA_dayScore.ACtCode!='VIEW' " 
+				+empTaskFilter+empCodeFilter +deptCodeFilter 
 				+" group by TBLEPA_DAYSCORE.logdate,tblEPA_dayScore.jobid, EMPLOYEE.EMP_CODE,TBLEPA_DAYSCORE.WINNAME, " 
 				+" Employee.emp_mname,Employee.emp_lname,Employee.emp_fname "  
-						+" )a  GROUP BY A.LOGDATE,A.EMP_CODE, A.EMP_NAME " 
-						+" )b GROUP BY b.emp_code,b.emp_name ) C )D  " + topNosFilter +"  order by D.rank asc ";
+				+" )a  GROUP BY A.LOGDATE,A.EMP_CODE, A.EMP_NAME ,a.winname "
+				//+" )W GROUP BY w.winname,w.EMP_CODE, w.EMP_NAME "
+				+" )b GROUP BY b.emp_code,b.emp_name)C )D "+topNosFilter+" order by D.rank asc ";
+    	   
     	   pstmt = conn.prepareStatement(sql);
 		   rs = pstmt.executeQuery();
 		   while (rs.next())
 			{
 				rowData = new JSONObject();
 				rowData.put("EMP_CODE",  checkNull(rs.getString("emp_code")));
-				rowData.put("escore", checkNull(rs.getString("escore"))+"@"+checkNull(rs.getString("emp_name")));
+				rowData.put("escore", checkNull(rs.getString("escore"))+"@"+checkNull(rs.getString("emp_name"))+"{br}#Transactions: "+checkNull(rs.getString("JOBID"))+"{br}Avg.E1-Score:");
 				rawEffTimeJson.put(count, rowData);
 				count++;
 			}
@@ -644,7 +574,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 	 * EJB Name           : EmpProductivity.java
 	 * Method Name        : getWorstEfficiencyAnalysisServlet
 	 * Servlet Name       : WorstEfficiencyAnalysisServlet
-	 * Metadata xml Name  : efftimeanalysis.xml,escoredistribution.xml
+	 * Metadata xml Name  : efftimeanalysis.xml
 	 * 
 	 * */
 	@SuppressWarnings("unchecked")
@@ -693,30 +623,21 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
     			   System.out.println("topNos" + topNos);
     			   topNosFilter = " where D.Rank<="+topNos;
     		   }
-        	  /* sql=" select b.emp_code,b.emp_name,b.rn,cast(b.score as decimal(10,2)) as Escore "
-        			   +"  from  (  select a.EMP_CODE,a.emp_name,a.SCORE,  rank() over(order by (a.score)  asc ) as rn  "
-        			   +"  from (         select EMPLOYEE.EMP_CODE as emp_code,(CASE WHEN Employee.emp_fname IS NULL THEN '' ELSE   "
-				+" TRIM(Employee.emp_fname) || ' ' END) ||  "
-				+"  (CASE WHEN employee.emp_mname  IS  NULL  THEN '' ELSE TRIM(Employee.emp_mname) || ' ' END) ||   "
-				+"   (case when EMPLOYEE.EMP_LNAME  is  null  then '' else  TRIM(EMPLOYEE.EMP_LNAME) || ' ' end) as EMP_NAME ,           nvl(  AVG(tblEPA_dayScore.escore) ,0) as score " 
-				+"   from TBLEPA_DAYSCORE,EMPLOYEE,  USERS ,transetup    where trim(tblEPA_dayScore.userid) =trim(USERS.CODE)  "
-				+"  AND   USERS.entity_code = EMPLOYEE.EMP_CODE     and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('" +frmPrd + "','dd/mm/yy') "    
-				+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('" + toPrd + "','dd/mm/yy')   and USERS.usage_intensity='"+usageIntensity+"' " 
-				+" and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) "	
-				+" and transetup.function_type='"+functionType+"' "	
-				 +  empTaskFilter+"   AND  TBLEPA_DAYSCORE.ESCORE > 0 "   +empCodeFilter +deptCodeFilter
-				+"  group by EMPLOYEE.EMP_CODE,employee.emp_fname ,employee.emp_mname,employee.emp_lname  ) a  )   B " + topNosFilter +"  order by RN ";
-        	  */
-        	   sql=" select d.emp_code,d.emp_name,d.JOBID, d.escore,d.rank from ( " +
-        	   		" select c.emp_code,c.emp_name,c.JOBID, c.escore,  "
-       				+" dense_rank () OVER (ORDER BY (c.escore) asc) AS RANK  "
+        	   
+        	   
+        	   sql="select d.emp_code,d.emp_name,d.JOBID, d.escore,d.rank " 
+       				+" from ( " 
+       				+" select c.emp_code,c.emp_name,c.JOBID, c.escore, "  
+       				+" dense_rank () OVER (ORDER BY (c.escore) desc) AS RANK "  
        				+" from( "  
        				+" select b.emp_code,b.emp_name,sum(b.jobid) jobid,trunc(AVG(b.escore),2) escore "  
        				+" from ( " 
+       				//+" select w.emp_code,w.emp_name,w.winname,sum(w.jobid) jobid,trunc(AVG(w.escore),2) escore "
+       				//+" from ( " 
        				+" select A.EMP_CODE,A.LOGDATE, "   
-       				+" A.EMP_NAME,count(a.jobid) jobid ,trunc(AVG(a.escore),2) escore  "
+       				+" A.EMP_NAME,count(a.jobid) jobid ,trunc(AVG(a.escore),2) escore ,a.WINNAME "
        				+" from( "  
-       				+" select  tblEPA_dayScore.jobid  jobid,TBLEPA_DAYSCORE.LOGDATE,EMPLOYEE.EMP_CODE as emp_code, "
+       				+" select distinct tblEPA_dayScore.jobid  jobid,TBLEPA_DAYSCORE.LOGDATE,EMPLOYEE.EMP_CODE as emp_code, " 
        				+" TBLEPA_DAYSCORE.WINNAME , "  
        				+" (CASE WHEN Employee.emp_fname IS NULL THEN '' ELSE TRIM(Employee.emp_fname) || ' ' END) || "  
        				+" (CASE WHEN employee.emp_mname  IS  NULL  THEN '' "    
@@ -726,24 +647,25 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
        				+" from TBLEPA_DAYSCORE,EMPLOYEE,USERS,transetup "  
        				+" where trim(tblEPA_dayScore.userid) =trim(USERS.CODE) "   
        				+" and  USERS.entity_code = EMPLOYEE.EMP_CODE "
-       						+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('" + frmPrd + "','dd/mm/yy')   " 
-       						+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('" + toPrd + "','dd/mm/yy')  "  
+       				+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('"+frmPrd+"','dd/mm/yy') "   
+       				+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('"+toPrd+"','dd/mm/yy') "   
        				+" and transetup.function_type='"+functionType+"' " 
        						+" and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) " 
        						+" and USERS.usage_intensity='"+usageIntensity+"' and tblEPA_dayScore.escore>0 "
-       						+empTaskFilter+empCodeFilter +deptCodeFilter
        				+" and tblEPA_dayScore.jobid !='NA' and tblEPA_dayScore.ACtCode!='VIEW' " 
+       				+empTaskFilter+empCodeFilter +deptCodeFilter 
        				+" group by TBLEPA_DAYSCORE.logdate,tblEPA_dayScore.jobid, EMPLOYEE.EMP_CODE,TBLEPA_DAYSCORE.WINNAME, " 
        				+" Employee.emp_mname,Employee.emp_lname,Employee.emp_fname "  
-       						+" )a  GROUP BY A.LOGDATE,A.EMP_CODE, A.EMP_NAME " 
-       						+" )b GROUP BY b.emp_code,b.emp_name ) C) D  " + topNosFilter +"  order by D.rank asc ";
+       				+" )a  GROUP BY A.LOGDATE,A.EMP_CODE, A.EMP_NAME ,a.winname "
+       				//+" )W GROUP BY w.winname,w.EMP_CODE, w.EMP_NAME "
+       				+" )b GROUP BY b.emp_code,b.emp_name)C )D "+topNosFilter+" order by D.rank asc ";
         	   pstmt = conn.prepareStatement(sql);
   			   rs = pstmt.executeQuery();
 			   while (rs.next())
 				{
 					rowData = new JSONObject();
 					rowData.put("EMP_CODE",  checkNull(rs.getString("emp_code")));					
-					rowData.put("escore", checkNull(rs.getString("escore"))+"@"+checkNull(rs.getString("emp_name")));
+					rowData.put("escore", checkNull(rs.getString("escore"))+"@"+checkNull(rs.getString("emp_name"))+"{br}#Transactions: "+checkNull(rs.getString("JOBID"))+"{br}Avg.E1-Score:");
 					rawEffTimeJson.put(count, rowData);
 					count++;
   				}
@@ -785,7 +707,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 	* EJB Name           : EmpProductivity.java
 	* Method Name        : getTopNumAttemptAnalysisServlet
 	* Servlet Name       : TopNumAttemptAnalysisServlet
-	* Metadata xml Name  : efftimeanalysis.xml,attemptdistribution.xml
+	* Metadata xml Name  : efftimeanalysis.xml
 	* 
 	* */
 	@SuppressWarnings("unchecked")
@@ -836,39 +758,18 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
     			   topNosFilter = " where D.RANK<="+topNos;
     		   }
 
-					/*	sql=" select main.emp_code,main.emp_name,main.no_of_tran,main.NOATTEMPTS_avg, "
-							+" rank () OVER (ORDER BY (main.NOATTEMPTS_avg) asc) AS RANK "
-							+" from ( "
-							+" select b.emp_code,b.EMP_NAME ,b.jobid no_of_tran, trunc((b.NOATTEMPTS/b.jobid),2) NOATTEMPTS_avg "
-							+" from ( "
-							+" select a.EMP_CODE,a.EMP_NAME,sum(a.jobid) jobid,sum(a.NOATTEMPTS) NOATTEMPTS  "
-							+" from	(   "
-							+" select EMPLOYEE.EMP_CODE as emp_code ,TBLEPA_DAYSCORE.winname,  "
-							+" (CASE WHEN Employee.emp_fname IS NULL THEN '' ELSE  TRIM(Employee.emp_fname) || ' ' END)||  "
-							+" (CASE WHEN employee.emp_mname  IS  NULL  THEN ''  ELSE TRIM(Employee.emp_mname) || ' ' END) ||   "
-							+" (case when EMPLOYEE.EMP_LNAME  is  null  then '' else  TRIM(EMPLOYEE.EMP_LNAME) || ' ' end) as EMP_NAME ,  "
-							+" count(distinct tblEPA_dayScore.jobid)  jobid,  sum(TBLEPA_DAYSCORE.NOATTEMPTS) as NOATTEMPTS "
-							+" from TBLEPA_DAYSCORE,EMPLOYEE,  "
-							+" USERS,transetup  where trim(tblEPA_dayScore.userid) =trim(USERS.CODE) and  USERS.entity_code = EMPLOYEE.EMP_CODE   "
-							+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('" +frmPrd + "','dd/mm/yy')  "
-							+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('" + toPrd + "','dd/mm/yy')   "
-							+" and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname))  "
-							+" and transetup.function_type='"+functionType+"' "
-							+" and USERS.usage_intensity='"+usageIntensity+"'"	+empTaskFilter+ empCodeFilter 
-							+deptCodeFilter+" and tblEPA_dayScore.jobid !='NA'  and tblEPA_dayScore.ACtCode!='VIEW'  "							
-							+" group by TBLEPA_DAYSCORE.winname,EMPLOYEE.EMP_CODE,employee.emp_fname ,    "
-							+" employee.emp_mname,employee.emp_lname  "
-							+" ) a group by a.EMP_CODE,a.EMP_NAME  ) B  )main  "+topNosFilter+" order by RANK  ";*/
-	    	   
-	    	   sql="  select D.emp_code,D.emp_name,D.JOBID,D.noatt,D.success,D.fail,D.RANK from ( " +
-	    	   		" select c.emp_code,c.JOBID,c.emp_name,trunc(c.noatt,2) noatt,trunc(c.success,2) success,trunc(c.fail,2) fail, "
+	    	   sql=" select D.emp_code,D.emp_name,D.JOBID,D.noatt,D.success,D.fail,D.RANK from ( " 
+					+" select c.emp_code,c.JOBID,c.emp_name,trunc(c.noatt,2) noatt,trunc(c.success,2) success,trunc(c.fail,2) fail,"
 					+" dense_rank () OVER (ORDER BY (c.noatt) asc) AS RANK " 
 					+" from( " 
 					+" select b.emp_code,b.emp_name,sum(b.jobid) jobid, "
-	    			   +" AVG(b.noatt) noatt,AVG(b.success) success, AVG(b.fail) fail "
+					+" trunc(AVG(b.noatt),2) noatt,trunc(AVG(b.success),2) success, trunc(AVG(b.fail),2) fail "
 					+" from ( " 
-	    			   +" select A.EMP_CODE,A.LOGDATE,  "
-	    			   +" A.EMP_NAME,count(a.jobid) jobid,trunc(AVG(A.SERVERT),2) SERVERT,trunc(AVG(A.OHT),2) OHT,trunc(AVG(JOBT),2) JOBT , "
+					//+" select  w.EMP_CODE, w.winname, " 
+					//+" w.EMP_NAME,sum(w.jobid) jobid,trunc(AVG(w.SERVERT),2) SERVERT,trunc(AVG(w.OHT),2) OHT,trunc(AVG(w.JOBT),2) JOBT , " 
+					//+" trunc(AVG(w.noatt),2) noatt,trunc(AVG(w.success),2) success,trunc(AVG(w.fail),2) fail  from ( "
+					+" select A.EMP_CODE,A.LOGDATE, a.winname, " 
+					+" A.EMP_NAME,count(a.jobid) jobid,trunc(AVG(A.SERVERT),2) SERVERT,trunc(AVG(A.OHT),2) OHT,trunc(AVG(a.JOBT),2) JOBT , " 
 					+" trunc(AVG(a.noatt),2) noatt,trunc(AVG(a.success),2) success,trunc(AVG(a.fail),2) fail " 
 					+" from( " 
 					+" select distinct tblEPA_dayScore.jobid  jobid,TBLEPA_DAYSCORE.LOGDATE,EMPLOYEE.EMP_CODE as emp_code,TBLEPA_DAYSCORE.WINNAME , " 
@@ -879,20 +780,22 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 					+" trunc(AVG(nvl((tblEPA_dayScore.servert),0)),2) as servert, "
 					+" trunc(AVG(nvl((tblEPA_dayScore.oh),0)),2) as oht, "
 					+" trunc(AVG(nvl((tblEPA_dayScore.jobt),0)),2) as jobt , " 
-	    			   +" trunc(AVG(nvl((tblEPA_dayScore.noatt),0)),2) as noatt , "
+					+" trunc(AVG(nvl((tblEPA_dayScore.noatt),0)),2) as noatt ,"
 					+" trunc(AVG(nvl((tblEPA_dayScore.success),0)),2) as success , " 
 					+" trunc(AVG(nvl((tblEPA_dayScore.fail),0)),2) as fail "
 					+" from TBLEPA_DAYSCORE,EMPLOYEE,USERS,transetup "
 					+" where trim(tblEPA_dayScore.userid) =trim(USERS.CODE) "   
 					+" and  USERS.entity_code = EMPLOYEE.EMP_CODE "
-	    			   +" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('" +frmPrd + "','dd/mm/yy')   "
-	    			   +" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('" +toPrd + "','dd/mm/yy')   " 
+					+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('"+frmPrd+"','dd/mm/yy') "   
+					+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('"+toPrd+"','dd/mm/yy') " 
 					+" and transetup.function_type='"+functionType+"'  and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) " 
-	    			   +" and USERS.usage_intensity='"+usageIntensity+"'" +empTaskFilter+empCodeFilter +deptCodeFilter 
+					+" and USERS.usage_intensity='"+usageIntensity+"' "
 					+" and tblEPA_dayScore.jobid !='NA' and tblEPA_dayScore.ACtCode!='VIEW' " 
+							+empTaskFilter+empCodeFilter +deptCodeFilter 
 							+" group by TBLEPA_DAYSCORE.logdate,tblEPA_dayScore.jobid, EMPLOYEE.EMP_CODE,TBLEPA_DAYSCORE.WINNAME, " 
 					+" Employee.emp_mname,Employee.emp_lname,Employee.emp_fname "
-	    			   +" )a  GROUP BY A.LOGDATE,A.EMP_CODE, A.EMP_NAME "
+					+" )a  GROUP BY A.LOGDATE,A.EMP_CODE, A.EMP_NAME ,a.winname "
+					//+" ) w group by w.EMP_CODE, w.winname,w.EMP_NAME "
 					+" )b GROUP BY b.emp_code,b.emp_name "
 					+" ) C )D  "+topNosFilter+" order by D.RANK asc ";
 	    	  
@@ -943,7 +846,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 		 * EJB Name           : EmpProductivity.java
 		 * Method Name        : getWorstNumAttemptAnalysisServlet
 		 * Servlet Name       : WorstNumAttemptAnalysisServlet
-		 * Metadata xml Name  : efftimeanalysis.xml,attemptdistribution.xml
+		 * Metadata xml Name  : efftimeanalysis.xml
 		 * 
 		 * */
 		@SuppressWarnings("unchecked")
@@ -993,39 +896,18 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 	    			   topNosFilter = " where D.RANK<="+topNos;
 	    		   }
 
-						/*sql=" select main.emp_code,main.emp_name,main.no_of_tran,main.NOATTEMPTS_avg, "
-							+" rank () OVER (ORDER BY (main.NOATTEMPTS_avg) desc) AS RANK "
-							+" from ( "
-							+" select b.emp_code,b.EMP_NAME ,b.jobid no_of_tran, trunc((b.NOATTEMPTS/b.jobid),2) NOATTEMPTS_avg "
-							+" from ( "
-							+" select a.EMP_CODE,a.EMP_NAME,sum(a.jobid) jobid,sum(a.NOATTEMPTS) NOATTEMPTS  "
-							+" from	(   "
-							+" select EMPLOYEE.EMP_CODE as emp_code ,TBLEPA_DAYSCORE.winname,  "
-							+" (CASE WHEN Employee.emp_fname IS NULL THEN '' ELSE  TRIM(Employee.emp_fname) || ' ' END)||  "
-							+" (CASE WHEN employee.emp_mname  IS  NULL  THEN ''  ELSE TRIM(Employee.emp_mname) || ' ' END) ||   "
-							+" (case when EMPLOYEE.EMP_LNAME  is  null  then '' else  TRIM(EMPLOYEE.EMP_LNAME) || ' ' end) as EMP_NAME ,  "
-							+" count(distinct tblEPA_dayScore.jobid)  jobid,  sum(TBLEPA_DAYSCORE.NOATTEMPTS) as NOATTEMPTS "
-							+" from TBLEPA_DAYSCORE,EMPLOYEE,  "
-							+" USERS,transetup  where trim(tblEPA_dayScore.userid) =trim(USERS.CODE) and  USERS.entity_code = EMPLOYEE.EMP_CODE   "
-							+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('" +frmPrd + "','dd/mm/yy')  "
-							+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('" + toPrd + "','dd/mm/yy')   "
-							+" and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname))  "
-							+" and transetup.function_type='"+functionType+"' "
-							+" and USERS.usage_intensity='"+usageIntensity+"'"	+empTaskFilter+ empCodeFilter 
-							+deptCodeFilter+" and tblEPA_dayScore.jobid !='NA'  and tblEPA_dayScore.ACtCode!='VIEW'  "							
-							+" group by TBLEPA_DAYSCORE.winname,EMPLOYEE.EMP_CODE,employee.emp_fname ,    "
-							+" employee.emp_mname,employee.emp_lname  "
-							+" ) a group by a.EMP_CODE,a.EMP_NAME  ) B  )main  "+topNosFilter+" order by RANK  ";*/
-	        	   
-	        	   sql="  select D.emp_code,D.emp_name,D.JOBID,D.noatt,D.success,D.fail,D.RANK from ( " +
-	   	    	   		" select c.emp_code,c.JOBID,c.emp_name,trunc(c.noatt,2) noatt,trunc(c.success,2) success,trunc(c.fail,2) fail, "
+	        	   sql=" select D.emp_code,D.emp_name,D.JOBID,D.noatt,D.success,D.fail,D.RANK from ( " 
+	   					+" select c.emp_code,c.JOBID,c.emp_name,trunc(c.noatt,2) noatt,trunc(c.success,2) success,trunc(c.fail,2) fail,"
 	   					+" dense_rank () OVER (ORDER BY (c.noatt) desc) AS RANK " 
 	   					+" from( " 
 	   					+" select b.emp_code,b.emp_name,sum(b.jobid) jobid, "
-	   	    			   +" AVG(b.noatt) noatt,AVG(b.success) success, AVG(b.fail) fail "
+	   					+" trunc(AVG(b.noatt),2) noatt,trunc(AVG(b.success),2) success, trunc(AVG(b.fail),2) fail "
 	   					+" from ( " 
-	   	    			   +" select A.EMP_CODE,A.LOGDATE,  "
-	   	    			   +" A.EMP_NAME,count(a.jobid) jobid,trunc(AVG(A.SERVERT),2) SERVERT,trunc(AVG(A.OHT),2) OHT,trunc(AVG(JOBT),2) JOBT , "
+	   					//+" select  w.EMP_CODE, w.winname, " 
+	   					//+" w.EMP_NAME,sum(w.jobid) jobid,trunc(AVG(w.SERVERT),2) SERVERT,trunc(AVG(w.OHT),2) OHT,trunc(AVG(w.JOBT),2) JOBT , " 
+	   					//+" trunc(AVG(w.noatt),2) noatt,trunc(AVG(w.success),2) success,trunc(AVG(w.fail),2) fail  from ( "
+	   					+" select A.EMP_CODE,A.LOGDATE, a.winname, " 
+	   					+" A.EMP_NAME,count(a.jobid) jobid,trunc(AVG(A.SERVERT),2) SERVERT,trunc(AVG(A.OHT),2) OHT,trunc(AVG(a.JOBT),2) JOBT , " 
 	   					+" trunc(AVG(a.noatt),2) noatt,trunc(AVG(a.success),2) success,trunc(AVG(a.fail),2) fail " 
 	   					+" from( " 
 	   					+" select distinct tblEPA_dayScore.jobid  jobid,TBLEPA_DAYSCORE.LOGDATE,EMPLOYEE.EMP_CODE as emp_code,TBLEPA_DAYSCORE.WINNAME , " 
@@ -1036,20 +918,22 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 	   					+" trunc(AVG(nvl((tblEPA_dayScore.servert),0)),2) as servert, "
 	   					+" trunc(AVG(nvl((tblEPA_dayScore.oh),0)),2) as oht, "
 	   					+" trunc(AVG(nvl((tblEPA_dayScore.jobt),0)),2) as jobt , " 
-	   	    			   +" trunc(AVG(nvl((tblEPA_dayScore.noatt),0)),2) as noatt , "
+	   					+" trunc(AVG(nvl((tblEPA_dayScore.noatt),0)),2) as noatt ,"
 	   					+" trunc(AVG(nvl((tblEPA_dayScore.success),0)),2) as success , " 
 	   					+" trunc(AVG(nvl((tblEPA_dayScore.fail),0)),2) as fail "
 	   					+" from TBLEPA_DAYSCORE,EMPLOYEE,USERS,transetup "
 	   					+" where trim(tblEPA_dayScore.userid) =trim(USERS.CODE) "   
 	   					+" and  USERS.entity_code = EMPLOYEE.EMP_CODE "
-	   	    			   +" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('" +frmPrd + "','dd/mm/yy')   "
-	   	    			   +" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('" +toPrd + "','dd/mm/yy')   " 
+	   					+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('"+frmPrd+"','dd/mm/yy') "   
+	   					+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('"+toPrd+"','dd/mm/yy') " 
 	   					+" and transetup.function_type='"+functionType+"'  and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) " 
-	   	    			   +" and USERS.usage_intensity='"+usageIntensity+"'" +empTaskFilter+empCodeFilter +deptCodeFilter 
+	   					+" and USERS.usage_intensity='"+usageIntensity+"' "
 	   					+" and tblEPA_dayScore.jobid !='NA' and tblEPA_dayScore.ACtCode!='VIEW' " 
+	   							+empTaskFilter+empCodeFilter +deptCodeFilter 
 	   							+" group by TBLEPA_DAYSCORE.logdate,tblEPA_dayScore.jobid, EMPLOYEE.EMP_CODE,TBLEPA_DAYSCORE.WINNAME, " 
 	   					+" Employee.emp_mname,Employee.emp_lname,Employee.emp_fname "
-	   	    			   +" )a  GROUP BY A.LOGDATE,A.EMP_CODE, A.EMP_NAME "
+	   					+" )a  GROUP BY A.LOGDATE,A.EMP_CODE, A.EMP_NAME ,a.winname "
+	   					//+" ) w group by w.EMP_CODE, w.winname,w.EMP_NAME "
 	   					+" )b GROUP BY b.emp_code,b.emp_name "
 	   					+" ) C )D  "+topNosFilter+" order by D.RANK asc ";
 
@@ -1096,11 +980,11 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 		}
 		/********** End of method getWorstNumAttemptAnalysisServlet()  ******/
 
-	/********** Start of method for  distribution of Time,Efficiency,Task and Number of Attempts 
+	/********** Start of method for  distribution of Time
 	 * EJB Name           : EmpProductivity.java
 	 * Method Name        : getDistributionDetailServlet
 	 * Servlet Name       : DistributionDetailServlet
-	 * Metadata xml Name  : attemptdistribution.xml,timedistribution.xml
+	 * Metadata xml Name  : attemptdistribution.xml(SSGrid),timedistribution.xml
 	 * 
 	 * */
 	@SuppressWarnings("unchecked")
@@ -1149,38 +1033,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
         	   toPrd=toPrd.trim();        	  
         	   int count = 0;
         	  
-        	 
-        	  /* sql="select b.emp_code,b.EMP_NAME,sum(b.jobid) jobid,sum(b.servert) server_time,sum(b.oht) oh_time,sum(b.jobt) job_time, "
-					+" sum(b.tot_time) tot_time,sum(b.tot_time_min) TOTAL_TIME_MIN,sum(b.NOATTEMPTS) NOATTEMPTS,sum(b.NOATTEMPTS_db) NOATTEMPTS_db, "
-					+" sum(b.failAtt) failAtt,sum(b.fail_attm_db) fail_attm_db,sum(b.successAtt) success_att ,sum(b.success_att_db) success_att_db from ( "
-					+" select a.jobid,a.userid,a.emp_code,a.emp_name,trunc((a.server_time/a.jobid),2) servert, "
-					+" trunc((a.oh_time/a.jobid),2) oht,trunc((a.job_time/a.jobid),2) jobt, "
-					+" trunc((a.total_time/a.jobid),2) tot_time,trunc((a.total_time_min/a.jobid),2) tot_time_min, "
-					+" trunc((a.NOATTEMPTS/a.jobid),2) NOATTEMPTS,a.NOATTEMPTS_db,trunc((a.fail_attm/a.jobid),2) failAtt,a.fail_attm_db, "
-					+" trunc((a.success_att/a.jobid),2) successAtt,a.success_att_db "
-					+" from (select count(distinct D.jobid) jobid,D.USERID,D.WINNAME,EMP.EMP_CODE, "
-					+" (CASE WHEN EMP.emp_fname IS NULL THEN '' ELSE  TRIM(EMP.emp_fname) "
-					+" || ' ' END) ||   (CASE WHEN EMP.emp_mname  IS  NULL  THEN '' ELSE TRIM(EMP.emp_mname) || ' ' END) || " 
-					+" (case when EMP.EMP_LNAME is  null  then '' else  TRIM(EMP.EMP_LNAME) || ' ' end) as EMP_NAME, "  
-					+" trunc((SUM(D.SERVERT)/60),2) as server_time, trunc((SUM(D.OH)/60),2) as oh_time,trunc((sum(D.JOBT)/60),2) as job_time, "  
-					+" (nvl(sum(D.servert),0)+nvl(sum(D.oh),0)+nvl(sum(D.jobt),0) ) as TOTAL_TIME, "
-					+" trunc((((nvl(sum(D.servert),0)+nvl(sum(D.oh),0)+nvl(sum(D.jobt),0) )/60)),2) as TOTAL_TIME_MIN, "
-					+" trunc((SUM(D.NOATTEMPTS)),2) as NOATTEMPTS,  trunc((SUM(D.NOATTEMPTS)),2) as NOATTEMPTS_db, "   
-					+" trunc((SUM(D.FAIL)),2) as fail_attm, trunc((SUM(D.FAIL)),2) as fail_attm_db, " 
-					+" trunc((SUM(D.SUCCESS)),2) as success_att ,   trunc((SUM(D.SUCCESS)),2) as success_att_db  "
-					+" FROM transetup,TBLEPA_DAYSCORE D   inner join USERS USR on TRIM(USR.CODE) =TRIM(D.USERID) "    
-					+" inner join EMPLOYEE EMP on TRIM(EMP.EMP_CODE) = TRIM(USR.entity_code) "   
-					+" inner join DEPARTMENT DEPT on TRIM(EMP.DEPT_CODE) = TRIM(DEPT.DEPT_CODE) "  
-					+" where  TO_DATE(LOGDATE,'dd/mm/yy') >= TO_DATE('"+frmPrd+"','dd/mm/yy') " 
-					+" AND  TO_DATE(LOGDATE,'dd/mm/yy') <= TO_DATE('"+toPrd+"','dd/mm/yy') " 
-						+" and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(D.winname)) "
-					 +" and transetup.function_type='"+functionType+"' "	
-					+" and USR.usage_intensity='"+usageIntensity+"'  and TRIM(EMP.EMP_CODE) ='"+empCode.trim()+"'" +deptCodeFilter 
-					+empTaskFilter+" and D.jobid !='NA' and D.ACtCode!='VIEW' "  
-					+" group by  D.USERID,D.WINNAME,EMP.EMP_CODE,EMP.emp_fname ,EMP.emp_mname,EMP.emp_lname "
-					+" ) A) b group by b.emp_code,b.emp_name ";*/
-        	   
-        	   sql=" select b.emp_code,b.emp_name,TRUNC(AVG(b.servert/60),2) server_time , "
+        	 /*  sql=" select b.emp_code,b.emp_name,TRUNC(AVG(b.servert/60),2) server_time , "
 					+" TRUNC(AVG(b.oht/60),2) oh_time ,TRUNC(AVG(b.jobt/60),2) job_time, TRUNC((AVG(B.OHT)/60+AVG(b.servert)/60+AVG(b.jobt)/60),2) TOTAL_TIME_MIN, "
 					+" trunc(AVG(b.noatt),2) NOATTEMPTS,trunc(AVG(b.success),2) success , trunc(AVG(b.fail),2) fail "
 					+" from (  select A.EMP_CODE,A.LOGDATE, "
@@ -1209,7 +1062,44 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 					+" and tblEPA_dayScore.jobid !='NA' and tblEPA_dayScore.ACtCode!='VIEW' "
 					+" group by TBLEPA_DAYSCORE.logdate,tblEPA_dayScore.jobid, EMPLOYEE.EMP_CODE,TBLEPA_DAYSCORE.WINNAME, "
 					+" Employee.emp_mname,Employee.emp_lname,Employee.emp_fname "
-					+" )a  GROUP BY A.LOGDATE,A.EMP_CODE, A.EMP_NAME )b GROUP BY b.emp_code,b.emp_name ";
+					+" )a  GROUP BY A.LOGDATE,A.EMP_CODE, A.EMP_NAME )b GROUP BY b.emp_code,b.emp_name ";*/
+        	   
+        	   sql=" select b.emp_code,b.emp_name,TRUNC(AVG(b.servert/60),2) server_time , " 
+   					+" TRUNC(AVG(b.oht/60),2) oh_time ,TRUNC(AVG(b.jobt/60),2) job_time, " 
+   					+" TRUNC((AVG(B.OHT)/60+AVG(b.servert)/60+AVG(b.jobt)/60),2) TOTAL_TIME_MIN, " 
+   					+" trunc(AVG(b.noatt),2) NOATTEMPTS,trunc(AVG(b.success),2) success , trunc(AVG(b.fail),2) fail " 
+   					+" from ( "  
+   					//+" select  w.EMP_CODE, w.winname, "
+   					//+" w.EMP_NAME,trunc(AVG(w.SERVERT),2) SERVERT,trunc(AVG(w.OHT),2) OHT,trunc(AVG(w.JOBT),2) JOBT , " 
+   					//+" trunc(AVG(w.noatt),2) noatt,trunc(AVG(w.success),2) success,trunc(AVG(w.fail),2) fail from ( "
+   					+" select A.EMP_CODE,A.LOGDATE, a.winname, "
+   					+" A.EMP_NAME,trunc(AVG(A.SERVERT),2) SERVERT,trunc(AVG(A.OHT),2) OHT,trunc(AVG(a.JOBT),2) JOBT , " 
+   					+" trunc(AVG(a.noatt),2) noatt,trunc(AVG(a.success),2) success,trunc(AVG(a.fail),2) fail "
+   					+" from( " 
+   					+" select distinct tblEPA_dayScore.jobid  jobid,TBLEPA_DAYSCORE.LOGDATE,EMPLOYEE.EMP_CODE as emp_code,TBLEPA_DAYSCORE.WINNAME , "
+   					+" (CASE WHEN Employee.emp_fname IS NULL THEN '' ELSE TRIM(Employee.emp_fname) || ' ' END) || " 
+   					+" (CASE WHEN employee.emp_mname  IS  NULL  THEN '' " 
+   					+" ELSE TRIM(Employee.emp_mname) || ' ' END) || (case when EMPLOYEE.EMP_LNAME  is  null  then '' else " 
+   					+" TRIM(EMPLOYEE.EMP_LNAME) || ' ' end) as EMP_NAME , "
+   					+" trunc(AVG(nvl((tblEPA_dayScore.servert),0)),2) as servert, " 
+   					+" trunc(AVG(nvl((tblEPA_dayScore.oh),0)),2) as oht, " 
+   					+" trunc(AVG(nvl((tblEPA_dayScore.jobt),0)),2) as jobt , " 
+   					+" trunc(AVG(nvl((tblEPA_dayScore.noatt),0)),2) as noatt ,  "
+   					+" trunc(AVG(nvl((tblEPA_dayScore.success),0)),2) as success , "
+   					+" trunc(AVG(nvl((tblEPA_dayScore.fail),0)),2) as fail " 
+   					+" from TBLEPA_DAYSCORE,EMPLOYEE,USERS,transetup "
+   					+" where trim(tblEPA_dayScore.userid) =trim(USERS.CODE) " 
+   					+" and  USERS.entity_code = EMPLOYEE.EMP_CODE "	
+   					+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('"+frmPrd+"','dd/mm/yy') "   
+   					+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('"+toPrd+"','dd/mm/yy') "   
+   					+" and transetup.function_type='"+functionType+"'  and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) " 
+   					+" and USERS.usage_intensity='"+usageIntensity+"'  and TRIM(EMPLOYEE.EMP_CODE) ='"+empCode.trim()+"' " 					 
+   					+" and tblEPA_dayScore.jobid !='NA' and tblEPA_dayScore.ACtCode!='VIEW' " + empTaskFilter + deptCodeFilter 
+   					+" group by TBLEPA_DAYSCORE.logdate,tblEPA_dayScore.jobid, EMPLOYEE.EMP_CODE,TBLEPA_DAYSCORE.WINNAME, " 
+   					+" Employee.emp_mname,Employee.emp_lname,Employee.emp_fname " 
+   					+" )a  GROUP BY A.LOGDATE,A.EMP_CODE, A.EMP_NAME ,a.winname "
+   					//+" )W group by  w.EMP_CODE, w.winname,w.EMP_NAME " 
+   					+")b GROUP BY b.emp_code,b.emp_name ";
         	   
         	   pstmt = conn.prepareStatement(sql);
   			   rs = pstmt.executeQuery();
@@ -1310,11 +1200,11 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 	}
 	/********** End of method getDistributionDetailServlet()  ******/
 	
-	/********** Start of method for  distribution of  Number of Attempts Pie chatr
+	/********** Start of method for  distribution of  Number of Attempts Pie chart
 	 * EJB Name           : EmpProductivity.java
 	 * Method Name        : getPieChartDistributionDetailServlet
 	 * Servlet Name       : PieChartDistributionDetailServlet
-	 * Metadata xml Name  : attemptdistribution.xml,timedistribution.xml
+	 * Metadata xml Name  : attemptdistribution.xml(Pie-Chart)
 	 * 
 	 * */
 	@SuppressWarnings("unchecked")
@@ -1361,44 +1251,16 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
         	   frmPrd=frmPrd.trim();
         	   toPrd=toPrd.trim();        	  
         	   int count = 0;
-        	 
-        	  
-        	   /*sql="select b.EMP_CODE,b.EMP_NAME,sum(b.jobid) jobid,sum(b.servert) server_time,sum(b.oht) oh_time,sum(b.jobt) job_time, "
-   					+" sum(b.tot_time) tot_time,sum(b.tot_time_min) TOTAL_TIME_MIN,sum(b.NOATTEMPTS) NOATTEMPTS,sum(b.NOATTEMPTS_db) NOATTEMPTS_db, "
-   					+" sum(b.failAtt) failAtt,sum(b.fail_attm_db) fail_attm_db,sum(b.successAtt) success_att ,sum(b.success_att_db) success_att_db from ( "
-   					+" select a.jobid,a.userid,a.emp_code,a.emp_name,trunc((a.server_time/a.jobid),2) servert, "
-   					+" trunc((a.oh_time/a.jobid),2) oht,trunc((a.job_time/a.jobid),2) jobt, "
-   					+" trunc((a.total_time/a.jobid),2) tot_time,trunc((a.total_time_min/a.jobid),2) tot_time_min, "
-   					+" trunc((a.NOATTEMPTS/a.jobid),2) NOATTEMPTS,a.NOATTEMPTS_db,trunc((a.fail_attm/a.jobid),2) failAtt,a.fail_attm_db, "
-   					+" trunc((a.success_att/a.jobid),2) successAtt,a.success_att_db "
-   					+" from (select count(distinct D.jobid) jobid,D.USERID,D.WINNAME,EMP.EMP_CODE, "
-   					+" (CASE WHEN EMP.emp_fname IS NULL THEN '' ELSE  TRIM(EMP.emp_fname) "
-   					+" || ' ' END) ||   (CASE WHEN EMP.emp_mname  IS  NULL  THEN '' ELSE TRIM(EMP.emp_mname) || ' ' END) || " 
-   					+" (case when EMP.EMP_LNAME is  null  then '' else  TRIM(EMP.EMP_LNAME) || ' ' end) as EMP_NAME, "  
-   					+" trunc((SUM(D.SERVERT)/60),2) as server_time, trunc((SUM(D.OH)/60),2) as oh_time,trunc((sum(D.JOBT)/60),2) as job_time, "  
-   					+" (nvl(sum(D.servert),0)+nvl(sum(D.oh),0)+nvl(sum(D.jobt),0) ) as TOTAL_TIME, "
-   					+" trunc((((nvl(sum(D.servert),0)+nvl(sum(D.oh),0)+nvl(sum(D.jobt),0) )/60)),2) as TOTAL_TIME_MIN, "
-   					+" trunc((SUM(D.NOATTEMPTS)),2) as NOATTEMPTS,  trunc((SUM(D.NOATTEMPTS)),2) as NOATTEMPTS_db, "   
-   					+" trunc((SUM(D.FAIL)),2) as fail_attm, trunc((SUM(D.FAIL)),2) as fail_attm_db, " 
-   					+" trunc((SUM(D.SUCCESS)),2) as success_att ,   trunc((SUM(D.SUCCESS)),2) as success_att_db  "
-   					+" FROM transetup,TBLEPA_DAYSCORE D   inner join USERS USR on TRIM(USR.CODE) =TRIM(D.USERID) "    
-   					+" inner join EMPLOYEE EMP on TRIM(EMP.EMP_CODE) = TRIM(USR.entity_code) "   
-   					+" inner join DEPARTMENT DEPT on TRIM(EMP.DEPT_CODE) = TRIM(DEPT.DEPT_CODE) "  
-   					+" where  TO_DATE(LOGDATE,'dd/mm/yy') >= TO_DATE('"+frmPrd+"','dd/mm/yy') " 
-   					+" AND  TO_DATE(LOGDATE,'dd/mm/yy') <= TO_DATE('"+toPrd+"','dd/mm/yy') " 
-						+" and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(D.winname)) "
-   					 +" and transetup.function_type='"+functionType+"' "	
-					+" and USR.usage_intensity='"+usageIntensity+"'  and TRIM(EMP.EMP_CODE) ='"+empCode.trim()+"'" +deptCodeFilter 
-   					+empTaskFilter+" and D.jobid !='NA' and D.ACtCode!='VIEW' "  
-   					+" group by  D.USERID,D.WINNAME,EMP.EMP_CODE,EMP.emp_fname ,EMP.emp_mname,EMP.emp_lname "
-   					+" ) A) b group by b.emp_code,b.emp_name ";*/
-        	   
-        	   
         	   sql=" select b.emp_code,b.emp_name,TRUNC(AVG(b.servert/60),2) server_time , " 
-					+" TRUNC(AVG(b.oht/60),2) oh_time ,TRUNC(AVG(b.jobt/60),2) job_time, TRUNC((AVG(B.OHT)/60+AVG(b.servert)/60+AVG(b.jobt)/60),2) TOTAL_TIME_MIN, "
+					+" TRUNC(AVG(b.oht/60),2) oh_time ,TRUNC(AVG(b.jobt/60),2) job_time, " 
+					+" TRUNC((AVG(B.OHT)/60+AVG(b.servert)/60+AVG(b.jobt)/60),2) TOTAL_TIME_MIN, " 
 					+" trunc(AVG(b.noatt),2) NOATTEMPTS,trunc(AVG(b.success),2) success , trunc(AVG(b.fail),2) fail " 
-					+" from (  select A.EMP_CODE,A.LOGDATE, "
-					+" A.EMP_NAME,trunc(AVG(A.SERVERT),2) SERVERT,trunc(AVG(A.OHT),2) OHT,trunc(AVG(JOBT),2) JOBT , "
+					+" from ( "  
+					//+" select  w.EMP_CODE, w.winname, "
+					//+" w.EMP_NAME,trunc(AVG(w.SERVERT),2) SERVERT,trunc(AVG(w.OHT),2) OHT,trunc(AVG(w.JOBT),2) JOBT , " 
+					//+" trunc(AVG(w.noatt),2) noatt,trunc(AVG(w.success),2) success,trunc(AVG(w.fail),2) fail from ( "
+					+" select A.EMP_CODE,A.LOGDATE, a.winname, "
+					+" A.EMP_NAME,trunc(AVG(A.SERVERT),2) SERVERT,trunc(AVG(A.OHT),2) OHT,trunc(AVG(a.JOBT),2) JOBT , " 
 					+" trunc(AVG(a.noatt),2) noatt,trunc(AVG(a.success),2) success,trunc(AVG(a.fail),2) fail "
 					+" from( " 
 					+" select distinct tblEPA_dayScore.jobid  jobid,TBLEPA_DAYSCORE.LOGDATE,EMPLOYEE.EMP_CODE as emp_code,TBLEPA_DAYSCORE.WINNAME , "
@@ -1419,11 +1281,12 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 					+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('"+toPrd+"','dd/mm/yy') "   
 					+" and transetup.function_type='"+functionType+"'  and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) " 
 					+" and USERS.usage_intensity='"+usageIntensity+"'  and TRIM(EMPLOYEE.EMP_CODE) ='"+empCode.trim()+"' " 					 
-					+ empTaskFilter + deptCodeFilter 
-					+" and tblEPA_dayScore.jobid !='NA' and tblEPA_dayScore.ACtCode!='VIEW' "
+					+" and tblEPA_dayScore.jobid !='NA' and tblEPA_dayScore.ACtCode!='VIEW' " + empTaskFilter + deptCodeFilter 
 					+" group by TBLEPA_DAYSCORE.logdate,tblEPA_dayScore.jobid, EMPLOYEE.EMP_CODE,TBLEPA_DAYSCORE.WINNAME, " 
 					+" Employee.emp_mname,Employee.emp_lname,Employee.emp_fname " 
-					+" )a  GROUP BY A.LOGDATE,A.EMP_CODE, A.EMP_NAME )b GROUP BY b.emp_code,b.emp_name ";
+					+" )a  GROUP BY A.LOGDATE,A.EMP_CODE, A.EMP_NAME ,a.winname "
+				//	+" )W group by  w.EMP_CODE, w.winname,w.EMP_NAME " 
+					+")b GROUP BY b.emp_code,b.emp_name "; 
         	   
         	   pstmt = conn.prepareStatement(sql);
   			   rs = pstmt.executeQuery();
@@ -1494,13 +1357,11 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 	
 	
 	
-	/********** Start of method for Employee day Distribution
+	/********** Start of method for Employee date wise Distribution for Time
 	 * EJB Name           : EmpProductivity.java
 	 * Method Name        : getDayWiseDistributionServlet
 	 * Servlet Name       : DayWiseDistributionServlet
-	 * Metadata xml Name  : escoredistribution.xml,overheadtimedistribution.xml,
-	 *                      servertimedistribution.xml,tasktimedistribution.cml,
-	 *                      tojdistribution.xml
+	 * Metadata xml Name  : overheadtimedistribution.xml,servertimedistribution.xml,tojdistribution.xml
 	 * 
 	 * */
 	@SuppressWarnings("unchecked")
@@ -1587,8 +1448,8 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 					+deptCodeFilter	 +empTaskFilter +" and D.jobid !='NA' and D.ACtCode!='VIEW' group by D.LOGDATE "
 					+" ) A where A.totaltime_MIN>0.04 order by to_date(A.logdate,'DD/MM/YY') asc ";*/
         		   sql=" select B.LOGDATE,B.EMP_CODE,B.EMP_NAME,b.SERVERT,b.oht,b.jobt,b.total_time,b.noatt,b.success,b.fail "
-        				   +" from ( select A.LOGDATE,A.EMP_CODE,A.EMP_NAME,trunc(AVG(A.SERVERT/60),2) SERVERT,trunc(AVG(A.OHT/60),2) OHT," +
-        		   		"trunc(AVG(JOBT/60),2) JOBT ,trunc((AVG(A.SERVERT/60)+AVG(A.OHT/60)+AVG(JOBT/60)),2) total_time , "
+        		   +" from ( select A.LOGDATE,A.EMP_CODE,A.EMP_NAME,trunc(AVG(A.SERVERT/60),2) SERVERT,trunc(AVG(A.OHT/60),2) OHT," 
+        		   +"trunc(AVG(JOBT/60),2) JOBT ,trunc((AVG(A.SERVERT/60)+AVG(A.OHT/60)+AVG(JOBT/60)),2) total_time , "
 					+" trunc(AVG(a.noatt),2) noatt,trunc(AVG(a.success),2) success,trunc(AVG(a.fail),2) fail "
 					+" From ( "
 					+" select distinct tblEPA_dayScore.jobid  jobid,TBLEPA_DAYSCORE.LOGDATE,EMPLOYEE.EMP_CODE as emp_code,TBLEPA_DAYSCORE.WINNAME ,  " 
@@ -1666,7 +1527,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 	/********** End of method getDayWiseDistributionServlet()  ******/
 
 
-	/********** Start of method for Employee day Distribution
+	/********** Start of method for Employee date wise Distribution for Number of attempts
 	 * EJB Name           : EmpProductivity.java
 	 * Method Name        : getDayWiseNoattDistServlet
 	 * Servlet Name       : DayWiseNoattDistServlet
@@ -1830,7 +1691,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 	
 	/********** End of method getDayWiseNoattDistServlet()  ******/
 	
-	/********** Start of method for Employee E-Score day Distribution
+	/********** Start of method for Employee E-Score date wise Distribution
 	 * EJB Name           : EmpProductivity.java
 	 * Method Name        : getDayWiseEscoreDistributionServlet
 	 * Servlet Name       : DayWiseEscoreDistributionServlet
@@ -1853,7 +1714,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 		{
 			conn = connDriver.getConnectDB(dataSourceName);
 			connDriver = null;	
-        	   System.out.println(" Inside getDayWiseEscoreDistributionServlet() for seperated method  for Data Soruc Name ="+dataSourceName);
+        	   System.out.println("Inside getDayWiseEscoreDistributionServlet() for seperated method  for Data Soruc Name ="+dataSourceName);
         	   deptCode=deptCode.trim();
         	   empCode=empCode.trim();
         	   int count = 0;
@@ -1871,7 +1732,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
       		   }
         	   if ((empTask != null) && (empTask.trim().length() > 0))
      		   {
-     			  // System.out.println("empTask" + empTask);
+     			   System.out.println("empTask" + empTask);
      			   String tempArr [];
      			   if(empTask.indexOf(",")!=-1)
      			   {
@@ -1882,8 +1743,9 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
      					  if(i==0)
      					    empTask="W_"+(tempArr[i]).toUpperCase();
      					  else 
-     						 empTask=",W_"+(tempArr[i]).toUpperCase();
+     						 empTask=empTask+",W_"+(tempArr[i]).toUpperCase();
      				  }
+     				 System.out.println("empTask in , separated :" + empTask);
      			   }
      			   else if(empTask.indexOf("[")!=-1 )
      			   {
@@ -1899,21 +1761,8 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
      		   }
         	   if ((frmPrd != null && frmPrd.trim().length()>0 ) && (toPrd != null && toPrd.trim().length()>0 ))
    			   {
-        	  /* sql= " SELECT D.LOGDATE,trunc(AVG(D.ESCORE),2) as Escore "        	   	  
-        	   	  + " from transetup,TBLEPA_DAYSCORE D    "
-        	   	  + " inner join USERS USR on TRIM(USR.CODE) =TRIM(D.USERID)  "  
-        	   	  + " INNER JOIN EMPLOYEE EMP ON TRIM(EMP.EMP_CODE) = TRIM(USR.ENTITY_CODE)  "  
-        	   	  + " where  "
-        	  	  +" TO_DATE(D.LOGDATE,'dd/mm/yy') >= TO_DATE('"+frmPrd+"','dd/mm/yy') AND "
-				  +" TO_DATE(D.LOGDATE,'dd/mm/yy') <= TO_DATE('"+toPrd+"','dd/mm/yy') and "
-				  +" and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(D.winname)) "
-				  +" transetup.function_type='"+functionType+"' and "	
-				  + "  USR.usage_intensity='"+usageIntensity+"'"
-				  +empCodeFilter+" and D.escore>0  " +empTaskFilter +deptCodeFilter	
-        	   	  + " group by D.LOGDATE "
-        	   	  + " order by to_date(D.logdate,'DD/MM/YY') asc ";*/
         		   
-        		   sql=" select B.LOGDATE,B.EMP_CODE,B.EMP_NAME,b.escore "
+        		   /*sql=" select B.LOGDATE,B.EMP_CODE,B.EMP_NAME,b.escore "
 						+" from ( select A.LOGDATE,A.EMP_CODE,A.EMP_NAME,trunc(AVG(A.escore),2) escore "    		 
 						+" From (  "
 						+" select  tblEPA_dayScore.jobid  jobid,TBLEPA_DAYSCORE.LOGDATE,EMPLOYEE.EMP_CODE as emp_code,TBLEPA_DAYSCORE.WINNAME ,  " 
@@ -1932,9 +1781,29 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 						+" and tblEPA_dayScore.jobid !='NA' and tblEPA_dayScore.ACtCode!='VIEW' and tblEPA_dayScore.escore>0 "			
 						+" group by TBLEPA_DAYSCORE.logdate,tblEPA_dayScore.jobid, EMPLOYEE.EMP_CODE,TBLEPA_DAYSCORE.WINNAME,  "
 						+" Employee.emp_mname,Employee.emp_lname,Employee.emp_fname  "
-						+" ) A GROUP BY A.LOGDATE,A.EMP_CODE,A.EMP_NAME )B  ORDER BY to_date(B.logdate,'DD/MM/YY') asc " ;
-
+						+" ) A GROUP BY A.LOGDATE,A.EMP_CODE,A.EMP_NAME )B  ORDER BY to_date(B.logdate,'DD/MM/YY') asc " ;*/
               
+                 sql="select B.LOGDATE,B.EMP_CODE,B.EMP_NAME,b.escore "
+					 +" from ( select A.LOGDATE,A.EMP_CODE,A.EMP_NAME,trunc(AVG(A.escore),2) escore  "
+					 +" From (   " 
+					 //+" select w.logdate,w.emp_code,w.emp_name,trunc(avg(w.escore),2) escore,w.winname  "
+					// +" from( "
+					 +" select  tblEPA_dayScore.jobid  jobid,TBLEPA_DAYSCORE.LOGDATE,EMPLOYEE.EMP_CODE as emp_code, "
+					 +" TBLEPA_DAYSCORE.WINNAME ,   (CASE WHEN Employee.emp_fname IS NULL THEN '' ELSE TRIM(Employee.emp_fname) || ' ' END) ||  "
+					 +"  (CASE WHEN employee.emp_mname  IS  NULL  THEN ''     ELSE TRIM(Employee.emp_mname) || ' ' END) || "
+					 +" (case when EMPLOYEE.EMP_LNAME  is  null  then '' else   TRIM(EMPLOYEE.EMP_LNAME) || ' ' end) as EMP_NAME , "  
+					 +" trunc(AVG(nvl((tblEPA_dayScore.escore),0)),2) as escore  from TBLEPA_DAYSCORE,EMPLOYEE,USERS,transetup   " 
+					 +" where trim(tblEPA_dayScore.userid) =trim(USERS.CODE)    and  USERS.entity_code = EMPLOYEE.EMP_CODE	 "   
+					 +" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('"+frmPrd+"','dd/mm/yy')  "
+					 +" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('"+toPrd+"','dd/mm/yy')  "  
+					 +" and transetup.function_type='"+functionType+"'  and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname))  " 
+					 +"  and USERS.usage_intensity='"+usageIntensity+"' "+empCodeFilter +empTaskFilter +deptCodeFilter
+					 +"  and tblEPA_dayScore.jobid !='NA'  "
+					 +" and tblEPA_dayScore.ACtCode!='VIEW' and tblEPA_dayScore.escore>0   "
+					 +" group by TBLEPA_DAYSCORE.logdate,tblEPA_dayScore.jobid, EMPLOYEE.EMP_CODE,TBLEPA_DAYSCORE.WINNAME,  " 
+					 +"  Employee.emp_mname,Employee.emp_lname,Employee.emp_fname" 
+					// " )W  group by w.winname ,w.logdate,w.emp_code,w.emp_name "
+					 +"  ) A GROUP BY A.LOGDATE,A.EMP_CODE,A.EMP_NAME )B  ORDER BY to_date(B.logdate,'DD/MM/YY') asc ";
         		   
 				pstmt = conn.prepareStatement(sql);
 				rs = pstmt.executeQuery();
@@ -1984,7 +1853,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 	* EJB Name           : EmpProductivity.java
 	* Method Name        : getTaskWiseEscoreServlet(String,String,String,String)
 	* Servlet Name       : TaskWiseEscoreServlet
-	* Metadata xml Name  : efftimeanalysis.xml,tasktimedistribution.xml,escoredistribution.xml
+	* Metadata xml Name  : efftimeanalysis.xml
 	* 
 	* */
 	@SuppressWarnings("unchecked")
@@ -2034,7 +1903,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
         	   empCode=empCode.trim();
         	   int count = 0;
         	        	   
-        	   sql=" select c.jobid,c.WINNAME,c.WIN_DESCR,c.ESCORE,c.rank  "
+        	   /*sql=" select c.jobid,c.WINNAME,c.WIN_DESCR,c.ESCORE,c.rank  "
 					+" from(  "
 					+"  SELECT z.jobid,Z.WINNAME,SUBSTR(b.win_descr,INSTR(B.WIN_DESCR,'.')+1,length(b.win_descr)) WIN_DESCR,Z.ESCORE ,   " 
 					+" dense_rank() OVER (ORDER BY (z.ESCORE) desc) AS RANK    "
@@ -2062,7 +1931,28 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 					+" TBLEPA_DAYSCORE.WINNAME,   Employee.emp_mname,Employee.emp_lname,Employee.emp_fname   "
 					+" )A group by a.logdate,a.emp_code,a.winname )B group by b.emp_code,b.winname )D group by d.winname  "
 					+" )Z  LEFT OUTER JOIN   (SELECT WIN_NAME ,DESCR WIN_DESCR FROM ITM2MENU ) B   on Z.WINNAME=  B.WIN_NAME   " 
-					+" )C "+topNosFilter+" order by c.rank asc ";
+					+" )C "+topNosFilter+" order by c.rank asc ";*/
+        	   sql=" select c.jobid,c.WINNAME,c.WIN_DESCR,c.ESCORE,c.rank "
+					 +" from( "    
+					 +" SELECT z.jobid,Z.WINNAME,SUBSTR(b.win_descr,INSTR(B.WIN_DESCR,'.')+1,length(b.win_descr)) WIN_DESCR,Z.ESCORE , "  
+					 +"   dense_rank() OVER (ORDER BY (z.ESCORE) desc) AS RANK "     
+					 +" from( "      
+					 +" select sum(b.jobid) jobid ,b.winname,trunc(AVG(b.escore),2) escore "   
+					 +" from ( "  
+					 +"  select count(a.jobid) jobid,a.logdate,'w_' || a.winname as winname,trunc(AVG(escore),2) escore  "   
+					 +" from( "    
+					 +" select distinct tblEPA_dayScore.jobid  jobid,  tblEPA_dayScore.logdate, "
+					 +" TBLEPA_DAYSCORE.WINNAME , "   
+					 +"   trunc(AVG(nvl((tblEPA_dayScore.escore),0)),2) as escore   from TBLEPA_DAYSCORE,EMPLOYEE,USERS,transetup  "  
+					 +"   where trim(tblEPA_dayScore.userid) =trim(USERS.CODE)   and  USERS.entity_code = EMPLOYEE.EMP_CODE  "    
+					 +" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('"+frmPrd+"','dd/mm/yy')  "  
+					+"  and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('"+toPrd+"','dd/mm/yy') "   
+					+" and transetup.function_type='"+functionType+"'    and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname))  " 
+					+" and USERS.usage_intensity='"+usageIntensity+"'    and tblEPA_dayScore.escore>0  "+empTaskFilter+empCodeFilter
+					+deptCodeFilter	+"  and tblEPA_dayScore.jobid !='NA'    and tblEPA_dayScore.ACtCode!='VIEW'    "
+					+" group by TBLEPA_DAYSCORE.logdate,tblEPA_dayScore.jobid, TBLEPA_DAYSCORE.WINNAME "
+					+"    )A group by a.logdate,a.winname )B group by b.winname )Z  LEFT OUTER JOIN   "
+					+"  (SELECT WIN_NAME ,DESCR WIN_DESCR FROM ITM2MENU ) B   on Z.WINNAME=  B.WIN_NAME    )C "+topNosFilter+"  order by c.rank asc";
 
         	   pstmt = conn.prepareStatement(sql);
   			   rs = pstmt.executeQuery();
@@ -2071,7 +1961,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 					rowData = new JSONObject();
 					rowData.put("TASK_NAME", checkNull(rs.getString("WIN_DESCR"))+"["+checkNull(rs.getString("WINNAME"))+"]");
 					rowData.put("task_code", checkNull(rs.getString("WINNAME")));					
-					rowData.put("e_score", checkNull(rs.getString("ESCORE"))+"@"+"#Transactions: "+checkNull(rs.getString("jobid"))+"{br}Avg.E-1 Score:");
+					rowData.put("e_score", checkNull(rs.getString("ESCORE"))+"@"+"{br}#Transactions: "+checkNull(rs.getString("jobid"))+"{br}Avg.E-1 Score:");
 					rawDataEmpTopScoreJson.put(Integer.valueOf(count), rowData);
 					count++;
   				}
@@ -2110,7 +2000,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 	/********** End of method getTaskWiseEscoreServlet()  ******/
 	
 	
-	/********** Start of method for Task wise Time
+	/********** Start of method for Task wise Time analysis
 	* EJB Name           : EmpProductivity.java
 	* Method Name        : getTaskWiseTimeServlet(String,String,String,String)
 	* Servlet Name       : TaskWiseTimeServlet
@@ -2163,9 +2053,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
         	   toPrd=toPrd.trim();
         	   empCode=empCode.trim();
         	   int count = 0;
-        	   
-        	  
-        	   sql="select c.jobid,c.WINNAME,WIN_DESCR,c.tot_time_min,c.rank  "
+        	   /*sql="select c.jobid,c.WINNAME,WIN_DESCR,c.tot_time_min,c.rank  "
 					+" from ( "  
 					+" SELECT z.jobid,Z.WINNAME,SUBSTR(b.win_descr,INSTR(B.WIN_DESCR,'.')+1,length(b.win_descr)) WIN_DESCR, " 
 					+"  z.tot_time_min,dense_rank() OVER (ORDER BY (z.tot_time_min) asc) AS RANK   from( "   
@@ -2196,7 +2084,35 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 							+" )B group by b.emp_code ,b.winname "
 							+" )D group by d.winname "  
 							+" )Z    LEFT OUTER JOIN (SELECT WIN_NAME ,DESCR WIN_DESCR FROM ITM2MENU   ) B    on Z.WINNAME=  B.WIN_NAME "  
-							+" ) C where c.tot_time_min>=0.04 "+topNosFilter+" order by c.rank asc";
+							+" ) C where c.tot_time_min>=0.04 "+topNosFilter+" order by c.rank asc";*/
+        	   
+        	   sql="select c.jobid,c.WINNAME,c.WIN_DESCR,c.total_time,c.rank " 
+					+" from( " 
+					+" SELECT z.jobid,Z.WINNAME,SUBSTR(b.win_descr,INSTR(B.WIN_DESCR,'.')+1,length(b.win_descr)) WIN_DESCR,z.total_time, "   
+					+" dense_rank() OVER (ORDER BY (z.total_time) desc) AS RANK "  
+					+" from( "  
+					+" select sum(b.jobid) jobid ,b.winname,trunc(AVG(b.total_time),2) total_time "  
+					+" from " 
+					+" (   select count(a.jobid) jobid,a.logdate,'w_' || a.winname as winname,trunc(AVG(A.SERVERT/60),2) SERVERT,trunc(AVG(A.OHT/60),2) OHT, "
+					+" trunc(AVG(JOBT/60),2) JOBT ,trunc((AVG(A.SERVERT/60)+AVG(A.OHT/60)+AVG(JOBT/60)),2) total_time "  
+					+" from( "  
+					+" select distinct tblEPA_dayScore.jobid  jobid,  tblEPA_dayScore.logdate,  TBLEPA_DAYSCORE.WINNAME ,trunc(AVG(nvl((tblEPA_dayScore.servert),0)),2) as servert,  trunc(AVG(nvl((tblEPA_dayScore.oh),0)),2) as oht, " 
+					+" trunc(AVG(nvl((tblEPA_dayScore.jobt),0)),2) as jobt "      
+					+" from TBLEPA_DAYSCORE,EMPLOYEE,USERS,transetup "    
+					+" where trim(tblEPA_dayScore.userid) =trim(USERS.CODE)   and  USERS.entity_code = EMPLOYEE.EMP_CODE "   
+					+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('"+frmPrd+"','dd/mm/yy') "    
+					+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('"+toPrd+"','dd/mm/yy') " 
+					+" and transetup.function_type='"+functionType+"'    and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) "  
+					+" and USERS.usage_intensity='"+usageIntensity+"' " 
+					+" and tblEPA_dayScore.jobid !='NA'    and tblEPA_dayScore.ACtCode!='VIEW' "  
+					+empTaskFilter+empCodeFilter+deptCodeFilter
+					+" group by TBLEPA_DAYSCORE.logdate,tblEPA_dayScore.jobid, TBLEPA_DAYSCORE.WINNAME "   
+					+" )A group by a.logdate,a.winname " 
+					+" )B group by b.winname "
+					+" )Z  LEFT OUTER JOIN "  
+					+" (SELECT WIN_NAME ,DESCR WIN_DESCR FROM ITM2MENU ) B   on Z.WINNAME=  B.WIN_NAME "   
+					+" )C  where c.total_time>0.04 "+topNosFilter
+					+" order by c.rank asc ";
         	   
         	   pstmt = conn.prepareStatement(sql);
   			   rs = pstmt.executeQuery();
@@ -2205,7 +2121,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 					rowData = new JSONObject();
 					rowData.put("TASK_NAME", checkNull(rs.getString("WIN_DESCR"))+"["+checkNull(rs.getString("WINNAME"))+"]");
 					rowData.put("task_code", checkNull(rs.getString("WINNAME")));					
-					rowData.put("tot_time", checkNull(rs.getString("tot_time_min"))+"@"+"#Transactions: "+checkNull(rs.getString("jobid"))+"{br}Avg.Total Time:");
+					rowData.put("tot_time", checkNull(rs.getString("total_time"))+"@"+"{br}#Transactions: "+checkNull(rs.getString("jobid"))+"{br}Avg.Total Time:");
 					rawDataEmpTopScoreJson.put(Integer.valueOf(count), rowData);
 					count++;
 				}
@@ -2243,11 +2159,236 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 	
 	/********** End of method getTaskWiseTimeServlet()  ******/
 	
-	/********** Start of method for  Worst E 2 score Analysis 
+	/********** Start of method for Employee E-Score date Distribution for Task Analysis
+	 * EJB Name           : EmpProductivity.java
+	 * Method Name        : getDateWiseTaskWiseEscoreDistServlet
+	 * Servlet Name       : DateWiseTaskWiseEscoreDistServlet
+	 * Metadata xml Name  : escoretaskdistribution.xml
+	 * 
+	 * */
+	@SuppressWarnings("unchecked")
+	public JSONObject getDateWiseTaskWiseEscoreDistServlet(String dataSourceName,String frmPrd,String toPrd,String empTask,String empCode,String deptCode,String usageIntensity,String functionType) throws RemoteException, ITMException
+	{
+		JSONObject rawDayDistJson = new JSONObject();
+		JSONObject rowData = null;
+		String sql = "";
+		ResultSet rs = null;
+		PreparedStatement pstmt = null;
+		Connection conn = null;
+		ConnDriver connDriver = new ConnDriver();
+		String deptCodeFilter="",empTaskFilter="",empCodeFilter="";
+		DashboardUtility dashbordUtil = new DashboardUtility();
+		try
+		{
+			conn = connDriver.getConnectDB(dataSourceName);
+			connDriver = null;	
+        	   System.out.println("Inside getDateWiseTaskWiseEscoreDistServlet() for seperated method  for Data Soruc Name ="+dataSourceName);
+        	   deptCode=deptCode.trim();
+        	   empCode=empCode.trim();
+        	   int count = 0;
+        	   if ((empCode != null && empCode.trim().length()>0 ))
+        	   {
+        		   System.out.println("empCode" + empCode);
+        		   empCode = dashbordUtil.getCommaSeparated(empCode);
+        		   empCodeFilter = " and EMPLOYEE.EMP_CODE in ("+empCode+") ";
+        	   }
+        	   if ((deptCode != null) && (deptCode.trim().length() > 0))
+      		   {
+      			   System.out.println("deptCode" + deptCode);
+      			   deptCode = dashbordUtil.getCommaSeparated(deptCode);
+      			   deptCodeFilter = " and EMPLOYEE.DEPT_CODE in ("+deptCode+") ";
+      		   }
+        	   if(empTask.indexOf("[")!=-1 )
+ 			   {
+ 				  empTask=(empTask.substring((empTask.indexOf("[")+1),empTask.indexOf("]"))).toUpperCase();
+ 				  System.out.println("empTask for task wise : "+empTask);
+           	   }
+        	   
+        	   if ((frmPrd != null && frmPrd.trim().length()>0 ) && (toPrd != null && toPrd.trim().length()>0 ))
+   			   {
+                 sql="select A.LOGDATE,trunc(AVG(A.escore),2) as escore "
+					+" From (  "   
+					+" select distinct TBLEPA_DAYSCORE.jobid, TBLEPA_DAYSCORE.LOGDATE,  TBLEPA_DAYSCORE.WINNAME , "  
+					+" trunc((nvl(AVG(tblEPA_dayScore.escore),0)),2) as escore  from TBLEPA_DAYSCORE,EMPLOYEE,USERS,transetup "  
+					+" where trim(tblEPA_dayScore.userid) =trim(USERS.CODE)    and  USERS.entity_code = EMPLOYEE.EMP_CODE " 	
+					 +"  and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('"+frmPrd+"','dd/mm/yy')  " 
+					+"  and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('"+toPrd+"','dd/mm/yy') and transetup.function_type='"+functionType+"' " 
+					+"  and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) and USERS.usage_intensity='"+usageIntensity+"' "  
+					+" AND 'W_'||UPPER(TRIM(tblEPA_dayScore.WINNAME)) = UPPER('"+empTask+"') and tblEPA_dayScore.jobid !='NA' "   
+					+" and tblEPA_dayScore.ACtCode!='VIEW' and tblEPA_dayScore.escore>0  "  +empCodeFilter+ deptCodeFilter
+					+" group by TBLEPA_DAYSCORE.logdate,TBLEPA_DAYSCORE.WINNAME,TBLEPA_DAYSCORE.jobid "  
+					+"  ) A GROUP BY A.LOGDATE "
+					+"  ORDER BY to_date(a.logdate,'DD/MM/YY') asc ";
+        		   
+				pstmt = conn.prepareStatement(sql);
+				rs = pstmt.executeQuery();
+				while (rs.next())
+				   {
+					 rowData = new JSONObject();
+					 rowData.put("log_date", checkNull(rs.getString("LOGDATE")));
+					 rowData.put("escore"  , checkNull(rs.getString("escore")));
+					 rawDayDistJson.put(count, rowData);
+					 count++;
+				   }
+			    System.out.println("rawDayDistJson: "+rawDayDistJson);
+   			}
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+			throw new ITMException(e);
+		} finally
+		{
+			try
+			{
+				if (conn != null)
+				{
+					if (rs != null)
+					rs.close();
+					rs = null;
+					if (pstmt != null)
+					pstmt.close();
+					pstmt = null;
+					conn.close();
+					conn = null;
+				}
+				conn = null;
+			} catch (Exception d)
+			{
+				d.printStackTrace();
+				System.out.println("Exception in :EmpProductivity : getDateWiseTaskWiseEscoreDistServlet() :" + d.getMessage());
+				throw new ITMException(d);
+			}
+		}		
+		return rawDayDistJson;
+	}
+	/********** End of method getDateWiseTaskWiseEscoreDistServlet()  ******/
+	
+	/********** Start of method for Employee Date wise Time Distribution for Task Analysis
+	 * EJB Name           : EmpProductivity.java
+	 * Method Name        : getDateWiseTaskWiseTimeDistServlet
+	 * Servlet Name       : DateWiseTaskWiseTimeDistServlet
+	 * Metadata xml Name  : etaskwisetimedistribution.xml
+	 * 
+	 * */
+	@SuppressWarnings("unchecked")
+	public JSONObject getDateWiseTaskWiseTimeDistServlet(String dataSourceName,String frmPrd,String toPrd,String empTask,String empCode,String deptCode,String usageIntensity,String functionType) throws RemoteException, ITMException
+	{
+		JSONObject rawDayDistJson = new JSONObject();
+		JSONObject rowData = null;
+		String sql = "";
+		ResultSet rs = null;
+		PreparedStatement pstmt = null;
+		Connection conn = null;
+		ConnDriver connDriver = new ConnDriver();
+		String deptCodeFilter="",empTaskFilter="",empCodeFilter="";
+		DashboardUtility dashbordUtil = new DashboardUtility();
+		try
+		{
+			conn = connDriver.getConnectDB(dataSourceName);
+			connDriver = null;	
+        	   System.out.println("Inside getDateWiseTaskWiseTimeDistServlet() for seperated method  for Data Soruc Name ="+dataSourceName);
+        	   deptCode=deptCode.trim();
+        	   empCode=empCode.trim();
+        	   int count = 0;
+        	   if ((empCode != null && empCode.trim().length()>0 ))
+        	   {
+        		   System.out.println("empCode" + empCode);
+        		   empCode = dashbordUtil.getCommaSeparated(empCode);
+        		   empCodeFilter = " and EMPLOYEE.EMP_CODE in ("+empCode+") ";
+        	   }
+        	   if ((deptCode != null) && (deptCode.trim().length() > 0))
+      		   {
+      			   System.out.println("deptCode" + deptCode);
+      			   deptCode = dashbordUtil.getCommaSeparated(deptCode);
+      			   deptCodeFilter = " and EMPLOYEE.DEPT_CODE in ("+deptCode+") ";
+      		   }
+        	   if(empTask.indexOf("[")!=-1 )
+ 			   {
+ 				  empTask=(empTask.substring((empTask.indexOf("[")+1),empTask.indexOf("]"))).toUpperCase();
+ 				  System.out.println("empTask for task wise : "+empTask);
+           	   }
+        	   
+        	   if ((frmPrd != null && frmPrd.trim().length()>0 ) && (toPrd != null && toPrd.trim().length()>0 ))
+   			   {
+                /* sql="select A.LOGDATE,trunc(AVG(A.escore),2) as escore "
+					+" From (  "   
+					+" select distinct TBLEPA_DAYSCORE.jobid, TBLEPA_DAYSCORE.LOGDATE,  TBLEPA_DAYSCORE.WINNAME , "  
+					+" trunc((nvl(AVG(tblEPA_dayScore.escore),0)),2) as escore  from TBLEPA_DAYSCORE,EMPLOYEE,USERS,transetup "  
+					+" where trim(tblEPA_dayScore.userid) =trim(USERS.CODE)    and  USERS.entity_code = EMPLOYEE.EMP_CODE " 	
+					 +"  and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('"+frmPrd+"','dd/mm/yy')  " 
+					+"  and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('"+toPrd+"','dd/mm/yy') and transetup.function_type='"+functionType+"' " 
+					+"  and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) and USERS.usage_intensity='"+usageIntensity+"' "  
+					+" AND 'W_'||UPPER(TRIM(tblEPA_dayScore.WINNAME)) = UPPER('"+empTask+"') and tblEPA_dayScore.jobid !='NA' "   
+					+" and tblEPA_dayScore.ACtCode!='VIEW' and tblEPA_dayScore.escore>0  "  +empCodeFilter+ deptCodeFilter
+					+" group by TBLEPA_DAYSCORE.logdate,TBLEPA_DAYSCORE.WINNAME,TBLEPA_DAYSCORE.jobid "  
+					+"  ) A GROUP BY A.LOGDATE "
+					+"  ORDER BY to_date(a.logdate,'DD/MM/YY') asc ";*/
+        		 sql="select count(a.jobid),A.LOGDATE,trunc(AVG(A.SERVERT/60),2) SERVERT,trunc(AVG(A.OHT/60),2) OHT,"
+						+" trunc(AVG(JOBT/60),2) JOBT ,trunc((AVG(A.SERVERT/60)+AVG(A.OHT/60)+AVG(JOBT/60)),2) total_time" 
+						+" From ("    
+						+" select distinct TBLEPA_DAYSCORE.jobid, TBLEPA_DAYSCORE.LOGDATE,  TBLEPA_DAYSCORE.WINNAME ,"
+						+" trunc(AVG(nvl((tblEPA_dayScore.servert),0)),2) as servert,  trunc(AVG(nvl((tblEPA_dayScore.oh),0)),2) as oht," 
+						+" trunc(AVG(nvl((tblEPA_dayScore.jobt),0)),2) as jobt" 
+						+" from TBLEPA_DAYSCORE,EMPLOYEE,USERS,transetup "  
+						+" where trim(tblEPA_dayScore.userid) =trim(USERS.CODE)    and  USERS.entity_code = EMPLOYEE.EMP_CODE"	
+						+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('"+frmPrd+"','dd/mm/yy')  "
+						 +" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('"+toPrd+"','dd/mm/yy')   and transetup.function_type='"+functionType+"'" 
+						 +" and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname))    and USERS.usage_intensity='"+usageIntensity+"' " 
+						+" AND 'W_'||UPPER(TRIM(tblEPA_dayScore.WINNAME))  = UPPER('"+empTask+"')   and tblEPA_dayScore.jobid !='NA'  " 
+						+" and tblEPA_dayScore.ACtCode!='VIEW'    "+empCodeFilter+ deptCodeFilter
+						+" group by TBLEPA_DAYSCORE.logdate,TBLEPA_DAYSCORE.WINNAME,TBLEPA_DAYSCORE.jobid " 
+						 +" ) A GROUP BY A.LOGDATE"
+						 +" ORDER BY to_date(a.logdate,'DD/MM/YY') asc ";
+				pstmt = conn.prepareStatement(sql);
+				rs = pstmt.executeQuery();
+				while (rs.next())
+				   {
+					 rowData = new JSONObject();
+					 rowData.put("log_date", checkNull(rs.getString("LOGDATE")));
+					 rowData.put("total_time"  , checkNull(rs.getString("total_time")));
+					 rawDayDistJson.put(count, rowData);
+					 count++;
+				   }
+			    System.out.println("rawDayDistJson: "+rawDayDistJson);
+   			}
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+			throw new ITMException(e);
+		} finally
+		{
+			try
+			{
+				if (conn != null)
+				{
+					if (rs != null)
+					rs.close();
+					rs = null;
+					if (pstmt != null)
+					pstmt.close();
+					pstmt = null;
+					conn.close();
+					conn = null;
+				}
+				conn = null;
+			} catch (Exception d)
+			{
+				d.printStackTrace();
+				System.out.println("Exception in :EmpProductivity : getDateWiseTaskWiseTimeDistServlet() :" + d.getMessage());
+				throw new ITMException(d);
+			}
+		}		
+		return rawDayDistJson;
+	}
+	/********** End of method getDateWiseTaskWiseTimeDistServlet()  ******/
+	
+	/********** Start of method for  Worst E2-score Analysis 
 	 * EJB Name           : EmpProductivity.java
 	 * Method Name        : getWorstE2ScoreAnalysisServlet
 	 * Servlet Name       : WorstE2ScoreAnalysisServlet
-	 * Metadata xml Name  : efftimeanalysis.xml,attemptdistribution.xml
+	 * Metadata xml Name  : efftimeanalysis.xml
 	 * 
 	 * */
 	@SuppressWarnings("unchecked")
@@ -2294,24 +2435,9 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
         	   if ((topNos != null) && (topNos.trim().length() > 0))
     		   {
     			   System.out.println("topNos" + topNos);
-    			   topNosFilter = " where B.RN<="+topNos;
+    			   topNosFilter = " where D.RANK<="+topNos;
     		   }
         	 
-        	  /* sql=" select b.EMP_CODE,b.emp_name,b.avgNott,b.rn  "
-        			   +" from(  select  a.EMP_CODE,a.emp_name,trunc(AVG(a.NOATTE2),2) avgNott  "
-        			   +" ,rank() over(order by (trunc(AVG(a.NOATTE2),2)) asc ) as rn  "
-        			   +"  from(  select  TBLEPA_DAYSCORE.logdate logdate,EMPLOYEE.EMP_CODE as emp_code,(CASE WHEN Employee.emp_fname IS NULL THEN '' ELSE "  
-        			   +" TRIM(Employee.emp_fname) || ' ' END) || " 
-        			   +"  (CASE WHEN employee.emp_mname  IS  NULL  THEN '' ELSE TRIM(Employee.emp_mname) || ' ' END) || "  
-        			   +" (case when EMPLOYEE.EMP_LNAME  is  null  then '' else  TRIM(EMPLOYEE.EMP_LNAME) || ' ' end) as EMP_NAME,  TBLEPA_DAYSCORE.NOATT as NOATT, "
-        			   +" trunc((1/TBLEPA_DAYSCORE.NOATT)*100,2) as NOATTE2 ,  TBLEPA_DAYSCORE.WINNAME " 
-        			   +"  from TBLEPA_DAYSCORE,EMPLOYEE,  USERS ,transetup where trim(tblEPA_dayScore.userid) =trim(USERS.CODE) " 
-        			   +"  AND  USERS.entity_code = EMPLOYEE.EMP_CODE      and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('"+frmPrd+"','dd/mm/yy') " 
-        			   +"  and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('"+toPrd+"','dd/mm/yy')  and USERS.usage_intensity='"+usageIntensity+"' " 
-					   +" and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) "	   
-					   +" and transetup.function_type='"+functionType+"'  "	
-        			   +taskFilter+empCodeFilter+deptCodeFilter+" and TBLEPA_DAYSCORE.NOATT > 0 " 
-        			   +"  )a group by a.EMP_CODE,a.emp_name  )b "+topNosFilter+"  order by b.rn ";*/
         	   
         	/*   sql="select b.EMP_CODE,b.emp_name,b.avgNott,b.rn   "
    					+" from(   "
@@ -2336,7 +2462,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
    					+"  )a group by a.EMP_CODE,a.emp_name   "
    					+" )b "+topNosFilter+"  order by b.rn ";*/
         	   
-        	   sql="select b.EMP_CODE,b.emp_name,b.avgNott,b.rn "   
+        	  /* sql="select b.EMP_CODE,b.emp_name,b.avgNott,b.rn "   
    					+" from( "  
    					+" select  a.EMP_CODE,a.emp_name,trunc(AVG(a.NOATT2),2) avgNott,rank() over(order by (trunc(AVG(a.NOATT2),2)) asc ) as rn " 
    					+"   from(   "
@@ -2355,14 +2481,42 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
    					+"  and transetup.function_type='"+functionType+"'   and TBLEPA_DAYSCORE.NOATT > 0  "
    					+taskFilter+empCodeFilter+deptCodeFilter
    					+" 	group by TBLEPA_DAYSCORE.logdate,EMPLOYEE.EMP_CODE,EMPLOYEE.emp_mname,EMPLOYEE.emp_lname,EMPLOYEE.emp_fname " 
-   					+" 	)D )a group by a.EMP_CODE,a.emp_name )b  "+topNosFilter+"  order by b.rn ";
+   					+" 	)D )a group by a.EMP_CODE,a.emp_name )b  "+topNosFilter+"  order by b.rn ";*/
+        	   
+        	   sql=" select  d.jobid ,d.emp_code,d.emp_name,d.e2score ,d.RANK "
+					+" from ( "
+					+" select sum(b.jobid) jobid,b.emp_code,b.emp_name,trunc(AVG(b.e2score),2) e2score ,dense_rank () OVER (ORDER BY (trunc(AVG(b.e2score),2)) asc) AS RANK "
+					+" from ( "
+					+" select count(z.jobid) jobid,z.logdate,z.emp_code,z.emp_name,trunc(AVG(z.e2score),2) e2score  from " 
+					+" ( "
+					+" select a.jobid,a.logdate,a.emp_code,a.emp_name,a.success,a.noatt,trunc(((a.success/a.noatt)*100 ),2) e2score from "
+					+" ( "
+					+" select distinct tblEPA_dayScore.jobid  jobid,TBLEPA_DAYSCORE.LOGDATE,EMPLOYEE.EMP_CODE as emp_code,TBLEPA_DAYSCORE.WINNAME ,   "
+					+" (CASE WHEN Employee.emp_fname IS NULL THEN '' ELSE TRIM(Employee.emp_fname) || ' ' END) || "  
+					+" (CASE WHEN employee.emp_mname  IS  NULL  THEN '' "    
+					+" ELSE TRIM(Employee.emp_mname) || ' ' END) || (case when EMPLOYEE.EMP_LNAME  is  null  then '' else "    
+					+" TRIM(EMPLOYEE.EMP_LNAME) || ' ' end) as EMP_NAME , "	   
+					+" trunc(AVG(nvl((tblEPA_dayScore.noatt),0)),2) as noatt ,trunc(AVG(nvl((tblEPA_dayScore.success),0)),2) as success " 
+					+" from TBLEPA_DAYSCORE,EMPLOYEE,USERS,transetup " 
+					+" where trim(tblEPA_dayScore.userid) =trim(USERS.CODE) "    
+					+" and  USERS.entity_code = EMPLOYEE.EMP_CODE " 
+					+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('"+frmPrd+"','dd/mm/yy') " 
+							+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('"+toPrd+"','dd/mm/yy') "  
+					+" and transetup.function_type='"+functionType+"'  and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) " 
+					+" and USERS.usage_intensity='"+usageIntensity+"' " 
+					+" and tblEPA_dayScore.jobid !='NA' and tblEPA_dayScore.ACtCode!='VIEW' "
+					+taskFilter+empCodeFilter+deptCodeFilter 
+					+" group by TBLEPA_DAYSCORE.logdate,tblEPA_dayScore.jobid, EMPLOYEE.EMP_CODE,TBLEPA_DAYSCORE.WINNAME, " 
+					+" Employee.emp_mname,Employee.emp_lname,Employee.emp_fname " 
+					+" )A )Z group by z.logdate,z.emp_code,z.emp_name "
+					+" )B group by b.emp_code,b.emp_name ) D "+topNosFilter+"  order by d.RANK asc";
         	   pstmt = conn.prepareStatement(sql);
   			   rs = pstmt.executeQuery();
 			   while (rs.next())
 				{
 					rowData = new JSONObject();
 					rowData.put("EMP_CODE", checkNull(rs.getString("emp_code")));					
-					rowData.put("e2_score", checkNull(rs.getString("avgNott"))+"@"+checkNull(rs.getString("emp_name")));					
+					rowData.put("e2_score", checkNull(rs.getString("e2score"))+"@"+checkNull(rs.getString("emp_name"))+"{br}#Transactions: "+checkNull(rs.getString("jobid"))+"{br}Avg.E2-Score:");					
 					rawEffTimeJson.put(count, rowData);
 					count++;
   				}
@@ -2399,11 +2553,11 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 	}
 	/********** End of method getWorstE2ScoreAnalysisServlet()  ******/
 	
-	/********** Start of method for  top E 2 score Analysis 
+	/********** Start of method for  Top E2-score Analysis 
 	 * EJB Name           : EmpProductivity.java
 	 * Method Name        : gettopE2ScoreAnalysisServlet
 	 * Servlet Name       : TopE2ScoreAnalysisServlet
-	 * Metadata xml Name  : efftimeanalysis.xml,attemptdistribution.xml
+	 * Metadata xml Name  : efftimeanalysis.xml
 	 * 
 	 * */
 	@SuppressWarnings("unchecked")
@@ -2450,7 +2604,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
         	   if ((topNos != null) && (topNos.trim().length() > 0))
     		   {
     			   System.out.println("topNos" + topNos);
-    			   topNosFilter = " where b.rn<="+topNos;
+    			   topNosFilter = " where D.rank<="+topNos;
     		   }
         	  /* sql=" select b.EMP_CODE,b.emp_name,b.avgNott,b.rn  "
         			   +" from(  select  a.EMP_CODE,a.emp_name,trunc(AVG(a.NOATTE2),2) avgNott  "
@@ -2468,7 +2622,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
         			   +taskFilter+empCodeFilter+deptCodeFilter+" and TBLEPA_DAYSCORE.NOATT > 0 " 
         			   +"  )a group by a.EMP_CODE,a.emp_name  )b "+topNosFilter+"  order by b.rn ";*/
         	   
-        	   sql="select b.EMP_CODE,b.emp_name,b.avgNott,b.rn "   
+        	  /* sql="select b.EMP_CODE,b.emp_name,b.avgNott,b.rn "   
 					+" from( "  
 					+" select  a.EMP_CODE,a.emp_name,trunc(AVG(a.NOATT2),2) avgNott,rank() over(order by (trunc(AVG(a.NOATT2),2)) desc ) as rn " 
 					+"   from(   "
@@ -2487,7 +2641,34 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 					+" and transetup.function_type='"+functionType+"'   and TBLEPA_DAYSCORE.NOATT > 0  "
 					+taskFilter+empCodeFilter+deptCodeFilter
 					+" group by TBLEPA_DAYSCORE.logdate,EMPLOYEE.EMP_CODE,EMPLOYEE.emp_mname,EMPLOYEE.emp_lname,EMPLOYEE.emp_fname " 
-					+" 	)D )a group by a.EMP_CODE,a.emp_name )b  "+topNosFilter+"  order by b.rn ";
+					+" )D )a group by a.EMP_CODE,a.emp_name )b  "+topNosFilter+"  order by b.rn ";*/
+        	   sql=" select  d.jobid ,d.emp_code,d.emp_name,d.e2score ,d.RANK "
+   					+" from ( "
+   					+" select sum(b.jobid) jobid,b.emp_code,b.emp_name,trunc(AVG(b.e2score),2) e2score ,dense_rank () OVER (ORDER BY (trunc(AVG(b.e2score),2)) desc) AS RANK "
+   					+" from ( "
+   					+" select count(z.jobid) jobid,z.logdate,z.emp_code,z.emp_name,trunc(AVG(z.e2score),2) e2score  from " 
+   					+" ( "
+   					+" select a.jobid,a.logdate,a.emp_code,a.emp_name,a.success,a.noatt,trunc(((a.success/a.noatt)*100 ),2) e2score from "
+   					+" ( "
+   					+" select distinct tblEPA_dayScore.jobid  jobid,TBLEPA_DAYSCORE.LOGDATE,EMPLOYEE.EMP_CODE as emp_code,TBLEPA_DAYSCORE.WINNAME ,   "
+   					+" (CASE WHEN Employee.emp_fname IS NULL THEN '' ELSE TRIM(Employee.emp_fname) || ' ' END) || "  
+   					+" (CASE WHEN employee.emp_mname  IS  NULL  THEN '' "    
+   					+" ELSE TRIM(Employee.emp_mname) || ' ' END) || (case when EMPLOYEE.EMP_LNAME  is  null  then '' else "    
+   					+" TRIM(EMPLOYEE.EMP_LNAME) || ' ' end) as EMP_NAME , "	   
+   					+" trunc(AVG(nvl((tblEPA_dayScore.noatt),0)),2) as noatt ,trunc(AVG(nvl((tblEPA_dayScore.success),0)),2) as success " 
+   					+" from TBLEPA_DAYSCORE,EMPLOYEE,USERS,transetup " 
+   					+" where trim(tblEPA_dayScore.userid) =trim(USERS.CODE) "    
+   					+" and  USERS.entity_code = EMPLOYEE.EMP_CODE " 
+   					+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('"+frmPrd+"','dd/mm/yy') " 
+   					+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('"+toPrd+"','dd/mm/yy') "  
+   					+" and transetup.function_type='"+functionType+"'  and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) " 
+   					+" and USERS.usage_intensity='"+usageIntensity+"' " 
+   					+" and tblEPA_dayScore.jobid !='NA' and tblEPA_dayScore.ACtCode!='VIEW' "
+   					+taskFilter+empCodeFilter+deptCodeFilter 
+   					+" group by TBLEPA_DAYSCORE.logdate,tblEPA_dayScore.jobid, EMPLOYEE.EMP_CODE,TBLEPA_DAYSCORE.WINNAME, " 
+   					+" Employee.emp_mname,Employee.emp_lname,Employee.emp_fname " 
+   					+" )A )Z group by z.logdate,z.emp_code,z.emp_name "
+   					+" )B group by b.emp_code,b.emp_name ) D "+topNosFilter+"  order by d.RANK asc";
         	   
         	   
         	   pstmt = conn.prepareStatement(sql);
@@ -2496,7 +2677,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 				{
 					rowData = new JSONObject();
 					rowData.put("EMP_CODE", checkNull(rs.getString("emp_code")));					
-					rowData.put("e2_score", checkNull(rs.getString("avgNott"))+"@"+checkNull(rs.getString("emp_name")));					
+					rowData.put("e2_score", checkNull(rs.getString("e2score"))+"@"+checkNull(rs.getString("emp_name"))+"{br}#Transactions: "+checkNull(rs.getString("jobid"))+"{br}Avg.E2-Score:");					
 					rawEffTimeJson.put(count, rowData);
 					count++;
   				}
@@ -2533,11 +2714,11 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 	}
 	/********** End of method getTopE2ScoreAnalysisServlet()  ******/
 	
-	/********** Start of method for Employee E-Score date Distribution
+	/********** Start of method for Employee E2-Score date Distribution
 	 * EJB Name           : EmpProductivity.java
 	 * Method Name        : getDateWiseE2scoreDistributionServlet
 	 * Servlet Name       : DateWiseE2scoreDistributionServlet
-	 * Metadata xml Name  : escoredistribution.xml
+	 * Metadata xml Name  : e2scoredistribution.xml
 	 * 
 	 * */
 	@SuppressWarnings("unchecked")
@@ -2581,9 +2762,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
     			   empCode = dashbordUtil.getCommaSeparated(empCode);
     			   empCodeFilter = " AND employee.EMP_CODE IN (" + empCode + ") ";
     		   }
-        	  
-        	   /*sql="select a.logdate,a.emp_code,trunc((1/a.NOATT)*100,2) as NOATTE2 "
-					+" from ( "
+        	   /*sql=" select a.logdate,a.emp_code,trunc((1/a.NOATT)*100,2) as NOATTE2 from ( "
 					+" select  TBLEPA_DAYSCORE.logdate logdate,EMPLOYEE.EMP_CODE as emp_code,  "
 					+" sum (TBLEPA_DAYSCORE.NOATT) as NOATT "
 					  +"  from TBLEPA_DAYSCORE,EMPLOYEE,  USERS ,transetup  "    
@@ -2591,39 +2770,43 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
 					+"  and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('"+frmPrd+"','dd/mm/yy')  "  
 					+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('"+toPrd+"','dd/mm/yy') "    
 					+"  and USERS.usage_intensity='"+usageIntensity+"' and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) " 
-					+"  and transetup.function_type='"+functionType+"' and tblEPA_dayScore.jobid !='NA' and tblEPA_dayScore.ACtCode!='VIEW'  and TBLEPA_DAYSCORE.NOATT > 0 " 
+					+"  and transetup.function_type='"+functionType+"' and TBLEPA_DAYSCORE.NOATT > 0  "
 					+ empCodeFilter + taskFilter + deptCodeFilter	
-					+" group by TBLEPA_DAYSCORE.logdate ,EMPLOYEE.EMP_COD " 
+					+" group by TBLEPA_DAYSCORE.logdate ,EMPLOYEE.EMP_CODE  "
 					+" order by to_date(TBLEPA_DAYSCORE.logdate,'DD/MM/YY') )A ";*/
         	   
-        	   sql=" select a.logdate,a.emp_code,trunc((1/a.NOATT)*100,2) as NOATTE2 from ( "
-					+" select  TBLEPA_DAYSCORE.logdate logdate,EMPLOYEE.EMP_CODE as emp_code,  "
-					+" sum (TBLEPA_DAYSCORE.NOATT) as NOATT "
-					  +"  from TBLEPA_DAYSCORE,EMPLOYEE,  USERS ,transetup  "    
-					+" where trim(tblEPA_dayScore.userid) =trim(USERS.CODE) AND  USERS.entity_code = EMPLOYEE.EMP_CODE  "    
+        	   sql="select b.logdate,b.emp_code,b.emp_name,trunc(AVG(b.e2score),2) e2score "
+					 +" from "
+					 +" ( "
+					 +" select a.logdate,a.emp_code,a.emp_name,a.success,a.noatt,trunc(((a.success/a.noatt)*100 ),2) e2score from "
+					 +" ( "
+					 +" select distinct tblEPA_dayScore.jobid  jobid,TBLEPA_DAYSCORE.LOGDATE,EMPLOYEE.EMP_CODE as emp_code,TBLEPA_DAYSCORE.WINNAME , " 
+					 +" (CASE WHEN Employee.emp_fname IS NULL THEN '' ELSE TRIM(Employee.emp_fname) || ' ' END) ||  "
+					 +" (CASE WHEN employee.emp_mname  IS  NULL  THEN '' "   
+					 +" ELSE TRIM(Employee.emp_mname) || ' ' END) || (case when EMPLOYEE.EMP_LNAME  is  null  then '' else "   
+					+" TRIM(EMPLOYEE.EMP_LNAME) || ' ' end) as EMP_NAME ,	"   
+					+" trunc(AVG(nvl((tblEPA_dayScore.noatt),0)),2) as noatt ,trunc(AVG(nvl((tblEPA_dayScore.success),0)),2) as success" 
+					+" from TBLEPA_DAYSCORE,EMPLOYEE,USERS,transetup "
+					+" where trim(tblEPA_dayScore.userid) =trim(USERS.CODE) "   
+					+" and  USERS.entity_code = EMPLOYEE.EMP_CODE " 
 					+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') >= to_date('"+frmPrd+"','dd/mm/yy')  "
 					+" and to_date(tblEPA_dayScore.logdate,'dd/mm/yy') <= to_date('"+toPrd+"','dd/mm/yy') "  
-					+"  and USERS.usage_intensity='"+usageIntensity+"' and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) " 
-					+"  and transetup.function_type='"+functionType+"' and TBLEPA_DAYSCORE.NOATT > 0  "
+					+" and transetup.function_type='"+functionType+"'  and UPPER(TRIM(transetup.tran_window))='W_' ||UPPER(TRIM(TBLEPA_DAYSCORE.winname)) "
+					+" and USERS.usage_intensity='"+usageIntensity+"' " 
 					+ empCodeFilter + taskFilter + deptCodeFilter	
-					+" group by TBLEPA_DAYSCORE.logdate ,EMPLOYEE.EMP_CODE  "
-					+" order by to_date(TBLEPA_DAYSCORE.logdate,'DD/MM/YY') )A ";
+					+" and tblEPA_dayScore.jobid !='NA' and tblEPA_dayScore.ACtCode!='VIEW' "
+					+" group by TBLEPA_DAYSCORE.logdate,tblEPA_dayScore.jobid, EMPLOYEE.EMP_CODE,TBLEPA_DAYSCORE.WINNAME, " 
+					+" Employee.emp_mname,Employee.emp_lname,Employee.emp_fname "
+					+" )A "
+					+" )B group by  b.logdate,b.emp_code,b.emp_name "
+					+" order by to_date(b.logdate,'DD/MM/YY') ";
 				pstmt = conn.prepareStatement(sql);
 				rs = pstmt.executeQuery();
 				while (rs.next())
 				   {
 					rowData = new JSONObject();
 					rowData.put("log_date", checkNull(rs.getString("logdate")));					
-					e2Score=Double.parseDouble(checkZero(rs.getString("NOATTE2")));
-				    if(count==0)
-				    {
-				    	finalE2Score=e2Score;
-				    }
-				    else 
-				    {
-				    	finalE2Score=((finalE2Score+e2Score)/2);
-				    }
-				    rowData.put("e2_score", finalE2Score);
+				    rowData.put("e2_score", checkNull(rs.getString("e2score")));
 					rawDayDistJson.put(count, rowData);
 					count++;
 				   }

webitm-dashboard/ibase/dashboard/epa/ejb/EmpProductivityLocal.java

@@ -34,6 +34,8 @@ public abstract interface EmpProductivityLocal extends ValidatorLocal
 	public JSONObject getDateWiseE2scoreDistributionServlet(String dataSourceName,String frmPrd,String toPrd,String empTask,String empCode,String deptCode,String usageIntensity,String functionType) throws RemoteException, ITMException;
 	
 	public JSONObject getEmployeeProfileData(String dataSourceName,  String empCode) throws RemoteException, ITMException;
+	public JSONObject getDateWiseTaskWiseEscoreDistServlet(String dataSourceName,String frmPrd,String toPrd,String empTask,String empCode,String deptCode,String usageIntensity,String functionType) throws RemoteException, ITMException;
+	public JSONObject getDateWiseTaskWiseTimeDistServlet(String dataSourceName,String frmPrd,String toPrd,String empTask,String empCode,String deptCode,String usageIntensity,String functionType) throws RemoteException, ITMException;
 
 }
 

webitm-dashboard/ibase/dashboard/epa/ejb/EmpProductivityRemote.java

@@ -34,6 +34,8 @@ public abstract interface EmpProductivityRemote extends ValidatorRemote
 	public JSONObject getDateWiseE2scoreDistributionServlet(String dataSourceName,String frmPrd,String toPrd,String empTask,String empCode,String deptCode,String usageIntensity,String functionType) throws RemoteException, ITMException;
 	
 	public JSONObject getEmployeeProfileData(String dataSourceName,  String empCode) throws RemoteException, ITMException;
+	public JSONObject getDateWiseTaskWiseEscoreDistServlet(String dataSourceName,String frmPrd,String toPrd,String empTask,String empCode,String deptCode,String usageIntensity,String functionType) throws RemoteException, ITMException;
+	public JSONObject getDateWiseTaskWiseTimeDistServlet(String dataSourceName,String frmPrd,String toPrd,String empTask,String empCode,String deptCode,String usageIntensity,String functionType) throws RemoteException, ITMException;
 
 }