Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -103,6 +103,14 @@
             insert="true"
             column="limit_upload_number"
         />
+        
+        <property
+            name="useSelectLeaderToolOuput"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="use_select_leader_tool_ouput"
+        />
 
         <property
             name="created"
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml	(.../SubmitFilesSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml	(.../SubmitFilesSession.hbm.xml)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -73,6 +73,16 @@
             column="session_name"
             length="250"
         />
+        
+        <many-to-one
+            name="groupLeader"
+            class="org.lamsfoundation.lams.tool.sbmt.SubmitUser"
+            cascade="all"
+            
+            update="true"
+            insert="true"
+            column="group_leader_uid"
+        />
 
         <!--
             To add non XDoclet property mappings, create a file named
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -ra71bf2630935c6bc8b907ca22801208a2d3bd657 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a71bf2630935c6bc8b907ca22801208a2d3bd657)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -63,6 +63,9 @@
 label.monitoring.edit.activity.edit  =Edit activity
 label.monitoring.edit.activity.cancel  =Cancel
 label.monitoring.edit.activity.update  =Update activity
+label.select.leader  =Leader selection
+label.waiting.for.leader.launch.time.limit  =Leader has not started the activity. Please wait until he/she commences it.
+label.waiting.for.leader.finish  =Time limit set by teacher is over. Please wait until a group leader finishes the activity.
 monitoring.statistic.title  =Statistic for monitoring
 monitoring.statistic.marked  =Marked files:
 monitoring.statistic.not.marked  =Not marked files:
@@ -157,6 +160,6 @@
 errors.required  ={0} is required.
 errors.maxfilesize  =Uploaded file exceeded maximum size: {0}
 label.add  =Add
+label.use.select.leader.tool.output  =Use leaders from Select Leader tool
 
-
 #======= End labels: Exported 151 labels for en AU =====
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java	(.../SbmtConstants.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java	(.../SbmtConstants.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -70,6 +70,12 @@
     public static final String ATTR_LOCK_ON_FINISH = "lockOnFinish";
 
     public static final String PARAM_MIN_UPLOAD = "minUpload";
+    
+    public static final String ATTR_GROUP_USERS = "groupUsers";
+    
+    public static final String ATTR_USE_SEL_LEADER = "useSelectLeaderToolOuput";
+    
+    public static final String ATTR_GROUP_LEADER = "groupLeader";
 
     public static final String ATTR_LIMIT_UPLOAD = "limitUpload";
 
@@ -79,7 +85,19 @@
 
     public static final String ATTR_USER_FINISHED = "userFinished";
 
-    public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity";
+    public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity";    
+    
+    public static final String ATTR_SUBMIT_FILES = "submittedFilesMap";
+    
+    public static final String WAIT_FOR_LEADER = "waitForLeader";
+    
+    public static final String WAIT_FOR_LEADER_TIME_LIMIT = "waitForLeaderTimeLimit";
+    
+    public static final String ATTR_IS_USER_LEADER = "isUserLeader";
+    
+    public static final String ATTR_HAS_EDIT_RIGHT = "hasEditRight";
+    
+    public static final String PARAM_WAITING_MESSAGE_KEY = "waitingMessageKey";
 
     public static final String ATTR_UPLOAD_MAX_FILE_SIZE = "uploadMaxFileSize";
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	(.../SubmitFilesContent.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	(.../SubmitFilesContent.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -62,6 +62,8 @@
     private boolean defineLater;
 
     private boolean contentInUse;
+    
+    private boolean useSelectLeaderToolOuput;
 
     private boolean limitUpload;
 
@@ -340,4 +342,12 @@
     public void setNotifyTeachersOnFileSubmit(boolean notifyTeachersOnFileSubmit) {
 	this.notifyTeachersOnFileSubmit = notifyTeachersOnFileSubmit;
     }
+    
+    public boolean isUseSelectLeaderToolOuput() {
+   	return useSelectLeaderToolOuput;
+    }
+
+    public void setUseSelectLeaderToolOuput(boolean useSelectLeaderToolOuput) {
+   	this.useSelectLeaderToolOuput = useSelectLeaderToolOuput;
+    }
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java	(.../SubmitFilesSession.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java	(.../SubmitFilesSession.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -62,6 +62,8 @@
     /** persistent field, but not cloned to avoid to clone block */
     private SubmitFilesContent content;
 
+    private SubmitUser groupLeader;
+    
     /** full constructor */
     public SubmitFilesSession(Long sessionID, int status) {
 	this.sessionID = sessionID;
@@ -198,4 +200,12 @@
     public void setSessionName(String sessionName) {
 	this.sessionName = sessionName;
     }
+    
+    public SubmitUser getGroupLeader() {
+   	return groupLeader;
+    }
+
+    public void setGroupLeader(SubmitUser groupLeader) {
+   	this.groupLeader = groupLeader;
+    }
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmissionDetailsDAO.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmissionDetailsDAO.java	(.../ISubmissionDetailsDAO.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmissionDetailsDAO.java	(.../ISubmissionDetailsDAO.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -52,6 +52,8 @@
      * @param session
      */
     public void saveOrUpdate(SubmitFilesSession session);
+    
+    public void save(SubmissionDetails submissionDetails);
 
     /**
      * @param sessionID
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesSessionDAO.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesSessionDAO.java	(.../ISubmitFilesSessionDAO.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesSessionDAO.java	(.../ISubmitFilesSessionDAO.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -51,4 +51,14 @@
     public void createSession(SubmitFilesSession submitSession);
 
     public List<SubmitFilesSession> getSubmitFilesSessionByContentID(Long contentID);
+    
+    
+    
+    /**
+     * Generic method to save an object - handles both update and insert.
+     *
+     * @param o
+     *            the object to save
+     */
+    public void saveObject(Object o);
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitUserDAO.java
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitUserDAO.java	(.../ISubmitUserDAO.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitUserDAO.java	(.../ISubmitUserDAO.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -57,4 +57,18 @@
     int getCountUsersBySession(final Long sessionId, String searchString);
 
     List<StatisticDTO> getStatisticsBySession(final Long contentId);
+    
+    List<StatisticDTO> getLeaderStatisticsBySession(final Long contentId);
+    
+    List<Long> getReportsForGroup(final Long sessionId, final Long reportId);
+
+    
+    /**
+     * Generic method to save an object - handles both update and insert.
+     *
+     * @param o
+     *            the object to save
+     */
+    public void saveObject(Object o);
+    
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java
===================================================================
diff -u -r0f06a3fe1469600b56093d09d01c0922ab1cb3db -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java	(.../SubmissionDetailsDAO.java)	(revision 0f06a3fe1469600b56093d09d01c0922ab1cb3db)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java	(.../SubmissionDetailsDAO.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -65,6 +65,11 @@
 	getSession().saveOrUpdate(session);
 
     }
+    
+    @Override
+    public void save(SubmissionDetails submissionDetails) {
+	getSession().save(submissionDetails);
+    }
 
     /*
      * (non-Javadoc)
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java	(.../SubmitUserDAO.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java	(.../SubmitUserDAO.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -217,5 +217,49 @@
 	}
 	return list;
     }
+    
+    
+    private static final String GET_LEADER_STATISTICS = "SELECT session.session_id sessionId, session.session_name sessionName, "
+	    + " COUNT(detail.submission_id) totalUploadedFiles, COUNT(report.marks) markedCount"
+	    + " FROM tl_lasbmt11_session session, tl_lasbmt11_submission_details detail, tl_lasbmt11_report report "
+	    + " WHERE session.content_id = :contentId and detail.session_id = session.session_id "
+	    + " AND detail.submission_id = report.report_id AND session.group_leader_uid= detail.learner_id" + " GROUP BY session.session_id";
 
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<StatisticDTO> getLeaderStatisticsBySession(final Long contentId) {
+
+	SQLQuery query = getSession().createSQLQuery(GET_LEADER_STATISTICS);
+	query.addScalar("sessionId", LongType.INSTANCE).addScalar("sessionName", StringType.INSTANCE)
+		.addScalar("totalUploadedFiles", IntegerType.INSTANCE).addScalar("markedCount", IntegerType.INSTANCE)
+		.setLong("contentId", contentId).setResultTransformer(Transformers.aliasToBean(StatisticDTO.class));
+
+	List<StatisticDTO> list = query.list();
+	for (StatisticDTO dto : list) {
+	    dto.setNotMarkedCount(dto.getTotalUploadedFiles() - dto.getMarkedCount());
+	}
+	return list;
+    }
+    
+    
+    private static final String GET_GROUP_REPORTS = "SELECT report.report_id reportId "
+	    + " FROM tl_lasbmt11_submission_details detail, tl_lasbmt11_report report "
+	    + " WHERE detail.session_id = :sessionId "
+	    + " AND detail.submission_id = report.report_id "
+    	    + " AND detail.filePath = (SELECT filePath from tl_lasbmt11_submission_details "
+	    + " WHERE submission_id = :reportId); ";
+    
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<Long> getReportsForGroup(final Long sessionId, final Long reportId) {
+
+	SQLQuery query = getSession().createSQLQuery(GET_GROUP_REPORTS);
+	query.addScalar("reportId", LongType.INSTANCE)
+		.setLong("sessionId", sessionId)
+		.setLong("reportId", reportId);
+
+	return query.list();
+	
+    }
+
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20171114.sql
===================================================================
diff -u
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20171114.sql	(revision 0)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20171114.sql	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -0,0 +1,24 @@
+-- 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-
+
+
+ALTER TABLE tl_lasbmt11_content ADD COLUMN use_select_leader_tool_ouput TINYINT(1) NOT NULL DEFAULT 0;
+
+ALTER TABLE tl_lasbmt11_session ADD COLUMN group_leader_uid BIGINT;
+ALTER TABLE tl_lasbmt11_session ADD INDEX FK_lasbmt11_session_1 (group_leader_uid), ADD CONSTRAINT tl_lasbmt11_session FOREIGN KEY (group_leader_uid) REFERENCES tl_lasbmt11_user (uid) ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- Adding a constraint to the assessment user table so no same user_id and session_id can be repetead 
+-- (Please, note there are some duplicate users exist (their session_uid is null), they got formed when techers created questions in authoring. It's required to keep track of questions' authors.) 
+ALTER TABLE tl_lasbmt11_user ADD UNIQUE INDEX(user_id, session_id);
+ 
+
+----------------------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/AuthoringDTO.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java	(.../AuthoringDTO.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java	(.../AuthoringDTO.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -48,6 +48,8 @@
     private String instruction;
 
     // advance
+    private boolean useSelectLeaderToolOuput;
+    
     private boolean lockOnFinished;
 
     private boolean limitUpload;
@@ -188,4 +190,12 @@
     public void setNotifyTeachersOnFileSubmit(boolean notifyTeachersOnFileSubmit) {
 	this.notifyTeachersOnFileSubmit = notifyTeachersOnFileSubmit;
     }
+    
+    public boolean isUseSelectLeaderToolOuput() {
+   	return useSelectLeaderToolOuput;
+    }
+
+    public void setUseSelectLeaderToolOuput(boolean useSelectLeaderToolOuput) {
+   	this.useSelectLeaderToolOuput = useSelectLeaderToolOuput;
+    }
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
===================================================================
diff -u -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision b67c428939ed96f08f56192d54b8ee55d8ab89d2)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -134,7 +134,7 @@
      * @param marksFileInputStream
      * @param marksFileName
      */
-    public void updateMarks(Long reportID, Float marks, String comments, FormFile file)
+    public void updateMarks(Long reportID, Float marks, String comments, FormFile file, Long SessionID)	    
 	    throws InvalidParameterException, RepositoryCheckedException;
 
     /**
@@ -320,7 +320,15 @@
      * @param contentId
      * @return
      */
-    List<StatisticDTO> getStatisticsBySession(final Long contentId);
+    List<StatisticDTO> getStatisticsBySession(final Long contentId);   
+    
+    /**
+     * Get the leader statistics for all the sessions for one activity.
+     * 
+     * @param contentId
+     * @return
+     */
+    List<StatisticDTO> getLeaderStatisticsBySession(final Long contentId);
 
     public IEventNotificationService getEventNotificationService();
 
@@ -349,4 +357,28 @@
      * @param toolContentID
      */
     void auditLogStartEditingActivityInMonitor(long toolContentID);
+    
+    /**
+     * Set specified user as a leader. Also the previous leader (if any) is marked as non-leader.
+     *
+     * @param userId
+     * @param toolSessionID
+     */
+    SubmitUser checkLeaderSelectToolForSessionLeader(SubmitUser user, Long toolSessionID);
+    
+    /**
+     * Create a new user in database.
+     */
+    void createUser(SubmitUser submitUser);
+    
+    /**
+     * @param user
+     * @param toolSessionId
+     * @return
+     */
+    boolean isUserGroupLeader(SubmitUser user, Long toolSessionId);
+    
+
+    void copyLearnerContent(SubmitUser fromUser, SubmitUser toUser);
+    
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -262,7 +262,32 @@
 	    }
 	}
     }
+    
+ 
+    
+    @Override
+    public void copyLearnerContent(SubmitUser fromUser, SubmitUser toUser) throws ToolException {
 
+	List<SubmissionDetails> leadersubmissions = submissionDetailsDAO.getBySessionAndLearner(fromUser.getSessionID(),fromUser.getUserID());
+	for (SubmissionDetails leadersubmission : leadersubmissions) {
+	    if(leadersubmission.getSubmitFileSession().getSessionID()==toUser.getSessionID()){
+		SubmissionDetails usersubmission = new SubmissionDetails();
+		    usersubmission.setLearner(toUser);
+		    usersubmission.setDateOfSubmission(new Date());
+		    usersubmission.setFileDescription(leadersubmission.getFileDescription());
+		    usersubmission.setFilePath(leadersubmission.getFilePath());
+		    usersubmission.setSubmitFileSession(leadersubmission.getSubmitFileSession());
+		    usersubmission.setVersionID(leadersubmission.getVersionID());
+		    SubmitFilesReport report1 = new SubmitFilesReport();
+		    usersubmission.setReport(report1);
+		    usersubmission.setRemoved(leadersubmission.isRemoved());
+		    usersubmission.setUuid(leadersubmission.getUuid());
+        	    submissionDetailsDAO.save(usersubmission);
+	    }
+	}
+    }
+
+
     @Override
     public List<SubmitFilesSession> getSessionsByContentID(Long toolContentID) {
 	return submitFilesSessionDAO.getSubmitFilesSessionByContentID(toolContentID);
@@ -702,38 +727,81 @@
     }
 
     @Override
-    public void updateMarks(Long reportID, Float marks, String comments, FormFile markFile)
+    public void updateMarks(Long reportID, Float marks, String comments, FormFile markFile, Long sessionID)
 	    throws InvalidParameterException, RepositoryCheckedException {
+	
+	
+	SubmitFilesSession session = getSessionById(sessionID);
+	System.out.println("MARK FILE NAME>>"+markFile.getFileName());
+	SubmitFilesContent content = session.getContent();
+	if (content.isUseSelectLeaderToolOuput()) {
+	    List<Long> reportIDs = submitUserDAO.getReportsForGroup(sessionID, reportID);
+	    for (Long reportIDGroup : reportIDs) {
 
-	IToolContentHandler toolContentHandler = getSbmtToolContentHandler();
-	SubmitFilesReport report = submitFilesReportDAO.getReportByID(reportID);
-	if (report != null) {
-	    report.setComments(comments);
-	    report.setMarks(marks);
+		IToolContentHandler toolContentHandler = getSbmtToolContentHandler();
+		SubmitFilesReport report = submitFilesReportDAO.getReportByID(reportIDGroup);
+		if (report != null) {
+		    report.setComments(comments);
+		    report.setMarks(marks);
 
-	    // If there is a new file, delete the existing and add the mark file
-	    if ((markFile != null) && !StringUtils.isEmpty(markFile.getFileName())) {
+		    // If there is a new file, delete the existing and add the mark file
+		    if ((markFile != null) && !StringUtils.isEmpty(markFile.getFileName())) {
 
-		// Delete the existing
-		if (report.getMarkFileUUID() != null) {
-		    toolContentHandler.deleteFile(report.getMarkFileUUID());
-		    report.setMarkFileName(null);
-		    report.setMarkFileUUID(null);
-		    report.setMarkFileVersionID(null);
-		}
+			// Delete the existing
+			if (report.getMarkFileUUID() != null) {
+			    toolContentHandler.deleteFile(report.getMarkFileUUID());
+			    report.setMarkFileName(null);
+			    report.setMarkFileUUID(null);
+			    report.setMarkFileVersionID(null);
+			}
 
-		// Add the new file
-		NodeKey nodeKey = this.processFile(markFile);
-		// NodeKey nodeKey = toolContentHandler.uploadFile(marksFileInputStream, marksFileName, null,
-		// IToolContentHandler.TYPE_ONLINE);
+			// Add the new file
+			NodeKey nodeKey = this.processFile(markFile);
+			// NodeKey nodeKey = toolContentHandler.uploadFile(marksFileInputStream, marksFileName, null,
+			// IToolContentHandler.TYPE_ONLINE);
 
-		report.setMarkFileName(markFile.getFileName());
-		report.setMarkFileUUID(nodeKey.getUuid());
-		report.setMarkFileVersionID(nodeKey.getVersion());
+			report.setMarkFileName(markFile.getFileName());
+			report.setMarkFileUUID(nodeKey.getUuid());
+			report.setMarkFileVersionID(nodeKey.getVersion());
+		    }
+
+		    submitFilesReportDAO.update(report);
+		}
+	    
 	    }
 
-	    submitFilesReportDAO.update(report);
 	}
+	else{
+        	IToolContentHandler toolContentHandler = getSbmtToolContentHandler();
+        	SubmitFilesReport report = submitFilesReportDAO.getReportByID(reportID);
+        	if (report != null) {
+        	    report.setComments(comments);
+        	    report.setMarks(marks);
+        
+        	    // If there is a new file, delete the existing and add the mark file
+        	    if ((markFile != null) && !StringUtils.isEmpty(markFile.getFileName())) {
+        
+        		// Delete the existing
+        		if (report.getMarkFileUUID() != null) {
+        		    toolContentHandler.deleteFile(report.getMarkFileUUID());
+        		    report.setMarkFileName(null);
+        		    report.setMarkFileUUID(null);
+        		    report.setMarkFileVersionID(null);
+        		}
+        
+        		// Add the new file
+        		NodeKey nodeKey = this.processFile(markFile);
+        		// NodeKey nodeKey = toolContentHandler.uploadFile(marksFileInputStream, marksFileName, null,
+        		// IToolContentHandler.TYPE_ONLINE);
+        
+        		report.setMarkFileName(markFile.getFileName());
+        		report.setMarkFileUUID(nodeKey.getUuid());
+        		report.setMarkFileVersionID(nodeKey.getVersion());
+        	    }
+        
+        	    submitFilesReportDAO.update(report);
+        	}
+	}
 
     }
 
@@ -1031,6 +1099,12 @@
     public List<StatisticDTO> getStatisticsBySession(final Long contentId) {
 	return submitUserDAO.getStatisticsBySession(contentId);
     }
+    
+    
+    @Override
+    public List<StatisticDTO> getLeaderStatisticsBySession(final Long contentId) {
+	return submitUserDAO.getLeaderStatisticsBySession(contentId);
+    }
 
     public SubmitUser createContentUser(Integer userId, String firstName, String lastName, String loginName,
 	    Long contentId) {
@@ -1180,6 +1254,11 @@
     public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
 	this.coreNotebookService = coreNotebookService;
     }
+    
+    
+    public IUserManagementService getUserManagementService() {
+   	return userManagementService;
+    }
 
     public void setUserManagementService(IUserManagementService userManagementService) {
 	this.userManagementService = userManagementService;
@@ -1283,6 +1362,7 @@
 	content.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
 	content.setLockOnFinished(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
 	content.setLimitUpload(JsonUtil.opt(toolContentJSON, "limitUpload", Boolean.FALSE));
+	content.setUseSelectLeaderToolOuput(JsonUtil.opt(toolContentJSON, "useSelectLeaderToolOuput", Boolean.FALSE));
 	content.setLimitUploadNumber(JsonUtil.opt(toolContentJSON, "limitUploadNumber", 0));
 	// submissionDeadline is set in monitoring
 
@@ -1295,5 +1375,71 @@
 	saveOrUpdateContent(content);
 
     }
+    
+    
+    @Override
+    public SubmitUser checkLeaderSelectToolForSessionLeader(SubmitUser user, Long toolSessionId) {
+	if ((user == null) || (toolSessionId == null)) {
+	    return null;
+	}
 
+	SubmitFilesSession submitFileSession = getSessionById(toolSessionId);
+
+	SubmitUser leader = submitFileSession.getGroupLeader();
+	// check leader select tool for a leader only in case QA tool doesn't know it. As otherwise it will screw
+	// up previous scratches done
+	if (leader == null) {
+
+	    Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getUserID().intValue());
+	    if (leaderUserId != null) {
+		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());
+		    String userName = leaderDto.getLogin();
+		    String fullName = leaderDto.getFirstName() + " " + leaderDto.getLastName();
+		  //  leader = new SubmitUser(leaderDto.getUserDTO(), submitFileSession);
+		    leader = new SubmitUser();		   	
+		    leader.setLogin(leaderDto.getLogin());
+		    leader.setFirstName(leaderDto.getFirstName());
+		    leader.setLastName(leaderDto.getLastName());
+		    leader.setUserID(leaderDto.getUserId());
+
+		    createUser(leader);
+		}
+
+		// set group leader
+		submitFileSession.setGroupLeader(leader);
+		submitFilesSessionDAO.saveObject(submitFileSession);
+	    }
+	}
+
+	return leader;
+    }
+    
+    @Override
+    public void createUser(SubmitUser submitUser) {
+	// make sure the user was not created in the meantime
+	SubmitUser user = submitUserDAO.getLearner(submitUser.getSessionID(), submitUser.getUserID());
+	if (user == null) {
+	    user = submitUser;
+	}
+	// Save it no matter if the user already exists.
+	// At checkLeaderSelectToolForSessionLeader() the user is added to session.
+	// Sometimes session save is earlier that user save in another thread, leading to an exception.
+	submitUserDAO.saveObject(user);
+    }
+    
+    
+    @Override
+    public boolean isUserGroupLeader(SubmitUser user, Long toolSessionId) {
+
+	SubmitFilesSession session = submitFilesSessionDAO.getSessionByID(toolSessionId);
+	SubmitUser groupLeader = session.getGroupLeader();
+
+	return (groupLeader != null) && user.getUserID().equals(groupLeader.getUserID());
+    }
+
+
 }
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesServiceProxy.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesServiceProxy.java	(.../SubmitFilesServiceProxy.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesServiceProxy.java	(.../SubmitFilesServiceProxy.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -27,6 +27,7 @@
 
 import javax.servlet.ServletContext;
 
+import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -52,5 +53,10 @@
 	WebApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
 	return context.getBean("submitFilesService");
     }
+    
+  
+    public static final ToolContentManager getSubmitFilesContentManager(ServletContext servletContext) {
+	return (ToolContentManager) SubmitFilesServiceProxy.getSubmitFilesService(servletContext);
+    }
 
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/AuthoringAction.java
===================================================================
diff -u -rf98151f6d4d6f66f3d8e482481aa198076133e71 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision f98151f6d4d6f66f3d8e482481aa198076133e71)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -199,6 +199,7 @@
 	content.setReflectInstructions(authForm.getReflectInstructions());
 	content.setReflectOnActivity(authForm.isReflectOnActivity());
 	content.setLimitUpload(authForm.isLimitUpload());
+	content.setUseSelectLeaderToolOuput(authForm.isUseSelectLeaderToolOuput());
 	content.setLimitUploadNumber(authForm.getLimitUploadNumber());
 	content.setNotifyLearnersOnMarkRelease(authForm.isNotifyLearnersOnMarkRelease());
 	content.setNotifyTeachersOnFileSubmit(authForm.isNotifyTeachersOnFileSubmit());
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java
===================================================================
diff -u -rf98151f6d4d6f66f3d8e482481aa198076133e71 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java	(.../LearnerAction.java)	(revision f98151f6d4d6f66f3d8e482481aa198076133e71)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java	(.../LearnerAction.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -30,6 +30,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import java.util.SortedMap;
 import java.util.TimeZone;
 
 import javax.servlet.ServletException;
@@ -51,6 +52,7 @@
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
@@ -130,6 +132,7 @@
 	}
 
 	ISubmitFilesService submitFilesService = getService();
+	ToolContentManager contentManager = getContentManager();
 	SubmitFilesSession session = submitFilesService.getSessionById(sessionID);
 	SubmitFilesContent content = session.getContent();
 
@@ -145,6 +148,7 @@
 	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
 	sessionMap.put(SbmtConstants.ATTR_FINISH_LOCK, lock);
 	sessionMap.put(SbmtConstants.ATTR_LOCK_ON_FINISH, content.isLockOnFinished());
+	sessionMap.put(SbmtConstants.ATTR_USE_SEL_LEADER, content.isUseSelectLeaderToolOuput());
 	sessionMap.put(SbmtConstants.ATTR_REFLECTION_ON, content.isReflectOnActivity());
 	sessionMap.put(SbmtConstants.ATTR_REFLECTION_INSTRUCTION, content.getReflectInstructions());
 	sessionMap.put(SbmtConstants.ATTR_TITLE, content.getTitle());
@@ -199,6 +203,61 @@
 		    IEventNotificationService.DELIVERY_METHOD_MAIL);
 	}
 
+	
+	SortedMap submittedFilesMap = submitFilesService.getFilesUploadedBySession(sessionID, request.getLocale());
+	System.out.println("Deadline coming soon 1>>"+content.isUseSelectLeaderToolOuput());
+	// support for leader select feature  
+            	SubmitUser groupLeader = content.isUseSelectLeaderToolOuput()
+			? submitFilesService.checkLeaderSelectToolForSessionLeader(learner, new Long(sessionID).longValue())
+			: null;
+	
+	if (content.isUseSelectLeaderToolOuput() && !mode.isTeacher()) {
+	    
+	 // forwards to the leaderSelection page
+	    if (groupLeader == null) {
+		List<SubmitUser> groupUsers = submitFilesService.getUsersBySession(new Long(sessionID).longValue());
+		request.setAttribute(SbmtConstants.ATTR_GROUP_USERS, groupUsers);
+		request.setAttribute(SbmtConstants.ATTR_SUBMIT_FILES, submittedFilesMap);
+		return mapping.findForward(SbmtConstants.WAIT_FOR_LEADER);
+	    }
+	    
+	    // forwards to the waitForLeader pages
+		boolean isNonLeader = !userID.equals(groupLeader.getUserID());	    
+
+		 if (isNonLeader && !learner.isFinished()) {
+		     List filesUploadedByLeader = submitFilesService.getFilesUploadedByUser(groupLeader.getUserID(), sessionID, request.getLocale(), false);
+
+			//show waitForLeaderLaunchTimeLimit page if the leader hasn't started activity or hasn't pressed OK button to launch time limit
+			if (filesUploadedByLeader == null ) {
+			    request.setAttribute(SbmtConstants.PARAM_WAITING_MESSAGE_KEY, "label.waiting.for.leader.launch.time.limit");
+			    return mapping.findForward(SbmtConstants.WAIT_FOR_LEADER_TIME_LIMIT);
+			}		
+			
+			//if the time is up and leader hasn't submitted response - show waitForLeaderFinish page
+			if ( !groupLeader.isFinished()) {
+			    request.setAttribute(SbmtConstants.PARAM_WAITING_MESSAGE_KEY, "label.waiting.for.leader.finish");
+			    return mapping.findForward(SbmtConstants.WAIT_FOR_LEADER_TIME_LIMIT);
+			}
+		    }
+		 
+		 // check if leader has submitted all answers
+		    if (groupLeader.isFinished()) {
+
+			submitFilesService.copyLearnerContent(groupLeader,learner);
+			filesUploaded = submitFilesService.getFilesUploadedByUser(learner.getUserID(), learner.getSessionID(), request.getLocale(), false);
+			setLearnerDTO(request, sessionMap, learner, filesUploaded, mode);
+		    }
+	}
+	
+	    sessionMap.put(SbmtConstants.ATTR_GROUP_LEADER, groupLeader);
+	    boolean isUserLeader = submitFilesService.isUserGroupLeader(learner, sessionID);
+	    sessionMap.put(SbmtConstants.ATTR_IS_USER_LEADER, isUserLeader);
+	    
+	    boolean hasEditRight = !content.isUseSelectLeaderToolOuput()
+			|| content.isUseSelectLeaderToolOuput() && isUserLeader;
+	   sessionMap.put(SbmtConstants.ATTR_HAS_EDIT_RIGHT, hasEditRight);
+
+	
 	return mapping.findForward(SbmtConstants.SUCCESS);
     }
 
@@ -330,6 +389,12 @@
 		.getSubmitFilesService(this.getServlet().getServletContext());
 	return submitFilesService;
     }
+    
+    private ToolContentManager getContentManager() {
+	ToolContentManager contentManager = SubmitFilesServiceProxy.
+		getSubmitFilesContentManager(this.getServlet().getServletContext());
+	return contentManager;
+    }
 
     // validate uploaded form
     private boolean validateUploadForm(LearnerForm learnerForm, HttpServletRequest request) {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java
===================================================================
diff -u -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java	(.../MarkAction.java)	(revision b67c428939ed96f08f56192d54b8ee55d8ab89d2)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java	(.../MarkAction.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -111,8 +111,8 @@
 	}
 
 	// Update the mark based on the form
-	submitFilesService.updateMarks(markForm.getReportID(), marks, comments, markForm.getMarkFile());
-
+	submitFilesService.updateMarks(markForm.getReportID(), marks, comments, markForm.getMarkFile(),markForm.getToolSessionID());
+	
 	// Return to the appropriate screen based upon the updateMode
 	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, markForm.getToolSessionID());
 	if (StringUtils.equals(markForm.getUpdateMode(), "listMark")) {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -186,7 +186,11 @@
 	JSONArray rows = new JSONArray();
 	JSONObject responsedata = new JSONObject();
 	responsedata.put("total_rows", service.getCountUsersBySession(sessionID, searchString));
-
+	SubmitUser groupLeader = new SubmitUser();
+	 if (spreadsheet.isUseSelectLeaderToolOuput()) {
+		SubmitFilesSession session = service.getSessionById(sessionID);
+		groupLeader = session.getGroupLeader();
+	 }
 	for (Object[] userAndReflection : users) {
 
 	    JSONObject responseRow = new JSONObject();
@@ -212,8 +216,9 @@
 	    if (userAndReflection.length > 5) {
 		responseRow.put(SbmtConstants.ATTR_USER_REFLECTION, userAndReflection[5]);
 	    }
-
-	    rows.put(responseRow);
+	    if(!spreadsheet.isUseSelectLeaderToolOuput()|| (spreadsheet.isUseSelectLeaderToolOuput() && groupLeader==user)){
+		rows.put(responseRow);
+	    }
 	}
 
 	responsedata.put("rows", rows);
@@ -244,8 +249,16 @@
 
     private void statistic(HttpServletRequest request, Long contentID) {
 	SortedSet<StatisticDTO> statistics = new TreeSet<StatisticDTO>(new StatisticComparator());
-	statistics.addAll(submitFilesService.getStatisticsBySession(contentID));
-	request.setAttribute("statisticList", statistics);
+	ISubmitFilesService service = getSubmitFilesService();
+	SubmitFilesContent spreadsheet = service.getSubmitFilesContent(contentID);
+	if (spreadsheet.isUseSelectLeaderToolOuput()) {
+	    statistics.addAll(submitFilesService.getLeaderStatisticsBySession(contentID));
+	    request.setAttribute("statisticList", statistics);
+	}
+	else{
+    	statistics.addAll(submitFilesService.getStatisticsBySession(contentID));
+    	request.setAttribute("statisticList", statistics);
+	}
     }
 
     /**
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/AuthoringForm.java
===================================================================
diff -u -rf98151f6d4d6f66f3d8e482481aa198076133e71 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/AuthoringForm.java	(.../AuthoringForm.java)	(revision f98151f6d4d6f66f3d8e482481aa198076133e71)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/AuthoringForm.java	(.../AuthoringForm.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -32,6 +32,8 @@
     // file and display fields
 
     private boolean limitUpload;
+    
+    private boolean useSelectLeaderToolOuput;
 
     private int limitUploadNumber;
 
@@ -46,6 +48,7 @@
     @Override
     public void reset(ActionMapping mapping, HttpServletRequest request) {
 	lockOnFinished = false;
+	useSelectLeaderToolOuput = false;
 	limitUpload = false;
 	reflectOnActivity = false;
 
@@ -61,7 +64,7 @@
 	title = content.getTitle();
 	instructions = content.getInstruction();
 	lockOnFinished = content.isLockOnFinished();
-
+	useSelectLeaderToolOuput = content.isUseSelectLeaderToolOuput();
 	limitUpload = content.isLimitUpload();
 	limitUploadNumber = content.getLimitUploadNumber();
 
@@ -177,4 +180,12 @@
     public void setNotifyTeachersOnFileSubmit(boolean notifyTeachersOnFileSubmit) {
 	this.notifyTeachersOnFileSubmit = notifyTeachersOnFileSubmit;
     }
+    
+    public boolean isUseSelectLeaderToolOuput() {
+   	return useSelectLeaderToolOuput;
+    }
+
+    public void setUseSelectLeaderToolOuput(boolean useSelectLeaderToolOuput) {
+   	this.useSelectLeaderToolOuput = useSelectLeaderToolOuput;
+    }
 }
Index: lams_tool_sbmt/web/WEB-INF/struts-config.xml
===================================================================
diff -u -rf98151f6d4d6f66f3d8e482481aa198076133e71 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision f98151f6d4d6f66f3d8e482481aa198076133e71)
+++ lams_tool_sbmt/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -114,6 +114,11 @@
         path="/learner/submissionDeadline.jsp"
         redirect="false"
       />
+      <forward
+        name="waitForLeaderTimeLimit"
+        path="/learner/waitForLeaderTimeLimit.jsp"
+        redirect="false"
+      />
     </action>
     <action
       path="/pedagogicalPlanner"
Index: lams_tool_sbmt/web/authoring/advance.jsp
===================================================================
diff -u -red5aa531a1b645392cb8fcb2fad507065ddb0227 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision ed5aa531a1b645392cb8fcb2fad507065ddb0227)
+++ lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -17,6 +17,15 @@
 	});
 </script>
 
+<lams:SimplePanel titleKey="label.select.leader">
+<div class="checkbox">
+	<label for="useSelectLeaderToolOuput">
+		<html:checkbox property="useSelectLeaderToolOuput" value="1" styleId="useSelectLeaderToolOuput"/>
+		<fmt:message key="label.use.select.leader.tool.output" />
+	</label>
+</div>
+</lams:SimplePanel>
+
 <lams:SimplePanel titleKey="label.file.options">
 <div class="checkbox">
 	<label for="limitUpload">
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -ra71bf2630935c6bc8b907ca22801208a2d3bd657 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision a71bf2630935c6bc8b907ca22801208a2d3bd657)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -7,7 +7,9 @@
 <c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING"><%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE))%></c:set>
 <c:set var="EXE_FILE_TYPES"><%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%></c:set>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-
+<c:set var="isUserLeader" value="${sessionMap.isUserLeader}"/>
+<c:set var="isLeadershipEnabled" value="${sessionMap.useSelectLeaderToolOuput}"/>
+<c:set var="hasEditRight" value="${sessionMap.hasEditRight}"/>
 <lams:html>
 <lams:head>
 	<title><fmt:message key="tool.display.name" /></title>
@@ -126,7 +128,7 @@
 		</div>
 
 		<!-- notices and announcements -->
-		<c:if test="${sessionMap.mode == 'author' || sessionMap.mode == 'learner'}">
+		<c:if test="${(sessionMap.mode == 'author' || sessionMap.mode == 'learner') && hasEditRight}">
 			<c:if test="${sessionMap.lockOnFinish}">
 				<!--  Lock when finished -->
 				<lams:Alert id="lockWhenFinished" type="info" close="true">
@@ -171,8 +173,7 @@
 
 		<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
 		<c:choose>
-
-			<c:when test="${empty learner.filesUploaded}">
+			<c:when test="${empty learner.filesUploaded && hasEditRight}">
 				<div class="alert">
 					<fmt:message key="label.learner.noUpload" />
 				</div>
@@ -200,7 +201,7 @@
 								</c:set>
 								</td>
 								<td>
-								<c:if test="${empty file.marks}">
+								<c:if test="${empty file.marks && hasEditRight}">
 								 <html:link href="javascript:deleteLearnerFile(${file.submissionID});" styleClass="btn btn-default btn-disable-on-submit pull-right">
 					                      <i class="fa fa-trash" title="<fmt:message key="label.monitoring.original.learner.file.delete" />"></i> <span class="hidden-xs"></span>
 				                 </html:link>
@@ -282,7 +283,7 @@
 			<!-- now check if the user is (finished + lockedWhenFinished) or no more files allowed -->
 			<c:set var="displayForm" value="${sessionMap.finishLock || sessionMap.arriveLimit}" />
 
-			<c:if test="${!displayForm}">
+			<c:if test="${!displayForm && hasEditRight}">
 
 				<html:form action="/learner?method=uploadFile" method="post" enctype="multipart/form-data" onsubmit="return validate();" >
 					<html:hidden property="sessionMapID" />
@@ -311,10 +312,12 @@
 							</div>
 							<p class="help-block"><small><fmt:message key="errors.required"><fmt:param>*</fmt:param></fmt:message></small></p>
 							<div class="form-group">
-								<button id="uploadButton" type="submit" <c:if test="${sessionMap.finishLock || sessionMap.arriveLimit}">disabled="disabled"</c:if>
-									class="btn btn-sm btn-default btn-primary btn-disable-on-submit">
-									<i class="fa fa-xs fa-plus"></i> <fmt:message key="label.add" />
-								</button>
+								<c:if test="${hasEditRight}">											
+									<button id="uploadButton" type="submit" <c:if test="${sessionMap.finishLock || sessionMap.arriveLimit}">disabled="disabled"</c:if>
+										class="btn btn-sm btn-default btn-primary btn-disable-on-submit">
+										<i class="fa fa-xs fa-plus"></i> <fmt:message key="label.add" />
+									</button>
+								</c:if>
 							</div>
 						</div>
 					</div>
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -221,6 +221,23 @@
 <table class="table table-striped table-condensed">
 	<tr>
 		<td>
+			<fmt:message key="label.use.select.leader.tool.output" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${authoring.useSelectLeaderToolOuput}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+		
+	<tr>
+		<td>
 			<fmt:message key="label.authoring.advance.lock.on.finished" />
 		</td>