Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Attic/SubmissionDetails.hbm.xml,v
diff -u -r1.9.2.2 -r1.9.2.3
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	27 Apr 2016 13:22:34 -0000	1.9.2.2
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	30 Aug 2016 02:15:10 -0000	1.9.2.3
@@ -100,6 +100,14 @@
             column="learner_id"
         />
 
+	    <property
+	            name="removed"
+	            type="java.lang.Boolean"
+	            column="removed"
+	            length="1"
+	            not-null="true"            
+	        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-SubmissionDetails.xml
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.33.2.3 -r1.33.2.4
--- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	29 Jun 2016 06:19:48 -0000	1.33.2.3
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	30 Aug 2016 02:15:10 -0000	1.33.2.4
@@ -147,9 +147,21 @@
 monitoring.user.submittedFiles  =Submitted files
 output.desc.submitted.items.output.definition.sbmt  =Files submitted in the Submit Files tool
 button.submit  =Finish
-label.monitoring.file.delete  =Delete
+label.monitoring.file.delete  =Delete Mark File
 label.search  =Search...
 label.file.options=File Options
 label.activity.completion=End of Activity
 label.notifications=Notifications
+label.view.files=View Files
+label.deleted=Deleted
+label.monitoring.original.learner.file.delete  =Delete Learner File
+label.monitoring.original.learner.file.restore  =Restore Learner File
+message.monitor.confirm.original.learner.file.delete  =Are you sure you want to delete the original file {0} uploaded by the learner?
+message.monitor.confirm.original.learner.file.restore  =Are you sure you want to restore the original file {0} uploaded by the learner?
+event.file.delete.subject  =LAMS: File was deleted.
+event.file.delete.body  =An instructor deleted your file ''{0}'' in a Submit Files activity in LAMS.\n\nThis message was send automatically, please do not reply to it.
+event.file.restore.subject  =LAMS: File was restored.
+event.file.restore.body  =An instructor restored your file ''{0}'' in a Submit Files activity in LAMS.\n\nThis message was send automatically, please do not reply to it.
+audit.file.delete=Instructor {0} deleted file {1} uploaded by learner {2}.
+audit.file.restore=Instructor {0} restored file {1} uploaded by learner {2}.
 #======= End labels: Exported 142 labels for en AU =====
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java,v
diff -u -r1.16.14.3 -r1.16.14.4
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java	11 May 2016 07:35:37 -0000	1.16.14.3
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java	30 Aug 2016 02:15:09 -0000	1.16.14.4
@@ -65,11 +65,14 @@
 
     private SubmitUser learner;
 
+    private Boolean removed;
+    
     /** persistent field, but not cloned to avoid to clone block */
     private SubmitFilesSession submitFileSession;
 
     /** default constructor */
     public SubmissionDetails() {
+	this.removed = Boolean.FALSE;
     }
 
     /**
@@ -242,4 +245,13 @@
 	this.learner = learner;
     }
 
+    public Boolean isRemoved() {
+	return removed;
+    }
+
+    public void setRemoved(Boolean removed) {
+	this.removed = removed;
+    }
+
+
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml,v
diff -u -r1.28.2.6 -r1.28.2.7
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	10 Aug 2015 15:24:25 -0000	1.28.2.6
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	30 Aug 2016 02:15:09 -0000	1.28.2.7
@@ -57,6 +57,7 @@
 		<property name="eventNotificationService"><ref bean="eventNotificationService"/></property> 
 		<property name="repositoryService"><ref bean="repositoryService" /></property>
 		<property name="gradebookService"><ref bean="gradebookService" /></property>
+		<property name="auditService"><ref bean="auditService" /></property>
 		<property name="submitFilesOutputFactory"><ref bean="submitFilesOutputFactory"/></property>
 	</bean>
 	
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java,v
diff -u -r1.17.14.5 -r1.17.14.6
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java	11 May 2016 07:35:37 -0000	1.17.14.5
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java	30 Aug 2016 02:15:10 -0000	1.17.14.6
@@ -40,7 +40,7 @@
 public class SubmissionDetailsDAO extends LAMSBaseDAO implements ISubmissionDetailsDAO {
 
     private static final String FIND_BY_SESSION = "from " + SubmissionDetails.class.getName()
-	    + " as d where d.submitFileSession.sessionID=? ";
+	    + " as d where d.submitFileSession.sessionID=?";
     private static final String FIND_BY_SESSION_LEARNER = "from " + SubmissionDetails.class.getName()
 	    + " as d where d.submitFileSession.sessionID=? and d.learner.userID=?";
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java,v
diff -u -r1.2.14.5 -r1.2.14.6
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java	11 May 2016 07:35:37 -0000	1.2.14.5
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java	30 Aug 2016 02:15:10 -0000	1.2.14.6
@@ -131,7 +131,7 @@
 
 	// Basic select for the user records
 	StringBuilder queryText = new StringBuilder();
-	queryText.append("SELECT user.*, COUNT(details.submission_id) numFiles, count(report.marks) numFilesMarked ");
+	queryText.append("SELECT user.*, COUNT(details.submission_id) numFiles, SUM(details.removed) numFilesRemoved, count(report.marks) numFilesMarked ");
 	queryText.append(notebookEntryStrings != null ? notebookEntryStrings[0] : ", NULL notebookEntry");
 	queryText.append(" FROM tl_lasbmt11_user user ");
 	queryText.append(" LEFT JOIN tl_lasbmt11_submission_details details ON user.uid = details.learner_id ");
@@ -142,7 +142,7 @@
 	    queryText.append(notebookEntryStrings[1]);
 	}
 
-	queryText.append(" WHERE user.session_id = :sessionId ");
+	queryText.append(" WHERE user.session_id = :sessionId");
 
 	// If filtering by name add a name based where clause
 	buildNameSearch(searchString, queryText);
@@ -154,7 +154,8 @@
 	queryText.append(" ORDER BY " + sortingOrder);
 
 	SQLQuery query = getSession().createSQLQuery(queryText.toString());
-	query.addEntity("user", SubmitUser.class).addScalar("numFiles", IntegerType.INSTANCE)
+	query.addEntity("user", SubmitUser.class)
+		.addScalar("numFiles", IntegerType.INSTANCE).addScalar("numFilesRemoved", IntegerType.INSTANCE)
 		.addScalar("numFilesMarked", IntegerType.INSTANCE).addScalar("notebookEntry", StringType.INSTANCE)
 		.setLong("sessionId", sessionId.longValue()).setFirstResult(page * size).setMaxResults(size);
 	return query.list();
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20160828.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java,v
diff -u -r1.17.2.3 -r1.17.2.4
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java	11 May 2016 07:35:38 -0000	1.17.2.3
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java	30 Aug 2016 02:15:09 -0000	1.17.2.4
@@ -69,6 +69,8 @@
     private boolean finished;
     //if this file uploaded by current learner
     private boolean currentLearner;
+    
+    private boolean removed;
 
     /**
      * @param details
@@ -94,6 +96,7 @@
 	this.dateOfSubmission = details.getDateOfSubmission();
 	this.uuID = details.getUuid();
 	this.versionID = details.getVersionID();
+	this.removed = details.isRemoved();
 	SubmitFilesReport report = details.getReport();
 	if (report != null) {
 	    this.reportID = report.getReportID();
@@ -311,4 +314,12 @@
     public void setMarkFileVersionID(Long markFileVersionID) {
 	this.markFileVersionID = markFileVersionID;
     }
+
+    public boolean isRemoved() {
+	return removed;
+    }
+
+    public void setRemoved(boolean removed) {
+	this.removed = removed;
+    }
 }
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.3 -r1.34.2.4
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	11 May 2016 07:35:35 -0000	1.34.2.3
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	30 Aug 2016 02:15:10 -0000	1.34.2.4
@@ -35,6 +35,7 @@
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.tool.sbmt.SubmissionDetails;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
@@ -90,6 +91,13 @@
     public void uploadFileToSession(Long sessionID, FormFile uploadFile, String fileDescription, Integer userID)
 	    throws SubmitFilesException;
 
+    /** 
+     * Get a the details for a single file uploaded by a learner
+     * @param detailId
+     * @return SubmissionDetails
+     */
+    public SubmissionDetails getSubmissionDetail(Long detailId);
+    
     /**
      * This method returns a list of files that were uploaded by the given
      * <code>User<code> for given <code>contentID</code>.
@@ -102,9 +110,11 @@
      *            The <code>user_id</code> of the <code>User</code>
      * @param sessionID
      *            The <code>session_id</code> to be looked up
+     * @param includeRemovedFiles
+     * 		  Should files removed in monitor be included.
      * @return List The list of required objects.
      */
-    public List getFilesUploadedByUser(Integer userID, Long sessionID, Locale currentLocale);
+    public List getFilesUploadedByUser(Integer userID, Long sessionID, Locale currentLocale, boolean includeRemovedFiles);
 
     /**
      * This method returns a SortedMap of all files that were submitted users within a given <code>sessionID</code>.
@@ -136,6 +146,19 @@
      */
     public void removeMarkFile(Long reportID, Long markFileUUID, Long markFileVersionID);
 
+    /**
+     * Mark the original file uploaded by a learner as deleted. Does not delete the file
+     * from the content repository.
+     * @param detailID
+     */
+    public void removeLearnerFile(Long detailID, UserDTO monitor);
+
+    /**
+     * Mark a deleted original file as not deleted. Undoes what removeLearnerFile().
+     * @param detailID
+     */
+    public void restoreLearnerFile(Long detailID, UserDTO monitor);
+    
     public FileDetailsDTO getFileDetails(Long detailID, Locale currentLocale);
 
     /**
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.11 -r1.94.2.12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	15 Jun 2016 08:06:33 -0000	1.94.2.11
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	30 Aug 2016 02:15:10 -0000	1.94.2.12
@@ -101,6 +101,7 @@
 import org.lamsfoundation.lams.usermanagement.util.LastNameAlphabeticComparator;
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.springframework.dao.DataAccessException;
 
 /**
@@ -141,6 +142,8 @@
 
     private IGradebookService gradebookService;
 
+    private IAuditService auditService;
+
     private SubmitFilesOutputFactory submitFilesOutputFactory;
 
     private class FileDtoComparator implements Comparator<FileDetailsDTO> {
@@ -616,7 +619,7 @@
      *      java.lang.Long)
      */
     @Override
-    public List getFilesUploadedByUser(Integer userID, Long sessionID, Locale currentLocale) {
+    public List getFilesUploadedByUser(Integer userID, Long sessionID, Locale currentLocale, boolean includeRemovedFiles) {
 	List<SubmissionDetails> list = submissionDetailsDAO.getBySessionAndLearner(sessionID, userID);
 	SortedSet details = new TreeSet(this.new FileDtoComparator());
 	if (list == null) {
@@ -625,12 +628,19 @@
 
 	NumberFormat numberFormat = currentLocale != null ? NumberFormat.getInstance(currentLocale) : null;
 	for (SubmissionDetails submissionDetails : list) {
-	    FileDetailsDTO detailDto = new FileDetailsDTO(submissionDetails, numberFormat);
-	    details.add(detailDto);
+	    if ( includeRemovedFiles || ! submissionDetails.isRemoved() ) {
+		FileDetailsDTO detailDto = new FileDetailsDTO(submissionDetails, numberFormat);
+		details.add(detailDto);
+	    }
 	}
 	return new ArrayList(details);
     }
 
+    @Override
+    public SubmissionDetails getSubmissionDetail(Long detailId) {
+	return submissionDetailsDAO.getSubmissionDetailsByID(detailId);
+    }
+
     /**
      * This method save SubmissionDetails list into a map container: key is user id, value is a list container, which
      * contains all <code>FileDetailsDTO</code> object belong to this user.
@@ -732,7 +742,50 @@
 	}
     }
 
+ 
     @Override
+    public void removeLearnerFile(Long detailID, UserDTO monitor) {
+
+	SubmissionDetails detail = submissionDetailsDAO.getSubmissionDetailsByID(detailID);
+
+	if (detail != null) {
+
+	    auditRemoveRestore(monitor, detail, "audit.file.delete");
+
+	    detail.setRemoved(true);
+	    submissionDetailsDAO.update(detail);
+	}
+    }
+
+    @Override
+    public void restoreLearnerFile(Long detailID, UserDTO monitor) {
+	
+	SubmissionDetails detail = submissionDetailsDAO.getSubmissionDetailsByID(detailID);
+
+	if (detail != null) {
+	    
+	    auditRemoveRestore(monitor, detail,"audit.file.restore");
+	    
+	    detail.setRemoved(false);
+	    submissionDetailsDAO.update(detail);
+	}
+
+    }
+
+    private void auditRemoveRestore(UserDTO monitor, SubmissionDetails detail, String i18nKey) {
+	SubmitUser learner = detail.getLearner();
+	StringBuilder instructorTxt = new StringBuilder(monitor.getLogin()).append(" (").append(monitor.getUserID()).append(") ")
+	    .append(monitor.getFirstName()).append(" ").append(monitor.getLastName());
+	StringBuilder learnerTxt = new StringBuilder(learner.getLogin()).append("  (").append(learner.getUserID()).append(") ")
+	    .append(learner.getFirstName()).append(" ").append(learner.getLastName());
+
+	String auditMsg = getLocalisedMessage(i18nKey, new Object[] { instructorTxt.toString(), detail.getFilePath(),
+	    learnerTxt.toString() });
+	auditService.log(SbmtConstants.AUDIT_LOG_MODULE_NAME, auditMsg);
+    }
+
+
+    @Override
     public IVersionedNode downloadFile(Long uuid, Long versionID) throws SubmitFilesException {
 	ITicket ticket = getRepositoryLoginTicket();
 	try {
@@ -775,7 +828,7 @@
 	    details = (SubmissionDetails) iter.next();
 	    report = details.getReport();
 	    report.setDateMarksReleased(new Date());
-	    if (notifyLearnersOnMarkRelease) {
+	    if (notifyLearnersOnMarkRelease && ! details.isRemoved()) {
 		SubmitUser user = details.getLearner();
 		StringBuilder notificationMessage = notificationMessages.get(user.getUserID());
 		if (notificationMessage == null) {
@@ -835,15 +888,16 @@
 	if (detailsList != null) {
 	    Float totalMark = null;
 	    for (SubmissionDetails details : detailsList) {
-		SubmitFilesReport report = details.getReport();
-		if (report != null) {
-		    if (totalMark == null) {
-			totalMark = details.getReport().getMarks();
-		    } else if (report.getMarks() != null) {
-			totalMark += report.getMarks();
+		if ( ! details.isRemoved() ) {
+		    SubmitFilesReport report = details.getReport();
+		    if (report != null) {
+			if (totalMark == null) {
+			    totalMark = details.getReport().getMarks();
+			} else if (report.getMarks() != null) {
+			    totalMark += report.getMarks();
+			}
 		    }
 		}
-
 	    }
 	    if (totalMark != null) {
 		Double mark = new Double(totalMark);
@@ -1135,6 +1189,14 @@
 	this.messageService = messageService;
     }
 
+    public IAuditService getAuditService() {
+        return auditService;
+    }
+
+    public void setAuditService(IAuditService auditService) {
+        this.auditService = auditService;
+    }
+
     public void setGradebookService(IGradebookService gradebookService) {
 	this.gradebookService = gradebookService;
     }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java,v
diff -u -r1.27.2.3 -r1.27.2.4
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	11 May 2016 07:35:38 -0000	1.27.2.3
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	30 Aug 2016 02:15:10 -0000	1.27.2.4
@@ -91,6 +91,8 @@
 
     public static final String SUBMITTED_ITEMS_DEFINITION_NAME = "submitted.items.output.definition.sbmt";
 
+    public static final String AUDIT_LOG_MODULE_NAME = "Submit Files";
+    
     public static final int SORT_BY_NO = 1;
     public static final int SORT_BY_USERNAME_ASC = 2;
     public static final int SORT_BY_USERNAME_DESC = 3;
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java,v
diff -u -r1.56.2.5 -r1.56.2.6
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	11 May 2016 07:35:35 -0000	1.56.2.5
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	30 Aug 2016 02:15:09 -0000	1.56.2.6
@@ -140,7 +140,7 @@
 	// this must before getFileUploadByUser() method becuase getCurrentLearner()
 	// will create session user if it does not exist.
 	SubmitUser learner = getCurrentLearner(sessionID, submitFilesService);
-	List filesUploaded = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale());
+	List filesUploaded = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale(), false);
 
 	// check whehter finish lock is on/off
 	boolean lock = content.isLockOnFinished() && learner.isFinished();
@@ -236,7 +236,7 @@
 	    Integer userID = user.getUserID();
 
 	    ISubmitFilesService submitFilesService = getService();
-	    List filesUploaded = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale());
+	    List filesUploaded = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale(), false);
 
 	    SubmitUser learner = getCurrentLearner(sessionID, submitFilesService);
 	    ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
@@ -259,7 +259,7 @@
 	ISubmitFilesService submitFilesService = getService();
 
 	submitFilesService.uploadFileToSession(sessionID, uploadedFile, fileDescription, userID);
-	List filesUploaded = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale());
+	List filesUploaded = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale(), false);
 	SubmitUser learner = getCurrentLearner(sessionID, submitFilesService);
 	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
 	setLearnerDTO(request, sessionMap, learner, filesUploaded, mode);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MarkAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MarkAction.java,v
diff -u -r1.1.4.3 -r1.1.4.4
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MarkAction.java	11 May 2016 07:35:35 -0000	1.1.4.3
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MarkAction.java	30 Aug 2016 02:15:09 -0000	1.1.4.4
@@ -117,7 +117,7 @@
 	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, markForm.getToolSessionID());
 	if (StringUtils.equals(markForm.getUpdateMode(), "listMark")) {
 	    List report = submitFilesService.getFilesUploadedByUser(markForm.getUserID(), markForm.getToolSessionID(),
-		    request.getLocale());
+		    request.getLocale(), true);
 	    request.setAttribute("report", report);
 	    return mapping.findForward("listMark");
 	} else {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java,v
diff -u -r1.52.2.5 -r1.52.2.6
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	20 May 2016 12:29:11 -0000	1.52.2.5
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	30 Aug 2016 02:15:09 -0000	1.52.2.6
@@ -37,6 +37,7 @@
 import java.util.TimeZone;
 import java.util.TreeSet;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -54,23 +55,23 @@
 import org.apache.tomcat.util.json.JSONArray;
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
-import org.lamsfoundation.lams.notebook.model.NotebookEntry;
-import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
+import org.lamsfoundation.lams.events.IEventNotificationService;
+import org.lamsfoundation.lams.tool.sbmt.SubmissionDetails;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
 import org.lamsfoundation.lams.tool.sbmt.SubmitUser;
 import org.lamsfoundation.lams.tool.sbmt.dto.AuthoringDTO;
 import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO;
 import org.lamsfoundation.lams.tool.sbmt.dto.SessionDTO;
 import org.lamsfoundation.lams.tool.sbmt.dto.StatisticDTO;
-import org.lamsfoundation.lams.tool.sbmt.dto.SubmitUserDTO;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -197,18 +198,19 @@
 	    responseRow.put(SbmtConstants.USER_ID, user.getUserID());
 	    responseRow.put(SbmtConstants.ATTR_USER_FULLNAME, StringEscapeUtils.escapeHtml(user.getFullName()));
 
-	    if (userAndReflection.length > 1) {
-		responseRow.put(SbmtConstants.ATTR_USER_NUM_FILE, userAndReflection[1]);
-	    }
-
 	    if (userAndReflection.length > 2) {
-		responseRow.put(SbmtConstants.ATTR_USER_FILE_MARKED, (Integer) userAndReflection[2] > 0);
+		responseRow.put(SbmtConstants.ATTR_USER_NUM_FILE, 
+			(Integer)userAndReflection[1] - (Integer)userAndReflection[2]);
 	    }
 
 	    if (userAndReflection.length > 3) {
-		responseRow.put(SbmtConstants.ATTR_USER_REFLECTION, userAndReflection[3]);
+		responseRow.put(SbmtConstants.ATTR_USER_FILE_MARKED, (Integer) userAndReflection[3] > 0);
 	    }
 
+	    if (userAndReflection.length > 4) {
+		responseRow.put(SbmtConstants.ATTR_USER_REFLECTION, userAndReflection[4]);
+	    }
+
 	    rows.put(responseRow);
 	}
 
@@ -326,30 +328,32 @@
 
 		while (dtoIter.hasNext()) {
 		    FileDetailsDTO dto = (FileDetailsDTO) dtoIter.next();
-		    row = sheet.createRow(idx++);
+		    if ( ! dto.isRemoved() ) {
+			row = sheet.createRow(idx++);
 
-		    int count = 0;
+			int count = 0;
 
-		    cell = row.createCell(count++);
-		    cell.setCellValue(dto.getOwner().getFullName());
+			cell = row.createCell(count++);
+			cell.setCellValue(dto.getOwner().getFullName());
 
-		    ++count;
+			++count;
 
-		    sheet.setColumnWidth(count, 8000);
+			sheet.setColumnWidth(count, 8000);
 
-		    cell = row.createCell(count++);
-		    cell.setCellValue(dto.getFilePath());
+			cell = row.createCell(count++);
+			cell.setCellValue(dto.getFilePath());
 
-		    cell = row.createCell(count++);
-		    cell.setCellValue(dto.getFileDescription());
+			cell = row.createCell(count++);
+			cell.setCellValue(dto.getFileDescription());
 
-		    cell = row.createCell(count++);
+			cell = row.createCell(count++);
 
-		    String marks = dto.getMarks();
-		    cell.setCellValue(marks != null ? marks : "");
+			String marks = dto.getMarks();
+			cell.setCellValue(marks != null ? marks : "");
 
-		    cell = row.createCell(count++);
-		    cell.setCellValue(dto.getComments());
+			cell = row.createCell(count++);
+			cell.setCellValue(dto.getComments());
+		    }
 		}
 	    }
 
@@ -433,7 +437,7 @@
 
 	submitFilesService = getSubmitFilesService();
 	// return FileDetailsDTO list according to the given userID and sessionID
-	List files = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale());
+	List files = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale(), true);
 
 	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
 	request.setAttribute("report", files);
@@ -464,6 +468,107 @@
 
     }
 
+    /**
+     * Remove the original file created by the learner. Does not actually remove it from the content repository - merely
+     * makes it as removed.
+     */
+    public ActionForward removeLearnerFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws ServletException {
+	return removeRestoreLearnerFile(mapping, form, request, response, true);
+    }
+
+    /**
+     * Remove the original file created by the learner. Does not actually remove it from the content repository - merely
+     * makes it as removed.
+     */
+    public ActionForward restoreLearnerFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws ServletException {
+	return removeRestoreLearnerFile(mapping, form, request, response, false);
+    }
+
+    private ActionForward removeRestoreLearnerFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response, boolean remove) throws ServletException {
+
+	UserDTO currentUser = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+
+	if (submitFilesService == null) {
+	    submitFilesService = getSubmitFilesService();
+	}
+
+	Long sessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+	Integer learnerUserID = WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID);
+	Long detailID = WebUtil.readLongParam(request, "detailID");
+
+	SubmissionDetails fileToProcess = submitFilesService.getSubmissionDetail(detailID);
+
+	if (fileToProcess == null) {
+	    StringBuilder builder = new StringBuilder("Unable to ").append(remove ? "remove" : "restore")
+		    .append("file as file does not exist. Requested by user ").append(currentUser.getUserID())
+		    .append(" for file ").append(detailID).append(" for user ").append(learnerUserID);
+	    log.error(builder.toString());
+	    throw new ServletException("Invalid call to "+(remove ? "remove" : "restore")+" file. See the server log for more details.");
+	} else {
+
+	    if (!fileToProcess.getSubmitFileSession().getSessionID().equals(sessionID)
+		    || !fileToProcess.getLearner().getUserID().equals(learnerUserID)) {
+		StringBuilder builder = new StringBuilder("Unable to ").append(remove ? "remove" : "restore")
+			.append("file as values in database do not match values in request. Requested by user ")
+			.append(currentUser.getUserID()).append(" for file ").append(detailID).append(" for user ")
+			.append(learnerUserID).append(" in session ").append(sessionID);
+		log.error(builder.toString());
+		throw new ServletException("Invalid call to "+(remove ? "remove" : "restore")+" file. See the server log for more details.");
+	    } else {
+
+		if (remove) {
+		    submitFilesService.removeLearnerFile(detailID, currentUser);
+		    notifyRemoveRestore(fileToProcess, "event.file.restore.subject", "event.file.restore.body", "restore file");
+
+
+		} else {
+		    submitFilesService.restoreLearnerFile(detailID, currentUser);
+		    notifyRemoveRestore(fileToProcess, "event.file.delete.subject", "event.file.delete.body", "delete file");
+		}
+
+	    }
+	}
+
+	List files = submitFilesService.getFilesUploadedByUser(learnerUserID, sessionID, request.getLocale(), true);
+
+	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
+	request.setAttribute("report", files);
+	return mapping.findForward("listMark");
+    }
+
+    /** Notify the user by email of the file change. Need to do it here rather than in the service so that any issues are caught and logged
+     * without stuffing up the transaction. 
+     */
+    private void notifyRemoveRestore(SubmissionDetails detail, String i18nSubjectKey, String i18nBodyKey, String errorSubject) {
+	Long contentID = detail.getSubmitFileSession().getContent().getContentID();
+	Integer learnerID = detail.getLearner().getUserID();
+
+	// Can't just create a new subscription then call triggerForSingleUser() as 
+	// it needs a subscription id, which doesn't exist for a subscription created in the same 
+	// transaction. So reuse the existing RELEASE MARKS event and subscription (created when
+	// a file is uploaded) and override both the subject and the message.
+
+	try {
+	    boolean eventExists = submitFilesService.getEventNotificationService().eventExists(SbmtConstants.TOOL_SIGNATURE,
+		    SbmtConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE, contentID);
+
+	    if (eventExists) {
+		submitFilesService.getEventNotificationService().triggerForSingleUser(SbmtConstants.TOOL_SIGNATURE,
+			SbmtConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE, contentID, learnerID,
+			submitFilesService.getLocalisedMessage(i18nSubjectKey, null),
+			submitFilesService.getLocalisedMessage(i18nBodyKey, new Object[] { detail.getFilePath() }));
+	    } else {
+		log.error("Unable to notify user of "+errorSubject+". contentID="+contentID+" learner="+learnerID+" file "+detail.getFilePath()+" as "+SbmtConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE+" event is missing");
+	    }
+	}  catch ( Exception e) {
+            log.error("Unable to notify user of "+errorSubject+". contentID="+contentID+" learner="+learnerID+" file "+detail.getFilePath()+" due to exception "+e.getMessage(),e);
+        }
+    }
+
+
     // **********************************************************
     // Private methods
     // **********************************************************
@@ -519,4 +624,5 @@
 	// request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
 	request.setAttribute("sessions", sessions);
     }
+    
 }
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ReflectAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ReflectAction.java,v
diff -u -r1.4.12.1 -r1.4.12.2
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ReflectAction.java	5 May 2016 08:09:17 -0000	1.4.12.1
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ReflectAction.java	30 Aug 2016 02:15:09 -0000	1.4.12.2
@@ -154,7 +154,7 @@
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	Integer userID = user.getUserID();
 
-	List list = submitFilesService.getFilesUploadedByUser(userID, sessionId, request.getLocale());
+	List list = submitFilesService.getFilesUploadedByUser(userID, sessionId, request.getLocale(), false);
 	int minUpload = (Integer) sessionMap.get(SbmtConstants.PARAM_MIN_UPLOAD);
 	if (minUpload > 0) {
 	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.learning.minimum.upload.number.less"));
Index: lams_tool_sbmt/web/monitoring/mark/allmarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/allmarks.jsp,v
diff -u -r1.10.2.4 -r1.10.2.5
--- lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	4 Aug 2016 06:56:26 -0000	1.10.2.4
+++ lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	30 Aug 2016 02:15:10 -0000	1.10.2.5
@@ -30,7 +30,7 @@
 	<table class="table table-condensed">
 		<c:forEach var="user" items="${reports}">
 			<c:forEach items="${user.value}" var="fileInfo" varStatus="status">
-				<%@include file="filelist.jsp"%>
+				<%@include file="fileinfo.jsp"%>
 			</c:forEach>
 		</c:forEach>
 		<tr>
Index: lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp,v
diff -u -r1.7.2.1 -r1.7.2.2
--- lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp	20 May 2016 12:29:11 -0000	1.7.2.1
+++ lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp	30 Aug 2016 02:15:10 -0000	1.7.2.2
@@ -7,28 +7,56 @@
 </c:if> 
 
 <tr>
+	<c:choose>
+	<c:when test="${fileInfo.removed}">
+		<td>
+			<span style="color:red"><fmt:message key="label.deleted"/> : 
+		</td>
+		<td>
+			<span style="color:red"><c:out value="${fileInfo.filePath}" /></span>
+		</td>
+	</c:when>
+	<c:otherwise>
+		<td>
+			<fmt:message key="label.learner.filePath" />
+		</td>
+		<td>
+			<c:out value="${fileInfo.filePath}" />
+		</td>
+	</c:otherwise>
+	</c:choose>
 	<td>
-		<fmt:message key="label.learner.filePath" />
-		:
+		<c:choose>
+		<c:when test="${fileInfo.removed and empty updateMode}">
+			<html:link href="javascript:restoreLearnerFile(${fileInfo.submissionID},${toolSessionID},${fileInfo.owner.userID},'${fileInfo.filePath}');" styleClass="btn btn-default loffset10">
+				<fmt:message key="label.monitoring.original.learner.file.restore" />
+			</html:link>
+		</c:when>
+
+		<c:otherwise>
+			<c:set var="viewURL">
+				<html:rewrite page="/download/?uuid=${fileInfo.uuID}&versionID=${fileInfo.versionID}&preferDownload=false" />
+			</c:set>
+			<html:link href="javascript:launchInstructionsPopup('${viewURL}')" styleClass="btn btn-default">
+				<fmt:message key="label.view" />
+			</html:link>
+			<c:set var="downloadURL">
+				<html:rewrite page="/download/?uuid=${fileInfo.uuID}&versionID=${fileInfo.versionID}&preferDownload=true" />
+			</c:set>
+			<html:link href="${downloadURL}" styleClass="btn btn-default loffset10">
+				<fmt:message key="label.download" />
+			</html:link>
+			<c:if test="${empty updateMode}">
+				<html:link href="javascript:removeLearnerFile(${fileInfo.submissionID},${toolSessionID},${fileInfo.owner.userID},'${fileInfo.filePath}');" styleClass="btn btn-default loffset10">
+					<fmt:message key="label.monitoring.original.learner.file.delete" />
+				</html:link>
+			</c:if>
+		</c:otherwise>
+		</c:choose>
 	</td>
-	<td>
-		<c:out value="${fileInfo.filePath}" />
-	</td>
-	<td>
-		<c:set var="viewURL">
-			<html:rewrite page="/download/?uuid=${fileInfo.uuID}&versionID=${fileInfo.versionID}&preferDownload=false" />
-		</c:set>
-		<html:link href="javascript:launchInstructionsPopup('${viewURL}')" styleClass="btn btn-default">
-			<fmt:message key="label.view" />
-		</html:link>
-		<c:set var="downloadURL">
-			<html:rewrite page="/download/?uuid=${fileInfo.uuID}&versionID=${fileInfo.versionID}&preferDownload=true" />
-		</c:set>
-		<html:link href="${downloadURL}" styleClass="btn btn-default loffset10">
-			<fmt:message key="label.download" />
-		</html:link>
-	</td>
 </tr>
+
+<c:if test="${not fileInfo.removed}">
 <tr>
 	<td>
 		<fmt:message key="label.learner.fileDescription" />
@@ -45,12 +73,20 @@
 		</c:choose>
 	</td>
 </tr>
-<tr>
+</c:if>
+
+<c:set var="style">${fileInfo.removed?"style=\"margin-bottom: 5px; border-bottom: 5px solid #ddd\"":""}</c:set>
+<tr ${style}>
 	<td>
 		<fmt:message key="label.learner.dateOfSubmission" />
 		:
 	</td>
 	<td colspan="2">
 		<lams:Date value="${fileInfo.dateOfSubmission}" />
 	</td>
-</tr>
\ No newline at end of file
+</tr>
+
+<c:if test="${not fileInfo.removed and empty updateMode}">
+<!--  do not show full details if removed or on mark screen --> 
+	<%@include file="filelist.jsp"%>
+</c:if>
\ No newline at end of file
Index: lams_tool_sbmt/web/monitoring/mark/filelist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/filelist.jsp,v
diff -u -r1.7.2.1 -r1.7.2.2
--- lams_tool_sbmt/web/monitoring/mark/filelist.jsp	20 May 2016 12:29:11 -0000	1.7.2.1
+++ lams_tool_sbmt/web/monitoring/mark/filelist.jsp	30 Aug 2016 02:15:10 -0000	1.7.2.2
@@ -1,5 +1,3 @@
-<%@include file="fileinfo.jsp"%>
-
 <tr>
 	<td>
 		<fmt:message key="label.learner.marks" />
Index: lams_tool_sbmt/web/monitoring/mark/mark.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/mark.jsp,v
diff -u -r1.10.2.4 -r1.10.2.5
--- lams_tool_sbmt/web/monitoring/mark/mark.jsp	4 Aug 2016 06:56:26 -0000	1.10.2.4
+++ lams_tool_sbmt/web/monitoring/mark/mark.jsp	30 Aug 2016 02:15:10 -0000	1.10.2.5
@@ -20,7 +20,28 @@
 		function updateMark(detailId,reportId,sessionId,userId){
 			location.href="<lams:WebAppURL/>mark.do?method=newMark&updateMode=listMark&userID="+userId+"&toolSessionID="+sessionId+"&detailID="+detailId+"&reportID="+reportId;
 		}
+
+		function removeLearnerFile(detailId,sessionId,userId,filename) {
+			var msg = '<fmt:message key="message.monitor.confirm.original.learner.file.delete"/>';
+			msg = msg.replace('{0}', filename)
+			var answer = confirm(msg);
+			if (answer) {	
+				location.href="<c:url value="/monitoring.do"/>?method=removeLearnerFile&userID="+userId+"&toolSessionID="+sessionId+"&detailID="+detailId;
+			}
+		}
+
+		function restoreLearnerFile(detailId,sessionId,userId,filename) {
+			var msg = '<fmt:message key="message.monitor.confirm.original.learner.file.restore"/>';
+			msg = msg.replace('{0}', filename)
+			var answer = confirm(msg);
+			if (answer) {	
+				location.href="<c:url value="/monitoring.do"/>?method=restoreLearnerFile&userID="+userId+"&toolSessionID="+sessionId+"&detailID="+detailId;
+			}
+		}
+
 	</script>
+
+	</script>
 </lams:head>
 
 <body class="stripes">
@@ -29,7 +50,7 @@
 
 	<table class="table table-condensed">
 		<c:forEach var="fileInfo" items="${report}" varStatus="status">
-			<%@include file="filelist.jsp"%>
+			<%@include file="fileinfo.jsp"%>
 		</c:forEach>
 	
 		<tr>
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/parts/summary.jsp,v
diff -u -r1.21.2.5 -r1.21.2.6
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	20 May 2016 12:29:11 -0000	1.21.2.5
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	30 Aug 2016 02:15:10 -0000	1.21.2.6
@@ -66,9 +66,7 @@
 							} else {
 								rows += '<fmt:message key="label.no"/>';
 							}
-							if ( userData["numFiles"] > 0 ) {
-								rows += ' [<a href=\"javascript:viewMark('+userData["userID"]+','+$(table).attr("data-session-id")+');\"><fmt:message key="label.monitoring.Mark.button" /></a>]';
-							} 
+							rows += ' [<a href=\"javascript:viewMark('+userData["userID"]+','+$(table).attr("data-session-id")+');\"><fmt:message key="label.view.files" /></a>]';
 							rows += '</td>';
 
 							<c:if test="${reflectOn}">
@@ -176,7 +174,7 @@
         	<span class="panel-title collapsable-icon-left">
         	<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${sessionDto.sessionID}" 
 					aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${sessionDto.sessionID}" >
-			<fmt:message key="message.session.name" />:	<c:out value="${sessionDto.sessionName}" /></a>
+			<fmt:message key="label.session.name" />:	<c:out value="${sessionDto.sessionName}" /></a>
 			</span>
         </div>