Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
===================================================================
diff -u -r02bb4fca9ae82d4344427707eb59f35f3e8deb39 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision 02bb4fca9ae82d4344427707eb59f35f3e8deb39)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -45,6 +45,7 @@
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.web.context.WebApplicationContext;
@@ -56,8 +57,6 @@
  * cancel/close window, this action will execute clearSession().
  *
  * @author Steve.Ni
- *
- * @version $Revision$
  */
 public abstract class LamsAuthoringFinishAction extends Action {
     private static Logger log = Logger.getLogger(LamsAuthoringFinishAction.class);
@@ -69,8 +68,11 @@
 
     private static final String CONFIRM_ACTION = "confirm";
     private static final String CANCEL_ACTION = "cancel";
+    private static final String DEFINE_LATER_ACTION = "defineLater";
 
     private static final String RE_EDIT_URL = "reEditUrl";
+    
+    private static IAuditService auditService;
 
     /**
      * Action method, will handle save/cancel action.
@@ -82,6 +84,7 @@
 	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, ACTION_MODE, false);
 	String cSessionID = request.getParameter(CUSTOMISE_SESSION_ID);
 	String notifyCloseURL = (String) request.getSession().getAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL);
+	Long toolContentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
 
 	// clear session according to the ToolAccessMode.
 	clearSession(cSessionID, request.getSession(), mode);
@@ -90,7 +93,6 @@
 	if (StringUtils.equals(action, CONFIRM_ACTION)) {
 	    String nextUrl = getLamsUrl() + "authoringConfirm.jsp";
 	    String signature = request.getParameter(TOOL_SIGNATURE);
-	    Long toolContentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
 
 	    String contentFolderID = "TODO_remove-change_optional_to_false";
 	    contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID, true);
@@ -112,12 +114,20 @@
 	    }
 	    response.sendRedirect(nextUrl);
 	}
+	
+	//audit log content has been finished being edited 
+	if (StringUtils.equals(action, DEFINE_LATER_ACTION)) {
+	    getAuditService().logFinishEditingActivityInMonitor(toolContentId);
+	}
+	
+	//reset defineLater task
 	if (StringUtils.equals(action, CANCEL_ACTION) && mode.isTeacher()) {
 	    String signature = request.getParameter(TOOL_SIGNATURE);
-	    Long toolContentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
 
 	    ToolContentManager contentManager = (ToolContentManager) findToolService(signature);
 	    contentManager.resetDefineLater(toolContentId);
+	    
+	    getAuditService().logCancelEditingActivityInMonitor(toolContentId);
 	}
 
 	return null;
@@ -154,6 +164,18 @@
 		.getRequiredWebApplicationContext(this.getServlet().getServletContext());
 	return (ILamsToolService) webContext.getBean(AuthoringConstants.TOOL_SERVICE_BEAN_NAME);
     }
+    
+    /**
+     * Get AuditService bean
+     */
+    private IAuditService getAuditService() {
+	if (auditService == null) {
+	    WebApplicationContext ctx = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext());
+	    auditService = (IAuditService) ctx.getBean("auditService");
+	}
+	return auditService;
+    }
 
     /**
      * Find a tool's service registered inside lams.
Index: lams_common/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r790d6ad75cdd46b34fef6fced526a2cd348ab933 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_common/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 790d6ad75cdd46b34fef6fced526a2cd348ab933)
+++ lams_common/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -68,5 +68,9 @@
 validation.error.GroupingNotUsed  =Grouping is not used in any of activities
 audit.change.mark  =Changed mark for user {0}. Old mark: {1}, new mark: {2}
 
+audit.started.editing.activity  =Teacher {0} has started editing activity {1} in monitor
+audit.finished.editing.activity  =Teacher {0} has finished editing activity {1} in monitor
+audit.cancelled.editing.activity  =Teacher {0} has cancelled editing activity {1} in monitor
 
+
 #======= End labels: Exported 61 labels for en AU =====
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r60e44b19b8de02a00faa437fba8117928baa3d73 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 60e44b19b8de02a00faa437fba8117928baa3d73)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -447,6 +447,7 @@
 	<!-- auditing service -->
 	<bean id="auditService" class="org.lamsfoundation.lams.util.audit.AuditService" >
 		<property name="messageService"><ref bean="commonMessageService"/></property>
+		<property name="activityDao"><ref bean="activityDAO"/></property>
     </bean>
 
 	<!-- Security service -->
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java
===================================================================
diff -u -r42e6c9c7220f8baf3b245d73b57aca9be08191ea -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java	(.../IActivityDAO.java)	(revision 42e6c9c7220f8baf3b245d73b57aca9be08191ea)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java	(.../IActivityDAO.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -28,6 +28,7 @@
 import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
+import org.lamsfoundation.lams.learningdesign.ToolActivity;
 
 /**
  * @author Manpreet Minhas
@@ -138,4 +139,14 @@
      */
     public Activity getTemplateActivityByLibraryID(Long libraryID);
 
+    /**
+     * Returns ToolActivity by the specified toolContentId
+     * 
+     * @param toolContentId
+     * @throws NonUniqueResultException
+     *             if there is more than one matching result
+     * @return
+     */
+    ToolActivity getToolActivityByToolContentId(Long toolContentId);
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
===================================================================
diff -u -r42e6c9c7220f8baf3b245d73b57aca9be08191ea -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java	(.../ActivityDAO.java)	(revision 42e6c9c7220f8baf3b245d73b57aca9be08191ea)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java	(.../ActivityDAO.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -76,7 +76,18 @@
 	Activity act = (Activity) super.find(Activity.class, activityId);
 	return getNonCGLibActivity(act);
     }
+    
+    @Override
+    public ToolActivity getToolActivityByToolContentId(Long toolContentId) {
 
+	final String FIND_BY_TOOL_CONTENT_ID = "from " + ActivityDAO.TABLENAME + " in class " + Activity.class.getName()
+		+ " where toolContentId=?";
+
+	Query query = getSessionFactory().getCurrentSession().createQuery(FIND_BY_TOOL_CONTENT_ID);
+	query.setLong(0, toolContentId);
+	return (ToolActivity) getNonCGLibActivity((Activity) query.uniqueResult());
+    }
+
     /**
      * we must return the real activity, not a Hibernate proxy. So relook
      * it up. This should be quick as it should be in the cache.
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java
===================================================================
diff -u -r320bc5b2ac74965748f2a03e31b3a3c6c6c547fd -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	(.../ILamsToolService.java)	(revision 320bc5b2ac74965748f2a03e31b3a3c6c6c547fd)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	(.../ILamsToolService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -73,6 +73,13 @@
      * @return
      */
     Boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
     /**
      * Assign tool an ActivityEvaluation (it is an equivalent of doing it manually on authoring canvas). It also updates
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
===================================================================
diff -u -r7b6e80807e0d48dcfc370c0eaff241cb672d5b36 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision 7b6e80807e0d48dcfc370c0eaff241cb672d5b36)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -56,14 +56,13 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.FileUtilException;
+import org.lamsfoundation.lams.util.audit.IAuditService;
 
 /**
- *
  * @author Jacky Fang
  * @since 2005-3-17
  *
  * @author Ozgur Demirtas 24/06/2005
- *
  */
 public class LamsToolService implements ILamsToolService {
     private static Logger log = Logger.getLogger(LamsToolService.class);
@@ -72,6 +71,7 @@
     private static final String LEADER_SELECTION_TOOL_OUTPUT_NAME_LEADER_USERID = "leader.user.id";
 
     private IActivityDAO activityDAO;
+    private IAuditService auditService;
     private IToolDAO toolDAO;
     private IToolSessionDAO toolSessionDAO;
     private IToolContentDAO toolContentDAO;
@@ -136,26 +136,21 @@
     @SuppressWarnings("unchecked")
     @Override
     public Boolean isGroupedActivity(long toolContentID) {
-	List<Activity> activities = toolContentDAO.findByProperty(Activity.class, "toolContentId", toolContentID);
-	if (activities.size() == 1) {
-	    Activity activity = activities.get(0);
-	    return activity.getApplyGrouping();
-	} else {
-	    LamsToolService.log.debug("ToolContent contains multiple activities, can't test whether grouping applies.");
-	    return null;
-	}
+	ToolActivity toolActivity = activityDAO.getToolActivityByToolContentId(toolContentID);
+	boolean isGroupedActivity = toolActivity == null ? null : toolActivity.getApplyGrouping();
+	
+	return isGroupedActivity;
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+	auditService.logStartEditingActivityInMonitor(toolContentID);
+    }    
 
     @Override
     public String getActivityEvaluation(Long toolContentId) {
 
-	List<Activity> activities = toolContentDAO.findByProperty(Activity.class, "toolContentId", toolContentId);
-	if (activities.size() != 1) {
-	    log.debug("ToolContent contains multiple activities, can't get ActivityEvaluation.");
-	    return null;
-	}
-
-	ToolActivity toolActivity = (ToolActivity) activities.get(0);
+	ToolActivity toolActivity = activityDAO.getToolActivityByToolContentId(toolContentId);
 	Set<ActivityEvaluation> activityEvaluations = toolActivity.getActivityEvaluations();
 	if (activityEvaluations.isEmpty()) {
 	    return null;
@@ -168,16 +163,11 @@
     @Override
     public void setActivityEvaluation(Long toolContentId, String toolOutputDefinition) {
 
-	List<Activity> activities = toolContentDAO.findByProperty(Activity.class, "toolContentId", toolContentId);
-	if (activities.size() != 1) {
-	    throw new LamsToolServiceException(
-		    "ToolContent contains multiple activities, can't set ActivityEvaluation.");
-	}
 	if (StringUtils.isEmpty(toolOutputDefinition)) {
 	    return;
 	}
 
-	ToolActivity toolActivity = (ToolActivity) activities.get(0);
+	ToolActivity toolActivity = activityDAO.getToolActivityByToolContentId(toolContentId);
 	Set<ActivityEvaluation> activityEvaluations = toolActivity.getActivityEvaluations();
 
 	// Get the first (only) ActivityEvaluation if it exists
@@ -362,6 +352,10 @@
     public void setActivityDAO(IActivityDAO activityDAO) {
 	this.activityDAO = activityDAO;
     }
+    
+    public void setAuditService(IAuditService auditService) {
+	this.auditService = auditService;
+    }
 
     public void setToolSessionDAO(IToolSessionDAO toolSessionDAO) {
 	this.toolSessionDAO = toolSessionDAO;
Index: lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
===================================================================
diff -u -rb818acc7a09da4f6163fa410e8caf451fb92b02c -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	(.../toolApplicationContext.xml)	(revision b818acc7a09da4f6163fa410e8caf451fb92b02c)
+++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	(.../toolApplicationContext.xml)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -82,6 +82,7 @@
 		<property name="target">
 				<bean class="org.lamsfoundation.lams.tool.service.LamsToolService">
 					<property name="activityDAO"><ref bean="activityDAO"/></property>
+					<property name="auditService"><ref bean="auditService"/></property>
 					<property name="toolDAO"><ref bean="toolDAO"/></property>	
 					<property name="toolSessionDAO"><ref bean="toolSessionDAO"/></property>
 					<property name="toolContentDAO"><ref bean="toolContentDAO"/></property>	
Index: lams_common/src/java/org/lamsfoundation/lams/util/audit/AuditService.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_common/src/java/org/lamsfoundation/lams/util/audit/AuditService.java	(.../AuditService.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_common/src/java/org/lamsfoundation/lams/util/audit/AuditService.java	(.../AuditService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -27,6 +27,8 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.learningdesign.ToolActivity;
+import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -60,7 +62,12 @@
     private final String AUDIT_MARK_CHANGE_I18N_KEY = "audit.change.mark";
     private final String AUDIT_HIDE_I18N_KEY = "audit.hide.entry";
     private final String AUDIT_SHOW_I18N_KEY = "audit.show.entry";
+    private final String AUDIT_STARTED_EDITING_I18N_KEY = "audit.started.editing.activity";
+    private final String AUDIT_FINISHED_EDITING_I18N_KEY = "audit.finished.editing.activity";
+    private final String AUDIT_CANCELLED_EDITING_I18N_KEY = "audit.cancelled.editing.activity";
+	    
     protected MessageService messageService;
+    protected IActivityDAO activityDao;
 
     private String getUserString() {
 	HttpSession ss = SessionManager.getSession();
@@ -126,7 +133,34 @@
 	String message = messageService.getMessage(AUDIT_SHOW_I18N_KEY, args);
 	log(moduleName, message);
     }
+    
+    @Override
+    public void logStartEditingActivityInMonitor(Long toolContentId) {
+	logEditActivityInMonitor(toolContentId, AUDIT_STARTED_EDITING_I18N_KEY);
+    }
+    
+    @Override
+    public void logFinishEditingActivityInMonitor(Long toolContentId) {
+	logEditActivityInMonitor(toolContentId, AUDIT_FINISHED_EDITING_I18N_KEY);
+    }
+    
+    @Override
+    public void logCancelEditingActivityInMonitor(Long toolContentId) {
+	logEditActivityInMonitor(toolContentId, AUDIT_CANCELLED_EDITING_I18N_KEY);
+    }
+    
+    private void logEditActivityInMonitor(Long toolContentId, String messageKey) {
 
+	ToolActivity toolActivity = activityDao.getToolActivityByToolContentId(toolContentId);
+	String toolSignature = toolActivity.getTool().getToolSignature();
+
+	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+	String[] args = new String[] { user.getLogin() + "(" + user.getUserID() + ")",
+		"(activityId:" + toolActivity.getActivityId() + ")" };
+	String message = messageService.getMessage(messageKey, args);
+	log(toolSignature, message);
+    }
+
     /* *** Spring Injection Methods ************ */
 
     public MessageService getMessageService() {
@@ -136,5 +170,13 @@
     public void setMessageService(MessageService messageService) {
 	this.messageService = messageService;
     }
+    
+    public IActivityDAO getActivityDao() {
+	return activityDao;
+    }
 
+    public void setActivityDao(IActivityDAO activityDao) {
+	this.activityDao = activityDao;
+    }
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/util/audit/IAuditService.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_common/src/java/org/lamsfoundation/lams/util/audit/IAuditService.java	(.../IAuditService.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_common/src/java/org/lamsfoundation/lams/util/audit/IAuditService.java	(.../IAuditService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -116,4 +116,25 @@
      *            the login of the user who created the text initially
      */
     void logShowEntry(String moduleName, Long originalUserId, String originalUserLogin, String hiddenItem);
+
+    /**
+     * Log teacher has started editing activity in monitor.
+     * 
+     * @param toolContentId
+     */
+    void logStartEditingActivityInMonitor(Long toolContentId);
+
+    /**
+     * Log teacher has pressed Save button when editing activity in monitor.
+     * 
+     * @param toolContentId
+     */
+    void logFinishEditingActivityInMonitor(Long toolContentId);
+
+    /**
+     * Log teacher has pressed Cancel button when editing activity in monitor.
+     * 
+     * @param toolContentId
+     */
+    void logCancelEditingActivityInMonitor(Long toolContentId);
 }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r0d5bce9b3d06456cf119cbb76805e673616378fa -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 0d5bce9b3d06456cf119cbb76805e673616378fa)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -1942,6 +1942,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     public String getActivityEvaluation(Long toolContentId) {
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
===================================================================
diff -u -rc97b41d72e071f6293126bd85f6eba0b756f7836 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision c97b41d72e071f6293126bd85f6eba0b756f7836)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -417,6 +417,13 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
     /**
      * Get the definitions for possible output for an activity, based on the toolContentId. These may be definitions
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -119,6 +119,9 @@
 
 	    assessment.setDefineLater(true);
 	    service.saveOrUpdateAssessment(assessment);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    service.auditLogStartEditingActivityInMonitor(contentId);
 
 	    request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER.toString());
 	    return start(mapping, form, request, response);
Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java	(.../BbbService.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java	(.../BbbService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -445,6 +445,10 @@
 	return toolService.isGroupedActivity(toolContentID);
     }
 
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     @SuppressWarnings("unchecked")
Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/IBbbService.java
===================================================================
diff -u -rd14a9d149e4d52c0214fc67260381b2ace04df6c -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/IBbbService.java	(.../IBbbService.java)	(revision d14a9d149e4d52c0214fc67260381b2ace04df6c)
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/IBbbService.java	(.../IBbbService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -67,6 +67,13 @@
      * @return
      */
     public boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
     /**
      * @param bbb
Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -105,6 +105,9 @@
 	    // called.
 	    bbb.setDefineLater(true);
 	    bbbService.saveOrUpdateBbb(bbb);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    bbbService.auditLogStartEditingActivityInMonitor(toolContentID);
 	}
 
 	// Set up the authForm.
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -655,6 +655,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     /* Private methods */
     private Map<Long, ChatMessageFilter> messageFilters = new ConcurrentHashMap<Long, ChatMessageFilter>();
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/IChatService.java
===================================================================
diff -u -r8acb96a0f7380dea2f7a68347379cc6f8e8549e5 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/IChatService.java	(.../IChatService.java)	(revision 8acb96a0f7380dea2f7a68347379cc6f8e8549e5)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/IChatService.java	(.../IChatService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -203,4 +203,11 @@
     void releaseConditionsFromCache(Chat chat);
 
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 }
\ No newline at end of file
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -109,6 +109,9 @@
 	    // are editing. This flag is released when updateContent is called.
 	    chat.setDefineLater(true);
 	    chatService.saveOrUpdateChat(chat);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    chatService.auditLogStartEditingActivityInMonitor(toolContentID);
 	}
 
 	// Set up the authForm.
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java	(.../DacoServiceImpl.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java	(.../DacoServiceImpl.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -786,6 +786,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     // *******************************************************************************
     // ToolContentManager, ToolSessionManager methods
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java	(.../IDacoService.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java	(.../IDacoService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -323,4 +323,11 @@
     int getRecordNum(Long userID, Long sessionId);
 
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 }
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -100,6 +100,9 @@
 
 	    daco.setDefineLater(true);
 	    service.saveOrUpdateDaco(daco);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    service.auditLogStartEditingActivityInMonitor(contentId);
 
 	    request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER.toString());
 	    return start(mapping, form, request);
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -819,6 +819,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     public String getLearnerContentFolder(Long toolSessionId, Long userId) {
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -430,6 +430,13 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
     /**
      * Return content folder (unique to each learner and lesson) which is used for storing user generated content.
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -109,6 +109,9 @@
 	    if (!forum.isContentInUse()) {
 		forum.setDefineLater(true);
 		forumService.updateForum(forum);
+
+		// audit log the teacher has started editing activity in monitor
+		forumService.auditLogStartEditingActivityInMonitor(contentId);
 	    }
 
 	    return initPage(mapping, form, request, response);
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -593,6 +593,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     // =========================================================================================
     /* ********** Used by Spring to "inject" the linked objects ************* */
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java	(.../IGmapService.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java	(.../IGmapService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -178,5 +178,12 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -106,6 +106,9 @@
 	    // are editing. This flag is released when updateContent is called.
 	    gmap.setDefineLater(true);
 	    gmapService.saveOrUpdateGmap(gmap);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    gmapService.auditLogStartEditingActivityInMonitor(toolContentID);
 	}
 
 	// Set up the authForm.
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java
===================================================================
diff -u -r2228652cfb59ec7c0fcbb1914a94f65d22815911 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	(.../IImageGalleryService.java)	(revision 2228652cfb59ec7c0fcbb1914a94f65d22815911)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	(.../IImageGalleryService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -314,4 +314,11 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
diff -u -r2228652cfb59ec7c0fcbb1914a94f65d22815911 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 2228652cfb59ec7c0fcbb1914a94f65d22815911)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -639,6 +639,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     public void notifyTeachersOnImageSumbit(Long sessionId, ImageGalleryUser imageGalleryUser) {
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -99,6 +99,9 @@
 
 	    imageGallery.setDefineLater(true);
 	    service.saveOrUpdateImageGallery(imageGallery);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    service.auditLogStartEditingActivityInMonitor(contentId);
 
 	    request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER.toString());
 	    return start(mapping, form, request, response);
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java	(.../CommonCartridgeServiceImpl.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java	(.../CommonCartridgeServiceImpl.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -1013,19 +1013,17 @@
 	this.lessonService = lessonService;
     }
 
-    /**
-     * Finds out which lesson the given tool content belongs to and returns its monitoring users.
-     *
-     * @param sessionId
-     *            tool session ID
-     * @return list of teachers that monitor the lesson which contains the tool with given session ID
-     */
     @Override
     public List<User> getMonitorsByToolSessionId(Long sessionId) {
 	return getLessonService().getMonitorsByToolSessionId(sessionId);
     }
     
     @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
+    
+    @Override
     public ToolCompletionStatus getCompletionStatus(Long learnerId, Long toolSessionId) {
 	CommonCartridgeUser learner = getUserByIDAndSession(learnerId, toolSessionId);
 	if (learner == null) {
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java
===================================================================
diff -u -r2bef59c032438311b6dfadac874b0a7ee4cb72de -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java	(.../ICommonCartridgeService.java)	(revision 2bef59c032438311b6dfadac874b0a7ee4cb72de)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java	(.../ICommonCartridgeService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -286,4 +286,11 @@
      * @return list of teachers that monitor the lesson which contains the tool with given session ID
      */
     public List<User> getMonitorsByToolSessionId(Long sessionId);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 }
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -101,6 +101,9 @@
 
 	    commonCartridge.setDefineLater(true);
 	    service.saveOrUpdateCommonCartridge(commonCartridge);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    service.auditLogStartEditingActivityInMonitor(contentId);
 
 	    request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER.toString());
 	    return start(mapping, form, request, response);
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/IKalturaService.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/IKalturaService.java	(.../IKalturaService.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/IKalturaService.java	(.../IKalturaService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -136,6 +136,13 @@
     String finishToolSession(Long toolSessionId, Long userId) throws KalturaException;
 
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
     void deleteKalturaItem(Long uid);
 
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java	(.../KalturaService.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java	(.../KalturaService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -731,6 +731,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -113,6 +113,9 @@
 	    // are editing. This flag is released when updateContent is called.
 	    kaltura.setDefineLater(true);
 	    kalturaService.saveOrUpdateKaltura(kaltura);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    kalturaService.auditLogStartEditingActivityInMonitor(toolContentID);
 	}
 
 	// Set up the authForm.
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
===================================================================
diff -u -r7f589f1ea063f8c50aad53033e73f9cb1ba5adac -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	(.../IMcService.java)	(revision 7f589f1ea063f8c50aad53033e73f9cb1ba5adac)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	(.../IMcService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -174,6 +174,13 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
     /**
      * Get the definitions for possible output for an activity, based on the toolContentId. These may be definitions
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -1584,6 +1584,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     public String getActivityEvaluation(Long toolContentId) {
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -142,6 +142,9 @@
 		mcService.releaseQuestionsFromCache(mcContent);
 		mcService.setDefineLater(strToolContentID, false);
 
+		// audit log the teacher has started editing activity in monitor
+		mcService.auditLogStartEditingActivityInMonitor(new Long(strToolContentID));
+
 		// recalculate User Answers
 		mcService.recalculateUserAnswers(mcContent, oldQuestions, questionDTOs, deletedQuestionDTOs);
 	    }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
===================================================================
diff -u -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java	(.../IQaService.java)	(revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java	(.../IQaService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -309,6 +309,13 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
     /**
      * Return content folder (unique to each learner and lesson) which is used for storing user generated content. It's
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -975,6 +975,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     public String getLearnerContentFolder(Long toolSessionId, Long userId) {
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	(.../QaAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	(.../QaAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -140,6 +140,9 @@
 		qaService.removeQuestionsFromCache(qaContent);
 		qaService.setDefineLater(strToolContentID, false);
 
+		// audit log the teacher has started editing activity in monitor
+		qaService.auditLogStartEditingActivityInMonitor(toolContentID);
+
 		// recalculate User Answers
 		qaService.recalculateUserAnswers(qaContent, oldQuestions, questionDTOs, deletedQuestionDTOs);
 	    }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
===================================================================
diff -u -r7eef220bc1575595385b722a0c337359ca02a397 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	(.../IResourceService.java)	(revision 7eef220bc1575595385b722a0c337359ca02a397)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	(.../IResourceService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -269,5 +269,12 @@
      */
     boolean isGroupedActivity(long toolContentID);
     
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
+    
     void evict(Object object);
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -757,6 +757,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     // *******************************************************************************
     // ToolContentManager, ToolSessionManager methods
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -110,6 +110,9 @@
 
 	    resource.setDefineLater(true);
 	    service.saveOrUpdateResource(resource);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    service.auditLogStartEditingActivityInMonitor(contentId);
 
 	    request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER.toString());
 	    return start(mapping, form, request, response);
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java
===================================================================
diff -u -rac8b64b03ce6d8c718e55823f23fd995159b7ca0 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java	(.../ILeaderselectionService.java)	(revision ac8b64b03ce6d8c718e55823f23fd995159b7ca0)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java	(.../ILeaderselectionService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -159,4 +159,11 @@
     void updateEntry(Long uid, String entry);
 
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 }
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java
===================================================================
diff -u -rac8b64b03ce6d8c718e55823f23fd995159b7ca0 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java	(.../LeaderselectionService.java)	(revision ac8b64b03ce6d8c718e55823f23fd995159b7ca0)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java	(.../LeaderselectionService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -591,6 +591,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -99,6 +99,9 @@
 	    // are editing. This flag is released when updateContent is called.
 	    leaderselection.setDefineLater(true);
 	    leaderselectionService.saveOrUpdateLeaderselection(leaderselection);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    leaderselectionService.auditLogStartEditingActivityInMonitor(toolContentID);
 	}
 
 	// Set up the authForm.
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java	(.../IMindmapService.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java	(.../IMindmapService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -76,6 +76,13 @@
     public void updateEntry(NotebookEntry notebookEntry);
 
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
     public void setMindmapMessageService(MessageService mindmapMessageService);
 
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java	(.../MindmapService.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java	(.../MindmapService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -858,6 +858,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     public void setMindmapNodeDAO(IMindmapNodeDAO mindmapNodeDAO) {
 	this.mindmapNodeDAO = mindmapNodeDAO;
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -116,6 +116,9 @@
 	    // while we are editing. This flag is released when updateContent is called.
 	    mindmap.setDefineLater(true);
 	    mindmapService.saveOrUpdateMindmap(mindmap);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    mindmapService.auditLogStartEditingActivityInMonitor(toolContentID);
 	}
 
 	/* Mindmap Attributes */
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/INoticeboardService.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/INoticeboardService.java	(.../INoticeboardService.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/INoticeboardService.java	(.../INoticeboardService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -312,4 +312,11 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 }
\ No newline at end of file
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	(.../NoticeboardServicePOJO.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	(.../NoticeboardServicePOJO.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -276,6 +276,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException {
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java
===================================================================
diff -u -r353b0a8b7e6537666d2a8ccfb75982871e92bdb8 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java	(.../NbAuthoringAction.java)	(revision 353b0a8b7e6537666d2a8ccfb75982871e92bdb8)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java	(.../NbAuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -147,6 +147,9 @@
 
 	    if (isDefineLater) {
 		request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER.toString());
+
+		// audit log the teacher has started editing activity in monitor
+		nbService.auditLogStartEditingActivityInMonitor(contentId);
 	    }
 	}
 
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java	(.../INotebookService.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java	(.../INotebookService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -155,6 +155,13 @@
     void deleteCondition(NotebookCondition condition);
 
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
     /**
      * Return content folder (unique to each learner and lesson) which is used for storing user generated content.
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -627,6 +627,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     public String getLearnerContentFolder(Long toolSessionId, Long userId) {
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -107,6 +107,9 @@
 	    // when updateContent is called.
 	    notebook.setDefineLater(true);
 	    notebookService.saveOrUpdateNotebook(notebook);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    notebookService.auditLogStartEditingActivityInMonitor(toolContentID);
 	}
 
 	// Set up the authForm.
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/IPixlrService.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/IPixlrService.java	(.../IPixlrService.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/IPixlrService.java	(.../IPixlrService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -161,5 +161,12 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
 }
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java	(.../PixlrService.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java	(.../PixlrService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -583,6 +583,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     public PixlrConfigItem getConfigItem(String key) {
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -119,6 +119,9 @@
 	    // are editing. This flag is released when updateContent is called.
 	    pixlr.setDefineLater(true);
 	    pixlrService.saveOrUpdatePixlr(pixlr);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    pixlrService.auditLogStartEditingActivityInMonitor(toolContentID);
 	}
 
 	String imageUrl = PixlrConstants.LAMS_WWW_PIXLR_FOLDER_URL;
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java
===================================================================
diff -u -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java	(.../IPeerreviewService.java)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java	(.../IPeerreviewService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -229,6 +229,13 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
     int getCommentsMinWordsLimit(Long toolContentId);
 
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
===================================================================
diff -u -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -428,6 +428,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     public String getLocalisedMessage(String key, Object[] args) {
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -81,6 +81,9 @@
 
 	    peerreview.setDefineLater(true);
 	    service.saveOrUpdatePeerreview(peerreview);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    service.auditLogStartEditingActivityInMonitor(contentId);
 
 	    request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER.toString());
 	    return start(mapping, form, request, response);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
===================================================================
diff -u -r0f06a3fe1469600b56093d09d01c0922ab1cb3db -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision 0f06a3fe1469600b56093d09d01c0922ab1cb3db)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -342,4 +342,11 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -971,6 +971,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     public SubmitUser getUserByUid(Long learnerID) {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
diff -u -r6bed0e62245e6c9ce454d4bc54920a0b41dac9bc -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6bed0e62245e6c9ce454d4bc54920a0b41dac9bc)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -87,7 +87,7 @@
 	    mode = ToolAccessMode.AUTHOR;
 	}
 
-	SessionMap sessionMap = new SessionMap();
+	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	sessionMap.put(AttributeNames.PARAM_MODE, mode);
 
@@ -99,10 +99,11 @@
 	SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(contentID);
 
 	if (mode.isTeacher()) {
-
 	    persistContent.setDefineLater(true);
 	    submitFilesService.saveOrUpdateContent(persistContent);
-
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    submitFilesService.auditLogStartEditingActivityInMonitor(contentID);
 	}
 
 	// if this content does not exist(empty without id), create a content by default content record.
@@ -137,7 +138,7 @@
 	    HttpServletResponse response) throws Exception {
 
 	AuthoringForm authForm = (AuthoringForm) form;
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(authForm.getSessionMapID());
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(authForm.getSessionMapID());
 
 	ToolAccessMode mode = null;
 	try {
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
===================================================================
diff -u -r5e5c78e2345ed588a0fd341d4e7c53ed8402b958 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(.../IScratchieService.java)	(revision 5e5c78e2345ed588a0fd341d4e7c53ed8402b958)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(.../IScratchieService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -336,6 +336,13 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
     /**
      * Return all leaders in activity for all groups
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -1694,6 +1694,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     // *****************************************************************************
     // set methods for Spring Bean
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -102,6 +102,9 @@
 
 	    scratchie.setDefineLater(true);
 	    service.saveOrUpdateScratchie(scratchie);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    service.auditLogStartEditingActivityInMonitor(contentId);
 
 	    request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER.toString());
 	    return start(mapping, form, request, response);
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java	(.../IScribeService.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java	(.../IScribeService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -135,6 +135,13 @@
     public void createReportEntry(Long toolSessionId);
 
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
     void submitReport(Long toolSessionId, String userName, JSONObject requestJSON) throws JSONException;
 
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	(.../ScribeService.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	(.../ScribeService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -489,6 +489,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     @SuppressWarnings("unchecked")
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -125,6 +125,9 @@
 	    // are editing. This flag is released when updateContent is called.
 	    scribe.setDefineLater(true);
 	    scribeService.saveOrUpdateScribe(scribe);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    scribeService.auditLogStartEditingActivityInMonitor(toolContentID);
 	}
 
 	// Set up the authForm.
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java	(.../ISpreadsheetService.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java	(.../ISpreadsheetService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -240,4 +240,11 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 }
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java	(.../SpreadsheetServiceImpl.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java	(.../SpreadsheetServiceImpl.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -334,6 +334,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     // *****************************************************************************
     // private methods
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -78,6 +78,9 @@
 
 	    spreadsheet.setDefineLater(true);
 	    service.saveOrUpdateSpreadsheet(spreadsheet);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    service.auditLogStartEditingActivityInMonitor(contentId);
 
 	    request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER.toString());
 	    return start(mapping, form, request, response);
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java	(.../ISurveyService.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java	(.../ISurveyService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -297,6 +297,13 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
     /**
      * Gets the Answer information for the monitoring listAnswers tablesorter. Will return List<[SurveyUser, String,
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -544,6 +544,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     public String createConditionName(Collection<SurveyCondition> existingConditions) {
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -113,6 +113,9 @@
 	    if (!survey.isContentInUse()) {
 		survey.setDefineLater(true);
 		service.saveOrUpdateSurvey(survey);
+
+		// audit log the teacher has started editing activity in monitor
+		service.auditLogStartEditingActivityInMonitor(contentId);
 	    }
 
 	    request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER.toString());
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java	(.../ITaskListService.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java	(.../ITaskListService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -356,6 +356,13 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
     /**
      * Get localized message.
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	(.../TaskListServiceImpl.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	(.../TaskListServiceImpl.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -468,6 +468,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     public String getMessage(String key) {
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -105,6 +105,9 @@
 
 	    taskList.setDefineLater(true);
 	    service.saveOrUpdateTaskList(taskList);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    service.auditLogStartEditingActivityInMonitor(contentId);
 
 	    request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER.toString());
 	    return start(mapping, form, request, response);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java
===================================================================
diff -u -r9e3f3125462e0c1428bdd356e603d0cb9549616b -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java	(.../IVoteService.java)	(revision 9e3f3125462e0c1428bdd356e603d0cb9549616b)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java	(.../IVoteService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -260,6 +260,13 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
     /**
      * Gets the basic details about an attempt for a nomination. questionUid must not be null, sessionUid may be NULL.
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	(.../VoteServicePOJO.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	(.../VoteServicePOJO.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -1553,6 +1553,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Long toolContentId, int definitionType)
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -769,6 +769,9 @@
 		voteService.removeQuestionsFromCache(voteContentTest);
 		VoteUtils.setDefineLater(request, false, strToolContentID, voteService);
 
+		// audit log the teacher has started editing activity in monitor
+		voteService.auditLogStartEditingActivityInMonitor(new Long(strToolContentID));
+
 		// recalculate User Answers
 		voteService.recalculateUserAnswers(voteContentTest, oldQuestions, questionDTOs, deletedQuestionDTOs);
 	    }
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java	(.../IWikiService.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java	(.../IWikiService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -316,6 +316,13 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
+    
+    /**
+     * Audit log the teacher has started editing activity in monitor.
+     * 
+     * @param toolContentID
+     */
+    void auditLogStartEditingActivityInMonitor(long toolContentID);
 
     /**
      * Return content folder (unique to each learner and lesson) which is used for storing user generated content.
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
diff -u -r09dafa805c15b342353c81b85f9d3a237581df2e -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision 09dafa805c15b342353c81b85f9d3a237581df2e)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -831,6 +831,11 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
+    
+    @Override
+    public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+    }
 
     @Override
     public String getLearnerContentFolder(Long toolSessionId, Long userId) {
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
@@ -122,6 +122,9 @@
 	    // are editing. This flag is released when updateContent is called.
 	    wiki.setDefineLater(true);
 	    wikiService.saveOrUpdateWiki(wiki);
+	    
+	    //audit log the teacher has started editing activity in monitor
+	    wikiService.auditLogStartEditingActivityInMonitor(toolContentID);
 	}
 
 	// update the form