Fix animal history case and cleanup#132

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 22, 2022
Merged

Fix animal history case and cleanup #132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e454c6
Animal history dupe real and alias id
labkey-martyp Jul 20, 2022
d49e647
Fix filters
labkey-martyp Jul 22, 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
64 changes: 34 additions & 30 deletions LDK/resources/web/LDK/panel/SingleSubjectFilterType.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,9 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
if (!report.subjectFieldName)
return 'This report cannot be used with the selected filter type, because the report does not contain a ' + this.nounSingular + ' Id field';

if (this.subjects.length === 0)
return 'Must enter at least one valid Subject ID.'

return null;
},

Expand DownExpand Up@@ -143,7 +146,11 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
for (var alias in this.aliases) {
if (this.aliases.hasOwnProperty(alias)) {
Ext4.each(this.aliases[alias], function (id) {
msg += "<div class='labkey-error'>Alias " + alias + " mapped to ID " + id + "</div>";
msg += "<div class='labkey-error'>Alias " + alias + " mapped to ID " + id;
if (this.subjects.indexOf(alias) !== -1) {
msg += " and is a real ID";
}
msg += "</div>";
}, this);
}
}
Expand All@@ -165,7 +172,8 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
// results than necessary in some cases, however those results are filtered to match the user input and non-matching
// results are not used.
var filterType = this.caseInsensitive ? LABKEY.Filter.Types.CONTAINS_ONE_OF : LABKEY.Filter.Types.EQUALS_ONE_OF;
this.aliasTable.filterArray = [LABKEY.Filter.create('alias', subjectArray.join(';'), filterType)];
var filterCol = this.aliasTable.aliasColumn ? this.aliasTable.aliasColumn : this.aliasTable.idColumn;
this.aliasTable.filterArray = [LABKEY.Filter.create(filterCol, subjectArray.join(';'), filterType)];
this.aliasTable.columns = this.aliasTable.idColumn + (Ext4.isDefined(this.aliasTable.aliasColumn) ? ',' + this.aliasTable.aliasColumn : '');
},

Expand All@@ -183,15 +191,21 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {

handleAliasResults: function (results) {
this.notFound = Ext4.clone(this.subjects);
var updatedSubjects = [];
Ext4.each(results.rows, function (row) {

var rowId = row[this.aliasTable.idColumn];
updatedSubjects.push(rowId);

if (this.aliasTable.aliasColumn) {

var rowAlias = row[this.aliasTable.aliasColumn];

// Remove from notFound array if found
var subjIndex = this.notFound.indexOf(row[this.aliasTable.aliasColumn]);
var subjIndex = this.notFound.indexOf(rowAlias);
if (subjIndex === -1 && this.caseInsensitive) {
for (var i = 0; i < this.notFound.length; i++) {
if (row[this.aliasTable.aliasColumn].toLowerCase() === this.notFound[i].toString().toLowerCase()) {
if (rowAlias.toLowerCase() === this.notFound[i].toString().toLowerCase()) {
subjIndex = i;
break;
}
Expand All@@ -202,74 +216,64 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
this.notFound.splice(subjIndex, 1);
}

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

if (index !== -1) {
this.subjects.splice(index, 1, row[this.aliasTable.idColumn]);
}

// Resolve aliases
if (row[this.aliasTable.idColumn] !== row[this.aliasTable.aliasColumn]) {
if (rowId !== rowAlias) {

if (index !== -1) {
this.aliases[row[this.aliasTable.aliasColumn]] = [row[this.aliasTable.idColumn]];
var aliasList = this.aliases[rowAlias];
if (aliasList) {
aliasList.push(rowId);
}
// In case an alias matches multiple ID's
else {
for (var alias in this.aliases) {
if (this.aliases.hasOwnProperty(alias) && row[this.aliasTable.aliasColumn] == alias) {
this.aliases[row[this.aliasTable.aliasColumn]].push(row[this.aliasTable.idColumn]);
index = this.subjects.indexOf(this.aliases[row[this.aliasTable.aliasColumn]][0]);
this.subjects.splice(index, 0, row[this.aliasTable.idColumn]);
}
}
this.aliases[rowAlias] = [rowId];
}
}
}
else {
// Remove from notFound array if found
var idIndex = this.notFound.indexOf(row[this.aliasTable.idColumn]);
var idIndex = this.notFound.indexOf(rowId);
if (idIndex === -1 && this.caseInsensitive) {
for (var i = 0; i < this.notFound.length; i++) {
if (row[this.aliasTable.idColumn].toLowerCase() === this.notFound[i].toString().toLowerCase()) {
if (rowId.toLowerCase() === this.notFound[i].toString().toLowerCase()) {
idIndex = i;
break;
}
}
}

// TODO: Update this and LDK.Utils.splitIds when the case sensitive cache issues are fixed
if (idIndex == -1) {
if (idIndex === -1) {
for (var nfIndex = 0; nfIndex < this.notFound.length; nfIndex++) {
if (this.notFound[nfIndex].toString().toUpperCase() == row[this.aliasTable.idColumn]) {
if (this.notFound[nfIndex].toString().toUpperCase() === rowId) {
idIndex = nfIndex;
break;
}
}
}

if (idIndex != -1) {
if (idIndex !== -1) {
this.notFound.splice(idIndex, 1);
}
}
}, this);

// Remove any not found
Ext4.each(this.notFound, function (id) {
var found = this.subjects.indexOf(id);
if (found != -1)
this.subjects.splice(found, 1);
var found = updatedSubjects.indexOf(id);
if (found !== -1)
updatedSubjects.splice(found, 1);
}, this);

this.subjects = Ext4.unique(this.subjects);
this.subjects = Ext4.unique(updatedSubjects);
this.subjects.sort();
},

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix animal history case and cleanup#132

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 22, 2022
 Merged


Fix animal history case and cleanup
#132
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3e454c6

Animal history dupe real and alias id


labkey-martyp Jul 20, 2022
d49e647

Fix filters


labkey-martyp Jul 22, 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


64 changes: 34 additions & 30 deletions
LDK/resources/web/LDK/panel/SingleSubjectFilterType.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,9 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 if (!report.subjectFieldName)
 return 'This report cannot be used with the selected filter type, because the report does not contain a ' + this.nounSingular + ' Id field';

 if (this.subjects.length === 0)
 return 'Must enter at least one valid Subject ID.'

 return null;
 },

Expand DownExpand Up@@ -143,7 +146,11 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 for (var alias in this.aliases) {
 if (this.aliases.hasOwnProperty(alias)) {
 Ext4.each(this.aliases[alias], function (id) {
 msg += "<div class='labkey-error'>Alias " + alias + " mapped to ID " + id + "</div>";
 msg += "<div class='labkey-error'>Alias " + alias + " mapped to ID " + id;
 if (this.subjects.indexOf(alias) !== -1) {
 msg += " and is a real ID";
 }
 msg += "</div>";
 }, this);
 }
 }
Expand All@@ -165,7 +172,8 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 // results than necessary in some cases, however those results are filtered to match the user input and non-matching
 // results are not used.
 var filterType = this.caseInsensitive ? LABKEY.Filter.Types.CONTAINS_ONE_OF : LABKEY.Filter.Types.EQUALS_ONE_OF;
 this.aliasTable.filterArray = [LABKEY.Filter.create('alias', subjectArray.join(';'), filterType)];
 var filterCol = this.aliasTable.aliasColumn ? this.aliasTable.aliasColumn : this.aliasTable.idColumn;
 this.aliasTable.filterArray = [LABKEY.Filter.create(filterCol, subjectArray.join(';'), filterType)];
 this.aliasTable.columns = this.aliasTable.idColumn + (Ext4.isDefined(this.aliasTable.aliasColumn) ? ',' + this.aliasTable.aliasColumn : '');
 },

Expand All@@ -183,15 +191,21 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {

 handleAliasResults: function (results) {
 this.notFound = Ext4.clone(this.subjects);
 var updatedSubjects = [];
 Ext4.each(results.rows, function (row) {

 var rowId = row[this.aliasTable.idColumn];
 updatedSubjects.push(rowId);

 if (this.aliasTable.aliasColumn) {

 var rowAlias = row[this.aliasTable.aliasColumn];

 // Remove from notFound array if found
 var subjIndex = this.notFound.indexOf(row[this.aliasTable.aliasColumn]);
 var subjIndex = this.notFound.indexOf(rowAlias);
 if (subjIndex === -1 && this.caseInsensitive) {
 for (var i = 0; i < this.notFound.length; i++) {
 if (row[this.aliasTable.aliasColumn].toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 if (rowAlias.toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 subjIndex = i;
 break;
 }
Expand All@@ -202,74 +216,64 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 this.notFound.splice(subjIndex, 1);
 }

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

 if (index !== -1) {
 this.subjects.splice(index, 1, row[this.aliasTable.idColumn]);
 }

 // Resolve aliases
 if (row[this.aliasTable.idColumn] !== row[this.aliasTable.aliasColumn]) {
 if (rowId !== rowAlias) {

 if (index !== -1) {
 this.aliases[row[this.aliasTable.aliasColumn]] = [row[this.aliasTable.idColumn]];
 var aliasList = this.aliases[rowAlias];
 if (aliasList) {
 aliasList.push(rowId);
 }
 // In case an alias matches multiple ID's
 else {
 for (var alias in this.aliases) {
 if (this.aliases.hasOwnProperty(alias) && row[this.aliasTable.aliasColumn] == alias) {
 this.aliases[row[this.aliasTable.aliasColumn]].push(row[this.aliasTable.idColumn]);
 index = this.subjects.indexOf(this.aliases[row[this.aliasTable.aliasColumn]][0]);
 this.subjects.splice(index, 0, row[this.aliasTable.idColumn]);
 }
 }
 this.aliases[rowAlias] = [rowId];
 }
 }
 }
 else {
 // Remove from notFound array if found
 var idIndex = this.notFound.indexOf(row[this.aliasTable.idColumn]);
 var idIndex = this.notFound.indexOf(rowId);
 if (idIndex === -1 && this.caseInsensitive) {
 for (var i = 0; i < this.notFound.length; i++) {
 if (row[this.aliasTable.idColumn].toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 if (rowId.toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 idIndex = i;
 break;
 }
 }
 }

 // TODO: Update this and LDK.Utils.splitIds when the case sensitive cache issues are fixed
 if (idIndex == -1) {
 if (idIndex === -1) {
 for (var nfIndex = 0; nfIndex < this.notFound.length; nfIndex++) {
 if (this.notFound[nfIndex].toString().toUpperCase() == row[this.aliasTable.idColumn]) {
 if (this.notFound[nfIndex].toString().toUpperCase() === rowId) {
 idIndex = nfIndex;
 break;
 }
 }
 }

 if (idIndex != -1) {
 if (idIndex !== -1) {
 this.notFound.splice(idIndex, 1);
 }
 }
 }, this);

 // Remove any not found
 Ext4.each(this.notFound, function (id) {
 var found = this.subjects.indexOf(id);
 if (found != -1)
this.subjects.splice(found, 1);
 var found = updatedSubjects.indexOf(id);
 if (found !== -1)
updatedSubjects.splice(found, 1);
 }, this);

 this.subjects = Ext4.unique(this.subjects);
 this.subjects = Ext4.unique(updatedSubjects);
 this.subjects.sort();
 },

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix animal history case and cleanup#132

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 22, 2022
 Merged


Fix animal history case and cleanup
#132
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3e454c6

Animal history dupe real and alias id


labkey-martyp Jul 20, 2022
d49e647

Fix filters


labkey-martyp Jul 22, 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


64 changes: 34 additions & 30 deletions
LDK/resources/web/LDK/panel/SingleSubjectFilterType.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,9 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 if (!report.subjectFieldName)
 return 'This report cannot be used with the selected filter type, because the report does not contain a ' + this.nounSingular + ' Id field';

 if (this.subjects.length === 0)
 return 'Must enter at least one valid Subject ID.'

 return null;
 },

Expand DownExpand Up@@ -143,7 +146,11 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 for (var alias in this.aliases) {
 if (this.aliases.hasOwnProperty(alias)) {
 Ext4.each(this.aliases[alias], function (id) {
 msg += "<div class='labkey-error'>Alias " + alias + " mapped to ID " + id + "</div>";
 msg += "<div class='labkey-error'>Alias " + alias + " mapped to ID " + id;
 if (this.subjects.indexOf(alias) !== -1) {
 msg += " and is a real ID";
 }
 msg += "</div>";
 }, this);
 }
 }
Expand All@@ -165,7 +172,8 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 // results than necessary in some cases, however those results are filtered to match the user input and non-matching
 // results are not used.
 var filterType = this.caseInsensitive ? LABKEY.Filter.Types.CONTAINS_ONE_OF : LABKEY.Filter.Types.EQUALS_ONE_OF;
 this.aliasTable.filterArray = [LABKEY.Filter.create('alias', subjectArray.join(';'), filterType)];
 var filterCol = this.aliasTable.aliasColumn ? this.aliasTable.aliasColumn : this.aliasTable.idColumn;
 this.aliasTable.filterArray = [LABKEY.Filter.create(filterCol, subjectArray.join(';'), filterType)];
 this.aliasTable.columns = this.aliasTable.idColumn + (Ext4.isDefined(this.aliasTable.aliasColumn) ? ',' + this.aliasTable.aliasColumn : '');
 },

Expand All@@ -183,15 +191,21 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {

 handleAliasResults: function (results) {
 this.notFound = Ext4.clone(this.subjects);
 var updatedSubjects = [];
 Ext4.each(results.rows, function (row) {

 var rowId = row[this.aliasTable.idColumn];
 updatedSubjects.push(rowId);

 if (this.aliasTable.aliasColumn) {

 var rowAlias = row[this.aliasTable.aliasColumn];

 // Remove from notFound array if found
 var subjIndex = this.notFound.indexOf(row[this.aliasTable.aliasColumn]);
 var subjIndex = this.notFound.indexOf(rowAlias);
 if (subjIndex === -1 && this.caseInsensitive) {
 for (var i = 0; i < this.notFound.length; i++) {
 if (row[this.aliasTable.aliasColumn].toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 if (rowAlias.toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 subjIndex = i;
 break;
 }
Expand All@@ -202,74 +216,64 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 this.notFound.splice(subjIndex, 1);
 }

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

 if (index !== -1) {
 this.subjects.splice(index, 1, row[this.aliasTable.idColumn]);
 }

 // Resolve aliases
 if (row[this.aliasTable.idColumn] !== row[this.aliasTable.aliasColumn]) {
 if (rowId !== rowAlias) {

 if (index !== -1) {
 this.aliases[row[this.aliasTable.aliasColumn]] = [row[this.aliasTable.idColumn]];
 var aliasList = this.aliases[rowAlias];
 if (aliasList) {
 aliasList.push(rowId);
 }
 // In case an alias matches multiple ID's
 else {
 for (var alias in this.aliases) {
 if (this.aliases.hasOwnProperty(alias) && row[this.aliasTable.aliasColumn] == alias) {
 this.aliases[row[this.aliasTable.aliasColumn]].push(row[this.aliasTable.idColumn]);
 index = this.subjects.indexOf(this.aliases[row[this.aliasTable.aliasColumn]][0]);
 this.subjects.splice(index, 0, row[this.aliasTable.idColumn]);
 }
 }
 this.aliases[rowAlias] = [rowId];
 }
 }
 }
 else {
 // Remove from notFound array if found
 var idIndex = this.notFound.indexOf(row[this.aliasTable.idColumn]);
 var idIndex = this.notFound.indexOf(rowId);
 if (idIndex === -1 && this.caseInsensitive) {
 for (var i = 0; i < this.notFound.length; i++) {
 if (row[this.aliasTable.idColumn].toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 if (rowId.toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 idIndex = i;
 break;
 }
 }
 }

 // TODO: Update this and LDK.Utils.splitIds when the case sensitive cache issues are fixed
 if (idIndex == -1) {
 if (idIndex === -1) {
 for (var nfIndex = 0; nfIndex < this.notFound.length; nfIndex++) {
 if (this.notFound[nfIndex].toString().toUpperCase() == row[this.aliasTable.idColumn]) {
 if (this.notFound[nfIndex].toString().toUpperCase() === rowId) {
 idIndex = nfIndex;
 break;
 }
 }
 }

 if (idIndex != -1) {
 if (idIndex !== -1) {
 this.notFound.splice(idIndex, 1);
 }
 }
 }, this);

 // Remove any not found
 Ext4.each(this.notFound, function (id) {
 var found = this.subjects.indexOf(id);
 if (found != -1)
this.subjects.splice(found, 1);
 var found = updatedSubjects.indexOf(id);
 if (found !== -1)
updatedSubjects.splice(found, 1);
 }, this);

 this.subjects = Ext4.unique(this.subjects);
 this.subjects = Ext4.unique(updatedSubjects);
 this.subjects.sort();
 },

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix animal history case and cleanup#132

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 22, 2022
 Merged


Fix animal history case and cleanup
#132
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3e454c6

Animal history dupe real and alias id


labkey-martyp Jul 20, 2022
d49e647

Fix filters


labkey-martyp Jul 22, 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


64 changes: 34 additions & 30 deletions
LDK/resources/web/LDK/panel/SingleSubjectFilterType.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,9 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 if (!report.subjectFieldName)
 return 'This report cannot be used with the selected filter type, because the report does not contain a ' + this.nounSingular + ' Id field';

 if (this.subjects.length === 0)
 return 'Must enter at least one valid Subject ID.'

 return null;
 },

Expand DownExpand Up@@ -143,7 +146,11 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 for (var alias in this.aliases) {
 if (this.aliases.hasOwnProperty(alias)) {
 Ext4.each(this.aliases[alias], function (id) {
 msg += "<div class='labkey-error'>Alias " + alias + " mapped to ID " + id + "</div>";
 msg += "<div class='labkey-error'>Alias " + alias + " mapped to ID " + id;
 if (this.subjects.indexOf(alias) !== -1) {
 msg += " and is a real ID";
 }
 msg += "</div>";
 }, this);
 }
 }
Expand All@@ -165,7 +172,8 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 // results than necessary in some cases, however those results are filtered to match the user input and non-matching
 // results are not used.
 var filterType = this.caseInsensitive ? LABKEY.Filter.Types.CONTAINS_ONE_OF : LABKEY.Filter.Types.EQUALS_ONE_OF;
 this.aliasTable.filterArray = [LABKEY.Filter.create('alias', subjectArray.join(';'), filterType)];
 var filterCol = this.aliasTable.aliasColumn ? this.aliasTable.aliasColumn : this.aliasTable.idColumn;
 this.aliasTable.filterArray = [LABKEY.Filter.create(filterCol, subjectArray.join(';'), filterType)];
 this.aliasTable.columns = this.aliasTable.idColumn + (Ext4.isDefined(this.aliasTable.aliasColumn) ? ',' + this.aliasTable.aliasColumn : '');
 },

Expand All@@ -183,15 +191,21 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {

 handleAliasResults: function (results) {
 this.notFound = Ext4.clone(this.subjects);
 var updatedSubjects = [];
 Ext4.each(results.rows, function (row) {

 var rowId = row[this.aliasTable.idColumn];
 updatedSubjects.push(rowId);

 if (this.aliasTable.aliasColumn) {

 var rowAlias = row[this.aliasTable.aliasColumn];

 // Remove from notFound array if found
 var subjIndex = this.notFound.indexOf(row[this.aliasTable.aliasColumn]);
 var subjIndex = this.notFound.indexOf(rowAlias);
 if (subjIndex === -1 && this.caseInsensitive) {
 for (var i = 0; i < this.notFound.length; i++) {
 if (row[this.aliasTable.aliasColumn].toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 if (rowAlias.toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 subjIndex = i;
 break;
 }
Expand All@@ -202,74 +216,64 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 this.notFound.splice(subjIndex, 1);
 }

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

 if (index !== -1) {
 this.subjects.splice(index, 1, row[this.aliasTable.idColumn]);
 }

 // Resolve aliases
 if (row[this.aliasTable.idColumn] !== row[this.aliasTable.aliasColumn]) {
 if (rowId !== rowAlias) {

 if (index !== -1) {
 this.aliases[row[this.aliasTable.aliasColumn]] = [row[this.aliasTable.idColumn]];
 var aliasList = this.aliases[rowAlias];
 if (aliasList) {
 aliasList.push(rowId);
 }
 // In case an alias matches multiple ID's
 else {
 for (var alias in this.aliases) {
 if (this.aliases.hasOwnProperty(alias) && row[this.aliasTable.aliasColumn] == alias) {
 this.aliases[row[this.aliasTable.aliasColumn]].push(row[this.aliasTable.idColumn]);
 index = this.subjects.indexOf(this.aliases[row[this.aliasTable.aliasColumn]][0]);
 this.subjects.splice(index, 0, row[this.aliasTable.idColumn]);
 }
 }
 this.aliases[rowAlias] = [rowId];
 }
 }
 }
 else {
 // Remove from notFound array if found
 var idIndex = this.notFound.indexOf(row[this.aliasTable.idColumn]);
 var idIndex = this.notFound.indexOf(rowId);
 if (idIndex === -1 && this.caseInsensitive) {
 for (var i = 0; i < this.notFound.length; i++) {
 if (row[this.aliasTable.idColumn].toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 if (rowId.toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 idIndex = i;
 break;
 }
 }
 }

 // TODO: Update this and LDK.Utils.splitIds when the case sensitive cache issues are fixed
 if (idIndex == -1) {
 if (idIndex === -1) {
 for (var nfIndex = 0; nfIndex < this.notFound.length; nfIndex++) {
 if (this.notFound[nfIndex].toString().toUpperCase() == row[this.aliasTable.idColumn]) {
 if (this.notFound[nfIndex].toString().toUpperCase() === rowId) {
 idIndex = nfIndex;
 break;
 }
 }
 }

 if (idIndex != -1) {
 if (idIndex !== -1) {
 this.notFound.splice(idIndex, 1);
 }
 }
 }, this);

 // Remove any not found
 Ext4.each(this.notFound, function (id) {
 var found = this.subjects.indexOf(id);
 if (found != -1)
this.subjects.splice(found, 1);
 var found = updatedSubjects.indexOf(id);
 if (found !== -1)
updatedSubjects.splice(found, 1);
 }, this);

 this.subjects = Ext4.unique(this.subjects);
 this.subjects = Ext4.unique(updatedSubjects);
 this.subjects.sort();
 },

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix animal history case and cleanup#132

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 22, 2022
 Merged


Fix animal history case and cleanup
#132
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3e454c6

Animal history dupe real and alias id


labkey-martyp Jul 20, 2022
d49e647

Fix filters


labkey-martyp Jul 22, 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


64 changes: 34 additions & 30 deletions
LDK/resources/web/LDK/panel/SingleSubjectFilterType.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,9 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 if (!report.subjectFieldName)
 return 'This report cannot be used with the selected filter type, because the report does not contain a ' + this.nounSingular + ' Id field';

 if (this.subjects.length === 0)
 return 'Must enter at least one valid Subject ID.'

 return null;
 },

Expand DownExpand Up@@ -143,7 +146,11 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 for (var alias in this.aliases) {
 if (this.aliases.hasOwnProperty(alias)) {
 Ext4.each(this.aliases[alias], function (id) {
 msg += "<div class='labkey-error'>Alias " + alias + " mapped to ID " + id + "</div>";
 msg += "<div class='labkey-error'>Alias " + alias + " mapped to ID " + id;
 if (this.subjects.indexOf(alias) !== -1) {
 msg += " and is a real ID";
 }
 msg += "</div>";
 }, this);
 }
 }
Expand All@@ -165,7 +172,8 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 // results than necessary in some cases, however those results are filtered to match the user input and non-matching
 // results are not used.
 var filterType = this.caseInsensitive ? LABKEY.Filter.Types.CONTAINS_ONE_OF : LABKEY.Filter.Types.EQUALS_ONE_OF;
 this.aliasTable.filterArray = [LABKEY.Filter.create('alias', subjectArray.join(';'), filterType)];
 var filterCol = this.aliasTable.aliasColumn ? this.aliasTable.aliasColumn : this.aliasTable.idColumn;
 this.aliasTable.filterArray = [LABKEY.Filter.create(filterCol, subjectArray.join(';'), filterType)];
 this.aliasTable.columns = this.aliasTable.idColumn + (Ext4.isDefined(this.aliasTable.aliasColumn) ? ',' + this.aliasTable.aliasColumn : '');
 },

Expand All@@ -183,15 +191,21 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {

 handleAliasResults: function (results) {
 this.notFound = Ext4.clone(this.subjects);
 var updatedSubjects = [];
 Ext4.each(results.rows, function (row) {

 var rowId = row[this.aliasTable.idColumn];
 updatedSubjects.push(rowId);

 if (this.aliasTable.aliasColumn) {

 var rowAlias = row[this.aliasTable.aliasColumn];

 // Remove from notFound array if found
 var subjIndex = this.notFound.indexOf(row[this.aliasTable.aliasColumn]);
 var subjIndex = this.notFound.indexOf(rowAlias);
 if (subjIndex === -1 && this.caseInsensitive) {
 for (var i = 0; i < this.notFound.length; i++) {
 if (row[this.aliasTable.aliasColumn].toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 if (rowAlias.toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 subjIndex = i;
 break;
 }
Expand All@@ -202,74 +216,64 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 this.notFound.splice(subjIndex, 1);
 }

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

 if (index !== -1) {
 this.subjects.splice(index, 1, row[this.aliasTable.idColumn]);
 }

 // Resolve aliases
 if (row[this.aliasTable.idColumn] !== row[this.aliasTable.aliasColumn]) {
 if (rowId !== rowAlias) {

 if (index !== -1) {
 this.aliases[row[this.aliasTable.aliasColumn]] = [row[this.aliasTable.idColumn]];
 var aliasList = this.aliases[rowAlias];
 if (aliasList) {
 aliasList.push(rowId);
 }
 // In case an alias matches multiple ID's
 else {
 for (var alias in this.aliases) {
 if (this.aliases.hasOwnProperty(alias) && row[this.aliasTable.aliasColumn] == alias) {
 this.aliases[row[this.aliasTable.aliasColumn]].push(row[this.aliasTable.idColumn]);
 index = this.subjects.indexOf(this.aliases[row[this.aliasTable.aliasColumn]][0]);
 this.subjects.splice(index, 0, row[this.aliasTable.idColumn]);
 }
 }
 this.aliases[rowAlias] = [rowId];
 }
 }
 }
 else {
 // Remove from notFound array if found
 var idIndex = this.notFound.indexOf(row[this.aliasTable.idColumn]);
 var idIndex = this.notFound.indexOf(rowId);
 if (idIndex === -1 && this.caseInsensitive) {
 for (var i = 0; i < this.notFound.length; i++) {
 if (row[this.aliasTable.idColumn].toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 if (rowId.toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 idIndex = i;
 break;
 }
 }
 }

 // TODO: Update this and LDK.Utils.splitIds when the case sensitive cache issues are fixed
 if (idIndex == -1) {
 if (idIndex === -1) {
 for (var nfIndex = 0; nfIndex < this.notFound.length; nfIndex++) {
 if (this.notFound[nfIndex].toString().toUpperCase() == row[this.aliasTable.idColumn]) {
 if (this.notFound[nfIndex].toString().toUpperCase() === rowId) {
 idIndex = nfIndex;
 break;
 }
 }
 }

 if (idIndex != -1) {
 if (idIndex !== -1) {
 this.notFound.splice(idIndex, 1);
 }
 }
 }, this);

 // Remove any not found
 Ext4.each(this.notFound, function (id) {
 var found = this.subjects.indexOf(id);
 if (found != -1)
this.subjects.splice(found, 1);
 var found = updatedSubjects.indexOf(id);
 if (found !== -1)
updatedSubjects.splice(found, 1);
 }, this);

 this.subjects = Ext4.unique(this.subjects);
 this.subjects = Ext4.unique(updatedSubjects);
 this.subjects.sort();
 },

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix animal history case and cleanup#132

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 22, 2022
 Merged


Fix animal history case and cleanup
#132
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3e454c6

Animal history dupe real and alias id


labkey-martyp Jul 20, 2022
d49e647

Fix filters


labkey-martyp Jul 22, 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


64 changes: 34 additions & 30 deletions
LDK/resources/web/LDK/panel/SingleSubjectFilterType.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,9 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 if (!report.subjectFieldName)
 return 'This report cannot be used with the selected filter type, because the report does not contain a ' + this.nounSingular + ' Id field';

 if (this.subjects.length === 0)
 return 'Must enter at least one valid Subject ID.'

 return null;
 },

Expand DownExpand Up@@ -143,7 +146,11 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 for (var alias in this.aliases) {
 if (this.aliases.hasOwnProperty(alias)) {
 Ext4.each(this.aliases[alias], function (id) {
 msg += "<div class='labkey-error'>Alias " + alias + " mapped to ID " + id + "</div>";
 msg += "<div class='labkey-error'>Alias " + alias + " mapped to ID " + id;
 if (this.subjects.indexOf(alias) !== -1) {
 msg += " and is a real ID";
 }
 msg += "</div>";
 }, this);
 }
 }
Expand All@@ -165,7 +172,8 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 // results than necessary in some cases, however those results are filtered to match the user input and non-matching
 // results are not used.
 var filterType = this.caseInsensitive ? LABKEY.Filter.Types.CONTAINS_ONE_OF : LABKEY.Filter.Types.EQUALS_ONE_OF;
 this.aliasTable.filterArray = [LABKEY.Filter.create('alias', subjectArray.join(';'), filterType)];
 var filterCol = this.aliasTable.aliasColumn ? this.aliasTable.aliasColumn : this.aliasTable.idColumn;
 this.aliasTable.filterArray = [LABKEY.Filter.create(filterCol, subjectArray.join(';'), filterType)];
 this.aliasTable.columns = this.aliasTable.idColumn + (Ext4.isDefined(this.aliasTable.aliasColumn) ? ',' + this.aliasTable.aliasColumn : '');
 },

Expand All@@ -183,15 +191,21 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {

 handleAliasResults: function (results) {
 this.notFound = Ext4.clone(this.subjects);
 var updatedSubjects = [];
 Ext4.each(results.rows, function (row) {

 var rowId = row[this.aliasTable.idColumn];
 updatedSubjects.push(rowId);

 if (this.aliasTable.aliasColumn) {

 var rowAlias = row[this.aliasTable.aliasColumn];

 // Remove from notFound array if found
 var subjIndex = this.notFound.indexOf(row[this.aliasTable.aliasColumn]);
 var subjIndex = this.notFound.indexOf(rowAlias);
 if (subjIndex === -1 && this.caseInsensitive) {
 for (var i = 0; i < this.notFound.length; i++) {
 if (row[this.aliasTable.aliasColumn].toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 if (rowAlias.toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 subjIndex = i;
 break;
 }
Expand All@@ -202,74 +216,64 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 this.notFound.splice(subjIndex, 1);
 }

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

 if (index !== -1) {
 this.subjects.splice(index, 1, row[this.aliasTable.idColumn]);
 }

 // Resolve aliases
 if (row[this.aliasTable.idColumn] !== row[this.aliasTable.aliasColumn]) {
 if (rowId !== rowAlias) {

 if (index !== -1) {
 this.aliases[row[this.aliasTable.aliasColumn]] = [row[this.aliasTable.idColumn]];
 var aliasList = this.aliases[rowAlias];
 if (aliasList) {
 aliasList.push(rowId);
 }
 // In case an alias matches multiple ID's
 else {
 for (var alias in this.aliases) {
 if (this.aliases.hasOwnProperty(alias) && row[this.aliasTable.aliasColumn] == alias) {
 this.aliases[row[this.aliasTable.aliasColumn]].push(row[this.aliasTable.idColumn]);
 index = this.subjects.indexOf(this.aliases[row[this.aliasTable.aliasColumn]][0]);
 this.subjects.splice(index, 0, row[this.aliasTable.idColumn]);
 }
 }
 this.aliases[rowAlias] = [rowId];
 }
 }
 }
 else {
 // Remove from notFound array if found
 var idIndex = this.notFound.indexOf(row[this.aliasTable.idColumn]);
 var idIndex = this.notFound.indexOf(rowId);
 if (idIndex === -1 && this.caseInsensitive) {
 for (var i = 0; i < this.notFound.length; i++) {
 if (row[this.aliasTable.idColumn].toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 if (rowId.toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 idIndex = i;
 break;
 }
 }
 }

 // TODO: Update this and LDK.Utils.splitIds when the case sensitive cache issues are fixed
 if (idIndex == -1) {
 if (idIndex === -1) {
 for (var nfIndex = 0; nfIndex < this.notFound.length; nfIndex++) {
 if (this.notFound[nfIndex].toString().toUpperCase() == row[this.aliasTable.idColumn]) {
 if (this.notFound[nfIndex].toString().toUpperCase() === rowId) {
 idIndex = nfIndex;
 break;
 }
 }
 }

 if (idIndex != -1) {
 if (idIndex !== -1) {
 this.notFound.splice(idIndex, 1);
 }
 }
 }, this);

 // Remove any not found
 Ext4.each(this.notFound, function (id) {
 var found = this.subjects.indexOf(id);
 if (found != -1)
this.subjects.splice(found, 1);
 var found = updatedSubjects.indexOf(id);
 if (found !== -1)
updatedSubjects.splice(found, 1);
 }, this);

 this.subjects = Ext4.unique(this.subjects);
 this.subjects = Ext4.unique(updatedSubjects);
 this.subjects.sort();
 },

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix animal history case and cleanup#132

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 22, 2022
 Merged


Fix animal history case and cleanup
#132
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3e454c6

Animal history dupe real and alias id


labkey-martyp Jul 20, 2022
d49e647

Fix filters


labkey-martyp Jul 22, 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


64 changes: 34 additions & 30 deletions
LDK/resources/web/LDK/panel/SingleSubjectFilterType.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,9 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 if (!report.subjectFieldName)
 return 'This report cannot be used with the selected filter type, because the report does not contain a ' + this.nounSingular + ' Id field';

 if (this.subjects.length === 0)
 return 'Must enter at least one valid Subject ID.'

 return null;
 },

Expand DownExpand Up@@ -143,7 +146,11 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 for (var alias in this.aliases) {
 if (this.aliases.hasOwnProperty(alias)) {
 Ext4.each(this.aliases[alias], function (id) {
 msg += "<div class='labkey-error'>Alias " + alias + " mapped to ID " + id + "</div>";
 msg += "<div class='labkey-error'>Alias " + alias + " mapped to ID " + id;
 if (this.subjects.indexOf(alias) !== -1) {
 msg += " and is a real ID";
 }
 msg += "</div>";
 }, this);
 }
 }
Expand All@@ -165,7 +172,8 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 // results than necessary in some cases, however those results are filtered to match the user input and non-matching
 // results are not used.
 var filterType = this.caseInsensitive ? LABKEY.Filter.Types.CONTAINS_ONE_OF : LABKEY.Filter.Types.EQUALS_ONE_OF;
 this.aliasTable.filterArray = [LABKEY.Filter.create('alias', subjectArray.join(';'), filterType)];
 var filterCol = this.aliasTable.aliasColumn ? this.aliasTable.aliasColumn : this.aliasTable.idColumn;
 this.aliasTable.filterArray = [LABKEY.Filter.create(filterCol, subjectArray.join(';'), filterType)];
 this.aliasTable.columns = this.aliasTable.idColumn + (Ext4.isDefined(this.aliasTable.aliasColumn) ? ',' + this.aliasTable.aliasColumn : '');
 },

Expand All@@ -183,15 +191,21 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {

 handleAliasResults: function (results) {
 this.notFound = Ext4.clone(this.subjects);
 var updatedSubjects = [];
 Ext4.each(results.rows, function (row) {

 var rowId = row[this.aliasTable.idColumn];
 updatedSubjects.push(rowId);

 if (this.aliasTable.aliasColumn) {

 var rowAlias = row[this.aliasTable.aliasColumn];

 // Remove from notFound array if found
 var subjIndex = this.notFound.indexOf(row[this.aliasTable.aliasColumn]);
 var subjIndex = this.notFound.indexOf(rowAlias);
 if (subjIndex === -1 && this.caseInsensitive) {
 for (var i = 0; i < this.notFound.length; i++) {
 if (row[this.aliasTable.aliasColumn].toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 if (rowAlias.toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 subjIndex = i;
 break;
 }
Expand All@@ -202,74 +216,64 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 this.notFound.splice(subjIndex, 1);
 }

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

 if (index !== -1) {
 this.subjects.splice(index, 1, row[this.aliasTable.idColumn]);
 }

 // Resolve aliases
 if (row[this.aliasTable.idColumn] !== row[this.aliasTable.aliasColumn]) {
 if (rowId !== rowAlias) {

 if (index !== -1) {
 this.aliases[row[this.aliasTable.aliasColumn]] = [row[this.aliasTable.idColumn]];
 var aliasList = this.aliases[rowAlias];
 if (aliasList) {
 aliasList.push(rowId);
 }
 // In case an alias matches multiple ID's
 else {
 for (var alias in this.aliases) {
 if (this.aliases.hasOwnProperty(alias) && row[this.aliasTable.aliasColumn] == alias) {
 this.aliases[row[this.aliasTable.aliasColumn]].push(row[this.aliasTable.idColumn]);
 index = this.subjects.indexOf(this.aliases[row[this.aliasTable.aliasColumn]][0]);
 this.subjects.splice(index, 0, row[this.aliasTable.idColumn]);
 }
 }
 this.aliases[rowAlias] = [rowId];
 }
 }
 }
 else {
 // Remove from notFound array if found
 var idIndex = this.notFound.indexOf(row[this.aliasTable.idColumn]);
 var idIndex = this.notFound.indexOf(rowId);
 if (idIndex === -1 && this.caseInsensitive) {
 for (var i = 0; i < this.notFound.length; i++) {
 if (row[this.aliasTable.idColumn].toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 if (rowId.toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 idIndex = i;
 break;
 }
 }
 }

 // TODO: Update this and LDK.Utils.splitIds when the case sensitive cache issues are fixed
 if (idIndex == -1) {
 if (idIndex === -1) {
 for (var nfIndex = 0; nfIndex < this.notFound.length; nfIndex++) {
 if (this.notFound[nfIndex].toString().toUpperCase() == row[this.aliasTable.idColumn]) {
 if (this.notFound[nfIndex].toString().toUpperCase() === rowId) {
 idIndex = nfIndex;
 break;
 }
 }
 }

 if (idIndex != -1) {
 if (idIndex !== -1) {
 this.notFound.splice(idIndex, 1);
 }
 }
 }, this);

 // Remove any not found
 Ext4.each(this.notFound, function (id) {
 var found = this.subjects.indexOf(id);
 if (found != -1)
this.subjects.splice(found, 1);
 var found = updatedSubjects.indexOf(id);
 if (found !== -1)
updatedSubjects.splice(found, 1);
 }, this);

 this.subjects = Ext4.unique(this.subjects);
 this.subjects = Ext4.unique(updatedSubjects);
 this.subjects.sort();
 },

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix animal history case and cleanup#132

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 22, 2022
 Merged


Fix animal history case and cleanup
#132
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3e454c6

Animal history dupe real and alias id


labkey-martyp Jul 20, 2022
d49e647

Fix filters


labkey-martyp Jul 22, 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


64 changes: 34 additions & 30 deletions
LDK/resources/web/LDK/panel/SingleSubjectFilterType.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,9 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 if (!report.subjectFieldName)
 return 'This report cannot be used with the selected filter type, because the report does not contain a ' + this.nounSingular + ' Id field';

 if (this.subjects.length === 0)
 return 'Must enter at least one valid Subject ID.'

 return null;
 },

Expand DownExpand Up@@ -143,7 +146,11 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 for (var alias in this.aliases) {
 if (this.aliases.hasOwnProperty(alias)) {
 Ext4.each(this.aliases[alias], function (id) {
 msg += "<div class='labkey-error'>Alias " + alias + " mapped to ID " + id + "</div>";
 msg += "<div class='labkey-error'>Alias " + alias + " mapped to ID " + id;
 if (this.subjects.indexOf(alias) !== -1) {
 msg += " and is a real ID";
 }
 msg += "</div>";
 }, this);
 }
 }
Expand All@@ -165,7 +172,8 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 // results than necessary in some cases, however those results are filtered to match the user input and non-matching
 // results are not used.
 var filterType = this.caseInsensitive ? LABKEY.Filter.Types.CONTAINS_ONE_OF : LABKEY.Filter.Types.EQUALS_ONE_OF;
 this.aliasTable.filterArray = [LABKEY.Filter.create('alias', subjectArray.join(';'), filterType)];
 var filterCol = this.aliasTable.aliasColumn ? this.aliasTable.aliasColumn : this.aliasTable.idColumn;
 this.aliasTable.filterArray = [LABKEY.Filter.create(filterCol, subjectArray.join(';'), filterType)];
 this.aliasTable.columns = this.aliasTable.idColumn + (Ext4.isDefined(this.aliasTable.aliasColumn) ? ',' + this.aliasTable.aliasColumn : '');
 },

Expand All@@ -183,15 +191,21 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {

 handleAliasResults: function (results) {
 this.notFound = Ext4.clone(this.subjects);
 var updatedSubjects = [];
 Ext4.each(results.rows, function (row) {

 var rowId = row[this.aliasTable.idColumn];
 updatedSubjects.push(rowId);

 if (this.aliasTable.aliasColumn) {

 var rowAlias = row[this.aliasTable.aliasColumn];

 // Remove from notFound array if found
 var subjIndex = this.notFound.indexOf(row[this.aliasTable.aliasColumn]);
 var subjIndex = this.notFound.indexOf(rowAlias);
 if (subjIndex === -1 && this.caseInsensitive) {
 for (var i = 0; i < this.notFound.length; i++) {
 if (row[this.aliasTable.aliasColumn].toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 if (rowAlias.toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 subjIndex = i;
 break;
 }
Expand All@@ -202,74 +216,64 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
 this.notFound.splice(subjIndex, 1);
 }

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

 if (index !== -1) {
 this.subjects.splice(index, 1, row[this.aliasTable.idColumn]);
 }

 // Resolve aliases
 if (row[this.aliasTable.idColumn] !== row[this.aliasTable.aliasColumn]) {
 if (rowId !== rowAlias) {

 if (index !== -1) {
 this.aliases[row[this.aliasTable.aliasColumn]] = [row[this.aliasTable.idColumn]];
 var aliasList = this.aliases[rowAlias];
 if (aliasList) {
 aliasList.push(rowId);
 }
 // In case an alias matches multiple ID's
 else {
 for (var alias in this.aliases) {
 if (this.aliases.hasOwnProperty(alias) && row[this.aliasTable.aliasColumn] == alias) {
 this.aliases[row[this.aliasTable.aliasColumn]].push(row[this.aliasTable.idColumn]);
 index = this.subjects.indexOf(this.aliases[row[this.aliasTable.aliasColumn]][0]);
 this.subjects.splice(index, 0, row[this.aliasTable.idColumn]);
 }
 }
 this.aliases[rowAlias] = [rowId];
 }
 }
 }
 else {
 // Remove from notFound array if found
 var idIndex = this.notFound.indexOf(row[this.aliasTable.idColumn]);
 var idIndex = this.notFound.indexOf(rowId);
 if (idIndex === -1 && this.caseInsensitive) {
 for (var i = 0; i < this.notFound.length; i++) {
 if (row[this.aliasTable.idColumn].toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 if (rowId.toLowerCase() === this.notFound[i].toString().toLowerCase()) {
 idIndex = i;
 break;
 }
 }
 }

 // TODO: Update this and LDK.Utils.splitIds when the case sensitive cache issues are fixed
 if (idIndex == -1) {
 if (idIndex === -1) {
 for (var nfIndex = 0; nfIndex < this.notFound.length; nfIndex++) {
 if (this.notFound[nfIndex].toString().toUpperCase() == row[this.aliasTable.idColumn]) {
 if (this.notFound[nfIndex].toString().toUpperCase() === rowId) {
 idIndex = nfIndex;
 break;
 }
 }
 }

 if (idIndex != -1) {
 if (idIndex !== -1) {
 this.notFound.splice(idIndex, 1);
 }
 }
 }, this);

 // Remove any not found
 Ext4.each(this.notFound, function (id) {
 var found = this.subjects.indexOf(id);
 if (found != -1)
this.subjects.splice(found, 1);
 var found = updatedSubjects.indexOf(id);
 if (found !== -1)
updatedSubjects.splice(found, 1);
 }, this);

 this.subjects = Ext4.unique(this.subjects);
 this.subjects = Ext4.unique(updatedSubjects);
 this.subjects.sort();
 },

Expand Down