Skip to content

Fix to https://issues.openmrs.org/browse/ERR-652 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cereblanco wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix to https://issues.openmrs.org/browse/ERR-652 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions api/src/main/java/org/openmrs/module/drawing/elements/DrawingSubmissionElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
import org.openmrs.obs.ComplexData;
import org.openmrs.web.WebConstants;

import java.text.SimpleDateFormat;
import java.util.Date;

//public class DrawingSubmissionElement {
public class DrawingSubmissionElement implements HtmlGeneratorElement, FormSubmissionControllerAction {

Expand Down Expand Up @@ -71,12 +74,14 @@ public void handleSubmission(FormEntrySession session, HttpServletRequest submis
try {
AnnotatedImage ai = new AnnotatedImage(DrawingUtil.base64ToImage(encodedImage));
ai.setAnnotations(DrawingUtil.getAnnotations(submission, id));
if (session.getContext().getMode() == Mode.EDIT && existingObs != null)
if (session.getContext().getMode() == Mode.EDIT && existingObs != null){
session.getSubmissionActions().modifyObs(existingObs, questionConcept,
new ComplexData(existingObs.getComplexData().getTitle(), ai), null, null);
else
session.getSubmissionActions().createObs(questionConcept, new ComplexData("drawingObs.png", ai), null, null);

}else{
String filename = "drawingObs" + new SimpleDateFormat("yyyyMMddhhmmssSSSSSSS").format(new Date()) + ".png";
session.getSubmissionActions().createObs(questionConcept, new ComplexData(filename, ai), null, null);
//session.getSubmissionActions().createObs(questionConcept, new ComplexData("drawingObs.png", ai), null, null);
}
}
catch (Exception e) {
log.error("cannot create obs :" + e.getMessage(), e);
Expand Down
8 changes: 7 additions & 1 deletion omod/src/main/java/org/openmrs/module/drawing/web/controller/DrawingWindowController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;

import java.text.SimpleDateFormat;
import java.util.Date;

@Controller
public class DrawingWindowController {

Expand All @@ -50,7 +53,10 @@ public String saveDrawing(@RequestParam(value = "encodedImage", required = true)
o.setEncounter(encounter);
AnnotatedImage ai = new AnnotatedImage(DrawingUtil.base64ToImage(encodedImage));
ai.setAnnotations(DrawingUtil.getAnnotations(request, ""));
o.setComplexData(new ComplexData("drawingObs.png", ai));
String filename = "drawingObs" + new SimpleDateFormat("yyyyMMddhhmmssSSSSSSS").format(new Date()) + ".png";
o.setComplexData(new ComplexData(filename, ai));
// o.setComplexData(new ComplexData("drawingObs.png", ai));

Errors obsErrors = new BindException(o, "obs");
ValidationUtils.invokeValidator(new ObsValidator(), o, obsErrors);
if (!obsErrors.hasErrors()) {
Expand Down