Index: lams_build/lib/lams/lams-gradebook.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams-gradebook.jar,v
diff -u -r1.1.2.2 -r1.1.2.3
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.324.2.1 -r1.324.2.2
Binary files differ
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/Attic/GradebookUserActivity.hbm.xml,v
diff -u -r1.1 -r1.1.2.1
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml	9 Apr 2009 05:05:39 -0000	1.1
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml	1 May 2009 06:13:56 -0000	1.1.2.1
@@ -67,6 +67,15 @@
             column="feedback"
             length="65535"
         />
+        
+        <property
+            name="markedInGradebook"
+            type="java.lang.Boolean"
+            update="true"
+            insert="true"
+            column="marked_in_gradebook"
+            length="1"
+        />
 
         <!--
             To add non XDoclet property mappings, create a file named
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_tables.sql,v
diff -u -r1.138.2.3 -r1.138.2.4
--- lams_common/db/sql/create_lams_11_tables.sql	27 Apr 2009 21:38:08 -0000	1.138.2.3
+++ lams_common/db/sql/create_lams_11_tables.sql	1 May 2009 06:13:56 -0000	1.138.2.4
@@ -1112,6 +1112,7 @@
 	, user_id BIGINT (20) NOT NULL
 	, mark DOUBLE PRECISION 
 	, feedback TEXT
+	, marked_in_gradebook TINYINT(1) NOT NULL DEFAULT 0
 	, INDEX (activity_id, user_id)
 	, CONSTRAINT FK_lams_gradebook_user_activity_1 FOREIGN KEY (activity_id)
                   REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE
Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java,v
diff -u -r1.1 -r1.1.2.1
--- lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java	9 Apr 2009 05:05:39 -0000	1.1
+++ lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java	1 May 2009 06:13:55 -0000	1.1.2.1
@@ -40,13 +40,16 @@
     private User learner;
     private Double mark;
     private String feedback;
+    private Boolean markedInGradebook;
 
     public GradebookUserActivity() {
+	markedInGradebook = false;
     }
     
     public GradebookUserActivity(ToolActivity activity, User learner){
 	this.activity = activity;
 	this.learner = learner;
+	markedInGradebook = false;
     }
 
     /**
@@ -105,4 +108,17 @@
     public void setFeedback(String feedback) {
         this.feedback = feedback;
     }
+
+    /**
+     * @hibernate.property column="marked_in_gradebook" length="1"
+     */
+    public Boolean getMarkedInGradebook() {
+        return markedInGradebook;
+    }
+
+    public void setMarkedInGradebook(Boolean markedInGradebook) {
+        this.markedInGradebook = markedInGradebook;
+    }
+    
+    
 }
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java,v
diff -u -r1.1.2.12 -r1.1.2.13
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	23 Apr 2009 01:41:00 -0000	1.1.2.12
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	1 May 2009 06:15:09 -0000	1.1.2.13
@@ -374,7 +374,7 @@
      *      org.lamsfoundation.lams.usermanagement.User,
      *      org.lamsfoundation.lams.learningdesign.Activity, java.lang.Double)
      */
-    public void updateUserActivityGradebookMark(Lesson lesson, User learner, Activity activity, Double mark) {
+    public void updateUserActivityGradebookMark(Lesson lesson, User learner, Activity activity, Double mark, Boolean markedInGradebook) {
 	if (lesson != null && activity != null && learner != null && activity.isToolActivity()) {
 
 	    // First, update the mark for the activity
@@ -386,6 +386,7 @@
 	    }
 
 	    gradebookUserActivity.setMark(mark);
+	    gradebookUserActivity.setMarkedInGradebook(markedInGradebook);
 	    gradebookDAO.insertOrUpdate(gradebookUserActivity);
 
 	    // Now update the lesson mark
@@ -523,16 +524,16 @@
      * @see org.lamsfoundation.lams.gradebook.service.IGradebookService#updateActivityMark(java.lang.Double,
      *      java.lang.String, java.lang.Integer, java.lang.Long)
      */
-    public void updateActivityMark(Double mark, String feedback, Integer userID, Long toolSessionID) {
+    public void updateActivityMark(Double mark, String feedback, Integer userID, Long toolSessionID, Boolean markedInGradebook) {
 	ToolSession toolSession = toolService.getToolSessionById(toolSessionID);
 	User learner = (User) userService.findById(User.class, userID);
 	if (learner != null && toolSession != null) {
 	    ToolActivity activity = toolSession.getToolActivity();
 	    GradebookUserActivity gradebookUserActivity = getGradebookUserActivity(activity.getActivityId(), userID);
 
 	    // If gradebook user activity is null, save the mark and feedback
-	    if (gradebookUserActivity == null) {
-		updateUserActivityGradebookMark(toolSession.getLesson(), learner, activity, mark);
+	    if (gradebookUserActivity == null || !gradebookUserActivity.getMarkedInGradebook()) {
+		updateUserActivityGradebookMark(toolSession.getLesson(), learner, activity, mark, markedInGradebook);
 	    } 
 
 	}
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java	23 Apr 2009 00:26:41 -0000	1.1.2.4
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java	1 May 2009 06:15:09 -0000	1.1.2.5
@@ -98,7 +98,7 @@
      * @param activity
      * @param mark
      */
-    public void updateUserActivityGradebookMark(Lesson lesson, User learner, Activity activity, Double mark);
+    public void updateUserActivityGradebookMark(Lesson lesson, User learner, Activity activity, Double mark, Boolean markedInGradebook);
     
     /**
      * Updates the user's feedback for an activity
@@ -168,7 +168,7 @@
      * @param userID
      * @param toolSessionID
      */
-    public void updateActivityMark(Double mark, String feedback, Integer userID, Long toolSessionID);
+    public void updateActivityMark(Double mark, String feedback, Integer userID, Long toolSessionID, Boolean markedInGradebook);
     
     /**
      * Get an activity from the db by id
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java,v
diff -u -r1.1.2.5 -r1.1.2.6
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java	22 Apr 2009 06:39:06 -0000	1.1.2.5
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java	1 May 2009 06:15:09 -0000	1.1.2.6
@@ -248,7 +248,7 @@
 
 	    if (markStr != null && !markStr.equals("")) {
 		Double mark = Double.parseDouble(markStr);
-		gradebookService.updateUserActivityGradebookMark(lesson, learner, activity, mark);
+		gradebookService.updateUserActivityGradebookMark(lesson, learner, activity, mark, true);
 	    }
 
 	    if (feedback != null) {
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java,v
diff -u -r1.96.4.2 -r1.96.4.3
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	22 Apr 2009 06:39:05 -0000	1.96.4.2
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	1 May 2009 06:13:55 -0000	1.96.4.3
@@ -647,8 +647,8 @@
 				    toolActivity.getActivityId(), learner.getUserId());
 			    
 			    // Only set the mark if it hasnt previously been set by a teacher
-			    if (gradebookUserActivity == null) {
-				gradebookService.updateUserActivityGradebookMark(lesson, learner, toolActivity, outputDouble);
+			    if (gradebookUserActivity == null || !gradebookUserActivity.getMarkedInGradebook()) {
+				gradebookService.updateUserActivityGradebookMark(lesson, learner, toolActivity, outputDouble, false);
 			    }
 			}
 		    }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v
diff -u -r1.99.4.2 -r1.99.4.3
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	23 Apr 2009 00:26:42 -0000	1.99.4.2
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	1 May 2009 06:13:56 -0000	1.99.4.3
@@ -1157,7 +1157,7 @@
 	    }
 	    if (totalMark != null) {
 		Double mark = new Double(totalMark);
-		gradebookService.updateActivityMark(mark, null, user.getUserId().intValue(), toolSessionID);
+		gradebookService.updateActivityMark(mark, null, user.getUserId().intValue(), toolSessionID, false);
 	    }
 	}
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v
diff -u -r1.78.4.1 -r1.78.4.2
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	23 Apr 2009 00:26:40 -0000	1.78.4.1
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	1 May 2009 06:13:54 -0000	1.78.4.2
@@ -888,7 +888,7 @@
 	    }
 	    if (totalMark != null) {
 		Double mark = new Double(totalMark);
-		gradebookService.updateActivityMark(mark, null, user.getUserID(), toolSessionID);
+		gradebookService.updateActivityMark(mark, null, user.getUserID(), toolSessionID, false);
 	    }
 	}
     }