diff --git a/omod/src/main/java/org/openmrs/module/htmlformentryui/page/controller/htmlform/ViewEncounterWithHtmlFormPageController.java b/omod/src/main/java/org/openmrs/module/htmlformentryui/page/controller/htmlform/ViewEncounterWithHtmlFormPageController.java index f7f6e88..58b8f53 100644 --- a/omod/src/main/java/org/openmrs/module/htmlformentryui/page/controller/htmlform/ViewEncounterWithHtmlFormPageController.java +++ b/omod/src/main/java/org/openmrs/module/htmlformentryui/page/controller/htmlform/ViewEncounterWithHtmlFormPageController.java @@ -16,12 +16,8 @@ import org.openmrs.ui.framework.annotation.SpringBean; import org.openmrs.ui.framework.page.PageModel; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.context.request.WebRequest; public class ViewEncounterWithHtmlFormPageController { @@ -72,8 +68,8 @@ public void get(@RequestParam("encounter") Encounter encounter, if (htmlForm == null) { message = messageSourceService.getMessage("encounter.form is not an HTML Form" +encounter.getForm()); - log.warn("Active drugs are cannot be editted"); - model.addAttribute("htmlForm", htmlForm); + log.warn("Active drugs are cannot be editted"); + model.addAttribute("htmlForm", htmlForm); } @@ -90,9 +86,9 @@ private String fixCase(String word) { @ExceptionHandler(value= NullPointerException.class) public String HandleNullPointerException(Exception e) { - log.warn("encounter.form is not an HTML Form"); - return "NullPointerException"; - } + log.warn("encounter.form is not an HTML Form"); + return "NullPointerException"; + } } diff --git a/omod/src/main/webapp/pages/htmlform/NullPointerException.gsp b/omod/src/main/webapp/pages/htmlform/NullPointerException.gsp index 647be80..5249b30 100644 --- a/omod/src/main/webapp/pages/htmlform/NullPointerException.gsp +++ b/omod/src/main/webapp/pages/htmlform/NullPointerException.gsp @@ -1,5 +1,12 @@ +

Application has encountered an error. Please contact support on ...

<% out << " ooppsss!!!! Active drugs cannot be edittted!" %> + \ No newline at end of file