Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java,v diff -u -r1.24 -r1.25 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java 8 Oct 2007 08:08:57 -0000 1.24 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java 30 Apr 2008 05:32:29 -0000 1.25 @@ -160,7 +160,8 @@ .get(KEY_TOOL_CONTENT_ID)); // update chat content using form inputs. - updateChat(chat, authForm); + ToolAccessMode mode = (ToolAccessMode) map.get(KEY_MODE); + updateChat(chat, authForm, mode); // remove attachments marked for deletion. Set attachments = chat.getChatAttachments(); @@ -259,13 +260,13 @@ } ActionMessages errors = new ActionMessages(); - FileValidatorUtil.validateFileSize(file, true, errors ); - if(!errors.isEmpty()){ + FileValidatorUtil.validateFileSize(file, true, errors); + if (!errors.isEmpty()) { request.setAttribute(ChatConstants.ATTR_SESSION_MAP, map); this.saveErrors(request, errors); return mapping.findForward("success"); } - + if (file.getFileName().length() != 0) { // upload file to repository ChatAttachment newAtt = chatService.uploadFileToContent((Long) map @@ -360,18 +361,22 @@ * Updates Chat content using AuthoringForm inputs. * * @param authForm + * @param mode * @return */ - private void updateChat(Chat chat, AuthoringForm authForm) { + private void updateChat(Chat chat, AuthoringForm authForm, + ToolAccessMode mode) { chat.setTitle(authForm.getTitle()); chat.setInstructions(authForm.getInstructions()); - chat.setOfflineInstructions(authForm.getOfflineInstruction()); - chat.setOnlineInstructions(authForm.getOnlineInstruction()); - chat.setLockOnFinished(authForm.isLockOnFinished()); - chat.setReflectOnActivity(authForm.isReflectOnActivity()); - chat.setReflectInstructions(authForm.getReflectInstructions()); - chat.setFilteringEnabled(authForm.isFilteringEnabled()); - chat.setFilterKeywords(authForm.getFilterKeywords()); + if (mode.isAuthor()) { + chat.setOfflineInstructions(authForm.getOfflineInstruction()); + chat.setOnlineInstructions(authForm.getOnlineInstruction()); + chat.setLockOnFinished(authForm.isLockOnFinished()); + chat.setReflectOnActivity(authForm.isReflectOnActivity()); + chat.setReflectInstructions(authForm.getReflectInstructions()); + chat.setFilteringEnabled(authForm.isFilteringEnabled()); + chat.setFilterKeywords(authForm.getFilterKeywords()); + } } /** Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java,v diff -u -r1.11 -r1.12 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java 16 Nov 2007 07:49:40 -0000 1.11 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java 30 Apr 2008 05:34:39 -0000 1.12 @@ -177,7 +177,8 @@ .get(KEY_TOOL_CONTENT_ID)); // update scribe content using form inputs. - updateScribe(scribe, authForm); + ToolAccessMode mode = (ToolAccessMode) map.get(KEY_MODE); + updateScribe(scribe, authForm, mode); // remove attachments marked for deletion. Set attachments = scribe.getScribeAttachments(); @@ -201,43 +202,42 @@ List updatedHeadings = getHeadingList(map); Set currentHeadings = scribe.getScribeHeadings(); for (ScribeHeading heading : updatedHeadings) { - //it is update - if(heading.getUid() != null){ + // it is update + if (heading.getUid() != null) { Iterator iter = currentHeadings.iterator(); - while(iter.hasNext()){ + while (iter.hasNext()) { ScribeHeading currHeading = (ScribeHeading) iter.next(); - if(heading.getUid().equals(currHeading.getUid())){ - //update fields + if (heading.getUid().equals(currHeading.getUid())) { + // update fields currHeading.setHeadingText(heading.getHeadingText()); currHeading.setDisplayOrder(heading.getDisplayOrder()); break; } }// go to next heading from page - }else{ + } else { currentHeadings.add(heading); } } - //remove deleted heading. + // remove deleted heading. Iterator iter = currentHeadings.iterator(); - while(iter.hasNext()){ + while (iter.hasNext()) { ScribeHeading currHeading = (ScribeHeading) iter.next(); - //skip new added heading - if(currHeading.getUid() == null) + // skip new added heading + if (currHeading.getUid() == null) continue; - boolean find =false; + boolean find = false; for (ScribeHeading heading : updatedHeadings) { - if(currHeading.getUid().equals(heading.getUid())){ + if (currHeading.getUid().equals(heading.getUid())) { find = true; break; } } - if(!find){ - //delete current heading's report first + if (!find) { + // delete current heading's report first scribeService.deleteHeadingReport(currHeading.getUid()); iter.remove(); } } - // set the update date scribe.setUpdateDate(new Date()); @@ -424,16 +424,16 @@ savedFiles = getAttList(KEY_ONLINE_FILES, map); } - - //validate file max size + + // validate file max size ActionMessages errors = new ActionMessages(); - FileValidatorUtil.validateFileSize(file, true, errors ); - if(!errors.isEmpty()){ + FileValidatorUtil.validateFileSize(file, true, errors); + if (!errors.isEmpty()) { request.setAttribute(ScribeConstants.ATTR_SESSION_MAP, map); this.saveErrors(request, errors); return mapping.findForward("success"); } - + if (file.getFileName().length() != 0) { // upload file to repository @@ -530,17 +530,21 @@ * Updates Scribe content using AuthoringForm inputs. * * @param authForm + * @param mode * @return */ - private void updateScribe(Scribe scribe, AuthoringForm authForm) { + private void updateScribe(Scribe scribe, AuthoringForm authForm, + ToolAccessMode mode) { scribe.setTitle(authForm.getTitle()); scribe.setInstructions(authForm.getInstructions()); - scribe.setOfflineInstructions(authForm.getOnlineInstruction()); - scribe.setOnlineInstructions(authForm.getOfflineInstruction()); - scribe.setReflectOnActivity(authForm.isReflectOnActivity()); - scribe.setReflectInstructions(authForm.getReflectInstructions()); - scribe.setAutoSelectScribe(authForm.isAutoSelectScribe()); - scribe.setShowAggregatedReports(authForm.isShowAggregatedReports()); + if (mode.isAuthor()) { + scribe.setOfflineInstructions(authForm.getOnlineInstruction()); + scribe.setOnlineInstructions(authForm.getOfflineInstruction()); + scribe.setReflectOnActivity(authForm.isReflectOnActivity()); + scribe.setReflectInstructions(authForm.getReflectInstructions()); + scribe.setAutoSelectScribe(authForm.isAutoSelectScribe()); + scribe.setShowAggregatedReports(authForm.isShowAggregatedReports()); + } } /**