Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp =================================================================== diff -u -r65a83a957c6c1160566e3e9d11a9c9a4d6e704f6 -rf667257f8ac808a351349b03967b18394ada4526 --- lams_tool_assessment/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 65a83a957c6c1160566e3e9d11a9c9a4d6e704f6) +++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision f667257f8ac808a351349b03967b18394ada4526) @@ -20,6 +20,18 @@ vertical-align:text-top; padding-top:2px; } + + .session-container { + padding-left: 30px; + width:99%; + } + .session-header { + padding-bottom: 5px; + font-size: small; + } + div[id^="gbox_userSummary"] { + margin-top: 5px; + } Index: lams_tool_assessment/web/pages/monitoring/summary.jsp =================================================================== diff -u -r2571a4976d67852a0a839fb0d97a21ec84d51713 -rf667257f8ac808a351349b03967b18394ada4526 --- lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 2571a4976d67852a0a839fb0d97a21ec84d51713) +++ lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision f667257f8ac808a351349b03967b18394ada4526) @@ -14,24 +14,24 @@ datatype: "json", url: "?sessionMapID=${sessionMapID}&sessionId=${sessionDto.sessionId}", height: '100%', - width: 730, + autowidth: true, + shrinkToFit: false, pager: 'listPager${sessionDto.sessionId}', rowList:[5,10,20,30], rowNum:10, viewrecords:true, - recordpos: 'left', colNames:['#', 'userId', 'sessionId', "", ""], colModel:[ - {name:'id',index:'id', width:20, sorttype:"int", search:false}, - {name:'userId',index:'userId', width:0}, - {name:'sessionId',index:'sessionId', width:0}, - {name:'userName',index:'userName', width:350, searchoptions: { clearSearch: false }}, - {name:'total',index:'total', width:120,align:"right", formatter:'number', search:false} + {name:'id', index:'id', width:20, sorttype:"int", search:false}, + {name:'userId', index:'userId', width:0, hidden: true}, + {name:'sessionId', index:'sessionId', width:0, hidden: true}, + {name:'userName', index:'userName', width:570, searchoptions: { clearSearch: false }}, + {name:'total', index:'total', width:174, align:"right", formatter:'number', search:false} ], ondblClickRow: function(rowid) { var userId = jQuery("#list${sessionDto.sessionId}").getCell(rowid, 'userId'); @@ -68,8 +68,7 @@ searchOnEnter: false }) - .hideCol("userId").hideCol("sessionId") - .navGrid("#listPager${sessionDto.sessionId}", {edit:false,add:false,del:false,search:false, refresh:false}); + .navGrid("#listPager${sessionDto.sessionId}", {edit:false,add:false,del:false,search:false}); var oldValue = 0; jQuery("#userSummary${sessionDto.sessionId}").jqGrid({ @@ -136,18 +135,11 @@ //jqgrid autowidth (http://stackoverflow.com/a/1610197) $(window).bind('resize', function() { - var grid; - if (grid = jQuery(".ui-jqgrid-btable:visible")) { - grid.each(function(index) { - var gridId = $(this).attr('id'); - - //resize only user summary grids - if (gridId.match("^userSummary")) { - var gridParentWidth = jQuery('#gbox_' + gridId).parent().width(); - jQuery('#' + gridId).setGridWidth(gridParentWidth, true); - } - }); - } + jQuery(".ui-jqgrid-btable:visible").each(function(index) { + var gridId = $(this).attr('id'); + var gridParentWidth = jQuery('#gbox_' + gridId).parent().width(); + jQuery('#' + gridId).setGridWidth(gridParentWidth, true); + }); }).trigger('resize'); $("#questionUid").change(function() { @@ -237,23 +229,19 @@ -
+
-
+
${sessionDto.sessionName}
-
-
-
+
-
- - - +