Index: lams_tool_daco/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/conf/xdoclet/struts-actions.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_daco/conf/xdoclet/struts-actions.xml	8 Aug 2008 08:10:22 -0000	1.4
+++ lams_tool_daco/conf/xdoclet/struts-actions.xml	12 Aug 2008 01:43:04 -0000	1.5
@@ -94,10 +94,6 @@
 	parameter="removeAnswerOption">
 	<forward name="success" path="/pages/authoring/parts/answeroptions.jsp" />
 </action>
-<action path="/authoring/removeQuestionAttachment" type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction"
-	parameter="removeQuestionAttachment">
-	<forward name="success" path="/pages/authoring/parts/questionattachment.jsp" />
-</action>
 
 <!-- ========== BEGIN: Learning Definitions ============================== -->
 <action path="/learning/start" type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" parameter="start"
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java,v
diff -u -r1.7 -r1.8
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java	8 Aug 2008 08:10:22 -0000	1.7
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java	12 Aug 2008 01:43:04 -0000	1.8
@@ -23,6 +23,9 @@
 /* $Id$ */
 package org.lamsfoundation.lams.tool.daco;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
 public class DacoConstants {
 	// system-wide constants
 	public static final String TOOL_SIGNATURE = "ladaco10";
@@ -46,6 +49,9 @@
 	// longitude/latitude maps
 	public static final String[] LONGLAT_MAPS_LIST = new String[] { "Google Maps", "Geabios", "Open Street Map", "Multimap" };
 
+	//for date parsing
+	public static final DateFormat DEFAULT_DATE_FORMAT = new SimpleDateFormat("EEE MMM dd hh:mm:ss zzz yyyy");
+
 	// answer options' constants
 	public static final int INIT_ANSWER_OPTION_COUNT = 3;
 	public static final int ANSWER_OPTION_MINIMUM_COUNT = 2;
@@ -55,9 +61,6 @@
 	// image question valid extensions
 	public static final String[] IMAGE_EXTENSIONS = new String[] { "GIF", "JPG", "PNG" };
 
-	// format for the date question
-	public static final String DATE_PART_DELIMETER = "-";
-
 	// action forward names
 	public static final String SUCCESS = "success";
 	public static final String ERROR = "error";
@@ -106,7 +109,7 @@
 	public static final String ATTR_LEARNING_CURRENT_TAB = "learningCurrentTab";
 	public static final String ATTR_QUESTION_LIST = "questionList";
 	public static final String ATTR_RECORD_LIST = "recordList";
-	public static final String ATT_ATTACHMENT_LIST = "instructionAttachmentList";
+	public static final String ATTR_ATTACHMENT_LIST = "instructionAttachmentList";
 	public static final String ATTR_DELETED_QUESTION_LIST = "deleteDacoList";
 	public static final String ATTR_DELETED_ATTACHMENT_LIST = "deletedAttachmmentList";
 	public static final String ATTR_DELETED_QUESTION_ATTACHMENT_LIST = "deletedQuestionAttachmmentList";
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DAO.java	31 Jul 2008 03:51:05 -0000	1.2
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DAO.java	12 Aug 2008 01:43:04 -0000	1.3
@@ -67,5 +67,9 @@
 	 */
 	public void removeObject(Class clazz, Serializable id);
 
+	/**
+	 * To release an object from Hibernate cache.
+	 * @param o object to release
+	 */
 	public void releaseFromCache(Object o);
 }
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoAnswerDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoAnswerDAO.java,v
diff -u -r1.4 -r1.5
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoAnswerDAO.java	8 Aug 2008 08:10:21 -0000	1.4
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoAnswerDAO.java	12 Aug 2008 01:43:04 -0000	1.5
@@ -5,8 +5,18 @@
 import org.lamsfoundation.lams.tool.daco.dto.QuestionSummaryDTO;
 
 public interface DacoAnswerDAO extends DAO {
-
+	/**
+	 * Gets the summary values for the questions.
+	 * @param userUid user for who the summary should be created
+	 * @param blankSummary the empty structure where the summary values will be filled into
+	 * @return list of question summaries
+	 */
 	List<QuestionSummaryDTO> getQuestionSummaries(Long userUid, List<QuestionSummaryDTO> blankSummary);
 
+	/**
+	 * Gets the number of records in the group.
+	 * @param sessionId session ID of the group
+	 * @return number of records in that group
+	 */
 	Integer getGroupRecordCount(Long sessionId);
 }
\ No newline at end of file
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoDAOHibernate.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoDAOHibernate.java,v
diff -u -r1.3 -r1.4
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoDAOHibernate.java	8 Aug 2008 08:10:22 -0000	1.3
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoDAOHibernate.java	12 Aug 2008 01:43:04 -0000	1.4
@@ -30,7 +30,7 @@
 
 /**
  * 
- * @author Steve.Ni
+ * @author Marcin Cieslak
  * 
  * @version $Revision$
  */
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dto/MonitoringSummarySessionDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dto/MonitoringSummarySessionDTO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dto/MonitoringSummarySessionDTO.java	31 Jul 2008 03:51:05 -0000	1.1
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dto/MonitoringSummarySessionDTO.java	12 Aug 2008 01:43:04 -0000	1.2
@@ -26,7 +26,12 @@
 
 import java.util.List;
 
-
+/**
+ * Represents a group of users with details that are useful for displaying summary in monitoring.
+ * 
+ * @author Marcin Cieslak
+ *
+ */
 public class MonitoringSummarySessionDTO {
 
 	private Long sessionId;
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dto/MonitoringSummaryUserDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dto/MonitoringSummaryUserDTO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dto/MonitoringSummaryUserDTO.java	8 Aug 2008 08:10:22 -0000	1.2
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dto/MonitoringSummaryUserDTO.java	12 Aug 2008 01:43:04 -0000	1.3
@@ -7,6 +7,11 @@
 
 import org.lamsfoundation.lams.tool.daco.model.DacoAnswer;
 
+/**
+ * Contains the user details that are useful for displaying summary in monitoring.
+ * @author Marcin Cieslak
+ *
+ */
 public class MonitoringSummaryUserDTO {
 
 	private Long uid;
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dto/QuestionSummaryDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dto/QuestionSummaryDTO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dto/QuestionSummaryDTO.java	8 Aug 2008 08:10:22 -0000	1.2
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dto/QuestionSummaryDTO.java	12 Aug 2008 01:43:04 -0000	1.3
@@ -4,8 +4,19 @@
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * Contains summary values for a single question.
+ * @author Marcin Cieslak
+ *
+ */
 public class QuestionSummaryDTO implements Cloneable {
+	/**
+	 * Contains set of summary information for the user.
+	 */
 	private List<QuestionSummarySingleAnswerDTO> userSummary = new ArrayList<QuestionSummarySingleAnswerDTO>();
+	/**
+	 * Contains set of summary information for the group of users (session).
+	 */
 	private List<QuestionSummarySingleAnswerDTO> groupSummary = new ArrayList<QuestionSummarySingleAnswerDTO>();
 	private Long questionUid;
 
@@ -70,6 +81,7 @@
 		catch (CloneNotSupportedException e) {
 			e.printStackTrace();
 		}
+		// Group data stays the same, user data is cleared
 		if (userSummary != null) {
 			List<QuestionSummarySingleAnswerDTO> list = new ArrayList<QuestionSummarySingleAnswerDTO>(userSummary.size());
 			for (QuestionSummarySingleAnswerDTO singleAnswer : userSummary) {
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dto/QuestionSummarySingleAnswerDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dto/QuestionSummarySingleAnswerDTO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dto/QuestionSummarySingleAnswerDTO.java	8 Aug 2008 08:10:22 -0000	1.2
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dto/QuestionSummarySingleAnswerDTO.java	12 Aug 2008 01:43:04 -0000	1.3
@@ -3,6 +3,11 @@
  */
 package org.lamsfoundation.lams.tool.daco.dto;
 
+/**
+ * Represents a single answer and its summary.
+ * @author Marcin Cieslak
+ *
+ */
 public class QuestionSummarySingleAnswerDTO {
 	private String answer;
 	private String sum;
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java,v
diff -u -r1.3 -r1.4
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java	8 Aug 2008 08:10:22 -0000	1.3
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java	12 Aug 2008 01:43:04 -0000	1.4
@@ -39,7 +39,7 @@
 /**
  * Daco
  * 
- * @author Dapeng Ni
+ * @author Marcin Cieslak
  * 
  * @hibernate.class table="tl_ladaco10_contents"
  * 
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java,v
diff -u -r1.5 -r1.6
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java	8 Aug 2008 08:10:22 -0000	1.5
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java	12 Aug 2008 01:43:04 -0000	1.6
@@ -399,6 +399,7 @@
 		List<MonitoringSummarySessionDTO> result = new ArrayList<MonitoringSummarySessionDTO>(sessions.size());
 		Daco daco = getDacoByContentId(contentId);
 		for (DacoSession session : sessions) {
+			//for each session a monitoring summary is created
 			MonitoringSummarySessionDTO monitoringRecordList = new MonitoringSummarySessionDTO(session.getSessionId(), session
 					.getSessionName());
 			List<DacoUser> users = dacoUserDao.getBySessionId(session.getSessionId());
@@ -407,6 +408,9 @@
 				MonitoringSummaryUserDTO monitoringUser = new MonitoringSummaryUserDTO(user.getUid(),
 						user.getUserId().intValue(), user.getLastName() + " " + user.getFirstName(), user.getLoginName());
 				List<List<DacoAnswer>> records = getDacoAnswersByUserUid(user.getUid());
+				/* If the user provided as "userUid" matches current user UID, the summary is filled with additional data.
+				 * NULL matches all users. UID < 0 matches no users, so only the brief description of users is filled in.
+				 */
 				if (userUid == null || userUid.equals(user.getUid())) {
 					monitoringUser.setRecords(records);
 					NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL,
@@ -429,12 +433,16 @@
 	public List<QuestionSummaryDTO> getQuestionSummaries(Long userUid) {
 		List<QuestionSummaryDTO> result = new ArrayList<QuestionSummaryDTO>();
 		DacoUser user = (DacoUser) dacoUserDao.getObject(DacoUser.class, userUid);
-
+		//Blank structure is created
 		Set<DacoQuestion> questions = user.getDaco().getDacoQuestions();
 		if (questions.size() > 0) {
 			for (DacoQuestion question : questions) {
 				switch (question.getType()) {
 					case DacoConstants.QUESTION_TYPE_NUMBER: {
+						/*
+						 * For numbers, first "single answer" is a summary for the whole question.
+						 * Other "single answers" are summaries for the real answers provided by a learner.
+						 */
 						QuestionSummaryDTO summary = new QuestionSummaryDTO();
 						summary.addUserSummarySingleAnswer(0, new QuestionSummarySingleAnswerDTO());
 						summary.addGroupSummarySingleAnswer(0, new QuestionSummarySingleAnswerDTO());
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java,v
diff -u -r1.5 -r1.6
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java	8 Aug 2008 08:10:22 -0000	1.5
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java	12 Aug 2008 01:43:04 -0000	1.6
@@ -29,6 +29,7 @@
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.contentrepository.IVersionedNode;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.tool.daco.dao.DacoAnswerDAO;
 import org.lamsfoundation.lams.tool.daco.dto.MonitoringSummarySessionDTO;
 import org.lamsfoundation.lams.tool.daco.dto.QuestionSummaryDTO;
 import org.lamsfoundation.lams.tool.daco.model.Daco;
@@ -227,17 +228,56 @@
 	 */
 	DacoUser getUser(Long uid);
 
+	/**
+	 * Gets a message from resource bundle. Same as <code><fmt:message></code> in JSP pages. 
+	 * @param key key of the message
+	 * @param args arguments for the message
+	 * @return message content
+	 */
 	public String getLocalisedMessage(String key, Object[] args);
 
+	/**
+	 * Returns summaries for particular questions. A list of {@link QuestionSummaryDTO question summaries} is created,
+	 * one for each question. They are filled with default, blank data.
+	 * Then the proper summaries are {@link DacoAnswerDAO#getQuestionSummaries(Long, List) read} from the database.
+	 * @param userUid user for who the summary should be created
+	 * @return list of question summaries
+	 */
 	public List<QuestionSummaryDTO> getQuestionSummaries(Long userUid);
 
+	/**
+	 * Removes a Daco object and all of its Questions from Hibernate cache.
+	 * It is required to avoid errors when same object was read from the database twice and one of the copies is being saved.
+	 * @param daco object to release
+	 */
 	public void releaseDacoFromCache(Daco daco);
 
+	/**
+	 * Removes Answers from Hibernate cache.
+	 * It is required to avoid errors when same object was read from the database twice and one of the copies is being saved.
+	 * @param answers collection of answers to remove from cache
+	 */
 	void releaseAnswersFromCache(Collection<DacoAnswer> answers);
 
+	/**
+	 * Gets the number of records in the group. It uses database connection.
+	 * @param sessionId session ID of the group
+	 * @return number of records in that group
+	 */
 	Integer getGroupRecordCount(Long sessionId);
 
+	/**
+	 * Gets the number of records in the group. It uses provided monitoring summary.
+	 * @param monitoringSummary summary which will be iterated through and the records counted
+	 * @return number of records in that group
+	 */
 	Integer getGroupRecordCount(MonitoringSummarySessionDTO monitoringSummary);
 
+	/**
+	 * Creates summary that is later used in the monitoring.
+	 * @param contentId ID of Daco for which the summary should be created
+	 * @param userUid ID of the user for who the summary details should be created; <code>null</code> if the summary details should be created for all users; <code>< 0 </code> if the summary details should be created for noone  
+	 * @return list of monitoring summaries, one for each session
+	 */
 	List<MonitoringSummarySessionDTO> getMonitoringSummary(Long contentId, Long userUid);
 }
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java,v
diff -u -r1.5 -r1.6
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java	8 Aug 2008 08:10:22 -0000	1.5
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java	12 Aug 2008 01:43:04 -0000	1.6
@@ -80,7 +80,7 @@
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
- * @author Steve.Ni
+ * @author Marcin Cieslak
  * @version $Revision$
  */
 public class AuthoringAction extends Action {
@@ -184,10 +184,6 @@
 			return removeAnswerOption(mapping, form, request);
 		}
 
-		if (param.equals("removeQuestionAttachment")) {
-			return removeQuestionAttachment(mapping, form, request, response);
-		}
-
 		return mapping.findForward(DacoConstants.ERROR);
 	}
 
@@ -474,7 +470,7 @@
 	 * @return
 	 */
 	protected List getAttachmentList(SessionMap sessionMap) {
-		return getListFromSession(sessionMap, DacoConstants.ATT_ATTACHMENT_LIST);
+		return getListFromSession(sessionMap, DacoConstants.ATTR_ATTACHMENT_LIST);
 	}
 
 	// *************************************************************************************
@@ -758,22 +754,6 @@
 	}
 
 	/**
-	 * Remove daco question attachment, such as single file, learning object ect. It is a ajax call and just temporarily remove
-	 * from page, all permenant change will happen only when user sumbit this daco question again.
-	 * 
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	protected ActionForward removeQuestionAttachment(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
-		request.setAttribute("questionAttachment", null);
-		return mapping.findForward(DacoConstants.SUCCESS);
-	}
-
-	/**
 	 * This method will get necessary information from daco question form and save or update into <code>HttpSession</code>
 	 * DacoQuestionList. Notice, this save is not persist them into database, just save <code>HttpSession</code> temporarily.
 	 * Only they will be persist when the entire authoring page is being persisted.
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java,v
diff -u -r1.7 -r1.8
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java	8 Aug 2008 08:10:22 -0000	1.7
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java	12 Aug 2008 01:43:04 -0000	1.8
@@ -25,6 +25,7 @@
 package org.lamsfoundation.lams.tool.daco.web.action;
 
 import java.io.IOException;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -80,7 +81,7 @@
 
 /**
  * 
- * @author Steve.Ni
+ * @author Marcin Cieslak
  * 
  * @version $Revision$
  */
@@ -365,11 +366,12 @@
 							recordForm.getAnswer(formAnswerNumber++), recordForm.getAnswer(formAnswerNumber) };
 					if (!(StringUtils.isBlank(dateParts[0]) || StringUtils.isBlank(dateParts[1]) || StringUtils
 							.isBlank(dateParts[2]))) {
+
 						Calendar calendar = Calendar.getInstance();
 						calendar.clear();
 						calendar.set(Integer.parseInt(dateParts[2]), Integer.parseInt(dateParts[1]) - 1, Integer
 								.parseInt(dateParts[0]));
-						answer.setAnswer(calendar.getTime().toString());
+						answer.setAnswer(DacoConstants.DEFAULT_DATE_FORMAT.format(calendar.getTime()));
 					}
 					else {
 						answer.setAnswer(null);
@@ -975,13 +977,23 @@
 						checkboxes = null;
 					}
 					if (questionType == DacoConstants.QUESTION_TYPE_DATE) {
-						String[] dateParts = null;
+						String[] dateParts = new String[3];
 						if (answer.getAnswer() != null) {
-							dateParts = answer.getAnswer().split(DacoConstants.DATE_PART_DELIMETER);
+							Calendar calendar = Calendar.getInstance();
+							calendar.clear();
+
+							try {
+								calendar.setTime(DacoConstants.DEFAULT_DATE_FORMAT.parse(answer.getAnswer()));
+							}
+							catch (ParseException e) {
+								LearningAction.log.error(e.getMessage());
+								e.printStackTrace();
+							}
+
+							dateParts[0] = String.valueOf(calendar.get(Calendar.DAY_OF_YEAR));
+							dateParts[1] = String.valueOf(calendar.get(Calendar.MONTH) + 1);
+							dateParts[2] = String.valueOf(calendar.get(Calendar.YEAR));
 						}
-						else {
-							dateParts = new String[] { null, null, null };
-						}
 						recordForm.setAnswer(formAnswerNumber++, dateParts[0]);
 						recordForm.setAnswer(formAnswerNumber++, dateParts[1]);
 						recordForm.setAnswer(formAnswerNumber++, dateParts[2]);
Index: lams_tool_daco/web/pages/authoring/advanced.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/advanced.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_daco/web/pages/authoring/advanced.jsp	8 Aug 2008 08:10:22 -0000	1.3
+++ lams_tool_daco/web/pages/authoring/advanced.jsp	12 Aug 2008 01:43:04 -0000	1.4
@@ -1,8 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
-<!-- Javascript functions -->
-
 <script type="text/javascript">
 	function turnOnReflect(){
 			document.getElementById("reflectOn").checked = !isEmpty(document.getElementById("reflectInstructions").value);
@@ -13,6 +11,7 @@
 
 <p class="small-space-top"><fmt:message key="label.authoring.advanced.record" /></p>
 <p>
+<!-- Minimum number of records learner must provide -->
 <label for="minRecords">
 <fmt:message key="label.common.min" /></label> <html:select property="daco.minRecords"
 	styleClass="noBorder">
@@ -22,7 +21,10 @@
 	<c:forEach begin="1" end="50" var="index">
 		<html:option value="${index}">${index}</html:option>
 	</c:forEach>
-</html:select> <label for="maxRecords" style="space-left"> <fmt:message key="label.common.max" /> </label> 
+</html:select>
+<label for="maxRecords" style="space-left"> <fmt:message key="label.common.max" /> </label> 
+
+<!-- Maximum number of records learner must provide -->
 <html:select
 	property="daco.maxRecords" styleClass="noBorder">
 	<html:option value="0">
Index: lams_tool_daco/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/basic.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_daco/web/pages/authoring/basic.jsp	31 Jul 2008 03:51:05 -0000	1.3
+++ lams_tool_daco/web/pages/authoring/basic.jsp	12 Aug 2008 01:43:04 -0000	1.4
@@ -1,10 +1,11 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-<c:set var="showMessageURL">
-	<html:rewrite page='/authoring/newQuestion.do?sessionMapID=${formBean.sessionMapID}&questionType=' />
-</c:set>
+<c:url var="showMessageURL" value='/authoring/newQuestion.do'>
+	<c:param name="sessionMapID" value="${formBean.sessionMapID}" />
+</c:url>
 
 <script type="text/javascript">
+	//Showes the add/edit question area
 	function showQuestionInputArea(url) {
 
 		var area=document.getElementById("questionInputArea");
@@ -38,13 +39,12 @@
 	//Shows the add/edit question area for the corresponding question type
    function showQuestionInputAreaByType(url){
 	 var questionTypeDropdown=document.getElementById("questionType");
-	 showQuestionInputArea(url.concat(questionTypeDropdown.selectedIndex + 1));
+	 showQuestionInputArea(url+"&questionType="+(questionTypeDropdown.selectedIndex + 1));
 }
 	
 	
 	function editQuestion(questionIndex,sessionMapID){
-		var reqID = new Date();
-		var url = "<c:url value="/authoring/editQuestion.do?questionIndex="/>" + questionIndex +"&reqID="+reqID.getTime()+"&sessionMapID="+sessionMapID;
+		var url = "<c:url value="/authoring/editQuestion.do?questionIndex="/>" + questionIndex +"&reqID="+(new Date()).getTime()+"&sessionMapID="+sessionMapID;
 		showQuestionInputArea(url);
 	}
 	
@@ -53,24 +53,25 @@
 		
 	function deleteQuestion(questionIndex,sessionMapID){
 		var url = "<c:url value='/authoring/removeQuestion.do'/>";
-	    var reqID = new Date();
-		var param = "questionIndex=" + questionIndex +"&reqID="+reqID.getTime()+"&sessionMapID="+sessionMapID;;
+		var param = "questionIndex=" + questionIndex +"&reqID="+(new Date()).getTime()+"&sessionMapID="+sessionMapID;;
 		deleteQuestionLoading();
 	    var myAjax = new Ajax.Updater(
 		    	questionListTargetDiv,
 		    	url,
 		    	{
-		    		method:'get',
+		    		method:'post',
 		    		parameters:param,
 		    		onComplete:deleteQuestionComplete,
 		    		evalScripts:true
 		    	}
 	    );
 	}
 	
+
 	function deleteQuestionLoading(){
 		showBusy("#questionListArea");
 	}
+	
 	function deleteQuestionComplete(){
 		hideBusy("#questionListArea");
 	}
@@ -90,7 +91,7 @@
 		<lams:FCKEditor id="daco.instructions" value="${formBean.daco.instructions}" contentFolderID="${formBean.contentFolderID}"></lams:FCKEditor></td>
 	</tr>
 </table>
-
+<!-- Dropdown menu for choosing a question type -->
 <div id="questionListArea"><c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 <%@ include	file="/pages/authoring/parts/questionlist.jsp"%></div>
 <p><select id="questionType" style="float: left">
Index: lams_tool_daco/web/pages/authoring/definelaterforbid.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/definelaterforbid.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_daco/web/pages/authoring/definelaterforbid.jsp	31 Jul 2008 03:51:05 -0000	1.2
+++ lams_tool_daco/web/pages/authoring/definelaterforbid.jsp	12 Aug 2008 01:43:04 -0000	1.3
@@ -4,7 +4,6 @@
 <html:html locale="true">
 <lams:head>
 	<title><fmt:message key="label.author.title" /></title>
-
 	<%@ include file="/common/header.jsp"%>
 </lams:head>
 <body class="stripes">
@@ -13,9 +12,8 @@
 		<h1>
 			<fmt:message key="label.common.heading" />
 		</h1>
-
-		<B><fmt:message key="message.monitoring.edit.activity.not.editable" /></B>
+		<b><fmt:message key="message.monitoring.edit.activity.not.editable" /></b>
 	</div>
 	</div>
 </body>
-</html:html>
+</html:html>
\ No newline at end of file
Index: lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp	8 Aug 2008 08:10:22 -0000	1.5
+++ lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp	12 Aug 2008 01:43:04 -0000	1.6
@@ -6,6 +6,7 @@
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
 	<lams:css style="tabbed" />
+	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var removeAnswerOptionUrl = "<c:url value='/authoring/removeAnswerOption.do'/>";
        var addAnswerOptionUrl = "<c:url value='/authoring/newAnswerOption.do'/>";
@@ -17,7 +18,7 @@
 </lams:head>
 <body class="tabpart">
 
-<!-- Basic Info Form-->
+<!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
 	<html:hidden property="sessionMapID" />
Index: lams_tool_daco/web/pages/authoring/parts/adddate.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/parts/adddate.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_daco/web/pages/authoring/parts/adddate.jsp	8 Aug 2008 08:10:22 -0000	1.3
+++ lams_tool_daco/web/pages/authoring/parts/adddate.jsp	12 Aug 2008 01:43:04 -0000	1.4
@@ -6,6 +6,7 @@
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
 	<lams:css style="tabbed" />
+	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
        var msgHideAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.hide' />";
@@ -15,7 +16,7 @@
 </lams:head>
 <body class="tabpart">
 
-<!-- Basic Info Form-->
+<!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
 	<html:hidden property="sessionMapID" />
Index: lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp	8 Aug 2008 08:10:22 -0000	1.4
+++ lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp	12 Aug 2008 01:43:04 -0000	1.5
@@ -6,6 +6,7 @@
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
 	<lams:css style="tabbed" />
+	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var removeAnswerOptionUrl = "<c:url value='/authoring/removeAnswerOption.do'/>";
        var addAnswerOptionUrl = "<c:url value='/authoring/newAnswerOption.do'/>";
@@ -17,7 +18,7 @@
 </lams:head>
 <body class="tabpart">
 
-<!-- Basic Info Form-->
+<!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
 	<html:hidden property="sessionMapID" />
Index: lams_tool_daco/web/pages/authoring/parts/addfile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/parts/addfile.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_daco/web/pages/authoring/parts/addfile.jsp	8 Aug 2008 08:10:22 -0000	1.3
+++ lams_tool_daco/web/pages/authoring/parts/addfile.jsp	12 Aug 2008 01:43:04 -0000	1.4
@@ -6,6 +6,7 @@
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
 	<lams:css style="tabbed" />
+	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
        var msgHideAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.hide' />";
@@ -15,7 +16,7 @@
 </lams:head>
 <body class="tabpart">
 
-<!-- Basic Info Form-->
+<!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
 	<html:hidden property="sessionMapID" />
Index: lams_tool_daco/web/pages/authoring/parts/addimage.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/parts/addimage.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_daco/web/pages/authoring/parts/addimage.jsp	8 Aug 2008 08:10:22 -0000	1.3
+++ lams_tool_daco/web/pages/authoring/parts/addimage.jsp	12 Aug 2008 01:43:04 -0000	1.4
@@ -6,6 +6,7 @@
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
 	<lams:css style="tabbed" />
+	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
        var msgHideAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.hide' />";
@@ -15,7 +16,7 @@
 </lams:head>
 <body class="tabpart">
 
-<!-- Basic Info Form-->
+<!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
 	<html:hidden property="sessionMapID" />
Index: lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp	8 Aug 2008 08:10:21 -0000	1.3
+++ lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp	12 Aug 2008 01:43:04 -0000	1.4
@@ -8,6 +8,7 @@
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
 	<lams:css style="tabbed" />
+	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
        var msgHideAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.hide' />";
@@ -17,7 +18,7 @@
 
 </lams:head>
 <body class="tabpart">
-<!-- Basic Info Form-->
+<!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
 	<html:hidden property="sessionMapID" />
Index: lams_tool_daco/web/pages/authoring/parts/addnumber.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/parts/addnumber.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_daco/web/pages/authoring/parts/addnumber.jsp	8 Aug 2008 08:10:22 -0000	1.4
+++ lams_tool_daco/web/pages/authoring/parts/addnumber.jsp	12 Aug 2008 01:43:04 -0000	1.5
@@ -6,6 +6,7 @@
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
 	<lams:css style="tabbed" />
+	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
        var msgHideAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.hide' />";
@@ -15,7 +16,7 @@
 </lams:head>
 <body class="tabpart">
 
-<!-- Basic Info Form-->
+<!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
 	<html:hidden property="sessionMapID" />
Index: lams_tool_daco/web/pages/authoring/parts/addradio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/parts/addradio.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_daco/web/pages/authoring/parts/addradio.jsp	8 Aug 2008 08:10:21 -0000	1.4
+++ lams_tool_daco/web/pages/authoring/parts/addradio.jsp	12 Aug 2008 01:43:04 -0000	1.5
@@ -6,6 +6,7 @@
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
 	<lams:css style="tabbed" />
+	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var removeAnswerOptionUrl = "<c:url value='/authoring/removeAnswerOption.do'/>";
        var addAnswerOptionUrl = "<c:url value='/authoring/newAnswerOption.do'/>";
@@ -17,7 +18,7 @@
 </lams:head>
 <body class="tabpart">
 
-<!-- Basic Info Form-->
+<!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
 	<html:hidden property="sessionMapID" />
Index: lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp	8 Aug 2008 08:10:21 -0000	1.3
+++ lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp	12 Aug 2008 01:43:04 -0000	1.4
@@ -6,6 +6,7 @@
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
 	<lams:css style="tabbed" />
+	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
        var msgHideAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.hide' />";
@@ -15,7 +16,7 @@
 </lams:head>
 <body class="tabpart">
 
-<!-- Basic Info Form-->
+<!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
 	<html:hidden property="sessionMapID" />
Index: lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp	8 Aug 2008 08:10:21 -0000	1.3
+++ lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp	12 Aug 2008 01:43:04 -0000	1.4
@@ -6,6 +6,7 @@
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
 	<lams:css style="tabbed" />
+	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
        var msgHideAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.hide' />";
@@ -16,7 +17,7 @@
 <body class="tabpart">
 
 
-<!-- Basic Info Form-->
+<!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
Index: lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp	8 Aug 2008 08:10:22 -0000	1.4
+++ lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp	12 Aug 2008 01:43:04 -0000	1.5
@@ -9,6 +9,8 @@
 <div class="field-name"><fmt:message key="label.authoring.basic.answeroption" /></div>
 <a href="#" onclick="javascript:addAnswerOption()" class="button left-buttons"><fmt:message
 	key="label.authoring.basic.answeroption.add" /></a>
+	
+		<%-- This image is shown when answer options are downloaded from a server. --%>
 		<img src="${ctxPath}/includes/images/indicator.gif"
 			style="display:none;" id="answerOptionsArea_Busy" name="answerOptionsArea_Busy"/>
 <table>
@@ -17,28 +19,30 @@
 			<td width="3px">${fn:substring(ordinal,status.index,status.index+1)})</td>
 			<td><input type="text" name="answerOptionItemDesc${status.index+1}" id="answerOptionItemDesc${status.index+1}" size="60" value="${item}"></td>
 
-			<td><%-- Don't display down icon if last line --%>
+			<td>
+			<%-- Don't display up icon if first line --%>
 			<c:choose>
-				<c:when test="${status.index > 0}">
-					<img src="<html:rewrite page='/includes/images/uparrow.gif'/>" border="0"
-						title="<fmt:message key="label.authoring.basic.answeroption.up"/>" onclick="javascript:upItem('${status.index+1}')">
-				</c:when>
-				<c:otherwise>
+				<c:when test="${status.first}">
 					<img src="<html:rewrite page='/includes/images/uparrow_disabled.gif'/>" border="0"
 						title="<fmt:message key="label.authoring.basic.answeroption.up"/>">
+				</c:when>
+				<c:otherwise>
+					<img src="<html:rewrite page='/includes/images/uparrow.gif'/>" border="0"
+						title="<fmt:message key="label.authoring.basic.answeroption.up"/>" onclick="javascript:upItem('${status.index+1}')">
 				</c:otherwise>
 			</c:choose>
+			<%-- Don't display down icon if last line --%>
 			<c:choose>
-				<c:when test="${status.count < listSize}">
-					<img src="<html:rewrite page='/includes/images/downarrow.gif'/>" border="0"
-						title="<fmt:message key="label.authoring.basic.answeroption.down"/>" onclick="javascript:downItem('${status.index+1}','${listSize}')">
+				<c:when test="${status.last}">
+					<img src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>" border="0"
+						title="<fmt:message key="label.authoring.basic.answeroption.down"/>">			
 				</c:when>
 				<c:otherwise>
-					<img src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>" border="0"
-						title="<fmt:message key="label.authoring.basic.answeroption.down"/>">
+					<img src="<html:rewrite page='/includes/images/downarrow.gif'/>" border="0"
+						title="<fmt:message key="label.authoring.basic.answeroption.down"/>" onclick="javascript:downItem('${status.index+1}','${listSize}')">
 				</c:otherwise>
 
-			</c:choose> <%-- Don't display remove icon if less than 2 question answers --%></td>
+			</c:choose> <%-- Don't display remove icon if there is less than 2 answer options --%></td>
 			<c:if test="${listSize > 2}">
 				<td><img src="<html:rewrite page='/includes/images/cross.gif'/>" border="0"
 					title="<fmt:message key="label.common.delete"/>" onclick="javascript:removeAnswerOption('${status.index+1}')"></td>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_daco/web/pages/authoring/parts/questionattachment.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_daco/web/pages/authoring/parts/questionlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/parts/questionlist.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_daco/web/pages/authoring/parts/questionlist.jsp	8 Aug 2008 08:10:22 -0000	1.2
+++ lams_tool_daco/web/pages/authoring/parts/questionlist.jsp	12 Aug 2008 01:43:04 -0000	1.3
@@ -6,6 +6,7 @@
 </c:set>
 
 <div id="questionList">
+<%-- This image is shown when a question is being downloaded from a server. --%>
 <h2 class="spacer-left"><fmt:message key="label.authoring.basic.list.title" /> <img
 	src="${ctxPath}/includes/images/indicator.gif" style="display: none" id="questionListArea_Busy" /></h2>
 
@@ -19,117 +20,53 @@
 
 	<c:forEach var="question" items="${sessionMap.questionList}" varStatus="status">
 		<tr>
-			<%-- Questions type:1=textfield,2=textarea,3=number,4=date,5=File,6=image,7=radio,8=dropdown,9=checkbox,10=longitude/latitude --%>
-			<c:if test="${question.type == 1}">
-				<td><span class="field-name"> <fmt:message key="label.authoring.basic.textfield" /></span></td><td>
-				${question.description}</td>
-				<td width="5%"><img src="${tool}includes/images/edit.gif"
-					title="<fmt:message key="label.common.edit" />"
-					onclick="editQuestion(${status.index},'${sessionMapID}')" /></td>
-				<td width="5%"><img src="${tool}includes/images/cross.gif"
-					title="<fmt:message key="label.common.delete" />"
-					onclick="deleteQuestion(${status.index},'${sessionMapID}')" /></td>
-			</c:if>
-
-			<c:if test="${question.type == 2}">
-				<td><span class="field-name"> <fmt:message key="label.authoring.basic.textarea" /></span></td><td>
-				${question.description}</td>
-				<td width="5%"><img src="${tool}includes/images/edit.gif"
-					title="<fmt:message key="label.common.edit" />"
-					onclick="editQuestion(${status.index},'${sessionMapID}')" /></td>
-				<td width="5%"><img src="${tool}includes/images/cross.gif"
-					title="<fmt:message key="label.common.delete" />"
-					onclick="deleteQuestion(${status.index},'${sessionMapID}')" /></td>
-			</c:if>
-
-			<c:if test="${question.type == 3}">
-				<td><span class="field-name"> <fmt:message key="label.authoring.basic.number" /></span></td><td>
-				${question.description}</td>
-				<td width="5%"><img src="${tool}includes/images/edit.gif"
-					title="<fmt:message key="label.common.edit" />"
-					onclick="editQuestion(${status.index},'${sessionMapID}')" /></td>
-				<td width="5%"><img src="${tool}includes/images/cross.gif"
-					title="<fmt:message key="label.common.delete" />"
-					onclick="deleteQuestion(${status.index},'${sessionMapID}')" /></td>
-			</c:if>
-
-			<c:if test="${question.type == 4}">
-				<td><span class="field-name"> <fmt:message key="label.authoring.basic.date" /></span></td><td>
-				${question.description}</td>
-				<td width="5%"><img src="${tool}includes/images/edit.gif"
-					title="<fmt:message key="label.common.edit" />"
-					onclick="editQuestion(${status.index},'${sessionMapID}')" /></td>
-				<td width="5%"><img src="${tool}includes/images/cross.gif"
-					title="<fmt:message key="label.common.delete" />"
-					onclick="deleteQuestion(${status.index},'${sessionMapID}')" /></td>
-			</c:if>
-
-			<c:if test="${question.type == 5}">
-				<td><span class="field-name"> <fmt:message key="label.authoring.basic.file" /></span></td><td>
-				${question.description}</td>
+			<td><span class="field-name">
+				<c:choose>
+					<c:when test="${question.type == 1}">
+						<span class="field-name"> <fmt:message key="label.authoring.basic.textfield" />
+					</c:when>		
+					<c:when test="${question.type == 2}">
+						<fmt:message key="label.authoring.basic.textarea" />
+					</c:when>
+					<c:when test="${question.type == 3}">
+						<fmt:message key="label.authoring.basic.number" />
+					</c:when>
+					<c:when test="${question.type == 4}">
+						<fmt:message key="label.authoring.basic.date" />
+					</c:when>
+					<c:when test="${question.type == 5}">
+						<fmt:message key="label.authoring.basic.file" />
+					</c:when>
+					<c:when test="${question.type == 6}">
+						<fmt:message key="label.authoring.basic.image" />
+					</c:when>
+					<c:when test="${question.type == 7}">
+						<fmt:message key="label.authoring.basic.radio" />
+					</c:when>
+					<c:when test="${question.type == 8}">
+						<fmt:message key="label.authoring.basic.dropdown" />
+					</c:when>
+					<c:when test="${question.type == 9}">
+						<fmt:message key="label.authoring.basic.checkbox" />
+					</c:when>
+					<c:when test="${question.type == 10}">
+						 <fmt:message key="label.authoring.basic.longlat" />
+					</c:when>
+				</c:choose>
+				</span></td>
+				<td>${question.description}</td>
 				<td><img src="${tool}includes/images/edit.gif"
 					title="<fmt:message key="label.common.edit" />"
 					onclick="editQuestion(${status.index},'${sessionMapID}')" /></td>
 				<td><img src="${tool}includes/images/cross.gif"
 					title="<fmt:message key="label.common.delete" />"
 					onclick="deleteQuestion(${status.index},'${sessionMapID}')" /></td>
-			</c:if>
-			<c:if test="${question.type == 6}">
-				<td><span class="field-name"> <fmt:message key="label.authoring.basic.image" /></span></td><td>
-				${question.description}</td>
-				<td><img src="${tool}includes/images/edit.gif"
-					title="<fmt:message key="label.common.edit" />"
-					onclick="editQuestion(${status.index},'${sessionMapID}')" /></td>
-				<td><img src="${tool}includes/images/cross.gif"
-					title="<fmt:message key="label.common.delete" />"
-					onclick="deleteQuestion(${status.index},'${sessionMapID}')" /></td>
-			</c:if>
-			<c:if test="${question.type == 7}">
-				<td><span class="field-name"> <fmt:message key="label.authoring.basic.radio" /></span></td><td>
-				${question.description}</td>
-				<td><img src="${tool}includes/images/edit.gif"
-					title="<fmt:message key="label.common.edit" />"
-					onclick="editQuestion(${status.index},'${sessionMapID}')" /></td>
-				<td><img src="${tool}includes/images/cross.gif"
-					title="<fmt:message key="label.common.delete" />"
-					onclick="deleteQuestion(${status.index},'${sessionMapID}')" /></td>
-			</c:if>
-			<c:if test="${question.type == 8}">
-				<td><span class="field-name"> <fmt:message key="label.authoring.basic.dropdown" /></span></td><td>
-				${question.description}</td>
-				<td><img src="${tool}includes/images/edit.gif"
-					title="<fmt:message key="label.common.edit" />"
-					onclick="editQuestion(${status.index},'${sessionMapID}')" /></td>
-				<td><img src="${tool}includes/images/cross.gif"
-					title="<fmt:message key="label.common.delete" />"
-					onclick="deleteQuestion(${status.index},'${sessionMapID}')" /></td>
-			</c:if>
-			<c:if test="${question.type == 9}">
-				<td><span class="field-name"> <fmt:message key="label.authoring.basic.checkbox" /></span></td><td>
-				${question.description}</td>
-				<td><img src="${tool}includes/images/edit.gif"
-					title="<fmt:message key="label.common.edit" />"
-					onclick="editQuestion(${status.index},'${sessionMapID}')" /></td>
-				<td><img src="${tool}includes/images/cross.gif"
-					title="<fmt:message key="label.common.delete" />"
-					onclick="deleteQuestion(${status.index},'${sessionMapID}')" /></td>
-			</c:if>
-			<c:if test="${question.type == 10}">
-				<td><span class="field-name"> <fmt:message key="label.authoring.basic.longlat" /></span></td><td>
-				${question.description}</td>
-				<td><img src="${tool}includes/images/edit.gif"
-					title="<fmt:message key="label.common.edit" />"
-					onclick="editQuestion(${status.index},'${sessionMapID}')" /></td>
-				<td><img src="${tool}includes/images/cross.gif"
-					title="<fmt:message key="label.common.delete" />"
-					onclick="deleteQuestion(${status.index},'${sessionMapID}')" /></td>
-			</c:if>
 		</tr>
 	</c:forEach>
 </table>
 </div>
 
-<%-- This script will work when a new question submit in order to refresh "Question List" panel. --%>
+<%-- This script will work when a new question is submited in order to refresh "Question List" panel. --%>
 <script type="text/javascript">
 	if(window.top != null){
 		window.top.hideQuestionInputArea();
Index: lams_tool_daco/web/pages/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/export/exportportfolio.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_daco/web/pages/export/exportportfolio.jsp	8 Aug 2008 08:10:22 -0000	1.2
+++ lams_tool_daco/web/pages/export/exportportfolio.jsp	12 Aug 2008 01:43:04 -0000	1.3
@@ -4,8 +4,11 @@
 <c:set var="sessionMapID" value="${param.sessionMapID}" />
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <c:set var="mode" value="${sessionMap.mode}" />
+<%-- Contains users grouped in sessions, with corresponding records and other details --%>
 <c:set var="monitoringSummary" value="${sessionMap.monitoringSummary}" />
+<%-- To modify behavior of the included files (record lists) --%>
 <c:set var="includeMode" value="exportportfolio" />
+<%-- Whether to display the "View all records" button --%>
 <c:set var="anyRecordsAvailable" value="false" />
 <c:set var="daco" value="${sessionMap.daco}" />
 <c:set var="reflectEntry" value="${sessionMap.reflectEntry}" />
@@ -41,6 +44,7 @@
 		</tr>
 	</table>
 	<c:choose>
+		<%-- Export single page for learner, containing record list, summary table and his reflection entry --%>
 		<c:when test="${mode == 'learner'}">
 			<c:set var="recordList" value="${sessionMap.recordList}" />
 			<%@ include file="/pages/learning/listRecords.jsp" %>
@@ -62,8 +66,12 @@
 			</c:if>
 		</c:when>
 		<c:otherwise>
+			<%-- Export the main page for teacher. It contains table with users grouped in sessions.
+				Additional links are created for viewing record lists and reflection entries.
+			 --%>
 			<c:choose>
 				<c:when test="${empty monitoringSummary || empty monitoringSummary[0].users}">
+					<%-- If no users accessed the activity. --%>
 					<p class="hint">
 						<fmt:message key="message.monitoring.summary.no.session" />
 					</p>
@@ -95,6 +103,7 @@
 									<td style="text-align: center; font-weight: bold;">
 										<c:choose>
 											<c:when test="${user.recordCount > 0}">
+											<%-- If user added any records, a link to view them is displayed --%>
 												<c:set var="anyRecordsAvailable" value="true" />
 												<a href="#" onclick="javascript:launchPopup('learners/${user.uid}-records.html','RecordList')">
 													${user.recordCount}
@@ -111,6 +120,7 @@
 												<fmt:message key="label.monitoring.notebook.none" />
 											</c:when>
 											<c:otherwise>
+												<%-- If user added a reflection entry, a link to view it is displayed--%>
 												<a href="#" onclick="javascript:launchPopup('learners/${user.uid}-reflection.html','Reflection')">
 													<fmt:message key="label.monitoring.notebook.view" />
 												</a>
@@ -122,6 +132,7 @@
 						</c:forEach>
 					</c:forEach>
 					<c:if  test="${anyRecordsAvailable}">
+						<%-- If any user added at least one record, a link to view all records of all users is displayed --%>
 						<a href="#" onclick="javascript:launchPopup('learners/allRecords.html','RecordList')" class="button space-left">
 							<fmt:message key="label.monitoring.viewrecords.all" />
 						</a>
Index: lams_tool_daco/web/pages/export/listRecordsTemplate.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/export/listRecordsTemplate.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_daco/web/pages/export/listRecordsTemplate.jsp	8 Aug 2008 08:10:22 -0000	1.1
+++ lams_tool_daco/web/pages/export/listRecordsTemplate.jsp	12 Aug 2008 01:43:04 -0000	1.2
@@ -3,12 +3,14 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <lams:html>
 <lams:head>
+	<%-- This page is displayed if a teacher clicks on "view records" link in his main portfolio page --%>
 	<title><fmt:message key="label.export.title" /></title>
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 	<c:set var="daco" value="${sessionMap.daco}" />
 	<c:set var="user" value="${sessionMap.user}" />
 	<c:set var="recordList" value="${user.records}" />
+	<%-- To modify behavior of the included files (record lists) --%>
 	<c:set var="includeMode" value="exportportfolio" />
 	<c:set var="userFullName" value="${user.fullName}" />
 	<c:set var="lams">
@@ -33,6 +35,7 @@
 </lams:head>
 <body class="stripes">
 <div id="content">
+	<%-- It displays user's full name, his records and summary table --%>
 	<h1>${userFullName}</h1>
 	<%@ include file="/pages/learning/listRecords.jsp" %>
 	<%@ include file="/pages/learning/questionSummaries.jsp" %>
Index: lams_tool_daco/web/pages/learning/addRecord.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/addRecord.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_daco/web/pages/learning/addRecord.jsp	8 Aug 2008 08:10:22 -0000	1.4
+++ lams_tool_daco/web/pages/learning/addRecord.jsp	12 Aug 2008 01:43:04 -0000	1.5
@@ -7,12 +7,14 @@
 
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <c:set var="daco" value="${sessionMap.daco}" />
+<%-- If the view is horizontal or vertical --%>
 <c:set var="horizontal" value="${sessionMap.learningView=='horizontal'}" />
+<%-- To display A) B) C) in answer options instead of 1) 2) 3) --%>
 <c:set var="ordinal"><fmt:message key="label.authoring.basic.answeroption.ordinal"/></c:set>
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 
 <%@ include file="/common/messages.jsp"%>
-
+<%-- The status of the last add/edit operation. --%>
 <c:if test="${recordOperationSuccess=='add'}">
 	<div class="info"><fmt:message key="message.learning.addrecordsuccess" /></div>
 </c:if>
@@ -30,11 +32,12 @@
 	</tr>
 </table>
 <c:if test="${not finishedLock }">
+
 	<p class="hint">
 		<fmt:message key="label.learning.heading.recordnumber" />
 		<span id="displayedRecordNumberSpan" class="hint">${displayedRecordNumber}</span>
 	</p>
-	
+	<!-- Form to add/edit a record -->
 	<html:form action="learning/saveOrUpdateRecord" method="post" styleId="recordForm" enctype="multipart/form-data">
 	
 	<c:set var="fileNumber" value="0" />
@@ -50,12 +53,16 @@
 					<div class="bigNumber">${questionStatus.index+1}</div>
 					${question.description}
 					<c:choose>
-						<c:when test="${question.type==1}">
+						<%-- The content varies depending on the question type --%>
+						<c:when test="${question.type==1}"><%-- Single line text --%>
 							<div class="hint"><fmt:message key="label.learning.textfield.hint" /></div>		
 							<c:if test="${horizontal}">
 								</td><td style="vertical-align: middle;">
 							</c:if>
 							<c:choose>
+								<%-- Textfield entry length is limited 
+									depending on the maximum number of characters the teacher provided
+								--%>
 								<c:when test="${question.max!=null}">
 									<html:text property="answer[${answerIndex}]" size="60" maxlength="${question.max}" />
 								</c:when>
@@ -65,18 +72,21 @@
 							</c:choose>
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 						</c:when>
-						<c:when test="${question.type==2}">
+						<c:when test="${question.type==2}"><%-- Multi-line text --%>
 							<div class="hint"><fmt:message key="label.learning.textarea.hint" /></div>
 							<c:if test="${horizontal}">
 								</td><td style="vertical-align: middle;">
 							</c:if>
 							<html:textarea property="answer[${answerIndex}]" cols="50" rows="3" />
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 						</c:when>
-						<c:when test="${question.type==3}">
+						<c:when test="${question.type==3}"><%-- Number --%>
 							<div class="hint"><fmt:message key="label.learning.number.hint" />
 							<c:if test="${not empty question.digitsDecimal}">
 								<br />
+								<%-- An information for the learner is displayed,
+									if the number he provides will be rounded to the number of places after the decimal point,
+									as stated by the teacher. --%>
 								<fmt:message key="label.learning.number.decimal">
 									<fmt:param value="${question.digitsDecimal}" />
 								</fmt:message>
@@ -88,7 +98,7 @@
 							<html:text property="answer[${answerIndex}]" size="10" />
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 						</c:when>
-						<c:when test="${question.type==4}">
+						<c:when test="${question.type==4}"><%-- Date can be entered in three textfields --%>
 							<div class="hint"><fmt:message key="label.learning.date.hint" /></div>
 							<c:if test="${horizontal}">
 								</td><td style="vertical-align: middle;">
@@ -106,33 +116,34 @@
 							
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 						</c:when>
-						<c:when test="${question.type==5}">
+						<c:when test="${question.type==5}"><%-- File --%>
 							<div class="hint"><fmt:message key="label.learning.file.hint" /></div>
 							<c:if test="${horizontal}">
 								</td><td style="vertical-align: middle;">
 							</c:if>
 							<html:file styleId="file-${fileNumber+1}" property="file[${fileNumber}]" size="50" />
 							<c:set var="fileNumber" value="${fileNumber+1}" />
 						</c:when>
-						<c:when test="${question.type==6}">
+						<c:when test="${question.type==6}"><%-- Image --%>
 							<div class="hint"><fmt:message key="label.learning.image.hint" /></div>
 							<c:if test="${horizontal}">
 								</td><td style="vertical-align: middle;">
 							</c:if>
 							<html:file styleId="file-${fileNumber+1}" property="file[${fileNumber}]" size="50" />
 							<c:set var="fileNumber" value="${fileNumber+1}" />
 						</c:when>
-						<c:when test="${question.type==7}">
+						<c:when test="${question.type==7}"><%-- Radio buttons  --%>
 							<div class="hint"><fmt:message key="label.learning.radio.hint" /></div>
 							<c:if test="${horizontal}">
 								</td><td style="vertical-align: middle;">
 							</c:if>
 							<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
+							<%-- It displays for example A) instead of 1) --%>
 							${fn:substring(ordinal,status.index,status.index+1)}) <html:radio property="answer[${answerIndex}]" value="${status.index+1}">${answerOption.answerOption}</html:radio><br />
 							</c:forEach>
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 						</c:when>
-						<c:when test="${question.type==8}">
+						<c:when test="${question.type==8}"><%-- Dropdown menu --%>
 							<div class="hint"><fmt:message key="label.learning.dropdown.hint" /></div>
 							<c:if test="${horizontal}">
 								</td><td style="vertical-align: middle;">
@@ -145,7 +156,7 @@
 							</html:select>
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 						</c:when>
-						<c:when test="${question.type==9}">
+						<c:when test="${question.type==9}"><%-- Checkboxes --%>
 							<div class="hint"><fmt:message key="label.learning.checkbox.hint" /></div>
 							<c:if test="${horizontal}">
 								</td><td style="vertical-align: middle;">
@@ -159,7 +170,7 @@
 							</c:forEach>
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 						</c:when>
-						<c:when test="${question.type==10}">
+						<c:when test="${question.type==10}"><%-- Longitude/latitude --%>
 							<div class="hint"><fmt:message key="label.learning.longlat.hint" /></div>
 							<c:if test="${horizontal}">
 								</td>
@@ -202,6 +213,7 @@
 	</html:form>
 </c:if>
 <c:if test="${sessionMap.userFinished and daco.reflectOnActivity}">
+	<%-- Buttons that either move onto the next activity or display the reflection screen --%>
 	<p class="small-space-top">
 		<h2 style="padding-left: 20px;">${daco.reflectInstructions}</h2>
 		<div class="button-add-div">
Index: lams_tool_daco/web/pages/learning/finish.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/finish.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_daco/web/pages/learning/finish.jsp	4 Jul 2008 07:14:25 -0000	1.2
+++ lams_tool_daco/web/pages/learning/finish.jsp	12 Aug 2008 01:43:04 -0000	1.3
@@ -2,7 +2,7 @@
 		"http://www.w3.org/TR/html4/loose.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
-<%-- This page just for : redir finish page to parent rather that part of the frame --%>
+<%-- This page just for : redirect finish page to parent rather that part of the frame --%>
 <html>
 	<body class="stripes">
 	<script type="text/javascript">
Index: lams_tool_daco/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/learning.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_daco/web/pages/learning/learning.jsp	8 Aug 2008 08:10:22 -0000	1.5
+++ lams_tool_daco/web/pages/learning/learning.jsp	12 Aug 2008 01:43:04 -0000	1.6
@@ -22,6 +22,7 @@
 	</c:if>
 	
 	<c:choose>
+		<%-- To return to the previous tab.  --%>
 		<c:when test="${not empty sessionMap.learningCurrentTab}">
 			<c:set var="learningCurrentTab" value="${sessionMap.learningCurrentTab}" />
 		</c:when>
@@ -51,15 +52,14 @@
 </lams:Tabs></div>
 
 <div id="content-learner">
+<%-- To switch between the vertical/horizontal view --%>
 <div style="float: right; margin-left: 10px; padding-top: 4px" class="help">
 	<img src="${tool}includes/images/uparrow.gif" title="<fmt:message key="label.common.view.change" />"
 	 onclick="javascript:changeView('${sessionMapID}',${displayedRecordNumber})" />
 </div>
 
 <lams:help toolSignature="<%= DacoConstants.TOOL_SIGNATURE %>" module="learning" />
 
-
-
 <c:if test="${daco.lockOnFinished and mode != 'teacher'}">
 	<div class="info"><c:choose>
 		<c:when test="${sessionMap.userFinished}">
Index: lams_tool_daco/web/pages/learning/listRecords.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/listRecords.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_daco/web/pages/learning/listRecords.jsp	8 Aug 2008 08:10:22 -0000	1.7
+++ lams_tool_daco/web/pages/learning/listRecords.jsp	12 Aug 2008 01:43:04 -0000	1.8
@@ -2,7 +2,7 @@
 <div id="recordListDiv">
 
 <%@ include file="/common/taglibs.jsp"%>
-
+<%-- This page modifies its content depending on the page it was included from. --%>
 <c:if test="${not empty param.includeMode}">
 	<c:set var="includeMode" value="${param.includeMode}" />
 </c:if>
@@ -16,13 +16,16 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
+<%-- Wheter to display the vertical or horizontal view. --%>
 <c:set var="horizontal" value="${sessionMap.learningView=='horizontal'}" />
 <c:if test="${empty isIE}">
+	<%-- Some elements are displayed differently depending on the browser. --%>
 	<c:set var="userAgent" value='<%=request.getHeader("User-Agent") %>' />
 	<c:set var="isIE" value='${(not empty userAgent) && fn:indexOf(userAgent,"MSIE") != -1}' scope="session" />
 </c:if>
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 <c:choose>
+	<%-- This page can be included multiple times on a single master page. That is why element IDs need prefixes. --%>
 	<c:when test="${includeMode=='learning'}">
 		<c:set var="elementIdPrefix" value="" />
 	</c:when>
@@ -31,10 +34,11 @@
 	</c:otherwise>
 </c:choose>
 <script type="text/javascript">
-	var editRecordUrl = "<html:rewrite page='/learning/editRecord.do' />";
-	var removeRecordUrl = "<html:rewrite page='/learning/removeRecord.do' />";
+	var editRecordUrl = "<c:url value='/learning/editRecord.do' />";
+	var removeRecordUrl = "<c:url value='/learning/removeRecord.do' />";
 </script>
 <c:if test="${empty recordList}">
+	<%-- In some cases record list is passed as an attribute, in other - in session map. --%>
 	<c:set var="recordList" value="${sessionMap.recordList}" />
 </c:if>
 
@@ -59,6 +63,7 @@
 	</c:when>
 	<c:otherwise>
 		<c:choose>
+			<%-- Indenting is different depending on the page this page is included to. --%>
 			<c:when test='${includeMode=="learning"}'>
 				<p class="hint" style="margin-left: 17px; font-weight: bold;">
 					<fmt:message key="label.learning.heading.recordcount" />: ${fn:length(recordList)}
@@ -73,6 +78,7 @@
 
 		<c:choose>
 			<c:when test="${horizontal}">
+				<%-- Horizontal view creates a table with question list and one large cell where iframe with records is displayed --%>
 				<table cellspacing="0" class="alternative-color" id="recordListTable">
 					<tr>
 						<th><fmt:message key="label.learning.tableheader.questions" /></th>
@@ -81,15 +87,17 @@
 					<tr>
 					<td class="fixedCellHeight" style="width: 160px"><fmt:message key="label.learning.tableheader.recordnumber" /></td>
 					<td rowspan="${fn:length(daco.dacoQuestions) + 2}" style="padding: 0px; height: 100%;">
+						<%-- Link that displayes the horizontal record list --%>
 						<c:url var="showRecordsUrl" value='/learning/diplayHorizontalRecordList.do'>
 							<c:param name="sessionMapID" value="${sessionMapID}" />
 							<c:if test="${includeMode=='monitoring'}">
 								<c:param name="userUid" value="${user.uid}" />
 							</c:if>
 							<c:param name="includeMode" value="${includeMode}" />
 						</c:url>
-						<iframe id="${elementIdPrefix}horizontalRecordListFrame" onLoad="javascript:resizeHorizontalRecordListFrame('${elementIdPrefix}',${fn:length(daco.dacoQuestions)});" style="width: 100%;"
-						frameborder="0" scrolling="auto" src="${showRecordsUrl}"></iframe>
+						<iframe id="${elementIdPrefix}horizontalRecordListFrame"
+								onLoad="javascript:resizeHorizontalRecordListFrame('${elementIdPrefix}',${fn:length(daco.dacoQuestions)});"
+								style="width: 100%;" frameborder="0" scrolling="auto" src="${showRecordsUrl}"></iframe>
 					</td>
 					
 					</tr>
@@ -104,13 +112,15 @@
 				</table>
 			</c:when>
 			<c:otherwise>
+				<%-- Vertical view displays records as separate tables of answers. --%>
 				<c:forEach var="record" items="${recordList}" varStatus="recordStatus">
 				<table>
 					<tr>
 						<td class="hint">
 							<fmt:message key="label.learning.heading.recordnumber" /> ${recordStatus.index+1}
 						</td>
 						<c:if test='${includeMode=="learning" and not finishedLock}'>
+						<%-- If the record can be edited, display these links. --%>
 						<td width="5%">
 							<img src="${tool}includes/images/edit.gif"
 								title="<fmt:message key="label.common.edit" />"
@@ -127,6 +137,9 @@
 				
 					<table cellspacing="0" class="alternative-color recordList">
 						<c:forEach var="question" items="${daco.dacoQuestions}" varStatus="questionStatus">
+							<%-- "Generated" means that the table for a long/lat question was already generated
+								 and the current answer only needs to be filled in in the existing textfield.
+							--%>
 							<c:set var="generated" value="false" />
 							<c:forEach var="answer" items="${record}" varStatus="answerStatus">
 								<c:if test="${answer.question.uid==question.uid}">
@@ -136,6 +149,9 @@
 											<c:if test="${not empty question.answerOptions and not empty longitude}">
 												<c:set var="mapLinks">
 													<c:forEach var="selectedMap" items="${question.answerOptions}">
+														<%-- Display the links for external maps,
+														where the longitude and latitude can be marked and shown.
+														Strange syntax of this var (mapLinks) comes from later usage in a javascript.--%>
 														<c:choose>
 															<c:when test="${selectedMap.answerOption=='Google Maps'}">
 																'<a onclick="javascript:launchPopup('+"'http://maps.google.com/maps?q=${longitude},+${answer.answer}&iwloc=A&hl=en','LAMS');"+'" href="#">${selectedMap.answerOption}</a><br />'+
@@ -153,10 +169,12 @@
 													</c:forEach>
 												</c:set>
 												<script type="text/javascript">
+													<%-- Fill the existing cell in long/lat question table with created links. --%>
 													document.getElementById("${elementIdPrefix}maplinks-record${recordStatus.index+1}-question${questionStatus.index+1}").innerHTML=''+${mapLinks}'';
 												</script>
 											</c:if>
 											<script type="text/javascript">
+												<%-- Set the value of latitude in long/lat question according to the answer. --%>
 												setValue("${elementIdPrefix}latitude-record${recordStatus.index+1}-question${questionStatus.index+1}","${answer.answer}");
 											</script>
 										</c:if>
@@ -174,10 +192,11 @@
 												<c:when test="${question.type==2}">
 													<textarea  cols="55" 
 														<c:choose>
-															<c:when test="${isIE}">
+															<c:when test="${isIE}">															
 																rows="3"
 															</c:when>
 															<c:otherwise>
+																<%-- In Firefox 2 rows are displayed as 3 rows (!) --%>
 																rows="2"
 															</c:otherwise>
 														</c:choose>
@@ -189,6 +208,7 @@
 												<c:when test="${question.type==4}">
 													<c:set var="date">
 														<c:if test="${not empty answer.answer}">
+															<%-- To display a date a single textfield with formatted date is used. --%>
 															<lams:Date value="${fn:trim(answer.answer)}" type="date" style="medium"/>
 														</c:if>
 													</c:set>
@@ -202,6 +222,8 @@
 														<c:otherwise>
 															<fmt:message key="label.learning.file.uploaded" />
 															<c:choose>
+																<%-- The file can be downloaded back from the server.
+																	It is done differently in learning and export portfolio modes. --%>
 																<c:when test="${includeMode=='exportportfolio'}">
 																	<a href="<c:url value='files/${answer.fileUuid}-${answer.fileName}'/>">${answer.fileName}</a>
 																</c:when>
@@ -253,6 +275,7 @@
 																<label><fmt:message key="label.learning.longlat.longitude.unit" /></label><br />
 															</td>
 															<c:if test="${not empty question.answerOptions and not empty longitude}">
+																<%-- A placeholder for external maps links --%>
 																<td rowspan="2" id="${elementIdPrefix}maplinks-record${recordStatus.index+1}-question${questionStatus.index+1}">
 																</td>
 															</c:if>						
@@ -274,6 +297,9 @@
 									</c:otherwise>
 									</c:choose>
 									<c:if test="${question.type==9 && (not empty answer.answer)}">
+										<%-- Each answer contains one piece of information: whether the checkbox is checked or not.
+											Since the whole table is generated for the first answer,
+											other answers simply check the existing boxes. --%>
 										<script type="text/javascript">
 											checkCheckbox("${elementIdPrefix}checkbox-record${recordStatus.index+1}-question${questionStatus.index+1}-${answer.answer}");
 										</script>
Index: lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	8 Aug 2008 08:10:22 -0000	1.5
+++ lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	12 Aug 2008 01:43:04 -0000	1.6
@@ -11,10 +11,13 @@
 	<c:set var="tool">
 		<lams:WebAppURL />
 	</c:set>
+	<%-- This page modifies its content depending on the page it was included from. --%>
 	<c:set var="includeMode" value="${param.includeMode}" />
 	<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
+	<%-- It contains users info divided into sessions. --%>
 	<c:set var="monitoringSummary" value="${sessionMap.monitoringSummary}" />
 	<c:choose>
+		<%-- Record list comes from different sources, depending on the including page. --%>
 		<c:when test="${includeMode=='learning'}">
 			<c:set var="recordList" value="${sessionMap.recordList}" />
 		</c:when>
@@ -30,6 +33,7 @@
 	</c:choose>
 
 	<lams:css style="tabbed" />
+	<%-- To enable the table to have maximum height.  --%>
 	<style type="text/css">
 		html,body {
 			height: 100%;
@@ -46,6 +50,7 @@
 <body class="tabpart">
 	
 	<table id="horizontalListTable" class="alternative-color" cellspacing="0">
+		<%-- Each column is one record. This is pure data - header was done in the including page.  --%>
 		<tr>
 			<c:forEach var="record" items="${recordList}" varStatus="recordStatus">
 				<td class="fixedCellHeight">
@@ -54,6 +59,7 @@
 					</div>
 					<c:if test='${includeMode=="learning" and not finishedLock}'>
 						<div >
+						<%-- If the record can be edited, display these links. --%>
 						<img src="${tool}includes/images/edit.gif"
 								title="<fmt:message key="label.common.edit" />"
 								onclick="javascript:parent.editRecord('${sessionMapID}',${recordStatus.index+1})" />
@@ -70,6 +76,7 @@
 		<c:forEach var="question" items="${daco.dacoQuestions}" varStatus="questionStatus">	
 		<tr>
 			<c:forEach var="record" items="${recordList}" varStatus="recordStatus">
+			<%-- For comments on the structure, see "learning/listRecords.jsp" --%>
 				<c:set var="generated" value="false" />
 				<c:forEach var="answer" items="${record}" varStatus="answerStatus">
 					<c:if test="${answer.question.uid==question.uid}">
@@ -108,6 +115,9 @@
 								<c:set var="generated" value="true" />
 										<td class="fixedCellHeight"
 												<c:choose>
+												<%-- Iframes are displayed differently in some browsers, this code fixes it.
+													The last cell in a column is shorter to accomodate the horizontal scrollbar.
+												 --%>
 													<c:when test="${isIE}">
 														<c:if test="${questionStatus.index==fn:length(daco.dacoQuestions)-1 && fn:length(recordList)>1}">
 																id="lastHorizontalQuestion"
Index: lams_tool_daco/web/pages/learning/questionSummaries.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/questionSummaries.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_daco/web/pages/learning/questionSummaries.jsp	8 Aug 2008 08:10:22 -0000	1.3
+++ lams_tool_daco/web/pages/learning/questionSummaries.jsp	12 Aug 2008 01:43:04 -0000	1.4
@@ -1,14 +1,16 @@
 <%@ include file="/common/taglibs.jsp"%>
 <div id="questionSummariesDiv">
-
+<%--  --%>
 <c:if test="${not empty param.sessionMapID}">
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 </c:if>
 
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <c:if test="${empty recordList}">
+	<%-- In some cases record list is passed as an attribute, in other - in session map. --%>
 	<c:set var="recordList" value="${sessionMap.recordList}" />
 </c:if>
+<%-- This page modifies its content depending on the page it was included from. --%>
 <c:if test="${empty includeMode}">
 	<c:set var="includeMode" value="learning" />
 </c:if>
@@ -88,10 +90,12 @@
 			<c:choose>
 				<c:when test="${question.type==3 && not empty question.summary}">
 					<c:choose>
+						<%-- Part of the content is displayed depending on the summary type --%>
 						<c:when test="${question.summary==1 || question.summary==2}">
 							<c:choose>
-								<c:when test="${(question.summary==1 && empty questionSummary.userSummary[0].sum) 
-											 || (question.summary==2 && empty questionSummary.userSummary[0].average)}">
+								<%-- If no records were provided --%>
+								<c:when test="${(question.summary==1 and empty questionSummary.userSummary[0].sum) 
+											 || (question.summary==2 and empty questionSummary.userSummary[0].average)}">
 									<td class="singleSummaryCell hint">
 										<fmt:message key="label.learning.heading.norecords" />
 									</td>
@@ -100,6 +104,8 @@
 									</td>
 								</c:when>
 								<c:otherwise>
+									<%-- First column shows the summaries for the learner,
+										second one for the whole group (session) --%>
 									<td class="singleSummaryCell">
 										<c:choose>
 											<c:when test="${question.summary==1}">
Index: lams_tool_daco/web/pages/learning/runoffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/Attic/runoffline.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_daco/web/pages/learning/runoffline.jsp	8 Aug 2008 08:10:22 -0000	1.2
+++ lams_tool_daco/web/pages/learning/runoffline.jsp	12 Aug 2008 01:43:04 -0000	1.3
@@ -29,7 +29,7 @@
 		<h1>
 			${daco.title}
 		</h1>
-
+		<%-- Just a message and reflection entry (if exists) --%>
 		<p>
 			<fmt:message key="message.learning.offline" />
 		</p>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_daco/web/pages/learning/success.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_daco/web/pages/monitoring/listRecords.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/monitoring/listRecords.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_daco/web/pages/monitoring/listRecords.jsp	8 Aug 2008 08:10:22 -0000	1.2
+++ lams_tool_daco/web/pages/monitoring/listRecords.jsp	12 Aug 2008 01:43:04 -0000	1.3
@@ -3,12 +3,15 @@
 "http://www.w3.org/TR/html4/loose.dtd">
 <lams:html>
 <lams:head>
+		<%-- This page modifies its content depending on the page it was included from. --%>
 		<c:if test="${not empty param.includeMode}">
 			<c:set var="includeMode" value="${param.includeMode}" />
 		</c:if>
 		<c:if test="${empty includeMode}">
 			<c:set var="includeMode" value="monitoring" />
 		</c:if>
+		<%-- The style sheet file is either on the server (monitoring)
+			or in the parent directory (export portfolio) --%>
 		<c:if test="${includeMode=='exportportfolio'}">
 			<lams:css localLinkPath="../../" />
 			<link rel="StyleSheet" href="../daco.css" type="text/css" />
@@ -39,6 +42,7 @@
 	<div id="content">
 		<c:if test="${includeMode=='monitoring'}">
 			<div style="float: right; margin-left: 10px; padding-top: 4px" class="help">
+				<%-- Switch between the horizontal and vertical views --%>
 				<c:url var="changeViewUrl" value='/monitoring/changeView.do'>
 					<c:param name="sessionMapID" value="${sessionMapID}" />
 					<c:param name="userUid" value="${userUid}" />
@@ -50,6 +54,9 @@
 				<tr>
 					<td class="button-cell">
 						<div style="float: left">
+							<%-- Users in the dropdown menu are divided into groups.
+								 Currently displayed user is selected.
+								 There is also an option to display all records of all users. --%>
 							<select id="userDropdown" style="margin-top: -4px;">
 								<c:forEach var="userGroup" items="${monitoringSummary}">
 									<option value="-1" disabled="disabled">--- ${userGroup.sessionName} ---</option>
@@ -112,6 +119,7 @@
 							</td>
 						</tr>
 					</table>
+					<%-- for each user his record list is displayed --%>
 					<c:if test="${not empty user.records}">
 						<c:set var="recordList" value="${user.records}" />
 						<%@ include file="/pages/learning/listRecords.jsp" %>
Index: lams_tool_daco/web/pages/monitoring/statistics.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/monitoring/statistics.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_daco/web/pages/monitoring/statistics.jsp	8 Aug 2008 08:10:22 -0000	1.2
+++ lams_tool_daco/web/pages/monitoring/statistics.jsp	12 Aug 2008 01:43:04 -0000	1.3
@@ -5,7 +5,8 @@
 <c:set var="userUid" value="${sessionMap.userUid}" />
 <c:url var="refreshStatisticsUrl" value="/monitoring/summary.do?sessionMapID=${sessionMapID}"/>
 
-
+	<%-- Same statistics as in the learner,
+		but with an option to choose currently displayed learner. --%>
 	<c:choose>
 		<c:when test="${empty monitoringSummary || empty monitoringSummary[0].users}">
 			<div align="center" style="font-weight: bold;">