diff --git a/dmp-backend/.classpath b/dmp-backend/.classpath index 6b533711d..c9a85b970 100644 --- a/dmp-backend/.classpath +++ b/dmp-backend/.classpath @@ -17,11 +17,6 @@ - - - - - diff --git a/dmp-backend/src/main/java/rest/BackendInterface.java b/dmp-backend/src/main/java/rest/BackendInterface.java index 2d95ca8e7..5cbfa3a69 100644 --- a/dmp-backend/src/main/java/rest/BackendInterface.java +++ b/dmp-backend/src/main/java/rest/BackendInterface.java @@ -198,10 +198,20 @@ public class BackendInterface { @RequestMapping(method = RequestMethod.POST, value = { "/setDMPByForm" }, consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces="text/plain") public @ResponseBody ResponseEntity setDMPByForm(@RequestBody MultiValueMap formData) { + //create the whole dmp structure by the form fields DMP dmp = Transformers.createDMPfromMap(formData); return setDMP(dmp); } + @RequestMapping(method = RequestMethod.POST, value = { "/editDMPByForm" }, consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces="text/plain") + public @ResponseBody ResponseEntity editDMPByForm(@RequestBody MultiValueMap formData) { + //get previous DMP by id, replace fields, and update + DMP dmp = dMPDao.read(UUID.fromString(formData.getFirst("dmp-id"))); + dmp.getDataset().getProfile().setDefinition(formData.getFirst("DatasetProfile.definition")); + dmp.getDataset().getProfile().getRuleset().setDefinition(formData.getFirst("DatasetProfileRuleset.definition")); + dmp.getDataset().getProfile().getViewstyle().setDefinition(formData.getFirst("DatasetProfileViewStyle.definition")); + return setDMP(dmp); + } diff --git a/dmp-backend/src/main/webapp/WEB-INF/views/jsp/home.jsp b/dmp-backend/src/main/webapp/WEB-INF/views/jsp/home.jsp index b696ef240..9c1ea52a5 100644 --- a/dmp-backend/src/main/webapp/WEB-INF/views/jsp/home.jsp +++ b/dmp-backend/src/main/webapp/WEB-INF/views/jsp/home.jsp @@ -21,6 +21,9 @@ + + + @@ -32,8 +35,8 @@ - - + + Digital Management Plans - Backend administration @@ -78,11 +81,21 @@ - + + + - + + + @@ -364,5 +377,58 @@ + + + + + + Edit DMP + + × + + + + + + + + + + DatasetProfile Definition: + + + + + DatasetProfileRuleset Definition: + + + + + DatasetProfileViewStyle Definition: + + + + + + Update + Cancel + + + + + + + + + + + + +