Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions nirc_ehr/src/org/labkey/nirc_ehr/NIRC_EHRModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it safe to remove these no-arg constructors?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are called in background threads in triggers. I can look into using the parameter version and get the module from the ModuleLoader

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, if they're being used it seems fine to retain them

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

}

@Override
public String getName()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down