Index: lams_tool_lamc/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.8 -r1.9
--- lams_tool_lamc/conf/language/ApplicationResources.properties	17 Jun 2006 22:42:19 -0000	1.8
+++ lams_tool_lamc/conf/language/ApplicationResources.properties	19 Jun 2006 23:03:40 -0000	1.9
@@ -235,8 +235,6 @@
 label.export.teacher =Portfolio Export for Teacher
 label.candidateAnswer =Candidate Answer
 label.learning.forceFinishMessage  =Responses are no more allowed. Please finish.
-label.openPar  =(
-label.closePar  =)
 label.correct =correct
 label.passingMark =Passing Mark:
 label.mcqSummary =MCQ Summary
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java,v
diff -u -r1.16 -r1.17
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java	16 Jun 2006 20:56:38 -0000	1.16
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java	19 Jun 2006 23:03:40 -0000	1.17
@@ -42,7 +42,8 @@
 public class McOptionsContentDAO extends HibernateDaoSupport implements IMcOptionsContentDAO {
 	 	static Logger logger = Logger.getLogger(McOptionsContentDAO.class.getName());
 	 	
-	 	private static final String FIND_MC_OPTIONS_CONTENT = "from " + McOptsContent.class.getName() + " as mco where mc_que_content_id=?";
+	 	//private static final String FIND_MC_OPTIONS_CONTENT = "from " + McOptsContent.class.getName() + " as mco where mc_que_content_id=?";
+	 	private static final String FIND_MC_OPTIONS_CONTENT = "from mcOptsContent in class McOptsContent where mcOptsContent.mcQueContentId=:mcQueContentUid order by mcOptsContent.uid";
 	 	
 	 	private static final String LOAD_OPTION_CONTENT_BY_OPTION_TEXT = "from mcOptsContent in class McOptsContent where mcOptsContent.mcQueOptionText=:option and mcOptsContent.mcQueContentId=:mcQueContentUid";
 	 	
@@ -62,7 +63,7 @@
 			HibernateTemplate templ = this.getHibernateTemplate();
 			if ( mcQueContentId != null) {
 				List list = getSession().createQuery(FIND_MC_OPTIONS_CONTENT)
-					.setLong(0,mcQueContentId.longValue())
+					.setLong("mcQueContentUid",mcQueContentId.longValue())
 					.list();
 				return list;
 			}
@@ -77,7 +78,7 @@
 			HibernateTemplate templ = this.getHibernateTemplate();
 			if ( mcQueContentId != null) {
 				List list = getSession().createQuery(FIND_MC_OPTIONS_CONTENT)
-					.setLong(0,mcQueContentId.longValue())
+					.setLong("mcQueContentUid",mcQueContentId.longValue())					
 					.list();
 				
 				if(list != null && list.size() > 0){
@@ -100,7 +101,7 @@
 			HibernateTemplate templ = this.getHibernateTemplate();
 			if ( mcQueContentId != null) {
 				List list = getSession().createQuery(FIND_MC_OPTIONS_CONTENT)
-					.setLong(0,mcQueContentId.longValue())
+					.setLong("mcQueContentUid",mcQueContentId.longValue())
 					.list();
 				
 				if(list != null && list.size() > 0){
@@ -127,7 +128,7 @@
 			HibernateTemplate templ = this.getHibernateTemplate();
 			if ( mcQueContentId != null) {
 				List list = getSession().createQuery(FIND_MC_OPTIONS_CONTENT)
-					.setLong(0,mcQueContentId.longValue())
+					.setLong("mcQueContentUid",mcQueContentId.longValue())
 					.list();
 				
 				if(list != null && list.size() > 0){
@@ -202,7 +203,7 @@
 	    {
 			HibernateTemplate templ = this.getHibernateTemplate();
 			List list = getSession().createQuery(FIND_MC_OPTIONS_CONTENT)
-				.setLong(0,mcQueContentId.longValue())
+				.setLong("mcQueContentUid",mcQueContentId.longValue())
 				.list();
 
 			if(list != null && list.size() > 0){
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java,v
diff -u -r1.16 -r1.17
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java	19 Jun 2006 15:09:53 -0000	1.16
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java	19 Jun 2006 23:03:40 -0000	1.17
@@ -320,7 +320,7 @@
 	    			if (!mcSession.getMcContent().isRetries())
 	    			{
 	    			    logger.debug("retries is OFF.");
-	    			    boolean attemptCorrect=false;
+	    			    boolean isAttemptCorrect=false;
 	    			    McUsrAttempt mcUsrAttemptUser=null;
 	    			    
 		    			while (itAttempts.hasNext())
@@ -333,17 +333,27 @@
 		    	    		{
 		    	    		    if (mcUsrAttempt.isAttemptCorrect())
 		    	    		    {
-		    	    		        attemptCorrect=true;
+		    	    		        isAttemptCorrect=true;
 		    	    		    }
 		    	    		}
 		    			}
-		    			logger.debug("final attemptCorrect: " + attemptCorrect);
+		    			logger.debug("final isAttemptCorrect: " + isAttemptCorrect);
+		    			logger.debug("mcUsrAttemptUser: " + mcUsrAttemptUser);
+		    			
 	    			    McMonitoredUserDTO mcMonitoredUserDTO = new McMonitoredUserDTO();
-	    			    mcMonitoredUserDTO.setUid(mcUsrAttemptUser.getUid().toString());
     	    			mcMonitoredUserDTO.setUserName(mcQueUsr.getFullname());
     	    			mcMonitoredUserDTO.setSessionId(sessionId.toString());
     	    			mcMonitoredUserDTO.setQuestionUid(questionUid);
     	    			
+	    				if (isAttemptCorrect)
+	    				{
+		    			    mcMonitoredUserDTO.setMark(mcUsrAttemptUser.getMcQueContent().getWeight().toString());
+	    				}
+	    				else
+	    				{
+	    				    mcMonitoredUserDTO.setMark("0");
+	    				}
+		    			
 		    			logger.debug("final constructed mcMonitoredUserDTO: " + mcMonitoredUserDTO);
     	    			listMonitoredUserContainerDTO.add(mcMonitoredUserDTO);
 	    			}
@@ -387,61 +397,7 @@
 	    			    
 	    			    logger.debug("final constructed mcMonitoredUserDTO: " + mcMonitoredUserDTO);
 	    			    listMonitoredUserContainerDTO.add(mcMonitoredUserDTO);
-
 	    			    
-	    			    /*
-	    			    McUsrAttempt mcUsrAttempt=getAttemptWithHighestOrder(listUserAttempts);
-	    			    logger.debug("attempt with highest attempt order, mcUsrAttempt: " + mcUsrAttempt);
-	    			    if (mcUsrAttempt != null)
-	    			    {
-	    			        Integer IntegerPassmark=mcUsrAttempt.getMcOptionsContent().getMcQueContent().getMcContent().getPassMark();
-	    			        logger.debug("IntegerPassmark: " + IntegerPassmark);
-	    			        if ((IntegerPassmark != null) && (IntegerPassmark.intValue() >= 0))
-	    			        {
-	    			            logger.debug("pasmark is defined: ");
-		    			        if (mcUsrAttempt.isPassed())
-		    			        {
-		    			            logger.debug("user has passed the activity");
-				    			    McMonitoredUserDTO mcMonitoredUserDTO = new McMonitoredUserDTO();
-				    			    mcMonitoredUserDTO.setMark(mcUsrAttempt.getMcQueContent().getWeight().toString());
-				    			    mcMonitoredUserDTO.setUserName(mcQueUsr.getFullname());
-				    			    mcMonitoredUserDTO.setUid(mcUsrAttempt.getUid().toString());
-				    			    mcMonitoredUserDTO.setSessionId(sessionId.toString());
-				    			    mcMonitoredUserDTO.setQuestionUid(questionUid);
-				    			    
-				    			    logger.debug("final constructed mcMonitoredUserDTO: " + mcMonitoredUserDTO);
-				    			    listMonitoredUserContainerDTO.add(mcMonitoredUserDTO);
-		    			        }
-		    			        else 
-		    			        {
-		    			            logger.debug("user did not finish the the activity yet");
-				    			    McMonitoredUserDTO mcMonitoredUserDTO = new McMonitoredUserDTO();
-				    			    mcMonitoredUserDTO.setMark("Learner still responding...");
-				    			    mcMonitoredUserDTO.setUserName(mcQueUsr.getFullname());
-				    			    mcMonitoredUserDTO.setUid(mcUsrAttempt.getUid().toString());
-				    			    mcMonitoredUserDTO.setSessionId(sessionId.toString());
-				    			    mcMonitoredUserDTO.setQuestionUid(questionUid);
-				    			    
-				    			    logger.debug("final constructed mcMonitoredUserDTO: " + mcMonitoredUserDTO);
-				    			    listMonitoredUserContainerDTO.add(mcMonitoredUserDTO);
-		    			        }
-	    			        }
-	    			        else
-	    			        {
-	    			            logger.debug("pasmark is Undefined: ");
-	    			            logger.debug("pupulate user marks as if user has passed");
-			    			    McMonitoredUserDTO mcMonitoredUserDTO = new McMonitoredUserDTO();
-			    			    mcMonitoredUserDTO.setMark(mcUsrAttempt.getMcQueContent().getWeight().toString());
-			    			    mcMonitoredUserDTO.setUserName(mcQueUsr.getFullname());
-			    			    mcMonitoredUserDTO.setUid(mcUsrAttempt.getUid().toString());
-			    			    mcMonitoredUserDTO.setSessionId(sessionId.toString());
-			    			    mcMonitoredUserDTO.setQuestionUid(questionUid);
-			    			    
-			    			    logger.debug("final constructed mcMonitoredUserDTO: " + mcMonitoredUserDTO);
-			    			    listMonitoredUserContainerDTO.add(mcMonitoredUserDTO);
-	    			        }
-	    			    }
-	    			    */	    			    
 	    			}
 	    		}
 			}
Index: lams_tool_lamc/web/monitoring/Summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/Summary.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/web/monitoring/Summary.jsp	17 Jun 2006 22:42:19 -0000	1.2
+++ lams_tool_lamc/web/monitoring/Summary.jsp	19 Jun 2006 23:03:40 -0000	1.3
@@ -101,8 +101,8 @@
 						<tr>			
 							<td NOWRAP valign=top align=left><b> <font size=2> <bean:message key="label.question.col"/> </b>
 							<font size=2>
-								<c:out value="${currentDto.question}"/> &nbsp <bean:message key="label.openPar"/> <bean:message key="label.weight"/> 
-								<c:out value="${currentDto.weight}"/>  <bean:message key="label.percent"/><bean:message key="label.closePar"/>
+								<c:out value="${currentDto.question}"/> &nbsp ( <bean:message key="label.weight"/> 
+								<c:out value="${currentDto.weight}"/>  <bean:message key="label.percent"/> )
 							</font> </td>
 						</tr>	
 						<tr>					
@@ -115,9 +115,7 @@
 												<c:out value="${answersData.candidateAnswer}"/> 
 												
 												<c:if test="${answersData.correct == 'true'}"> 		
-													&nbsp <bean:message key="label.openPar"/>
-													<bean:message key="label.correct"/>
-													<bean:message key="label.closePar"/>
+													&nbsp ( <bean:message key="label.correct"/> )
 												</c:if>																		
 												</font>
 											</td>	
@@ -153,8 +151,8 @@
 						<tr>			
 							<td NOWRAP valign=top align=left><b> <font size=2> <bean:message key="label.question.col"/> </b>
 							<font size=2>
-								<c:out value="${currentDto.question}"/> &nbsp <bean:message key="label.openPar"/> <bean:message key="label.weight"/> 
-								<c:out value="${currentDto.weight}"/>  <bean:message key="label.percent"/><bean:message key="label.closePar"/>
+								<c:out value="${currentDto.question}"/> &nbsp ( <bean:message key="label.weight"/> 
+								<c:out value="${currentDto.weight}"/>  <bean:message key="label.percent"/> )
 							</font> </td>
 						</tr>	
 
@@ -211,8 +209,7 @@
 
 					<tr>			
 						<td NOWRAP valign=top align=left><b> <font size=2> <bean:message key="label.total"/> 
-									<bean:message key="label.openPar"/> <bean:message key="label.percent"/> 
-									<bean:message key="label.closePar"/>
+										( <bean:message key="label.percent"/> )
 									</b>
 						</font> </td>
 					</tr>