Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -ra9e2d458266b86533fec824f1bd26710d2f59271
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	(.../SubmitFilesReport.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	(.../SubmitFilesReport.hbm.xml)	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -44,15 +44,6 @@
         />
 
         <property
-            name="dateMarksReleased"
-            type="java.util.Date"
-            update="true"
-            insert="true"
-            column="date_marks_released"
-            length="19"
-        />
-
-        <property
             name="markFileUUID"
             type="java.lang.Long"
             update="true"
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml
===================================================================
diff -u -r1688016bbb43db756bca9b93361c2a3833089d12 -ra9e2d458266b86533fec824f1bd26710d2f59271
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml	(.../SubmitFilesSession.hbm.xml)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml	(.../SubmitFilesSession.hbm.xml)	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -83,6 +83,14 @@
             insert="true"
             column="group_leader_uid"
         />
+        
+       <property
+            name="marksReleased"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="marks_released"
+        />
 
         <!--
             To add non XDoclet property mappings, create a file named
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r2d20cd764b9f78cf3d349dc62735bcc86d356795 -ra9e2d458266b86533fec824f1bd26710d2f59271
--- lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 2d20cd764b9f78cf3d349dc62735bcc86d356795)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -82,6 +82,7 @@
 label.count  =Count
 label.no.user.available  =No data
 msg.mark.released  =Marks in {0} have been released.
+label.marks.released  =Marks have been released
 error.title.blank  =Title can not be blank.
 label.authoring.advanced.reflectOnActivity  =Add a notebook at end of Submit Files with the following instructions:
 error.reflection.emtpy  =Please input Notebook entry
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java
===================================================================
diff -u -rc2388b4c760cc0a05554b831b3205e4831f6e17b -ra9e2d458266b86533fec824f1bd26710d2f59271
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java	(.../SbmtConstants.java)	(revision c2388b4c760cc0a05554b831b3205e4831f6e17b)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java	(.../SbmtConstants.java)	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -87,6 +87,8 @@
 
     public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity";    
     
+    public static final String ATTR_IS_MARKS_RELEASED = "isMarksReleased";
+    
     public static final String ATTR_SUBMIT_FILES = "submittedFilesMap";
     
     public static final String WAIT_FOR_LEADER = "waitForLeader";
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -ra9e2d458266b86533fec824f1bd26710d2f59271
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java	(.../SubmitFilesReport.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java	(.../SubmitFilesReport.java)	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -51,9 +51,6 @@
     /** nullable persistent field */
     private Float marks;
 
-    /** nullable persistent field */
-    private Date dateMarksReleased;
-
     /** persistent field */
     private Long markFileUUID;
 
@@ -64,10 +61,9 @@
     private Long markFileVersionID;
 
     /** full constructor */
-    public SubmitFilesReport(String comments, Float marks, Date dateMarksReleased) {
+    public SubmitFilesReport(String comments, Float marks) {
 	this.comments = comments;
 	this.marks = marks;
-	this.dateMarksReleased = dateMarksReleased;
     }
 
     /** default constructor */
@@ -111,17 +107,6 @@
     /**
      *
      */
-    public Date getDateMarksReleased() {
-	return this.dateMarksReleased;
-    }
-
-    public void setDateMarksReleased(Date dateMarksReleased) {
-	this.dateMarksReleased = dateMarksReleased;
-    }
-
-    /**
-     *
-     */
     public Long getMarkFileUUID() {
 	return markFileUUID;
     }
@@ -155,7 +140,7 @@
     @Override
     public String toString() {
 	return new ToStringBuilder(this).append("reportID", getReportID()).append("comments", getComments())
-		.append("marks", getMarks()).append("dateMarksReleased", getDateMarksReleased()).toString();
+		.append("marks", getMarks()).toString();
     }
 
     /*
@@ -188,12 +173,11 @@
 	SubmitFilesReport castOther = (SubmitFilesReport) other;
 	return new EqualsBuilder().append(this.getReportID(), castOther.getReportID())
 		.append(this.getComments(), castOther.getComments()).append(this.getMarks(), castOther.getMarks())
-		.append(this.getDateMarksReleased(), castOther.getDateMarksReleased()).isEquals();
+		.isEquals();
     }
 
     @Override
     public int hashCode() {
-	return new HashCodeBuilder().append(getReportID()).append(getComments()).append(getMarks())
-		.append(getDateMarksReleased()).toHashCode();
+	return new HashCodeBuilder().append(getReportID()).append(getComments()).append(getMarks()).toHashCode();
     }
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java
===================================================================
diff -u -r1688016bbb43db756bca9b93361c2a3833089d12 -ra9e2d458266b86533fec824f1bd26710d2f59271
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java	(.../SubmitFilesSession.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java	(.../SubmitFilesSession.java)	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -64,6 +64,8 @@
 
     private SubmitUser groupLeader;
     
+    private boolean marksReleased;
+    
     /** full constructor */
     public SubmitFilesSession(Long sessionID, int status) {
 	this.sessionID = sessionID;
@@ -208,4 +210,12 @@
     public void setGroupLeader(SubmitUser groupLeader) {
    	this.groupLeader = groupLeader;
     }
+    
+    public boolean isMarksReleased() {
+	return marksReleased;
+    }
+
+    public void setMarksReleased(boolean marksReleased) {
+	this.marksReleased = marksReleased;
+    }
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20180702.sql
===================================================================
diff -u
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20180702.sql	(revision 0)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20180702.sql	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -0,0 +1,21 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-4611 Release marks is now a state
+ALTER TABLE tl_lasbmt11_session ADD COLUMN marks_released TINYINT(1) DEFAULT 0;
+
+UPDATE tl_lasbmt11_session as sessions, tl_lasbmt11_report as report, tl_lasbmt11_submission_details as details
+		SET sessions.marks_released = 1 
+		WHERE report.report_id = details.submission_id AND details.session_id=sessions.session_id AND report.date_marks_released IS NOT NULL;
+
+ALTER TABLE tl_lasbmt11_report DROP COLUMN date_marks_released;
+
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java
===================================================================
diff -u -r0f06a3fe1469600b56093d09d01c0922ab1cb3db -ra9e2d458266b86533fec824f1bd26710d2f59271
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java	(.../FileDetailsDTO.java)	(revision 0f06a3fe1469600b56093d09d01c0922ab1cb3db)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java	(.../FileDetailsDTO.java)	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -57,7 +57,6 @@
     private String comments;
     private String marks;
     private Date dateOfSubmission;
-    private Date dateMarksReleased;
     private String markFileName;
     private Long markFileUUID;
     private Long markFileVersionID;
@@ -100,7 +99,6 @@
 	SubmitFilesReport report = details.getReport();
 	if (report != null) {
 	    this.reportID = report.getReportID();
-	    this.dateMarksReleased = report.getDateMarksReleased();
 	    this.comments = report.getComments();
 	    this.marks = report.getMarks() != null
 		    ? NumberUtil.formatLocalisedNumber(report.getMarks(), numberFormat, 2) : "";
@@ -201,21 +199,6 @@
     }
 
     /**
-     * @return Returns the dateMarksReleased.
-     */
-    public Date getDateMarksReleased() {
-	return dateMarksReleased;
-    }
-
-    /**
-     * @param dateMarksReleased
-     *            The dateMarksReleased to set.
-     */
-    public void setDateMarksReleased(Date dateMarksReleased) {
-	this.dateMarksReleased = dateMarksReleased;
-    }
-
-    /**
      * @return Returns the uuID.
      */
     public Long getUuID() {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SessionDTO.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -ra9e2d458266b86533fec824f1bd26710d2f59271
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SessionDTO.java	(.../SessionDTO.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SessionDTO.java	(.../SessionDTO.java)	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -21,20 +21,19 @@
  * ****************************************************************
  */
 
-
-
 package org.lamsfoundation.lams.tool.sbmt.dto;
 
 /**
  *
  * @author Anthony Sukkar
- *
  */
 public class SessionDTO {
 
     private Long sessionID;
 
     private String sessionName;
+    
+    private boolean marksReleased;
 
     public Long getSessionID() {
 	return sessionID;
@@ -51,5 +50,13 @@
     public void setSessionName(String sessionName) {
 	this.sessionName = sessionName;
     }
+    
+    public boolean isMarksReleased() {
+	return marksReleased;
+    }
 
+    public void setMarksReleased(boolean marksReleased) {
+	this.marksReleased = marksReleased;
+    }
+
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -ra9e2d458266b86533fec824f1bd26710d2f59271
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java	(.../SubmitUserDTO.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java	(.../SubmitUserDTO.java)	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -53,7 +53,6 @@
     private String comments;
     private Float marks;
     private Date dateOfSubmission;
-    private Date dateMarksReleased;
     private boolean anyFilesMarked;
 
     //submit file list
@@ -96,21 +95,6 @@
     }
 
     /**
-     * @return Returns the dateMarksReleased.
-     */
-    public Date getDateMarksReleased() {
-	return dateMarksReleased;
-    }
-
-    /**
-     * @param dateMarksReleased
-     *            The dateMarksReleased to set.
-     */
-    public void setDateMarksReleased(Date dateMarksReleased) {
-	this.dateMarksReleased = dateMarksReleased;
-    }
-
-    /**
      * @return Returns the dateOfSubmission.
      */
     public Date getDateOfSubmission() {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r309d4e79cd4ea1ee0b3e4cf0e070dd5243e73203 -ra9e2d458266b86533fec824f1bd26710d2f59271
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 309d4e79cd4ea1ee0b3e4cf0e070dd5243e73203)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -65,6 +65,7 @@
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
+import org.lamsfoundation.lams.logevent.LogEvent;
 import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
@@ -102,6 +103,8 @@
 import org.lamsfoundation.lams.usermanagement.util.LastNameAlphabeticComparator;
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.dao.DataAccessException;
 
 /**
@@ -218,7 +221,7 @@
     public void removeToolContent(Long toolContentId) throws ToolException {
 	SubmitFilesContent submitFilesContent = submitFilesContentDAO.getContentByID(toolContentId);
 	if (submitFilesContent == null) {
-	    SubmitFilesService.log.warn("Can not remove the tool content as it does not exist, ID: " + toolContentId);
+	    log.warn("Can not remove the tool content as it does not exist, ID: " + toolContentId);
 	    return;
 	}
 
@@ -235,9 +238,8 @@
 
     @Override
     public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
-	if (SubmitFilesService.log.isDebugEnabled()) {
-	    SubmitFilesService.log.debug(
-		    "Removing Submit Files content for user ID " + userId + " and toolContentId " + toolContentId);
+	if (log.isDebugEnabled()) {
+	    log.debug("Removing Submit Files content for user ID " + userId + " and toolContentId " + toolContentId);
 	}
 
 	List<SubmitFilesSession> sessions = submitFilesSessionDAO.getSubmitFilesSessionByContentID(toolContentId);
@@ -261,16 +263,15 @@
 
     @Override
     public void copyLearnerContent(SubmitUser fromUser, SubmitUser toUser) throws ToolException {
-
 	if ((fromUser == null) || (toUser == null) || fromUser.getUid().equals(toUser.getUid())) {
 	    return;
 	}
 
 	List<SubmissionDetails> leaderSubmissions = submissionDetailsDAO.getBySessionAndLearner(fromUser.getSessionID(),
 		fromUser.getUserID());
 
-	List<SubmissionDetails> existingSubmissions = submissionDetailsDAO
-		.getBySessionAndLearner(toUser.getSessionID(), toUser.getUserID());
+	List<SubmissionDetails> existingSubmissions = submissionDetailsDAO.getBySessionAndLearner(toUser.getSessionID(),
+		toUser.getUserID());
 
 	// Note: uuid never changes once a file is uploaded as this is the key from the content repository.
 	for (SubmissionDetails leadersubmission : leaderSubmissions) {
@@ -302,7 +303,6 @@
 		    usersubmission.setReport(userreport);
 		}
 		userreport.setComments(leaderReport.getComments());
-		userreport.setDateMarksReleased(leaderReport.getDateMarksReleased());
 		userreport.setMarkFileName(leaderReport.getMarkFileName());
 		userreport.setMarkFileUUID(leaderReport.getMarkFileUUID());
 		userreport.setMarkFileVersionID(leaderReport.getMarkFileVersionID());
@@ -311,7 +311,7 @@
 	    } else {
 		usersubmission.setReport(null);
 	    }
-	    
+
 	    submissionDetailsDAO.save(usersubmission);
 	}
     }
@@ -321,11 +321,6 @@
 	return submitFilesSessionDAO.getSubmitFilesSessionByContentID(toolContentID);
     }
 
-    /**
-     * Export the XML fragment for the tool's content, along with any files needed for the content.
-     *
-     * @throws ExportToolContentException
-     */
     @Override
     public void exportToolContent(Long toolContentId, String toPath) throws ToolException, DataMissingException {
 	SubmitFilesContent toolContentObj = submitFilesContentDAO.getContentByID(toolContentId);
@@ -386,14 +381,6 @@
 	}
     }
 
-    /**
-     * Get the definitions for possible output for an activity, based on the toolContentId. These may be definitions
-     * that are always available for the tool (e.g. number of marks for Multiple Choice) or a custom definition created
-     * for a particular activity such as the answer to the third question contains the word Koala and hence the need for
-     * the toolContentId
-     *
-     * @return SortedMap of ToolOutputDefinitions with the key being the name of each definition
-     */
     @Override
     public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Long toolContentId, int definitionType)
 	    throws ToolException {
@@ -438,7 +425,7 @@
 	try {
 	    content = submitFilesContentDAO.getContentByID(contentID);
 	} catch (Exception e) {
-	    SubmitFilesService.log.error("Could not find the content by given ID:" + contentID + ". Excpetion is " + e);
+	    log.error("Could not find the content by given ID:" + contentID + ". Excpetion is " + e);
 	}
 
 	return content;
@@ -493,7 +480,7 @@
 		    "Fail to create a submission session" + " based on null toolSessionId or toolContentId");
 	}
 
-	SubmitFilesService.log.debug("Start to create submission session based on toolSessionId["
+	log.debug("Start to create submission session based on toolSessionId["
 		+ toolSessionId.longValue() + "] and toolContentId[" + toolContentId.longValue() + "]");
 	try {
 	    SubmitFilesContent submitContent = getSubmitFilesContent(toolContentId);
@@ -508,7 +495,7 @@
 	    submitSession.setStatus(new Integer(SubmitFilesSession.INCOMPLETE));
 	    submitSession.setContent(submitContent);
 	    submitFilesSessionDAO.createSession(submitSession);
-	    SubmitFilesService.log.debug("Submit File session created");
+	    log.debug("Submit File session created");
 	} catch (DataAccessException e) {
 	    throw new SubmitFilesException(
 		    "Exception occured when lams is creating" + " a submission Session: " + e.getMessage(), e);
@@ -519,11 +506,11 @@
     @Override
     public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
 	if (toolSessionId == null) {
-	    SubmitFilesService.log.error("Fail to leave tool Session based on null tool session id.");
+	    log.error("Fail to leave tool Session based on null tool session id.");
 	    throw new ToolException("Fail to remove tool Session based on null tool session id.");
 	}
 	if (learnerId == null) {
-	    SubmitFilesService.log.error("Fail to leave tool Session based on null learner.");
+	    log.error("Fail to leave tool Session based on null learner.");
 	    throw new ToolException("Fail to remove tool Session based on null learner.");
 	}
 
@@ -532,7 +519,7 @@
 	    session.setStatus(new Integer(SubmitFilesSession.COMPLETED));
 	    submitFilesSessionDAO.update(session);
 	} else {
-	    SubmitFilesService.log.error("Fail to leave tool Session.Could not find submit file "
+	    log.error("Fail to leave tool Session.Could not find submit file "
 		    + "session by given session id: " + toolSessionId);
 	    throw new DataMissingException("Fail to leave tool Session."
 		    + "Could not find submit file session by given session id: " + toolSessionId);
@@ -553,15 +540,15 @@
     @Override
     public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException {
 	if (toolSessionId == null) {
-	    SubmitFilesService.log.error("Fail to remove tool Session based on null tool session id.");
+	    log.error("Fail to remove tool Session based on null tool session id.");
 	    throw new ToolException("Fail to remove tool Session based on null tool session id.");
 	}
 
 	SubmitFilesSession session = submitFilesSessionDAO.getSessionByID(toolSessionId);
 	if (session != null) {
 	    removeToolSession(session);
 	} else {
-	    SubmitFilesService.log.error("Could not find submit file session by given session id: " + toolSessionId);
+	    log.error("Could not find submit file session by given session id: " + toolSessionId);
 	    throw new DataMissingException("Could not find submit file session by given session id: " + toolSessionId);
 	}
     }
@@ -637,7 +624,6 @@
 	detailSet.add(details);
 	session.setSubmissionDetails(detailSet);
 	submissionDetailsDAO.saveOrUpdate(session);
-
     }
 
     /**
@@ -654,7 +640,7 @@
 	if ((file != null) && !StringUtils.isEmpty(file.getFileName())) {
 	    String fileName = file.getFileName();
 	    try {
-		node = getSbmtToolContentHandler().uploadFile(file.getInputStream(), fileName, file.getContentType());
+		node = sbmtToolContentHandler.uploadFile(file.getInputStream(), fileName, file.getContentType());
 	    } catch (InvalidParameterException e) {
 		throw new SubmitFilesException(
 			"FileNotFoundException occured while trying to upload File" + e.getMessage());
@@ -672,19 +658,13 @@
 	return node;
     }
 
-    /**
-     * (non-Javadoc)
-     *
-     * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#getFilesUploadedByUserForContent(java.lang.Long,
-     *      java.lang.Long)
-     */
     @Override
-    public List getFilesUploadedByUser(Integer userID, Long sessionID, Locale currentLocale,
+    public List<FileDetailsDTO> getFilesUploadedByUser(Integer userID, Long sessionID, Locale currentLocale,
 	    boolean includeRemovedFiles) {
 	List<SubmissionDetails> list = submissionDetailsDAO.getBySessionAndLearner(sessionID, userID);
-	SortedSet details = new TreeSet(this.new FileDtoComparator());
+	SortedSet<FileDetailsDTO> details = new TreeSet<FileDetailsDTO>(this.new FileDtoComparator());
 	if (list == null) {
-	    return new ArrayList(details);
+	    return new ArrayList<FileDetailsDTO>(details);
 	}
 
 	NumberFormat numberFormat = currentLocale != null ? NumberFormat.getInstance(currentLocale) : null;
@@ -694,7 +674,7 @@
 		details.add(detailDto);
 	    }
 	}
-	return new ArrayList(details);
+	return new ArrayList<FileDetailsDTO>(details);
     }
 
     
@@ -708,28 +688,29 @@
      * contains all <code>FileDetailsDTO</code> object belong to this user.
      */
     @Override
-    public SortedMap getFilesUploadedBySession(Long sessionID, Locale currentLocale) {
-	List list = submissionDetailsDAO.getSubmissionDetailsBySession(sessionID);
+    public SortedMap<SubmitUserDTO, List<FileDetailsDTO>> getFilesUploadedBySession(Long sessionID,
+	    Locale currentLocale) {
+	List<SubmissionDetails> list = submissionDetailsDAO.getSubmissionDetailsBySession(sessionID);
 	if (list != null) {
-	    SortedMap map = new TreeMap(new LastNameAlphabeticComparator());
-	    Iterator iterator = list.iterator();
-	    List userFileList;
+	    SortedMap<SubmitUserDTO, List<FileDetailsDTO>> map = new TreeMap<SubmitUserDTO, List<FileDetailsDTO>>(
+		    new LastNameAlphabeticComparator());
+	    Iterator<SubmissionDetails> iterator = list.iterator();
+	    List<FileDetailsDTO> userFileList;
 	    NumberFormat numberFormat = currentLocale != null ? NumberFormat.getInstance(currentLocale) : null;
 	    while (iterator.hasNext()) {
-		SubmissionDetails submissionDetails = (SubmissionDetails) iterator.next();
+		SubmissionDetails submissionDetails = iterator.next();
 		SubmitUser learner = submissionDetails.getLearner();
 		if (learner == null) {
-		    SubmitFilesService.log
-			    .error("Could not find learer for special submission item:" + submissionDetails);
+		    log.error("Could not find learer for special submission item:" + submissionDetails);
 		    return null;
 		}
 		SubmitUserDTO submitUserDTO = new SubmitUserDTO(learner);
 
 		FileDetailsDTO detailDto = new FileDetailsDTO(submissionDetails, numberFormat);
-		userFileList = (List) map.get(submitUserDTO);
+		userFileList = (List<FileDetailsDTO>) map.get(submitUserDTO);
 		// if it is first time to this user, creating a new ArrayList for this user.
 		if (userFileList == null) {
-		    userFileList = new ArrayList();
+		    userFileList = new ArrayList<FileDetailsDTO>();
 		}
 		userFileList.add(detailDto);
 		map.put(submitUserDTO, userFileList);
@@ -746,11 +727,6 @@
 	return new FileDetailsDTO(details, currentLocale != null ? NumberFormat.getInstance(currentLocale) : null);
     }
 
-    /**
-     * (non-Javadoc)
-     *
-     * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#getUsersBySession(java.lang.Long)
-     */
     @Override
     public List<SubmitUser> getUsersBySession(Long sessionID) {
 	return submitUserDAO.getUsersBySession(sessionID);
@@ -762,7 +738,8 @@
 
 	SubmitFilesSession session = getSessionById(sessionID);
 	SubmitFilesContent content = session.getContent();
-	if (content.isUseSelectLeaderToolOuput()) {
+	boolean isUseSelectLeaderToolOuput = content.isUseSelectLeaderToolOuput();
+	if (isUseSelectLeaderToolOuput) {
 
 	    // can share the mark file across users
 	    NodeKey nodeKey = null;
@@ -773,7 +750,6 @@
 	    List<Long> reportIDs = submitUserDAO.getReportsForGroup(sessionID, reportID);
 	    for (Long reportIDGroup : reportIDs) {
 
-		IToolContentHandler toolContentHandler = getSbmtToolContentHandler();
 		SubmitFilesReport report = submitFilesReportDAO.getReportByID(reportIDGroup);
 		if (report != null) {
 		    report.setComments(comments);
@@ -784,7 +760,7 @@
 
 			// Delete the existing
 			if (report.getMarkFileUUID() != null) {
-			    toolContentHandler.deleteFile(report.getMarkFileUUID());
+			    sbmtToolContentHandler.deleteFile(report.getMarkFileUUID());
 			    report.setMarkFileName(null);
 			    report.setMarkFileUUID(null);
 			    report.setMarkFileVersionID(null);
@@ -797,11 +773,9 @@
 
 		    submitFilesReportDAO.update(report);
 		}
-
 	    }
 
 	} else {
-	    IToolContentHandler toolContentHandler = getSbmtToolContentHandler();
 	    SubmitFilesReport report = submitFilesReportDAO.getReportByID(reportID);
 	    if (report != null) {
 		report.setComments(comments);
@@ -812,7 +786,7 @@
 
 		    // Delete the existing
 		    if (report.getMarkFileUUID() != null) {
-			toolContentHandler.deleteFile(report.getMarkFileUUID());
+			sbmtToolContentHandler.deleteFile(report.getMarkFileUUID());
 			report.setMarkFileName(null);
 			report.setMarkFileUUID(null);
 			report.setMarkFileVersionID(null);
@@ -832,15 +806,82 @@
 	    }
 	}
 
+	// push outputs to gradebook
+	recalculateUserTotalMarks(isUseSelectLeaderToolOuput, session, reportID);
     }
+    
+    /**
+     * Calculate user's total mark and push it to gradebook.
+     * 
+     * @param updateMarksForAllSessionUsers
+     *            whether we should update marks for all users in a session
+     * @param session
+     * @param reportID
+     *            applicable only in case of updateMarksForAllSessionUsers is false
+     */
+    private void recalculateUserTotalMarks(boolean updateMarksForAllSessionUsers, SubmitFilesSession session,
+	    Long reportID) {
 
+	//proceed only in case marks have been released
+	if (!session.isMarksReleased()) {
+	    return;
+	}
+	Long sessionID = session.getSessionID();
+
+	//calculate users' total marks
+	Map<Integer, Float> userIdToTotalMarkMap = new TreeMap<Integer, Float>();
+	if (updateMarksForAllSessionUsers) {
+	    List<SubmissionDetails> allDetails = submissionDetailsDAO.getSubmissionDetailsBySession(sessionID);
+	    for (SubmissionDetails details : allDetails) {
+		Integer userId = details.getLearner().getUserID();
+		Float userTotalMark = userIdToTotalMarkMap.get(userId);
+
+		if (!details.isRemoved()) {
+
+		    SubmitFilesReport report = details.getReport();
+		    if (report != null) {
+			if (userTotalMark == null) {
+			    userTotalMark = report.getMarks();
+			} else if (report.getMarks() != null) {
+			    userTotalMark += report.getMarks();
+			}
+		    }
+		}
+
+		userIdToTotalMarkMap.put(userId, userTotalMark);
+	    }
+	} else {
+	    SubmissionDetails submissionDetails = submissionDetailsDAO.getSubmissionDetailsByID(reportID);
+	    Integer userId = submissionDetails.getLearner().getUserID();
+	    List<SubmissionDetails> userDetails = submissionDetailsDAO.getBySessionAndLearner(sessionID, userId);
+	    Float userTotalMark = 0f;
+	    for (SubmissionDetails details : userDetails) {
+		if (!details.isRemoved()) {
+		    SubmitFilesReport report = details.getReport();
+		    if (report != null && report.getMarks() != null) {
+			userTotalMark += report.getMarks();
+		    }
+		}
+	    }
+
+	    userIdToTotalMarkMap.put(userId, userTotalMark);
+	}
+	
+	// push outputs to gradebook
+	for (Integer userId : userIdToTotalMarkMap.keySet()) {
+	    Double userTotalMark = userIdToTotalMarkMap.get(userId) == null ? null
+		    : new Double(userIdToTotalMarkMap.get(userId));
+	    gradebookService.updateActivityMark(userTotalMark, null, userId, sessionID, false);
+	}
+    }
+
     @Override
     public void removeMarkFile(Long reportID, Long markFileUUID, Long markFileVersionID, Long sessionID) {
-
 	SubmitFilesSession session = getSessionById(sessionID);
 	SubmitFilesContent content = session.getContent();
-
-	if (content.isUseSelectLeaderToolOuput()) {
+	boolean isUseSelectLeaderToolOuput = content.isUseSelectLeaderToolOuput();
+	
+	if (isUseSelectLeaderToolOuput) {
 	    List<Long> reportIDs = submitUserDAO.getReportsForGroup(sessionID, reportID);
 	    for (Long reportIDGroup : reportIDs) {
 		SubmitFilesReport report = submitFilesReportDAO.getReportByID(reportIDGroup);
@@ -863,7 +904,6 @@
 	}
 
 	deleteFromRepository(markFileUUID, markFileVersionID);
-
     }
 
     @Override
@@ -879,6 +919,11 @@
 
 	    detail.setRemoved(true);
 	    submissionDetailsDAO.update(detail);
+	    
+	    if (detail.getReport() != null) {
+		// push outputs to gradebook
+		recalculateUserTotalMarks(false, detail.getSubmitFileSession(), detail.getReport().getReportID());
+	    }
 	}
     }
 
@@ -893,6 +938,11 @@
 
 	    detail.setRemoved(false);
 	    submissionDetailsDAO.update(detail);
+	    
+	    if (detail.getReport() != null) {
+		// push outputs to gradebook
+		recalculateUserTotalMarks(false, detail.getSubmitFileSession(), detail.getReport().getReportID());
+	    }
 	}
 
     }
@@ -937,63 +987,66 @@
     }
 
     @Override
-    public boolean releaseMarksForSession(Long sessionID) {
-	List list = submissionDetailsDAO.getSubmissionDetailsBySession(sessionID);
-	Iterator iter = list.iterator();
-	SubmissionDetails details;
-	SubmitFilesReport report;
+    public void releaseMarksForSession(Long sessionID) {
 	SubmitFilesSession session = getSessionById(sessionID);
-
 	SubmitFilesContent content = session.getContent();
+	
+	//set marks released indicator
+	session.setMarksReleased(true);
+	submitFilesSessionDAO.update(session);
+
+	// push outputs to gradebook
+	recalculateUserTotalMarks(true, session, null);
+	
+	// notify learners on mark release
 	boolean notifyLearnersOnMarkRelease = getEventNotificationService().eventExists(SbmtConstants.TOOL_SIGNATURE,
 		SbmtConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE, content.getContentID());
-	Map<Integer, StringBuilder> notificationMessages = null;
-	Object[] notificationMessageParameters = null;
 	if (notifyLearnersOnMarkRelease) {
-	    notificationMessages = new TreeMap<Integer, StringBuilder>();
-	    notificationMessageParameters = new Object[3];
-	}
-	while (iter.hasNext()) {
-	    details = (SubmissionDetails) iter.next();
-	    report = details.getReport();
-	    report.setDateMarksReleased(new Date());
-	    if (notifyLearnersOnMarkRelease && !details.isRemoved()) {
-		SubmitUser user = details.getLearner();
-		StringBuilder notificationMessage = notificationMessages.get(user.getUserID());
-		if (notificationMessage == null) {
-		    notificationMessage = new StringBuilder();
+	    Map<Integer, StringBuilder> notificationMessages = new TreeMap<Integer, StringBuilder>();
+	    
+	    List<SubmissionDetails> list = submissionDetailsDAO.getSubmissionDetailsBySession(sessionID);
+	    for (SubmissionDetails details : list) {
+		SubmitFilesReport report = details.getReport();
+		if (!details.isRemoved()) {
+		    Integer userId = details.getLearner().getUserID();
+		    StringBuilder notificationMessage = notificationMessages.get(userId);
+		    if (notificationMessage == null) {
+			notificationMessage = new StringBuilder();
+		    }
+		    Object[] notificationMessageParameters = new Object[3];
+		    notificationMessageParameters[0] = details.getFilePath();
+		    notificationMessageParameters[1] = details.getDateOfSubmission();
+		    notificationMessageParameters[2] = report.getMarks();
+		    notificationMessage
+			    .append(getLocalisedMessage("event.mark.release.mark", notificationMessageParameters));
+		    notificationMessages.put(userId, notificationMessage);
 		}
-		notificationMessageParameters[0] = details.getFilePath();
-		notificationMessageParameters[1] = details.getDateOfSubmission();
-		notificationMessageParameters[2] = report.getMarks();
-		notificationMessage
-			.append(getLocalisedMessage("event.mark.release.mark", notificationMessageParameters));
-		notificationMessages.put(user.getUserID(), notificationMessage);
 	    }
-	    submitFilesReportDAO.updateReport(report);
-	}
-	// current there is no false return
-	if (notifyLearnersOnMarkRelease) {
-	    notificationMessageParameters = new Object[1];
+
+	    Object[] notificationMessageParameters = new Object[1];
 	    for (Integer userID : notificationMessages.keySet()) {
 		notificationMessageParameters[0] = notificationMessages.get(userID).toString();
 		getEventNotificationService().triggerForSingleUser(SbmtConstants.TOOL_SIGNATURE,
 			SbmtConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE, content.getContentID(), userID,
 			notificationMessageParameters);
 	    }
 	}
-
-	// pushing outputs to gradebook
-	List<SubmitUser> users = getUsersBySession(sessionID);
-
-	if (users != null) {
-	    for (SubmitUser user : users) {
-		// send marks to gradebook where applicable
-		sendMarksToGradebook(user, sessionID);
-	    }
-	}
-
-	return true;
+	
+	//audit log event
+//	UserDTO currentUser = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+//	StringBuilder instructorTxt = new StringBuilder(monitor.getLogin()).append(" (").append(monitor.getUserID())
+//		.append(") ");
+//	StringBuilder learnerTxt = new StringBuilder(learner.getLogin()).append("  (").append(learner.getUserID())
+//		.append(") ");
+//
+//	String auditMsg = getLocalisedMessage(i18nKey,
+//		new Object[] { instructorTxt.toString(), detail.getFilePath(), learnerTxt.toString() });
+//	Long toolContentId = null;
+//	if (detail.getSubmitFileSession() != null && detail.getSubmitFileSession().getContent() != null) {
+//	    toolContentId = detail.getSubmitFileSession().getContent().getContentID();
+//	}
+//	logEventService.logEvent(LogEvent.TYPE_MARK_RELEASED, monitor.getUserID(), null, lessonId, null, message);
+//	logEventService.logEvent(logEventTypeId, currentUser.getUserID(), null, lessonId, activityId, description);
     }
 
     @Override
@@ -1013,66 +1066,23 @@
 	}
     }
 
-    /**
-     * Sends marks to gradebook
-     *
-     * @param user
-     * @param toolSessionID
-     */
-    @SuppressWarnings("unchecked")
-    public void sendMarksToGradebook(SubmitUser user, Long toolSessionID) {
-	submissionDetailsDAO.getSubmissionDetailsBySession(toolSessionID);
-	List<SubmissionDetails> detailsList = submissionDetailsDAO.getBySessionAndLearner(toolSessionID,
-		user.getUserID());
-	if (detailsList != null) {
-	    Float totalMark = null;
-	    for (SubmissionDetails details : detailsList) {
-		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);
-		gradebookService.updateActivityMark(mark, null, user.getUserID(), toolSessionID, false);
-	    }
-	}
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#getToolDefaultContentIdBySignature(java.lang.Long)
-     */
     @Override
     public Long getToolDefaultContentIdBySignature(String toolSignature) {
 	Long contentId = null;
 	contentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature));
 	if (contentId == null) {
 	    String error = "Could not retrieve default content id for this tool";
-	    SubmitFilesService.log.error(error);
+	    log.error(error);
 	    throw new SubmitFilesException(error);
 	}
 	return contentId;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#createDefaultContent(java.lang.Long)
-     */
     @Override
     public SubmitFilesContent createDefaultContent(Long contentID) {
 	if (contentID == null) {
 	    String error = "Could not retrieve default content id for this tool";
-	    SubmitFilesService.log.error(error);
+	    log.error(error);
 	    throw new SubmitFilesException(error);
 	}
 	SubmitFilesContent defaultContent = getDefaultSubmit();
@@ -1090,7 +1100,7 @@
 	SubmitFilesContent defaultContent = getSubmitFilesContent(defaultToolContentId);
 	if (defaultContent == null) {
 	    String error = "Could not retrieve default content record for this tool";
-	    SubmitFilesService.log.error(error);
+	    log.error(error);
 	    throw new SubmitFilesException(error);
 	}
 	return defaultContent;
@@ -1183,7 +1193,6 @@
 
 	submitUserDAO.saveOrUpdateUser(author);
 	return author;
-
     }
 
     @Override
@@ -1202,7 +1211,6 @@
 
 	submitUserDAO.saveOrUpdateUser(learner);
 	return learner;
-
     }
 
     @Override
@@ -1247,13 +1255,6 @@
     }
 
     /**
-     * @return Returns the sbmtToolContentHandler.
-     */
-    public IToolContentHandler getSbmtToolContentHandler() {
-	return sbmtToolContentHandler;
-    }
-
-    /**
      * @param sbmtToolContentHandler
      *            The sbmtToolContentHandler to set.
      */
@@ -1262,13 +1263,6 @@
     }
 
     /**
-     * @return Returns the learnerDAO.
-     */
-    public ISubmitUserDAO getSubmitUserDAO() {
-	return submitUserDAO;
-    }
-
-    /**
      * @param learnerDAO
      *            The learnerDAO to set.
      */
@@ -1292,34 +1286,18 @@
 	this.repositoryService = repositoryService;
     }
 
-    public ILamsToolService getToolService() {
-	return toolService;
-    }
-
     public void setToolService(ILamsToolService toolService) {
 	this.toolService = toolService;
     }
 
-    public IExportToolContentService getExportContentService() {
-	return exportContentService;
-    }
-
     public void setExportContentService(IExportToolContentService exportContentService) {
 	this.exportContentService = exportContentService;
     }
 
-    public ICoreNotebookService getCoreNotebookService() {
-	return coreNotebookService;
-    }
-
     public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
 	this.coreNotebookService = coreNotebookService;
     }
 
-    public IUserManagementService getUserManagementService() {
-	return userManagementService;
-    }
-
     public void setUserManagementService(IUserManagementService userManagementService) {
 	this.userManagementService = userManagementService;
     }
@@ -1342,10 +1320,6 @@
 	this.messageService = messageService;
     }
 
-    public ILogEventService getLogEventService() {
-	return logEventService;
-    }
-
     public void setLogEventService(ILogEventService logEventService) {
 	this.logEventService = logEventService;
     }
@@ -1453,8 +1427,8 @@
 		leader = submitUserDAO.getLearner(toolSessionId, (Integer) leaderUserId.intValue());
 		// create new user in a DB
 		if (leader == null) {
-		    SubmitFilesService.log.debug("creating new user with userId: " + leaderUserId);
-		    User leaderDto = (User) getUserManagementService().findById(User.class, leaderUserId.intValue());
+		    log.debug("creating new user with userId: " + leaderUserId);
+		    User leaderDto = (User) userManagementService.findById(User.class, leaderUserId.intValue());
 		    String userName = leaderDto.getLogin();
 		    String fullName = leaderDto.getFirstName() + " " + leaderDto.getLastName();
 		    //  leader = new SubmitUser(leaderDto.getUserDTO(), submitFileSession);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java
===================================================================
diff -u -r309d4e79cd4ea1ee0b3e4cf0e070dd5243e73203 -ra9e2d458266b86533fec824f1bd26710d2f59271
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java	(.../LearnerAction.java)	(revision 309d4e79cd4ea1ee0b3e4cf0e070dd5243e73203)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java	(.../LearnerAction.java)	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -102,11 +102,10 @@
     public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	// initial session Map
-	SessionMap sessionMap = new SessionMap();
+	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 	
-
 	((LearnerForm) form).setSessionMapID(sessionMap.getSessionID());
 
 	// get parameters from Request
@@ -134,14 +133,13 @@
 	}
 
 	ISubmitFilesService submitFilesService = getService();
-	ToolContentManager contentManager = getContentManager();
 	SubmitFilesSession session = submitFilesService.getSessionById(sessionID);
 	SubmitFilesContent content = session.getContent();
 
 	// 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(), false);
+	List<FileDetailsDTO> filesUploaded = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale(), false);
 
 	// check whehter finish lock is on/off
 	boolean lock = content.isLockOnFinished() && learner.isFinished();
@@ -158,6 +156,7 @@
 	sessionMap.put(SbmtConstants.ATTR_LIMIT_UPLOAD, content.isLimitUpload());
 	sessionMap.put(SbmtConstants.ATTR_LIMIT_UPLOAD_NUMBER, content.getLimitUploadNumber());
 	sessionMap.put(SbmtConstants.ATTR_USER_FINISHED, learner.isFinished());
+	sessionMap.put(SbmtConstants.ATTR_IS_MARKS_RELEASED, session.isMarksReleased());
 
 	sessionMap.put(SbmtConstants.ATTR_UPLOAD_MAX_FILE_SIZE,
 		FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE)));
@@ -205,8 +204,8 @@
 		    IEventNotificationService.DELIVERY_METHOD_MAIL);
 	}
 
-	
-	SortedMap submittedFilesMap = submitFilesService.getFilesUploadedBySession(sessionID, request.getLocale());
+	SortedMap<SubmitUserDTO, List<FileDetailsDTO>> submittedFilesMap = submitFilesService
+		.getFilesUploadedBySession(sessionID, request.getLocale());
 	// support for leader select feature  
 	SubmitUser groupLeader = content.isUseSelectLeaderToolOuput()
 		? submitFilesService.checkLeaderSelectToolForSessionLeader(learner, new Long(sessionID).longValue())
@@ -274,7 +273,7 @@
     public ActionForward refresh(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	((LearnerForm) form).setSessionMapID(sessionMap.getSessionID());
 	request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	
@@ -286,10 +285,13 @@
 	Long sessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 	
 	ISubmitFilesService submitFilesService = getService();
-	List filesUploaded = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale(), false);
+	List<FileDetailsDTO> 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);
+	
+	SubmitFilesSession session = submitFilesService.getSessionById(sessionID);
+	sessionMap.put(SbmtConstants.ATTR_IS_MARKS_RELEASED, session.isMarksReleased());
 
 	return mapping.findForward(SbmtConstants.SUCCESS);
     }
@@ -309,7 +311,7 @@
 
 	LearnerForm learnerForm = (LearnerForm) form;
 	String sessionMapID = learnerForm.getSessionMapID();
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 
 	// set the mode into http session
@@ -326,8 +328,8 @@
 	    Integer userID = user.getUserID();
 
 	    ISubmitFilesService submitFilesService = getService();
-	    List filesUploaded = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale(),
-		    false);
+	    List<FileDetailsDTO> filesUploaded = submitFilesService.getFilesUploadedByUser(userID, sessionID,
+		    request.getLocale(), false);
 
 	    SubmitUser learner = getCurrentLearner(sessionID, submitFilesService);
 	    ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
@@ -378,7 +380,7 @@
 	    HttpServletResponse response) {
 
 	String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 
 	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
@@ -416,8 +418,10 @@
     // Private mehtods
     // **********************************************************************************************
     private ISubmitFilesService getService() {
-	ISubmitFilesService submitFilesService = SubmitFilesServiceProxy
-		.getSubmitFilesService(this.getServlet().getServletContext());
+	if (submitFilesService == null) {
+	    submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
+	}
+
 	return submitFilesService;
     }
     
@@ -463,16 +467,8 @@
     }
 
     /**
-     *
      * Set information into learner DTO object for page display. Fill file list uploaded by the special user into web
      * form. Remove the unauthorized mark and comments.
-     *
-     * @param request
-     * @param sessionMap
-     * @param sessionID
-     * @param userID
-     * @param content
-     * @param filesUploaded
      */
     private void setLearnerDTO(HttpServletRequest request, SessionMap sessionMap, SubmitUser currUser,
 	    List filesUploaded, ToolAccessMode mode) {
@@ -489,10 +485,6 @@
 		    } else {
 			filedto.setCurrentLearner(false);
 		    }
-//		    if (filedto.getDateMarksReleased() == null) {
-//			filedto.setComments(null);
-//			filedto.setMarks(null);
-//		    }
 		}
 	    }
 	    dto.setFilesUploaded(filesUploaded);
@@ -542,25 +534,13 @@
 	return learner;
     }
 
-    private ISubmitFilesService getSubmitFilesService() {
-	return SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
-    }
-
     public ActionForward deleteLearnerFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws ServletException, IOException {
-	HttpSession ss = SessionManager.getSession();
-	
-
 	UserDTO currentUser = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
 	Long detailID = WebUtil.readLongParam(request, "detailId");
-
-	if (submitFilesService == null) {
-	    submitFilesService = getSubmitFilesService();
-	}
-	FileDetailsDTO fileDetail = submitFilesService.getFileDetails(detailID, request.getLocale());
+	FileDetailsDTO fileDetail = getService().getFileDetails(detailID, request.getLocale());
 	
 	if (fileDetail.getOwner().getUserID().equals(currentUser.getUserID()) && (StringUtils.isBlank(fileDetail.getMarks()))) {
-
 	    submitFilesService.removeLearnerFile(detailID,null);
 
 	} else {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java
===================================================================
diff -u -rc2388b4c760cc0a05554b831b3205e4831f6e17b -ra9e2d458266b86533fec824f1bd26710d2f59271
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision c2388b4c760cc0a05554b831b3205e4831f6e17b)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -60,6 +60,7 @@
 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.usermanagement.dto.UserDTO;
@@ -308,7 +309,8 @@
 	Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
 	submitFilesService = getSubmitFilesService();
 	// return FileDetailsDTO list according to the given sessionID
-	Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID, request.getLocale());
+	Map<SubmitUserDTO, List<FileDetailsDTO>> userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID,
+		request.getLocale());
 	// construct Excel file format and download
 	String errors = null;
 	try {
@@ -452,14 +454,17 @@
      */
     public ActionForward listMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
+	getSubmitFilesService();
 	Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
+	SubmitFilesSession session = submitFilesService.getSessionById(sessionID);
 	Integer userID = WebUtil.readIntParam(request, "userID");
 
-	submitFilesService = getSubmitFilesService();
 	// return FileDetailsDTO list according to the given userID and sessionID
-	List files = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale(), true);
+	List<FileDetailsDTO> files = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale(),
+		true);
 
 	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
+	request.setAttribute(SbmtConstants.ATTR_IS_MARKS_RELEASED, session.isMarksReleased());
 	request.setAttribute("report", files);
 	return mapping.findForward("listMark");
     }
@@ -476,13 +481,17 @@
     public ActionForward listAllMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 
+	getSubmitFilesService();
 	Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
-	submitFilesService = getSubmitFilesService();
+	SubmitFilesSession session = submitFilesService.getSessionById(sessionID);
+
 	// return FileDetailsDTO list according to the given sessionID
-	Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID, request.getLocale());
+	Map<SubmitUserDTO, List<FileDetailsDTO>> userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID,
+		request.getLocale());
 	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
 	// request.setAttribute("user",submitFilesService.getUserDetails(userID));
 	request.setAttribute("reports", userFilesMap);
+	request.setAttribute(SbmtConstants.ATTR_IS_MARKS_RELEASED, session.isMarksReleased());
 
 	return mapping.findForward("listAllMarks");
 
@@ -552,7 +561,8 @@
 	    }
 	}
 
-	List files = submitFilesService.getFilesUploadedByUser(learnerUserID, sessionID, request.getLocale(), true);
+	List<FileDetailsDTO> files = submitFilesService.getFilesUploadedByUser(learnerUserID, sessionID,
+		request.getLocale(), true);
 
 	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
 	request.setAttribute("report", files);
@@ -607,20 +617,6 @@
     }
 
     /**
-     * Save file mark information into HttpRequest
-     *
-     * @param request
-     * @param sessionID
-     * @param userID
-     * @param detailID
-     * @param updateMode
-     */
-    private void setMarkPage(HttpServletRequest request, Long sessionID, Long userID, Long detailID,
-	    String updateMode) {
-
-    }
-
-    /**
      * Save Summary information into HttpRequest.
      *
      * @param request
@@ -638,6 +634,7 @@
 	    Long sessionID = sfs.getSessionID();
 	    sessionDto.setSessionID(sessionID);
 	    sessionDto.setSessionName(sfs.getSessionName());
+	    sessionDto.setMarksReleased(sfs.isMarksReleased());
 	    sessions.add(sessionDto);
 	}
 
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r309d4e79cd4ea1ee0b3e4cf0e070dd5243e73203 -ra9e2d458266b86533fec824f1bd26710d2f59271
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 309d4e79cd4ea1ee0b3e4cf0e070dd5243e73203)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -229,7 +229,7 @@
 					</tr>
 
 				<!--Fourth row displaying the comments -->
-				<c:if test="${not empty file.dateMarksReleased and not empty file.comments}">
+				<c:if test="${sessionMap.isMarksReleased and not empty file.comments}">
 					<tr>
 						<td style="vertical-align:top"><fmt:message key="label.learner.comments" /></td>
 						<td colspan="2">
@@ -239,7 +239,7 @@
 				</c:if>
 
 				<!--Fifth row displaying the marks-->
-				<c:if test="${not empty file.dateMarksReleased and not empty file.marks}">
+				<c:if test="${sessionMap.isMarksReleased and not empty file.marks}">
 					<tr>
 						<td><fmt:message key="label.learner.marks" /></td>
 						<td>
@@ -248,7 +248,7 @@
 					</tr>
 				</c:if>
 				<!--Sixth row displaying the marked file-->
-				<c:if  test="${not empty file.markFileUUID}">	
+				<c:if  test="${sessionMap.isMarksReleased and not empty file.markFileUUID}">	
 					<tr>
 						<td><fmt:message key="label.monitor.mark.markedFile" /></td>
 						<td>
Index: lams_tool_sbmt/web/monitoring/mark/allmarks.jsp
===================================================================
diff -u -raeba69e88ab1e8231f91f2b5908dda5edf03f84f -ra9e2d458266b86533fec824f1bd26710d2f59271
--- lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	(.../allmarks.jsp)	(revision aeba69e88ab1e8231f91f2b5908dda5edf03f84f)
+++ lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	(.../allmarks.jsp)	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -28,6 +28,12 @@
 <c:set var="title"><fmt:message key="label.monitoring.heading.marking" /></c:set>
 <lams:Page title="${title}" type="monitor">
 
+	<c:if test="${isMarksReleased}">
+		<div class="alert alert-success">
+			<fmt:message key="label.marks.released" />
+		</div>
+	</c:if>
+
 	<c:forEach var="user" items="${reports}">
 		<c:forEach items="${user.value}" var="fileInfo" varStatus="status">
 			<%@include file="fileinfo.jsp"%>
Index: lams_tool_sbmt/web/monitoring/mark/mark.jsp
===================================================================
diff -u -raeba69e88ab1e8231f91f2b5908dda5edf03f84f -ra9e2d458266b86533fec824f1bd26710d2f59271
--- lams_tool_sbmt/web/monitoring/mark/mark.jsp	(.../mark.jsp)	(revision aeba69e88ab1e8231f91f2b5908dda5edf03f84f)
+++ lams_tool_sbmt/web/monitoring/mark/mark.jsp	(.../mark.jsp)	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -41,22 +41,26 @@
 		}
 
 	</script>
-
-	</script>
 </lams:head>
 
 <body class="stripes">
 <c:set var="title"><fmt:message key="label.monitoring.heading.marking" /></c:set>
 <lams:Page title="${title}" type="monitor">
 
-		<c:forEach var="fileInfo" items="${report}" varStatus="status">
-			<%@include file="fileinfo.jsp"%>
-			<hr width="100%">
-		</c:forEach>
+	<c:if test="${isMarksReleased}">
+		<div class="alert alert-success">
+			<fmt:message key="label.marks.released" />
+		</div>
+	</c:if>
+
+	<c:forEach var="fileInfo" items="${report}" varStatus="status">
+		<%@include file="fileinfo.jsp"%>
+		<hr width="100%">
+	</c:forEach>
 	
-		<html:link href="javascript:window.close();" property="submit" styleClass="btn btn-primary pull-right">
-			<fmt:message key="label.monitoring.done.button" />
-		</html:link>
+	<html:link href="javascript:window.close();" property="submit" styleClass="btn btn-primary pull-right">
+		<fmt:message key="label.monitoring.done.button" />
+	</html:link>
 	
 	<div id="footer"></div>
 	
Index: lams_tool_sbmt/web/monitoring/mark/updatemark.jsp
===================================================================
diff -u -r07ace0e41d113321756cbe1d75ab04d8c9cb5841 -ra9e2d458266b86533fec824f1bd26710d2f59271
--- lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	(.../updatemark.jsp)	(revision 07ace0e41d113321756cbe1d75ab04d8c9cb5841)
+++ lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	(.../updatemark.jsp)	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -56,7 +56,6 @@
 <c:set var="title"><fmt:message key="label.monitoring.updateMarks.button" /></c:set>
 <lams:Page title="${title}" type="monitor">
 
-
 		<c:forEach var="fileInfo" items="${report}" varStatus="status">
 			<html:form action="/mark.do" method="post" styleId="updateMarkForm" enctype="multipart/form-data" onsubmit="return validate();">
 			
@@ -72,7 +71,7 @@
 				<%@include file="fileinfo.jsp"%>
 				
 				<logic:messagesPresent>
-							<%@include file="/common/messages.jsp"%>
+					<%@include file="/common/messages.jsp"%>
 				</logic:messagesPresent>
 			
 			<dl class="dl-horizontal">		
@@ -159,7 +158,6 @@
 			</html:form>
 		</c:forEach>
 
-
 <div id="footer"></div>
 </lams:Page>
 </body>
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
diff -u -r1688016bbb43db756bca9b93361c2a3833089d12 -ra9e2d458266b86533fec824f1bd26710d2f59271
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision a9e2d458266b86533fec824f1bd26710d2f59271)
@@ -8,6 +8,12 @@
 	<lams:LAMSURL />
 </c:set>
 
+<style>
+	.group-mark-release-label {
+		font-size: medium; vertical-align: -webkit-baseline-middle;
+	}
+</style>
+
 <script type="text/javascript">
 	// pass settings to monitorToolSummaryAdvanced.js
 	var submissionDeadlineSettings = {
@@ -136,6 +142,8 @@
 			},
 			function() {
 				$("#messageArea_Busy").hide();
+				$("#release-marks-" + sessionId).hide();
+				$("#release-marks-info-" + sessionId).show();
 			}
 		);
 	}
@@ -162,8 +170,6 @@
 
 </div>
 
-
-
 <c:forEach var="sessionDto" items="${sessions}" varStatus="status">
 		
 	<c:if test="${isGroupedActivity}">	
@@ -188,15 +194,23 @@
 			</c:if>
 	</lams:TSTable>
 	
-	<P style="display: inline"> 
+	<P style="display: inline">
+		
+		<div class="label label-success loffset5 group-mark-release-label" id="release-marks-info-${sessionDto.sessionID}"
+				<c:if test="${!sessionDto.marksReleased}">style="display:none;"</c:if>>
+			<fmt:message key="label.marks.released" />
+		</div>
+	
 		<html:button property="viewAllMarks" onclick="javascript:viewAllMarks(${sessionDto.sessionID})"
 					 styleClass="btn btn-default loffset5 voffset10" >
 			<fmt:message key="label.monitoring.viewAllMarks.button" />
 		</html:button>
-		<html:button property="releaseMarks" onclick="releaseMarks(${sessionDto.sessionID})"
-					 styleClass="btn btn-default loffset5 voffset10" >
-			<fmt:message key="label.monitoring.releaseMarks.button" />
-		</html:button>
+		<c:if test="${!sessionDto.marksReleased}">
+			<html:button property="releaseMarks" styleId="release-marks-${sessionDto.sessionID}" onclick="releaseMarks(${sessionDto.sessionID})"
+						 styleClass="btn btn-default loffset5 voffset10" >
+				<fmt:message key="label.monitoring.releaseMarks.button" />
+			</html:button>
+		</c:if>
 		<html:form action="/monitoring" style="display:inline">
 			<html:hidden property="method" value="downloadMarks" />
 			<html:hidden property="toolSessionID" value="${sessionDto.sessionID}" />