Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp =================================================================== diff -u -r70e7323be9b50d1e8c3902cde43cbe5039181541 -r6f53dcc0016b4e9c777dcf89595faf121a5da8c9 --- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision 70e7323be9b50d1e8c3902cde43cbe5039181541) +++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision 6f53dcc0016b4e9c777dcf89595faf121a5da8c9) @@ -106,7 +106,7 @@ $(".tablesorter").tablesorter({ theme: 'bootstrap', widthFixed: true, - widgets: ["uitheme", "zebra", "filter"], + widgets: ["uitheme", "zebra", "filter", "resizable"], headerTemplate : '{content} {icon}', headers: { 1: { filter: false }, 2: { filter: false, sorter: false } }, widgetOptions : { @@ -122,12 +122,11 @@ $(this).tablesorterPager({ // set to false otherwise it remembers setting from other jsFiddle demos savePages: false, - // use this format: "http:/mydatabase.com?page={page}&size={size}&{sortList:col}" - // where {page} is replaced by the page number (or use {page+1} to get a one-based index), - // {size} is replaced by the number of records to show, - // {sortList:col} adds the sortList to the url into a "col" array, and {filterList:fcol} adds - // the filterList to the url into an "fcol" array. - // So a sortList = [[2,0],[3,0]] becomes "&col[2]=0&col[3]=0" in the url + container: $(this).find(".ts-pager"), + output: '{startRow} to {endRow} ({totalRows})', + cssPageDisplay: '.pagedisplay', + cssPageSize: '.pagesize', + cssDisabled: 'disabled', ajaxUrl : "?method=getResponses&page={page}&size={size}&{sortList:column}&{filterList:fcol}&isMonitoring=true&isAllowRateAnswers=${qaContent.allowRateAnswers}&isAllowRichEditor=${qaContent.allowRichEditor}&isOnlyLeadersIncluded=${qaContent.useSelectLeaderToolOuput}&qaContentId=${qaContent.qaContentId}&qaSessionId=" + $(this).attr('data-session-id') + "&questionUid=" + $(this).attr('data-question-uid') + "&userId=" + $("#userID").val() + "&reqID=" + (new Date()).getTime(), ajaxProcessing: function (data) { if (data && data.hasOwnProperty('rows')) { @@ -228,20 +227,7 @@ return json; } - }, - container: $(this).next(".pager"), - output: '{startRow} to {endRow} ({totalRows})', - //removeRows: false, - // css class names of pager arrows - cssNext: '.tablesorter-next', // next page arrow - cssPrev: '.tablesorter-prev', // previous page arrow - cssFirst: '.tablesorter-first', // go to first page arrow - cssLast: '.tablesorter-last', // go to last page arrow - cssGoto: '.gotoPage', // select dropdown to allow choosing a page - cssPageDisplay: '.pagedisplay', // location of where the "output" is displayed - cssPageSize: '.pagesize', // page size selector - select dropdown that sets the "size" option - // class added to arrows when at the extremes (i.e. prev/first arrows are "disabled" when on the first page) - cssDisabled: 'disabled' // Note there is no period "." in front of this class name + } }) // bind to pager events Index: lams_tool_laqa/web/monitoring/Reflections.jsp =================================================================== diff -u -r0db4ba2ef30249f2973bd30b83b8fc3c19f57c05 -r6f53dcc0016b4e9c777dcf89595faf121a5da8c9 --- lams_tool_laqa/web/monitoring/Reflections.jsp (.../Reflections.jsp) (revision 0db4ba2ef30249f2973bd30b83b8fc3c19f57c05) +++ lams_tool_laqa/web/monitoring/Reflections.jsp (.../Reflections.jsp) (revision 6f53dcc0016b4e9c777dcf89595faf121a5da8c9) @@ -30,23 +30,32 @@ $(document).ready(function(){ $(".tablesorter").tablesorter({ - theme: 'blue', - sortInitialOrder: 'desc', - sortList: [[0]], - widgets: [ "resizable", "filter" ], - headers: { 1: { filter: false, sorter: false} }, - widgetOptions: { + theme: 'bootstrap', + widthFixed: true, + widgets: ["uitheme", "zebra", "filter", "resizable"], + headerTemplate : '{content} {icon}', + headers: { 1: { filter: false, sorter: false} }, + widgetOptions : { resizable: true, - // include column filters - filter_columnFilters: true, - filter_placeholder: { search : '' }, - filter_searchDelay: 700 - } + // include column filters + filter_columnFilters: true, + filter_placeholder: { search : '' }, + filter_searchDelay: 700 + + }, + sortInitialOrder: 'desc', + sortList: [[0]] }); - + $(".tablesorter").each(function() { $(this).tablesorterPager({ + // set to false otherwise it remembers setting from other jsFiddle demos savePages: false, + container: $(this).find(".ts-pager"), + output: '{startRow} to {endRow} ({totalRows})', + cssPageDisplay: '.pagedisplay', + cssPageSize: '.pagesize', + cssDisabled: 'disabled', ajaxUrl : "monitoring.do?dispatch=getReflectionsJSON&page={page}&size={size}&{sortList:column}&{filterList:fcol}&toolSessionID=" + $(this).attr('data-session-id'), ajaxProcessing: function (data, table) { if (data && data.hasOwnProperty('rows')) { @@ -78,18 +87,6 @@ } }, - container: $(this).next(".pager"), - output: '{startRow} to {endRow} ({totalRows})', - // css class names of pager arrows - cssNext: '.tablesorter-next', // next page arrow - cssPrev: '.tablesorter-prev', // previous page arrow - cssFirst: '.tablesorter-first', // go to first page arrow - cssLast: '.tablesorter-last', // go to last page arrow - cssGoto: '.gotoPage', // select dropdown to allow choosing a page - cssPageDisplay: '.pagedisplay', // location of where the "output" is displayed - cssPageSize: '.pagesize', // page size selector - select dropdown that sets the "size" option - // class added to arrows when at the extremes (i.e. prev/first arrows are "disabled" when on the first page) - cssDisabled: 'disabled' // Note there is no period "." in front of this class name }) }); }); Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp =================================================================== diff -u -r70e7323be9b50d1e8c3902cde43cbe5039181541 -r6f53dcc0016b4e9c777dcf89595faf121a5da8c9 --- lams_tool_laqa/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 70e7323be9b50d1e8c3902cde43cbe5039181541) +++ lams_tool_laqa/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 6f53dcc0016b4e9c777dcf89595faf121a5da8c9) @@ -59,7 +59,7 @@ dataId="data-session-id='${groupDto.sessionId}' data-question-uid='${question.uid}'"> - +