Added more sections to the alert, take #2

Author: kollil

onprc_ehr/resources/queries/study/AssignmentsCreatedInPast1Day.sql

@@ -12,9 +12,9 @@ SELECT
     enddate as ReleaseDate,
     projectedrelease as ProjectedReleaseDate,
     assignmentType,
-    assignCondition,
-    projectedReleaseCondition,
-    releaseCondition as ConditionAtRelease
+    assignCondition.meaning as AssignCondition,
+    projectedReleaseCondition.meaning as ProjectedReleaseCondition,
+    releaseCondition.meaning as ConditionAtRelease
 
 FROM Assignment
 WHERE Created >= TIMESTAMPADD('SQL_TSI_DAY', -1, NOW())

onprc_ehr/resources/queries/study/AssignmentsReleasedInPast1Day.sql

@@ -12,9 +12,9 @@ SELECT
     enddate as ReleaseDate,
     projectedrelease as ProjectedReleaseDate,
     assignmentType,
-    assignCondition,
-    projectedReleaseCondition,
-    releaseCondition as ConditionAtRelease
+    assignCondition.meaning as AssignCondition,
+    projectedReleaseCondition.meaning as ProjectedReleaseCondition,
+    releaseCondition.meaning as ConditionAtRelease
 
 FROM Assignment
 WHERE enddate >= TIMESTAMPADD('SQL_TSI_DAY', -1, NOW())

onprc_ehr/resources/queries/study/AssignmentsStartedPast1to7Days.sql

@@ -12,9 +12,9 @@ SELECT
     enddate as ReleaseDate,
     projectedrelease as ProjectedReleaseDate,
     assignmentType,
-    assignCondition,
-    projectedReleaseCondition,
-    releaseCondition as ConditionAtRelease
+    assignCondition.meaning as AssignCondition,
+    projectedReleaseCondition.meaning as ProjectedReleaseCondition,
+    releaseCondition.meaning as ConditionAtRelease
 
 FROM Assignment
 WHERE date >= TIMESTAMPADD('SQL_TSI_DAY', -1, NOW())

onprc_ehr/resources/queries/study/AssignmentsStartingNext1to14Days.sql

@@ -12,9 +12,9 @@ SELECT
     enddate as ReleaseDate,
     projectedrelease as ProjectedReleaseDate,
     assignmentType,
-    assignCondition,
-    projectedReleaseCondition,
-    releaseCondition as ConditionAtRelease
+    assignCondition.meaning as AssignCondition,
+    projectedReleaseCondition.meaning as ProjectedReleaseCondition,
+    releaseCondition.meaning as ConditionAtRelease
 
 FROM Assignment
 WHERE date >= TIMESTAMPADD('SQL_TSI_DAY', 1, NOW())

onprc_ehr/src/org/labkey/onprc_ehr/notification/BehaviorNotification.java

@@ -254,7 +254,7 @@ private void assignmentsCreatedInPast1Day(final Container c, User u, final Strin
                 msg.append("<td>" + PageFlowUtil.filter(rs.getString("ConditionAtRelease")) + "</td>");
                 msg.append("</tr>");
             });
-            msg.append("</table>");
+            msg.append("</table><br>");
         }
 
         else {
@@ -285,7 +285,7 @@ private void assignmentsReleasedInPast1Day(final Container c, User u, final Stri
             msg.append("<b>List of assignments with new \"Release date\" added within the last 24hrs:</b><p>");
             msg.append("There are " + count + " entries found. ");
             msg.append("<p><a href='" + getExecuteQueryUrl(c, "study", "AssignmentsReleasedInPast1Day", null)  + "'>Click here to view them</a></p>\n");
-            msg.append("<hr>\n\n");
+            msg.append("\n\n");
 
         //Display the daily report in the email
             Set<FieldKey> columns = new HashSet<>();
@@ -337,7 +337,7 @@ private void assignmentsReleasedInPast1Day(final Container c, User u, final Stri
                 msg.append("<td>" + PageFlowUtil.filter(rs.getString("ConditionAtRelease")) + "</td>");
                 msg.append("</tr>");
             });
-            msg.append("</table>");
+            msg.append("</table><br>");
         }
         else {
             msg.append("<b>WARNING: No assignments released in past 24hrs!</b><br><hr>\n");