Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -re4b2a3cbdfdd26b99ead9b77705faa5a333d326e
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java (.../IMcUsrAttemptDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java (.../IMcUsrAttemptDAO.java) (revision e4b2a3cbdfdd26b99ead9b77705faa5a333d326e)
@@ -24,6 +24,7 @@
import java.util.List;
+import org.lamsfoundation.lams.tool.mc.pojos.McContent;
import org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt;
@@ -143,6 +144,8 @@
public boolean getUserAttemptCorrectForQuestionContentAndSessionUid(final Long queUsrUid, final Long mcQueContentId, final Long mcSessionUid, final Integer attemptOrder);
public List getMarks();
+
+ public List getMarksForContent(McContent mcContent);
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -re4b2a3cbdfdd26b99ead9b77705faa5a333d326e
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java (.../McUsrAttemptDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java (.../McUsrAttemptDAO.java) (revision e4b2a3cbdfdd26b99ead9b77705faa5a333d326e)
@@ -29,6 +29,7 @@
import org.apache.log4j.Logger;
import org.hibernate.FlushMode;
import org.lamsfoundation.lams.tool.mc.dao.IMcUsrAttemptDAO;
+import org.lamsfoundation.lams.tool.mc.pojos.McContent;
import org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt;
import org.springframework.orm.hibernate3.HibernateTemplate;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
@@ -89,6 +90,38 @@
return list;
}
+
+ public List getMarksForContent(McContent mcContent)
+ {
+ logger.debug("running getMarksForContent for mcContent:" + mcContent);
+ logger.debug("running getMarksForContent for mcContent uid :" + mcContent.getUid());
+
+ HibernateTemplate templ = this.getHibernateTemplate();
+ List list = getSession().createQuery(LOAD_MARK)
+ .list();
+
+ List userEntries= new ArrayList();
+
+ if(list != null && list.size() > 0){
+ Iterator listIterator=list.iterator();
+ while (listIterator.hasNext())
+ {
+ McUsrAttempt attempt=(McUsrAttempt)listIterator.next();
+ logger.debug("attempt:" + attempt);
+ logger.debug("attempt content uid:" + attempt.getMcQueContent().getMcContent().getUid());
+
+ if (attempt.getMcQueContent().getMcContent().getUid() == mcContent.getUid())
+ {
+ logger.debug("same content found:" + mcContent);
+ userEntries.add(attempt);
+ }
+ }
+ }
+
+ logger.debug("returning userEntries:" + userEntries);
+ return userEntries;
+ }
+
public List getHighestAttemptOrder(Long queUsrId)
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
===================================================================
diff -u -r8522cd628329e0031e21b48f2750b1fd9b1842a6 -re4b2a3cbdfdd26b99ead9b77705faa5a333d326e
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision 8522cd628329e0031e21b48f2750b1fd9b1842a6)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision e4b2a3cbdfdd26b99ead9b77705faa5a333d326e)
@@ -285,7 +285,9 @@
public void removeFile(Long submissionId) throws McApplicationException;
- public List retrieveMcUploadedFiles(McContent mc) throws McApplicationException;
+ public List retrieveMcUploadedFiles(McContent mcContent) throws McApplicationException;
+ public List getMarksForContent(McContent mcContent) throws McApplicationException;
+
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -r40632908af1b31e1af4f1607b0ee4031ab098a84 -re4b2a3cbdfdd26b99ead9b77705faa5a333d326e
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 40632908af1b31e1af4f1607b0ee4031ab098a84)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision e4b2a3cbdfdd26b99ead9b77705faa5a333d326e)
@@ -939,6 +939,19 @@
}
+ public List getMarksForContent(McContent mcContent) throws McApplicationException
+ {
+ try
+ {
+ return mcUsrAttemptDAO.getMarksForContent(mcContent);
+ }
+ catch(DataAccessException e)
+ {
+ throw new McApplicationException("Exception occured when lams is getting marks "
+ + e.getMessage(),e);
+ }
+ }
+
public List getMarks() throws McApplicationException
{
try
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java
===================================================================
diff -u -rc4892b09d93fd9811095b7b24ede460121832159 -re4b2a3cbdfdd26b99ead9b77705faa5a333d326e
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java (.../LearningUtil.java) (revision c4892b09d93fd9811095b7b24ede460121832159)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java (.../LearningUtil.java) (revision e4b2a3cbdfdd26b99ead9b77705faa5a333d326e)
@@ -260,9 +260,11 @@
* @param request
* @return
*/
- public static int getTopMark(HttpServletRequest request, IMcService mcService)
+ public static int getTopMark(HttpServletRequest request, IMcService mcService, McContent mcContent)
{
- List listMarks=mcService.getMarks();
+ logger.debug("performing getTopMark on mcContent: " + mcContent);
+ List listMarks=mcService.getMarksForContent(mcContent);
+ logger.debug("listMarks: " + listMarks);
Iterator itMarks=listMarks.iterator();
int highestMark=0;
@@ -284,9 +286,11 @@
* @param request
* @return
*/
- public static int getLowestMark(HttpServletRequest request, IMcService mcService)
+ public static int getLowestMark(HttpServletRequest request, IMcService mcService, McContent mcContent)
{
- List listMarks=mcService.getMarks();
+ logger.debug("performing getLowestMark on mcContent: " + mcContent);
+ List listMarks=mcService.getMarksForContent(mcContent);
+ logger.debug("listMarks: " + listMarks);
Iterator itMarks=listMarks.iterator();
int lowestMark=100;
@@ -312,9 +316,11 @@
* @param request
* @return
*/
- public static int getAverageMark(HttpServletRequest request, IMcService mcService)
+ public static int getAverageMark(HttpServletRequest request, IMcService mcService, McContent mcContent)
{
- List listMarks=mcService.getMarks();
+ logger.debug("performing getAverageMark on mcContent: " + mcContent);
+ List listMarks=mcService.getMarksForContent(mcContent);
+ logger.debug("listMarks: " + listMarks);
Iterator itMarks=listMarks.iterator();
int marksTotal=0;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
diff -u -rc4892b09d93fd9811095b7b24ede460121832159 -re4b2a3cbdfdd26b99ead9b77705faa5a333d326e
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java (.../McLearningAction.java) (revision c4892b09d93fd9811095b7b24ede460121832159)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java (.../McLearningAction.java) (revision e4b2a3cbdfdd26b99ead9b77705faa5a333d326e)
@@ -585,24 +585,7 @@
String question=mcQueContent.getQuestion();
logger.debug("question: " + question);
- /*
- boolean isTextMarkup=LearningUtil.isTextMarkup(question);
- logger.debug("isTextMarkup: " + isTextMarkup);
- String newQuestionText=question;
- if (!isTextMarkup)
- {
- newQuestionText= LearningUtil.getWrappedText(question, false);
- logger.debug("wrapped newQuestionText: " + newQuestionText);
- }
- logger.debug("post warp newQuestionText: " + newQuestionText);
-
-
- newQuestionText=McUtils.replaceNewLines(newQuestionText);
- logger.debug("newQuestionText after procesing new lines: " + newQuestionText);
- */
-
-
mcLearnerAnswersDTO.setQuestion(question);
mcLearnerAnswersDTO.setDisplayOrder(mcQueContent.getDisplayOrder().toString());
mcLearnerAnswersDTO.setQuestionUid(mcQueContent.getUid().toString());
@@ -617,23 +600,6 @@
if (feedback == null) feedback="";
logger.debug("feedback: " + feedback);
- /*
- boolean isFeedbackTextMarkup=LearningUtil.isTextMarkup(feedback);
- logger.debug("isFeedbackTextMarkup: " + isFeedbackTextMarkup);
-
- String newFeedbackText=feedback;
- if (!isFeedbackTextMarkup)
- {
- newFeedbackText= LearningUtil.getWrappedText(feedback, false);
- logger.debug("wrapped newFeedbackText: " + newFeedbackText);
- }
- logger.debug("post warp newFeedbackText: " + newFeedbackText);
-
-
- newFeedbackText=McUtils.replaceNewLines(newFeedbackText);
- logger.debug("newFeedbackText after procesing new lines: " + newFeedbackText);
- */
-
mcLearnerAnswersDTO.setFeedback(feedback);
Map caMap= new TreeMap(new McStringComparator());
@@ -1002,7 +968,16 @@
totalMarksPossible=LearningUtil.getTotalMarksPossible(mcContent);
logger.debug("totalMarksPossible: " + totalMarksPossible);
mcGeneralLearnerFlowDTO.setTotalMarksPossible(totalMarksPossible);
+
+
+ int topMark=LearningUtil.getTopMark(request, mcService, mcContent);
+ int lowestMark=LearningUtil.getLowestMark(request, mcService, mcContent);
+ int averageMark=LearningUtil.getAverageMark(request, mcService, mcContent);
+ mcGeneralLearnerFlowDTO.setTopMark(new Integer(topMark).toString());
+ mcGeneralLearnerFlowDTO.setLowestMark(new Integer(lowestMark).toString());
+ mcGeneralLearnerFlowDTO.setAverageMark(new Integer(averageMark).toString());
+
request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " + request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
@@ -1491,7 +1466,6 @@
mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString());
-
String userID = "";
HttpSession ss = SessionManager.getSession();
logger.debug("ss: " + ss);
@@ -1561,29 +1535,6 @@
logger.debug("userOverPassMark: " + userOverPassMark);
}
-
- /*
- if (requestByStarter.equals("true"))
- {
- logger.debug("requestByStarter is true");
-
- passMarkApplicable=(String)sessionMap.get(PASSMARK_APPLICABLE);
- logger.debug("passMarkApplicable: " + passMarkApplicable);
-
- userOverPassMark=(String)sessionMap.get(USER_OVER_PASSMARK);
- logger.debug("userOverPassMark: " + userOverPassMark);
- }
- else
- {
- logger.debug("requestByStarter is not true");
- logger.debug("reading request parameters");
- passMarkApplicable=request.getParameter("passMarkApplicable");
- logger.debug("passMarkApplicable: " + passMarkApplicable);
-
- userOverPassMark=request.getParameter("userOverPassMark");
- logger.debug("userOverPassMark: " + userOverPassMark);
- }
- */
mcGeneralLearnerFlowDTO.setPassMarkApplicable(passMarkApplicable);
mcLearningForm.setPassMarkApplicable(passMarkApplicable);
@@ -1713,9 +1664,9 @@
logger.debug("countSessionComplete: " + countSessionComplete);
- int topMark=LearningUtil.getTopMark(request, mcService);
- int lowestMark=LearningUtil.getLowestMark(request, mcService);
- int averageMark=LearningUtil.getAverageMark(request, mcService);
+ int topMark=LearningUtil.getTopMark(request, mcService, mcContent);
+ int lowestMark=LearningUtil.getLowestMark(request, mcService, mcContent);
+ int averageMark=LearningUtil.getAverageMark(request, mcService, mcContent);
logger.debug("countSessionComplete: " + countSessionComplete);
logger.debug("topMark: " + topMark);
@@ -1771,8 +1722,6 @@
sessionMap.put(USER_OVER_PASSMARK, userOverPassMark);
request.getSession().setAttribute(httpSessionID, sessionMap);
-
-
String totalMarksPossible=LearningUtil.getTotalMarksPossible(mcContent);
logger.debug("totalMarksPossible: " + totalMarksPossible);
@@ -2029,7 +1978,5 @@
return (mapping.findForward(NOTEBOOK));
}
-
-
}
\ No newline at end of file
Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r1d72fce59b0491cf7a3db3434809d552e132e572 -re4b2a3cbdfdd26b99ead9b77705faa5a333d326e
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision 1d72fce59b0491cf7a3db3434809d552e132e572)
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision e4b2a3cbdfdd26b99ead9b77705faa5a333d326e)
@@ -146,7 +146,32 @@
+
+
+
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+ |
+
+
+ |
+
+
+
+
+