Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v diff -u -r1.99 -r1.100 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 2 Nov 2015 02:45:47 -0000 1.99 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 2 Nov 2015 04:32:40 -0000 1.100 @@ -30,10 +30,12 @@ public interface QaAppConstants { public static final int SORT_BY_NO = 0; - public static final int SORT_BY_USERNAME_ASC = 1; - public static final int SORT_BY_USERNAME_DESC = 2; - public static final int SORT_BY_RATING_ASC = 3; - public static final int SORT_BY_RATING_DESC = 4; + public static final int SORT_BY_ANSWER_ASC = 3; // learner + public static final int SORT_BY_ANSWER_DESC = 4; // learner + public static final int SORT_BY_USERNAME_ASC = 1; // monitoring + public static final int SORT_BY_USERNAME_DESC = 2; // monitoring + public static final int SORT_BY_RATING_ASC = 5; // learner & monitoring + public static final int SORT_BY_RATING_DESC = 6; // learner & monitoring public static final String MY_SIGNATURE = "laqa11"; public static final String TOOL_CONTENT_ID = "toolContentID"; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java,v diff -u -r1.24 -r1.25 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java 2 Nov 2015 02:45:48 -0000 1.24 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java 2 Nov 2015 04:32:40 -0000 1.25 @@ -127,6 +127,12 @@ case QaAppConstants.SORT_BY_NO: sortingOrder = "qaUsrResp.attemptTime"; break; + case QaAppConstants.SORT_BY_ANSWER_ASC: + sortingOrder = "answer ASC"; + break; + case QaAppConstants.SORT_BY_ANSWER_DESC: + sortingOrder = "answer DESC"; + break; case QaAppConstants.SORT_BY_USERNAME_ASC: sortingOrder = "qaUsrResp.qaQueUser.fullname ASC"; break; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v diff -u -r1.69 -r1.70 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 2 Nov 2015 02:45:48 -0000 1.69 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 2 Nov 2015 04:32:40 -0000 1.70 @@ -1042,15 +1042,19 @@ //paging parameters of tablesorter int size = WebUtil.readIntParam(request, "size"); int page = WebUtil.readIntParam(request, "page"); - Integer sortByUser = WebUtil.readIntParam(request, "column[0]", true); - Integer sortByRating = WebUtil.readIntParam(request, "column[1]", true); + Integer sortByCol1 = WebUtil.readIntParam(request, "column[0]", true); + Integer sortByCol2 = WebUtil.readIntParam(request, "column[1]", true); String searchString = request.getParameter("fcol[0]"); int sorting = QaAppConstants.SORT_BY_NO; - if (sortByUser != null ) { - sorting = sortByUser.equals(0) ? QaAppConstants.SORT_BY_USERNAME_ASC : QaAppConstants.SORT_BY_USERNAME_DESC; - } else if ( sortByRating != null ) { - sorting = sortByRating.equals(0) ? QaAppConstants.SORT_BY_RATING_ASC : QaAppConstants.SORT_BY_RATING_DESC; + if (sortByCol1 != null ) { + if ( isMonitoring ) + sorting = sortByCol1.equals(0) ? QaAppConstants.SORT_BY_USERNAME_ASC : QaAppConstants.SORT_BY_USERNAME_DESC; + else + sorting = sortByCol1.equals(0) ? QaAppConstants.SORT_BY_ANSWER_ASC : QaAppConstants.SORT_BY_ANSWER_DESC; + + } else if ( sortByCol2 != null ) { + sorting = sortByCol2.equals(0) ? QaAppConstants.SORT_BY_RATING_ASC : QaAppConstants.SORT_BY_RATING_DESC; } List responses = qaService.getResponsesForTablesorter(qaContentId, qaSessionId, questionUid, userId, page, size, Index: lams_tool_laqa/web/learning/LearnerRep.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/LearnerRep.jsp,v diff -u -r1.64 -r1.65 --- lams_tool_laqa/web/learning/LearnerRep.jsp 20 Oct 2015 04:24:59 -0000 1.64 +++ lams_tool_laqa/web/learning/LearnerRep.jsp 2 Nov 2015 04:32:40 -0000 1.65 @@ -59,9 +59,6 @@ widthFixed: true, widgets: ['zebra'], headers: { - 1: { - sorter: false - }, 2: { sorter: false } Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp,v diff -u -r1.43 -r1.44 --- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp 20 Oct 2015 04:24:59 -0000 1.43 +++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp 2 Nov 2015 04:32:40 -0000 1.44 @@ -60,9 +60,6 @@ widthFixed: true, widgets: ['zebra'], headers: { - 1: { - sorter: false - }, 2: { sorter: false }