Index: lams_gradebook/web/gradebookMonitor.jsp =================================================================== diff -u -r65a83a957c6c1160566e3e9d11a9c9a4d6e704f6 -r1f6366dd975a5f5079cb57b2ca53e77873f5cb96 --- lams_gradebook/web/gradebookMonitor.jsp (.../gradebookMonitor.jsp) (revision 65a83a957c6c1160566e3e9d11a9c9a4d6e704f6) +++ lams_gradebook/web/gradebookMonitor.jsp (.../gradebookMonitor.jsp) (revision 1f6366dd975a5f5079cb57b2ca53e77873f5cb96) @@ -91,7 +91,7 @@ {name:'rowNamer',index:'rowName', sortable:true, editable:false, autoencode:true}, {name:'status',index:'status', sortable:false, editable:false, search:false, width:50, align:"center"}, {name:'timeTaken',index:'timeTaken', sortable:true, editable:false, search:false, width:80, align:"center"}, - {name:'feedback',index:'feedback', sortable:false, editable:true, edittype:'textarea', editoptions:{rows:'4',cols:'20'}, search:false }, + {name:'feedback',index:'feedback', sortable:true, editable:true, edittype:'textarea', editoptions:{rows:'4',cols:'20'}, search:false }, {name:'mark',index:'mark', sortable:true, editable:true, editrules:{number:true}, search:false, width:50, align:"center"} ], loadError: function(xhr,st,err) { @@ -119,9 +119,6 @@ '', "", "", - "", - "", - "", "", "", "" @@ -131,9 +128,6 @@ {name:'marksAvailable',index:'marksAvailable', sortable:false, editable:false, hidden:true, search:false, hidedlg:true}, {name:'rowName', index:'rowName', sortable:false, editable: false}, {name:'status', index:'status', sortable:false, editable:false, width:50, align:"center"}, - {name:'output', index:'output', sortable:false, editable: false, width:200, hidden:true}, - {name:'competences', index:'competences', sortable:false, editable: false, hidden:true}, - {name:'startDate', index:'startDate', sortable:true, editable: false, hidden:true, width:60, align:"center"}, {name:'timeTaken',index:'timeTaken', sortable:true, editable: false, width:80, align:"center"}, {name:'feedback', index:'feedback', sortable:false, editable: true, edittype:'textarea', editoptions:{rows:'4',cols:'20'}, width:200, hidden:true}, {name:'mark', index:'mark', sortable:true, editable: true, editrules:{number:true}, width:50, align:"center" } @@ -311,9 +305,7 @@ '', "", "", - "", "", - "", "", "" ], @@ -322,9 +314,7 @@ {name:'marksAvailable',index:'marksAvailable', sortable:false, editable:false, hidden:true, search:false, hidedlg:true}, {name:'rowName',index:'rowName', sortable:true, editable:false}, {name:'status', index:'status', sortable:false, editable:false, search:false, width:30, align:"center"}, - {name:'startDate', index:'startDate', sortable:true, editable: false, hidden:true, width:60, align:"center"}, {name:'timeTaken', index:'timeTaken', sortable:true, editable: false, width:80, align:"center"}, - {name:'output', index:'output', sortable:false, editable: false, search:false, width:200, hidden:true}, {name:'feedback',index:'feedback', sortable:false, editable:true, edittype:'textarea', editoptions:{rows:'4',cols:'20'} , search:false, width:200, hidden:true}, {name:'mark',index:'mark', sortable:true, editable:true, editrules:{number:true}, search:false, width:50, align:"center"} ], @@ -339,8 +329,7 @@ var string = removeHTMLTags(rowData["mark"]); - if (string.indexOf("-") != -1) - { + if (string.indexOf("-") != -1) { string = " "; } else if (string.indexOf("/") != -1) {