Index: lams_tool_larsrc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -raa932dd995a61adeed918456c6257a4a9a9cea74 -r77491c8baf27f5b5d8705ea6b306e8db142389e7
--- lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision aa932dd995a61adeed918456c6257a4a9a9cea74)
+++ lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 77491c8baf27f5b5d8705ea6b306e8db142389e7)
@@ -158,7 +158,6 @@
 label.activity.completion = End of activity
 label.notifications = Notifications
 label.authoring.basic.resource.url.placeholder = include http:// or https://
-label.authoring.advanced.notify.onfileupload = Notify instructors when a learner uploads a file
 event.file.upload = {0} uploaded a file \"{1}\"
 label.upload.info = Uploaded file must not be executable and not exceed size of {0}
 error.file.type.zip = File must be a zip file.
Index: lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -raa932dd995a61adeed918456c6257a4a9a9cea74 -r77491c8baf27f5b5d8705ea6b306e8db142389e7
--- lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision aa932dd995a61adeed918456c6257a4a9a9cea74)
+++ lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 77491c8baf27f5b5d8705ea6b306e8db142389e7)
@@ -158,7 +158,6 @@
 label.activity.completion = End of activity
 label.notifications = Notifications
 label.authoring.basic.resource.url.placeholder = include http:// or https://
-label.authoring.advanced.notify.onfileupload = Notify instructors when a learner uploads a file
 event.file.upload = {0} uploaded a file \"{1}\"
 label.upload.info = Uploaded file must not be executable and not exceed size of {0}
 error.file.type.zip = File must be a zip file.
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20210304.sql
===================================================================
diff -u
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20210304.sql	(revision 0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20210304.sql	(revision 77491c8baf27f5b5d8705ea6b306e8db142389e7)
@@ -0,0 +1,16 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+-- Put all sql statements below here
+
+-- LDEV-5186 Merge two "notify on submit" column into one
+UPDATE tl_larsrc11_resource SET assigment_submit_notify = 1 WHERE file_upload_notify = 1;
+
+ALTER TABLE tl_larsrc11_resource DROP COLUMN file_upload_notify;
+
+-- Put all sql statements above here
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java
===================================================================
diff -u -rbbd1ae162c29e443f30ef696c36ba958be942272 -r77491c8baf27f5b5d8705ea6b306e8db142389e7
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	(.../Resource.java)	(revision bbd1ae162c29e443f30ef696c36ba958be942272)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	(.../Resource.java)	(revision 77491c8baf27f5b5d8705ea6b306e8db142389e7)
@@ -101,9 +101,6 @@
     @Column(name = "assigment_submit_notify")
     private boolean notifyTeachersOnAssigmentSumbit;
 
-    @Column(name = "file_upload_notify")
-    private boolean notifyTeachersOnFileUpload;
-
     @Column(name = "reflect_on_activity")
     private boolean reflectOnActivity;
 
@@ -436,20 +433,11 @@
 	this.notifyTeachersOnAssigmentSumbit = notifyTeachersOnAssigmentSumbit;
     }
 
-    public boolean isNotifyTeachersOnFileUpload() {
-	return notifyTeachersOnFileUpload;
-    }
-
-    public void setNotifyTeachersOnFileUpload(boolean notifyTeachersOnFileUpload) {
-	this.notifyTeachersOnFileUpload = notifyTeachersOnFileUpload;
-    }
-
     public Set<LearnerItemRatingCriteria> getRatingCriterias() {
 	return ratingCriterias;
     }
 
     public void setRatingCriterias(Set<LearnerItemRatingCriteria> ratingCriterias) {
 	this.ratingCriterias = ratingCriterias;
     }
-
 }
\ No newline at end of file
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
===================================================================
diff -u -ra07430557603483e95a40ae22062e79b68a37778 -r77491c8baf27f5b5d8705ea6b306e8db142389e7
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	(.../IResourceService.java)	(revision a07430557603483e95a40ae22062e79b68a37778)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	(.../IResourceService.java)	(revision 77491c8baf27f5b5d8705ea6b306e8db142389e7)
@@ -253,11 +253,8 @@
      */
     ResourceUser getUser(Long uid);
 
-    void notifyTeachersOnAssigmentSumbit(Long sessionId, ResourceUser resourceUser);
+    void notifyTeachersOnAssigmentSumbit(long itemUid);
 
-    void notifyTeachersOnFileUpload(Long toolContentId, Long toolSessionId, String sessionMapId, String userName,
-	    Long itemUid, String fileName);
-
     void evict(Object object);
 
     /** Create an anonymous star rating criteria */
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -ra07430557603483e95a40ae22062e79b68a37778 -r77491c8baf27f5b5d8705ea6b306e8db142389e7
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision a07430557603483e95a40ae22062e79b68a37778)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 77491c8baf27f5b5d8705ea6b306e8db142389e7)
@@ -547,27 +547,32 @@
     }
 
     @Override
-    public void notifyTeachersOnAssigmentSumbit(Long sessionId, ResourceUser resourceUser) {
+    public void notifyTeachersOnAssigmentSumbit(long itemUid) {
+	ResourceItem item = getResourceItemByUid(itemUid);
+	ResourceUser resourceUser = item.getCreateBy();
+	ResourceSession session = resourceUser.getSession();
+	Resource resource = session.getResource();
+
 	String userName = resourceUser.getLastName() + " " + resourceUser.getFirstName();
 	String message = getLocalisedMessage("event.assigment.submit.body", new Object[] { userName });
+	
+	if (item.getType() == ResourceConstants.RESOURCE_TYPE_FILE) {
+		String eventName = new StringBuilder("resources_file_upload_").append(toolContentId).append("_")
+			.append(System.currentTimeMillis()).toString();
+		String url = new StringBuilder("<a href='").append(WebUtil.getBaseServerURL())
+			.append("/lams/tool/larsrc11/reviewItem.do?").append(ResourceConstants.ATTR_SESSION_MAP_ID).append("=")
+			.append(sessionMapId).append("&").append(AttributeNames.ATTR_MODE).append("=")
+			.append(ToolAccessMode.TEACHER.toString()).append("&").append(ResourceConstants.ATTR_TOOL_SESSION_ID)
+			.append("=").append(toolSessionId).append("&").append(ResourceConstants.ATTR_RESOURCE_ITEM_UID)
+			.append("=").append(itemUid).append("'>")
+			.append(getLocalisedMessage("event.file.upload", new Object[] { userName, fileName })).append("</a>")
+			.toString();
+		eventNotificationService.createLessonEvent(IEventNotificationService.LESSON_MONITORS_SCOPE, eventName,
+			toolContentId, null, url, true, IEventNotificationService.DELIVERY_METHOD_NOTIFICATION);
+	}
+	
 	eventNotificationService.notifyLessonMonitors(sessionId, message, false);
-    }
 
-    @Override
-    public void notifyTeachersOnFileUpload(Long toolContentId, Long toolSessionId, String sessionMapId, String userName,
-	    Long itemUid, String fileName) {
-	String eventName = new StringBuilder("resources_file_upload_").append(toolContentId).append("_")
-		.append(System.currentTimeMillis()).toString();
-	String url = new StringBuilder("<a href='").append(WebUtil.getBaseServerURL())
-		.append("/lams/tool/larsrc11/reviewItem.do?").append(ResourceConstants.ATTR_SESSION_MAP_ID).append("=")
-		.append(sessionMapId).append("&").append(AttributeNames.ATTR_MODE).append("=")
-		.append(ToolAccessMode.TEACHER.toString()).append("&").append(ResourceConstants.ATTR_TOOL_SESSION_ID)
-		.append("=").append(toolSessionId).append("&").append(ResourceConstants.ATTR_RESOURCE_ITEM_UID)
-		.append("=").append(itemUid).append("'>")
-		.append(getLocalisedMessage("event.file.upload", new Object[] { userName, fileName })).append("</a>")
-		.toString();
-	eventNotificationService.createLessonEvent(IEventNotificationService.LESSON_MONITORS_SCOPE, eventName,
-		toolContentId, null, url, true, IEventNotificationService.DELIVERY_METHOD_NOTIFICATION);
     }
 
     // *****************************************************************************
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java
===================================================================
diff -u -ra07430557603483e95a40ae22062e79b68a37778 -r77491c8baf27f5b5d8705ea6b306e8db142389e7
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java	(.../LearningController.java)	(revision a07430557603483e95a40ae22062e79b68a37778)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java	(.../LearningController.java)	(revision 77491c8baf27f5b5d8705ea6b306e8db142389e7)
@@ -424,20 +424,14 @@
 	resourceItemList.add(item);
 
 	// URL or file upload
-	request.setAttribute(ResourceConstants.ATTR_ADD_RESOURCE_TYPE, new Short(type));
+	request.setAttribute(ResourceConstants.ATTR_ADD_RESOURCE_TYPE, type);
 	request.setAttribute(AttributeNames.ATTR_MODE, mode);
 
 	Resource resource = resSession.getResource();
 	if (resource.isNotifyTeachersOnAssigmentSumbit()) {
-	    resourceService.notifyTeachersOnAssigmentSumbit(sessionId, resourceUser);
+	    resourceService.notifyTeachersOnAssigmentSumbit(item.getUid());
 	}
 
-//	if (resource.isNotifyTeachersOnFileUpload() && (type == ResourceConstants.RESOURCE_TYPE_FILE)) {
-//	    resourceService.notifyTeachersOnFileUpload(resource.getContentId(), sessionId, sessionMapID,
-//		    resourceUser.getFirstName() + " " + resourceUser.getLastName(), item.getUid(),
-//		    resourceItemForm.getFile().getOriginalFilename());
-//	}
-
 	return "pages/learning/success";
     }
 
@@ -645,7 +639,7 @@
 		    errorMap.add("GLOBAL", "No file uploaded");
 		}
 	    } else {
-		 errorMap.add("GLOBAL", "No file uploaded");
+		errorMap.add("GLOBAL", "No file uploaded");
 	    }
 //	    if ((resourceItemForm.getFile() != null)
 //		    && FileUtil.isExecutableFile(resourceItemForm.getFile().getOriginalFilename())) {
Index: lams_tool_larsrc/web/pages/authoring/advance.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r77491c8baf27f5b5d8705ea6b306e8db142389e7
--- lams_tool_larsrc/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_larsrc/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 77491c8baf27f5b5d8705ea6b306e8db142389e7)
@@ -55,13 +55,6 @@
 	</label>
 	</div>
 	
-	<div class="checkbox">
-	<label for="notifyTeachersOnFileUpload">
-	<form:checkbox path="resource.notifyTeachersOnFileUpload" id="notifyTeachersOnFileUpload"/>
-	<fmt:message key="label.authoring.advanced.notify.onfileupload" />
-	</label>
-	</div>
-	
 </lams:SimplePanel>
 
 <lams:OutcomeAuthor toolContentId="${authoringForm.resource.contentId}" />
Index: lams_tool_larsrc/web/pages/monitoring/advanceoptions.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r77491c8baf27f5b5d8705ea6b306e8db142389e7
--- lams_tool_larsrc/web/pages/monitoring/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/pages/monitoring/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision 77491c8baf27f5b5d8705ea6b306e8db142389e7)
@@ -100,22 +100,6 @@
 	</tr>
 	<tr>
 		<td>
-			<fmt:message key="label.authoring.advanced.notify.onfileupload" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${sessionMap.resource.notifyTeachersOnFileUpload == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	<tr>
-		<td>
 			<fmt:message key="monitor.summary.td.addNotebook" />
 		</td>