Index: lams_build/lib/lams/lams-admin.jar =================================================================== diff -u -rf9b23e848885c277bcc9de377b94ae3884ce7a6d -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a Binary files differ Index: lams_build/lib/lams/lams-gradebook.jar =================================================================== diff -u -ra949c337adc53b2df9207aa1de6e500281de7c20 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a Binary files differ Index: lams_build/lib/lams/lams-learning.jar =================================================================== diff -u -re3ce54ff7b473269e6148ad285f0148c61ae20af -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a Binary files differ Index: lams_build/lib/lams/lams-monitoring.jar =================================================================== diff -u -rf8946bae724b8a3f414aa1f6a27cd714fe8aae58 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a Binary files differ Index: lams_central/.classpath =================================================================== diff -u -r4338c54ef39ccdab47dc95d28deec40f23059633 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_central/.classpath (.../.classpath) (revision 4338c54ef39ccdab47dc95d28deec40f23059633) +++ lams_central/.classpath (.../.classpath) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -32,7 +32,6 @@ - Index: lams_common/.classpath =================================================================== diff -u -r3b9e2b6c7b2e329bb43385adebe49550b610fb34 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_common/.classpath (.../.classpath) (revision 3b9e2b6c7b2e329bb43385adebe49550b610fb34) +++ lams_common/.classpath (.../.classpath) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -43,7 +43,6 @@ - Fisheye: Tag de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivityArchive.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserLessonArchive.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java (.../GradebookUserActivity.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java (.../GradebookUserActivity.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -29,11 +29,9 @@ import org.lamsfoundation.lams.usermanagement.User; /** + * This class maps to one activity mark for a learner + * * @author lfoxton - * - * This class maps to one activity mark for a learner - * - * */ public class GradebookUserActivity { Fisheye: Tag de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivityArchive.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserLesson.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserLesson.java (.../GradebookUserLesson.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserLesson.java (.../GradebookUserLesson.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -27,11 +27,9 @@ import org.lamsfoundation.lams.usermanagement.User; /** + * This class maps to one learner's entire mark for a lesson + * * @author lfoxton - * - * This class maps to one learner's entire mark for a lesson - * - * */ public class GradebookUserLesson { private long uid; Fisheye: Tag de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserLessonArchive.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -0,0 +1,70 @@ +package org.lamsfoundation.lams.gradebook.service; + +import java.util.List; + +import org.lamsfoundation.lams.gradebook.GradebookUserLesson; +import org.lamsfoundation.lams.learningdesign.Activity; +import org.lamsfoundation.lams.lesson.Lesson; +import org.lamsfoundation.lams.usermanagement.User; + +public interface IGradebookService { + + /** + * If specified activity is set to produce ToolOutput, calculates and stores mark to gradebook. + * + * @param toolActivity + * @param progress + */ + void updateGradebookUserActivityMark(Lesson lesson, Activity activity, User learner); + + /** + * Method for updating an activity mark that tools can call + * + * @param mark + * @param feedback + * @param userID + * @param toolSessionID + */ + void updateGradebookUserActivityMark(Double mark, String feedback, Integer userID, Long toolSessionID, + Boolean markedInGradebook); + + /** + * Updates all user marks in specified activity. It recalculates all UserActivityGradebooks and + * UserLessonGradebooks. + * + * @param activity + */ + void recalculateGradebookMarksForActivity(Activity activity); + + /** + * Recalculates total marks for all users in a lesson. Then stores that mark in a gradebookUserLesson. Doesn't + * affect anyhow gradebookUserActivity objects. If total mark is positive but there is no gradebookUserLesson + * available - throws exception. + * + * @param lessonId + * @throws Exception + */ + void recalculateTotalMarksForLesson(Long lessonId) throws Exception; + + /** + * Gets a gradebook lesson mark/feedback for a given user and lesson + * + * @param lessonID + * @param userID + * @return + */ + GradebookUserLesson getGradebookUserLesson(Long lessonID, Integer userID); + + /** + * Gets a gradebook lesson mark/feedback for all users in a given lesson + * + * @param lessonID + * @return + */ + List getGradebookUserLesson(Long lessonID); + + void removeLearnerFromLesson(Long lessonId, Integer learnerId); + + void archiveLearnerMarks(Long lessonId, Integer learnerId); + +} Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java =================================================================== diff -u -rcad6ecebe29a61651bdf8c7500a6a17471c65970 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java (.../ILamsToolService.java) (revision cad6ecebe29a61651bdf8c7500a6a17471c65970) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java (.../ILamsToolService.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -91,6 +91,17 @@ * in case of problems. */ String completeToolSession(Long toolSessionId, Long learnerId); + + /** + * Method for updating an activity mark that tools can call + * + * @param mark + * @param feedback + * @param userID + * @param toolSessionID + */ + void updateActivityMark(Double mark, String feedback, Integer userID, Long toolSessionID, + Boolean markedInGradebook); /** * Allows the tool to ask whether or not the activity is grouped and therefore it should expect more than one tool Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java =================================================================== diff -u -rcad6ecebe29a61651bdf8c7500a6a17471c65970 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision cad6ecebe29a61651bdf8c7500a6a17471c65970) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -142,6 +142,12 @@ public String completeToolSession(Long toolSessionId, Long learnerId) { return learnerService.completeToolSession(toolSessionId, learnerId); } + + @Override + public void updateActivityMark(Double mark, String feedback, Integer userID, Long toolSessionID, + Boolean markedInGradebook) { + gradebookService.updateGradebookUserActivityMark(mark, feedback, userID, toolSessionID, markedInGradebook); + } @SuppressWarnings("unchecked") @Override Index: lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml =================================================================== diff -u -rcad6ecebe29a61651bdf8c7500a6a17471c65970 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml (.../toolApplicationContext.xml) (revision cad6ecebe29a61651bdf8c7500a6a17471c65970) +++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml (.../toolApplicationContext.xml) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -47,9 +47,6 @@ - - - @@ -92,6 +89,9 @@ + + + Index: lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -0,0 +1,20 @@ +package org.lamsfoundation.lams.util; + +public class CommonConstants { + + // params passed from the jqGrid + public static final String PARAM_PAGE = "page"; + public static final String PARAM_ROWS = "rows"; + public static final String PARAM_SIDX = "sidx"; + public static final String PARAM_SORD = "sord"; + + // XML Elemetns + public static final String ELEMENT_ROWS = "rows"; + public static final String ELEMENT_PAGE = "page"; + public static final String ELEMENT_TOTAL = "total"; + public static final String ELEMENT_RECORDS = "records"; + public static final String ELEMENT_ROW = "row"; + public static final String ELEMENT_ID = "id"; + public static final String ELEMENT_CELL = "cell"; + +} Index: lams_gradebook/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/model/GradebookUserActivityArchive.hbm.xml =================================================================== diff -u --- lams_gradebook/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/model/GradebookUserActivityArchive.hbm.xml (revision 0) +++ lams_gradebook/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/model/GradebookUserActivityArchive.hbm.xml (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: lams_gradebook/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.hbm.xml =================================================================== diff -u --- lams_gradebook/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.hbm.xml (revision 0) +++ lams_gradebook/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.hbm.xml (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserActivityArchive.java =================================================================== diff -u --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserActivityArchive.java (revision 0) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserActivityArchive.java (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -0,0 +1,109 @@ +/**************************************************************** + * 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 + * **************************************************************** + */ + +package org.lamsfoundation.lams.gradebook.model; + +import java.util.Date; + +import org.lamsfoundation.lams.gradebook.GradebookUserActivity; +import org.lamsfoundation.lams.learningdesign.ToolActivity; +import org.lamsfoundation.lams.usermanagement.User; + +public class GradebookUserActivityArchive { + + private long uid; + private ToolActivity activity; + private User learner; + private Double mark; + private String feedback; + private Boolean markedInGradebook; + private Date updateDate; + + public GradebookUserActivityArchive() { + } + + public GradebookUserActivityArchive(GradebookUserActivity source) { + this.uid = source.getUid(); + this.activity = source.getActivity(); + this.learner = source.getLearner(); + this.mark = source.getMark(); + this.feedback = source.getFeedback(); + this.markedInGradebook = source.getMarkedInGradebook(); + this.updateDate = source.getUpdateDate(); + } + + public long getUid() { + return uid; + } + + public void setUid(long uid) { + this.uid = uid; + } + + public ToolActivity getActivity() { + return activity; + } + + public void setActivity(ToolActivity activity) { + this.activity = activity; + } + + public User getLearner() { + return learner; + } + + public void setLearner(User learner) { + this.learner = learner; + } + + public Double getMark() { + return mark; + } + + public void setMark(Double mark) { + this.mark = mark; + } + + public String getFeedback() { + return feedback; + } + + public void setFeedback(String feedback) { + this.feedback = feedback; + } + + public Boolean getMarkedInGradebook() { + return markedInGradebook; + } + + public void setMarkedInGradebook(Boolean markedInGradebook) { + this.markedInGradebook = markedInGradebook; + } + + public Date getUpdateDate() { + return updateDate; + } + + public void setUpdateDate(Date updateDate) { + this.updateDate = updateDate; + } +} \ No newline at end of file Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java =================================================================== diff -u --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java (revision 0) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -0,0 +1,86 @@ +/**************************************************************** + * 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 + * **************************************************************** + */ + +package org.lamsfoundation.lams.gradebook.model; + +import org.lamsfoundation.lams.gradebook.GradebookUserLesson; +import org.lamsfoundation.lams.lesson.Lesson; +import org.lamsfoundation.lams.usermanagement.User; + +public class GradebookUserLessonArchive { + private long uid; + private Lesson lesson; + private User learner; + private Double mark; + private String feedback; + + public GradebookUserLessonArchive() { + } + + public GradebookUserLessonArchive(GradebookUserLesson source) { + this.uid = source.getUid(); + this.lesson = source.getLesson(); + this.learner = source.getLearner(); + this.mark = source.getMark(); + this.feedback = source.getFeedback(); + } + + public long getUid() { + return uid; + } + + public void setUid(long uid) { + this.uid = uid; + } + + public Lesson getLesson() { + return lesson; + } + + public void setLesson(Lesson lesson) { + this.lesson = lesson; + } + + public User getLearner() { + return learner; + } + + public void setLearner(User learner) { + this.learner = learner; + } + + public Double getMark() { + return mark; + } + + public void setMark(Double mark) { + this.mark = mark; + } + + public String getFeedback() { + return feedback; + } + + public void setFeedback(String feedback) { + this.feedback = feedback; + } +} \ No newline at end of file Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java =================================================================== diff -u -rcad6ecebe29a61651bdf8c7500a6a17471c65970 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision cad6ecebe29a61651bdf8c7500a6a17471c65970) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -40,19 +40,18 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.gradebook.GradebookUserActivity; -import org.lamsfoundation.lams.gradebook.GradebookUserActivityArchive; import org.lamsfoundation.lams.gradebook.GradebookUserLesson; -import org.lamsfoundation.lams.gradebook.GradebookUserLessonArchive; import org.lamsfoundation.lams.gradebook.dao.IGradebookDAO; import org.lamsfoundation.lams.gradebook.dto.GBActivityGridRowDTO; import org.lamsfoundation.lams.gradebook.dto.GBLessonGridRowDTO; import org.lamsfoundation.lams.gradebook.dto.GBUserGridRowDTO; import org.lamsfoundation.lams.gradebook.dto.GradebookGridRowDTO; +import org.lamsfoundation.lams.gradebook.model.GradebookUserActivityArchive; +import org.lamsfoundation.lams.gradebook.model.GradebookUserLessonArchive; import org.lamsfoundation.lams.gradebook.util.GBGridView; import org.lamsfoundation.lams.gradebook.util.GradebookConstants; import org.lamsfoundation.lams.gradebook.util.GradebookUtil; import org.lamsfoundation.lams.gradebook.util.LessonComparator; -import org.lamsfoundation.lams.gradebook.util.UserComparator; import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ActivityEvaluation; @@ -84,6 +83,7 @@ import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; +import org.lamsfoundation.lams.usermanagement.util.LastNameAlphabeticComparator; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.DateUtil; @@ -101,9 +101,8 @@ * This service handles all gradebook-related service calls * * @author lfoxton - * */ -public class GradebookService implements IGradebookService { +public class GradebookService implements IGradebookFullService { private static Logger logger = Logger.getLogger(GradebookService.class); @@ -361,7 +360,7 @@ //size will be 0 in case of excel export if (size == 0) { learners = new LinkedList(lesson.getAllLearners()); - Collections.sort(learners, new UserComparator()); + Collections.sort(learners, new LastNameAlphabeticComparator()); userToLearnerProgressMap = getUserToLearnerProgressMap(lesson, null); userToGradebookUserLessonMap = getUserToGradebookUserLessonMap(lesson, null); @@ -597,7 +596,7 @@ } @Override - public void updateUserActivityGradebookMark(Lesson lesson, Activity activity, User learner) { + public void updateGradebookUserActivityMark(Lesson lesson, Activity activity, User learner) { ToolSession toolSession = toolService.getToolSessionByLearner(learner, activity); if ((toolSession == null) || (toolSession == null) || (learner == null) || (lesson == null) @@ -624,7 +623,7 @@ // Only set the mark if it hasnt previously been set by a teacher if ((gradebookUserActivity == null) || !gradebookUserActivity.getMarkedInGradebook()) { - updateUserActivityGradebookMark(lesson, learner, toolActivity, outputDouble, false, false); + updateGradebookUserActivityMark(lesson, learner, toolActivity, outputDouble, false, false); } } } @@ -636,7 +635,7 @@ } @Override - public void updateUserActivityGradebookMark(Lesson lesson, User learner, Activity activity, Double mark, + public void updateGradebookUserActivityMark(Lesson lesson, User learner, Activity activity, Double mark, Boolean markedInGradebook, boolean isAuditLogRequired) { GradebookUserActivity gradebookUserActivity = gradebookDAO @@ -752,7 +751,7 @@ } @Override - public void updateUserActivityGradebookFeedback(Activity activity, User learner, String feedback) { + public void updateGradebookUserActivityFeedback(Activity activity, User learner, String feedback) { GradebookUserActivity gradebookUserActivity = gradebookDAO .getGradebookUserDataForActivity(activity.getActivityId(), learner.getUserId()); @@ -896,7 +895,7 @@ Map> activityToUserDTOMap = new LinkedHashMap>(); - Set learners = new TreeSet(new UserComparator()); + Set learners = new TreeSet(new LastNameAlphabeticComparator()); if (lesson.getAllLearners() != null) { learners.addAll(lesson.getAllLearners()); } @@ -926,7 +925,7 @@ if (activity instanceof SequenceActivity) { // use only a subset of learners for this branch of the branching activity based on who has started the branch - complexLearners = new TreeSet(new UserComparator()); + complexLearners = new TreeSet(new LastNameAlphabeticComparator()); for (User learner : learners) { LearnerProgress learnerProgress = userToLearnerProgressMap.get(learner.getUserId()); if (learnerProgress != null && (learnerProgress.getCompletedActivities().get(activity) != null @@ -1177,7 +1176,7 @@ // -------------------- process Learner View page -------------------------------- - Set learners = new TreeSet(new UserComparator()); + Set learners = new TreeSet(new LastNameAlphabeticComparator()); if (lesson.getAllLearners() != null) { learners.addAll(lesson.getAllLearners()); } @@ -1317,7 +1316,7 @@ } //sort users by last name - TreeSet sortedLearners = new TreeSet(new UserComparator()); + TreeSet sortedLearners = new TreeSet(new LastNameAlphabeticComparator()); sortedLearners.addAll(allLearners); for (User learner : sortedLearners) { @@ -1722,7 +1721,7 @@ } @Override - public void updateActivityMark(Double mark, String feedback, Integer userID, Long toolSessionID, + public void updateGradebookUserActivityMark(Double mark, String feedback, Integer userID, Long toolSessionID, Boolean markedInGradebook) { ToolSession toolSession = toolService.getToolSessionById(toolSessionID); User learner = (User) userService.findById(User.class, userID); @@ -1733,9 +1732,9 @@ // If gradebook user activity is null or the mark is set by teacher or was set previously by user - save the // mark and feedback if ((gradebookUserActivity == null) || markedInGradebook || !gradebookUserActivity.getMarkedInGradebook()) { - updateUserActivityGradebookMark(toolSession.getLesson(), learner, activity, mark, markedInGradebook, + updateGradebookUserActivityMark(toolSession.getLesson(), learner, activity, mark, markedInGradebook, false); - updateUserActivityGradebookFeedback(activity, learner, feedback); + updateGradebookUserActivityFeedback(activity, learner, feedback); } } } Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java =================================================================== diff -u --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java (revision 0) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -0,0 +1,278 @@ +/**************************************************************** + * 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 + * **************************************************************** + */ + +package org.lamsfoundation.lams.gradebook.service; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.TimeZone; + +import org.lamsfoundation.lams.gradebook.GradebookUserActivity; +import org.lamsfoundation.lams.gradebook.dto.GBLessonGridRowDTO; +import org.lamsfoundation.lams.gradebook.dto.GBUserGridRowDTO; +import org.lamsfoundation.lams.gradebook.dto.GradebookGridRowDTO; +import org.lamsfoundation.lams.gradebook.util.GBGridView; +import org.lamsfoundation.lams.learningdesign.Activity; +import org.lamsfoundation.lams.learningdesign.LearningDesign; +import org.lamsfoundation.lams.learningdesign.ToolActivity; +import org.lamsfoundation.lams.lesson.Lesson; +import org.lamsfoundation.lams.usermanagement.Organisation; +import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.util.ExcelCell; + +public interface IGradebookFullService extends IGradebookService { + + /** + * Gets all the activity rows for a lesson, with the mark for each activity being the average for all users in the + * lesson + * + * @param lesson + * @return + */ + List getGBActivityRowsForLesson(Long lessonId, TimeZone userTimezone); + + /** + * Gets all the activity rows for a user, with the mark for the activity being the user's individual mark + * + * @param + * @param learner + * @return + */ + List getGBActivityRowsForLearner(Long lessonId, Integer userId, TimeZone userTimezone); + + /** + * Gets the GBActivityDTO list for an activity, which provides the marks for all users in an activity + * + * @param lesson + * @param activity + * @param groupId + * @return + */ + List getGBUserRowsForActivity(Lesson lesson, ToolActivity activity, Long groupId, int page, + int size, String sortBy, String sortOrder, String searchString, TimeZone userTimezone); + + /** + * Gets the user rows and the user's entire lesson mark for all users in a lesson + * + * @param lesson + * @return + */ + List getGBUserRowsForLesson(Lesson lesson, TimeZone userTimezone); + + /** + * Gets the user rows containing only users' names. Do proper paging on DB side. + * + * @param lesson + * @param page + * @param size + * @param sortOrder + * @param searchString + * @return + */ + List getGBUserRowsForLesson(Lesson lesson, int page, int size, String sortBy, String sortOrder, + String searchString, TimeZone userTimezone); + + /** + * Returns output for gradebook on lesson complete. + */ + List getGBLessonComplete(Long lessonId, Integer userId); + +// /** +// * Gets the user rows containing only users' names. Do proper paging on DB side. +// * +// * @param lesson +// * @param page +// * @param size +// * @param sortOrder +// * @param searchString +// * @return +// */ +// List getGBUserRowsForLesson(Lesson lesson, int page, int size, String sortOrder, +// String searchString); + + int getCountUsersByLesson(Long lessonId, String searchString); + + /** + * Gets the user rows for specified organisation + * + * @param organisation + * @return + */ + ArrayList getGBUserRowsForOrganisation(Organisation organisation, int page, int size, + String sortOrder, String searchString); + + int getCountUsersByOrganisation(Integer orgId, String searchString); + + /** + * Updates a user's lesson mark, this will make it desynchronised with the aggregated marks from the activities + * + * @param lesson + * @param learner + * @param mark + */ + void updateUserLessonGradebookMark(Lesson lesson, User learner, Double mark); + + /** + * Updates a user's activity mark, this will automatically add up all the user's activity marks for a lesson and set + * the lesson mark too + * + * @param lesson + * @param learner + * @param activity + * @param mark + * @param markedInGradebook + * @param isAuditLogRequired + * should this event be logged with audit service + */ + void updateGradebookUserActivityMark(Lesson lesson, User learner, Activity activity, Double mark, + Boolean markedInGradebook, boolean isAuditLogRequired); + + /** + * Updates the user's feedback for an activity + * + * @param activity + * @param learner + * @param feedback + */ + void updateGradebookUserActivityFeedback(Activity activity, User learner, String feedback); + + /** + * Updates the user's feedback for a lesson + * + * @param lesson + * @param learner + * @param feedback + */ + void updateUserLessonGradebookFeedback(Lesson lesson, User learner, String feedback); + + /** + * Toggle on/off marks released option + * + * @param lessonId + */ + void toggleMarksReleased(Long lessonId); + + /** + * Gets the lesson row dtos for a given organisation + * + * @param organisation + * @param user + * user which results is requested + * @param viewer + * user who view gradebook. We display list of lessons based on his rights. + * @param view + * @return + */ + List getGBLessonRows(Organisation organisation, User user, User viewer, GBGridView view, + int page, int size, String sortBy, String sortOrder, String searchString, TimeZone userTimeZone); + + /** + * Gets a gradebook activity mark/feedback for a given activity and user + * + * @param activityID + * @param userID + * @return + */ + GradebookUserActivity getGradebookUserActivity(Long activityID, Integer userID); + + /** + * Returns the average mark for a given activity. Activity can be grouped - then supply according groupId to receive + * AverageMarkForGroupedActivity. + * + * @param activityID + * @param groupID + * return AverageMarkForActivity if groupId is null and AverageMarkForGroupedActivity if groupId is + * specified + * @return + */ + Double getAverageMarkForActivity(Long activityID, Long groupID); + + /** + * Returns the average mark for a lesson + * + * @param lessonID + * @return + */ + Double getAverageMarkForLesson(Long lessonID); + + /** + * Get an activity from the db by id + * + * @param activityID + * @return + */ + Activity getActivityById(Long activityID); + + /** + * Get a language label + * + * @param key + * @return + */ + String getMessage(String key); + + /** + * Get the summary data in a 2s array for an excel export + * + * @param lesson + * @return + */ + LinkedHashMap exportLessonGradebook(Lesson lesson); + + /** + * Get the summary data for course in order to create excel export + * + * @param userId + * @param organisationId + * @return + */ + LinkedHashMap exportCourseGradebook(Integer userId, Integer organisationId); + + /** + * Get the summary data for selected lessons in order to create excel export + * + * @param userId + * @param organisationId + * @return + */ + LinkedHashMap exportSelectedLessonsGradebook(Integer userId, Integer organisationId, + String[] lessonIds, boolean simplified); + + /** + * Get the raw overall marks for a lesson for charting purposes + * + * @param lessonId + * @return + */ + List getMarksArray(Long lessonId); + + /** Will the marks caculation take into account weighting? */ + boolean isWeightedMarks(LearningDesign design); + + /** Will the marks caculation take into account weighting? */ + boolean isWeightedMarks(Long lessonId); + + /** Get a summary of the weightings */ + List getWeights(LearningDesign design); + +} \ No newline at end of file Fisheye: Tag de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a refers to a dead (removed) revision in file `lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java (.../GradebookConstants.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java (.../GradebookConstants.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -34,10 +34,6 @@ public static final String MODULE_NAME = "gradebook"; // Parameters - public static final String PARAM_PAGE = "page"; - public static final String PARAM_ROWS = "rows"; - public static final String PARAM_SIDX = "sidx"; - public static final String PARAM_SORD = "sord"; public static final String PARAM_METHOD = "method"; public static final String PARAM_DISPATCH = "dispatch"; public static final String PARAM_LOGIN = "login"; @@ -76,15 +72,6 @@ public static final String VIEW_LRN_ACTIVITY = "lrnActivity"; public static final String VIEW_LIST = "listView"; - // XML Elemetns - public static final String ELEMENT_ROWS = "rows"; - public static final String ELEMENT_PAGE = "page"; - public static final String ELEMENT_TOTAL = "total"; - public static final String ELEMENT_RECORDS = "records"; - public static final String ELEMENT_ROW = "row"; - public static final String ELEMENT_ID = "id"; - public static final String ELEMENT_CELL = "cell"; - // Misc public static final String CONTENT_TYPE_TEXTXML = "text/xml"; public static final String CONTENT_TYPE_TEXTPLAIN = "text/plain"; Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java =================================================================== diff -u -r39ceb19b74c579d46fb624c3b3ab02fd8e79683a -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java (.../GradebookUtil.java) (revision 39ceb19b74c579d46fb624c3b3ab02fd8e79683a) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java (.../GradebookUtil.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -48,6 +48,7 @@ import org.lamsfoundation.lams.gradebook.dto.comparators.GBRowNameComparator; import org.lamsfoundation.lams.gradebook.dto.comparators.GBStartDateComparator; import org.lamsfoundation.lams.gradebook.dto.comparators.GBTimeTakenComparator; +import org.lamsfoundation.lams.util.CommonConstants; import org.lamsfoundation.lams.util.ExcelCell; import org.lamsfoundation.lams.util.WebUtil; import org.w3c.dom.Document; @@ -118,33 +119,33 @@ Document document = GradebookUtil.getDocument(); // root element - Element rootElement = document.createElement(GradebookConstants.ELEMENT_ROWS); + Element rootElement = document.createElement(CommonConstants.ELEMENT_ROWS); - Element pageElement = document.createElement(GradebookConstants.ELEMENT_PAGE); + Element pageElement = document.createElement(CommonConstants.ELEMENT_PAGE); pageElement.appendChild(document.createTextNode("" + page)); rootElement.appendChild(pageElement); - Element totalPageElement = document.createElement(GradebookConstants.ELEMENT_TOTAL); + Element totalPageElement = document.createElement(CommonConstants.ELEMENT_TOTAL); totalPageElement.appendChild(document.createTextNode("" + totalPages)); rootElement.appendChild(totalPageElement); - Element recordsElement = document.createElement(GradebookConstants.ELEMENT_RECORDS); + Element recordsElement = document.createElement(CommonConstants.ELEMENT_RECORDS); recordsElement.appendChild(document.createTextNode("" + gridRows.size())); rootElement.appendChild(recordsElement); Iterator iter = gridRows.iterator(); while (iter.hasNext()) { GradebookGridRowDTO gridRow = (GradebookGridRowDTO) iter.next(); - Element rowElement = document.createElement(GradebookConstants.ELEMENT_ROW); - rowElement.setAttribute(GradebookConstants.ELEMENT_ID, gridRow.getId().toString()); + Element rowElement = document.createElement(CommonConstants.ELEMENT_ROW); + rowElement.setAttribute(CommonConstants.ELEMENT_ID, gridRow.getId().toString()); // Work out which grid we want to put the data into ArrayList gridRowStringArray = new ArrayList(); gridRowStringArray = gridRow.toStringArray(view); for (String gradebookItem : gridRowStringArray) { - Element cellElement = document.createElement(GradebookConstants.ELEMENT_CELL); + Element cellElement = document.createElement(CommonConstants.ELEMENT_CELL); gradebookItem = (gradebookItem != null) ? gradebookItem : ""; cellElement.appendChild(document.createTextNode(gradebookItem)); rowElement.appendChild(cellElement); Fisheye: Tag de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a refers to a dead (removed) revision in file `lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/UserComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java =================================================================== diff -u -r59f1a5c76599f3ba7ba88462fff9d03a878d7c22 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java (.../GradebookAction.java) (revision 59f1a5c76599f3ba7ba88462fff9d03a878d7c22) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java (.../GradebookAction.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -40,7 +40,7 @@ import org.lamsfoundation.lams.gradebook.dto.GBLessonGridRowDTO; import org.lamsfoundation.lams.gradebook.dto.GBUserGridRowDTO; import org.lamsfoundation.lams.gradebook.dto.GradebookGridRowDTO; -import org.lamsfoundation.lams.gradebook.service.IGradebookService; +import org.lamsfoundation.lams.gradebook.service.IGradebookFullService; import org.lamsfoundation.lams.gradebook.util.GBGridView; import org.lamsfoundation.lams.gradebook.util.GradebookConstants; import org.lamsfoundation.lams.gradebook.util.GradebookUtil; @@ -55,6 +55,7 @@ import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; +import org.lamsfoundation.lams.util.CommonConstants; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.session.SessionManager; @@ -71,7 +72,7 @@ private static Logger logger = Logger.getLogger(GradebookAction.class); - private static IGradebookService gradebookService; + private static IGradebookFullService gradebookService; private static IUserManagementService userService; private static ILessonService lessonService; private static ISecurityService securityService; @@ -102,10 +103,10 @@ public ActionForward getActivityGridData(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { // Getting the params passed in from the jqGrid - int page = WebUtil.readIntParam(request, GradebookConstants.PARAM_PAGE); - int rowLimit = WebUtil.readIntParam(request, GradebookConstants.PARAM_ROWS); - String sortOrder = WebUtil.readStrParam(request, GradebookConstants.PARAM_SORD); - String sortBy = WebUtil.readStrParam(request, GradebookConstants.PARAM_SIDX, true); + int page = WebUtil.readIntParam(request, CommonConstants.PARAM_PAGE); + int rowLimit = WebUtil.readIntParam(request, CommonConstants.PARAM_ROWS); + String sortOrder = WebUtil.readStrParam(request, CommonConstants.PARAM_SORD); + String sortBy = WebUtil.readStrParam(request, CommonConstants.PARAM_SIDX, true); Boolean isSearch = WebUtil.readBooleanParam(request, GradebookConstants.PARAM_SEARCH); String searchField = WebUtil.readStrParam(request, GradebookConstants.PARAM_SEARCH_FIELD, true); String searchOper = WebUtil.readStrParam(request, GradebookConstants.PARAM_SEARCH_OPERATION, true); @@ -167,12 +168,12 @@ List gradebookActivityDTOs = getGradebookService().getGBLessonComplete(lessonId, userId); JSONObject resultJSON = new JSONObject(); - resultJSON.put(GradebookConstants.ELEMENT_RECORDS, gradebookActivityDTOs.size()); + resultJSON.put(CommonConstants.ELEMENT_RECORDS, gradebookActivityDTOs.size()); JSONArray rowsJSON = new JSONArray(); for (GradebookGridRowDTO gradebookActivityDTO : gradebookActivityDTOs) { JSONObject rowJSON = new JSONObject(); - rowJSON.put(GradebookConstants.ELEMENT_ID, gradebookActivityDTO.getId()); + rowJSON.put(CommonConstants.ELEMENT_ID, gradebookActivityDTO.getId()); JSONArray cellJSON = new JSONArray(); cellJSON.put(gradebookActivityDTO.getRowName()); @@ -182,10 +183,10 @@ cellJSON.put(gradebookActivityDTO.getMark() == null ? GradebookConstants.CELL_EMPTY : GradebookUtil.niceFormatting(gradebookActivityDTO.getMark())); - rowJSON.put(GradebookConstants.ELEMENT_CELL, cellJSON); + rowJSON.put(CommonConstants.ELEMENT_CELL, cellJSON); rowsJSON.put(rowJSON); } - resultJSON.put(GradebookConstants.ELEMENT_ROWS, rowsJSON); + resultJSON.put(CommonConstants.ELEMENT_ROWS, rowsJSON); boolean isWeighted = getGradebookService().isWeightedMarks(lessonId); GradebookUserLesson gradebookUserLesson = getGradebookService().getGradebookUserLesson(lessonId, userId); @@ -225,10 +226,10 @@ HttpServletResponse response) throws Exception { // Getting the params passed in from the jqGrid - int page = WebUtil.readIntParam(request, GradebookConstants.PARAM_PAGE); - int rowLimit = WebUtil.readIntParam(request, GradebookConstants.PARAM_ROWS); - String sortOrder = WebUtil.readStrParam(request, GradebookConstants.PARAM_SORD); - String sortBy = WebUtil.readStrParam(request, GradebookConstants.PARAM_SIDX, true); + int page = WebUtil.readIntParam(request, CommonConstants.PARAM_PAGE); + int rowLimit = WebUtil.readIntParam(request, CommonConstants.PARAM_ROWS); + String sortOrder = WebUtil.readStrParam(request, CommonConstants.PARAM_SORD); + String sortBy = WebUtil.readStrParam(request, CommonConstants.PARAM_SIDX, true); Boolean isSearch = WebUtil.readBooleanParam(request, GradebookConstants.PARAM_SEARCH); String searchField = WebUtil.readStrParam(request, GradebookConstants.PARAM_SEARCH_FIELD, true); String searchString = WebUtil.readStrParam(request, GradebookConstants.PARAM_SEARCH_STRING, true); @@ -349,10 +350,10 @@ public ActionForward getCourseGridData(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { // Getting the params passed in from the jqGrid - int page = WebUtil.readIntParam(request, GradebookConstants.PARAM_PAGE); - int rowLimit = WebUtil.readIntParam(request, GradebookConstants.PARAM_ROWS); - String sortOrder = WebUtil.readStrParam(request, GradebookConstants.PARAM_SORD); - String sortBy = WebUtil.readStrParam(request, GradebookConstants.PARAM_SIDX, true); + int page = WebUtil.readIntParam(request, CommonConstants.PARAM_PAGE); + int rowLimit = WebUtil.readIntParam(request, CommonConstants.PARAM_ROWS); + String sortOrder = WebUtil.readStrParam(request, CommonConstants.PARAM_SORD); + String sortBy = WebUtil.readStrParam(request, CommonConstants.PARAM_SIDX, true); Boolean isSearch = WebUtil.readBooleanParam(request, GradebookConstants.PARAM_SEARCH); String searchField = WebUtil.readStrParam(request, GradebookConstants.PARAM_SEARCH_FIELD, true); String searchOper = WebUtil.readStrParam(request, GradebookConstants.PARAM_SEARCH_OPERATION, true); @@ -604,11 +605,11 @@ return GradebookAction.lessonService; } - private IGradebookService getGradebookService() { + private IGradebookFullService getGradebookService() { if (GradebookAction.gradebookService == null) { WebApplicationContext ctx = WebApplicationContextUtils .getRequiredWebApplicationContext(getServlet().getServletContext()); - GradebookAction.gradebookService = (IGradebookService) ctx.getBean("gradebookService"); + GradebookAction.gradebookService = (IGradebookFullService) ctx.getBean("gradebookService"); } return GradebookAction.gradebookService; } Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java =================================================================== diff -u -ra949c337adc53b2df9207aa1de6e500281de7c20 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java (.../GradebookMonitoringAction.java) (revision a949c337adc53b2df9207aa1de6e500281de7c20) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java (.../GradebookMonitoringAction.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -41,7 +41,7 @@ import org.apache.struts.action.ActionMapping; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.gradebook.service.IGradebookService; +import org.lamsfoundation.lams.gradebook.service.IGradebookFullService; import org.lamsfoundation.lams.gradebook.util.GBGridView; import org.lamsfoundation.lams.gradebook.util.GradebookConstants; import org.lamsfoundation.lams.gradebook.util.GradebookUtil; @@ -66,17 +66,15 @@ import org.springframework.web.context.support.WebApplicationContextUtils; /** + * Handles the monitor interfaces for gradebook. This is where marking for an activity/lesson takes place + * * @author lfoxton - * - * Handles the monitor interfaces for gradebook - * - * This is where marking for an activity/lesson takes place */ public class GradebookMonitoringAction extends LamsDispatchAction { private static Logger log = Logger.getLogger(GradebookMonitoringAction.class); - private static IGradebookService gradebookService; + private static IGradebookFullService gradebookService; private static IUserManagementService userService; private static ILessonService lessonService; private static ISecurityService securityService; @@ -86,12 +84,12 @@ HttpServletResponse response) throws Exception { try { Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID); - if (GradebookMonitoringAction.log.isDebugEnabled()) { - GradebookMonitoringAction.log.debug("Getting gradebook for lesson " + lessonId); + if (log.isDebugEnabled()) { + log.debug("Getting gradebook for lesson " + lessonId); } UserDTO user = getUser(); if (user == null) { - GradebookMonitoringAction.log.error("User missing from session. "); + log.error("User missing from session. "); return mapping.findForward("error"); } if (!getSecurityService().isLessonMonitor(lessonId, user.getUserID(), "get lesson gradebook", false)) { @@ -114,7 +112,7 @@ return mapping.findForward("monitorgradebook"); } catch (Exception e) { - GradebookMonitoringAction.log.error("Failed to load lesson gradebook", e); + log.error("Failed to load lesson gradebook", e); return mapping.findForward("error"); } } @@ -124,13 +122,13 @@ try { Integer organisationID = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID); - if (GradebookMonitoringAction.log.isDebugEnabled()) { - GradebookMonitoringAction.log.debug("Getting gradebook for organisation " + organisationID); + if (log.isDebugEnabled()) { + log.debug("Getting gradebook for organisation " + organisationID); } UserDTO user = getUser(); if (user == null) { - GradebookMonitoringAction.log.error("User missing from session. "); + log.error("User missing from session. "); return mapping.findForward("error"); } if (!getSecurityService().hasOrgRole(organisationID, user.getUserID(), @@ -145,7 +143,7 @@ return mapping.findForward("monitorcoursegradebook"); } catch (Exception e) { - GradebookMonitoringAction.log.error("Failed to load course gradebook", e); + log.error("Failed to load course gradebook", e); return mapping.findForward("error"); } } @@ -171,8 +169,7 @@ Integer userID = WebUtil.readIntParam(request, GradebookConstants.PARAM_ID); User learner = (User) getUserService().findById(User.class, userID); if (learner == null) { - GradebookMonitoringAction.log - .error("User with ID " + userID + " could not be found to update his lesson gradebook"); + log.error("User with ID " + userID + " could not be found to update his lesson gradebook"); response.sendError(HttpServletResponse.SC_BAD_REQUEST, "User could not be found"); return null; } @@ -228,16 +225,14 @@ Activity activity = getGradebookService().getActivityById(activityID); if ((activity == null) || !activity.isToolActivity()) { - GradebookMonitoringAction.log - .error("Activity with ID " + activityID + " could not be found or it is not a Tool Activity"); + log.error("Activity with ID " + activityID + " could not be found or it is not a Tool Activity"); response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Wrong activity"); return null; } User learner = (User) getUserService().findById(User.class, userID); if (learner == null) { - GradebookMonitoringAction.log - .error("User with ID " + userID + " could not be found to update his activity gradebook"); + log.error("User with ID " + userID + " could not be found to update his activity gradebook"); response.sendError(HttpServletResponse.SC_BAD_REQUEST, "User could not be found"); return null; } @@ -247,11 +242,11 @@ Lesson lesson = getLessonService().getLesson(lessonID); if ((markStr != null) && !markStr.equals("")) { Double mark = Double.parseDouble(markStr); - getGradebookService().updateUserActivityGradebookMark(lesson, learner, activity, mark, true, true); + getGradebookService().updateGradebookUserActivityMark(lesson, learner, activity, mark, true, true); } if (feedback != null) { - getGradebookService().updateUserActivityGradebookFeedback(activity, learner, feedback); + getGradebookService().updateGradebookUserActivityFeedback(activity, learner, feedback); } return null; @@ -305,16 +300,16 @@ return null; } - if (GradebookMonitoringAction.log.isDebugEnabled()) { - GradebookMonitoringAction.log.debug("Exporting to a spreadsheet lesson: " + lessonID); + if (log.isDebugEnabled()) { + log.debug("Exporting to a spreadsheet lesson: " + lessonID); } Lesson lesson = getLessonService().getLesson(lessonID); String fileName = lesson.getLessonName().replaceAll(" ", "_") + ".xlsx"; fileName = FileUtil.encodeFilenameForDownload(request, fileName); response.setContentType("application/x-download"); response.setHeader("Content-Disposition", "attachment;filename=" + fileName); - GradebookMonitoringAction.log.debug("Exporting to a spreadsheet gradebook lesson: " + lessonID); + log.debug("Exporting to a spreadsheet gradebook lesson: " + lessonID); ServletOutputStream out = response.getOutputStream(); LinkedHashMap dataToExport = getGradebookService().exportLessonGradebook(lesson); @@ -344,8 +339,8 @@ } Organisation organisation = (Organisation) getUserService().findById(Organisation.class, organisationID); - if (GradebookMonitoringAction.log.isDebugEnabled()) { - GradebookMonitoringAction.log.debug("Exporting to a spreadsheet course: " + organisationID); + if (log.isDebugEnabled()) { + log.debug("Exporting to a spreadsheet course: " + organisationID); } LinkedHashMap dataToExport = getGradebookService() .exportCourseGradebook(user.getUserID(), organisationID); @@ -386,9 +381,9 @@ Organisation organisation = (Organisation) getUserService().findById(Organisation.class, organisationID); String[] lessonIds = request.getParameterValues(AttributeNames.PARAM_LESSON_ID); - if (GradebookMonitoringAction.log.isDebugEnabled()) { - GradebookMonitoringAction.log.debug("Exporting to a spreadsheet lessons " + Arrays.toString(lessonIds) - + " from course: " + organisationID); + if (log.isDebugEnabled()) { + log.debug("Exporting to a spreadsheet lessons " + Arrays.toString(lessonIds) + " from course: " + + organisationID); } LinkedHashMap dataToExport = getGradebookService() .exportSelectedLessonsGradebook(user.getUserID(), organisationID, lessonIds, simplified); @@ -444,44 +439,39 @@ return (UserDTO) ss.getAttribute(AttributeNames.USER); } - private ActionForward displayMessage(ActionMapping mapping, HttpServletRequest req, String messageKey) { - req.setAttribute("messageKey", messageKey); - return mapping.findForward("message"); - } - private IUserManagementService getUserService() { - if (GradebookMonitoringAction.userService == null) { + if (userService == null) { WebApplicationContext ctx = WebApplicationContextUtils .getRequiredWebApplicationContext(getServlet().getServletContext()); - GradebookMonitoringAction.userService = (IUserManagementService) ctx.getBean("userManagementService"); + userService = (IUserManagementService) ctx.getBean("userManagementService"); } - return GradebookMonitoringAction.userService; + return userService; } private ILessonService getLessonService() { - if (GradebookMonitoringAction.lessonService == null) { + if (lessonService == null) { WebApplicationContext ctx = WebApplicationContextUtils .getRequiredWebApplicationContext(getServlet().getServletContext()); - GradebookMonitoringAction.lessonService = (ILessonService) ctx.getBean("lessonService"); + lessonService = (ILessonService) ctx.getBean("lessonService"); } - return GradebookMonitoringAction.lessonService; + return lessonService; } - private IGradebookService getGradebookService() { - if (GradebookMonitoringAction.gradebookService == null) { + private IGradebookFullService getGradebookService() { + if (gradebookService == null) { WebApplicationContext ctx = WebApplicationContextUtils .getRequiredWebApplicationContext(getServlet().getServletContext()); - GradebookMonitoringAction.gradebookService = (IGradebookService) ctx.getBean("gradebookService"); + gradebookService = (IGradebookFullService) ctx.getBean("gradebookService"); } - return GradebookMonitoringAction.gradebookService; + return gradebookService; } private ISecurityService getSecurityService() { - if (GradebookMonitoringAction.securityService == null) { + if (securityService == null) { WebApplicationContext ctx = WebApplicationContextUtils .getRequiredWebApplicationContext(getServlet().getServletContext()); - GradebookMonitoringAction.securityService = (ISecurityService) ctx.getBean("securityService"); + securityService = (ISecurityService) ctx.getBean("securityService"); } - return GradebookMonitoringAction.securityService; + return securityService; } } \ No newline at end of file Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/servlet/RecalculateTotalMarksForLessonServlet.java =================================================================== diff -u -r0aad94a28574176ae783da37b50e4108c0882e90 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/servlet/RecalculateTotalMarksForLessonServlet.java (.../RecalculateTotalMarksForLessonServlet.java) (revision 0aad94a28574176ae783da37b50e4108c0882e90) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/servlet/RecalculateTotalMarksForLessonServlet.java (.../RecalculateTotalMarksForLessonServlet.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.gradebook.service.IGradebookService; +import org.lamsfoundation.lams.gradebook.service.IGradebookFullService; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.service.ILessonService; import org.lamsfoundation.lams.util.WebUtil; @@ -54,14 +54,14 @@ private static IAuditService auditService; private static ILessonService lessonService; - private static IGradebookService gradebookService; + private static IGradebookFullService gradebookService; @Override public void init() throws ServletException { WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext()); auditService = (IAuditService) ctx.getBean("auditService"); lessonService = (ILessonService) ctx.getBean("lessonService"); - gradebookService = (IGradebookService) ctx.getBean("gradebookService"); + gradebookService = (IGradebookFullService) ctx.getBean("gradebookService"); } @Override Index: lams_learning/.classpath =================================================================== diff -u -r4338c54ef39ccdab47dc95d28deec40f23059633 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_learning/.classpath (.../.classpath) (revision 4338c54ef39ccdab47dc95d28deec40f23059633) +++ lams_learning/.classpath (.../.classpath) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -19,7 +19,6 @@ - Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java =================================================================== diff -u -r3f99af7413ffdfdf7f69c54fd2a773f9443ac899 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java (.../KumaliveAction.java) (revision 3f99af7413ffdfdf7f69c54fd2a773f9443ac899) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java (.../KumaliveAction.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -17,14 +17,14 @@ import org.apache.tomcat.util.json.JSONArray; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.gradebook.util.GradebookConstants; import org.lamsfoundation.lams.learning.kumalive.model.Kumalive; import org.lamsfoundation.lams.learning.kumalive.model.KumaliveRubric; import org.lamsfoundation.lams.learning.kumalive.service.IKumaliveService; import org.lamsfoundation.lams.security.ISecurityService; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.CommonConstants; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.ExcelCell; @@ -117,10 +117,10 @@ return null; } - int page = WebUtil.readIntParam(request, GradebookConstants.PARAM_PAGE); - int rowLimit = WebUtil.readIntParam(request, GradebookConstants.PARAM_ROWS); - String sortOrder = WebUtil.readStrParam(request, GradebookConstants.PARAM_SORD); - String sortColumn = WebUtil.readStrParam(request, GradebookConstants.PARAM_SIDX, true); + int page = WebUtil.readIntParam(request, CommonConstants.PARAM_PAGE); + int rowLimit = WebUtil.readIntParam(request, CommonConstants.PARAM_ROWS); + String sortOrder = WebUtil.readStrParam(request, CommonConstants.PARAM_SORD); + String sortColumn = WebUtil.readStrParam(request, CommonConstants.PARAM_SIDX, true); JSONObject resultJSON = KumaliveAction.getKumaliveService().getReportOrganisationData(organisationId, sortColumn, !"DESC".equalsIgnoreCase(sortOrder), rowLimit, page); @@ -185,7 +185,7 @@ return null; } - String sortOrder = WebUtil.readStrParam(request, GradebookConstants.PARAM_SORD); + String sortOrder = WebUtil.readStrParam(request, CommonConstants.PARAM_SORD); JSONObject responseJSON = KumaliveAction.getKumaliveService().getReportKumaliveData(kumaliveId, !"DESC".equalsIgnoreCase(sortOrder)); Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java =================================================================== diff -u -re3ce54ff7b473269e6148ad285f0148c61ae20af -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java (.../KumaliveService.java) (revision e3ce54ff7b473269e6148ad285f0148c61ae20af) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java (.../KumaliveService.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -44,15 +44,15 @@ import org.apache.tomcat.util.json.JSONArray; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.gradebook.util.GradebookConstants; -import org.lamsfoundation.lams.gradebook.util.UserComparator; import org.lamsfoundation.lams.learning.kumalive.dao.IKumaliveDAO; import org.lamsfoundation.lams.learning.kumalive.model.Kumalive; import org.lamsfoundation.lams.learning.kumalive.model.KumaliveRubric; import org.lamsfoundation.lams.learning.kumalive.model.KumaliveScore; import org.lamsfoundation.lams.security.ISecurityService; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.usermanagement.util.LastNameAlphabeticComparator; +import org.lamsfoundation.lams.util.CommonConstants; import org.lamsfoundation.lams.util.ExcelCell; import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.util.MessageService; @@ -63,7 +63,7 @@ private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.##", new DecimalFormatSymbols(Locale.ENGLISH)); private static final ExcelCell[] EMPTY_ROW = new ExcelCell[1]; - private static final Comparator USER_COMPARATOR = new UserComparator(); + private static final Comparator USER_COMPARATOR = new LastNameAlphabeticComparator(); private IKumaliveDAO kumaliveDAO; private ISecurityService securityService; @@ -194,9 +194,9 @@ JSONObject resultJSON = new JSONObject(); - resultJSON.put(GradebookConstants.ELEMENT_PAGE, page); - resultJSON.put(GradebookConstants.ELEMENT_TOTAL, totalPages); - resultJSON.put(GradebookConstants.ELEMENT_RECORDS, kumalives.size()); + resultJSON.put(CommonConstants.ELEMENT_PAGE, page); + resultJSON.put(CommonConstants.ELEMENT_TOTAL, totalPages); + resultJSON.put(CommonConstants.ELEMENT_RECORDS, kumalives.size()); JSONArray rowsJSON = new JSONArray(); @@ -205,13 +205,13 @@ for (Kumalive kumalive : kumalives) { JSONObject rowJSON = new JSONObject(); - rowJSON.put(GradebookConstants.ELEMENT_ID, kumalive.getKumaliveId()); + rowJSON.put(CommonConstants.ELEMENT_ID, kumalive.getKumaliveId()); JSONArray cellJSON = new JSONArray(); cellJSON.put(order); cellJSON.put(kumalive.getName()); - rowJSON.put(GradebookConstants.ELEMENT_CELL, cellJSON); + rowJSON.put(CommonConstants.ELEMENT_CELL, cellJSON); rowsJSON.put(rowJSON); if (isAscending) { @@ -221,7 +221,7 @@ } } - resultJSON.put(GradebookConstants.ELEMENT_ROWS, rowsJSON); + resultJSON.put(CommonConstants.ELEMENT_ROWS, rowsJSON); return resultJSON; } @@ -244,13 +244,13 @@ Collectors.mapping(KumaliveScore::getScore, Collectors.toList())))); JSONObject resultJSON = new JSONObject(); - resultJSON.put(GradebookConstants.ELEMENT_RECORDS, scores.size()); + resultJSON.put(CommonConstants.ELEMENT_RECORDS, scores.size()); JSONArray rowsJSON = new JSONArray(); for (Entry>> userEntry : scores.entrySet()) { JSONObject rowJSON = new JSONObject(); User user = userEntry.getKey(); - rowJSON.put(GradebookConstants.ELEMENT_ID, user.getUserId()); + rowJSON.put(CommonConstants.ELEMENT_ID, user.getUserId()); JSONArray cellJSON = new JSONArray(); cellJSON.put(user.getFirstName() + " " + user.getLastName()); @@ -271,11 +271,11 @@ cellJSON.put(score == null ? "" : DECIMAL_FORMAT.format(score / attempts.size())); } - rowJSON.put(GradebookConstants.ELEMENT_CELL, cellJSON); + rowJSON.put(CommonConstants.ELEMENT_CELL, cellJSON); rowsJSON.put(rowJSON); } - resultJSON.put(GradebookConstants.ELEMENT_ROWS, rowsJSON); + resultJSON.put(CommonConstants.ELEMENT_ROWS, rowsJSON); return resultJSON; } @@ -297,14 +297,14 @@ Collectors.toMap(score -> score.getRubric().getRubricId(), KumaliveScore::getScore))); JSONObject resultJSON = new JSONObject(); - resultJSON.put(GradebookConstants.ELEMENT_RECORDS, scores.size()); + resultJSON.put(CommonConstants.ELEMENT_RECORDS, scores.size()); JSONArray rowsJSON = new JSONArray(); // just normal ordering of questions short order = 1; for (Entry> batchEntry : scores.entrySet()) { JSONObject rowJSON = new JSONObject(); - rowJSON.put(GradebookConstants.ELEMENT_ID, order); + rowJSON.put(CommonConstants.ELEMENT_ID, order); JSONArray cellJSON = new JSONArray(); cellJSON.put(order); @@ -314,11 +314,11 @@ cellJSON.put(score == null ? "" : score); } - rowJSON.put(GradebookConstants.ELEMENT_CELL, cellJSON); + rowJSON.put(CommonConstants.ELEMENT_CELL, cellJSON); rowsJSON.put(rowJSON); } - resultJSON.put(GradebookConstants.ELEMENT_ROWS, rowsJSON); + resultJSON.put(CommonConstants.ELEMENT_ROWS, rowsJSON); return resultJSON; } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java =================================================================== diff -u -r4338c54ef39ccdab47dc95d28deec40f23059633 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (.../LearnerService.java) (revision 4338c54ef39ccdab47dc95d28deec40f23059633) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (.../LearnerService.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -654,7 +654,7 @@ public void updateGradebookMark(Activity activity, LearnerProgress progress) { User learner = progress.getUser(); Lesson lesson = progress.getLesson(); - gradebookService.updateUserActivityGradebookMark(lesson, activity, learner); + gradebookService.updateGradebookUserActivityMark(lesson, activity, learner); } /** @@ -1428,7 +1428,7 @@ || TOOL_SIGNATURE_MCQ.equals(tool.getToolSignature())) { auditLogBuilder.append("Pushing mark to Gradebook for activity ") .append(activity.getActivityId()).append(" ").append(activity.getTitle()).append("\n"); - gradebookService.updateUserActivityGradebookMark(lesson, activity, learner); + gradebookService.updateGradebookUserActivityMark(lesson, activity, learner); } } } Index: lams_monitoring/.classpath =================================================================== diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_monitoring/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) +++ lams_monitoring/.classpath (.../.classpath) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -18,6 +18,5 @@ - Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java =================================================================== diff -u -r4338c54ef39ccdab47dc95d28deec40f23059633 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java (.../EmailNotificationsAction.java) (revision 4338c54ef39ccdab47dc95d28deec40f23059633) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java (.../EmailNotificationsAction.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -51,7 +51,6 @@ import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.events.EmailNotificationArchive; import org.lamsfoundation.lams.events.IEventNotificationService; -import org.lamsfoundation.lams.gradebook.util.GradebookConstants; import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.lesson.Lesson; @@ -67,6 +66,7 @@ import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; +import org.lamsfoundation.lams.util.CommonConstants; import org.lamsfoundation.lams.util.DateUtil; import org.lamsfoundation.lams.util.ExcelCell; import org.lamsfoundation.lams.util.ExcelUtil; @@ -313,32 +313,32 @@ } } - int page = WebUtil.readIntParam(request, GradebookConstants.PARAM_PAGE); - int rowLimit = WebUtil.readIntParam(request, GradebookConstants.PARAM_ROWS); + int page = WebUtil.readIntParam(request, CommonConstants.PARAM_PAGE); + int rowLimit = WebUtil.readIntParam(request, CommonConstants.PARAM_ROWS); // get only recipients we want on the page List recipients = monitoringService.getArchivedEmailNotificationRecipients(emailNotificationUid, rowLimit, (page - 1) * rowLimit); // build JSON which is understood by jqGrid JSONObject responseJSON = new JSONObject(); - responseJSON.put(GradebookConstants.ELEMENT_PAGE, page); - responseJSON.put(GradebookConstants.ELEMENT_TOTAL, ((notification.getRecipients().size() - 1) / rowLimit) + 1); - responseJSON.put(GradebookConstants.ELEMENT_RECORDS, recipients.size()); + responseJSON.put(CommonConstants.ELEMENT_PAGE, page); + responseJSON.put(CommonConstants.ELEMENT_TOTAL, ((notification.getRecipients().size() - 1) / rowLimit) + 1); + responseJSON.put(CommonConstants.ELEMENT_RECORDS, recipients.size()); JSONArray rowsJSON = new JSONArray(); for (User recipient : recipients) { JSONObject rowJSON = new JSONObject(); - rowJSON.put(GradebookConstants.ELEMENT_ID, recipient.getUserId()); + rowJSON.put(CommonConstants.ELEMENT_ID, recipient.getUserId()); JSONArray cellJSON = new JSONArray(); cellJSON.put(recipient.getFirstName() + " " + recipient.getLastName() + " [" + recipient.getLogin() + "]"); - rowJSON.put(GradebookConstants.ELEMENT_CELL, cellJSON); + rowJSON.put(CommonConstants.ELEMENT_CELL, cellJSON); rowsJSON.put(rowJSON); } - responseJSON.put(GradebookConstants.ELEMENT_ROWS, rowsJSON); + responseJSON.put(CommonConstants.ELEMENT_ROWS, rowsJSON); writeResponse(response, "text/json", LamsDispatchAction.ENCODING_UTF8, responseJSON.toString()); return null; } Index: lams_tool_assessment/.classpath =================================================================== diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_assessment/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) +++ lams_tool_assessment/.classpath (.../.classpath) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -24,6 +24,5 @@ - Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml (.../assessmentApplicationContext.xml) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml (.../assessmentApplicationContext.xml) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -92,9 +92,6 @@ - - - Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -53,7 +53,6 @@ import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; import org.lamsfoundation.lams.events.IEventNotificationService; -import org.lamsfoundation.lams.gradebook.service.IGradebookService; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; @@ -149,8 +148,6 @@ private IExportToolContentService exportContentService; - private IGradebookService gradebookService; - private ICoreNotebookService coreNotebookService; private IEventNotificationService eventNotificationService; @@ -1970,7 +1967,7 @@ assessmentResultDao.saveObject(result); // propagade changes to Gradebook - gradebookService.updateActivityMark(new Double(totalMark), null, userId.intValue(), toolSessionId, false); + toolService.updateActivityMark(new Double(totalMark), null, userId.intValue(), toolSessionId, false); // records mark change with audit service auditService.logMarkChange(AssessmentConstants.TOOL_SIGNATURE, userId, user.getLoginName(), "" + oldMark, @@ -2239,7 +2236,7 @@ // if this is the last finished assessment result - propagade total mark to Gradebook if (lastFinishedAssessmentResult != null && lastFinishedAssessmentResult.getUid().equals(assessmentResult.getUid())) { - gradebookService.updateActivityMark(new Double(assessmentMark), null, + toolService.updateActivityMark(new Double(assessmentMark), null, user.getUserId().intValue(), toolSessionId, false); } } @@ -2584,7 +2581,7 @@ } // propagade changes to Gradebook - gradebookService.updateActivityMark(null, null, userId, session.getSessionId(), false); + toolService.updateActivityMark(null, null, userId, session.getSessionId(), false); assessmentUserDao.removeObject(AssessmentUser.class, user.getUid()); } @@ -2783,10 +2780,6 @@ this.exportContentService = exportContentService; } - public void setGradebookService(IGradebookService gradebookService) { - this.gradebookService = gradebookService; - } - public IUserManagementService getUserManagementService() { return userManagementService; } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java =================================================================== diff -u -r5c770157545dea3dbc72e22a1dd1107c56cf22eb -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 5c770157545dea3dbc72e22a1dd1107c56cf22eb) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -50,7 +50,6 @@ import org.apache.tomcat.util.json.JSONArray; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.gradebook.util.GradebookConstants; import org.lamsfoundation.lams.tool.assessment.AssessmentConstants; import org.lamsfoundation.lams.tool.assessment.dto.AssessmentResultDTO; import org.lamsfoundation.lams.tool.assessment.dto.AssessmentUserDTO; @@ -69,6 +68,7 @@ import org.lamsfoundation.lams.tool.assessment.service.IAssessmentService; import org.lamsfoundation.lams.tool.assessment.util.AssessmentEscapeUtils; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.CommonConstants; import org.lamsfoundation.lams.util.DateUtil; import org.lamsfoundation.lams.util.ExcelCell; import org.lamsfoundation.lams.util.ExcelUtil; @@ -347,10 +347,10 @@ Long sessionId = WebUtil.readLongParam(request, "sessionId"); // Getting the params passed in from the jqGrid - int page = WebUtil.readIntParam(request, GradebookConstants.PARAM_PAGE); - int rowLimit = WebUtil.readIntParam(request, GradebookConstants.PARAM_ROWS); - String sortOrder = WebUtil.readStrParam(request, GradebookConstants.PARAM_SORD); - String sortBy = WebUtil.readStrParam(request, GradebookConstants.PARAM_SIDX, true); + int page = WebUtil.readIntParam(request, CommonConstants.PARAM_PAGE); + int rowLimit = WebUtil.readIntParam(request, CommonConstants.PARAM_ROWS); + String sortOrder = WebUtil.readStrParam(request, CommonConstants.PARAM_SORD); + String sortBy = WebUtil.readStrParam(request, CommonConstants.PARAM_SIDX, true); if (StringUtils.isEmpty(sortBy)) { sortBy = "userName"; } @@ -435,10 +435,10 @@ Long questionUid = WebUtil.readLongParam(request, "questionUid"); // Getting the params passed in from the jqGrid - int page = WebUtil.readIntParam(request, GradebookConstants.PARAM_PAGE); - int rowLimit = WebUtil.readIntParam(request, GradebookConstants.PARAM_ROWS); - String sortOrder = WebUtil.readStrParam(request, GradebookConstants.PARAM_SORD); - String sortBy = WebUtil.readStrParam(request, GradebookConstants.PARAM_SIDX, true); + int page = WebUtil.readIntParam(request, CommonConstants.PARAM_PAGE); + int rowLimit = WebUtil.readIntParam(request, CommonConstants.PARAM_ROWS); + String sortOrder = WebUtil.readStrParam(request, CommonConstants.PARAM_SORD); + String sortBy = WebUtil.readStrParam(request, CommonConstants.PARAM_SIDX, true); if (StringUtils.isEmpty(sortBy)) { sortBy = "userName"; } Index: lams_tool_bbb/.classpath =================================================================== diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_bbb/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) +++ lams_tool_bbb/.classpath (.../.classpath) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -6,7 +6,6 @@ - Index: lams_tool_eadventure/.classpath =================================================================== diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_eadventure/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) +++ lams_tool_eadventure/.classpath (.../.classpath) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -6,7 +6,6 @@ - Index: lams_tool_forum/.classpath =================================================================== diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_forum/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) +++ lams_tool_forum/.classpath (.../.classpath) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -23,6 +23,5 @@ - Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml (.../forumApplicationContext.xml) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml (.../forumApplicationContext.xml) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -136,9 +136,6 @@ - - - Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -50,7 +50,6 @@ import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.events.IEventNotificationService; -import org.lamsfoundation.lams.gradebook.service.IGradebookService; import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; @@ -150,8 +149,6 @@ private ForumOutputFactory forumOutputFactory; - private IGradebookService gradebookService; - private IEventNotificationService eventNotificationService; private ILessonService lessonService; @@ -924,7 +921,7 @@ user.setSessionFinished(false); forumUserDao.save(user); - gradebookService.updateActivityMark(null, null, userId, session.getSessionId(), false); + toolService.updateActivityMark(null, null, userId, session.getSessionId(), false); } } } @@ -1208,7 +1205,7 @@ } if (totalMark != null) { Double mark = new Double(totalMark); - gradebookService.updateActivityMark(mark, null, user.getUserId().intValue(), toolSessionID, false); + toolService.updateActivityMark(mark, null, user.getUserId().intValue(), toolSessionID, false); } } @@ -1335,10 +1332,6 @@ return messageService.getMessage(key, args); } - public void setGradebookService(IGradebookService gradebookService) { - this.gradebookService = gradebookService; - } - public void setLessonService(ILessonService lessonService) { this.lessonService = lessonService; } @@ -1347,9 +1340,6 @@ this.activityDAO = activityDAO; } - /** - * {@inheritDoc} - */ @Override public String createTextSearchConditionName(Collection existingConditions) { String uniqueNumber = null; Index: lams_tool_lamc/.classpath =================================================================== diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_lamc/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) +++ lams_tool_lamc/.classpath (.../.classpath) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -22,6 +22,5 @@ - Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml (.../mcApplicationContext.xml) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml (.../mcApplicationContext.xml) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -81,7 +81,6 @@ - Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -56,7 +56,6 @@ import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; -import org.lamsfoundation.lams.gradebook.service.IGradebookService; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; @@ -135,10 +134,7 @@ private ILamsToolService toolService; private IToolContentHandler mcToolContentHandler = null; private IExportToolContentService exportContentService; - private IGradebookService gradebookService; - private ICoreNotebookService coreNotebookService; - private MessageService messageService; public McService() { @@ -775,7 +771,7 @@ updateMcQueUsr(user); // propagate changes to Gradebook - gradebookService.updateActivityMark(new Double(totalMark), null, user.getQueUsrId().intValue(), + toolService.updateActivityMark(new Double(totalMark), null, user.getQueUsrId().intValue(), mcSession.getMcSessionId(), false); // record mark change with audit service @@ -909,7 +905,7 @@ user.setLastAttemptTotalMark(newTotalMark); updateMcQueUsr(user); - gradebookService.updateActivityMark(new Double(newTotalMark), null, user.getQueUsrId().intValue(), + toolService.updateActivityMark(new Double(newTotalMark), null, user.getQueUsrId().intValue(), toolSessionId, false); } @@ -1307,7 +1303,7 @@ mcUserDAO.removeMcUser(user); - gradebookService.updateActivityMark(null, null, userId, session.getMcSessionId(), false); + toolService.updateActivityMark(null, null, userId, session.getMcSessionId(), false); } } } @@ -1696,10 +1692,6 @@ this.exportContentService = exportContentService; } - public void setGradebookService(IGradebookService gradebookService) { - this.gradebookService = gradebookService; - } - public void setMcOutputFactory(MCOutputFactory mcOutputFactory) { this.mcOutputFactory = mcOutputFactory; } Index: lams_tool_sbmt/.classpath =================================================================== diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_sbmt/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) +++ lams_tool_sbmt/.classpath (.../.classpath) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -15,7 +15,6 @@ - Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -52,7 +52,6 @@ import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.events.IEventNotificationService; -import org.lamsfoundation.lams.gradebook.service.IGradebookService; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; @@ -126,8 +125,6 @@ private MessageService messageService; - private IGradebookService gradebookService; - private IAuditService auditService; private SubmitFilesOutputFactory submitFilesOutputFactory; @@ -238,7 +235,7 @@ if (entry != null) { submitFilesContentDAO.delete(entry); } - gradebookService.updateActivityMark(null, null, user.getUserID(), session.getSessionID(), false); + toolService.updateActivityMark(null, null, user.getUserID(), session.getSessionID(), false); submitUserDAO.delete(user); } @@ -919,7 +916,7 @@ } if (totalMark != null) { Double mark = new Double(totalMark); - gradebookService.updateActivityMark(mark, null, user.getUserID(), toolSessionID, false); + toolService.updateActivityMark(mark, null, user.getUserID(), toolSessionID, false); } } } @@ -1215,10 +1212,6 @@ this.auditService = auditService; } - public void setGradebookService(IGradebookService gradebookService) { - this.gradebookService = gradebookService; - } - @Override public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { return getSubmitFilesOutputFactory().getSupportedDefinitionClasses(definitionType); Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml (.../submitFilesApplicationContext.xml) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml (.../submitFilesApplicationContext.xml) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -54,7 +54,6 @@ - Index: lams_tool_scratchie/.classpath =================================================================== diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_scratchie/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) +++ lams_tool_scratchie/.classpath (.../.classpath) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -20,7 +20,6 @@ - Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml (.../scratchieApplicationContext.xml) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml (.../scratchieApplicationContext.xml) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -104,7 +104,6 @@ - Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -51,7 +51,6 @@ import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; import org.lamsfoundation.lams.events.IEventNotificationService; -import org.lamsfoundation.lams.gradebook.service.IGradebookService; import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; @@ -143,8 +142,6 @@ private IExportToolContentService exportContentService; - private IGradebookService gradebookService; - private IAuditService auditService; private ICoreNotebookService coreNotebookService; @@ -380,7 +377,7 @@ List users = this.getUsersBySession(sessionId); for (ScratchieUser user : users) { - gradebookService.updateActivityMark(new Double(newMark), null, user.getUserId().intValue(), + toolService.updateActivityMark(new Double(newMark), null, user.getUserId().intValue(), user.getSession().getSessionId(), false); // record mark change with audit service @@ -457,7 +454,7 @@ if (isPropagateToGradebook) { List users = this.getUsersBySession(sessionId); for (ScratchieUser user : users) { - gradebookService.updateActivityMark(new Double(mark), null, user.getUserId().intValue(), + toolService.updateActivityMark(new Double(mark), null, user.getUserId().intValue(), user.getSession().getSessionId(), false); } } @@ -2026,7 +2023,7 @@ scratchieUserDao.removeObject(ScratchieUser.class, user.getUid()); - gradebookService.updateActivityMark(null, null, userId, session.getSessionId(), false); + toolService.updateActivityMark(null, null, userId, session.getSessionId(), false); } } } @@ -2134,10 +2131,6 @@ this.exportContentService = exportContentService; } - public void setGradebookService(IGradebookService gradebookService) { - this.gradebookService = gradebookService; - } - public void setAuditService(IAuditService auditService) { this.auditService = auditService; } Index: lams_tool_spreadsheet/.classpath =================================================================== diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_spreadsheet/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) +++ lams_tool_spreadsheet/.classpath (.../.classpath) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -24,6 +24,5 @@ - Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -35,7 +35,6 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; -import org.lamsfoundation.lams.gradebook.service.IGradebookService; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; @@ -92,7 +91,6 @@ private IUserManagementService userManagementService; private IExportToolContentService exportContentService; private ICoreNotebookService coreNotebookService; - private IGradebookService gradebookService; // ******************************************************************************* // Service method @@ -321,7 +319,7 @@ // send marks to gradebook where applicable if (mark.getMarks() != null) { Double doubleMark = new Double(mark.getMarks()); - gradebookService.updateActivityMark(doubleMark, null, user.getUserId().intValue(), sessionId, + toolService.updateActivityMark(doubleMark, null, user.getUserId().intValue(), sessionId, false); } } @@ -689,14 +687,6 @@ this.coreNotebookService = coreNotebookService; } - public IGradebookService getGradebookService() { - return gradebookService; - } - - public void setGradebookService(IGradebookService gradebookService) { - this.gradebookService = gradebookService; - } - @Override public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { return null; Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml (.../spreadsheetApplicationContext.xml) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml (.../spreadsheetApplicationContext.xml) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) @@ -13,7 +13,6 @@ - @@ -80,11 +79,7 @@ - - - - - +