Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java =================================================================== diff -u -r6668d717bec2c56125019a19b256013f5c05269e -rc88e5df1e9ddf244579772d913c0b696c731b3ab --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java (.../QaUsrRespDAO.java) (revision 6668d717bec2c56125019a19b256013f5c05269e) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java (.../QaUsrRespDAO.java) (revision c88e5df1e9ddf244579772d913c0b696c731b3ab) @@ -107,8 +107,8 @@ } private static final String SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_AVG_RATING1 = "SELECT resp.*, AVG(rating.rating) avg_rating" - + " FROM tl_laqa11_usr_resp resp WHERE resp.answer IS NOT NULL" + " JOIN tl_laqa11_que_usr usr" - + " ON resp.qa_que_content_id = :questionId AND resp.que_usr_id = usr.uid " + + " FROM tl_laqa11_usr_resp resp" + " JOIN tl_laqa11_que_usr usr" + + " ON resp.answer IS NOT NULL AND resp.qa_que_content_id = :questionId AND resp.que_usr_id = usr.uid " + " AND usr.que_usr_id!=:excludeUserId " + " JOIN tl_laqa11_session sess " + " ON usr.qa_session_id = sess.uid AND sess.qa_session_id = :qaSessionId "; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== diff -u -r6668d717bec2c56125019a19b256013f5c05269e -rc88e5df1e9ddf244579772d913c0b696c731b3ab --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision 6668d717bec2c56125019a19b256013f5c05269e) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision c88e5df1e9ddf244579772d913c0b696c731b3ab) @@ -1097,9 +1097,6 @@ responcedata.put(AttributeNames.ATTR_COUNT_RATED_ITEMS, countRatedQuestions); } - // setting date format to ISO8601 for jquery.timeago - DateFormat dateFormatterTimeAgo = new SimpleDateFormat(DateUtil.ISO8601_FORMAT); - dateFormatterTimeAgo.setTimeZone(TimeZone.getTimeZone("GMT")); for (QaUsrResp response : responses) { QaQueUsr user = response.getQaQueUser(); @@ -1126,7 +1123,7 @@ // in the server time zone. Date attemptTime = response.getAttemptTime(); responseRow.put("attemptTime", DateUtil.convertToStringForJSON(attemptTime, request.getLocale())); - responseRow.put("timeAgo", dateFormatterTimeAgo.format(attemptTime)); + responseRow.put("timeAgo", DateUtil.convertToStringForTimeagoJSON(attemptTime)); if (isAllowRateAnswers) { Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp =================================================================== diff -u -r6668d717bec2c56125019a19b256013f5c05269e -rc88e5df1e9ddf244579772d913c0b696c731b3ab --- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision 6668d717bec2c56125019a19b256013f5c05269e) +++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision c88e5df1e9ddf244579772d913c0b696c731b3ab) @@ -91,7 +91,9 @@ + +