Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java =================================================================== diff -u -rf76780e7823d8ac845669773cc86f5a30012159a -r934e655abaf73d5fd3e21e8271bbb1d84cb0a7a4 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision f76780e7823d8ac845669773cc86f5a30012159a) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision 934e655abaf73d5fd3e21e8271bbb1d84cb0a7a4) @@ -33,6 +33,8 @@ import java.util.TreeMap; import org.apache.log4j.Logger; +import org.apache.tomcat.util.json.JSONException; +import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; @@ -43,6 +45,7 @@ import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; +import org.lamsfoundation.lams.rest.ToolRestManager; import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; @@ -62,6 +65,7 @@ import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardUserDAO; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.WebUtil; import org.springframework.dao.DataAccessException; @@ -74,7 +78,7 @@ * */ public class NoticeboardServicePOJO implements INoticeboardService, ToolContentManager, ToolSessionManager, - ToolContentImport102Manager { + ToolContentImport102Manager, ToolRestManager { private static Logger log = Logger.getLogger(NoticeboardServicePOJO.class); private ILearnerService learnerService; @@ -661,4 +665,25 @@ public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { return null; } + + // ****************** REST methods ************************* + + @Override + public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON) throws JSONException { + Date updateDate = new Date(); + + NoticeboardContent noticeboard = new NoticeboardContent(); + noticeboard.setNbContentId(toolContentID); + noticeboard.setTitle(toolContentJSON.getString("title")); + noticeboard.setContent(toolContentJSON.getString("content")); + noticeboard.setReflectOnActivity(JsonUtil.opt(toolContentJSON, "reflectOnActivity", Boolean.FALSE)); + noticeboard.setReflectInstructions((String)JsonUtil.opt(toolContentJSON, "reflectInstructions", null)); + + noticeboard.setCreatorUserId(userID.longValue()); + noticeboard.setDateCreated(updateDate); + noticeboard.setDateUpdated(updateDate); + noticeboard.setContentInUse(false); + + saveNoticeboard(noticeboard); + } } \ No newline at end of file Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java =================================================================== diff -u -r3ebd15db33850d4c09d0b7cd0819c7b88adefb09 -r934e655abaf73d5fd3e21e8271bbb1d84cb0a7a4 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision 3ebd15db33850d4c09d0b7cd0819c7b88adefb09) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision 934e655abaf73d5fd3e21e8271bbb1d84cb0a7a4) @@ -33,6 +33,8 @@ import java.util.SortedMap; import org.apache.log4j.Logger; +import org.apache.tomcat.util.json.JSONException; +import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.learning.service.ILearnerService; @@ -41,6 +43,7 @@ import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; +import org.lamsfoundation.lams.rest.ToolRestManager; import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; @@ -61,6 +64,7 @@ import org.lamsfoundation.lams.tool.notebook.util.NotebookException; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; @@ -72,7 +76,7 @@ */ public class NotebookService implements ToolSessionManager, ToolContentManager, INotebookService, - ToolContentImport102Manager { + ToolContentImport102Manager, ToolRestManager { static Logger logger = Logger.getLogger(NotebookService.class.getName()); @@ -601,4 +605,32 @@ public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { return getNotebookOutputFactory().getSupportedDefinitionClasses(definitionType); } + + // ****************** REST methods ************************* + + @Override + public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON) throws JSONException { + Date updateDate = new Date(); + + Notebook nb = new Notebook(); + nb.setToolContentId(toolContentID); + nb.setTitle(toolContentJSON.getString("title")); + nb.setInstructions(toolContentJSON.getString("instructions")); + nb.setCreateBy(userID.longValue()); + nb.setCreateDate(updateDate); + nb.setUpdateDate(updateDate); + + nb.setLockOnFinished(JsonUtil.opt(toolContentJSON, "lockOnFinished", Boolean.FALSE)); + nb.setAllowRichEditor(JsonUtil.opt(toolContentJSON, "allowRichTextEditor", Boolean.FALSE)); + nb.setSubmissionDeadline((Date)JsonUtil.opt(toolContentJSON, "submissionDeadline", null)); + + nb.setContentInUse(false); + nb.setDefineLater(false); + this.saveOrUpdateNotebook(nb); + + // TODO + // nb.setConditions(conditions); + + } + } \ No newline at end of file