From ecc80aaf82d9506af684053c051d1a761d296332 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 21 Aug 2019 20:34:38 +0530 Subject: [PATCH] RA-1526: Edit Conditions --- .travis.yml | 3 +- .../EditConditionPageController.java | 25 +++ .../pages/conditionlist/editCondition.gsp | 91 +++++++++++ .../pages/conditionlist/manageConditions.gsp | 2 + .../controllers/editcondition.controller.js | 143 ++++++++++++++++++ .../manageconditions.controller.js | 5 + 6 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 omod/src/main/java/org/openmrs/module/coreapps/page/controller/conditionlist/EditConditionPageController.java create mode 100644 omod/src/main/webapp/pages/conditionlist/editCondition.gsp create mode 100644 omod/src/main/webapp/resources/scripts/conditionlist/controllers/editcondition.controller.js diff --git a/.travis.yml b/.travis.yml index fcc4d3497..0f43688d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,10 @@ cache: directories: - .autoconf - $HOME/.m2 +services: + - xvfb install: - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start - tar -xjf /tmp/firefox-43.0.tar.bz2 --directory /tmp - export PATH="/tmp/firefox:$PATH" script: mvn clean install -q \ No newline at end of file diff --git a/omod/src/main/java/org/openmrs/module/coreapps/page/controller/conditionlist/EditConditionPageController.java b/omod/src/main/java/org/openmrs/module/coreapps/page/controller/conditionlist/EditConditionPageController.java new file mode 100644 index 000000000..8c20d45a4 --- /dev/null +++ b/omod/src/main/java/org/openmrs/module/coreapps/page/controller/conditionlist/EditConditionPageController.java @@ -0,0 +1,25 @@ +package org.openmrs.module.coreapps.page.controller.conditionlist; + +/** + * The contents of this file are subject to the OpenMRS Public License + * Version 1.0 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://license.openmrs.org + *

+ * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + *

+ * Copyright (C) OpenMRS, LLC. All Rights Reserved. + */ + +import org.openmrs.ui.framework.page.PageModel; +import org.springframework.web.bind.annotation.RequestParam; + +public class EditConditionPageController { + +public void controller(PageModel model, @RequestParam(value = "returnUrl", required = false) String returnUrl) { + model.addAttribute("returnUrl", returnUrl); + } +} \ No newline at end of file diff --git a/omod/src/main/webapp/pages/conditionlist/editCondition.gsp b/omod/src/main/webapp/pages/conditionlist/editCondition.gsp new file mode 100644 index 000000000..bdbf19d11 --- /dev/null +++ b/omod/src/main/webapp/pages/conditionlist/editCondition.gsp @@ -0,0 +1,91 @@ +<% + ui.decorateWith("appui", "standardEmrPage") + ui.includeJavascript("uicommons", "angular.min.js") + ui.includeJavascript("uicommons", "angular-ui/ui-bootstrap-tpls-0.11.2.min.js") + ui.includeJavascript("uicommons", "angular-resource.min.js") + ui.includeJavascript("uicommons", "angular-common.js") + ui.includeJavascript("uicommons", "ngDialog/ngDialog.js") + ui.includeJavascript("uicommons", "ngDialog/ngDialog.js") + ui.includeJavascript("uicommons", "services/conceptSearchService.js") + ui.includeJavascript("uicommons", "directives/coded-or-free-text-answer.js") + ui.includeFragment("coreapps", "patientHeader", [patient: patient]) + ui.includeJavascript("coreapps", "conditionlist/lib/restangular.min.js") + ui.includeJavascript("coreapps", "conditionlist/restful-services/restful-service.js"); + ui.includeJavascript("coreapps", "conditionlist/models/model.module.js") + ui.includeJavascript("coreapps", "conditionlist/models/concept.model.js") + ui.includeJavascript("coreapps", "conditionlist/models/condition.model.js") + ui.includeJavascript("coreapps", "conditionlist/emr.messages.js") + ui.includeJavascript("coreapps", "conditionlist/common.functions.js") + ui.includeJavascript("coreapps", "conditionlist/controllers/editcondition.controller.js") + ui.includeCss("uicommons", "ngDialog/ngDialog.min.css") + ui.includeCss("coreapps", "conditionlist/conditions.css") +%> + + +

+

${ui.message('coreapps.conditionui.editCondition',"")}


+ +
+
    +
  • + + +
  • +
  • +

    + ${ui.includeFragment("uicommons", "field/datetimepicker", [ + formFieldName: "conditionStartDate", + label : "", + useTime : false, + endDate : new Date(), + ])} +
  • +    +
  • + + ${ui.includeFragment("uicommons", "field/datetimepicker", [ + formFieldName: "conditionEndDate", + label : "", + useTime : false, + endDate : new Date(), + ])} +
  • +

    +
+
+ +
+

+ + +

+

+ + +

+
+
+
+ + +
+
\ No newline at end of file diff --git a/omod/src/main/webapp/pages/conditionlist/manageConditions.gsp b/omod/src/main/webapp/pages/conditionlist/manageConditions.gsp index 070831b6e..6ff2b5394 100644 --- a/omod/src/main/webapp/pages/conditionlist/manageConditions.gsp +++ b/omod/src/main/webapp/pages/conditionlist/manageConditions.gsp @@ -82,6 +82,8 @@ ${ui.includeFragment("coreapps", "patientHeader", [patient: patient])} {{formatDate(condition.onSetDate)}} {{formatDate(condition.endDate)}} +