Index: lams_central/web/gradebook/gradeBookCourseLearner.jsp =================================================================== diff -u -r3986ceae902d4b5f1b9e0fb41f74a369256e5ecd -rcf80644c2689292645517b3f367d58b9efb5a231 --- lams_central/web/gradebook/gradeBookCourseLearner.jsp (.../gradeBookCourseLearner.jsp) (revision 3986ceae902d4b5f1b9e0fb41f74a369256e5ecd) +++ lams_central/web/gradebook/gradeBookCourseLearner.jsp (.../gradeBookCourseLearner.jsp) (revision cf80644c2689292645517b3f367d58b9efb5a231) @@ -24,7 +24,7 @@ datatype: "xml", url: "/gradebook/gradebook.do?dispatch=getCourseGridData&view=lrnCourse&organisationID=${organisationID}", height: "100%", - width: 990, + width: 600, imgpath: 'includes/javascript/jqgrid/themes/basic/images', sortorder: "asc", sortname: "id", @@ -36,14 +36,14 @@ {name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true}, {name:'rowName',index:'rowName', sortable:true, editable:false}, {name:'subGroup',index:'subGroup', sortable:false, editable:false, search:false}, - {name:'status',index:'status', sortable:false, editable:false, search:false}, - {name:'feedback',index:'feedback', sortable:false, editable:false, search:false}, + {name:'status',index:'status', sortable:false, editable:false, search:false, width:50, align:"center"}, + {name:'feedback',index:'feedback', sortable:false, editable:false, search:false, width:200}, {name:'startDate',index:'startDate', sortable:false, editable:false, hidden:true, search:false}, {name:'finishDate',index:'finishDate', sortable:false, editable:false, hidden:true, search:false}, - {name:'averageTimeTaken',index:'averageTimeTaken', sortable:true, hidden:true, editable:false, search:false}, - {name:'timeTaken',index:'timeTaken', sortable:true, editable:false, hidden:true, search:false}, - {name:'averageMark',index:'averageMark', sortable:true, editable:false, search:false}, - {name:'mark',index:'mark', sortable:true, editable:false, search:false} + {name:'averageTimeTaken',index:'averageTimeTaken', sortable:true, hidden:true, editable:false, search:false, width:80, align:"center"}, + {name:'timeTaken',index:'timeTaken', sortable:true, editable:false, hidden:true, search:false, width:80, align:"center"}, + {name:'averageMark',index:'averageMark', sortable:true, editable:false, search:false, width:50, align:"center"}, + {name:'mark',index:'mark', sortable:true, editable:false, search:false, width:50, align:"center"} ], loadError: function(xhr,st,err) { jQuery("#organisationGrid").clearGridData(); @@ -59,22 +59,22 @@ datatype: "xml", url: "/gradebook/gradebook.do?dispatch=getActivityGridData&view=lrnActivity&lessonID=" + lessonID, height: "100%", - width: 920, + width: 550, sortname: "id", imgpath: 'includes/javascript/jqgrid/themes/basic/images', pager: subgrid_table_id + "_pager", rowList:[5,10,20,30], rowNum:10, colNames: ['Id','Activity','Progress', 'Feedback', 'Average Duration', 'Duration', 'Average Mark', 'Mark'], colModel: [ - {name:'id', width:10, index:'id', sortable:false, hidden:true, hidedlg:true}, - {name:'rowName', width:60, index:'rowName', sortable:false, editable: false}, - {name:'status', align:'center', width:30, index:'status', sortable:false, editable:false}, - {name:'feedback', width:250, index:'feedback', sortable:false, editable: false}, - {name:'averageTimeTaken',index:'averageTimeTaken', sortable:true, hidden:true, editable:false, search:false}, - {name:'timeTaken',index:'timeTaken', sortable:true, editable:false, hidden:true, search:false}, - {name:'averageMark',index:'averageMark', sortable:true, editable:false, search:false}, - {name:'mark', width:100, index:'mark', sortable:true, editable: false} + {name:'id', index:'id', sortable:false, hidden:true, hidedlg:true}, + {name:'rowName', index:'rowName', sortable:false, editable: false, width:100}, + {name:'status', index:'status', sortable:false, editable:false, width:50, align:"center"}, + {name:'feedback', index:'feedback', sortable:false, editable: false}, + {name:'averageTimeTaken',index:'averageTimeTaken', sortable:true, hidden:true, editable:false, search:false, width:80, align:"center"}, + {name:'timeTaken',index:'timeTaken', sortable:true, editable:false, hidden:true, search:false, width:80, align:"center"}, + {name:'averageMark',index:'averageMark', sortable:true, editable:false, search:false, width:50, align:"center"}, + {name:'mark', width:100, index:'mark', sortable:true, editable: false, width:50, align:"center"} ], loadError: function(xhr,st,err) { jQuery("#"+subgrid_table_id).clearGridData();