FLAG 67: fixed flags rendering issue on patient page (openmrs#77)

ManojLL · Jul 22, 2024 · fea13fe · fea13fe
1 parent e08205c
commit fea13fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...nmrs/module/patientflags/fragment/controller/PatientflagsDashboardFragmentController.java b/...nmrs/module/patientflags/fragment/controller/PatientflagsDashboardFragmentController.java
@@ -42,15 +42,15 @@ public SimpleObject processPatientFlags(@FragmentParam("patientId") Patient pati
                 intersection.retainAll(userRoles);
                 if (intersection.size() > 0) {
                 	flag.setMessage(patientFlag.getMessage());
-                    flagsString.append("<li><span style='").append(flag.getPriority().getStyle()).append("'>").append(flag.evalMessage(patient.getPatientId())).append("</span></li>");
+                    flagsString.append("<li><span ").append(flag.getPriority().getStyle()).append(">").append(flag.evalMessage(patient.getPatientId())).append("</span></li>");
                     continue;
                 }
             }
         }
 
         SimpleObject simpleObject = new SimpleObject();
 
-        simpleObject.put("", flagsString);
+        simpleObject.put("patientflags", flagsString);
 
         return simpleObject;
     }

diff --git a/omod/src/main/webapp/fragments/patientflagsDashboard.gsp b/omod/src/main/webapp/fragments/patientflagsDashboard.gsp
@@ -15,7 +15,7 @@
                 if (!response) {
                     ${ ui.message("coreapps.none ") }
                 } else {
-                    jq("#flags").html(response.replace("{=", "").replace("}", ""));
+                    jq("#flags").html(response.patientflags);
                 }
             });
         </script>