Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== diff -u -r95202c29d0cab6765b9c03fff3a721826ab7ec9d -r576423e7a806c12d2bc6031edf1fa3b9836c91a9 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 95202c29d0cab6765b9c03fff3a721826ab7ec9d) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 576423e7a806c12d2bc6031edf1fa3b9836c91a9) @@ -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 =================================================================== diff -u -r95202c29d0cab6765b9c03fff3a721826ab7ec9d -r576423e7a806c12d2bc6031edf1fa3b9836c91a9 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java (.../QaUsrRespDAO.java) (revision 95202c29d0cab6765b9c03fff3a721826ab7ec9d) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java (.../QaUsrRespDAO.java) (revision 576423e7a806c12d2bc6031edf1fa3b9836c91a9) @@ -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 =================================================================== diff -u -r95202c29d0cab6765b9c03fff3a721826ab7ec9d -r576423e7a806c12d2bc6031edf1fa3b9836c91a9 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision 95202c29d0cab6765b9c03fff3a721826ab7ec9d) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision 576423e7a806c12d2bc6031edf1fa3b9836c91a9) @@ -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 =================================================================== diff -u -r185407e8ce549d060dcd00c47c86007145eee47e -r576423e7a806c12d2bc6031edf1fa3b9836c91a9 --- lams_tool_laqa/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision 185407e8ce549d060dcd00c47c86007145eee47e) +++ lams_tool_laqa/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision 576423e7a806c12d2bc6031edf1fa3b9836c91a9) @@ -59,9 +59,6 @@ widthFixed: true, widgets: ['zebra'], headers: { - 1: { - sorter: false - }, 2: { sorter: false } Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp =================================================================== diff -u -r185407e8ce549d060dcd00c47c86007145eee47e -r576423e7a806c12d2bc6031edf1fa3b9836c91a9 --- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp (.../RevisitedLearnerRep.jsp) (revision 185407e8ce549d060dcd00c47c86007145eee47e) +++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp (.../RevisitedLearnerRep.jsp) (revision 576423e7a806c12d2bc6031edf1fa3b9836c91a9) @@ -60,9 +60,6 @@ widthFixed: true, widgets: ['zebra'], headers: { - 1: { - sorter: false - }, 2: { sorter: false }