Proper formatting of reasons for stopping past orders

openmrs · Nov 5, 2014 · e86481a · e86481a
1 parent ab206a1
commit e86481a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/api/src/main/resources/messages.properties b/api/src/main/resources/messages.properties
@@ -1,2 +1,5 @@
 ${project.parent.artifactId}.title=Order Entry UI Module
 orderentryui.patientdashboard.activeDrugOrders=Prescribed Medication
+
+orderentryui.pastAction.REVISE = Revised
+orderentryui.pastAction.DISCONTINUE = Discontinued
diff --git a/omod/src/main/compass/sass/drugOrders.scss b/omod/src/main/compass/sass/drugOrders.scss
@@ -76,11 +76,7 @@ form#new-order {
 }
 
 #past-drug-orders {
-  color: $darkerGrey;
-
-  &:hover {
-    color: $text;
-  }
+  font-size: 0.9em;
 }
 
 .css-form {

diff --git a/omod/src/main/webapp/pages/drugOrders.gsp b/omod/src/main/webapp/pages/drugOrders.gsp
@@ -32,6 +32,11 @@
     window.OpenMRS.drugOrdersConfig = ${ jsonConfig };
 </script>
 
+${ ui.includeFragment("appui", "messages", [ codes: [
+        "orderentryui.pastAction.REVISE",
+        "orderentryui.pastAction.DISCONTINUE"
+] ])}
+
 ${ ui.includeFragment("coreapps", "patientHeader", [ patient: patient ]) }
 
 <div id="drug-orders-app" ng-controller="DrugOrdersCtrl" ng-init='init()'>

diff --git a/omod/src/main/webapp/resources/scripts/drugOrders.js b/omod/src/main/webapp/resources/scripts/drugOrders.js
@@ -58,7 +58,7 @@ angular.module('drugOrders', ['orderService', 'encounterService', 'uicommons.fil
             if (!replacementOrder) {
                 return "";
             }
-            return replacementOrder.action + "d on " + omrsDateFilter(replacementOrder.dateActivated);
+            return emr.message("orderentryui.pastAction." + replacementOrder.action) + ", " + omrsDateFilter(replacementOrder.dateActivated);
         }
     }]).