Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_assessment/web/pages/monitoring/monitoring.jsp 4 May 2015 16:57:26 -0000 1.13
+++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp 13 Nov 2015 13:35:53 -0000 1.14
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/summary.jsp,v
diff -u -r1.30 -r1.31
--- lams_tool_assessment/web/pages/monitoring/summary.jsp 12 Nov 2015 23:26:07 -0000 1.30
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp 13 Nov 2015 13:35:53 -0000 1.31
@@ -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 @@
-