Skip to content

Update case insensitive animal history case #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-martyp merged 2 commits into from
Jul 27, 2022
Merged

Update case insensitive animal history case #135

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bef738
Find matching subjects in results
labkey-martyp Jul 27, 2022
b14dd93
CR feedback
labkey-martyp Jul 27, 2022
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
43 changes: 32 additions & 11 deletions LDK/resources/web/LDK/panel/SingleSubjectFilterType.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,41 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
LABKEY.Query.selectRows(this.aliasTable);
},

// This looks for rows that match subjects case insensitively. This is called due to the filter in the case insensitive
// case being "contains" instead of "equals" to get all possible casings. This also gets Ids that just contain the
// subject id as a substring. Thus we need this to filter out the non-matching rows.
getCaseInsensitiveMatches: function(results) {
var hasAlias = !!this.aliasTable.aliasColumn;
var updatedResults = [];

Ext4.each(results.rows, function (row) {
var rowValue = hasAlias ? row[this.aliasTable.aliasColumn] : row[this.aliasTable.idColumn];
var index = this.subjects.indexOf(rowValue);

if (index === -1) {
for (var i = 0; i < this.subjects.length; i++) {
if (rowValue.toLowerCase() === this.subjects[i].toString().toLowerCase()) {
index = i;
break;
}
}
}

if (index !== -1) {
updatedResults.push(row);
}
}, this)
return updatedResults;
},


handleAliasResults: function (results) {
this.notFound = Ext4.clone(this.subjects);

var rows = this.caseInsensitive ? this.getCaseInsensitiveMatches(results) : results.rows;
var updatedSubjects = [];
Ext4.each(results.rows, function (row) {

Ext4.each(rows, function (row) {

var rowId = row[this.aliasTable.idColumn];
updatedSubjects.push(rowId);
Expand All @@ -216,16 +247,6 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
this.notFound.splice(subjIndex, 1);
}

var index = this.subjects.indexOf(rowAlias);
if (index === -1 && this.caseInsensitive) {
for (var i = 0; i < this.subjects.length; i++) {
if (rowAlias.toLowerCase() === this.subjects[i].toString().toLowerCase()) {
index = i;
break;
}
}
}

// Resolve aliases
if (rowId !== rowAlias) {

Expand Down