Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v diff -u -r1.9 -r1.10 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 8 Jul 2005 03:59:25 -0000 1.9 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 11 Jul 2005 04:24:29 -0000 1.10 @@ -103,6 +103,7 @@ public static final String RICHTEXT_ONLINEINSTRUCTIONS ="richTextOnlineInstructions"; public static final String RICHTEXT_TITLE ="richTextTitle"; public static final String RICHTEXT_INSTRUCTIONS ="richTextInstructions"; + public static final String RICHTEXT_BLANK ="
"; /** Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QAction.java,v diff -u -r1.7 -r1.8 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java 11 Jul 2005 02:08:04 -0000 1.7 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java 11 Jul 2005 04:24:29 -0000 1.8 @@ -309,13 +309,18 @@ * full form validation should be performed only in standard authoring mode, but not in monitoring EditActivity */ - if ((qaAuthoringForm.getTitle() == null) || (qaAuthoringForm.getTitle().length() == 0)) + String richTextTitle=(String) request.getSession().getAttribute(RICHTEXT_TITLE); + logger.debug("richTextTitle: " + richTextTitle); + String richTextInstructions=(String) request.getSession().getAttribute(RICHTEXT_INSTRUCTIONS); + logger.debug("richTextInstructions: " + richTextInstructions); + + if ((richTextTitle == null) || (richTextTitle.length() == 0) || richTextTitle.equalsIgnoreCase(RICHTEXT_BLANK)) { errors.add(Globals.ERROR_KEY,new ActionMessage("error.title")); logger.debug("add title to ActionMessages"); } - if ((qaAuthoringForm.getInstructions() == null) || (qaAuthoringForm.getInstructions().length() == 0)) + if ((richTextInstructions == null) || (richTextInstructions.length() == 0) || richTextInstructions.equalsIgnoreCase(RICHTEXT_BLANK)) { errors.add(Globals.ERROR_KEY, new ActionMessage("error.instructions")); logger.debug("add instructions to ActionMessages: "); Index: lams_tool_laqa/web/BasicContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/BasicContent.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_laqa/web/BasicContent.jsp 8 Jul 2005 03:59:25 -0000 1.2 +++ lams_tool_laqa/web/BasicContent.jsp 11 Jul 2005 04:24:29 -0000 1.3 @@ -89,23 +89,32 @@ -
|
-
- |
+ |
+
+ |
|
-
- |
- |
+
+ |
+
Index: lams_tool_laqa/web/MonitoringInstructionsScreen.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/MonitoringInstructionsScreen.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/web/MonitoringInstructionsScreen.jsp 1 Jul 2005 04:53:48 -0000 1.2
+++ lams_tool_laqa/web/MonitoringInstructionsScreen.jsp 11 Jul 2005 04:24:29 -0000 1.3
@@ -26,21 +26,32 @@
- |
-
- |
-
- |
-
- |
-
+ |
+
+ |
+
+ |
+
+ |
+