Index: lams_build/build.xml =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r8176135403562bdf207f9477805d0e092915312a --- lams_build/build.xml (.../build.xml) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_build/build.xml (.../build.xml) (revision 8176135403562bdf207f9477805d0e092915312a) @@ -55,6 +55,8 @@ + + @@ -148,6 +150,8 @@ + + @@ -165,6 +169,7 @@ + Index: lams_build/conf/j2ee/lams.application.xml =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r8176135403562bdf207f9477805d0e092915312a --- lams_build/conf/j2ee/lams.application.xml (.../lams.application.xml) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_build/conf/j2ee/lams.application.xml (.../lams.application.xml) (revision 8176135403562bdf207f9477805d0e092915312a) @@ -73,6 +73,13 @@ /lams/www + + + + lams-gradebook.war + /lams/gradebook + + Index: lams_build/conf/j2ee/rams.application.xml =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r8176135403562bdf207f9477805d0e092915312a --- lams_build/conf/j2ee/rams.application.xml (.../rams.application.xml) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_build/conf/j2ee/rams.application.xml (.../rams.application.xml) (revision 8176135403562bdf207f9477805d0e092915312a) @@ -73,6 +73,13 @@ /rams/www + + + lams-gradebook.war + /lams/gradebook + + + Index: lams_build/shared.properties =================================================================== diff -u -r2a14741090c7e0f8cc12158171de8f9af40a17cc -r8176135403562bdf207f9477805d0e092915312a --- lams_build/shared.properties (.../shared.properties) (revision 2a14741090c7e0f8cc12158171de8f9af40a17cc) +++ lams_build/shared.properties (.../shared.properties) (revision 8176135403562bdf207f9477805d0e092915312a) @@ -35,6 +35,7 @@ lams_contentrepository=lams_contentrepository lams_tool_deploy=lams_tool_deploy lams_www=lams_www +lams_gradebook=lams_gradebook sub.build.lib=build/lib sub.build.language=build/lib/language Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/gradebook/gradeBookApplicationContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/gradebook/service/GradeBookService.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/gradebook/service/IGradeBookService.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/gradebook/util/GradeBookConstants.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/gradebook/util/GradeBookUtil.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookLearningAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookMonitoringAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_central/web/gradebook/gradeBookCourseLearner.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_central/web/gradebook/gradeBookCourseMonitor.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_central/web/gradebook/gradeBookMonitor.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_central/web/gradebook/jqGridIncludes.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/includes/javascript/openUrls.js =================================================================== diff -u -r57ae9b79f99a9cb3f1a39454626086bc0ed1c9ac -r8176135403562bdf207f9477805d0e092915312a --- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 57ae9b79f99a9cb3f1a39454626086bc0ed1c9ac) +++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 8176135403562bdf207f9477805d0e092915312a) @@ -17,9 +17,9 @@ var pWin = null; var copyrightWin = null; var customWin = null; - var gradeBookMonWin = null; - var gradeBookLrnWin = null; - var gradeBookMonLessonWin = null; + var gradebookMonWin = null; + var gradebookLrnWin = null; + var gradebookMonLessonWin = null; function closeAllChildren(){ if (authorWin && !authorWin.closed) authorWin.closeWindow(); @@ -31,8 +31,8 @@ if (omWin && !omWin.closed) omWin.close(); if (pWin && !pWin.closed) pWin.close(); if (copyrightWin && !copyrightWin.closed) copyrightWin.close(); - if (gradeBookMonWin && !gradeBookMonWin.closed) gradeBookMonWin.close(); - if (gradeBookLrnWin && !gradeBookLrnWin.closed) gradeBookLrnWin.close(); + if (gradebookMonWin && !gradebookMonWin.closed) gradebookMonWin.close(); + if (gradebookLrnWin && !gradebookLrnWin.closed) gradebookLrnWin.close(); } function openProfile() @@ -314,30 +314,30 @@ } } - function openGradeBookCourseMonitorPopup(winname, url, width, height, left, top) { - if(gradeBookMonWin && !gradeBookMonWin.closed ){ - gradeBookMonWin.focus(); + function openGradebookCourseMonitorPopup(winname, url, width, height, left, top) { + if(gradebookMonWin && !gradebookMonWin.closed ){ + gradebookMonWin.focus(); }else{ - gradeBookMonWin = window.open(url, winname,'resizable,left='+left+',top='+top+',width='+width+',height='+height+',scrollbars'); - gradeBookMonWin.focus(); + gradebookMonWin = window.open(url, winname,'resizable,left='+left+',top='+top+',width='+width+',height='+height+',scrollbars'); + gradebookMonWin.focus(); } } - function openGradeBookLearnerPopup(winname, url, width, height, left, top) { - if(gradeBookLrnWin && !gradeBookLrnWin.closed ){ - gradeBookLrnWin.focus(); + function openGradebookLearnerPopup(winname, url, width, height, left, top) { + if(gradebookLrnWin && !gradebookLrnWin.closed ){ + gradebookLrnWin.focus(); }else{ - gradeBookLrnWin = window.open(url, winname,'resizable,left='+left+',top='+top+',width='+width+',height='+height+',scrollbars'); - gradeBookLrnWin.focus(); + gradebookLrnWin = window.open(url, winname,'resizable,left='+left+',top='+top+',width='+width+',height='+height+',scrollbars'); + gradebookLrnWin.focus(); } } - function openGradeBookLessonMonitorPopup(winname, url, width, height, left, top) { - if(gradeBookMonLessonWin && !gradeBookMonLessonWin.closed ){ - gradeBookMonLessonWin.focus(); + function openGradebookLessonMonitorPopup(winname, url, width, height, left, top) { + if(gradebookMonLessonWin && !gradebookMonLessonWin.closed ){ + gradebookMonLessonWin.focus(); }else{ - gradeBookMonLessonWin = window.open(url, winname,'resizable,left='+left+',top='+top+',width='+width+',height='+height+',scrollbars'); - gradeBookMonLessonWin.focus(); + gradebookMonLessonWin = window.open(url, winname,'resizable,left='+left+',top='+top+',width='+width+',height='+height+',scrollbars'); + gradebookMonLessonWin.focus(); } } //--> Index: lams_common/build.xml =================================================================== diff -u -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb -r8176135403562bdf207f9477805d0e092915312a --- lams_common/build.xml (.../build.xml) (revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb) +++ lams_common/build.xml (.../build.xml) (revision 8176135403562bdf207f9477805d0e092915312a) @@ -413,8 +413,8 @@ - - + + Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradeBookUserActivity.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradeBookUserLesson.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml =================================================================== diff -u --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml (revision 0) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml (revision 8176135403562bdf207f9477805d0e092915312a) @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserLesson.hbm.xml =================================================================== diff -u --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserLesson.hbm.xml (revision 0) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserLesson.hbm.xml (revision 8176135403562bdf207f9477805d0e092915312a) @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml =================================================================== diff -u -ra8e4961c9f59aedf7bbc548462f658ecc539d0ca -r8176135403562bdf207f9477805d0e092915312a --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml (.../Activity.hbm.xml) (revision a8e4961c9f59aedf7bbc548462f658ecc539d0ca) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml (.../Activity.hbm.xml) (revision 8176135403562bdf207f9477805d0e092915312a) @@ -171,13 +171,13 @@ - + @hibernate.set lazy="false" inverse="true" cascade="none" @hibernate.collection-key column="gradebook_user_activity_id" - @hibernate.collection-one-to-many class="org.lamsfoundation.lams.gradebook.GradeBookUserActivity" + @hibernate.collection-one-to-many class="org.lamsfoundation.lams.gradebook.GradebookUserActivity" - + Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml =================================================================== diff -u -ra8e4961c9f59aedf7bbc548462f658ecc539d0ca -r8176135403562bdf207f9477805d0e092915312a --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml (.../Lesson.hbm.xml) (revision a8e4961c9f59aedf7bbc548462f658ecc539d0ca) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml (.../Lesson.hbm.xml) (revision 8176135403562bdf207f9477805d0e092915312a) @@ -89,14 +89,14 @@ class="org.lamsfoundation.lams.lesson.LearnerProgress" /> - - + + class="org.lamsfoundation.lams.gradebook.GradebookUserLesson" /> Index: lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml =================================================================== diff -u -rb02e79fc24c3d4f870d66a4a0386717f8093bc43 -r8176135403562bdf207f9477805d0e092915312a --- lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml (.../beanRefContext.xml) (revision b02e79fc24c3d4f870d66a4a0386717f8093bc43) +++ lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml (.../beanRefContext.xml) (revision 8176135403562bdf207f9477805d0e092915312a) @@ -47,7 +47,6 @@ /org/lamsfoundation/lams/web/webApplicationContext.xml /org/lamsfoundation/lams/integrationContext.xml /org/lamsfoundation/lams/usermanagement/ldapContext.xml - /org/lamsfoundation/lams/gradebook/gradeBookApplicationContext.xml Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml =================================================================== diff -u -r771e53ce121281172ff7101bd9f4eac1b02d674c -r8176135403562bdf207f9477805d0e092915312a --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 771e53ce121281172ff7101bd9f4eac1b02d674c) +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 8176135403562bdf207f9477805d0e092915312a) @@ -89,8 +89,8 @@ classpath:org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml - classpath:org/lamsfoundation/lams/gradebook/GradeBookUserActivity.hbm.xml - classpath:org/lamsfoundation/lams/gradebook/GradeBookUserLesson.hbm.xml + classpath:org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml + classpath:org/lamsfoundation/lams/gradebook/GradebookUserLesson.hbm.xml classpath:org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml classpath:org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml @@ -410,10 +410,10 @@ - + - + getAllGradebookUserActivitiesForActivity(Long activityID); + + public Double getAverageMarkForLesson(Long lessonID); + + public long getAverageDurationLesson(Long lessonID); + + public long getAverageDurationForActivity(Long activityID); + + public Double getAverageMarkForActivity(Long activityID); + +} + Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradeBookDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java (revision 8176135403562bdf207f9477805d0e092915312a) @@ -0,0 +1,199 @@ +/**************************************************************** + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $Id$ */ +package org.lamsfoundation.lams.gradebook.dao.hibernate; + +import java.util.Date; +import java.util.List; + +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.gradebook.GradebookUserActivity; +import org.lamsfoundation.lams.gradebook.GradebookUserLesson; +import org.lamsfoundation.lams.gradebook.dao.IGradebookDAO; + +public class GradebookDAO extends BaseDAO implements IGradebookDAO { + + private static final String GET_GRADEBOOK_USER_ACTIVITY = "from GradebookUserActivity gact where " + + "gact.learner.userId=:userID and gact.activity.activityId=:activityID"; + + private static final String GET_GRADEBOOK_USER_LESSON = "from GradebookUserLesson gles where " + + "gles.learner.userId=:userID and gles.lesson.lessonId=:lessonID"; + + private static final String GET_GRADEBOOK_ACTIVITIES_FROM_LESSON_SUM = "select sum(gact.mark) from GradebookUserActivity gact, ToolSession tses where " + + "gact.learner.userId=:userID and tses.toolActivity=gact.activity and tses.lesson.lessonId=:lessonID"; + + private static final String GET_GRADEBOOK_USER_ACTIVITIES_FOR_ACTIVITY = "from GradebookUserActivity gact where " + + "gact.activity.activityId=:activityID"; + + private static final String GET_AVERAGE_MARK_FOR_LESSON = "select avg(gles.mark) from GradebookUserLesson gles where " + + "gles.lesson.lessonId=:lessonID"; + + private static final String GET_AVERAGE_COMPLETION_TIME = "select prog.finishDate, prog.startDate from LearnerProgress prog where " + + "prog.lesson.lessonId=:lessonID"; + + private static final String GET_AVERAGE_COMPLETION_TIME_ACTIVITY = "select compProg.finishDate, compProg.startDate from CompletedActivityProgress compProg, Activity act where " + + "compProg.activity.activityId=:activityID"; + + private static final String GET_AVERAGE_MARK_FOR_ACTIVTY = "select avg(gact.mark) from GradebookUserActivity gact where " + + "gact.activity.activityId=:activityID"; + + @SuppressWarnings("unchecked") + public GradebookUserActivity getGradebookUserDataForActivity(Long activityID, Integer userID) { + List result = getSession().createQuery(GET_GRADEBOOK_USER_ACTIVITY).setInteger("userID", userID.intValue()) + .setLong("activityID", activityID.longValue()).list(); + + if (result != null) { + if (result.size() > 0) + return (GradebookUserActivity) result.get(0); + } + + return null; + } + + @SuppressWarnings("unchecked") + public GradebookUserLesson getGradebookUserDataForLesson(Long lessonID, Integer userID) { + List result = getSession().createQuery(GET_GRADEBOOK_USER_LESSON).setInteger("userID", userID.intValue()) + .setLong("lessonID", lessonID.longValue()).list(); + + if (result != null) { + if (result.size() > 0) + return (GradebookUserLesson) result.get(0); + } + + return null; + + } + + @SuppressWarnings("unchecked") + public Double getGradebookUserActivityMarkSum(Long lessonID, Integer userID) { + List result = getSession().createQuery(GET_GRADEBOOK_ACTIVITIES_FROM_LESSON_SUM).setInteger("userID", + userID.intValue()).setLong("lessonID", lessonID.longValue()).list(); + + if (result != null) { + if (result.size() > 0) + return (Double) result.get(0); + } + + return 0.0; + + } + + @SuppressWarnings("unchecked") + public List getAllGradebookUserActivitiesForActivity(Long activityID) { + List result = getSession().createQuery(GET_GRADEBOOK_USER_ACTIVITIES_FOR_ACTIVITY).setLong("activityID", + activityID.longValue()).list(); + + return (List) result; + } + + @SuppressWarnings("unchecked") + public Double getAverageMarkForLesson(Long lessonID) { + List result = getSession().createQuery(GET_AVERAGE_MARK_FOR_LESSON).setLong("lessonID", lessonID.longValue()) + .list(); + + if (result != null) { + if (result.size() > 0) + return (Double) result.get(0); + } + + return 0.0; + } + + @SuppressWarnings("unchecked") + public long getAverageDurationLesson(Long lessonID) { + List result = (List) getSession().createQuery(GET_AVERAGE_COMPLETION_TIME).setLong( + "lessonID", lessonID.longValue()).list(); + + if (result != null) { + if (result.size() > 0) { + + long sum = 0; + long count = 0; + for (Object[] dateObjs : result) { + if (dateObjs != null && dateObjs.length == 2) { + Date finishDate = (Date) dateObjs[0]; + Date startDate = (Date) dateObjs[1]; + + if (startDate != null && finishDate != null) { + + sum += finishDate.getTime() - startDate.getTime(); + count++; + } + } + } + + if (count > 0) { + return sum / count; + } + } + + } + return 0; + } + + @SuppressWarnings("unchecked") + public long getAverageDurationForActivity(Long activityID) { + List result = (List) getSession().createQuery(GET_AVERAGE_COMPLETION_TIME_ACTIVITY) + .setLong("activityID", activityID.longValue()).list(); + + if (result != null) { + if (result.size() > 0) { + + long sum = 0; + long count = 0; + for (Object[] dateObjs : result) { + if (dateObjs != null && dateObjs.length == 2) { + Date finishDate = (Date) dateObjs[0]; + Date startDate = (Date) dateObjs[1]; + + if (startDate != null && finishDate != null) { + + sum += finishDate.getTime() - startDate.getTime(); + count++; + } + } + } + + if (count > 0) { + return sum / count; + } + } + + } + return 0; + } + + @SuppressWarnings("unchecked") + public Double getAverageMarkForActivity(Long activityID) { + List result = getSession().createQuery(GET_AVERAGE_MARK_FOR_ACTIVTY).setLong("activityID", activityID.longValue()) + .list(); + + if (result != null) { + if (result.size() > 0) + return (Double) result.get(0); + } + + return 0.0; + + } +} Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBAverageMarkComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBAverageTimeTakenComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBIDComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBMarkComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBRowNameComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBTimeTakenComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8176135403562bdf207f9477805d0e092915312a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/util/GBGridView.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java =================================================================== diff -u -ra8e4961c9f59aedf7bbc548462f658ecc539d0ca -r8176135403562bdf207f9477805d0e092915312a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java (.../ToolActivity.java) (revision a8e4961c9f59aedf7bbc548462f658ecc539d0ca) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java (.../ToolActivity.java) (revision 8176135403562bdf207f9477805d0e092915312a) @@ -32,7 +32,7 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.gradebook.GradeBookUserActivity; +import org.lamsfoundation.lams.gradebook.GradebookUserActivity; import org.lamsfoundation.lams.learningdesign.strategy.ToolActivityStrategy; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.LessonClass; @@ -63,7 +63,7 @@ private Set activityEvaluations; - private Set gradeBookUserActivities; + private Set gradebookUserActivities; /** full constructor */ public ToolActivity(Long activityId, Integer id, String description, String title, Integer xcoord, Integer ycoord, @@ -72,7 +72,7 @@ Grouping grouping, Integer activityTypeId, Transition transitionTo, Transition transitionFrom, String languageFile, Boolean stopAfterActivity, Set inputActivities, Tool tool, Long toolContentId, Set branchActivityEntries, Set competenceMappings, - Set activityEvaluations, Set gradeBookUserActivities) { + Set activityEvaluations, Set gradebookUserActivities) { super(activityId, id, description, title, xcoord, ycoord, orderId, defineLater, createDateTime, learningLibrary, parentActivity, libraryActivity, parentUIID, learningDesign, grouping, activityTypeId, transitionTo, transitionFrom, languageFile, stopAfterActivity, inputActivities, branchActivityEntries); @@ -81,7 +81,7 @@ this.competenceMappings = competenceMappings; this.activityEvaluations = activityEvaluations; super.simpleActivityStrategy = new ToolActivityStrategy(this); - this.gradeBookUserActivities = gradeBookUserActivities; + this.gradebookUserActivities = gradebookUserActivities; } /** default constructor */ @@ -139,16 +139,16 @@ } newToolActivity.setActivityEvaluations(newEvaluations); - Set newGradeBookUserActivities = new HashSet(); - if (this.gradeBookUserActivities != null) { - for (GradeBookUserActivity gradeBookAct : this.gradeBookUserActivities) { - GradeBookUserActivity newGradeBookAct = new GradeBookUserActivity(); - newGradeBookAct.setActivity(newToolActivity); - newGradeBookAct.setLearner(gradeBookAct.getLearner()); - newGradeBookAct.setMark(gradeBookAct.getMark()); + Set newGradebookUserActivities = new HashSet(); + if (this.gradebookUserActivities != null) { + for (GradebookUserActivity gradebookAct : this.gradebookUserActivities) { + GradebookUserActivity newGradebookAct = new GradebookUserActivity(); + newGradebookAct.setActivity(newToolActivity); + newGradebookAct.setLearner(gradebookAct.getLearner()); + newGradebookAct.setMark(gradebookAct.getMark()); } } - newToolActivity.setGradeBookUserActivities(newGradeBookUserActivities); + newToolActivity.setGradebookUserActivities(newGradebookUserActivities); return newToolActivity; } @@ -333,11 +333,11 @@ this.activityEvaluations = activityEvaluations; } - public Set getGradeBookUserActivities() { - return gradeBookUserActivities; + public Set getGradebookUserActivities() { + return gradebookUserActivities; } - public void setGradeBookUserActivities(Set gradeBookUserActivities) { - this.gradeBookUserActivities = gradeBookUserActivities; + public void setGradebookUserActivities(Set gradebookUserActivities) { + this.gradebookUserActivities = gradebookUserActivities; } } Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java =================================================================== diff -u -ra8e4961c9f59aedf7bbc548462f658ecc539d0ca -r8176135403562bdf207f9477805d0e092915312a --- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision a8e4961c9f59aedf7bbc548462f658ecc539d0ca) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision 8176135403562bdf207f9477805d0e092915312a) @@ -30,7 +30,7 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -import org.lamsfoundation.lams.gradebook.GradeBookUserLesson; +import org.lamsfoundation.lams.gradebook.GradebookUserLesson; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.lesson.dto.LessonDTO; import org.lamsfoundation.lams.lesson.dto.LessonDetailsDTO; @@ -122,7 +122,7 @@ private Set learnerProgresses; /** persistent field */ - private Set gradeBookUserLessons; + private Set gradebookUserLessons; /** Persistent field. Defaults to FALSE if not set to anything by a constructor parameter. */ private Boolean learnerExportAvailable; @@ -196,7 +196,7 @@ this.organisation = organisation; this.learnerProgresses = learnerProgresses; this.liveEditEnabled = liveEditEnabled; - this.gradeBookUserLessons = new HashSet(); + this.gradebookUserLessons = new HashSet(); } /** * Factory method that create a new lesson. It initialized all necessary @@ -613,11 +613,11 @@ || stateId.equals(ARCHIVED_STATE) || stateId.equals(REMOVED_STATE) ) ) ; } - public Set getGradeBookUserLessons() { - return gradeBookUserLessons; + public Set getGradebookUserLessons() { + return gradebookUserLessons; } - public void setGradeBookUserLessons(Set gradeBookUserLessons) { - this.gradeBookUserLessons = gradeBookUserLessons; + public void setGradebookUserLessons(Set gradebookUserLessons) { + this.gradebookUserLessons = gradebookUserLessons; } }