Index: lams_tool_daco/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.7 -r1.8
--- lams_tool_daco/conf/language/lams/ApplicationResources.properties	25 Aug 2008 08:17:23 -0000	1.7
+++ lams_tool_daco/conf/language/lams/ApplicationResources.properties	26 Aug 2008 03:28:09 -0000	1.8
@@ -101,6 +101,7 @@
 label.authoring.advanced.record.nolimit=No limit
 label.authoring.advanced.lock.on.finished  =Lock when finished
 label.authoring.advanced.notify.onlearnerentry=Notify monitoring teachers when a learner enters this activity
+label.authoring.advanced.notify.onrecordsubmit=Notify monitoring teachers when a learner submits a record
 
 label.authoring.online.instruction  =Online Instructions
 label.authoring.online.file  =Upload online file
@@ -266,4 +267,7 @@
 event.learnerentry.subject=LAMS: A learner entered a data collection tool
 event.learnerentry.body=The learner {0} entered a data collection tool.\n\nThis message was send automatically, following tool's advanced settings.
 
+event.recordsubmit.subject=LAMS: A learner entered submitted a record in a data collection tool
+event.recordsubmit.body=The learner {0} submitted a record in a data collection tool.\n\nThis message was send automatically, following tool's advanced settings.
+
 #======= End labels: Exported 159 labels for en AU =====
Index: lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.7 -r1.8
--- lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties	25 Aug 2008 08:17:23 -0000	1.7
+++ lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties	26 Aug 2008 03:28:09 -0000	1.8
@@ -101,6 +101,7 @@
 label.authoring.advanced.record.nolimit=No limit
 label.authoring.advanced.lock.on.finished  =Lock when finished
 label.authoring.advanced.notify.onlearnerentry=Notify monitoring teachers when a learner enters this activity
+label.authoring.advanced.notify.onrecordsubmit=Notify monitoring teachers when a learner submits a record
 
 label.authoring.online.instruction  =Online Instructions
 label.authoring.online.file  =Upload online file
@@ -266,4 +267,7 @@
 event.learnerentry.subject=LAMS: A learner entered a data collection tool
 event.learnerentry.body=The learner {0} entered a data collection tool.\n\nThis message was send automatically, following tool's advanced settings.
 
+event.recordsubmit.subject=LAMS: A learner entered submitted a record in a data collection tool
+event.recordsubmit.body=The learner {0} submitted a record in a data collection tool.\n\nThis message was send automatically, following tool's advanced settings.
+
 #======= End labels: Exported 159 labels for en AU =====
Index: lams_tool_daco/db/model/daco.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/db/model/daco.clay,v
diff -u -r1.4 -r1.5
--- lams_tool_daco/db/model/daco.clay	25 Aug 2008 08:17:23 -0000	1.4
+++ lams_tool_daco/db/model/daco.clay	26 Aug 2008 03:28:09 -0000	1.5
@@ -266,7 +266,7 @@
 </table>
 <table alias="" name="tl_ladaco10_contents" remarks="" uid="12a32bf:11be7cf04bc:-7ea5">
 <table-description/>
-<table-figure-bounds height="236" width="175" x="59" y="31"/>
+<table-figure-bounds height="249" width="175" x="59" y="31"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="" uid="12a32bf:11be7cf04bc:-7ea3">
 <column-description/>
@@ -422,6 +422,19 @@
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="record_submit_notify" remarks="" uid="d81970:11bfceee954:-7ff7">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT">
+<variant type-name-pattern="TINYINT"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+</data-type>
+</column>
 <column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="content_id" remarks="" uid="12a32bf:11be7cf04bc:-7e95">
 <column-description/>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
Index: lams_tool_daco/db/sql/create_lams_tool_daco.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/db/sql/create_lams_tool_daco.sql,v
diff -u -r1.6 -r1.7
--- lams_tool_daco/db/sql/create_lams_tool_daco.sql	25 Aug 2008 08:17:23 -0000	1.6
+++ lams_tool_daco/db/sql/create_lams_tool_daco.sql	26 Aug 2008 03:28:09 -0000	1.7
@@ -27,6 +27,7 @@
    reflect_instructions varchar(255), 
    reflect_on_activity tinyint,
    learner_entry_notify tinyint DEFAULT 0,
+   record_submit_notify tinyint DEFAULT 0,
    PRIMARY KEY (uid)
 )TYPE=innodb;
 
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java,v
diff -u -r1.9 -r1.10
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java	25 Aug 2008 08:17:23 -0000	1.9
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java	26 Aug 2008 03:28:09 -0000	1.10
@@ -289,4 +289,6 @@
 	// events
 	public static final String EVENT_NAME_NOTIFY_TEACHERS_ON_LEARNER_ENTRY = "notify_teachers_on_learner_entry";
 
+	public static final String EVENT_NAME_NOTIFY_TEACHERS_ON_RECORD_SUBMIT = "notify_teachers_on_record_submit";
+
 }
\ No newline at end of file
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Attic/Daco.hbm.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.hbm.xml	25 Aug 2008 08:17:23 -0000	1.4
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.hbm.xml	26 Aug 2008 03:28:09 -0000	1.5
@@ -204,6 +204,14 @@
             column="learner_entry_notify"
         />
 
+        <property
+            name="notifyTeachersOnRecordSumbit"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="record_submit_notify"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Daco.xml
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java,v
diff -u -r1.5 -r1.6
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java	25 Aug 2008 08:17:23 -0000	1.5
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java	26 Aug 2008 03:28:09 -0000	1.6
@@ -94,6 +94,8 @@
 
 	private boolean notifyTeachersOnLearnerEntry;
 
+	private boolean notifyTeachersOnRecordSumbit;
+
 	// *************** NON Persist Fields ********************
 	private IToolContentHandler toolContentHandler;
 
@@ -519,4 +521,16 @@
 	public void setNotifyTeachersOnLearnerEntry(boolean notifyTeachersOnLearnerEntry) {
 		this.notifyTeachersOnLearnerEntry = notifyTeachersOnLearnerEntry;
 	}
+
+	/**
+	 * @hibernate.property column="record_submit_notify"
+	 * @return
+	 */
+	public boolean isNotifyTeachersOnRecordSumbit() {
+		return notifyTeachersOnRecordSumbit;
+	}
+
+	public void setNotifyTeachersOnRecordSumbit(boolean notifyTeachersOnRecordSumbit) {
+		this.notifyTeachersOnRecordSumbit = notifyTeachersOnRecordSumbit;
+	}
 }
\ No newline at end of file
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java,v
diff -u -r1.9 -r1.10
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java	25 Aug 2008 08:17:23 -0000	1.9
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java	26 Aug 2008 03:28:09 -0000	1.10
@@ -241,6 +241,7 @@
 			service.getEventNotificationService().trigger(DacoConstants.TOOL_SIGNATURE,
 					DacoConstants.EVENT_NAME_NOTIFY_TEACHERS_ON_LEARNER_ENTRY, daco.getContentId(), new Object[] { fullName });
 		}
+
 		return mapping.findForward(DacoConstants.SUCCESS);
 	}
 
@@ -490,6 +491,16 @@
 
 			records.add(record);
 			request.setAttribute(DacoConstants.ATTR_RECORD_OPERATION_SUCCESS, DacoConstants.RECORD_OPERATION_ADD);
+
+			//notify teachers
+			if (daco.isNotifyTeachersOnRecordSumbit()
+					&& service.getEventNotificationService().eventExists(DacoConstants.TOOL_SIGNATURE,
+							DacoConstants.EVENT_NAME_NOTIFY_TEACHERS_ON_RECORD_SUBMIT, daco.getContentId())) {
+				String fullName = user.getLastName() + " " + user.getFirstName();
+				service.getEventNotificationService()
+						.trigger(DacoConstants.TOOL_SIGNATURE, DacoConstants.EVENT_NAME_NOTIFY_TEACHERS_ON_RECORD_SUBMIT,
+								daco.getContentId(), new Object[] { fullName });
+			}
 		}
 
 		request.setAttribute(DacoConstants.ATTR_DISPLAYED_RECORD_NUMBER, records.size() + 1);
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java,v
diff -u -r1.4 -r1.5
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java	25 Aug 2008 08:17:23 -0000	1.4
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java	26 Aug 2008 03:28:09 -0000	1.5
@@ -150,6 +150,8 @@
 			sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID, WebUtil.readStrParam(request,
 					AttributeNames.PARAM_CONTENT_FOLDER_ID));
 
+			HttpSession ss = SessionManager.getSession();
+			UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 			if (daco.isNotifyTeachersOnLearnerEntry()) {
 				//Since we don't know if the event exists, we just try to create it.
 				service.getEventNotificationService().createEvent(DacoConstants.TOOL_SIGNATURE,
@@ -158,12 +160,22 @@
 						service.getLocalisedMessage("event.learnerentry.body", null));
 
 				//Now we subscribe the teacher
-				HttpSession ss = SessionManager.getSession();
-				UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 				service.getEventNotificationService().subscribe(DacoConstants.TOOL_SIGNATURE,
 						DacoConstants.EVENT_NAME_NOTIFY_TEACHERS_ON_LEARNER_ENTRY, contentId, user.getUserID().longValue(),
 						IEventNotificationService.DELIVERY_METHOD_MAIL, IEventNotificationService.PERIODICITY_SINGLE);
 			}
+			if (daco.isNotifyTeachersOnRecordSumbit()) {
+				//Since we don't know if the event exists, we just try to create it.
+				service.getEventNotificationService().createEvent(DacoConstants.TOOL_SIGNATURE,
+						DacoConstants.EVENT_NAME_NOTIFY_TEACHERS_ON_RECORD_SUBMIT, contentId,
+						service.getLocalisedMessage("event.recordsubmit.subject", null),
+						service.getLocalisedMessage("event.recordsubmit.body", null));
+
+				//Now we subscribe the teacher
+				service.getEventNotificationService().subscribe(DacoConstants.TOOL_SIGNATURE,
+						DacoConstants.EVENT_NAME_NOTIFY_TEACHERS_ON_RECORD_SUBMIT, contentId, user.getUserID().longValue(),
+						IEventNotificationService.DELIVERY_METHOD_MAIL, IEventNotificationService.PERIODICITY_SINGLE);
+			}
 		}
 		return mapping.findForward(DacoConstants.SUCCESS);
 	}
Index: lams_tool_daco/web/pages/authoring/advanced.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/advanced.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_daco/web/pages/authoring/advanced.jsp	25 Aug 2008 08:17:23 -0000	1.5
+++ lams_tool_daco/web/pages/authoring/advanced.jsp	26 Aug 2008 03:28:09 -0000	1.6
@@ -41,7 +41,11 @@
 	styleId="notifyTeachersOnLearnerEntry">
 </html:checkbox> <label for="notifyTeachersOnLearnerEntry"> <fmt:message key="label.authoring.advanced.notify.onlearnerentry" /> </label></p>
 
-<p class="small-space-top"><html:checkbox property="daco.lockOnFinished" styleClass="noBorder"
+<p><html:checkbox property="daco.notifyTeachersOnRecordSumbit" styleClass="noBorder"
+	styleId="notifyTeachersOnRecordSubmit">
+</html:checkbox> <label for="notifyTeachersOnRecordSubmit"> <fmt:message key="label.authoring.advanced.notify.onrecordsubmit" /> </label></p>
+
+<p><html:checkbox property="daco.lockOnFinished" styleClass="noBorder"
 	styleId="lockOnFinished">
 </html:checkbox> <label for="lockOnFinished"> <fmt:message key="label.authoring.advanced.lock.on.finished" /> </label></p>
 
Index: lams_tool_daco/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/monitoring/summary.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_daco/web/pages/monitoring/summary.jsp	25 Aug 2008 08:17:23 -0000	1.4
+++ lams_tool_daco/web/pages/monitoring/summary.jsp	26 Aug 2008 03:28:09 -0000	1.5
@@ -64,6 +64,21 @@
 				</c:choose>	
 			</td>
 		</tr>
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advanced.notify.onrecordsubmit" />
+			</td>
+			<td>
+				<c:choose>
+					<c:when test="${daco.notifyTeachersOnRecordSumbit}">
+						<fmt:message key="label.monitoring.advancedsettings.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.monitoring.advancedsettings.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
 		
 		<tr>
 			<td>