Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java =================================================================== diff -u -rd0f4c3bdd871e236755472c8443c337b2b96e48c -r3340a9fb8b4f086b2aa82aa121a2c597d863e8b9 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java (.../MonitoringController.java) (revision d0f4c3bdd871e236755472c8443c337b2b96e48c) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 3340a9fb8b4f086b2aa82aa121a2c597d863e8b9) @@ -98,10 +98,8 @@ public static Logger log = Logger.getLogger(MonitoringController.class); - public static final int LEARNER_MARKS_SORTING_FIRST_NAME_ASC = 0; - public static final int LEARNER_MARKS_SORTING_FIRST_NAME_DESC = 1; - public static final int LEARNER_MARKS_SORTING_LAST_NAME_ASC = 2; - public static final int LEARNER_MARKS_SORTING_LAST_NAME_DESC = 3; + public static final int LEARNER_MARKS_SORTING_FULL_NAME_ASC = 0; + public static final int LEARNER_MARKS_SORTING_FULL_NAME_DESC = 1; @Autowired private IDokumaranService dokumaranService; @@ -197,19 +195,12 @@ // paging parameters of tablesorter int size = WebUtil.readIntParam(request, "size"); int page = WebUtil.readIntParam(request, "page"); - Integer isSortFirstName = WebUtil.readIntParam(request, "column[0]", true); - Integer isSortLastName = WebUtil.readIntParam(request, "column[1]", true); + Integer isSortFullName = WebUtil.readIntParam(request, "column[0]", true); // identify sorting type - int sorting = LEARNER_MARKS_SORTING_LAST_NAME_ASC; - if (isSortFirstName != null) { - sorting = isSortFirstName.equals(1) - ? LEARNER_MARKS_SORTING_FIRST_NAME_DESC - : LEARNER_MARKS_SORTING_FIRST_NAME_ASC; - } else if (isSortLastName != null) { - sorting = isSortLastName.equals(1) - ? LEARNER_MARKS_SORTING_LAST_NAME_DESC - : LEARNER_MARKS_SORTING_LAST_NAME_ASC; + int sorting = LEARNER_MARKS_SORTING_FULL_NAME_ASC; + if (isSortFullName != null && isSortFullName.equals(1)) { + sorting = LEARNER_MARKS_SORTING_FULL_NAME_DESC; } // get all session users and sort them according to the parameter from tablesorter @@ -220,7 +211,7 @@ ObjectNode responsedata = JsonNodeFactory.instance.objectNode(); if (!users.isEmpty()) { // reverse if sorting is descending - if (sorting == LEARNER_MARKS_SORTING_FIRST_NAME_DESC || sorting == LEARNER_MARKS_SORTING_LAST_NAME_DESC) { + if (sorting == LEARNER_MARKS_SORTING_FULL_NAME_DESC) { Collections.reverse(users); } Index: lams_tool_doku/web/pages/monitoring/summary.jsp =================================================================== diff -u -rd0f4c3bdd871e236755472c8443c337b2b96e48c -r3340a9fb8b4f086b2aa82aa121a2c597d863e8b9 --- lams_tool_doku/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision d0f4c3bdd871e236755472c8443c337b2b96e48c) +++ lams_tool_doku/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 3340a9fb8b4f086b2aa82aa121a2c597d863e8b9) @@ -213,8 +213,7 @@ sortInitialOrder: 'asc', sortList: [[0]], widgets: [ "uitheme", "resizable", "editable" ], - headers: { 0: { sorter: true}, 1: { sorter: true} }, - sortList : [[0,1]], + headers: { 0: { sorter: true}, 1: { sorter: false} }, showProcessing: false, widgetOptions: { resizable: true, Index: lams_tool_doku/web/pages/monitoring/summary5.jsp =================================================================== diff -u -rd0f4c3bdd871e236755472c8443c337b2b96e48c -r3340a9fb8b4f086b2aa82aa121a2c597d863e8b9 --- lams_tool_doku/web/pages/monitoring/summary5.jsp (.../summary5.jsp) (revision d0f4c3bdd871e236755472c8443c337b2b96e48c) +++ lams_tool_doku/web/pages/monitoring/summary5.jsp (.../summary5.jsp) (revision 3340a9fb8b4f086b2aa82aa121a2c597d863e8b9) @@ -181,8 +181,7 @@ sortInitialOrder: 'asc', sortList: [[0]], widgets: [ "uitheme", "resizable", "editable" ], - headers: { 0: { sorter: true}, 1: { sorter: true} }, - sortList : [[0,1]], + headers: { 0: { sorter: true}, 1: { sorter: false} }, showProcessing: false, widgetOptions: { resizable: true, Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/MonitoringController.java =================================================================== diff -u -rd0f4c3bdd871e236755472c8443c337b2b96e48c -r3340a9fb8b4f086b2aa82aa121a2c597d863e8b9 --- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/MonitoringController.java (.../MonitoringController.java) (revision d0f4c3bdd871e236755472c8443c337b2b96e48c) +++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 3340a9fb8b4f086b2aa82aa121a2c597d863e8b9) @@ -94,10 +94,8 @@ public static Logger log = Logger.getLogger(MonitoringController.class); - public static final int LEARNER_MARKS_SORTING_FIRST_NAME_ASC = 0; - public static final int LEARNER_MARKS_SORTING_FIRST_NAME_DESC = 1; - public static final int LEARNER_MARKS_SORTING_LAST_NAME_ASC = 2; - public static final int LEARNER_MARKS_SORTING_LAST_NAME_DESC = 3; + public static final int LEARNER_MARKS_SORTING_FULL_NAME_ASC = 0; + public static final int LEARNER_MARKS_SORTING_FULL_NAME_DESC = 1; @Autowired private IWhiteboardService whiteboardService; @@ -184,19 +182,12 @@ // paging parameters of tablesorter int size = WebUtil.readIntParam(request, "size"); int page = WebUtil.readIntParam(request, "page"); - Integer isSortFirstName = WebUtil.readIntParam(request, "column[0]", true); - Integer isSortLastName = WebUtil.readIntParam(request, "column[1]", true); + Integer isSortFullName = WebUtil.readIntParam(request, "column[0]", true); // identify sorting type - int sorting = LEARNER_MARKS_SORTING_LAST_NAME_ASC; - if (isSortFirstName != null) { - sorting = isSortFirstName.equals(1) - ? LEARNER_MARKS_SORTING_FIRST_NAME_DESC - : LEARNER_MARKS_SORTING_FIRST_NAME_ASC; - } else if (isSortLastName != null) { - sorting = isSortLastName.equals(1) - ? LEARNER_MARKS_SORTING_LAST_NAME_DESC - : LEARNER_MARKS_SORTING_LAST_NAME_ASC; + int sorting = LEARNER_MARKS_SORTING_FULL_NAME_ASC; + if (isSortFullName != null && isSortFullName.equals(1)) { + sorting = LEARNER_MARKS_SORTING_FULL_NAME_DESC; } // get all session users and sort them according to the parameter from tablesorter @@ -207,7 +198,7 @@ ObjectNode responsedata = JsonNodeFactory.instance.objectNode(); if (!users.isEmpty()) { // reverse if sorting is descending - if (sorting == LEARNER_MARKS_SORTING_FIRST_NAME_DESC || sorting == LEARNER_MARKS_SORTING_LAST_NAME_DESC) { + if (sorting == LEARNER_MARKS_SORTING_FULL_NAME_DESC) { Collections.reverse(users); } Index: lams_tool_whiteboard/web/pages/monitoring/summary.jsp =================================================================== diff -u -rd0f4c3bdd871e236755472c8443c337b2b96e48c -r3340a9fb8b4f086b2aa82aa121a2c597d863e8b9 --- lams_tool_whiteboard/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision d0f4c3bdd871e236755472c8443c337b2b96e48c) +++ lams_tool_whiteboard/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 3340a9fb8b4f086b2aa82aa121a2c597d863e8b9) @@ -233,8 +233,7 @@ sortInitialOrder: 'asc', sortList: [[0]], widgets: [ "uitheme", "resizable", "editable" ], - headers: { 0: { sorter: true}, 1: { sorter: true} }, - sortList : [[0,1]], + headers: { 0: { sorter: true}, 1: { sorter: false} }, showProcessing: false, widgetOptions: { resizable: true,