Skip to content

Commit 780527d

Browse files
Case insensitive animal history (#407)
* Use new caseInsensitive option for animal history
1 parent 6ee9923 commit 780527d

3 files changed

Lines changed: 6 additions & 1 deletion

File tree

snprc_ehr/resources/views/animalHistory.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
xtype: 'ldk-singlesubjectfiltertype',
1717
inputValue: LDK.panel.SingleSubjectFilterType.filterName,
1818
label: 'Single Animal',
19+
caseInsensitive: true,
1920
aliasTable: {
2021
schemaName: 'study',
2122
queryName: 'validIdAndAlias',
@@ -26,6 +27,7 @@
2627
xtype: 'ehr-multianimalfiltertype',
2728
inputValue: EHR.panel.MultiAnimalFilterType.filterName,
2829
label: EHR.panel.MultiAnimalFilterType.label,
30+
caseInsensitive: true,
2931
searchOptions: {
3032
room: false,
3133
cage: false,

snprc_ehr/test/src/org/labkey/test/tests/snprc_ehr/SNPRC_EHRTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ public void testAnimalHistoryReports()
779779
{
780780
goToAnimalHistory();
781781
SNPRCAnimalHistoryPage animalHistoryPage = new SNPRCAnimalHistoryPage(getDriver());
782-
animalHistoryPage.searchSingleAnimal("TEST1441142", "No active housing");
782+
animalHistoryPage.searchSingleAnimal("Test1441142", "No active housing");
783783
_helper.verifyAllReportTabs(animalHistoryPage);
784784
}
785785

snprc_scheduler/resources/scripts/snprc_scheduler_triggers.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ exports.init = function (EHR) {
33
EHR.Server.TriggerManager.registerHandler(EHR.Server.TriggerManager.Events.INIT, function (event, helper, EHR) {
44

55
EHR.Server.TriggerManager.unregisterAllHandlersForQueryNameAndEvent('study', 'blood', EHR.Server.TriggerManager.Events.BEFORE_UPSERT);
6+
EHR.Server.TriggerManager.unregisterAllHandlersForQueryNameAndEvent('study', 'cases', EHR.Server.TriggerManager.Events.BEFORE_UPSERT);
7+
EHR.Server.TriggerManager.unregisterAllHandlersForQueryNameAndEvent('study', 'cases', EHR.Server.TriggerManager.Events.AFTER_DELETE);
8+
EHR.Server.TriggerManager.unregisterAllHandlersForQueryNameAndEvent('study', 'cases', EHR.Server.TriggerManager.Events.AFTER_UPSERT);
69
});
710

811
};

0 commit comments

Comments
 (0)