Commit f844869c authored by sbade's avatar sbade

changed Profile data sql as date format was displaying wrong date in dashboard grid


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98328 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6bb7c79d
...@@ -121,7 +121,7 @@ public JSONObject getLeastEmployeeScoreData(String dataSourceName, String month, ...@@ -121,7 +121,7 @@ public JSONObject getLeastEmployeeScoreData(String dataSourceName, String month,
} }
finally finally
{ {
try { try {
if (conn != null) if (conn != null)
{ {
if (rs != null) if (rs != null)
...@@ -989,8 +989,10 @@ public JSONObject getTopEmployeeScoreDataDayWise(String dataSourceName, String f ...@@ -989,8 +989,10 @@ public JSONObject getTopEmployeeScoreDataDayWise(String dataSourceName, String f
sql = "select emp.designation as designation,emp.dept_code as dept_code ,dep.descr as descr, emp.emp_fname as emp_fname, " sql = "select emp.designation as designation,emp.dept_code as dept_code ,dep.descr as descr, emp.emp_fname as emp_fname, "
+" emp.emp_lname as emp_lname ,emp.emp_type as emp_type, " +" emp.emp_lname as emp_lname ,emp.emp_type as emp_type, "
+" emp.grade as grade , " +" emp.grade as grade , "
+" to_char(TO_DATE(emp.date_join,'DD/MM/YY'),'DD/MM/YYYY') as date_join , " +" to_char(emp.date_join,'DD/MM/YYYY') as date_join , "
+" to_char(TO_DATE(emp.birth_date,'DD/MM/YY'),'DD/MM/YYYY') as birth_date " +" to_char(emp.birth_date,'DD/MM/YYYY') as birth_date "
//+" to_char(TO_DATE(emp.date_join,'DD/MM/YYYY'),'DD/MM/YYYY') as date_join , "
//+" to_char(TO_DATE(emp.birth_date,'DD/MM/YYYY'),'DD/MM/YYYY') as birth_date "
+" from employee emp inner join department dep on emp.dept_code=dep.dept_code " +" from employee emp inner join department dep on emp.dept_code=dep.dept_code "
+" where emp.emp_code='"+empCode+"' "; +" where emp.emp_code='"+empCode+"' ";
...@@ -1078,7 +1080,7 @@ public JSONObject getTopEmployeeScoreDataDayWise(String dataSourceName, String f ...@@ -1078,7 +1080,7 @@ public JSONObject getTopEmployeeScoreDataDayWise(String dataSourceName, String f
//" to_char(round( AVG(Nscore),2)) as score1, " + //" to_char(round( AVG(Nscore),2)) as score1, " +
///" to_char(round(AVG(Tscore),2)) as score2, to_char(round(AVG(Escore),2)) as score3 " + ///" to_char(round(AVG(Tscore),2)) as score2, to_char(round(AVG(Escore),2)) as score3 " +
" to_char(round(AVG(CASE WHEN '"+scoreType+"' ='No. Of Attempts' then Nscore when '"+scoreType+"' ='Time Score' then Tscore WHEN '"+scoreType+"' ='Efficiency Score' then Escore ELSE 0 END),2)) as SCORE " " to_char(round(AVG(CASE WHEN '"+scoreType+"' ='No. Of Attempts' then Nscore when '"+scoreType+"' ='Time Score' then Tscore WHEN '"+scoreType+"' ='Efficiency Score' then Escore ELSE 0 END),2)) as SCORE "
+"from tblEPA_DayScore , " + +" from tblEPA_DayScore , " +
" employee,USERS where trim(tblEPA_DayScore.userid) = trim(USERS.CODE) AND USERS.entity_code = EMPLOYEE.EMP_CODE " + " employee,USERS where trim(tblEPA_DayScore.userid) = trim(USERS.CODE) AND USERS.entity_code = EMPLOYEE.EMP_CODE " +
" and tblEPA_DayScore.wkno=" +week + " " + " and tblEPA_DayScore.wkno=" +week + " " +
" and EMPLOYEE.EMP_CODE = '" + empCode + "' " + " and EMPLOYEE.EMP_CODE = '" + empCode + "' " +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment