Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java,v diff -u -r1.68 -r1.69 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 5 Feb 2006 14:32:56 -0000 1.68 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 25 Feb 2006 19:27:26 -0000 1.69 @@ -43,7 +43,8 @@ public static final String LEARNING_STARTER ="learningStarter"; public static final String MONITORING_STARTER ="monitoringStarter"; public static final String LOAD_LEARNER ="loadLearner"; - public static final String LOAD_MONITORING ="loadMonitoring"; + public static final String LOAD_MONITORING_CONTENT ="loadMonitoringContent"; + public static final String LOAD_MONITORING_CONTENT_EDITACTIVITY ="loadMonitoringEditActivity"; public static final String EXPORT_PORTFOLIO = "exportPortfolio"; public static final String INDIVIDUAL_REPORT ="individualReport"; public static final String VIEW_SUMMARY ="viewSummary"; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredUserDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredUserDTO.java,v diff -u -r1.3 -r1.4 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredUserDTO.java 7 Jan 2006 16:09:46 -0000 1.3 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredUserDTO.java 25 Feb 2006 19:27:26 -0000 1.4 @@ -1,23 +1,24 @@ -/* - *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 - */ +/*************************************************************************** + * 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 + * ***********************************************************************/ package org.lamsfoundation.lams.tool.mc; import java.util.Map; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java,v diff -u -r1.30 -r1.31 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java 24 Feb 2006 20:25:27 -0000 1.30 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java 25 Feb 2006 19:27:26 -0000 1.31 @@ -521,8 +521,8 @@ } else { - logger.debug("request is from amonitoring url. return to: " + LOAD_MONITORING); - return LOAD_MONITORING; + logger.debug("request is from monitoring url. return to: " + LOAD_MONITORING_CONTENT_EDITACTIVITY); + return LOAD_MONITORING_CONTENT_EDITACTIVITY; } } @@ -573,7 +573,7 @@ request.getSession().removeAttribute(LEARNING_STARTER); request.getSession().removeAttribute(MONITORING_STARTER); request.getSession().removeAttribute(LOAD_LEARNER); - request.getSession().removeAttribute(LOAD_MONITORING); + request.getSession().removeAttribute(LOAD_MONITORING_CONTENT); request.getSession().removeAttribute(INDIVIDUAL_REPORT); request.getSession().removeAttribute(VIEW_SUMMARY); request.getSession().removeAttribute(REDO_QUESTIONS); @@ -699,7 +699,7 @@ request.getSession().removeAttribute(MAP_USER_RESPONSES); request.getSession().removeAttribute(MAP_MAIN_REPORT); request.getSession().removeAttribute(MAP_STATS); - request.getSession().removeAttribute(CURRENT_MONITORING_TAB); + //request.getSession().removeAttribute(CURRENT_MONITORING_TAB); request.getSession().removeAttribute(REPORT_TITLE_MONITOR); request.getSession().removeAttribute(MONITOR_USER_ID); request.getSession().removeAttribute(MONITORING_REPORT); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java,v diff -u -r1.33 -r1.34 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java 6 Feb 2006 21:31:29 -0000 1.33 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java 25 Feb 2006 19:27:26 -0000 1.34 @@ -1,3 +1,25 @@ +/*************************************************************************** + * 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 + * ***********************************************************************/ + package org.lamsfoundation.lams.tool.mc.web; import java.io.FileNotFoundException; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/CustomStrutsExceptionHandler.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/Attic/CustomStrutsExceptionHandler.java,v diff -u -r1.2 -r1.3 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/CustomStrutsExceptionHandler.java 24 Jan 2006 21:39:07 -0000 1.2 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/CustomStrutsExceptionHandler.java 25 Feb 2006 19:27:26 -0000 1.3 @@ -1,24 +1,25 @@ -/* - Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +/*************************************************************************** + * 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 + * ***********************************************************************/ - 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 -*/ - package org.lamsfoundation.lams.tool.mc.web; import javax.servlet.http.HttpServletRequest; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java,v diff -u -r1.20 -r1.21 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java 3 Feb 2006 23:59:24 -0000 1.20 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java 25 Feb 2006 19:27:26 -0000 1.21 @@ -1,6 +1,24 @@ -/* - * Created on 16/10/2005 - */ +/*************************************************************************** + * 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 + * ***********************************************************************/ package org.lamsfoundation.lams.tool.mc.web; import java.util.Date; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java,v diff -u -r1.98 -r1.99 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 24 Feb 2006 20:25:28 -0000 1.98 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 25 Feb 2006 19:27:26 -0000 1.99 @@ -1,21 +1,24 @@ -/* *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 - */ +/*************************************************************************** + * 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 + * ***********************************************************************/ package org.lamsfoundation.lams.tool.mc.web; import java.io.IOException; @@ -1935,7 +1938,7 @@ McUtils.setDefineLater(request, false); /* switch to view-only mode in the monitoring url after the content is persisted*/ - if (destination.equals(LOAD_MONITORING)) + if (destination.equals(LOAD_MONITORING_CONTENT)) { request.getSession().setAttribute(ACTIVE_MODULE, DEFINE_LATER); request.getSession().setAttribute(DEFINE_LATER_IN_EDIT_MODE, new Boolean(false)); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java,v diff -u -r1.28 -r1.29 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java 2 Feb 2006 20:57:39 -0000 1.28 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java 25 Feb 2006 19:27:26 -0000 1.29 @@ -1,3 +1,24 @@ +/*************************************************************************** + * 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 + * ***********************************************************************/ package org.lamsfoundation.lams.tool.mc.web; import org.lamsfoundation.lams.tool.mc.web.McLearningForm; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McDLStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/Attic/McDLStarterAction.java,v diff -u -r1.4 -r1.5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McDLStarterAction.java 5 Feb 2006 15:01:55 -0000 1.4 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McDLStarterAction.java 25 Feb 2006 19:27:26 -0000 1.5 @@ -1,3 +1,25 @@ +/*************************************************************************** + * 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 + * ***********************************************************************/ + /** * @author Ozgur Demirtas * Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/Attic/McExportAction.java,v diff -u -r1.2 -r1.3 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportAction.java 5 Feb 2006 15:01:55 -0000 1.2 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportAction.java 25 Feb 2006 19:27:26 -0000 1.3 @@ -1,3 +1,24 @@ +/*************************************************************************** + * 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 + * ***********************************************************************/ package org.lamsfoundation.lams.tool.mc.web; import javax.servlet.http.HttpServletRequest; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportForm.java,v diff -u -r1.1 -r1.2 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportForm.java 5 Feb 2006 14:32:56 -0000 1.1 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportForm.java 25 Feb 2006 19:27:26 -0000 1.2 @@ -1,3 +1,24 @@ +/*************************************************************************** + * 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 + * ***********************************************************************/ package org.lamsfoundation.lams.tool.mc.web; import org.apache.log4j.Logger; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/Attic/McExportServlet.java,v diff -u -r1.1 -r1.2 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportServlet.java 5 Feb 2006 14:32:56 -0000 1.1 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportServlet.java 25 Feb 2006 19:27:26 -0000 1.2 @@ -1,3 +1,24 @@ +/*************************************************************************** + * 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 + * ***********************************************************************/ package org.lamsfoundation.lams.tool.mc.web; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java,v diff -u -r1.12 -r1.13 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 5 Feb 2006 15:01:55 -0000 1.12 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 25 Feb 2006 19:27:26 -0000 1.13 @@ -1,21 +1,24 @@ -/* *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 - */ +/*************************************************************************** + * 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 + * ***********************************************************************/ package org.lamsfoundation.lams.tool.mc.web; import java.io.IOException; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java,v diff -u -r1.12 -r1.13 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java 2 Feb 2006 20:58:38 -0000 1.12 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java 25 Feb 2006 19:27:26 -0000 1.13 @@ -1,3 +1,24 @@ +/*************************************************************************** + * 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 + * ***********************************************************************/ package org.lamsfoundation.lams.tool.mc.web; import org.apache.struts.action.ActionForm; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java,v diff -u -r1.37 -r1.38 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 8 Feb 2006 11:27:08 -0000 1.37 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 25 Feb 2006 19:27:26 -0000 1.38 @@ -1,4 +1,24 @@ - +/*************************************************************************** + * 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 + * ***********************************************************************/ package org.lamsfoundation.lams.tool.mc.web; import java.io.IOException; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java,v diff -u -r1.15 -r1.16 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java 5 Feb 2006 15:01:55 -0000 1.15 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java 25 Feb 2006 19:27:26 -0000 1.16 @@ -1,21 +1,24 @@ -/* *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 - */ +/*************************************************************************** + * 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 + * ***********************************************************************/ package org.lamsfoundation.lams.tool.mc.web; import java.io.IOException; @@ -148,6 +151,7 @@ ServletException { logger.debug("dispatching unspecified..."); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); McMonitoringForm mcMonitoringForm = (McMonitoringForm) form; return null; } @@ -176,6 +180,7 @@ ServletException { logger.debug("dispatching submitSession..."); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); McMonitoringForm mcMonitoringForm = (McMonitoringForm) form; IMcService mcService =McUtils.getToolService(request); if (mcService == null) @@ -204,7 +209,7 @@ request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession); logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION)); - return (mapping.findForward(LOAD_MONITORING)); + return (mapping.findForward(LOAD_MONITORING_CONTENT)); } @@ -231,6 +236,7 @@ ServletException { logger.debug("dispatching editActivity..."); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); McMonitoringForm mcMonitoringForm = (McMonitoringForm) form; IMcService mcService =McUtils.getToolService(request); logger.debug("mcService: " + mcService); @@ -243,7 +249,7 @@ } request.getSession().setAttribute(TOOL_SERVICE, mcService); - request.setAttribute(CURRENT_MONITORING_TAB, "editActivity"); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity"); McStarterAction mcStarterAction= new McStarterAction(); request.getSession().setAttribute(TOOL_SERVICE, mcService); @@ -265,9 +271,9 @@ logger.debug("monitoring url does not allow editActivity since the content is in use."); persistError(request,"error.content.inUse"); McUtils.cleanUpSessionAbsolute(request); - request.setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(true).toString()); - logger.debug("forwarding to: " + LOAD_MONITORING); - return (mapping.findForward(LOAD_MONITORING)); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(true).toString()); + logger.debug("forwarding to: " + LOAD_MONITORING_CONTENT); + return (mapping.findForward(LOAD_MONITORING_CONTENT)); } return mcStarterAction.executeDefineLater(mapping, form, request, response, mcService); @@ -299,6 +305,7 @@ ToolException { logger.debug("dispatching editActivityQuestions.."); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); IMcService mcService =McUtils.getToolService(request); if (mcService == null) { @@ -308,7 +315,7 @@ } request.getSession().setAttribute(TOOL_SERVICE, mcService); - request.setAttribute(CURRENT_MONITORING_TAB, "editActivity"); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity"); request.getSession().setAttribute(DEFINE_LATER_IN_EDIT_MODE, new Boolean(true)); @@ -317,7 +324,7 @@ request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0)); logger.debug("setting EDIT_OPTIONS_MODE to 0"); - return (mapping.findForward(LOAD_MONITORING)); + return (mapping.findForward(LOAD_MONITORING_CONTENT)); } /** @@ -343,6 +350,7 @@ ServletException { McMonitoringStarterAction mcMonitoringStarter= new McMonitoringStarterAction(); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); logger.debug("init monitoring data"); boolean initData=mcMonitoringStarter.initialiseMonitoringData(mapping, form, request, response); logger.debug("monitoring data initialised.."); @@ -358,8 +366,8 @@ } request.getSession().setAttribute(TOOL_SERVICE, mcService); - request.setAttribute(CURRENT_MONITORING_TAB, "summary"); - return (mapping.findForward(LOAD_MONITORING)); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "summary"); + return (mapping.findForward(LOAD_MONITORING_CONTENT)); } @@ -386,6 +394,7 @@ ServletException { logger.debug("dispatching getInstructions..." + request); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); McMonitoringStarterAction mcMonitoringStarter= new McMonitoringStarterAction(); logger.debug("init monitoring data"); boolean initData=mcMonitoringStarter.initialiseMonitoringData(mapping, form, request, response); @@ -403,8 +412,9 @@ } request.getSession().setAttribute(TOOL_SERVICE, mcService); - request.setAttribute(CURRENT_MONITORING_TAB, "instructions"); - return (mapping.findForward(LOAD_MONITORING)); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "instructions"); + logger.debug("forwarding to: " + LOAD_MONITORING_CONTENT); + return (mapping.findForward(LOAD_MONITORING_CONTENT)); } @@ -431,6 +441,7 @@ ServletException { McMonitoringStarterAction mcMonitoringStarter= new McMonitoringStarterAction(); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); logger.debug("init monitoring data"); boolean initData=mcMonitoringStarter.initialiseMonitoringData(mapping, form, request, response); logger.debug("monitoring data initialised.."); @@ -446,8 +457,8 @@ } request.getSession().setAttribute(TOOL_SERVICE, mcService); - request.setAttribute(CURRENT_MONITORING_TAB, "stats"); - return (mapping.findForward(LOAD_MONITORING)); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "stats"); + return (mapping.findForward(LOAD_MONITORING_CONTENT)); } @@ -474,10 +485,11 @@ ServletException { logger.debug("dispatching proxy addNewQuestion..."); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); request.setAttribute(SOURCE_MC_STARTER, "monitoring"); logger.debug("SOURCE_MC_STARTER: monitoring"); - request.setAttribute(CURRENT_MONITORING_TAB, "editActivity"); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity"); McAction mcAction = new McAction(); return mcAction.addNewQuestion(mapping, form, request, response); @@ -507,10 +519,11 @@ ServletException { logger.debug("dispatching proxy removeQuestion..."); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); request.setAttribute(SOURCE_MC_STARTER, "monitoring"); logger.debug("SOURCE_MC_STARTER: monitoring"); - request.setAttribute(CURRENT_MONITORING_TAB, "editActivity"); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity"); McAction mcAction = new McAction(); return mcAction.removeQuestion(mapping, form, request, response); @@ -540,10 +553,11 @@ ServletException { logger.debug("dispatching proxy editOptions..." + request); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); request.setAttribute(SOURCE_MC_STARTER, "monitoring"); logger.debug("SOURCE_MC_STARTER: monitoring"); - request.setAttribute(CURRENT_MONITORING_TAB, "editActivity"); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity"); McAction mcAction = new McAction(); return mcAction.editOptions(mapping, form, request, response); @@ -573,10 +587,11 @@ ServletException { logger.debug("dispatching proxy addOption..."+ request); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); request.setAttribute(SOURCE_MC_STARTER, "monitoring"); logger.debug("SOURCE_MC_STARTER: monitoring"); - request.setAttribute(CURRENT_MONITORING_TAB, "editActivity"); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity"); McAction mcAction = new McAction(); return mcAction.addOption(mapping, form, request, response); @@ -605,10 +620,11 @@ ServletException { logger.debug("dispatching proxy removeOption..." + request); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); request.setAttribute(SOURCE_MC_STARTER, "monitoring"); logger.debug("SOURCE_MC_STARTER: monitoring"); - request.setAttribute(CURRENT_MONITORING_TAB, "editActivity"); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity"); McAction mcAction = new McAction(); return mcAction.removeOption(mapping, form, request, response); @@ -639,10 +655,11 @@ ServletException { logger.debug("dispatching proxy moveQuestionDown..." + request); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); request.setAttribute(SOURCE_MC_STARTER, "monitoring"); logger.debug("SOURCE_MC_STARTER: monitoring"); - request.setAttribute(CURRENT_MONITORING_TAB, "editActivity"); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity"); McAction mcAction = new McAction(); return mcAction.moveQuestionDown(mapping, form, request, response); @@ -672,10 +689,11 @@ ServletException { logger.debug("dispatching proxy moveQuestionUp..." + request); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); request.setAttribute(SOURCE_MC_STARTER, "monitoring"); logger.debug("SOURCE_MC_STARTER: monitoring"); - request.setAttribute(CURRENT_MONITORING_TAB, "editActivity"); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity"); McAction mcAction = new McAction(); return mcAction.moveQuestionUp(mapping, form, request, response); @@ -704,10 +722,11 @@ ServletException { logger.debug("dispatching proxy doneOptions..."); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); request.setAttribute(SOURCE_MC_STARTER, "monitoring"); logger.debug("SOURCE_MC_STARTER: monitoring"); - request.setAttribute(CURRENT_MONITORING_TAB, "editActivity"); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity"); McAction mcAction = new McAction(); return mcAction.doneOptions(mapping, form, request, response); @@ -738,11 +757,12 @@ { logger.debug("dispatching proxy submitQuestions..." + request); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); request.setAttribute(SOURCE_MC_STARTER, "monitoring"); logger.debug("SOURCE_MC_STARTER: monitoring"); /*set the current tab*/ - request.setAttribute(CURRENT_MONITORING_TAB, "editActivity"); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity"); /* present the view-only screen first */ request.getSession().setAttribute(ACTIVE_MODULE, DEFINE_LATER); @@ -776,10 +796,11 @@ { logger.debug("dispatching proxy deleteOfflineFile..." + request); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); request.setAttribute(SOURCE_MC_STARTER, "monitoring"); logger.debug("SOURCE_MC_STARTER: monitoring"); - request.setAttribute(CURRENT_MONITORING_TAB, "editActivity"); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity"); McAction mcAction = new McAction(); return mcAction.deleteOfflineFile(mapping, form, request, response); @@ -809,10 +830,11 @@ { logger.debug("dispatching proxy deleteOnlineFile..."); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); request.setAttribute(SOURCE_MC_STARTER, "monitoring"); logger.debug("SOURCE_MC_STARTER: monitoring"); - request.setAttribute(CURRENT_MONITORING_TAB, "editActivity"); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity"); McAction mcAction = new McAction(); return mcAction.deleteOnlineFile(mapping, form, request, response); @@ -845,10 +867,11 @@ RepositoryCheckedException { logger.debug("dispatching proxy deleteOnlineFile..." + request); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); request.setAttribute(SOURCE_MC_STARTER, "monitoring"); logger.debug("SOURCE_MC_STARTER: monitoring"); - request.setAttribute(CURRENT_MONITORING_TAB, "editActivity"); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity"); McAction mcAction = new McAction(); return mcAction.submitOfflineFiles(mapping, form, request, response); @@ -880,10 +903,11 @@ RepositoryCheckedException { logger.debug("dispatching proxy submitOnlineFiles..." + request); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); request.setAttribute(SOURCE_MC_STARTER, "monitoring"); logger.debug("SOURCE_MC_STARTER: monitoring"); - request.setAttribute(CURRENT_MONITORING_TAB, "editActivity"); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity"); McAction mcAction = new McAction(); return mcAction.submitOnlineFiles(mapping, form, request, response); @@ -912,10 +936,11 @@ ServletException { logger.debug("dispatching proxy doneAdvancedTab..."); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); request.setAttribute(SOURCE_MC_STARTER, "monitoring"); logger.debug("SOURCE_MC_STARTER: monitoring"); - request.setAttribute(CURRENT_MONITORING_TAB, "editActivity"); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity"); McAction mcAction = new McAction(); return mcAction.doneAdvancedTab(mapping, form, request, response); @@ -945,10 +970,11 @@ ServletException { logger.debug("dispatching proxy doneInstructionsTab..."); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); request.setAttribute(SOURCE_MC_STARTER, "monitoring"); logger.debug("SOURCE_MC_STARTER: monitoring"); - request.setAttribute(CURRENT_MONITORING_TAB, "editActivity"); + request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity"); McAction mcAction = new McAction(); return mcAction.doneInstructionsTab(mapping, form, request, response); @@ -978,6 +1004,7 @@ ServletException { McUtils.cleanUpSessionAbsolute(request); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); /*forward outside of the app. Currently it is index.jsp */ return (mapping.findForward(LOAD_STARTER)); } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringForm.java,v diff -u -r1.5 -r1.6 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringForm.java 18 Jan 2006 16:06:52 -0000 1.5 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringForm.java 25 Feb 2006 19:27:26 -0000 1.6 @@ -1,3 +1,24 @@ +/*************************************************************************** + * 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 + * ***********************************************************************/ package org.lamsfoundation.lams.tool.mc.web; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java,v diff -u -r1.15 -r1.16 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java 5 Feb 2006 15:01:55 -0000 1.15 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java 25 Feb 2006 19:27:26 -0000 1.16 @@ -1,4 +1,24 @@ - +/*************************************************************************** + * 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 + * ***********************************************************************/ package org.lamsfoundation.lams.tool.mc.web; import java.io.IOException; @@ -105,7 +125,7 @@ if (initData == false) return (mapping.findForward(ERROR_LIST)); - return (mapping.findForward(LOAD_MONITORING)); + return (mapping.findForward(LOAD_MONITORING_CONTENT)); } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java,v diff -u -r1.64 -r1.65 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java 6 Feb 2006 21:32:38 -0000 1.64 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java 25 Feb 2006 19:27:26 -0000 1.65 @@ -1,3 +1,25 @@ +/*************************************************************************** + * 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 + * ***********************************************************************/ + /** * @author Ozgur Demirtas * @@ -567,6 +589,7 @@ */ protected void retrieveExistingContent(HttpServletRequest request, McAuthoringForm mcAuthoringForm, long toolContentId, McContent mcContent) { + logger.debug("retrieving existing content:" + mcContent); IMcService mcService =McUtils.getToolService(request); logger.debug("mcService:" + mcService); @@ -577,14 +600,19 @@ /*used in authoring mode basic tab*/ request.getSession().setAttribute(RICHTEXT_TITLE,mcContent.getTitle()); request.getSession().setAttribute(RICHTEXT_INSTRUCTIONS,mcContent.getInstructions()); + + logger.debug("passMark:" +mcContent.getPassMark()); + if (mcContent.getPassMark() == null) + mcContent.setPassMark(new Integer(0)); + mcAuthoringForm.setPassmark(mcContent.getPassMark().toString()); + request.getSession().setAttribute(PASSMARK, mcContent.getPassMark()); //Integer /*used in advanced tab*/ request.getSession().setAttribute(RICHTEXT_REPORT_TITLE,mcContent.getReportTitle()); request.getSession().setAttribute(RICHTEXT_END_LEARNING_MSG,mcContent.getEndLearningMessage()); - request.getSession().setAttribute(PASSMARK, mcContent.getPassMark()); //Integer - /* used in instructions tab*/ + /* used in instructions tab*/ request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS,mcContent.getOfflineInstructions()); request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS,mcContent.getOnlineInstructions()); 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.8 -r1.9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java 3 Feb 2006 23:59:24 -0000 1.8 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java 25 Feb 2006 19:27:26 -0000 1.9 @@ -1,3 +1,24 @@ +/*************************************************************************** + * 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 + * ***********************************************************************/ package org.lamsfoundation.lams.tool.mc.web; import java.util.Iterator; Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/McContent.hbm.xml,v diff -u -r1.10 -r1.11 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml 7 Jan 2006 14:50:33 -0000 1.10 +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml 25 Feb 2006 19:27:26 -0000 1.11 @@ -48,22 +48,24 @@ type="boolean" access="property" column="define_later" + length="1" /> @@ -81,6 +83,7 @@ type="boolean" access="property" column="questions_sequenced" + length="1" /> @@ -176,6 +180,7 @@ type="java.lang.Integer" access="property" column="pass_mark" + length="1" /> - - + + @@ -354,7 +360,7 @@ /> @@ -406,11 +412,17 @@ /> - + + + javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.tool.mc.web.McResources + org.lamsfoundation.lams.tool.mc.web.McResources contextConfigLocation - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml - classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml - classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml + classpath:/org/lamsfoundation/lams/applicationContext.xml + classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml + classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml + classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml + classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml @@ -52,7 +52,7 @@ sessionFactoryBeanName - mcSessionFactory + mcSessionFactory @@ -133,7 +133,6 @@ org.lamsfoundation.lams.tool.mc.web.McExportServlet - Connector @@ -212,7 +211,6 @@ tags-logic-el /WEB-INF/struts/tlds/struts-logic-el.tld - tags-tiles /WEB-INF/struts/tlds/struts-tiles.tld Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/IndividualLearnerResults.jsp,v diff -u -r1.4 -r1.5 --- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp 24 Feb 2006 20:25:27 -0000 1.4 +++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp 25 Feb 2006 19:27:26 -0000 1.5 @@ -110,7 +110,7 @@ -   + images/dot.jpg" align=left>   @@ -155,15 +155,15 @@ - + images/tick.gif" align=right width=20 height=20> - + images/cross.gif" align=right width=20 height=20> Index: lams_tool_lamc/web/learning/ViewAnswers.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_lamc/web/learning/ViewAnswers.jsp 24 Feb 2006 20:25:27 -0000 1.6 +++ lams_tool_lamc/web/learning/ViewAnswers.jsp 25 Feb 2006 19:27:26 -0000 1.7 @@ -94,7 +94,7 @@ -   + images/dot.jpg" align=left>   Index: lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp,v diff -u -r1.18 -r1.19 --- lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp 24 Feb 2006 20:25:28 -0000 1.18 +++ lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp 25 Feb 2006 19:27:27 -0000 1.19 @@ -197,15 +197,15 @@
- + - +