Persistent object/bean that defines the uploaded file for the MCQ tool.
- * Provides accessors and mutators to get/set attributes
- * It maps to database table: tl_lamc11_uploadedFile
- *
+ *
* @author Ozgur Demirtas
- * starts up the monitoring module
*
+
-
+ unknown="false"
+ validate="false"
+ input="/monitoringIndex.jsp">
+
-
-
-
-
-
+
+
+
+
-
- *
+
+ *
*/
public class McMonitoringStarterAction extends Action implements McAppConstants {
@@ -94,327 +103,307 @@
public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException, McApplicationException
{
+ logger.debug("init McMonitoringStarterAction...");
McUtils.cleanUpSessionAbsolute(request);
+
+ IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+ logger.debug("mcService: " + mcService);
- ActionForward validateParameters=validateParameters(request, mapping);
+ McMonitoringForm mcMonitoringForm = (McMonitoringForm) form;
+ logger.debug("mcMonitoringForm: " + mcMonitoringForm);
+
+ McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
+ McGeneralMonitoringDTO mcGeneralMonitoringDTO=new McGeneralMonitoringDTO();
+
+ ActionForward validateParameters=validateParameters(request, mapping, mcMonitoringForm);
logger.debug("validateParamaters: " + validateParameters);
+
if (validateParameters != null)
{
- return validateParameters;
+ //return validateParameters;
+ logger.debug("error validating monitoring parameters");
}
- boolean initData=initialiseMonitoringData(mapping, form, request, response);
+ boolean initData=initialiseMonitoringData(mapping, form, request, response,
+ mcService, mcGeneralMonitoringDTO);
logger.debug("initData: " + initData);
if (initData == false)
- return (mapping.findForward(ERROR_LIST));
+ //return (mapping.findForward(ERROR_LIST));
+ logger.debug("error initialising monitoring parameters");
- request.getSession().setAttribute(CURRENT_MONITORING_TAB, "summary");
- McMonitoringForm mcMonitoringForm = (McMonitoringForm) form;
- mcMonitoringForm.setEditOptionsMode(new Integer(0).toString());
- request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
- request.getSession().setAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS, new Boolean(true).toString());
+ mcMonitoringForm.setCurrentTab("1");
+ mcGeneralMonitoringDTO.setCurrentTab("1");
+ logger.debug("setting current tab to 1: ");
- request.getSession().setAttribute(ACTIVE_MODULE, DEFINE_LATER);
- request.getSession().setAttribute(DEFINE_LATER_IN_EDIT_MODE, new Boolean(false));
- request.getSession().setAttribute(SHOW_AUTHORING_TABS,new Boolean(false).toString());
-
- Long toolContentId=(Long)request.getSession().getAttribute(TOOL_CONTENT_ID);
- logger.debug("toolContentId: " + toolContentId);
+ String toolContentID=mcMonitoringForm.getToolContentID();
+ logger.debug("toolContentID: " + toolContentID);
- IMcService mcService = (IMcService)request.getSession().getAttribute(TOOL_SERVICE);
- logger.debug("mcService: " + mcService);
- if (mcService == null)
- {
- logger.debug("will retrieve mcService");
- mcService = McServiceProxy.getMcService(getServlet().getServletContext());
- logger.debug("retrieving mcService from cache: " + mcService);
- }
-
- McContent mcContent=mcService.retrieveMc(toolContentId);
- logger.debug("mcContent:" + mcContent);
+ mcGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
+ mcGeneralMonitoringDTO.setCountAllUsers(new Integer(0).toString());
+ mcGeneralMonitoringDTO.setCountSessionComplete(new Integer(0).toString());
- logger.debug("TOTAL QUESTION COUNT: " + mcContent.getMcQueContents().size());
- request.getSession().setAttribute(TOTAL_QUESTION_COUNT, new Integer(mcContent.getMcQueContents().size()).toString());
- request.getSession().setAttribute(HR_COLUMN_COUNT, new Integer(mcContent.getMcQueContents().size()+2).toString());
+ McMonitoringAction mcMonitoringAction= new McMonitoringAction();
+ logger.debug("calling initSummaryContent.");
+ mcMonitoringAction.initSummaryContent(toolContentID , request, mcService, mcGeneralMonitoringDTO);
+ logger.debug("post initSummaryContent, mcGeneralMonitoringDTO: " + mcGeneralMonitoringDTO);
- /* it is possible that no users has ever logged in for the activity yet*/
- int countAllUsers=mcService.getTotalNumberOfUsers();
- logger.debug("countAllUsers: " + countAllUsers);
-
- request.getSession().setAttribute(USER_EXCEPTION_NO_STUDENT_ACTIVITY, new Boolean(false));
- if (countAllUsers == 0)
+ logger.debug("calling initInstructionsContent.");
+ logger.debug("post initInstructionsContent, mcGeneralMonitoringDTO: " + mcGeneralMonitoringDTO);
+
+ logger.debug("calling initStatsContent.");
+ mcMonitoringAction.initStatsContent(toolContentID, request, mcService, mcGeneralMonitoringDTO);
+ logger.debug("post initStatsContent, mcGeneralMonitoringDTO: " + mcGeneralMonitoringDTO);
+
+ McContent mcContent=mcService.retrieveMc(new Long(toolContentID));
+ logger.debug("mcContent: " + mcContent);
+
+ /*true means there is at least 1 response*/
+ if (mcService.studentActivityOccurredGlobal(mcContent))
{
- logger.debug("error: countAllUsers is 0");
- request.getSession().setAttribute(USER_EXCEPTION_NO_STUDENT_ACTIVITY, new Boolean(true));
+ mcGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
+ logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false");
}
-
- /* it is possible that no users has ever attempted the activity yet*/
- int totalAttemptCount=MonitoringUtil.getTotalAttemptCount(request);
- logger.debug("totalAttemptCount: " + totalAttemptCount);
- if (totalAttemptCount == 0)
+ else
{
- logger.debug("error: totalAttemptCount is 0");
- request.getSession().setAttribute(USER_EXCEPTION_NO_STUDENT_ACTIVITY, new Boolean(true));
+ mcGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
+ logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to true");
}
-
-
- request.getSession().setAttribute(IS_REVISITING_USER, new Boolean(false));
- request.getSession().setAttribute(RICHTEXT_TITLE,mcContent.getTitle());
- request.getSession().setAttribute(RICHTEXT_INSTRUCTIONS,mcContent.getInstructions());
- request.getSession().setAttribute(PASSMARK, mcContent.getPassMark()); //Integer
-
- Map mapQuestionsContent=AuthoringUtil.rebuildQuestionMapfromDB(request, toolContentId, mcService);
- logger.debug("mapQuestionsContent:" + mapQuestionsContent);
- request.getSession().setAttribute(MAP_QUESTIONS_CONTENT, mapQuestionsContent);
- logger.debug("starter initialized the existing Questions Map: " + request.getSession().getAttribute(MAP_QUESTIONS_CONTENT));
-
- Map mapWeights= AuthoringUtil.rebuildWeightsMapfromDB(request, toolContentId);
- logger.debug("Check the mapWeights: " + mapWeights);
- request.getSession().setAttribute(MAP_WEIGHTS, mapWeights);
-
- Map mapGeneralOptionsContent= new TreeMap(new McComparator());
- request.getSession().setAttribute(MAP_GENERAL_OPTIONS_CONTENT, mapGeneralOptionsContent);
-
- Map mapGeneralSelectedOptionsContent= new TreeMap(new McComparator());
- request.getSession().setAttribute(MAP_GENERAL_SELECTED_OPTIONS_CONTENT, mapGeneralSelectedOptionsContent);
-
- Map mapStartupGeneralOptionsContent= new TreeMap(new McComparator());
- request.getSession().setAttribute(MAP_STARTUP_GENERAL_OPTIONS_CONTENT, mapStartupGeneralOptionsContent);
-
- Map mapStartupGeneralSelectedOptionsContent= new TreeMap(new McComparator());
- request.getSession().setAttribute(MAP_STARTUP_GENERAL_SELECTED_OPTIONS_CONTENT, mapStartupGeneralSelectedOptionsContent);
-
- Map mapDisabledQuestions= new TreeMap(new McComparator());
- request.getSession().setAttribute(MAP_DISABLED_QUESTIONS, mapDisabledQuestions);
-
- Map mapCheckBoxStates= new TreeMap(new McComparator());
- mapCheckBoxStates.put("1" ,"INCORRECT");
- mapCheckBoxStates.put("2" ,"CORRECT");
- request.getSession().setAttribute(MAP_CHECKBOX_STATES, mapCheckBoxStates);
- Map mapSelectedOptions= new TreeMap(new McComparator());
- request.getSession().setAttribute(MAP_SELECTED_OPTIONS, mapSelectedOptions);
+ mcMonitoringForm.setActiveModule(MONITORING);
+ mcGeneralMonitoringDTO.setActiveModule(MONITORING);
- Map mapIncorrectFeedback= new TreeMap(new McComparator());
- request.getSession().setAttribute(MAP_INCORRECT_FEEDBACK, mapIncorrectFeedback);
+ mcMonitoringForm.setSelectedToolSessionId("All");
+ mcGeneralMonitoringDTO.setSelectedToolSessionId("All");
- Map mapCorrectFeedback= new TreeMap(new McComparator());
- request.getSession().setAttribute(MAP_CORRECT_FEEDBACK, mapCorrectFeedback);
+ mcGeneralMonitoringDTO.setRequestLearningReport(new Boolean(false).toString());
+ mcGeneralMonitoringDTO.setIsPortfolioExport(new Boolean(false).toString());
- List listUploadedOffFiles= mcService.retrieveMcUploadedOfflineFilesName(mcContent.getUid());
- logger.debug("existing listUploadedOfflineFileNames:" + listUploadedOffFiles);
- request.getSession().setAttribute(LIST_UPLOADED_OFFLINE_FILENAMES,listUploadedOffFiles);
+ logger.debug("calling submitSession:" + toolContentID);
+ request.setAttribute(MC_GENERAL_MONITORING_DTO, mcGeneralMonitoringDTO);
- List listUploadedOnFiles= mcService.retrieveMcUploadedOnlineFilesName(mcContent.getUid());
- logger.debug("existing listUploadedOnlineFileNames:" + listUploadedOnFiles);
- request.getSession().setAttribute(LIST_UPLOADED_ONLINE_FILENAMES,listUploadedOnFiles);
+ /*this section is needed for Edit Activity screen, from here... */
+ logger.debug("for copy using mcGeneralMonitoringDTO: " + mcGeneralMonitoringDTO);
+ mcGeneralAuthoringDTO.setActivityTitle(mcGeneralMonitoringDTO.getActivityTitle());
+ mcGeneralAuthoringDTO.setActivityInstructions(mcGeneralMonitoringDTO.getActivityInstructions());
+ mcGeneralAuthoringDTO.setActiveModule(MONITORING);
- List listOfflineFilesMetaData=mcService.getOfflineFilesMetaData(mcContent.getUid());
- logger.debug("existing listOfflineFilesMetaData, to be structured as McAttachmentDTO: " + listOfflineFilesMetaData);
- listOfflineFilesMetaData=AuthoringUtil.populateMetaDataAsAttachments(listOfflineFilesMetaData);
- logger.debug("populated listOfflineFilesMetaData: " + listOfflineFilesMetaData);
- request.getSession().setAttribute(LIST_OFFLINEFILES_METADATA, listOfflineFilesMetaData);
-
- List listUploadedOfflineFileNames=AuthoringUtil.populateMetaDataAsFilenames(listOfflineFilesMetaData);
- logger.debug("returned from db listUploadedOfflineFileNames: " + listUploadedOfflineFileNames);
- request.getSession().setAttribute(LIST_UPLOADED_OFFLINE_FILENAMES, listUploadedOfflineFileNames);
-
- /*process online files metadata*/
- List listOnlineFilesMetaData=mcService.getOnlineFilesMetaData(mcContent.getUid());
- logger.debug("existing listOnlineFilesMetaData, to be structured as McAttachmentDTO: " + listOnlineFilesMetaData);
- listOnlineFilesMetaData=AuthoringUtil.populateMetaDataAsAttachments(listOnlineFilesMetaData);
- logger.debug("populated listOnlineFilesMetaData: " + listOnlineFilesMetaData);
- request.getSession().setAttribute(LIST_ONLINEFILES_METADATA, listOnlineFilesMetaData);
-
- List listUploadedOnlineFileNames=AuthoringUtil.populateMetaDataAsFilenames(listOnlineFilesMetaData);
- logger.debug("returned from db listUploadedOnlineFileNames: " + listUploadedOnlineFileNames);
- request.getSession().setAttribute(LIST_UPLOADED_ONLINE_FILENAMES, listUploadedOnlineFileNames);
-
- logger.debug("end of execute: ");
- logger.debug("SUMMARY_TOOL_SESSIONS_ID: " + request.getSession().getAttribute(SUMMARY_TOOL_SESSIONS_ID));
- logger.debug("SUMMARY_TOOL_SESSIONS: " + request.getSession().getAttribute(SUMMARY_TOOL_SESSIONS));
- logger.debug("SELECTION_CASE: " + request.getSession().getAttribute(SELECTION_CASE));
- logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO));
+ Map mapOptionsContent=mcGeneralMonitoringDTO.getMapOptionsContent();
+ logger.debug("mapOptionsContent: " + mapOptionsContent);
+ int maxIndex=mapOptionsContent.size();
+ logger.debug("maxIndex: " + maxIndex);
- boolean isContentInUse=McUtils.isContentInUse(mcContent);
- logger.debug("isContentInUse:" + isContentInUse);
+ logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+ request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+ /*...till here */
- request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString());
- if (isContentInUse == true)
- {
- logger.debug("monitoring url does not allow editActivity since the content is in use.");
- persistError(request,"error.content.inUse");
- request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(true).toString());
- }
- logger.debug("final IS_MONITORED_CONTENT_IN_USE: " + request.getSession().getAttribute(IS_MONITORED_CONTENT_IN_USE));
-
- /*get existing feedback maps*/
- mapIncorrectFeedback = AuthoringUtil.rebuildIncorrectFeedbackMapfromDB(request,toolContentId);
- logger.debug("existing mapIncorrectFeedback:" + mapIncorrectFeedback);
- request.getSession().setAttribute(MAP_INCORRECT_FEEDBACK, mapIncorrectFeedback);
-
- mapCorrectFeedback = AuthoringUtil.rebuildCorrectFeedbackMapfromDB(request, toolContentId);
- logger.debug("existing mapCorrectFeedback:" + mapCorrectFeedback);
- request.getSession().setAttribute(MAP_CORRECT_FEEDBACK, mapCorrectFeedback);
-
- MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);
-
- McMonitoringAction mcMonitoringAction= new McMonitoringAction();
- mcMonitoringAction.prepareReflectionData(request, mcContent, mcService, null, false);
-
- return (mapping.findForward(LOAD_MONITORING_CONTENT));
+ logger.debug("calling submitSession with selectedToolSessionId" + mcMonitoringForm.getSelectedToolSessionId());
+ return mcMonitoringAction.submitSession(mapping, mcMonitoringForm, request, response, mcService, mcGeneralMonitoringDTO);
}
-
+
/**
- * initialises monitoring data mainly for jsp purposes
- * initialiseMonitoringData(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
+ * initialiseMonitoringData(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response,
+ IMcService mcService, McGeneralMonitoringDTO mcGeneralMonitoringDTO)
+
+ initialises monitoring data
*
* @param mapping
* @param form
* @param request
* @param response
- * @return boolean
+ * @param mcService
+ * @param mcGeneralMonitoringDTO
+ * @return
*/
- public boolean initialiseMonitoringData(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
+ public boolean initialiseMonitoringData(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response,
+ IMcService mcService, McGeneralMonitoringDTO mcGeneralMonitoringDTO)
{
- logger.debug("initialising MonitoringData...");
-
- IMcService mcService = (IMcService)request.getSession().getAttribute(TOOL_SERVICE);
- logger.debug("mcService: " + mcService);
- if (mcService == null)
- {
- logger.debug("will retrieve mcService");
- mcService = McServiceProxy.getMcService(getServlet().getServletContext());
- logger.debug("retrieving mcService from cache: " + mcService);
- }
-
- request.getSession().setAttribute(TOOL_SERVICE, mcService);
+ logger.debug("start initializing monitoring data...mcService: " + mcService);
McMonitoringForm mcMonitoringForm = (McMonitoringForm) form;
- /* setting active tab to summary*/
- mcMonitoringForm.setCurrentTab("1");
-
- /*
- * persist time zone information to session scope.
- */
- McUtils.saveTimeZone(request);
- /* we have made sure TOOL_CONTENT_ID is passed */
- Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID);
- logger.debug("toolContentId: " + toolContentId);
+ mcGeneralMonitoringDTO.setCurrentMonitoringTab("summary");
+ mcGeneralMonitoringDTO.setSbmtSuccess(new Boolean(false).toString());
+ mcGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(false).toString());
+ mcGeneralMonitoringDTO.setRequestLearningReport(new Boolean(false).toString());
+ mcGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
+
+ McUtils.saveTimeZone(request);
+
+ /* we have made sure TOOL_CONTENT_ID is passed */
+ String toolContentID=mcMonitoringForm.getToolContentID();
+ logger.debug("toolContentID: " + toolContentID);
- McContent mcContent=mcService.retrieveMc(toolContentId);
+ McContent mcContent=mcService.retrieveMc(new Long(toolContentID));
logger.debug("existing mcContent:" + mcContent);
if (mcContent == null)
{
McUtils.cleanUpSessionAbsolute(request);
- request.getSession().setAttribute(USER_EXCEPTION_CONTENT_DOESNOTEXIST, new Boolean(true).toString());
- persistError(request, "error.content.doesNotExist");
+ mcGeneralMonitoringDTO.setUserExceptionContentDoesNotExist(new Boolean(true).toString());
return false;
}
-
- Map summaryToolSessions=MonitoringUtil.populateToolSessions(request, mcContent, mcService);
- logger.debug("summaryToolSessions: " + summaryToolSessions);
- Map summaryToolSessionsId=MonitoringUtil.populateToolSessionsId(request, mcContent, mcService);
- logger.debug("summaryToolSessionsId: " + summaryToolSessionsId);
- request.getSession().setAttribute(SUMMARY_TOOL_SESSIONS_ID, summaryToolSessionsId);
+ boolean isContentInUse=McUtils.isContentInUse(mcContent);
+ logger.debug("isContentInUse:" + isContentInUse);
+ mcGeneralMonitoringDTO.setIsMonitoredContentInUse(new Boolean(false).toString());
+ if (isContentInUse == true)
+ {
+ logger.debug("monitoring url does not allow editActivity since the content is in use.");
+ mcGeneralMonitoringDTO.setIsMonitoredContentInUse(new Boolean(true).toString());
+ }
- /* this section is related to summary tab. Starts here. */
- request.getSession().setAttribute(SUMMARY_TOOL_SESSIONS, summaryToolSessions);
- logger.debug("SUMMARY_TOOL_SESSIONS: " + request.getSession().getAttribute(SUMMARY_TOOL_SESSIONS));
-
- /* SELECTION_CASE == 2 indicates start up */
- request.getSession().setAttribute(SELECTION_CASE, new Long(2));
- logger.debug("SELECTION_CASE: " + request.getSession().getAttribute(SELECTION_CASE));
-
- /* Default to All for tool Sessions so that all tool sessions' summary information gets displayed when the module starts up */
- request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION, "All");
- logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION));
+ mcGeneralMonitoringDTO.setActivityTitle(mcContent.getTitle());
+ mcGeneralMonitoringDTO.setActivityInstructions(mcContent.getInstructions());
- List listMonitoredAnswersContainerDTO=MonitoringUtil.buildGroupsQuestionData(request, mcContent, mcService);
- request.getSession().setAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO, listMonitoredAnswersContainerDTO);
- logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO));
-
- List listMonitoredMarksContainerDTO=MonitoringUtil.buildGroupsMarkData(request, mcContent, mcService);
- request.getSession().setAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO, listMonitoredMarksContainerDTO);
- logger.debug("LIST_MONITORED_MARKS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO));
- /* ends here*/
-
- /* this section is related to instructions tab. Starts here. */
- request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS,mcContent.getOnlineInstructions());
- request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS,mcContent.getOfflineInstructions());
- /* ends here. */
-
-
- /* it is possible that no users has ever logged in for the activity yet*/
- //int countAllUsers=mcService.getTotalNumberOfUsers();
- int countAllUsers=mcService.getTotalNumberOfUsers(mcContent);
- logger.debug("countAllUsers: " + countAllUsers);
-
- request.getSession().setAttribute(USER_EXCEPTION_NO_STUDENT_ACTIVITY, new Boolean(false));
- if (countAllUsers == 0)
+ logger.debug("checking student activity on the standard Questions:" + mcContent);
+ if (mcService.studentActivityOccurredGlobal(mcContent))
{
- logger.debug("error: countAllUsers is 0");
- request.getSession().setAttribute(USER_EXCEPTION_NO_STUDENT_ACTIVITY, new Boolean(true));
+ McUtils.cleanUpSessionAbsolute(request);
+ logger.debug("student activity occurred on this content:" + mcContent);
+ mcGeneralMonitoringDTO.setUserExceptionContentInUse(new Boolean(true).toString());
+ mcGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
+ logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false");
}
+ else
+ {
+ mcGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
+ logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to true");
+ }
+
+ /*
+ * get the questions
+ * section is needed for the Edit tab's View Only mode, starts here
+ */
- /* it is possible that no users has ever attempted the activity yet*/
- int totalAttemptCount=MonitoringUtil.getTotalAttemptCount(request);
- logger.debug("totalAttemptCount: " + totalAttemptCount);
- if (totalAttemptCount == 0)
+ SessionMap sessionMap = new SessionMap();
+ sessionMap.put(ACTIVITY_TITLE_KEY, mcContent.getTitle());
+ sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, mcContent.getInstructions());
+
+ mcMonitoringForm.setHttpSessionID(sessionMap.getSessionID());
+ request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+
+
+ List listQuestionContentDTO= new LinkedList();
+
+ Map mapOptionsContent= new TreeMap(new McComparator());
+ logger.debug("setting existing content data from the db");
+ mapOptionsContent.clear();
+ Iterator queIterator=mcContent.getMcQueContents().iterator();
+ Long mapIndex=new Long(1);
+ logger.debug("mapOptionsContent: " + mapOptionsContent);
+ while (queIterator.hasNext())
{
- logger.debug("error: totalAttemptCount is 0");
- request.getSession().setAttribute(USER_EXCEPTION_NO_STUDENT_ACTIVITY, new Boolean(true));
+ McQuestionContentDTO mcContentDTO=new McQuestionContentDTO();
+
+ McQueContent mcQueContent=(McQueContent) queIterator.next();
+ if (mcQueContent != null)
+ {
+ logger.debug("question: " + mcQueContent.getQuestion());
+ mapOptionsContent.put(mapIndex.toString(),mcQueContent.getQuestion());
+
+ mcContentDTO.setQuestion(mcQueContent.getQuestion());
+ mcContentDTO.setDisplayOrder(mcQueContent.getDisplayOrder().toString());
+ listQuestionContentDTO.add(mcContentDTO);
+
+ mapIndex=new Long(mapIndex.longValue()+1);
+ }
}
+ logger.debug("Map initialized with existing contentid to: " + mapOptionsContent);
+ mcGeneralMonitoringDTO.setMapOptionsContent(mapOptionsContent);
+ /* ends here*/
- /* this section is related to Stats tab. Starts here. */
- //int countSessionComplete=mcService.countSessionComplete(mcContent);
- int countUserComplete=mcService.countUserComplete(mcContent);
- logger.debug("countUserComplete: " + countUserComplete);
- int countMaxAttempt=1;
- logger.debug("countMaxAttempt: " + countMaxAttempt);
+ logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+ request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
+ sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
- int topMark=LearningUtil.getTopMark(request, mcService);
- logger.debug("topMark: " + topMark);
+ request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
- int lowestMark=LearningUtil.getLowestMark(request, mcService);
- logger.debug("lowestMark: " + lowestMark);
- int averageMark=LearningUtil.getAverageMark(request, mcService);
- logger.debug("averageMark: " + averageMark);
+ McMonitoringAction mcMonitoringAction= new McMonitoringAction();
+ logger.debug("refreshing summary data...");
+ mcMonitoringAction.refreshSummaryData(request, mcContent, mcService, true, false,
+ null, null, false, null, mcGeneralMonitoringDTO, null);
+ logger.debug("post refreshSummaryData, mcGeneralMonitoringDTO: " + mcGeneralMonitoringDTO);
- request.getSession().setAttribute(COUNT_ALL_USERS, new Integer(countAllUsers).toString());
- request.getSession().setAttribute(COUNT_SESSION_COMPLETE, new Integer(countUserComplete).toString());
- request.getSession().setAttribute(COUNT_MAX_ATTEMPT, new Integer(countMaxAttempt).toString());
- request.getSession().setAttribute(TOP_MARK, new Integer(topMark).toString());
- request.getSession().setAttribute(LOWEST_MARK, new Integer(lowestMark).toString());
- request.getSession().setAttribute(AVERAGE_MARK, new Integer(averageMark).toString());
- /* ends here. */
+ //mcMonitoringAction.refreshStatsData(request, mcService, mcGeneralMonitoringDTO);
- logger.debug("end of initialiseMonitoringData: ");
- logger.debug("SUMMARY_TOOL_SESSIONS_ID: " + request.getSession().getAttribute(SUMMARY_TOOL_SESSIONS_ID));
- logger.debug("SUMMARY_TOOL_SESSIONS: " + request.getSession().getAttribute(SUMMARY_TOOL_SESSIONS));
- logger.debug("SELECTION_CASE: " + request.getSession().getAttribute(SELECTION_CASE));
- logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO));
+ logger.debug("end initializing monitoring data...");
+ mcGeneralMonitoringDTO.setExistsOpenMcs(new Boolean(false).toString());
+ logger.debug("post refreshes, mcGeneralMonitoringDTO: " + mcGeneralMonitoringDTO);
+
+
+ EditActivityDTO editActivityDTO = new EditActivityDTO();
+ isContentInUse=McUtils.isContentInUse(mcContent);
+ logger.debug("isContentInUse:" + isContentInUse);
+ if (isContentInUse == true)
+ {
+ editActivityDTO.setMonitoredContentInUse(new Boolean(true).toString());
+ }
+ request.setAttribute(EDIT_ACTIVITY_DTO, editActivityDTO);
+
+ mcMonitoringAction.prepareReflectionData(request, mcContent, mcService, null, false, "All");
+
+
+ boolean notebookEntriesExist=MonitoringUtil.notebookEntriesExist(mcService, mcContent);
+ logger.debug("notebookEntriesExist : " + notebookEntriesExist);
+ if (notebookEntriesExist)
+ {
+ request.setAttribute(NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString());
+
+ String userExceptionNoToolSessions=(String)mcGeneralMonitoringDTO.getUserExceptionNoToolSessions();
+ logger.debug("userExceptionNoToolSessions : " + userExceptionNoToolSessions);
+
+ if (userExceptionNoToolSessions.equals("true"))
+ {
+ logger.debug("there are no online student activity but there are reflections : ");
+ request.setAttribute(NO_SESSIONS_NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString());
+ }
+
+ }
+ else
+ {
+ request.setAttribute(NOTEBOOK_ENTRIES_EXIST, new Boolean(false).toString());
+ }
+
+
+ /* SELECTION_CASE == 2 indicates start up */
+ request.setAttribute(SELECTION_CASE, new Long(2));
+ logger.debug("SELECTION_CASE: " + request.getAttribute(SELECTION_CASE));
+
+
+ /* Default to All for tool Sessions so that all tool sessions' summary information gets displayed when the module starts up */
+ request.setAttribute(CURRENT_MONITORED_TOOL_SESSION, "All");
+ MonitoringUtil.setupAllSessionsData(request, mcContent,mcService);
+
+ /**getting instructions screen content from here... */
+ mcGeneralMonitoringDTO.setOnlineInstructions(mcContent.getOnlineInstructions());
+ mcGeneralMonitoringDTO.setOfflineInstructions(mcContent.getOfflineInstructions());
+
+ List attachmentList = mcService.retrieveMcUploadedFiles(mcContent);
+ logger.debug("attachmentList: " + attachmentList);
+ mcGeneralMonitoringDTO.setAttachmentList(attachmentList);
+ mcGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
+ /** ...till here **/
+
+ MonitoringUtil.buildMcStatsDTO(request,mcService, mcContent);
+
return true;
}
-
+
/**
- * validates request paramaters based on tool contract
- * validateParameters(HttpServletRequest request, ActionMapping mapping)
+ * ActionForward validateParameters(HttpServletRequest request, ActionMapping mapping, McMonitoringForm mcMonitoringForm)
*
* @param request
* @param mapping
- * @return ActionForward
+ * @param mcMonitoringForm
+ * @return
*/
- protected ActionForward validateParameters(HttpServletRequest request, ActionMapping mapping)
+ protected ActionForward validateParameters(HttpServletRequest request, ActionMapping mapping, McMonitoringForm mcMonitoringForm)
{
logger.debug("start validating monitoring parameters...");
@@ -424,38 +413,32 @@
if ((strToolContentId == null) || (strToolContentId.length() == 0))
{
McUtils.cleanUpSessionAbsolute(request);
- persistError(request, "error.contentId.required");
- request.getSession().setAttribute(USER_EXCEPTION_CONTENTID_REQUIRED, new Boolean(true).toString());
- return (mapping.findForward(ERROR_LIST));
+ return (mapping.findForward(ERROR_LIST));
}
else
{
try
{
- long toolContentId=new Long(strToolContentId).longValue();
- logger.debug("passed TOOL_CONTENT_ID : " + new Long(toolContentId));
- request.getSession().setAttribute(TOOL_CONTENT_ID,new Long(toolContentId));
+ long toolContentID=new Long(strToolContentId).longValue();
+ logger.debug("passed TOOL_CONTENT_ID : " + new Long(toolContentID));
+ mcMonitoringForm.setToolContentID(strToolContentId);
}
catch(NumberFormatException e)
{
- McUtils.cleanUpSessionAbsolute(request);
- request.getSession().setAttribute(USER_EXCEPTION_NUMBERFORMAT, new Boolean(true).toString());
- //persistError(request, "error.numberFormatException");
- logger.debug("add error.numberFormatException to ActionMessages.");
+ logger.debug("add error.numberFormatException");
return (mapping.findForward(ERROR_LIST));
}
}
return null;
}
-
/**
* persists error messages to request scope
* @param request
* @param message
*/
- public void persistError(HttpServletRequest request, String message)
+ public void persistInRequestError(HttpServletRequest request, String message)
{
ActionMessages errors= new ActionMessages();
errors.add(Globals.ERROR_KEY, new ActionMessage(message));
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java,v
diff -u -r1.25 -r1.26
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java 17 Sep 2006 06:23:44 -0000 1.25
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java 2 Oct 2006 01:59:34 -0000 1.26
@@ -32,10 +32,14 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
+import org.lamsfoundation.lams.tool.mc.McAllGroupsDTO;
import org.lamsfoundation.lams.tool.mc.McAppConstants;
import org.lamsfoundation.lams.tool.mc.McMonitoredAnswersDTO;
import org.lamsfoundation.lams.tool.mc.McMonitoredUserDTO;
import org.lamsfoundation.lams.tool.mc.McSessionMarkDTO;
+import org.lamsfoundation.lams.tool.mc.McStatsDTO;
import org.lamsfoundation.lams.tool.mc.McStringComparator;
import org.lamsfoundation.lams.tool.mc.McUserMarkDTO;
import org.lamsfoundation.lams.tool.mc.McUtils;
@@ -56,9 +60,11 @@
static Logger logger = Logger.getLogger(MonitoringUtil.class.getName());
/**
- * populates all the tool sessions in a map
+ *
* populateToolSessions(HttpServletRequest request, McContent mcContent)
*
+ * populates all the tool sessions in a map
+ *
* @param request
* @param mcContent
* @return Map
@@ -92,9 +98,11 @@
/**
- * ends up populating the attempt history for all the users of all the tool sessions for a content
+ *
* buildGroupsQuestionData(HttpServletRequest request, McContent mcContent)
*
+ * ends up populating the attempt history for all the users of all the tool sessions for a content
+ *
* @param request
* @param mcContent
* @return List
@@ -121,7 +129,10 @@
mcMonitoredAnswersDTO.setQuestionUid(mcQueContent.getUid().toString());
mcMonitoredAnswersDTO.setQuestion(mcQueContent.getQuestion());
mcMonitoredAnswersDTO.setWeight(mcQueContent.getWeight().toString());
+ mcMonitoredAnswersDTO.setMark(mcQueContent.getMark().toString());
+
+
List listCandidateAnswers=mcService.findMcOptionNamesByQueId(mcQueContent.getUid());
logger.debug("listCandidateAnswers:..." + listCandidateAnswers);
mcMonitoredAnswersDTO.setCandidateAnswers(listCandidateAnswers);
@@ -142,6 +153,17 @@
}
+ /**
+ * buildGroupsQuestionDataForExportLearner(HttpServletRequest request, McContent mcContent,
+ IMcService mcService, McSession mcSession, McQueUsr mcQueUsr)
+ *
+ * @param request
+ * @param mcContent
+ * @param mcService
+ * @param mcSession
+ * @param mcQueUsr
+ * @return
+ */
public static List buildGroupsQuestionDataForExportLearner(HttpServletRequest request, McContent mcContent,
IMcService mcService, McSession mcSession, McQueUsr mcQueUsr)
{
@@ -167,6 +189,7 @@
mcMonitoredAnswersDTO.setQuestionUid(mcQueContent.getUid().toString());
mcMonitoredAnswersDTO.setQuestion(mcQueContent.getQuestion());
mcMonitoredAnswersDTO.setWeight(mcQueContent.getWeight().toString());
+ mcMonitoredAnswersDTO.setMark(mcQueContent.getMark().toString());
List listCandidateAnswers=mcService.findMcOptionNamesByQueId(mcQueContent.getUid());
logger.debug("listCandidateAnswers:..." + listCandidateAnswers);
@@ -188,7 +211,18 @@
}
-
+ /**
+ *
+ * List buildGroupsMarkDataForExportLearner(HttpServletRequest request,
+ * McContent mcContent, IMcService mcService, McSession mcSession, Long learnerUid)
+ *
+ * @param request
+ * @param mcContent
+ * @param mcService
+ * @param mcSession
+ * @param learnerUid
+ * @return
+ */
public static List buildGroupsMarkDataForExportLearner(HttpServletRequest request, McContent mcContent, IMcService mcService, McSession mcSession, Long learnerUid)
{
logger.debug("will be building export learner groups mark data for content:..." + mcContent);
@@ -249,6 +283,14 @@
}
+ /**
+ * List buildGroupsMarkData(HttpServletRequest request, McContent mcContent, IMcService mcService)
+ *
+ * @param request
+ * @param mcContent
+ * @param mcService
+ * @return
+ */
public static List buildGroupsMarkData(HttpServletRequest request, McContent mcContent, IMcService mcService)
{
logger.debug("will be building groups mark data for content:..." + mcContent);
@@ -324,6 +366,14 @@
}
+ /**
+ * List buildGroupingBasedResponsesData(HttpServletRequest request, McContent mcContent, IMcService mcService)
+ *
+ * @param request
+ * @param mcContent
+ * @param mcService
+ * @return
+ */
public static List buildGroupingBasedResponsesData(HttpServletRequest request, McContent mcContent, IMcService mcService)
{
logger.debug("will be building grouping data for content:..." + mcContent);
@@ -398,6 +448,18 @@
}
+ /**
+ *
+ * String getLearnerMarkForQuestionInSession(Long mcQueContentUid, Long mcSessionUid, Long mcQueUsrUid,
+ * McSession mcSession, IMcService mcService)
+ *
+ * @param mcQueContentUid
+ * @param mcSessionUid
+ * @param mcQueUsrUid
+ * @param mcSession
+ * @param mcService
+ * @return
+ */
public static String getLearnerMarkForQuestionInSession(Long mcQueContentUid, Long mcSessionUid, Long mcQueUsrUid, McSession mcSession, IMcService mcService)
{
logger.debug("starting getLearnerMarkForQuestionInSession: mcQueContentUid" + mcQueContentUid);
@@ -451,7 +513,8 @@
if (isAttemptCorrect)
{
- return mcUsrAttemptUser.getMcQueContent().getWeight().toString();
+ //return mcUsrAttemptUser.getMcQueContent().getWeight().toString();
+ return mcUsrAttemptUser.getMcQueContent().getMark().toString();
}
else
{
@@ -485,7 +548,8 @@
logger.debug("final isAttemptCorrect: " + isAttemptCorrect);
if (isAttemptCorrect)
{
- return mcUsrAttemptGeneral.getMcQueContent().getWeight().toString();
+ //return mcUsrAttemptGeneral.getMcQueContent().getWeight().toString();
+ return mcUsrAttemptGeneral.getMcQueContent().getMark().toString();
}
else
{
@@ -495,6 +559,12 @@
}
+ /**
+ * String getTotalUserMarkForQuestions(LinkedList userMarks)
+ *
+ * @param userMarks
+ * @return
+ */
public static String getTotalUserMarkForQuestions(LinkedList userMarks)
{
Iterator itAttempts=userMarks.iterator();
@@ -509,12 +579,21 @@
}
- public static List buildSessionQuestionData(HttpServletRequest request, McContent mcContent, Long sessionId, Long userID)
+ /**
+ * List buildSessionQuestionData(HttpServletRequest request, McContent mcContent, Long sessionId, Long userID)
+ *
+ * @param request
+ * @param mcContent
+ * @param sessionId
+ * @param userID
+ * @return
+ */
+ public static List buildSessionQuestionData(HttpServletRequest request, McContent mcContent, Long sessionId, Long userID, IMcService mcService)
{
logger.debug("doing buildSessionQuestionData with sessionId: " + sessionId);
logger.debug("doing buildSessionQuestionData with userID: " + userID);
logger.debug("will be building groups question data for content:..." + mcContent);
- IMcService mcService =McUtils.getToolService(request);
+
List listQuestions=mcService.getAllQuestionEntries(mcContent.getUid());
logger.debug("listQuestions:..." + listQuestions);
@@ -536,7 +615,8 @@
logger.debug("listCandidateAnswers:..." + listCandidateAnswers);
mcMonitoredAnswersDTO.setCandidateAnswers(listCandidateAnswers);
- Map questionAttemptData= buildSessionAttemptData(request, mcContent, mcQueContent, mcQueContent.getUid().toString(), sessionId, userID);
+ Map questionAttemptData= buildSessionAttemptData(request, mcContent, mcQueContent, mcQueContent.getUid().toString(), sessionId,
+ userID, mcService);
logger.debug("questionAttemptData:..." + questionAttemptData);
mcMonitoredAnswersDTO.setQuestionAttempts(questionAttemptData);
listMonitoredAnswersContainerDTO.add(mcMonitoredAnswersDTO);
@@ -550,9 +630,11 @@
/**
- * helps populating user's attempt history
+ *
* buildGroupsAttemptData(HttpServletRequest request, McContent mcContent, McQueContent mcQueContent)
*
+ * helps populating user's attempt history
+ *
* @param request
* @param mcContent
* @param mcQueContent
@@ -580,7 +662,8 @@
{
logger.debug("using the numerical summary tool sessions pair: " + " = " + pairs.getValue());
McSession mcSession= mcService.findMcSessionById(new Long(pairs.getValue().toString()));
- logger.debug("mcSession: " + " = " + mcSession);
+ logger.debug("mcSession: " + " = " + mcSession);
+
if (mcSession != null)
{
List listMcUsers=mcService.getMcUserBySessionOnly(mcSession);
@@ -627,6 +710,19 @@
}
+ /**
+ * Map buildGroupsAttemptDataForExportLearner(HttpServletRequest request, McContent mcContent, McQueContent mcQueContent, String questionUid,
+ IMcService mcService, McSession mcSession, McQueUsr mcQueUsr )
+
+ * @param request
+ * @param mcContent
+ * @param mcQueContent
+ * @param questionUid
+ * @param mcService
+ * @param mcSession
+ * @param mcQueUsr
+ * @return
+ */
public static Map buildGroupsAttemptDataForExportLearner(HttpServletRequest request, McContent mcContent, McQueContent mcQueContent, String questionUid,
IMcService mcService, McSession mcSession, McQueUsr mcQueUsr )
{
@@ -654,15 +750,24 @@
}
-
-
- public static Map buildSessionAttemptData(HttpServletRequest request, McContent mcContent, McQueContent mcQueContent, String questionUid, Long sessionId, Long userID)
+ /**
+ * Map buildSessionAttemptData(HttpServletRequest request, McContent mcContent, McQueContent mcQueContent, String questionUid,
+ * Long sessionId, Long userID)
+ *
+ * @param request
+ * @param mcContent
+ * @param mcQueContent
+ * @param questionUid
+ * @param sessionId
+ * @param userID
+ * @return
+ */
+ public static Map buildSessionAttemptData(HttpServletRequest request, McContent mcContent, McQueContent mcQueContent, String questionUid, Long sessionId, Long userID, IMcService mcService)
{
logger.debug("doing buildSessionAttemptData with sessionId: " + sessionId);
logger.debug("doing buildSessionAttemptData with userID: " + userID);
logger.debug("will be building groups attempt data for mcQueContent:..." + mcQueContent + " questionUid:" + questionUid);
- IMcService mcService =McUtils.getToolService(request);
Map mapMonitoredAttemptsContainerDTO= new TreeMap(new McStringComparator());
List listMonitoredAttemptsContainerDTO= new LinkedList();
@@ -690,19 +795,20 @@
* @param request
* @return int
*/
- public static int getTotalAttemptCount(HttpServletRequest request)
+ public static int getTotalAttemptCount(HttpServletRequest request, IMcService mcService)
{
- IMcService mcService =McUtils.getToolService(request);
List listMarks=mcService.getMarks();
logger.debug("total attempt count: " + listMarks.size());
return listMarks.size();
}
/**
- * ends up populating all the user's attempt data of a particular tool session
+ *
* populateSessionUsersAttempts(HttpServletRequest request,List listMcUsers)
*
+ * ends up populating all the user's attempt data of a particular tool session
+ *
* @param request
* @param listMcUsers
* @return List
@@ -754,7 +860,19 @@
}
-
+ /**
+ * Map getAttemptEntries(HttpServletRequest request, IMcService mcService, McQueUsr mcQueUsr, McSession mcSession,
+ String questionUid, List listMonitoredUserContainerDTO, Map mapMonitoredUserContainerDTO)
+ *
+ * @param request
+ * @param mcService
+ * @param mcQueUsr
+ * @param mcSession
+ * @param questionUid
+ * @param listMonitoredUserContainerDTO
+ * @param mapMonitoredUserContainerDTO
+ * @return
+ */
public static Map getAttemptEntries(HttpServletRequest request, IMcService mcService, McQueUsr mcQueUsr, McSession mcSession,
String questionUid, List listMonitoredUserContainerDTO, Map mapMonitoredUserContainerDTO)
{
@@ -829,7 +947,8 @@
if (isAttemptCorrect)
{
- mcMonitoredUserDTO.setMark(mcUsrAttemptUser.getMcQueContent().getWeight().toString());
+ //mcMonitoredUserDTO.setMark(mcUsrAttemptUser.getMcQueContent().getWeight().toString());
+ mcMonitoredUserDTO.setMark(mcUsrAttemptUser.getMcQueContent().getMark().toString());
}
else
{
@@ -866,7 +985,8 @@
logger.debug("final isAttemptCorrect: " + isAttemptCorrect);
if (isAttemptCorrect)
{
- mcMonitoredUserDTO.setMark(mcUsrAttemptGeneral.getMcQueContent().getWeight().toString());
+ //mcMonitoredUserDTO.setMark(mcUsrAttemptGeneral.getMcQueContent().getWeight().toString());
+ mcMonitoredUserDTO.setMark(mcUsrAttemptGeneral.getMcQueContent().getMark().toString());
}
else
{
@@ -892,6 +1012,12 @@
}
+ /**
+ * McUsrAttempt getAttemptWithHighestOrder(List listUserAttempts)
+ *
+ * @param listUserAttempts
+ * @return
+ */
public static McUsrAttempt getAttemptWithHighestOrder(List listUserAttempts)
{
logger.debug("starting getAttemptWithHighestOrder: " + listUserAttempts);
@@ -920,6 +1046,14 @@
}
+ /**
+ * Map populateToolSessionsId(HttpServletRequest request, McContent mcContent, IMcService mcService)
+ *
+ * @param request
+ * @param mcContent
+ * @param mcService
+ * @return
+ */
public static Map populateToolSessionsId(HttpServletRequest request, McContent mcContent, IMcService mcService)
{
List sessionsList=mcService.getSessionsFromContent(mcContent);
@@ -945,7 +1079,12 @@
}
-
+ /**
+ * Map convertToMap(List list)
+ *
+ * @param list
+ * @return
+ */
public static Map convertToMap(List list)
{
logger.debug("using convertToMap: " + list);
@@ -964,6 +1103,12 @@
}
+ /**
+ * Map convertToMcUserMarkDTOMap(List list)
+ *
+ * @param list
+ * @return
+ */
public static Map convertToMcUserMarkDTOMap(List list)
{
logger.debug("using McUserMarkDTOMap: " + list);
@@ -982,6 +1127,12 @@
}
+ /**
+ * Map convertToMcMonitoredUserDTOMap(List list)
+ *
+ * @param list
+ * @return
+ */
public static Map convertToMcMonitoredUserDTOMap(List list)
{
logger.debug("using convertToMcMonitoredUserDTOMap: " + list);
@@ -1000,6 +1151,13 @@
}
+ /**
+ * void setAttributeNoToolSessions(HttpServletRequest request, IMcService mcService, McContent mcContent)
+ *
+ * @param request
+ * @param mcService
+ * @param mcContent
+ */
public static void setAttributeNoToolSessions(HttpServletRequest request, IMcService mcService, McContent mcContent)
{
logger.debug("using mcContent: " + mcContent);
@@ -1050,5 +1208,250 @@
request.getSession().removeAttribute(DEFINE_LATER_IN_EDIT_MODE);
request.getSession().removeAttribute(EDIT_OPTIONS_MODE);
}
+
+
+ /**
+ * void buildMcStatsDTO(HttpServletRequest request, IMcService mcService, McContent mcContent)
+ *
+ * @param request
+ * @param mcService
+ * @param mcContent
+ */
+ public static void buildMcStatsDTO(HttpServletRequest request, IMcService mcService, McContent mcContent)
+ {
+ logger.debug("building mcStatsDTO: " + mcContent);
+ McStatsDTO mcStatsDTO= new McStatsDTO();
+
+ int countSessionComplete=0;
+ int countAllUsers=0;
+ logger.debug("finding out about content level notebook entries: " + mcContent);
+ Iterator iteratorSession= mcContent.getMcSessions().iterator();
+ while (iteratorSession.hasNext())
+ {
+ McSession mcSession=(McSession) iteratorSession.next();
+ logger.debug("mcSession: " + mcSession);
+
+ if (mcSession != null)
+ {
+ logger.debug("mcSession id: " + mcSession.getMcSessionId());
+
+ if (mcSession.getSessionStatus().equals(COMPLETED))
+ {
+ ++countSessionComplete;
+ }
+
+ Iterator iteratorUser=mcSession.getMcQueUsers().iterator();
+ while (iteratorUser.hasNext())
+ {
+ McQueUsr mcQueUsr=(McQueUsr) iteratorUser.next();
+ logger.debug("mcQueUsr: " + mcQueUsr);
+
+ if (mcQueUsr != null)
+ {
+ logger.debug("mcQueUsr foundid");
+ ++countAllUsers;
+ }
+ }
+ }
+ }
+ logger.debug("countAllUsers: " + countAllUsers);
+ logger.debug("countSessionComplete: " + countSessionComplete);
+
+
+ mcStatsDTO.setCountAllUsers(new Integer(countAllUsers).toString());
+ mcStatsDTO.setCountSessionComplete(new Integer(countSessionComplete).toString());
+
+ logger.debug("mcStatsDTO: " + mcStatsDTO);
+
+ request.setAttribute(MC_STATS_DTO, mcStatsDTO);
+ }
+
+
+ /**
+ * boolean notebookEntriesExist(IMcService mcService, McContent mcContent)
+ *
+ * @param mcService
+ * @param mcContent
+ * @return
+ */
+ public static boolean notebookEntriesExist(IMcService mcService, McContent mcContent)
+ {
+ logger.debug("finding out about content level notebook entries: " + mcContent);
+ Iterator iteratorSession= mcContent.getMcSessions().iterator();
+ while (iteratorSession.hasNext())
+ {
+ McSession mcSession=(McSession) iteratorSession.next();
+ logger.debug("mcSession: " + mcSession);
+
+ if (mcSession != null)
+ {
+ logger.debug("mcSession id: " + mcSession.getMcSessionId());
+
+ Iterator iteratorUser=mcSession.getMcQueUsers().iterator();
+ while (iteratorUser.hasNext())
+ {
+ McQueUsr mcQueUsr=(McQueUsr) iteratorUser.next();
+ logger.debug("mcQueUsr: " + mcQueUsr);
+
+ if (mcQueUsr != null)
+ {
+ logger.debug("mcQueUsr id: " + mcQueUsr.getQueUsrId());
+
+ logger.debug("attempt getting notebookEntry: ");
+ NotebookEntry notebookEntry = mcService.getEntry(mcSession.getMcSessionId(),
+ CoreNotebookConstants.NOTEBOOK_TOOL,
+ MY_SIGNATURE, new Integer(mcQueUsr.getQueUsrId().intValue()));
+
+ logger.debug("notebookEntry: " + notebookEntry);
+ if (notebookEntry != null)
+ {
+ logger.debug("found at least one notebookEntry: " + notebookEntry.getEntry());
+ return true;
+ }
+
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+
+ /**
+ * generateGroupsSessionData(HttpServletRequest request, IMcService mcService, McContent mcContent)
+ *
+ * @param request
+ * @param mcService
+ * @param mcContent
+ */
+ public static void generateGroupsSessionData(HttpServletRequest request, IMcService mcService, McContent mcContent)
+ {
+ logger.debug("generateGroupsSessionData: " + mcContent);
+
+ List listAllGroupsDTO=buildGroupBasedSessionData(request, mcContent, mcService);
+ logger.debug("listAllGroupsDTO: " + listAllGroupsDTO);
+
+ request.setAttribute(LIST_ALL_GROUPS_DTO, listAllGroupsDTO);
+ }
+
+
+ /**
+ * List buildGroupBasedSessionData(HttpServletRequest request, McContent mcContent, IMcService mcService)
+ *
+ * @param request
+ * @param mcContent
+ * @param mcService
+ * @return
+ */
+ public static List buildGroupBasedSessionData(HttpServletRequest request, McContent mcContent, IMcService mcService)
+ {
+ logger.debug("buildGroupBasedSessionData" + mcContent);
+ logger.debug("will be building groups question data for content:..." + mcContent);
+ List listQuestions=mcService.getAllQuestionEntries(mcContent.getUid());
+ logger.debug("listQuestions:..." + listQuestions);
+ List listAllGroupsContainerDTO= new LinkedList();
+
+
+ Iterator iteratorSession= mcContent.getMcSessions().iterator();
+ while (iteratorSession.hasNext())
+ {
+ McSession mcSession=(McSession) iteratorSession.next();
+ logger.debug("iteration for group based session data: " + mcSession);
+ String currentSessionId=mcSession.getMcSessionId().toString();
+ logger.debug("currentSessionId: " + currentSessionId);
+
+ String currentSessionName=mcSession.getSession_name();
+ logger.debug("currentSessionName: " + currentSessionName);
+
+ McAllGroupsDTO mcAllGroupsDTO= new McAllGroupsDTO();
+ List listMonitoredAnswersContainerDTO= new LinkedList();
+
+ if (mcSession != null)
+ {
+ Iterator itListQuestions = listQuestions.iterator();
+ while (itListQuestions.hasNext())
+ {
+ McQueContent mcQueContent =(McQueContent)itListQuestions.next();
+ logger.debug("mcQueContent:..." + mcQueContent);
+
+ if (mcQueContent != null)
+ {
+ logger.debug("populating McMonitoredAnswersDTO for : " + mcQueContent);
+ McMonitoredAnswersDTO mcMonitoredAnswersDTO= new McMonitoredAnswersDTO();
+ mcMonitoredAnswersDTO.setQuestionUid(mcQueContent.getUid().toString());
+ mcMonitoredAnswersDTO.setQuestion(mcQueContent.getQuestion());
+ mcMonitoredAnswersDTO.setSessionId(currentSessionId);
+ mcMonitoredAnswersDTO.setSessionName(currentSessionName);
+
+ Map questionAttemptData = new TreeMap();
+
+ logger.debug("generated questionAttemptData: " + questionAttemptData);
+ mcMonitoredAnswersDTO.setQuestionAttempts(questionAttemptData);
+
+ logger.debug("adding mcMonitoredAnswersDTO to the listMonitoredAnswersContainerDTO: " + mcMonitoredAnswersDTO);
+ listMonitoredAnswersContainerDTO.add(mcMonitoredAnswersDTO);
+ }
+ }
+ }
+ logger.debug("listMonitoredAnswersContainerDTO:" + listMonitoredAnswersContainerDTO);
+
+ logger.debug("adding listMonitoredAnswersContainerDTO to the mcAllGroupsDTO:" + listMonitoredAnswersContainerDTO);
+ mcAllGroupsDTO.setGroupData(listMonitoredAnswersContainerDTO);
+ mcAllGroupsDTO.setSessionName(currentSessionName);
+ mcAllGroupsDTO.setSessionId(currentSessionId);
+
+ logger.debug("built mcAllGroupsDTO:" + mcAllGroupsDTO);
+ listAllGroupsContainerDTO.add(mcAllGroupsDTO);
+
+ }
+
+
+ logger.debug("final listAllGroupsContainerDTO:..." + listAllGroupsContainerDTO);
+ return listAllGroupsContainerDTO;
+ }
+
+
+ /**
+ * void setupAllSessionsData(HttpServletRequest request, McContent mcContent, IMcService mcService)
+ *
+ * @param request
+ * @param mcContent
+ * @param mcService
+ */
+ protected static void setupAllSessionsData(HttpServletRequest request, McContent mcContent, IMcService mcService)
+ {
+ logger.debug("starting setupAllSessionsData, mcContent: " + mcContent);
+ logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getAttribute(CURRENT_MONITORED_TOOL_SESSION));
+
+ List listMonitoredAnswersContainerDTO=MonitoringUtil.buildGroupsQuestionData(request, mcContent, mcService);
+ request.setAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO, listMonitoredAnswersContainerDTO);
+ logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO));
+
+ List listMonitoredMarksContainerDTO=MonitoringUtil.buildGroupsMarkData(request, mcContent, mcService);
+ request.setAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO, listMonitoredMarksContainerDTO);
+ logger.debug("LIST_MONITORED_MARKS_CONTAINER_DTO: " + request.getAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO));
+ logger.debug("ending setupAllSessionsData, mcContent: ");
+
+ request.setAttribute(HR_COLUMN_COUNT, new Integer(mcContent.getMcQueContents().size()+2).toString());
+
+ String strPassMark="";
+ Integer passMark=mcContent.getPassMark();
+ logger.debug("passMark: " + passMark);
+
+ if (passMark == null)
+ strPassMark=" ";
+ else if ((passMark != null) && (passMark.equals("0")))
+ strPassMark=" ";
+ else
+ strPassMark=passMark.toString();
+
+ logger.debug("strPassMark: " + strPassMark);
+
+ if (strPassMark.trim().equals("0"))
+ strPassMark=" ";
+
+ logger.debug("strPassMark: " + strPassMark);
+ request.setAttribute(PASSMARK, strPassMark);
+ }
}
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/McDataAccessTestCase.java,v
diff -u -r1.19 -r1.20
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java 17 Sep 2006 06:23:44 -0000 1.19
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java 2 Oct 2006 01:59:54 -0000 1.20
@@ -115,18 +115,13 @@
mc.setTitle("title...");
mc.setInstructions("instructions...");
mc.setQuestionsSequenced(false);
- mc.setUsernameVisible(false);
mc.setCreatedBy(0);
- mc.setMonitoringReportTitle("Monitoring Report");
- mc.setReportTitle("Report");
mc.setRunOffline(false);
mc.setDefineLater(false);
- mc.setSynchInMonitor(false);
mc.setOnlineInstructions("online instructions...");
mc.setOfflineInstructions("offline instructions...");
mc.setContentInUse(false);
mc.setRetries(false);
- mc.setShowFeedback(false);
mc.setMcQueContents(new HashSet());
mc.setMcSessions(new HashSet());
mcContentDAO.saveMcContent(mc);
Index: lams_tool_lamc/web/403.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/403.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/web/403.jsp 25 Jul 2006 05:16:26 -0000 1.1
+++ lams_tool_lamc/web/403.jsp 2 Oct 2006 01:59:54 -0000 1.2
@@ -1,3 +1,22 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
<%@ taglib uri="tags-lams" prefix="lams"%>
<%@ taglib uri="tags-core" prefix="c" %>
Index: lams_tool_lamc/web/404.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/404.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/web/404.jsp 25 Jul 2006 05:16:26 -0000 1.1
+++ lams_tool_lamc/web/404.jsp 2 Oct 2006 01:59:35 -0000 1.2
@@ -1,3 +1,22 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
<%@ taglib uri="tags-lams" prefix="lams"%>
<%@ taglib uri="tags-core" prefix="c" %>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_lamc/web/AuthoringMaincontent.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_lamc/web/BaseContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/BaseContent.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/web/BaseContent.jsp 17 Sep 2006 06:23:44 -0000 1.4
+++ lams_tool_lamc/web/BaseContent.jsp 2 Oct 2006 01:59:35 -0000 1.5
@@ -1,9 +1,9 @@
-<%--
+<%--
Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
License Information: http://lamsfoundation.org/licensing/lams/2.0/
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
+ it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
@@ -13,18 +13,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
http://www.gnu.org/licenses/gpl.txt
--%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-logic-el" prefix="logic-el" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
Base Content
Index: lams_tool_lamc/web/Footer.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/Footer.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/web/Footer.jsp 17 Sep 2006 06:23:44 -0000 1.4
+++ lams_tool_lamc/web/Footer.jsp 2 Oct 2006 01:59:54 -0000 1.5
@@ -1,9 +1,9 @@
-<%--
+<%--
Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
License Information: http://lamsfoundation.org/licensing/lams/2.0/
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
+ it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
@@ -13,16 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
http://www.gnu.org/licenses/gpl.txt
---%>
-
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+--%>
\ No newline at end of file
Index: lams_tool_lamc/web/Header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/Header.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_lamc/web/Header.jsp 17 Sep 2006 06:23:44 -0000 1.6
+++ lams_tool_lamc/web/Header.jsp 2 Oct 2006 01:59:54 -0000 1.7
@@ -1,9 +1,9 @@
-<%--
+<%--
Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
License Information: http://lamsfoundation.org/licensing/lams/2.0/
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
+ it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
@@ -13,16 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
http://www.gnu.org/licenses/gpl.txt
--%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-logic-el" prefix="logic-el" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
Index: lams_tool_lamc/web/SystemErrorContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/SystemErrorContent.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_lamc/web/SystemErrorContent.jsp 17 Sep 2006 06:23:44 -0000 1.6
+++ lams_tool_lamc/web/SystemErrorContent.jsp 2 Oct 2006 01:59:54 -0000 1.7
@@ -1,9 +1,9 @@
-<%--
+<%--
Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
License Information: http://lamsfoundation.org/licensing/lams/2.0/
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
+ it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
@@ -13,27 +13,18 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
http://www.gnu.org/licenses/gpl.txt
--%>
-
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-
+
-
+
Fisheye: Tag 1.20 refers to a dead (removed) revision in file `lams_tool_lamc/web/index.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.18 refers to a dead (removed) revision in file `lams_tool_lamc/web/learningIndex.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_lamc/web/login.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/login.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_lamc/web/login.jsp 25 Jul 2006 05:16:26 -0000 1.5
+++ lams_tool_lamc/web/login.jsp 2 Oct 2006 01:59:54 -0000 1.6
@@ -1,3 +1,23 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
<%@ taglib uri="tags-lams" prefix="lams"%>
<%@ taglib uri="tags-core" prefix="c" %>
Fisheye: Tag 1.9 refers to a dead (removed) revision in file `lams_tool_lamc/web/monitoringIndex.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/struts-config.xml,v
diff -u -r1.56 -r1.57
--- lams_tool_lamc/web/WEB-INF/struts-config.xml 6 Sep 2006 23:49:47 -0000 1.56
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml 2 Oct 2006 01:59:54 -0000 1.57
@@ -26,119 +26,123 @@
-
-
-
+
+
-
+
+
+
-
+
-
+
+
+
+
+
-
-
-
+ name="load"
+ path="/AuthoringMaincontent.jsp"
+ redirect="false"
+ />
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
-
-
+
+
+
-
@@ -284,34 +288,29 @@
-
-
-
-
-
+
+
+
+
@@ -320,57 +319,63 @@
-
+
-
+
-
-
+
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/web.xml,v
diff -u -r1.22 -r1.23
--- lams_tool_lamc/web/WEB-INF/web.xml 20 Sep 2006 00:46:18 -0000 1.22
+++ lams_tool_lamc/web/WEB-INF/web.xml 2 Oct 2006 01:59:54 -0000 1.23
@@ -174,6 +174,7 @@
-->
+
@@ -191,10 +192,6 @@
/WEB-INF/struts/tlds/struts-logic.tld
- tags-logic-el
- /WEB-INF/struts/tlds/struts-logic-el.tld
-
- tags-tiles/WEB-INF/struts/tlds/struts-tiles.tld
@@ -217,30 +214,21 @@
tags-xml/WEB-INF/jstl/tlds/x.tld
-
-
-
-
- tags-permittedTaglibs
- /WEB-INF/jstl/tlds/permittedTaglibs.tld
-
-
- tags-scriptfree
- /WEB-INF/jstl/tlds/scriptfree.tld
-
-
-
-
-
- fck-editor
- /WEB-INF/fckeditor/tlds/FCKeditor.tld
-
-
- tags-lams
- /WEB-INF/lams.tld
-
+
+
+
+
+ fck-editor
+ /WEB-INF/fckeditor/tlds/FCKeditor.tld
+
+
+ tags-lams
+ /WEB-INF/lams.tld
+
-
+
+
+
@@ -350,6 +338,5 @@
/login.jsp?failed=y
-
Index: lams_tool_lamc/web/authoring/AdvancedContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/AdvancedContent.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_lamc/web/authoring/AdvancedContent.jsp 17 Sep 2006 06:23:45 -0000 1.19
+++ lams_tool_lamc/web/authoring/AdvancedContent.jsp 2 Oct 2006 01:59:35 -0000 1.20
@@ -1,9 +1,9 @@
-<%--
+<%--
Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
License Information: http://lamsfoundation.org/licensing/lams/2.0/
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
+ it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
@@ -13,25 +13,13 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
http://www.gnu.org/licenses/gpl.txt
--%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-logic-el" prefix="logic-el" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ include file="/common/taglibs.jsp"%>
-
-
-
-
@@ -56,6 +44,24 @@
+
+
+
+
+
+
+
+
+
@@ -72,14 +78,7 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
Index: lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp 2 Oct 2006 01:59:34 -0000 1.1
@@ -0,0 +1,179 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+
+
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<%@ page import="java.util.LinkedHashSet" %>
+<%@ page import="java.util.Set" %>
+<%@ page import="org.lamsfoundation.lams.tool.mc.McAppConstants"%>
+
+ <%
+ Set tabs = new LinkedHashSet();
+ tabs.add("label.basic");
+ tabs.add("label.advanced");
+ tabs.add("label.instructions");
+ pageContext.setAttribute("tabs", tabs);
+
+ Set tabsBasic = new LinkedHashSet();
+ tabsBasic.add("label.basic");
+ pageContext.setAttribute("tabsBasic", tabsBasic);
+ %>
+
+
+
+ <fmt:message key="activity.title" />
+
+ <%@ include file="/common/header.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_lamc/web/authoring/Basic.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_lamc/web/authoring/BasicContentViewOnly.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/Attic/BasicContentViewOnly.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/authoring/BasicContentViewOnly.jsp 2 Oct 2006 01:59:35 -0000 1.1
@@ -0,0 +1,74 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ include file="/common/taglibs.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%@ include file="/authoring/itemlistViewOnly.jsp"%>
+
+
+
+
+
+
+
Fisheye: Tag 1.21 refers to a dead (removed) revision in file `lams_tool_lamc/web/authoring/OptionsContent.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp 2 Oct 2006 01:59:35 -0000 1.1
@@ -0,0 +1,113 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ include file="/common/taglibs.jsp" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<%@ include file="/common/messages.jsp"%>
+
+newQuestionBoxDTO.listCandidateAnswersDTO:
+
+
Index: lams_tool_lamc/web/authoring/candidateAnswersList.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/candidateAnswersList.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/authoring/candidateAnswersList.jsp 2 Oct 2006 01:59:34 -0000 1.1
@@ -0,0 +1,124 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ include file="/common/taglibs.jsp" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<%@ include file="/common/messages.jsp"%>
+
+
+
Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/editQuestionBox.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp 2 Oct 2006 01:59:35 -0000 1.1
@@ -0,0 +1,189 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+
+
+<%@ include file="/common/taglibs.jsp"%>
+
+
+ <%@ include file="/common/header.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%@ include file="/authoring/candidateAnswersList.jsp"%>
+
+
+
+
Index: lams_tool_lamc/web/authoring/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/itemlist.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/authoring/itemlist.jsp 2 Oct 2006 01:59:34 -0000 1.1
@@ -0,0 +1,104 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ include file="/common/taglibs.jsp" %>
+
+
+<%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
+
+
Index: lams_tool_lamc/web/authoring/itemlistViewOnly.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/Attic/itemlistViewOnly.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/authoring/itemlistViewOnly.jsp 2 Oct 2006 01:59:35 -0000 1.1
@@ -0,0 +1,94 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+
+<%@ include file="/common/taglibs.jsp" %>
+
+
Index: lams_tool_lamc/web/authoring/newQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/newQuestionBox.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/authoring/newQuestionBox.jsp 2 Oct 2006 01:59:35 -0000 1.1
@@ -0,0 +1,149 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+
+
+<%@ include file="/common/taglibs.jsp"%>
+
+
+ <%@ include file="/common/header.jsp"%>
+
+
+
+
+
+
Index: lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/AllSessionsSummary.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp 2 Oct 2006 01:59:34 -0000 1.1
@@ -0,0 +1,112 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+<%@ include file="/common/taglibs.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
:
+
+
+
+
+
+
+
+
+
+
+ ( )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: lams_tool_lamc/web/monitoring/Edit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Edit.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_lamc/web/monitoring/Edit.jsp 20 Sep 2006 00:52:49 -0000 1.7
+++ lams_tool_lamc/web/monitoring/Edit.jsp 2 Oct 2006 01:59:34 -0000 1.8
@@ -1,9 +1,9 @@
-<%--
+<%--
Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
License Information: http://lamsfoundation.org/licensing/lams/2.0/
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
+ it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
@@ -13,28 +13,35 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ USA
http://www.gnu.org/licenses/gpl.txt
--%>
+
+ <%@ include file="/common/taglibs.jsp"%>
-<%@ include file="/common/taglibs.jsp"%>
+
+
-
-
+ <%@ include file="/common/messages.jsp"%>
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/IndividualSessionSummary.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp 2 Oct 2006 01:59:34 -0000 1.1
@@ -0,0 +1,116 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ include file="/common/taglibs.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
:
+
+
+
+
+
+
+
+
+
+ (
+ )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: lams_tool_lamc/web/monitoring/Instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/Instructions.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_lamc/web/monitoring/Instructions.jsp 20 Sep 2006 00:52:49 -0000 1.15
+++ lams_tool_lamc/web/monitoring/Instructions.jsp 2 Oct 2006 01:59:34 -0000 1.16
@@ -18,92 +18,119 @@
http://www.gnu.org/licenses/gpl.txt
--%>
-
<%@ include file="/common/taglibs.jsp"%>
-
-
-
Index: lams_tool_lamc/web/monitoring/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/LearnerRep.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/monitoring/LearnerRep.jsp 2 Oct 2006 01:59:34 -0000 1.1
@@ -0,0 +1,27 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+
+
+<%@ include file="/common/taglibs.jsp"%>
+
+mc learner rep
\ No newline at end of file
Index: lams_tool_lamc/web/monitoring/Reflections.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Reflections.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/monitoring/Reflections.jsp 2 Oct 2006 01:59:34 -0000 1.1
@@ -0,0 +1,61 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ include file="/common/taglibs.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/web/monitoring/Stats.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Stats.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_lamc/web/monitoring/Stats.jsp 20 Sep 2006 00:52:49 -0000 1.19
+++ lams_tool_lamc/web/monitoring/Stats.jsp 2 Oct 2006 01:59:34 -0000 1.20
@@ -1,9 +1,9 @@
-<%--
+<%--
Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
License Information: http://lamsfoundation.org/licensing/lams/2.0/
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
+ it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
@@ -13,7 +13,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ USA
http://www.gnu.org/licenses/gpl.txt
--%>
@@ -23,22 +24,22 @@
-
+
-
-
+
+
-
+
-
+
-
+
Fisheye: Tag 1.14 refers to a dead (removed) revision in file `lams_tool_lamc/web/monitoring/Summary.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.8 refers to a dead (removed) revision in file `lams_tool_lamc/web/monitoring/SummaryAllSessions.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/SummaryContent.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_lamc/web/monitoring/SummaryContent.jsp 20 Sep 2006 00:52:49 -0000 1.19
+++ lams_tool_lamc/web/monitoring/SummaryContent.jsp 2 Oct 2006 01:59:34 -0000 1.20
@@ -1,9 +1,9 @@
-<%--
+<%--
Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
License Information: http://lamsfoundation.org/licensing/lams/2.0/
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
+ it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
@@ -13,128 +13,124 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ USA
http://www.gnu.org/licenses/gpl.txt
--%>
<%@ include file="/common/taglibs.jsp"%>
-
-
-
-
+
+
+
-
+
-
+
+
-
+
+
-
-
-
+
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Fisheye: Tag 1.8 refers to a dead (removed) revision in file `lams_tool_lamc/web/monitoring/SummaryIndividualSession.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_lamc/web/monitoring/UserResponses.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/UserResponses.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/monitoring/UserResponses.jsp 2 Oct 2006 01:59:34 -0000 1.1
@@ -0,0 +1,28 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ include file="/common/taglibs.jsp"%>
+
+
+
+
+
+mc user responses
\ No newline at end of file
Index: lams_tool_lamc/web/monitoring/candidateAnswersList.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/candidateAnswersList.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/monitoring/candidateAnswersList.jsp 2 Oct 2006 01:59:34 -0000 1.1
@@ -0,0 +1,124 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ include file="/common/taglibs.jsp" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<%@ include file="/common/messages.jsp"%>
+
+
+
Index: lams_tool_lamc/web/monitoring/editQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/editQuestionBox.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/monitoring/editQuestionBox.jsp 2 Oct 2006 01:59:34 -0000 1.1
@@ -0,0 +1,170 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+
+
+<%@ include file="/common/taglibs.jsp"%>
+
+
+ <%@ include file="/common/header.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%@ include file="/monitoring/candidateAnswersList.jsp"%>
+
+
+
+
Index: lams_tool_lamc/web/monitoring/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/itemlist.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/monitoring/itemlist.jsp 2 Oct 2006 01:59:34 -0000 1.1
@@ -0,0 +1,104 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ include file="/common/taglibs.jsp" %>
+
+
+<%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
+
+
Index: lams_tool_lamc/web/monitoring/newQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/newQuestionBox.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/monitoring/newQuestionBox.jsp 2 Oct 2006 01:59:34 -0000 1.1
@@ -0,0 +1,139 @@
+ <%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+
+
+<%@ include file="/common/taglibs.jsp"%>
+
+
+ <%@ include file="/common/header.jsp"%>
+
+
+
+
+
+
+
+