Index: lams_tool_assessment/db/sql/create_lams_tool_assessment.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/db/sql/create_lams_tool_assessment.sql,v
diff -u -r1.20 -r1.21
--- lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	3 Oct 2011 13:51:48 -0000	1.20
+++ lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	7 Dec 2011 19:23:59 -0000	1.21
@@ -30,6 +30,7 @@
    run_offline tinyint,
    time_limit integer DEFAULT 0,
    attempts_allowed integer DEFAULT 1,
+   passing_mark integer DEFAULT 0,
    instructions text,
    online_instructions text,
    offline_instructions text,
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java,v
diff -u -r1.19 -r1.20
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	3 Oct 2011 13:51:48 -0000	1.19
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	7 Dec 2011 19:23:59 -0000	1.20
@@ -198,6 +198,8 @@
     
     public static final String ATTR_IS_RESUBMIT_ALLOWED = "isResubmitAllowed";
     
+    public static final String ATTR_IS_USER_FAILED = "isUserFailed";
+    
     public static final String ATTR_FINISHED_LOCK = "finishedLock";
     
     public static final String ATTR_USER = "user";
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql,v
diff -u -r1.4 -r1.5
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql	3 Oct 2011 13:51:48 -0000	1.4
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql	7 Dec 2011 19:23:59 -0000	1.5
@@ -24,6 +24,9 @@
    primary key (uid)
 )type=innodb;
 
+-- LDEV-2717 Add passing mark feature to assessment tool
+ALTER TABLE tl_laasse10_assessment ADD COLUMN passing_mark integer DEFAULT 0;
+
 ----------------------Put all sql statements above here-------------------------
 
 -- If there were no errors, commit and restore autocommit to on
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Attic/Assessment.hbm.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml	3 Oct 2011 13:51:47 -0000	1.7
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml	7 Dec 2011 19:23:59 -0000	1.8
@@ -284,6 +284,14 @@
         />
 
         <property
+            name="passingMark"
+            type="int"
+            update="true"
+            insert="true"
+            column="passing_mark"
+        />
+
+        <property
             name="shuffled"
             type="boolean"
             update="true"
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java,v
diff -u -r1.10 -r1.11
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	3 Oct 2011 13:51:47 -0000	1.10
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	7 Dec 2011 19:23:59 -0000	1.11
@@ -67,6 +67,8 @@
     
     private int attemptsAllowed;
     
+    private int passingMark;
+    
     private boolean runOffline;
 
     private boolean shuffled;
@@ -690,6 +692,20 @@
     public void setAttemptsAllowed(int attemptsAllowed) {
 	this.attemptsAllowed = attemptsAllowed;
     }
+    
+    /**
+     * passing mark based on which we decide either user has failed or passed
+     * 
+     * @hibernate.property column="passing_mark"
+     * @return
+     */
+    public int getPassingMark() {
+	return passingMark;
+    }
+    
+    public void setPassingMark(int passingMark) {
+	this.passingMark = passingMark;
+    }
 
     /**
      * @hibernate.property column="shuffled"
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java,v
diff -u -r1.13 -r1.14
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	3 Oct 2011 13:51:47 -0000	1.13
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	7 Dec 2011 19:23:59 -0000	1.14
@@ -56,6 +56,9 @@
     
     private int sequenceId;
 
+    /**
+     * Default grade set in author.
+     */
     private int defaultGrade;
     
     private float penaltyFactor;
@@ -99,6 +102,11 @@
     
     private String questionFeedback;
     
+    /**
+     * Grade acquired from QUestionReference in learner.
+     */
+    private int grade;
+    
     private float mark;
     
     private float penalty;
@@ -258,6 +266,8 @@
     }
 
     /**
+     * Default grade set in author. To be used only in author
+     * 
      * @hibernate.property column="default_grade"
      * 
      * @return
@@ -266,6 +276,9 @@
 	return defaultGrade;
     }
 
+    /**
+     * @param defaultGrade Default grade set in author. To be used only in author
+     */
     public void setDefaultGrade(int defaultGrade) {
 	this.defaultGrade = defaultGrade;
     }
@@ -493,6 +506,20 @@
 	return questionFeedback;
     }
     
+    /**
+     * @return Grade acquired from QUestionReference in learner.
+     */
+    public int getGrade() {
+	return grade;
+    }
+    
+    /**
+     * @param grade Grade acquired from QUestionReference in learner.
+     */
+    public void setGrade(int grade) {
+	this.grade = grade;
+    }
+    
     public Float getMark() {
 	return mark;
     }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java,v
diff -u -r1.3 -r1.4
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java	17 Mar 2009 22:40:48 -0000	1.3
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java	7 Dec 2011 19:23:59 -0000	1.4
@@ -142,13 +142,20 @@
     }
     
     /**
+     * Overall assessment grade (incl all penalties)
+     * 
      * @hibernate.property column="grade"
      * @return
      */
     public float getGrade() {
 	return grade;
     }
 
+    /**
+     * Overall assessment grade (incl all penalties)
+     * 
+     * @param grade
+     */
     public void setGrade(float grade) {
 	this.grade = grade;
     }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java,v
diff -u -r1.23 -r1.24
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	3 Oct 2011 13:51:48 -0000	1.23
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	7 Dec 2011 19:23:59 -0000	1.24
@@ -354,7 +354,7 @@
 		AssessmentQuestionResult processedAnswer = this.processUserAnswer(question, numberWrongAnswers);
 		questionResultList.add(processedAnswer);
 
-		maximumGrade += question.getDefaultGrade();
+		maximumGrade += question.getGrade();
 		grade += processedAnswer.getMark();
 	    }
 	}
@@ -389,7 +389,7 @@
 	questionResult.setFinishDate(new Date());
 
 	float mark = 0;
-	float maxMark = question.getDefaultGrade();
+	float maxMark = question.getGrade();
 	if (question.getType() == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE) {
 	    for (AssessmentQuestionOption option : question.getQuestionOptions()) {
 		if (option.getAnswerBoolean()) {
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java,v
diff -u -r1.20 -r1.21
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	3 Oct 2011 13:51:48 -0000	1.20
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	7 Dec 2011 19:23:59 -0000	1.21
@@ -240,6 +240,8 @@
 	    if (question.getCreateBy() != null) {
 		question.getCreateBy().getLoginName();
 	    }
+	    question.setGrade(questionReference.getDefaultGrade());
+	    
 	    questionList.add(question);
 	}
 
@@ -352,18 +354,23 @@
 	processUserAnswers(sessionMap);
 	loadupResultMarks(sessionMap);
 	
-	Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 	Assessment assessment = (Assessment) sessionMap.get(AssessmentConstants.ATTR_ASSESSMENT);
+	//calculate whether isResubmitAllowed
 	IAssessmentService service = getAssessmentService();
 	HttpSession ss = SessionManager.getSession();
 	UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	Long userID = new Long(userDTO.getUserID().longValue());
-	//AssessmentUser user = service.getUserByIDAndSession(userID, toolSessionId);
 	int dbResultCount = service.getAssessmentResultCount(assessment.getUid(), userID);
 	int attemptsAllowed = assessment.getAttemptsAllowed();
-	boolean isResubmitAllowed = ((attemptsAllowed > dbResultCount) | (attemptsAllowed == 0));// && !user.isSessionFinished();
+	boolean isResubmitAllowed = ((attemptsAllowed > dbResultCount) | (attemptsAllowed == 0));
 	sessionMap.put(AssessmentConstants.ATTR_IS_RESUBMIT_ALLOWED, isResubmitAllowed);
 	
+	//calculate whether isUserFailed
+	AssessmentResult result = (AssessmentResult) sessionMap.get(AssessmentConstants.ATTR_ASSESSMENT_RESULT);
+	int passingMark = assessment.getPassingMark();
+	boolean isUserFailed = ((passingMark != 0) && (passingMark > result.getGrade()));
+	request.setAttribute(AssessmentConstants.ATTR_IS_USER_FAILED, isUserFailed);
+	
 	sessionMap.put(AssessmentConstants.ATTR_FINISHED_LOCK, true);
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
Index: lams_tool_assessment/web/pages/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/advance.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_assessment/web/pages/authoring/advance.jsp	2 Jun 2011 04:18:30 -0000	1.4
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	7 Dec 2011 19:23:59 -0000	1.5
@@ -1,6 +1,26 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
+<script lang="javascript">
+	$(document).ready(function(){
+		$("#attemptsAllowedRadio").click(function() {
+			$("#passingMark").val("0");
+			$("#passingMark").attr("disabled", "disabled");
+			$("#attemptsAllowed").attr("disabled", "");
+		});
+		
+		$("#passingMarkRadio").click(function() {
+			$("#attemptsAllowed").val("0");
+			$("#attemptsAllowed").attr("disabled", "disabled");
+			$("#passingMark").attr("disabled", "");
+		});
+		
+		<c:if test="${formBean.assessment.passingMark == 0}">$("#passingMark").attr("disabled", "disabled");</c:if>
+		<c:if test="${formBean.assessment.passingMark > 0}">$("#attemptsAllowed").attr("disabled", "disabled");</c:if>
+	});
+
+</script>
+
 <!-- Advance Tab Content -->
 <p class="small-space-top">
 	<html:text property="assessment.timeLimit" size="3" styleId="timeLimit"></html:text>
@@ -35,7 +55,17 @@
 </p>
 
 <p>
-	<html:select property="assessment.attemptsAllowed" >
+	<label>
+		<fmt:message key="label.authoring.advance.choose.restriction" />
+	</label>
+	<br><br>
+	
+	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+	<input type="radio" name="isAttemptsChosen" value="${true}" id="attemptsAllowedRadio"
+		<c:if test="${formBean.assessment.passingMark == 0}">checked="checked"</c:if> 
+	/>
+	<fmt:message key="label.authoring.advance.attempts.allowed" />
+	<html:select property="assessment.attemptsAllowed" styleId="attemptsAllowed" >
 		<html:option value="0"><fmt:message key="label.authoring.advance.unlimited" /></html:option>
 		<html:option value="6">6</html:option>
 		<html:option value="5">5</html:option>
@@ -44,7 +74,16 @@
 		<html:option value="2">2</html:option>
 		<html:option value="1">1</html:option>
 	</html:select>
-	<fmt:message key="label.authoring.advance.attempts.allowed" />
+	<br><br>
+	
+	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+	<input type="radio" name="isAttemptsChosen" value="${false}" id="passingMarkRadio"	
+		<c:if test="${formBean.assessment.passingMark > 0}">checked="checked"</c:if> 
+	/>
+	<fmt:message key="label.authoring.advance.passing.mark" />
+	<html:select property="assessment.passingMark" styleId="passingMark" >
+	</html:select>
+	
 </p>
 
 <p>
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/basic.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_assessment/web/pages/authoring/basic.jsp	3 Oct 2011 13:51:47 -0000	1.11
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	7 Dec 2011 19:23:59 -0000	1.12
@@ -6,6 +6,10 @@
 </c:url>	
 
 <script lang="javascript">
+	$(document).ready(function(){
+		reinitializePassingMarkSelect(true);
+	});
+
 	//The panel of assessment list panel
 	var questionListTargetDiv = "#questionListArea";
 	function deleteQuestion(idx){
@@ -21,6 +25,7 @@
 					referenceGrades: serializeReferenceGrades()
 				},
 				function(){
+					reinitializePassingMarkSelect(false);
 					refreshThickbox();
 				}
 			);
@@ -39,6 +44,7 @@
 					referenceGrades: serializeReferenceGrades()
 				},
 				function(){
+					reinitializePassingMarkSelect(false);
 					refreshThickbox();
 				}
 		);
@@ -53,6 +59,7 @@
 				referenceGrades: serializeReferenceGrades()
 			},
 			function(){
+				reinitializePassingMarkSelect(false);
 				refreshThickbox();
 			}
 		);
@@ -128,6 +135,21 @@
 		imgLoader = new Image();// preload image
 		imgLoader.src = tb_pathToImage;
 	};
+	function reinitializePassingMarkSelect(isPageFresh){
+		var oldValue = (isPageFresh) ? "${formBean.assessment.passingMark}" : $("#passingMark").val();
+		$('#passingMark').empty();
+		$('#passingMark').append( new Option("<fmt:message key='label.authoring.advance.passing.mark.none' />",0) );
+		
+		var maxGrade = 0;
+		$("[name^=grade]").each(function() {
+			maxGrade += eval(this.value);
+		});
+		
+		for (var i = 1; i<=maxGrade; i++) {
+			var isSelected = (oldValue == i);
+		    $('#passingMark').append( new Option(i,i,isSelected) );
+		}
+	};	
 
 
 </script>
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/learning.jsp,v
diff -u -r1.17 -r1.18
--- lams_tool_assessment/web/pages/learning/learning.jsp	2 Jun 2011 04:18:30 -0000	1.17
+++ lams_tool_assessment/web/pages/learning/learning.jsp	7 Dec 2011 19:23:59 -0000	1.18
@@ -162,6 +162,14 @@
 			</div>
 		</c:if>
 		
+		<c:if test="${isUserFailed}">
+			<div class="warning">
+				<fmt:message key="label.learning.havent.reached.passing.mark">
+					<fmt:param>${assessment.passingMark}</fmt:param>
+				</fmt:message>
+			</div>
+		</c:if>
+		
 		<div id="question" style="display:none; cursor: default"> 
 	        <h1 style="padding: 30 10 50">
 	        	<fmt:message key='label.learning.blockui.are.you.ready' />
@@ -196,10 +204,12 @@
 							<html:link href="javascript:;" property="resubmit" onclick="return resubmit()" styleClass="button">
 								<fmt:message key="label.learning.resubmit" />
 							</html:link>						
-						</c:if>					
-						<html:link href="#" property="FinishButton" onclick="return finishSession()" styleClass="button">
-							<span class="nextActivity"><fmt:message key="label.learning.next.activity" /></span>
-						</html:link>
+						</c:if>	
+						<c:if test="${! isUserFailed}">				
+							<html:link href="#" property="FinishButton" onclick="return finishSession()" styleClass="button">
+								<span class="nextActivity"><fmt:message key="label.learning.next.activity" /></span>
+							</html:link>
+						</c:if>
 					</c:otherwise>
 				</c:choose>
 			</div>
Index: lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	18 May 2011 18:48:24 -0000	1.3
+++ lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	7 Dec 2011 19:23:59 -0000	1.4
@@ -55,6 +55,23 @@
 	
 	<tr>
 		<td>
+			<fmt:message key="label.authoring.advance.passing.mark" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${assessment.passingMark == 0}">
+					-
+				</c:when>
+				<c:otherwise>
+					${assessment.passingMark}
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
 			<fmt:message key="label.authoring.advance.allow.students.overall.feedback" />
 		</td>