Merge 25.7 to develop

Author: labkey-teamcity

nirc_ehr/resources/queries/study/obs/.qview.xml

@@ -1,6 +1,7 @@
 
 SELECT
 d.id,
+d_alias.alias AS Name,
 d.calculated_status,
 s.*,
 s.objectid AS treatmentid,
@@ -63,6 +64,6 @@ JOIN(
 
 ) s ON (s.animalid = d.id) 
 LEFT JOIN study.drug drug ON s.objectid = drug.treatmentid AND s.date = IFDEFINED(drug.scheduledDate)
-
+LEFT JOIN (SELECT Id, GROUP_CONCAT(alias, ', ') alias FROM alias WHERE category.title = 'Name' GROUP BY Id) d_alias ON d.id = d_alias.id
 WHERE (d.lastDayatCenter IS NULL OR d.lastDayAtCenter > s.enddate OR s.enddate IS NULL)
     AND s.date >= s.startDate AND (s.enddate IS NULL OR s.date <= s.enddate)

nirc_ehr/resources/queries/study/treatmentSchedule.sql

@@ -184,10 +184,10 @@ protected void doStartupAfterSpringConfig(ModuleContext moduleContext)
         EHRService.get().registerMoreActionsButton(new MarkCompletedButton(this, "study", "flags", "Set End Date"), "study", "flags");
 
         registerDataEntry();
-        NotificationService.get().registerNotification(new NIRCDeathNotification());
-        NotificationService.get().registerNotification(new NIRCClinicalMoveNotification());
-        NotificationService.get().registerNotification(new NIRCProcedureOverdueNotification());
-        NotificationService.get().registerNotification(new NIRCPregnancyOutcomeNotification());
+        NotificationService.get().registerNotification(new NIRCDeathNotification(this));
+        NotificationService.get().registerNotification(new NIRCClinicalMoveNotification(this));
+        NotificationService.get().registerNotification(new NIRCProcedureOverdueNotification(this));
+        NotificationService.get().registerNotification(new NIRCPregnancyOutcomeNotification(this));
 
         EHRService.get().registerReportLink(EHRService.REPORT_LINK_TYPE.moreReports, "Printable Necropsy Report", this, DetailsURL.fromString("/nirc_ehr-necropsy.view"), "Pathology");
 

nirc_ehr/src/org/labkey/nirc_ehr/NIRC_EHRModule.java

@@ -43,7 +43,7 @@ else if (amountExists)
         }
         else if (volumeExists)
         {
-            sb.append(safeAppend(rs, "Volume", rs.getString("volume") + " " + rs.getString("volume_units")));
+            sb.append(safeAppend(rs, "Volume", rs.getString("volume") + " " + rs.getString("vol_units")));
         }
         sb.append(safeAppend(rs, "End Ordered By", "orderedby/displayName"));
 

nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java

@@ -3,12 +3,23 @@
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.data.Container;
 import org.labkey.api.ehr.notification.AbstractEHRNotification;
+import org.labkey.api.module.Module;
 import org.labkey.api.security.User;
 
 import java.util.Date;
 
 public class NIRCClinicalMoveNotification extends AbstractEHRNotification
 {
+    public NIRCClinicalMoveNotification(Module owner)
+    {
+        super(owner);
+    }
+
+    public NIRCClinicalMoveNotification()
+    {
+        super();
+    }
+
     @Override
     public String getName()
     {

nirc_ehr/src/org/labkey/nirc_ehr/notification/NIRCClinicalMoveNotification.java

@@ -17,12 +17,23 @@
 
 import org.labkey.api.data.Container;
 import org.labkey.api.ehr.notification.AbstractEHRNotification;
+import org.labkey.api.module.Module;
 import org.labkey.api.security.User;
 
 import java.util.Date;
 
 public class NIRCDeathNotification extends AbstractEHRNotification
 {
+    public NIRCDeathNotification(Module owner)
+    {
+        super(owner);
+    }
+
+    public NIRCDeathNotification()
+    {
+        super();
+    }
+
     @Override
     public String getName()
     {

nirc_ehr/src/org/labkey/nirc_ehr/notification/NIRCDeathNotification.java

@@ -17,16 +17,27 @@
 
 import org.labkey.api.data.Container;
 import org.labkey.api.ehr.notification.AbstractEHRNotification;
+import org.labkey.api.module.Module;
 import org.labkey.api.security.User;
 
 import java.util.Date;
 
 public class NIRCPregnancyOutcomeNotification extends AbstractEHRNotification
 {
+    public NIRCPregnancyOutcomeNotification(Module owner)
+    {
+        super(owner);
+    }
+
+    public NIRCPregnancyOutcomeNotification()
+    {
+        super();
+    }
+
     @Override
     public String getName()
     {
-        return "NIRC Pregnancy Outcome Notification";
+        return "Pregnancy Outcome Notification";
     }
 
     @Override

nirc_ehr/src/org/labkey/nirc_ehr/notification/NIRCPregnancyOutcomeNotification.java

@@ -5,6 +5,7 @@
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.data.TableSelector;
 import org.labkey.api.ehr.notification.AbstractEHRNotification;
+import org.labkey.api.module.Module;
 import org.labkey.api.query.QueryService;
 import org.labkey.api.query.UserSchema;
 import org.labkey.api.security.User;
@@ -17,10 +18,15 @@
 
 public class NIRCProcedureOverdueNotification extends AbstractEHRNotification
 {
+    public NIRCProcedureOverdueNotification(Module owner)
+    {
+        super(owner);
+    }
+
     @Override
     public String getName()
     {
-        return "NIRC Procedure Overdue Notification";
+        return "Procedure Overdue Notification";
     }
 
     @Override