Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java =================================================================== diff -u -r77f932966d3bc4ce011c78dc938f5a18f8f4a5c0 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision 77f932966d3bc4ce011c78dc938f5a18f8f4a5c0) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -rf1f0a8edec32660df941111138545e2e686fe709 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredUserDTO.java (.../McMonitoredUserDTO.java) (revision f1f0a8edec32660df941111138545e2e686fe709) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredUserDTO.java (.../McMonitoredUserDTO.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java (.../McUtils.java) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java (.../McUtils.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -r580172d24abfdbc023ccba96db6d08865282db24 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 580172d24abfdbc023ccba96db6d08865282db24) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -r3971dc9408da1bacd6012b197165c66eca01778b -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/CustomStrutsExceptionHandler.java (.../CustomStrutsExceptionHandler.java) (revision 3971dc9408da1bacd6012b197165c66eca01778b) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/CustomStrutsExceptionHandler.java (.../CustomStrutsExceptionHandler.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -rdcb4bb59e05ab9fc05be18355abc22d8d5a675e9 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java (.../LearningUtil.java) (revision dcb4bb59e05ab9fc05be18355abc22d8d5a675e9) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java (.../LearningUtil.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -r02a4d02451cbdd260d020d4b22d6298c35e0493a -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java (.../McAuthoringForm.java) (revision 02a4d02451cbdd260d020d4b22d6298c35e0493a) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java (.../McAuthoringForm.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -ra671e429245e102a9a71e47003a883459ebdada4 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McDLStarterAction.java (.../McDLStarterAction.java) (revision a671e429245e102a9a71e47003a883459ebdada4) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McDLStarterAction.java (.../McDLStarterAction.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -ra671e429245e102a9a71e47003a883459ebdada4 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportAction.java (.../McExportAction.java) (revision a671e429245e102a9a71e47003a883459ebdada4) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportAction.java (.../McExportAction.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -r77f932966d3bc4ce011c78dc938f5a18f8f4a5c0 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportForm.java (.../McExportForm.java) (revision 77f932966d3bc4ce011c78dc938f5a18f8f4a5c0) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportForm.java (.../McExportForm.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -r77f932966d3bc4ce011c78dc938f5a18f8f4a5c0 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportServlet.java (.../McExportServlet.java) (revision 77f932966d3bc4ce011c78dc938f5a18f8f4a5c0) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportServlet.java (.../McExportServlet.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -ra671e429245e102a9a71e47003a883459ebdada4 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java (.../McLearningAction.java) (revision a671e429245e102a9a71e47003a883459ebdada4) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java (.../McLearningAction.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -rf1068c6c8b6c00c199b7e3544acce72cac9b988f -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java (.../McLearningForm.java) (revision f1068c6c8b6c00c199b7e3544acce72cac9b988f) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java (.../McLearningForm.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -rc77bbe110c0405056e0ee95f02eec4a2f1f9db81 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java (.../McLearningStarterAction.java) (revision c77bbe110c0405056e0ee95f02eec4a2f1f9db81) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java (.../McLearningStarterAction.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -ra671e429245e102a9a71e47003a883459ebdada4 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java (.../McMonitoringAction.java) (revision a671e429245e102a9a71e47003a883459ebdada4) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java (.../McMonitoringAction.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -r8f140db31dee478888fd5fe42ab0c3e4210c21f6 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringForm.java (.../McMonitoringForm.java) (revision 8f140db31dee478888fd5fe42ab0c3e4210c21f6) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringForm.java (.../McMonitoringForm.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -ra671e429245e102a9a71e47003a883459ebdada4 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java (.../McMonitoringStarterAction.java) (revision a671e429245e102a9a71e47003a883459ebdada4) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java (.../McMonitoringStarterAction.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -rbec706f6a70906dc5c7a6d3d03575d26100a3b10 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java (.../McStarterAction.java) (revision bec706f6a70906dc5c7a6d3d03575d26100a3b10) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java (.../McStarterAction.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -rdcb4bb59e05ab9fc05be18355abc22d8d5a675e9 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision dcb4bb59e05ab9fc05be18355abc22d8d5a675e9) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -r9219b0a1d1623f192568d6427be86e8c795b4b4a -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (.../McContent.hbm.xml) (revision 9219b0a1d1623f192568d6427be86e8c795b4b4a) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (.../McContent.hbm.xml) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) +++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -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 =================================================================== diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/web/learning/ViewAnswers.jsp (.../ViewAnswers.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) +++ lams_tool_lamc/web/learning/ViewAnswers.jsp (.../ViewAnswers.jsp) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -94,7 +94,7 @@ -   + images/dot.jpg" align=left>   Index: lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp =================================================================== diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 --- lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) +++ lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) @@ -197,15 +197,15 @@
- + - +