Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml,v diff -u -r1.1 -r1.2 --- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml 19 Feb 2006 19:13:42 -0000 1.1 +++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml 28 Feb 2006 07:29:14 -0000 1.2 @@ -51,6 +51,14 @@ column="session_status" length="100" /> + + - + QA Tool for Lams 1.1 @@ -9,7 +9,7 @@ - + @@ -49,6 +49,13 @@ + + + + + + + Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/db/sql/create_lams_tool_qa.sql,v diff -u -r1.23 -r1.24 --- lams_tool_laqa/db/sql/create_lams_tool_qa.sql 19 Feb 2006 14:10:20 -0000 1.23 +++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql 28 Feb 2006 07:29:14 -0000 1.24 @@ -25,6 +25,7 @@ , qa_session_id BIGINT(20) NOT NULL , session_start_date DATETIME , session_end_date DATETIME + , session_name VARCHAR(100) , session_status VARCHAR(100) , qa_content_id BIGINT(20) NOT NULL , PRIMARY KEY (uid) Index: lams_tool_laqa/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/db/sql/tool_insert.sql,v diff -u -r1.9 -r1.10 --- lams_tool_laqa/db/sql/tool_insert.sql 8 Feb 2006 05:53:45 -0000 1.9 +++ lams_tool_laqa/db/sql/tool_insert.sql 28 Feb 2006 07:29:14 -0000 1.10 @@ -47,8 +47,8 @@ 'tool/laqa11/authoringStarter.do', 'tool/laqa11/definelater.do', 'tool/laqa11/export.do', +'tool/laqa11/monitoringStarter.do', 'tool/laqa11/monitoring.do', 'tool/laqa11/monitoring.do', -'tool/laqa11/monitoring.do', NOW() ) Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v diff -u -r1.30 -r1.31 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 24 Feb 2006 15:06:00 -0000 1.30 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 28 Feb 2006 07:29:13 -0000 1.31 @@ -31,6 +31,7 @@ public static final long DEFAULT_QUE_CONTENT_ID =1; public static final String TOOL_SERVICE ="tool_service"; public static final String ERROR_MCAPPLICATION = "error.exception.QaApplication"; + public static final String TOOL_CONTENT_ID = "toolContentID"; public static final String TARGET_MODE ="targetMode"; public static final String TARGET_MODE_AUTHORING ="Authoring"; @@ -42,12 +43,13 @@ public static final String LOAD_LEARNER ="loadLearner"; public static final String LEARNING_STARTER ="learningStarter"; public static final String MONITORING_STARTER ="monitoringStarter"; + public static final String LOAD_MONITORING ="loadMonitoring"; public static final String COPY_TOOL_CONTENT ="copyToolContent"; public static final String ERROR_LIST ="errorList"; public static final String ERROR_LIST_LEARNER ="errorListLearner"; public static final String DEFAULT_CONTENT_ID_STR ="defaultContentIdStr"; public static final String TOOL_SESSION_ID = "toolSessionID"; - + /* * refers to number of questions presented initially, we have a single record for default content */ Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaResources.properties,v diff -u -r1.16 -r1.17 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties 23 Feb 2006 19:33:19 -0000 1.16 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties 28 Feb 2006 07:29:13 -0000 1.17 @@ -132,7 +132,6 @@ error.contentrepository =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly. monitoring.feedback.instructionUpdate =The content has been updated successfully. - group.label =Group button.summary =Summary button.editActivity =Edit Activity Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java,v diff -u -r1.7 -r1.8 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java 24 Feb 2006 15:06:00 -0000 1.7 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java 28 Feb 2006 07:29:13 -0000 1.8 @@ -66,6 +66,9 @@ /** nullable persistent field */ private String session_status; + /** nullable persistent field */ + private String session_name; + /** persistent field */ private QaContent qaContent; @@ -77,7 +80,7 @@ public QaSession(){}; - /** full constructor */ + public QaSession(Long qaSessionId, Date session_start_date, Date session_end_date, @@ -91,27 +94,26 @@ this.session_status = session_status; this.qaContent = qaContent; this.qaQueUsers = qaQueUsers; - logger.debug(logger + " " + this.getClass().getName() + "in full constructor: QaSession()"); } - - /** - * Construtor for initializing survey session. - * @param sessionStartDate - * @param sessionStatus - * @param surveyContent - * @param surveyQueUsrs - */ + public QaSession(Long qaSessionId, - Date session_start_date, - String session_status, - QaContent qaContent, - Set qaQueUsers) - { - this(qaSessionId,session_start_date,null,session_status,qaContent,qaQueUsers); - } + Date session_start_date, + String session_status, + String session_name, + QaContent qaContent, + Set qaQueUsers) + { + this.qaSessionId = qaSessionId; + this.session_start_date = session_start_date; + this.session_status = session_status; + this.session_name=session_name; + this.qaContent = qaContent; + this.qaQueUsers = qaQueUsers; + logger.debug(logger + " " + this.getClass().getName() + "in full constructor: QaSession()"); + } + - public Long getQaSessionId() { return this.qaSessionId; @@ -247,4 +249,16 @@ public void setUid(Long uid) { this.uid = uid; } + /** + * @return Returns the session_name. + */ + public String getSession_name() { + return session_name; + } + /** + * @param session_name The session_name to set. + */ + public void setSession_name(String session_name) { + this.session_name = session_name; + } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v diff -u -r1.32 -r1.33 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 24 Feb 2006 15:06:00 -0000 1.32 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 28 Feb 2006 07:29:14 -0000 1.33 @@ -1143,6 +1143,8 @@ public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { logger.debug("start of createToolSession with ids: " + toolSessionId + " and " + toolContentId); + logger.debug("toolSessionName: " + toolSessionName); + if (toolSessionId == null) { logger.debug("toolSessionId is null"); @@ -1204,6 +1206,7 @@ QaSession qaSession = new QaSession(toolSessionId, new Date(System.currentTimeMillis()), QaSession.INCOMPLETE, + toolSessionName, qaContent, new TreeSet()); Fisheye: Tag 1.14 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/WEB-INF/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/struts-config.xml,v diff -u -r1.11 -r1.12 --- lams_tool_laqa/web/WEB-INF/struts-config.xml 23 Feb 2006 20:14:03 -0000 1.11 +++ lams_tool_laqa/web/WEB-INF/struts-config.xml 28 Feb 2006 07:29:14 -0000 1.12 @@ -153,31 +153,47 @@ + + + + + + + - - - - - - + + + + Index: lams_tool_laqa/web/monitoring/Instructions.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/Instructions.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_laqa/web/monitoring/Instructions.jsp 28 Feb 2006 07:29:14 -0000 1.1 @@ -0,0 +1,37 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +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" %> + + + + +

+
+ instructions creen +
+ Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp 28 Feb 2006 07:29:14 -0000 1.1 @@ -0,0 +1,236 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +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" %> + + + + + + + + + + <bean:message key="label.monitoring"/> + + + + + + + css/tool_custom.css" rel="stylesheet" type="text/css"> + + + + + +<%-- chooses which tab to highlight --%> + + + + + + + + + + + + + + + +")'> + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
  
+ + + + + + +
images/aqua_tab_s_left.gif" name="tab_left_su" width="8" height="25" border="0" id="tab_left_su"/> + images/aqua_tab_s_right.gif" name="tab_right_su" width="8" height="25" border="0" id="tab_right_su"/>
+
+ + + + + + +
images/aqua_tab_s_left.gif" name="tab_left_i" width="8" height="25" border="0" id="tab_left_i"/> + images/aqua_tab_s_right.gif" name="tab_right_i" width="8" height="25" border="0" id="tab_right_i"/>
+
+ + + + + + +
images/aqua_tab_s_left.gif" name="tab_left_e" width="8" height="25" border="0" id="tab_left_e"/> + images/aqua_tab_s_right.gif" name="tab_right_e" width="8" height="25" border="0" id="tab_right_e"/>
+
+ + + + + + +
images/aqua_tab_s_left.gif" name="tab_left_s" width="8" height="25" border="0" id="tab_left_s"/> + images/aqua_tab_s_right.gif" name="tab_right_s" width="8" height="25" border="0" id="tab_right_s"/>
+
+ + + + + + +
+ +
+ +
+ + +
+ edit activity screen +
+
+ + +
+ +
+
+ + +
+ + + + + +
+ + + + + +
+
+
+
+ + + + + + + + + + + Index: lams_tool_laqa/web/monitoring/Stats.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Stats.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_laqa/web/monitoring/Stats.jsp 28 Feb 2006 07:29:14 -0000 1.1 @@ -0,0 +1,39 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +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" %> + + + + + +

+
+ stats screen +
+ + Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/SummaryContent.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_laqa/web/monitoring/SummaryContent.jsp 28 Feb 2006 07:29:14 -0000 1.1 @@ -0,0 +1,38 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +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" %> + + + + +

+
+ summary screen +
+ + \ No newline at end of file