Index: lams_build/lib/lams/lams.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v diff -u -r1.420.2.119 -r1.420.2.120 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java,v diff -u -r1.13.2.3 -r1.13.2.4 --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java 20 Jan 2017 02:51:03 -0000 1.13.2.3 +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java 4 Apr 2017 12:27:15 -0000 1.13.2.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.32.2.2 -r1.32.2.3 --- lams_common/conf/language/lams/ApplicationResources_en_AU.properties 3 Dec 2016 23:08:24 -0000 1.32.2.2 +++ lams_common/conf/language/lams/ApplicationResources_en_AU.properties 4 Apr 2017 12:25:44 -0000 1.32.2.3 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml,v diff -u -r1.100.2.32 -r1.100.2.33 --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml 8 Feb 2017 19:18:31 -0000 1.100.2.32 +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml 4 Apr 2017 12:25:44 -0000 1.100.2.33 @@ -447,6 +447,7 @@ + Index: lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml,v diff -u -r1.14.2.13 -r1.14.2.14 --- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml 14 Dec 2016 18:50:35 -0000 1.14.2.13 +++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml 4 Apr 2017 12:25:44 -0000 1.14.2.14 @@ -82,6 +82,7 @@ + Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java,v diff -u -r1.16.24.4 -r1.16.24.5 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java 24 Nov 2016 11:26:42 -0000 1.16.24.4 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java 4 Apr 2017 12:25:44 -0000 1.16.24.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java,v diff -u -r1.23.12.5 -r1.23.12.6 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java 24 Nov 2016 11:26:42 -0000 1.23.12.5 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java 4 Apr 2017 12:25:44 -0000 1.23.12.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java,v diff -u -r1.26.2.7 -r1.26.2.8 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java 27 Jan 2017 05:32:29 -0000 1.26.2.7 +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java 4 Apr 2017 12:25:44 -0000 1.26.2.8 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java,v diff -u -r1.29.2.10 -r1.29.2.11 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java 22 Feb 2017 07:09:23 -0000 1.29.2.10 +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java 4 Apr 2017 12:25:44 -0000 1.29.2.11 @@ -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 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 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 activityEvaluations = toolActivity.getActivityEvaluations(); if (activityEvaluations.isEmpty()) { return null; @@ -168,16 +163,11 @@ @Override public void setActivityEvaluation(Long toolContentId, String toolOutputDefinition) { - List 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 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/util/audit/AuditService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/audit/AuditService.java,v diff -u -r1.6.2.2 -r1.6.2.3 --- lams_common/src/java/org/lamsfoundation/lams/util/audit/AuditService.java 11 May 2016 07:07:19 -0000 1.6.2.2 +++ lams_common/src/java/org/lamsfoundation/lams/util/audit/AuditService.java 4 Apr 2017 12:25:44 -0000 1.6.2.3 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/audit/IAuditService.java,v diff -u -r1.5.2.2 -r1.5.2.3 --- lams_common/src/java/org/lamsfoundation/lams/util/audit/IAuditService.java 11 May 2016 07:07:19 -0000 1.5.2.2 +++ lams_common/src/java/org/lamsfoundation/lams/util/audit/IAuditService.java 4 Apr 2017 12:25:44 -0000 1.5.2.3 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java,v diff -u -r1.48.2.48 -r1.48.2.49 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java 17 Mar 2017 18:30:37 -0000 1.48.2.48 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java 4 Apr 2017 12:26:38 -0000 1.48.2.49 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java,v diff -u -r1.26.2.18 -r1.26.2.19 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java 17 Mar 2017 18:03:02 -0000 1.26.2.18 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java 4 Apr 2017 12:26:38 -0000 1.26.2.19 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java,v diff -u -r1.36.2.13 -r1.36.2.14 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java 30 Mar 2017 18:29:57 -0000 1.36.2.13 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java 4 Apr 2017 12:26:39 -0000 1.36.2.14 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java,v diff -u -r1.8.2.8 -r1.8.2.9 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java 11 Jan 2017 08:57:36 -0000 1.8.2.8 +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java 4 Apr 2017 12:25:46 -0000 1.8.2.9 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/IBbbService.java,v diff -u -r1.2.2.3 -r1.2.2.4 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/IBbbService.java 4 Jun 2016 11:56:03 -0000 1.2.2.3 +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/IBbbService.java 4 Apr 2017 12:25:46 -0000 1.2.2.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java,v diff -u -r1.2.2.4 -r1.2.2.5 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java 30 Mar 2017 18:30:49 -0000 1.2.2.4 +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java 4 Apr 2017 12:25:46 -0000 1.2.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java,v diff -u -r1.63.2.13 -r1.63.2.14 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 11 Jan 2017 08:57:37 -0000 1.63.2.13 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 4 Apr 2017 12:26:52 -0000 1.63.2.14 @@ -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 messageFilters = new ConcurrentHashMap(); Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/IChatService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/IChatService.java,v diff -u -r1.21.2.4 -r1.21.2.5 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/IChatService.java 30 Sep 2016 05:12:12 -0000 1.21.2.4 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/IChatService.java 4 Apr 2017 12:26:52 -0000 1.21.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java,v diff -u -r1.30.2.4 -r1.30.2.5 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java 30 Mar 2017 18:30:34 -0000 1.30.2.4 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java 4 Apr 2017 12:26:52 -0000 1.30.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java,v diff -u -r1.21.2.11 -r1.21.2.12 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java 11 Jan 2017 08:57:39 -0000 1.21.2.11 +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java 4 Apr 2017 12:25:49 -0000 1.21.2.12 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java,v diff -u -r1.12.2.4 -r1.12.2.5 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java 11 May 2016 07:14:29 -0000 1.12.2.4 +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java 4 Apr 2017 12:25:49 -0000 1.12.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java,v diff -u -r1.9.2.4 -r1.9.2.5 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java 30 Mar 2017 18:30:55 -0000 1.9.2.4 +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java 4 Apr 2017 12:25:49 -0000 1.9.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v diff -u -r1.126.2.24 -r1.126.2.25 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 11 Jan 2017 08:57:34 -0000 1.126.2.24 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 4 Apr 2017 12:26:56 -0000 1.126.2.25 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java,v diff -u -r1.53.2.6 -r1.53.2.7 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java 11 May 2016 07:14:58 -0000 1.53.2.6 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java 4 Apr 2017 12:26:56 -0000 1.53.2.7 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java,v diff -u -r1.82.2.11 -r1.82.2.12 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java 30 Mar 2017 18:30:38 -0000 1.82.2.11 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java 4 Apr 2017 12:26:56 -0000 1.82.2.12 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java,v diff -u -r1.25.2.8 -r1.25.2.9 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java 11 Jan 2017 08:57:33 -0000 1.25.2.8 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java 4 Apr 2017 12:26:35 -0000 1.25.2.9 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java,v diff -u -r1.10.2.2 -r1.10.2.3 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java 11 May 2016 07:14:34 -0000 1.10.2.2 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java 4 Apr 2017 12:26:35 -0000 1.10.2.3 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java,v diff -u -r1.14.2.4 -r1.14.2.5 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java 30 Mar 2017 18:30:39 -0000 1.14.2.4 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java 4 Apr 2017 12:26:35 -0000 1.14.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java,v diff -u -r1.20.2.7 -r1.20.2.8 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java 30 Mar 2017 13:35:34 -0000 1.20.2.7 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java 4 Apr 2017 12:27:05 -0000 1.20.2.8 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java,v diff -u -r1.31.2.23 -r1.31.2.24 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java 30 Mar 2017 13:35:34 -0000 1.31.2.23 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java 4 Apr 2017 12:27:05 -0000 1.31.2.24 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java,v diff -u -r1.9.2.15 -r1.9.2.16 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java 30 Mar 2017 18:30:02 -0000 1.9.2.15 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java 4 Apr 2017 12:27:05 -0000 1.9.2.16 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java,v diff -u -r1.9.2.13 -r1.9.2.14 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java 11 Jan 2017 08:55:23 -0000 1.9.2.13 +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java 4 Apr 2017 12:27:14 -0000 1.9.2.14 @@ -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 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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java,v diff -u -r1.2.2.4 -r1.2.2.5 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java 18 May 2016 17:46:34 -0000 1.2.2.4 +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java 4 Apr 2017 12:27:14 -0000 1.2.2.5 @@ -286,4 +286,11 @@ * @return list of teachers that monitor the lesson which contains the tool with given session ID */ public List 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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java,v diff -u -r1.5.2.5 -r1.5.2.6 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java 30 Mar 2017 18:30:04 -0000 1.5.2.5 +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java 4 Apr 2017 12:27:14 -0000 1.5.2.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/IKalturaService.java,v diff -u -r1.4.2.2 -r1.4.2.3 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/IKalturaService.java 11 May 2016 07:37:15 -0000 1.4.2.2 +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/IKalturaService.java 4 Apr 2017 12:27:03 -0000 1.4.2.3 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java,v diff -u -r1.9.2.10 -r1.9.2.11 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java 11 Jan 2017 08:55:22 -0000 1.9.2.10 +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java 4 Apr 2017 12:27:03 -0000 1.9.2.11 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java,v diff -u -r1.3.2.4 -r1.3.2.5 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java 30 Mar 2017 18:30:33 -0000 1.3.2.4 +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java 4 Apr 2017 12:27:03 -0000 1.3.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java,v diff -u -r1.77.2.10 -r1.77.2.11 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java 13 Sep 2016 04:57:11 -0000 1.77.2.10 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java 4 Apr 2017 12:26:45 -0000 1.77.2.11 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v diff -u -r1.128.2.19 -r1.128.2.20 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 11 Jan 2017 08:54:24 -0000 1.128.2.19 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 4 Apr 2017 12:26:45 -0000 1.128.2.20 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java,v diff -u -r1.143.2.6 -r1.143.2.7 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 30 Mar 2017 18:30:06 -0000 1.143.2.6 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 4 Apr 2017 12:26:45 -0000 1.143.2.7 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java,v diff -u -r1.66.2.13 -r1.66.2.14 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 13 Dec 2016 14:33:23 -0000 1.66.2.13 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 4 Apr 2017 12:27:07 -0000 1.66.2.14 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v diff -u -r1.111.2.31 -r1.111.2.32 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 11 Jan 2017 08:54:22 -0000 1.111.2.31 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 4 Apr 2017 12:27:07 -0000 1.111.2.32 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java,v diff -u -r1.39.2.8 -r1.39.2.9 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java 30 Mar 2017 18:30:56 -0000 1.39.2.8 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java 4 Apr 2017 12:27:07 -0000 1.39.2.9 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java,v diff -u -r1.30.2.6 -r1.30.2.7 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java 9 Jan 2017 11:49:11 -0000 1.30.2.6 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java 4 Apr 2017 12:26:30 -0000 1.30.2.7 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java,v diff -u -r1.77.2.17 -r1.77.2.18 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 11 Jan 2017 08:54:20 -0000 1.77.2.17 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 4 Apr 2017 12:26:31 -0000 1.77.2.18 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java,v diff -u -r1.62.2.7 -r1.62.2.8 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java 30 Mar 2017 18:30:41 -0000 1.62.2.7 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java 4 Apr 2017 12:26:30 -0000 1.62.2.8 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java 21 Mar 2017 18:15:53 -0000 1.1.2.3 +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java 4 Apr 2017 12:27:19 -0000 1.1.2.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java,v diff -u -r1.6.2.10 -r1.6.2.11 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java 21 Mar 2017 18:15:53 -0000 1.6.2.10 +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java 4 Apr 2017 12:27:19 -0000 1.6.2.11 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java,v diff -u -r1.1.2.4 -r1.1.2.5 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java 30 Mar 2017 18:30:45 -0000 1.1.2.4 +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java 4 Apr 2017 12:27:19 -0000 1.1.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java,v diff -u -r1.5.2.3 -r1.5.2.4 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java 11 May 2016 07:37:45 -0000 1.5.2.3 +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java 4 Apr 2017 12:27:00 -0000 1.5.2.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java,v diff -u -r1.17.2.12 -r1.17.2.13 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java 11 Jan 2017 08:51:37 -0000 1.17.2.12 +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java 4 Apr 2017 12:27:00 -0000 1.17.2.13 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java,v diff -u -r1.5.2.6 -r1.5.2.7 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java 30 Mar 2017 18:29:55 -0000 1.5.2.6 +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java 4 Apr 2017 12:27:00 -0000 1.5.2.7 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/INoticeboardService.java,v diff -u -r1.21.2.3 -r1.21.2.4 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/INoticeboardService.java 11 May 2016 07:37:11 -0000 1.21.2.3 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/INoticeboardService.java 4 Apr 2017 12:27:22 -0000 1.21.2.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java,v diff -u -r1.53.2.11 -r1.53.2.12 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 11 Jan 2017 08:49:40 -0000 1.53.2.11 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 4 Apr 2017 12:27:22 -0000 1.53.2.12 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java,v diff -u -r1.39.2.4 -r1.39.2.5 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java 4 Apr 2017 11:57:47 -0000 1.39.2.4 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java 4 Apr 2017 12:27:22 -0000 1.39.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java,v diff -u -r1.9.2.5 -r1.9.2.6 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java 11 May 2016 07:37:22 -0000 1.9.2.5 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java 4 Apr 2017 12:25:53 -0000 1.9.2.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java,v diff -u -r1.31.2.14 -r1.31.2.15 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java 11 Jan 2017 08:49:38 -0000 1.31.2.14 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java 4 Apr 2017 12:25:53 -0000 1.31.2.15 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java,v diff -u -r1.21.2.5 -r1.21.2.6 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java 30 Mar 2017 18:29:53 -0000 1.21.2.5 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java 4 Apr 2017 12:25:53 -0000 1.21.2.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/IPixlrService.java,v diff -u -r1.5.2.2 -r1.5.2.3 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/IPixlrService.java 11 May 2016 07:37:26 -0000 1.5.2.2 +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/IPixlrService.java 4 Apr 2017 12:26:40 -0000 1.5.2.3 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java,v diff -u -r1.14.2.8 -r1.14.2.9 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java 11 Jan 2017 08:49:19 -0000 1.14.2.8 +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java 4 Apr 2017 12:26:40 -0000 1.14.2.9 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java,v diff -u -r1.4.2.4 -r1.4.2.5 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java 30 Mar 2017 18:30:44 -0000 1.4.2.4 +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java 4 Apr 2017 12:26:40 -0000 1.4.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java,v diff -u -r1.4.2.12 -r1.4.2.13 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java 16 Feb 2017 16:19:01 -0000 1.4.2.12 +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java 4 Apr 2017 12:27:18 -0000 1.4.2.13 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java,v diff -u -r1.7.2.21 -r1.7.2.22 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java 16 Feb 2017 16:19:01 -0000 1.7.2.21 +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java 4 Apr 2017 12:27:18 -0000 1.7.2.22 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java,v diff -u -r1.1.2.5 -r1.1.2.6 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java 30 Mar 2017 18:29:52 -0000 1.1.2.5 +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java 4 Apr 2017 12:27:18 -0000 1.1.2.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java,v diff -u -r1.34.2.4 -r1.34.2.5 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java 30 Aug 2016 02:15:10 -0000 1.34.2.4 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java 4 Apr 2017 12:27:09 -0000 1.34.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v diff -u -r1.94.2.13 -r1.94.2.14 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 11 Jan 2017 08:48:45 -0000 1.94.2.13 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 4 Apr 2017 12:27:09 -0000 1.94.2.14 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java,v diff -u -r1.41.2.4 -r1.41.2.5 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java 19 May 2016 10:23:59 -0000 1.41.2.4 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java 4 Apr 2017 12:27:09 -0000 1.41.2.5 @@ -87,7 +87,7 @@ mode = ToolAccessMode.AUTHOR; } - SessionMap sessionMap = new SessionMap(); + SessionMap sessionMap = new SessionMap(); 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 sessionMap = (SessionMap) request.getSession().getAttribute(authForm.getSessionMapID()); ToolAccessMode mode = null; try { Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java,v diff -u -r1.29.2.8 -r1.29.2.9 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java 6 Dec 2016 16:52:34 -0000 1.29.2.8 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java 4 Apr 2017 12:25:41 -0000 1.29.2.9 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java,v diff -u -r1.51.2.28 -r1.51.2.29 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 11 Jan 2017 08:48:27 -0000 1.51.2.28 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 4 Apr 2017 12:25:41 -0000 1.51.2.29 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java,v diff -u -r1.20.2.4 -r1.20.2.5 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java 30 Mar 2017 18:30:48 -0000 1.20.2.4 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java 4 Apr 2017 12:25:41 -0000 1.20.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java,v diff -u -r1.9.2.3 -r1.9.2.4 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java 11 May 2016 07:35:47 -0000 1.9.2.3 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java 4 Apr 2017 12:25:51 -0000 1.9.2.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java,v diff -u -r1.30.2.12 -r1.30.2.13 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java 11 Jan 2017 08:48:02 -0000 1.30.2.12 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java 4 Apr 2017 12:25:51 -0000 1.30.2.13 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java,v diff -u -r1.15.2.4 -r1.15.2.5 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java 30 Mar 2017 18:31:00 -0000 1.15.2.4 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java 4 Apr 2017 12:25:51 -0000 1.15.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java,v diff -u -r1.6.2.4 -r1.6.2.5 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java 11 May 2016 07:37:36 -0000 1.6.2.4 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java 4 Apr 2017 12:26:28 -0000 1.6.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java,v diff -u -r1.14.2.13 -r1.14.2.14 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java 11 Jan 2017 08:47:40 -0000 1.14.2.13 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java 4 Apr 2017 12:26:28 -0000 1.14.2.14 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java,v diff -u -r1.4.2.4 -r1.4.2.5 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java 30 Mar 2017 18:29:47 -0000 1.4.2.4 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java 4 Apr 2017 12:26:28 -0000 1.4.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java,v diff -u -r1.20.2.6 -r1.20.2.7 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java 11 May 2016 07:37:30 -0000 1.20.2.6 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java 4 Apr 2017 12:27:27 -0000 1.20.2.7 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java,v diff -u -r1.37.2.15 -r1.37.2.16 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java 11 Jan 2017 08:47:21 -0000 1.37.2.15 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java 4 Apr 2017 12:27:27 -0000 1.37.2.16 @@ -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 existingConditions) { Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java,v diff -u -r1.27.2.5 -r1.27.2.6 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java 30 Mar 2017 18:30:53 -0000 1.27.2.5 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java 4 Apr 2017 12:27:27 -0000 1.27.2.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java,v diff -u -r1.23.2.4 -r1.23.2.5 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java 11 May 2016 07:35:22 -0000 1.23.2.4 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java 4 Apr 2017 12:27:30 -0000 1.23.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java,v diff -u -r1.37.2.11 -r1.37.2.12 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java 11 Jan 2017 08:46:57 -0000 1.37.2.11 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java 4 Apr 2017 12:27:30 -0000 1.37.2.12 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java,v diff -u -r1.20.2.5 -r1.20.2.6 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java 30 Mar 2017 18:29:50 -0000 1.20.2.5 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java 4 Apr 2017 12:27:30 -0000 1.20.2.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java,v diff -u -r1.51.2.6 -r1.51.2.7 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java 21 Dec 2016 05:25:37 -0000 1.51.2.6 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java 4 Apr 2017 12:26:49 -0000 1.51.2.7 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java,v diff -u -r1.86.2.14 -r1.86.2.15 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 11 Jan 2017 08:46:37 -0000 1.86.2.14 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 4 Apr 2017 12:26:50 -0000 1.86.2.15 @@ -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 getToolOutputDefinitions(Long toolContentId, int definitionType) Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/Attic/AuthoringAction.java,v diff -u -r1.1.2.4 -r1.1.2.5 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringAction.java 30 Mar 2017 18:30:08 -0000 1.1.2.4 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringAction.java 4 Apr 2017 12:26:49 -0000 1.1.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java,v diff -u -r1.11.2.2 -r1.11.2.3 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java 11 May 2016 07:37:40 -0000 1.11.2.2 +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java 4 Apr 2017 12:27:24 -0000 1.11.2.3 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java,v diff -u -r1.25.2.10 -r1.25.2.11 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java 30 Jan 2017 14:37:25 -0000 1.25.2.10 +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java 4 Apr 2017 12:27:24 -0000 1.25.2.11 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java,v diff -u -r1.7.2.4 -r1.7.2.5 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java 30 Mar 2017 18:31:03 -0000 1.7.2.4 +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java 4 Apr 2017 12:27:24 -0000 1.7.2.5 @@ -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