Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.7 -r1.8
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	21 Sep 2012 10:54:50 -0000	1.7
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	3 Oct 2012 13:07:44 -0000	1.8
@@ -106,3 +106,4 @@
 label.correct.answer  =Correct answer
 label.mark  =Mark
 label.attempts  =Attempts
+label.choice.number  =Choice #{0}
Index: lams_tool_scratchie/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/conf/xdoclet/struts-actions.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_scratchie/conf/xdoclet/struts-actions.xml	21 Sep 2012 10:54:49 -0000	1.5
+++ lams_tool_scratchie/conf/xdoclet/struts-actions.xml	3 Oct 2012 13:07:43 -0000	1.6
@@ -227,12 +227,7 @@
 			type="org.lamsfoundation.lams.tool.scratchie.web.action.MonitoringAction"
 			parameter="summary" >
 			<forward name="success" path="/pages/monitoring/monitoring.jsp" />
-		</action>  
-		<action path="/monitoring/userSummary"
-			type="org.lamsfoundation.lams.tool.scratchie.web.action.MonitoringAction"
-			parameter="userSummary" >
-			<forward name="success" path="/pages/monitoring/parts/userSummary.jsp" />
-		</action>
+		</action> 
 		<action path="/monitoring/itemSummary"
 			type="org.lamsfoundation.lams.tool.scratchie.web.action.MonitoringAction"
 			parameter="itemSummary" >
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java,v
diff -u -r1.4 -r1.5
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java	21 Sep 2012 10:54:50 -0000	1.4
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java	3 Oct 2012 13:07:44 -0000	1.5
@@ -30,12 +30,12 @@
 
 public interface ScratchieAnswerVisitDAO extends DAO {
 
-    public ScratchieAnswerVisitLog getScratchieAnswerLog(Long itemUid, Long userId);
+    ScratchieAnswerVisitLog getScratchieAnswerLog(Long answerUid, Long userId);
 
-    public int getLogCountTotal(Long sessionId, Long userId);
+    int getLogCountTotal(Long sessionId, Long userId);
     
     int getLogCountPerItem(Long toolSessionId, Long userId, Long itemUid);
+    
+    List<ScratchieAnswerVisitLog> getLogsByScratchieUserAndItem(Long userUid, Long itemUid);
 
-    public List<ScratchieAnswerVisitLog> getLogsBySessionAndUser(Long sessionId, Long userId);
-
 }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java,v
diff -u -r1.4 -r1.5
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java	21 Sep 2012 10:54:50 -0000	1.4
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java	3 Oct 2012 13:07:44 -0000	1.5
@@ -37,10 +37,10 @@
 
     private static final String FIND_BY_ANSWER_AND_USER = "from " + ScratchieAnswerVisitLog.class.getName()
 	    + " as r where r.user.userId = ? and r.scratchieAnswer.uid=?";
+    
+    private static final String FIND_BY_SCRATCHIE_USER_AND_ITEM = "from " + ScratchieAnswerVisitLog.class.getName()
+	    + " as r where r.user.uid=? and r.scratchieAnswer.scratchieItem.uid = ?  order by r.accessDate asc";
 
-    private static final String FIND_BY_SESSION_AND_USER = "from " + ScratchieAnswerVisitLog.class.getName()
-	    + " as r where r.sessionId = ? and r.user.userId=? order by r.accessDate asc";
-
     private static final String FIND_VIEW_COUNT_BY_USER = "select count(*) from "
 	    + ScratchieAnswerVisitLog.class.getName() + " as r where  r.sessionId=? and  r.user.userId =?";
     
@@ -67,9 +67,9 @@
 	    return 0;
 	return ((Number) list.get(0)).intValue();
     }
-
-    public List<ScratchieAnswerVisitLog> getLogsBySessionAndUser(Long sessionId, Long userId) {
-	return getHibernateTemplate().find(FIND_BY_SESSION_AND_USER, new Object[] { sessionId, userId });
+    
+    public List<ScratchieAnswerVisitLog> getLogsByScratchieUserAndItem(Long userUid, Long itemUid) {
+	return getHibernateTemplate().find(FIND_BY_SCRATCHIE_USER_AND_ITEM, new Object[] { userUid, itemUid });
     }
 
 }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java,v
diff -u -r1.3 -r1.4
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java	21 Sep 2012 10:54:50 -0000	1.3
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java	3 Oct 2012 13:07:44 -0000	1.4
@@ -51,7 +51,7 @@
     // ***********************************************
     // DTO fields:
     private boolean scratched;
-    private Date scratchedDate;
+    private int attemptOrder;
     private int[] attempts;
 
     // **********************************************************
@@ -128,14 +128,22 @@
 	return scratched;
     }
     
-    public Date getScratchedDate() {
-	return scratchedDate;
+    /**
+     * @return in which order the student selected it
+     */
+    public int getAttemptOrder() {
+	return attemptOrder;
     }
 
-    public void setScratchedDate(Date scratchedDate) {
-	this.scratchedDate = scratchedDate;
+    public void setAttemptOrder(int attemptOrder) {
+	this.attemptOrder = attemptOrder;
     }
 
+    /**
+     * Used for item summary page in monitor
+     * 
+     * @return
+     */
     public int[] getAttempts() {
 	return attempts;
     }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java,v
diff -u -r1.7 -r1.8
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	21 Sep 2012 10:54:49 -0000	1.7
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	3 Oct 2012 13:07:44 -0000	1.8
@@ -161,6 +161,14 @@
      * @param resSession
      */
     void saveOrUpdateScratchieSession(ScratchieSession resSession);
+    
+    /**
+     * Fills in which order the student selects answers
+     * 
+     * @param items
+     * @param user
+     */
+    void retrieveScratchesOrder(Collection<ScratchieItem> items, ScratchieUser user);
 
     /**
      * Fill in scratchieItems with information about whether they were unraveled; and answers with information on their scratched.
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java,v
diff -u -r1.8 -r1.9
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	21 Sep 2012 10:54:49 -0000	1.8
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	3 Oct 2012 13:07:43 -0000	1.9
@@ -479,6 +479,29 @@
 	return groupSummaryList;
     }
     
+    public void retrieveScratchesOrder(Collection<ScratchieItem> items, ScratchieUser user) {
+	
+	for (ScratchieItem item : items) {
+	    List<ScratchieAnswerVisitLog> itemLogs = scratchieAnswerVisitDao.getLogsByScratchieUserAndItem(user.getUid(), item.getUid());
+	    
+	    for (ScratchieAnswer answer : (Set<ScratchieAnswer>) item.getAnswers()) {
+
+		int attemptNumber;
+		ScratchieAnswerVisitLog log = scratchieAnswerVisitDao.getScratchieAnswerLog(answer.getUid(), user.getUserId());
+		if (log == null) {
+		    // -1 if there is no log
+		    attemptNumber = -1;
+		} else {
+		    //adding 1 to start from 1.
+		    attemptNumber = itemLogs.indexOf(log) + 1;
+		}
+
+		answer.setAttemptOrder(attemptNumber);
+	    }
+	}
+	
+    }
+    
     public void retrieveScratched(Collection<ScratchieItem> items, ScratchieUser user) {
 	
 	for (ScratchieItem item : items) {
@@ -490,7 +513,6 @@
 		    answer.setScratched(false);
 		} else {
 		    answer.setScratched(true);
-		    answer.setScratchedDate(log.getAccessDate());
 		}
 	    }
 	    
@@ -605,7 +627,7 @@
 	    for (ScratchieUser user : users) {
 		
 		int attemptNumber = 0;
-		List<ScratchieAnswerVisitLog> userAttempts = scratchieAnswerVisitDao.getLogsBySessionAndUser(sessionId, user.getUserId());
+		List<ScratchieAnswerVisitLog> userAttempts = scratchieAnswerVisitDao.getLogsByScratchieUserAndItem(user.getUid(), itemUid);
 		for (ScratchieAnswerVisitLog userAttempt : userAttempts) {
 		    ScratchieAnswer answer = answerMap.get(userAttempt.getScratchieAnswer().getUid());
 		    int[] attempts = answer.getAttempts();
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/util/ScratchieBundler.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/util/ScratchieBundler.java,v
diff -u -r1.1 -r1.2
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/util/ScratchieBundler.java	19 Jul 2012 19:20:12 -0000	1.1
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/util/ScratchieBundler.java	3 Oct 2012 13:07:44 -0000	1.2
@@ -94,23 +94,23 @@
 	final String IMAGE_FOLDER = getServerUrl() + "tool" + URL_SEPARATOR + ScratchieConstants.TOOL_SIGNATURE
 		+ URL_SEPARATOR + "includes" + URL_SEPARATOR + "images" + URL_SEPARATOR;
 
-	String urlToConnectTo = JAVASCRIPT_FOLDER + "jquery.jqGrid.min.js";
+	String urlToConnectTo = JAVASCRIPT_FOLDER + "jquery.jqGrid.js";
 	HttpUrlConnectionUtil
-		.writeResponseToFile(urlToConnectTo, FOLDER_TO_STORE_FILE, "jquery.jqGrid.min.js", cookies);
+		.writeResponseToFile(urlToConnectTo, FOLDER_TO_STORE_FILE, "jquery.jqGrid.js", cookies);
 	urlToConnectTo = JAVASCRIPT_FOLDER + "jquery.jqGrid.locale-en.js";
 	HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, FOLDER_TO_STORE_FILE, "jquery.jqGrid.locale-en.js",
 		cookies);
-	urlToConnectTo = JAVASCRIPT_FOLDER + "jquery-1.7.1.min.js";
-	HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, FOLDER_TO_STORE_FILE, "jquery-1.7.1.min.js", cookies);
-	urlToConnectTo = JAVASCRIPT_FOLDER + "jquery-ui-1.8.11.custom.min.js";
+	urlToConnectTo = JAVASCRIPT_FOLDER + "jquery.js";
+	HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, FOLDER_TO_STORE_FILE, "jquery.js", cookies);
+	urlToConnectTo = JAVASCRIPT_FOLDER + "jquery-ui.js";
 	HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, FOLDER_TO_STORE_FILE,
-		"jquery-ui-1.8.11.custom.min.js", cookies);
+		"jquery-ui.js", cookies);
 
-	urlToConnectTo = CSS_FOLDER + "jquery-ui-1.8.11.redmont-theme.css";
+	urlToConnectTo = CSS_FOLDER + "jquery-ui-redmond-theme.css";
 	HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, FOLDER_TO_STORE_FILE,
-		"jquery-ui-1.8.11.redmont-theme.css", cookies);
-	urlToConnectTo = CSS_FOLDER + "jquery.jqGrid-4.1.2.css";
-	HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, FOLDER_TO_STORE_FILE, "jquery.jqGrid-4.1.2.css",
+		"jquery-ui-redmond-theme.css", cookies);
+	urlToConnectTo = CSS_FOLDER + "jquery.jqGrid.css";
+	HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, FOLDER_TO_STORE_FILE, "jquery.jqGrid.css",
 		cookies);
 
 	urlToConnectTo = IMAGE_FOLDER + "scratchie-correct.gif";
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java,v
diff -u -r1.4 -r1.5
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	31 Aug 2012 15:22:54 -0000	1.4
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	3 Oct 2012 13:07:43 -0000	1.5
@@ -403,9 +403,9 @@
 	while (iter.hasNext()) {
 	    ScratchieItem item = (ScratchieItem) iter.next();
 	    if (item != null) {
-		// This flushs user UID info to message if this user is a new
-		// user.
+		// This flushs user UID info to message if this user is a new user.
 		item.setCreateBy(scratchieUser);
+		removeNewLineCharacters(item);
 		itemList.add(item);
 	    }
 	}
@@ -1045,6 +1045,25 @@
 	}
 	return paramMap;
     }
+    
+    /**
+     * Removes redundant new line characters from options left by CKEditor (otherwise it will break Javascript in
+     * monitor)
+     */
+    private void removeNewLineCharacters(ScratchieItem item) {
+	Set<ScratchieAnswer> answers = item.getAnswers();
+	if (answers != null) {
+	    for (ScratchieAnswer answer : answers) {
+		String answerDescription = answer.getDescription();
+		if (answerDescription != null) {
+		    answerDescription = answerDescription.replaceAll("[\n\r\f]", "");
+		    answerDescription = answerDescription.replaceAll("[\"]", "&quot;");
+		    answer.setDescription(answerDescription);
+		}
+	    }
+	    
+	}
+    }
 
     /**
      * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode.
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java,v
diff -u -r1.9 -r1.10
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	27 Sep 2012 12:56:31 -0000	1.9
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	3 Oct 2012 13:07:43 -0000	1.10
@@ -125,24 +125,24 @@
 
 	// get back the scratchie and item list and display them on page
 	IScratchieService service = getScratchieService();
-	ScratchieUser scratchieUser = null;
+	ScratchieUser user = null;
 	if (mode != null && mode.isTeacher()) {
 	    // monitoring mode - user is specified in URL
 	    // scratchieUser may be null if the user was force completed.
-	    scratchieUser = getSpecifiedUser(service, toolSessionId,
+	    user = getSpecifiedUser(service, toolSessionId,
 		    WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID, false));
 	} else {
-	    scratchieUser = getCurrentUser(service, toolSessionId);
+	    user = getCurrentUser(service, toolSessionId);
 	}
 
 	Scratchie scratchie = service.getScratchieBySessionId(toolSessionId);
 	Set<ScratchieItem> initialItems = scratchie.getScratchieItems();
 
 	// get notebook entry
 	String entryText = new String();
-	if (scratchieUser != null) {
+	if (user != null) {
 	    NotebookEntry notebookEntry = service.getEntry(toolSessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
-		    ScratchieConstants.TOOL_SIGNATURE, scratchieUser.getUserId().intValue());
+		    ScratchieConstants.TOOL_SIGNATURE, user.getUserId().intValue());
 	    if (notebookEntry != null) {
 		entryText = notebookEntry.getEntry();
 	    }
@@ -151,8 +151,8 @@
 	// basic information
 	sessionMap.put(ScratchieConstants.ATTR_TITLE, scratchie.getTitle());
 	sessionMap.put(ScratchieConstants.ATTR_RESOURCE_INSTRUCTION, scratchie.getInstructions());
-	sessionMap.put(ScratchieConstants.ATTR_USER_ID, scratchieUser.getUserId());
-	boolean isUserFinished = scratchieUser != null && scratchieUser.isSessionFinished();
+	sessionMap.put(ScratchieConstants.ATTR_USER_ID, user.getUserId());
+	boolean isUserFinished = user != null && user.isSessionFinished();
 	sessionMap.put(ScratchieConstants.ATTR_USER_FINISHED, isUserFinished);
 	sessionMap.put(ScratchieConstants.ATTR_IS_SHOW_RESULTS_PAGE, scratchie.isShowResultsPage());
 	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId);
@@ -185,11 +185,16 @@
 	    if (item.getCreateBy() != null) {
 		item.getCreateBy().getLoginName();
 	    }
-	}   
+	}
+	
+	// for teacher in monitoring display the number of atempt.
+	if (mode.isTeacher()) {
+	    service.retrieveScratchesOrder(initialItems, user);
+	}
 
 	// set complete flag for display purpose
-	if (scratchieUser != null) {
-	    service.retrieveScratched(initialItems, scratchieUser);
+	if (user != null) {
+	    service.retrieveScratched(initialItems, user);
 	}
 	
 	//randomize order if needed
@@ -198,7 +203,7 @@
 	sessionMap.put(ScratchieConstants.ATTR_ITEM_LIST, items);
 	sessionMap.put(ScratchieConstants.ATTR_SCRATCHIE, scratchie);
 
-	boolean isScratchingFinished = scratchieUser != null && scratchieUser.isScratchingFinished();
+	boolean isScratchingFinished = user != null && user.isScratchingFinished();
 	if (isScratchingFinished && !mode.isTeacher()) {
 	    ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("showResults"));
 	    redirect.addParameter(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java	21 Sep 2012 10:54:49 -0000	1.3
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java	3 Oct 2012 13:07:43 -0000	1.4
@@ -67,9 +67,6 @@
 	if (param.equals("summary")) {
 	    return summary(mapping, form, request, response);
 	}
-	if (param.equals("userSummary")) {
-	    return userSummary(mapping, form, request, response);
-	}
 	if (param.equals("itemSummary")) {
 	    return itemSummary(mapping, form, request, response);
 	}
@@ -109,31 +106,6 @@
 	return mapping.findForward(ScratchieConstants.SUCCESS);
     }
 
-    private ActionForward userSummary(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	Long itemUid = WebUtil.readLongParam(request, ScratchieConstants.ATTR_ITEM_UID);
-	if (itemUid.equals(-1)) {
-	    return null;
-	}
-	
-	String sessionMapID = request.getParameter(ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-	request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
-
-	Long userId = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID);
-	if (userId.equals(-1)) {
-	    return null;
-	}
-	ScratchieItem item = getScratchieService().getScratchieItemByUid(itemUid);
-	request.setAttribute(ScratchieConstants.ATTR_ITEM, item);
-	
-	Long contentId = (Long) sessionMap.get(ScratchieConstants.ATTR_TOOL_CONTENT_ID);
-	List<GroupSummary> summaryList = getScratchieService().getQuestionSummary(contentId, itemUid);
-
-	request.setAttribute(ScratchieConstants.ATTR_SUMMARY_LIST, summaryList);
-	return mapping.findForward(ScratchieConstants.SUCCESS);
-    }
-
     private ActionForward itemSummary(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	String sessionMapID = request.getParameter(ScratchieConstants.ATTR_SESSION_MAP_ID);
Index: lams_tool_scratchie/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/common/header.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_scratchie/web/common/header.jsp	19 Jul 2012 19:20:09 -0000	1.1
+++ lams_tool_scratchie/web/common/header.jsp	3 Oct 2012 13:07:44 -0000	1.2
@@ -10,7 +10,7 @@
 
  	<!-- ********************  javascript ********************** -->
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-1.7.1.min.js"></script>
+	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/scratchiecommon.js'/>"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
 
Index: lams_tool_scratchie/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/authoring/authoring.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_scratchie/web/pages/authoring/authoring.jsp	9 Aug 2012 21:55:37 -0000	1.2
+++ lams_tool_scratchie/web/pages/authoring/authoring.jsp	3 Oct 2012 13:07:44 -0000	1.3
@@ -12,7 +12,7 @@
 	<%@ include file="/common/tabbedheader.jsp"%>
 	<link href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
 	
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-1.7.1.min.js"></script>
+	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript">
 		var tb_pathToImage = "<lams:LAMSURL/>images/loadingAnimation.gif";
 	</script>
Index: lams_tool_scratchie/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/authoring/pedagogicalPlannerForm.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_scratchie/web/pages/authoring/pedagogicalPlannerForm.jsp	19 Jul 2012 19:20:12 -0000	1.1
+++ lams_tool_scratchie/web/pages/authoring/pedagogicalPlannerForm.jsp	3 Oct 2012 13:07:44 -0000	1.2
@@ -35,7 +35,7 @@
 		}
 	</style>
 	
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-latest.pack.js"></script>
+	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
   	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
   	<script type="text/javascript">
   		
Index: lams_tool_scratchie/web/pages/authoring/parts/additem.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/authoring/parts/additem.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_scratchie/web/pages/authoring/parts/additem.jsp	27 Aug 2012 13:52:03 -0000	1.2
+++ lams_tool_scratchie/web/pages/authoring/parts/additem.jsp	3 Oct 2012 13:07:43 -0000	1.3
@@ -19,7 +19,7 @@
 		
 		<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
 
-		<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-1.7.1.min.js"></script>
+		<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 		<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.pack.js"></script>
 		<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
 		<script type="text/javascript">
Index: lams_tool_scratchie/web/pages/export/parts/exportTeacher.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/export/parts/exportTeacher.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_scratchie/web/pages/export/parts/exportTeacher.jsp	19 Jul 2012 19:20:08 -0000	1.1
+++ lams_tool_scratchie/web/pages/export/parts/exportTeacher.jsp	3 Oct 2012 13:07:44 -0000	1.2
@@ -8,13 +8,13 @@
 <lams:head>
 	<title><fmt:message key="export.title" /> </title>
 
-		<link type="text/css" href="./includes/jquery-ui-1.8.11.redmont-theme.css" rel="stylesheet">
-		<link type="text/css" href="./includes/jquery.jqGrid-4.1.2.css" rel="stylesheet" />
+		<link type="text/css" href="./includes/jquery-ui-redmond-theme.css" rel="stylesheet">
+		<link type="text/css" href="./includes/jquery.jqGrid.css" rel="stylesheet" />
  
-		<script type="text/javascript" src="./includes/jquery-1.7.1.min.js"></script>
-		<script type="text/javascript" src="./includes/jquery-ui-1.8.11.custom.min.js"></script>
+		<script type="text/javascript" src="./includes/jquery.js"></script>
+		<script type="text/javascript" src="./includes/jquery-ui.js"></script>
  		<script type="text/javascript" src="./includes/jquery.jqGrid.locale-en.js"></script>
- 		<script type="text/javascript" src="./includes/jquery.jqGrid.min.js"></script>
+ 		<script type="text/javascript" src="./includes/jquery.jqGrid.js"></script>
  		<script type="text/javascript">
 		<!--	
 		$(document).ready(function(){
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/learning.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_scratchie/web/pages/learning/learning.jsp	21 Sep 2012 10:54:49 -0000	1.5
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	3 Oct 2012 13:07:44 -0000	1.6
@@ -22,7 +22,7 @@
     	.scartchie-image {border: 0;}
     </style>
 
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui-1.8.11.custom.min.js"></script>
+	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript">
 	<!--
 
@@ -118,6 +118,12 @@
 						
 						<td style="vertical-align: middle;">
 							${answer.description} 
+							
+							<c:if test="${(mode == 'teacher') && (answer.attemptOrder != -1)}">
+								<fmt:message key="label.choice.number" >
+									<fmt:param>${answer.attemptOrder}</fmt:param>
+								</fmt:message>
+							</c:if>
 						</td>
 					</tr>
 				</c:forEach>
Index: lams_tool_scratchie/web/pages/learning/results.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/results.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_scratchie/web/pages/learning/results.jsp	31 Aug 2012 15:22:55 -0000	1.1
+++ lams_tool_scratchie/web/pages/learning/results.jsp	3 Oct 2012 13:07:44 -0000	1.2
@@ -16,7 +16,7 @@
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
 
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui-1.8.11.custom.min.js"></script>
+	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript">
 	<!--
 
Index: lams_tool_scratchie/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	19 Jul 2012 19:20:10 -0000	1.1
+++ lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	3 Oct 2012 13:07:44 -0000	1.2
@@ -9,14 +9,14 @@
 <lams:html>
 	<lams:head>
 		 <%@ include file="/common/tabbedheader.jsp" %>
-		<link type="text/css" href="${lams}css/jquery-ui-1.8.11.redmont-theme.css" rel="stylesheet">
+		<link type="text/css" href="${lams}css/jquery-ui-redmond-theme.css" rel="stylesheet">
 		<link type="text/css" href="${lams}css/thickbox.css" rel="stylesheet"  media="screen">
-		<link type="text/css" href="${lams}css/jquery.jqGrid-4.1.2.css" rel="stylesheet" />
+		<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
  
-		<script type="text/javascript" src="${lams}includes/javascript/jquery-1.7.1.min.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/jquery-ui-1.8.11.custom.min.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
  		<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
- 		<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.min.js"></script>
+ 		<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
  		<script type="text/javascript"> 
 			var pathToImageFolder = "${lams}images/";
 		</script>
Index: lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	21 Sep 2012 10:54:50 -0000	1.2
+++ lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	3 Oct 2012 13:07:44 -0000	1.3
@@ -11,12 +11,12 @@
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		
-		<link type="text/css" href="${lams}css/jquery-ui-1.8.11.redmont-theme.css" rel="stylesheet">
-		<link type="text/css" href="${lams}css/jquery.jqGrid-4.1.2.css" rel="stylesheet" />
+		<link type="text/css" href="${lams}css/jquery-ui-redmond-theme.css" rel="stylesheet">
+		<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
 		
-		<script type="text/javascript" src="${lams}includes/javascript/jquery-1.7.1.min.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
  		<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
- 		<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.min.js"></script>
+ 		<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
 
   	    <script>
   	    	<!-- 
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_scratchie/web/pages/monitoring/parts/userSummary.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?