Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java,v diff -u -r1.17 -r1.18 --- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java 7 Apr 2009 05:28:28 -0000 1.17 +++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java 7 Apr 2009 06:24:12 -0000 1.18 @@ -145,7 +145,7 @@ String link = "javascript:openGradeBookLearnerPopup(" + "'" + org.getName() + "','" + Configuration.get(ConfigurationKeys.SERVER_URL) + "/gradebook/gradebookLearning.do?dispatch=courseLearner&organisationID=" - + org.getOrganisationId() + "'," + "1220,500,0,0);"; + + org.getOrganisationId() + "'," + "750,400,0,0);"; links.add(new IndexLinkBean("index.coursegradebook.learner", link, "manage-group-button", null)); } @@ -174,7 +174,7 @@ String link = "javascript:openGradeBookCourseMonitorPopup(" + "'" + org.getName() + "','" + Configuration.get(ConfigurationKeys.SERVER_URL) + "/gradebook/gradebookMonitoring.do?dispatch=courseMonitor&organisationID=" - + org.getOrganisationId() + "'," + "1220,500,0,0);"; + + org.getOrganisationId() + "'," + "850,400,0,0);"; moreLinks.add(new IndexLinkBean("index.coursegradebook", link, "manage-group-button", "index.coursegradebook.tooltip")); @@ -318,7 +318,7 @@ || (parent != null && parent.getEnableGradeBookForMonitors())) { String link = "javascript:openGradeBookLessonMonitorPopup(" + "'" + org.getName() + "','" + Configuration.get(ConfigurationKeys.SERVER_URL) - + "/gradebook/gradebookMonitoring.do?lessonID=" + bean.getId() + "'," + "1220,700,0,0);"; + + "/gradebook/gradebookMonitoring.do?lessonID=" + bean.getId() + "'," + "850,700,0,0);"; lessonLinks.add(new IndexLinkBean("index.coursegradebookmonitor", link)); } Index: lams_central/web/gradebook/gradeBookCourseLearner.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/gradebook/Attic/gradeBookCourseLearner.jsp,v diff -u -r1.2 -r1.3 --- lams_central/web/gradebook/gradeBookCourseLearner.jsp 7 Apr 2009 02:35:53 -0000 1.2 +++ lams_central/web/gradebook/gradeBookCourseLearner.jsp 7 Apr 2009 06:24:12 -0000 1.3 @@ -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(); Index: lams_central/web/gradebook/gradeBookCourseMonitor.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/gradebook/Attic/gradeBookCourseMonitor.jsp,v diff -u -r1.6 -r1.7 --- lams_central/web/gradebook/gradeBookCourseMonitor.jsp 7 Apr 2009 02:35:53 -0000 1.6 +++ lams_central/web/gradebook/gradeBookCourseMonitor.jsp 7 Apr 2009 06:24:12 -0000 1.7 @@ -23,7 +23,7 @@ datatype: "xml", url: "/gradebook/gradebook.do?dispatch=getCourseGridData&view=monCourse&organisationID=${organisationID}", height: "100%", - width: 990, + width: 700, imgpath: 'includes/javascript/jqgrid/themes/basic/images', sortorder: "asc", sortname: "id", @@ -35,9 +35,9 @@ {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:'startDate',index:'startDate', sortable:false, editable:false, search:false}, - {name:'avgTimeTaken',index:'avgTimeTaken', sortable:true, editable:false, search:false}, - {name:'avgMark',index:'avgMark', sortable:true, editable:false, search:false} + {name:'startDate',index:'startDate', sortable:false, editable:false, search:false, width:80, align:"center"}, + {name:'avgTimeTaken',index:'avgTimeTaken', sortable:true, editable:false, search:false, width:80, align:"center"}, + {name:'avgMark',index:'avgMark', sortable:true, editable:false, search:false, width:50, align:"center"} ], loadError: function(xhr,st,err) { jQuery("#organisationGrid").clearGridData(); @@ -53,7 +53,7 @@ datatype: "xml", url: "/gradebook/gradebook.do?dispatch=getUserGridData&view=monCourse&lessonID=" + lessonID, height: "100%", - width: 920, + width: 650, imgpath: 'includes/javascript/jqgrid/themes/basic/images', cellEdit:true, cellurl: "/gradebook/gradebookMonitoring.do?dispatch=updateUserLessonGradeBookData&lessonID=" + lessonID, @@ -62,14 +62,14 @@ pager: subgrid_table_id + "_pager", rowList:[5,10,20,30], rowNum:10, - colNames: ['','Full Name','Progress', 'Time Taken', 'Lesson Feedback', 'Lesson Mark'], + colNames: ['','Full Name','Progress', 'Time Taken', 'Lesson Feedback', 'Mark'], colModel:[ {name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true}, {name:'rowName',index:'rowName', sortable:true, editable:false}, - {name:'status', align:'center', width:30, index:'status', sortable:false, editable:false, search:false}, - {name:'timeTaken', index:'timeTaken', sortable:true, editable:false, search:false}, + {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:'mark',index:'mark', sortable:true, editable:true, editrules:{number:true}, search:false} + {name:'mark',index:'mark', sortable:true, editable:true, editrules:{number:true}, search:false, width:50, align:"center"} ], loadError: function(xhr,st,err) { jQuery("#"+subgrid_table_id).clearGridData(); Index: lams_central/web/gradebook/gradeBookMonitor.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/gradebook/Attic/gradeBookMonitor.jsp,v diff -u -r1.16 -r1.17 --- lams_central/web/gradebook/gradeBookMonitor.jsp 7 Apr 2009 00:09:15 -0000 1.16 +++ lams_central/web/gradebook/gradeBookMonitor.jsp 7 Apr 2009 06:24:12 -0000 1.17 @@ -25,7 +25,7 @@ datatype: "xml", url: "/gradebook/gradebook.do?dispatch=getUserGridData&view=monUserView&lessonID=${lessonDetails.lessonID}", height: "100%", - width: 990, + width: 700, imgpath: 'includes/javascript/jqgrid/themes/basic/images', cellEdit: true, viewrecords: true, @@ -39,10 +39,10 @@ colModel:[ {name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true}, {name:'rowName',index:'rowName', sortable:true, editable:false}, - {name:'status',index:'status', align:'center', width:30, sortable:false, editable:false, search:false}, - {name:'timeTaken',index:'timeTaken', sortable:true, editable:false, search:false}, + {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:'mark',index:'mark', sortable:true, editable:true, editrules:{number:true}, search:false} + {name:'mark',index:'mark', sortable:true, editable:true, editrules:{number:true}, search:false, width:50, align:"center"} ], loadError: function(xhr,st,err) { jQuery("#userView").clearGridData(); @@ -58,7 +58,7 @@ datatype: "xml", url: "/gradebook/gradebook.do?dispatch=getActivityGridData&lessonID=${lessonDetails.lessonID}&view=monUserView&userID=" + userID, height: "100%", - width: 920, + width: 650, cellEdit:true, sortname: "id", imgpath: 'includes/javascript/jqgrid/themes/basic/images', @@ -68,14 +68,14 @@ cellurl: "/gradebook/gradebookMonitoring.do?dispatch=updateUserActivityGradeBookData&lessonID=${lessonDetails.lessonID}&view=monUserView&userID=" + userID, colNames: ['Id','Activity','Progress','Outputs', 'Competences', 'Time Taken', 'Activity FeedBack', '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:'output', width:250, index:'output', sortable:false, editable: false}, - {name:'competences', width:250, index:'competences', sortable:false, editable: false, hidden:true}, - {name:'timeTaken', width:50, index:'timeTaken', sortable:true, editable: false}, - {name:'feedback', width:250, index:'feedback', sortable:false, editable: true, edittype:'textarea', editoptions:{rows:'4',cols:'20'}}, - {name:'mark', width:100, index:'mark', sortable:true, editable: true, editrules:{number:true} } + {name:'id', index:'id', sortable:false, hidden:true, 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}, + {name:'competences', index:'competences', sortable:false, editable: false, hidden:true}, + {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}, + {name:'mark', index:'mark', sortable:true, editable: true, editrules:{number:true}, width:50, align:"center" } ], loadError: function(xhr,st,err) { jQuery("#"+subgrid_table_id).clearGridData(); @@ -151,7 +151,7 @@ datatype: "xml", url: "/gradebook/gradebook.do?dispatch=getActivityGridData&view=monActivityView&lessonID=${lessonDetails.lessonID}", height: "100%", - width: 990, + width: 700, cellEdit: true, pager: "activityViewPager", rowList:[5,10,20,30], @@ -160,11 +160,11 @@ sortname: "activityId", colNames:["", 'Activity Name', 'Average Time Taken', 'Competences', 'Average Mark'], colModel:[ - {name:'id', width:10, index:'id', sortable:false, hidden:true, hidedlg:true}, - {name:'rowName', width:60, index:'rowName', sortable:true, editable: false}, - {name:'avgTimeTaken', index:'avgTimeTaken', sortable:true, editable: false}, - {name:'competences', width:250, index:'competences', sortable:false, editable: false, hidden:true}, - {name:'avgMark',index:'avgMark', sortable:true, editable:false} + {name:'id', index:'id', sortable:false, hidden:true, hidedlg:true}, + {name:'rowName', index:'rowName', sortable:true, editable: false}, + {name:'avgTimeTaken', index:'avgTimeTaken', sortable:true, editable: false, width:80, align:"center"}, + {name:'competences', index:'competences', sortable:false, editable: false, hidden:true}, + {name:'avgMark',index:'avgMark', sortable:true, editable:false, width:50, align:"center"} ], loadError: function(xhr,st,err) { jQuery("#activityView").clearGridData(); @@ -181,7 +181,7 @@ datatype: "xml", url: "/gradebook/gradebook.do?dispatch=getUserGridData&view=monActivityView&lessonID=${lessonDetails.lessonID}&activityID=" + activityID, height: "100%", - width: 920, + width: 600, cellEdit:true, imgpath: 'includes/javascript/jqgrid/themes/basic/images', cellurl: "/gradebook/gradebookMonitoring.do?dispatch=updateUserActivityGradeBookData&lessonID=${lessonDetails.lessonID}&view=monActivityView&activityID=" + activityID, @@ -194,11 +194,11 @@ colModel:[ {name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true}, {name:'rowName',index:'rowName', sortable:true, editable:false}, - {name:'status', align:'center', width:30, index:'status', sortable:false, editable:false, search:false}, - {name:'timeTaken', width:50, index:'timeTaken', sortable:true, editable: false}, - {name:'output', width:220, index:'output', sortable:false, editable: false, search:false}, - {name:'feedback',index:'feedback', sortable:false, editable:true, edittype:'textarea', editoptions:{rows:'4',cols:'20'} , search:false}, - {name:'mark',index:'mark', sortable:true, editable:true, editrules:{number:true}, search:false} + {name:'status', align:'center', width:30, index:'status', sortable:false, editable:false, search:false, width:50, 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}, + {name:'feedback',index:'feedback', sortable:false, editable:true, edittype:'textarea', editoptions:{rows:'4',cols:'20'} , search:false, width:200}, + {name:'mark',index:'mark', sortable:true, editable:true, editrules:{number:true}, search:false, width:50, align:"center"} ], loadError: function(xhr,st,err) { jQuery("#"+subgrid_table_id).clearGridData();