Skip to content

Commit c431229

Browse files
labkey-teamcitylabkey-teamcity
committed
Merge 25.3 to 25.5
2 parents a89f8b8 + 87d465e commit c431229

25 files changed

Lines changed: 450 additions & 2914 deletions

‎WNPRC_EHR/resources/module.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,11 @@
3838
<permission>ADMIN</permission>
3939
</editPermissions>
4040
</propertyDescriptor>
41+
<propertyDescriptor name="NightlyTestServer">
42+
<description>URL for Nightly test server that gets updated from daily backups</description>
43+
<editPermissions>
44+
<permission>ADMIN</permission>
45+
</editPermissions>
46+
</propertyDescriptor>
4147
</properties>
4248
</module>

‎WNPRC_EHR/resources/views/ehrBegin.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@
123123
{name: 'Run SQL Directly', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/ehr-executeSql.view'},
124124
{name: 'Search WNPRC SNOMED Codes', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/query-executeQuery.view?schemaName=ehr_lookups&query.queryName=snomed'},
125125
{name: 'Search ALL SNOMED Codes', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/query-executeQuery.view?schemaName=ehr_lookups&query.queryName=full_snomed'},
126-
{name: 'Gestational Day Calculator', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/wnprc_ehr-gestation_calculator.view'}
126+
{name: 'Gestational Day Calculator', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/wnprc_ehr-gestation_calculator.view'},
127+
{name: 'Nightly-EHRTestServer', url:ctx['NightlyTestServer'], target: '_blank'}
127128
]},
128129
{header: 'Data Entry',
129130
items: [

‎WNPRC_EHR/src/org/labkey/wnprc_ehr/TriggerScriptHelper.java‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,10 @@
5353
import org.labkey.dbutils.api.SimpleQueryUpdater;
5454
import org.labkey.dbutils.api.SimplerFilter;
5555
import org.labkey.webutils.api.json.JsonUtils;
56-
import org.labkey.wnprc_ehr.notification.AnimalRequestNotification;
5756
import org.labkey.wnprc_ehr.notification.AnimalRequestNotificationRevamp;
58-
import org.labkey.wnprc_ehr.notification.AnimalRequestNotificationUpdate;
5957
import org.labkey.wnprc_ehr.notification.AnimalRequestUpdateNotificationRevamp;
6058
import org.labkey.wnprc_ehr.notification.BloodDrawReviewTriggerNotification;
6159
import org.labkey.wnprc_ehr.notification.BloodOverdrawTriggerNotification;
62-
import org.labkey.wnprc_ehr.notification.DeathNotification;
6360
import org.labkey.wnprc_ehr.notification.DeathNotificationRevamp;
6461
import org.labkey.wnprc_ehr.notification.ProjectRequestNotification;
6562
import org.labkey.wnprc_ehr.notification.VvcNotification;
@@ -198,19 +195,6 @@ public void sendDeathNotification(final List<String> ids, String hostName) {
198195
Module ehr = ModuleLoader.getInstance().getModule("EHR");
199196
//Verifies 'Notification Service' is enabled before sending notification.
200197
if (NotificationService.get().isServiceEnabled()){
201-
//Sends original Death Notification.
202-
//Remove this if-else when new notification is approved.
203-
if (NotificationService.get().isActive(new DeathNotification(), container)) {
204-
for (String id : ids) {
205-
DeathNotification idNotification = new DeathNotification();
206-
idNotification.setParam(DeathNotification.idParamName, id);
207-
idNotification.sendManually(container, user);
208-
}
209-
}
210-
else {
211-
_log.info("Death Notification is not enabled, will not send death notification");
212-
}
213-
214198
//Sends revamped Death Notification.
215199
if (NotificationService.get().isActive(new DeathNotificationRevamp(ehr), container)) {
216200
for (String id : ids) {
@@ -872,17 +856,6 @@ public void sendAnimalRequestNotification(Integer rowid, String hostName){
872856

873857
//Verifies 'Notification Service' is enabled before sending notification.
874858
if (NotificationService.get().isServiceEnabled()){
875-
//Sends original Animal Request Notification.
876-
//TODO: Remove this if-else when new notification is approved.
877-
if (NotificationService.get().isActive(new AnimalRequestNotification(ehr), container)) {
878-
_log.info("Using java helper to send email for animal request record: "+rowid);
879-
AnimalRequestNotification notification = new AnimalRequestNotification(ehr, rowid, user, hostName);
880-
notification.sendManually(container, user);
881-
}
882-
else {
883-
_log.info("Animal Request Notification is not enabled, will not send animal request notification");
884-
}
885-
886859
//Sends revamped Animal Request Notification.
887860
if (NotificationService.get().isActive(new AnimalRequestNotificationRevamp(ehr), container)) {
888861
_log.info("Using java helper to send animal request notification revamp for animal request record: "+rowid);
@@ -902,17 +875,6 @@ public void sendAnimalRequestNotificationUpdate(Integer rowid, Map<String,Object
902875

903876
// Verifies 'Notification Service' is enabled before sending notification.
904877
if (NotificationService.get().isServiceEnabled()) {
905-
// Sends original Animal Request Update Notification.
906-
// TODO: Remove this if-else when new notification is approved.
907-
if (NotificationService.get().isActive(new AnimalRequestNotificationUpdate(ehr), container)) {
908-
_log.info("Using java helper to send email for animal request record: "+rowid);
909-
AnimalRequestNotificationUpdate notification = new AnimalRequestNotificationUpdate(ehr, rowid, row, oldRow, user, hostName);
910-
notification.sendManually(container, user);
911-
}
912-
else {
913-
_log.info("Animal Request Update Notification is not enabled, will not send animal request notification.");
914-
}
915-
916878
// Sends revamped Animal Request Notification.
917879
if (NotificationService.get().isActive(new AnimalRequestUpdateNotificationRevamp(ehr), container)) {
918880
_log.info("Using java helper to send animal request update notification revamp for animal request record: " + rowid);

‎WNPRC_EHR/src/org/labkey/wnprc_ehr/WNPRC_EHRModule.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,20 +104,16 @@
104104
import org.labkey.wnprc_ehr.history.DefaultTBDataSource;
105105
import org.labkey.wnprc_ehr.history.WNPRCUrinalysisLabworkType;
106106
import org.labkey.wnprc_ehr.notification.*;
107-
import org.labkey.wnprc_ehr.notification.AnimalRequestNotificationUpdate;
108107
import org.labkey.wnprc_ehr.notification.BehaviorNotification;
109108
import org.labkey.wnprc_ehr.notification.ColonyAlertsNotification;
110-
import org.labkey.wnprc_ehr.notification.DeathNotification;
111109
import org.labkey.wnprc_ehr.notification.FoodCompletedProblemsNotification;
112110
import org.labkey.wnprc_ehr.notification.FoodNotCompletedNotification;
113111
import org.labkey.wnprc_ehr.notification.FoodNotStartedNoonNotification;
114112
import org.labkey.wnprc_ehr.notification.FoodNotStartedNotification;
115113
import org.labkey.wnprc_ehr.notification.IrregularObsBehaviorNotification;
116114
import org.labkey.wnprc_ehr.notification.ProjectRequestNotification;
117-
import org.labkey.wnprc_ehr.notification.TreatmentAlertsNotification;
118115
import org.labkey.wnprc_ehr.notification.VvcNotification;
119116
import org.labkey.wnprc_ehr.notification.WaterMonitoringAnimalWithOutEntriesNotification;
120-
import org.labkey.wnprc_ehr.notification.AnimalRequestNotification;
121117
import org.labkey.wnprc_ehr.notification.AnimalRequestNotificationRevamp;
122118
import org.labkey.wnprc_ehr.notification.ColonyAlertsNotificationRevamp;
123119
import org.labkey.wnprc_ehr.notification.WaterMonitoringAnimalWithOutEntriesSupervisorNotification;
@@ -362,16 +358,12 @@ List<Supplier<ClientDependency>> getClientDependencies(Container c) {
362358
public void registerNotifications() {
363359
List<Notification> notifications = Arrays.asList(
364360
new BehaviorNotification(this),
365-
new DeathNotification(),
366361
new ColonyAlertsNotification(this),
367-
new TreatmentAlertsNotification(this),
368362
new VvcNotification(this),
369363
new FoodNotStartedNotification(this),
370364
new FoodNotStartedNoonNotification(this),
371365
new FoodNotCompletedNotification(this),
372366
new FoodCompletedProblemsNotification(this),
373-
new AnimalRequestNotification(this),
374-
new AnimalRequestNotificationUpdate(this),
375367
new ProjectRequestNotification(this),
376368
new IrregularObsBehaviorNotification(this),
377369
new WaterOrdersAlertNotification(this),

‎WNPRC_EHR/src/org/labkey/wnprc_ehr/notification/AnimalRequestNotification.java‎

Lines changed: 0 additions & 147 deletions
This file was deleted.

0 commit comments

Comments
 (0)