| " + title + ' | |
|---|---|
| " + - name + - ' | '; - text += "" + value + ' | '; - text += '
| "+o+" | |
|---|---|
| "+c+" | ",r+=""+s+" | ",r+="
- {{this.statusMessage}}
+ {{#ifCond this.statusMessage '===' "ERROR"}}
+ {{this.statusMessage}}
+ {{/ifCond}}
+ {{#ifCond this.statusMessage '!==' "ERROR"}}
+ {{this.statusMessage}}
+ {{/ifCond}}
{{/if}}
diff --git a/js-i2b2/cells/CRC/templates/QueryGroupAdder.html b/js-i2b2/cells/CRC/templates/QueryGroupAdder.html
index 1cdbb3e8..097a7315 100644
--- a/js-i2b2/cells/CRC/templates/QueryGroupAdder.html
+++ b/js-i2b2/cells/CRC/templates/QueryGroupAdder.html
@@ -13,7 +13,7 @@
diff --git a/js-i2b2/cells/CRC/templates/QueryGroupConceptList.html b/js-i2b2/cells/CRC/templates/QueryGroupConceptList.html
index 31370cb9..112acda5 100644
--- a/js-i2b2/cells/CRC/templates/QueryGroupConceptList.html
+++ b/js-i2b2/cells/CRC/templates/QueryGroupConceptList.html
@@ -63,7 +63,7 @@
{{#ifCond this.withDates "===" true}}
{{/ifCond}}
-
+
{{/ifCond}}
diff --git a/js-i2b2/cells/CRC/templates/QueryReport.html b/js-i2b2/cells/CRC/templates/QueryReport.html
index a3bca72d..94cea20e 100644
--- a/js-i2b2/cells/CRC/templates/QueryReport.html
+++ b/js-i2b2/cells/CRC/templates/QueryReport.html
@@ -4,16 +4,15 @@
Query Report
-
{{/if}}
@@ -77,7 +76,7 @@
-
drag a concept here to define inclusion or exclusion criteria
+ drag a term here to define inclusion or exclusion criteria
i2b2 Query Report
-{{#if completedAt}} +{{#if hasError}} + The query entitled "{{name}}" submitted on {{submittedAt}}. +{{else}} The query entitled "{{name}}" submitted on {{submittedAt}}, was successfully completed on {{completedAt}}. This query was performed by "{{submittedBy}}". The search was completed in {{runDuration}} seconds. -{{else}} - The query entitled "{{name}}" submitted on {{submittedAt}}. {{/if}} @@ -41,7 +40,7 @@All Groups
Occurs in Same Encounter {{/ifCond}} {{#ifCond this.timing "==" "SAMEINSTANCENUM"}} - Items' Instance will be the same + Item's Instance will be the same {{/ifCond}}All Events
Occurs in Same Encounter {{/ifCond}} {{#ifCond this.timing "==" "SAMEINSTANCENUM"}} - Items' Instance will be the same + Item's Instance will be the same {{/ifCond}}From {{this.timingFrom}} to {{this.timingTo}}
diff --git a/js-i2b2/cells/CRC/templates/QueryResult.html b/js-i2b2/cells/CRC/templates/QueryResult.html
index 5d765a84..52c3c0ec 100644
--- a/js-i2b2/cells/CRC/templates/QueryResult.html
+++ b/js-i2b2/cells/CRC/templates/QueryResult.html
@@ -13,7 +13,12 @@
{{#if this.statusMessage}}
- {{this.statusMessage}}
+ {{#ifCond this.statusMessage '===' "ERROR"}}
+ {{this.statusMessage}}
+ {{/ifCond}}
+ {{#ifCond this.statusMessage '!==' "ERROR"}}
+ {{this.statusMessage}}
+ {{/ifCond}}
{{/if}}
{{#ifCond this.status '!==' 'ERROR'}}
diff --git a/js-i2b2/cells/ONT/ONT_ctrlr_Search.js b/js-i2b2/cells/ONT/ONT_ctrlr_Search.js
index a6092cf8..b80d3a67 100644
--- a/js-i2b2/cells/ONT/ONT_ctrlr_Search.js
+++ b/js-i2b2/cells/ONT/ONT_ctrlr_Search.js
@@ -16,6 +16,9 @@ i2b2.ONT.ctrlr.Search = {
i2b2.ONT.view.nav.treeview.hide();
i2b2.ONT.view.search.treeview.show();
+ $("#ontNavTreeToggle").removeClass("hidden");
+ $("#ontSearchTreeToggle").addClass("hidden");
+
// clear any previous warning for "more than X number of results"
$('i.srTooltip').attr('data-bs-original-title', "A maximum of " + i2b2.ONT.view.nav.params.max + " records per category will be returned.");
$('i.srTooltip').removeClass("warn");
@@ -116,8 +119,12 @@ i2b2.ONT.ctrlr.Search = {
$('i.srTooltip').attr('data-bs-original-title', "Not all results are displayed! A maximum of " + i2b2.ONT.view.nav.params.max + " records per category were returned.");
}
status[0].innerHTML = disp;
-// i2b2.ONT.ctrlr.Search.backfillResultNodes();
- i2b2.ONT.ctrlr.Search.backfillResultNodes_fast();
+ if(i2b2.ONT.view.nav.params.fullSearch) {
+ i2b2.ONT.ctrlr.Search.backfillResultNodes();
+ }
+ else{
+ i2b2.ONT.ctrlr.Search.backfillResultNodes_fast();
+ }
}
}
};
@@ -443,4 +450,3 @@ i2b2.ONT.ctrlr.Search = {
};
-
diff --git a/js-i2b2/cells/ONT/ONT_view_Nav.js b/js-i2b2/cells/ONT/ONT_view_Nav.js
index f6d47e4a..b6e3f44c 100644
--- a/js-i2b2/cells/ONT/ONT_view_Nav.js
+++ b/js-i2b2/cells/ONT/ONT_view_Nav.js
@@ -70,7 +70,15 @@ i2b2.ONT.view.nav.PopulateCategories = function() {
i2b2.ONT.view.nav.treeview.treeview('redraw', []);
};
// ================================================================================================== //
-
+i2b2.ONT.view.nav.nodeClickedAction = function(event) {
+ let target = $(event.target);
+ let nodeId = parseInt(target.closest('li.list-group-item').attr('data-nodeid'));
+ let nodeData = i2b2.ONT.view.nav.treeview.treeview("getNodes", (snode)=> (snode.nodeId === nodeId));
+ if(nodeData.length > 0) {
+ i2b2.ONT.view.info.load(nodeData[0].i2b2, true);
+ }
+};
+// ================================================================================================== //
i2b2.ONT.view.nav.loadChildrenAction = function(e, nodeData) {
i2b2.ONT.view.nav.loadChildren(nodeData);
}
@@ -159,6 +167,21 @@ i2b2.ONT.view.nav.displayAlertDialog = function(inputData){
$(i2b2.ONT.view.nav.templates.alertDialog(data)).appendTo(ontMsgDialogModal);
$("#ONTAlertDialog").modal('show');
}
+// ======================================================================================
+i2b2.ONT.view.nav.toggleSearchTree = function(){
+ i2b2.ONT.view.nav.treeview.hide();
+ i2b2.ONT.view.search.treeview.show();
+ $("#ontNavTreeToggle").removeClass("hidden");
+ $("#ontSearchTreeToggle").addClass("hidden");
+}
+// ======================================================================================
+i2b2.ONT.view.nav.toggleNavTree = function(){
+ i2b2.ONT.view.nav.treeview.show();
+ i2b2.ONT.view.search.treeview.hide();
+ $("#ontNavTreeToggle").addClass("hidden");
+ $("#ontSearchTreeToggle").removeClass("hidden");
+}
+// ======================================================================================
// Below code is executed once the entire cell has been loaded
//================================================================================================== //
@@ -187,6 +210,8 @@ i2b2.events.afterCellInit.add((cell) => {
});
i2b2.ONT.view.nav.treeview = treeRef;
treeRef.on('nodeLoading', i2b2.ONT.view.nav.loadChildrenAction);
+ treeRef.on('click', i2b2.ONT.view.nav.nodeClickedAction);
+
treeRef.on('onDrag', i2b2.sdx.Master.onDragStart);
treeRef.on('onRedraw', () => {
// attach drag drop attribute after the tree has been redrawn
@@ -222,6 +247,8 @@ i2b2.events.afterCellInit.add((cell) => {
i2b2.ONT.view.nav.params.patientCounts = $('#ONTNAVshowPatientCounts').is(":checked");
i2b2.ONT.view.nav.params.showConceptCode = $('#ONTNAVshowCodeTooltips').is(":checked");
i2b2.ONT.view.nav.params.showShortTooltips = $('#ONTNAVshowShortTooltips').is(":checked");
+ i2b2.ONT.view.nav.params.fullSearch = $('#ONTNAVdisableOptSearch').is(":checked");
+
i2b2.ONT.view.nav.doRefreshAll();
$("#ontOptionsModal div").eq(0).modal("hide");
});
@@ -289,7 +316,10 @@ i2b2.events.afterCellInit.add((cell) => {
//================================================================================================== //
i2b2.ONT.view.nav.viewInTreeFromId = function(sdx) {
//clear any search results
- i2b2.ONT.view.search.clearSearchInput();
+ if($("#ontNavTreeToggle").is(":visible")) {
+ $("#ontNavTreeToggle").click();
+ }
+
// do not do modifiers (for now)
let modifierKey;
@@ -398,7 +428,7 @@ i2b2.ONT.view.nav.createContextMenu = function(treeviewElemId, treeview, include
if (includeSearchOptions) {
actions.nodeInTree = {
- name: 'View in Tree',
+ name: 'Browse in tree',
isShown: (node) => (node.i2b2 !== undefined),
onClick: function(node){
i2b2.ONT.view.search.viewInNavTree(node);
diff --git a/js-i2b2/cells/ONT/ONT_view_Search.js b/js-i2b2/cells/ONT/ONT_view_Search.js
index f8903ede..72c05de3 100644
--- a/js-i2b2/cells/ONT/ONT_view_Search.js
+++ b/js-i2b2/cells/ONT/ONT_view_Search.js
@@ -75,6 +75,9 @@ i2b2.ONT.view.search.clearSearchInput = function(){
// show the navigation treeview
i2b2.ONT.view.nav.treeview.show();
i2b2.ONT.view.search.toggleSearchClearIcon();
+
+ $("#ontNavTreeToggle").addClass("hidden");
+ $("#ontSearchTreeToggle").addClass("hidden");
};
//================================================================================================== //
@@ -124,7 +127,15 @@ i2b2.ONT.view.search.initSearch = function(container){
// -------------------- setup context menu --------------------
i2b2.ONT.view.search.ContextMenu = i2b2.ONT.view.nav.createContextMenu('i2b2TreeviewOntSearch',i2b2.ONT.view.search.treeview, true);
};
-
+// ================================================================================================== //
+i2b2.ONT.view.search.nodeClickedAction = function(event) {
+ let target = $(event.target);
+ let nodeId = parseInt(target.closest('li.list-group-item').attr('data-nodeid'));
+ let nodeData = i2b2.ONT.view.search.treeview.treeview("getNodes", (snode)=> (snode.nodeId === nodeId));
+ if(nodeData.length > 0) {
+ i2b2.ONT.view.info.load(nodeData[0].i2b2, true);
+ }
+};
//================================================================================================== //
i2b2.ONT.view.search.displayResults = function(treeData) {
@@ -132,6 +143,7 @@ i2b2.ONT.view.search.displayResults = function(treeData) {
let treeview = i2b2.ONT.view.search.treeview.data('treeview');
treeview.clear();
treeview.init({data: treeData, showTags: true});
+ i2b2.ONT.view.search.treeview.on('click', i2b2.ONT.view.search.nodeClickedAction);
};
//================================================================================================== //
@@ -202,13 +214,15 @@ i2b2.ONT.view.search.viewInNavTree = function(node, nodeSubList){
let nodesToExpand = [];
nodesToExpand = nodesToExpand.concat(nodeSubList);
- i2b2.ONT.view.search.clearSearchInput();
+ $("#ontNavTreeToggle").click();
let currentNode = nodesToExpand.shift();
- //look up node in search tree in the nav tree using the key
+ // look up node in search tree in the nav tree using the key
+ if (!currentNode.key.endsWith("\\")) currentNode.key = currentNode.key + "\\";
let topLevelNode = i2b2.ONT.view.nav.treeview.treeview('getNodes', function(snode) {
return snode.key === currentNode.key;
});
+
// skip over any nodes that are already loaded in the nav tree
while (nodesToExpand.length >= 1 && (topLevelNode.length === 1 && topLevelNode[0].state.loaded === true)) {
//expand any collapsed nodes that were already loaded
@@ -217,7 +231,8 @@ i2b2.ONT.view.search.viewInNavTree = function(node, nodeSubList){
}
currentNode = nodesToExpand.shift();
- //look up node in search tree in the nav tree using the key
+ // look up node in search tree in the nav tree using the key
+ if (!currentNode.key.endsWith("\\")) currentNode.key = currentNode.key + "\\";
topLevelNode = i2b2.ONT.view.nav.treeview.treeview('getNodes', function(snode) {
return snode.key === currentNode.key;
});
@@ -240,7 +255,8 @@ i2b2.ONT.view.search.viewInNavTree = function(node, nodeSubList){
i2b2.ONT.view.nav.treeview.treeview('expandNode', nodeData.nodeId);
let currentNode = nodesToExpand.shift();
- //look up node in search tree in the nav tree using the key
+ // look up node in search tree in the nav tree using the key
+ if (!currentNode.key.endsWith("\\")) currentNode.key = currentNode.key + "\\";
let topLevelNode = i2b2.ONT.view.nav.treeview.treeview('getNodes', function(snode) {
return snode.key === currentNode.key;
});
@@ -288,6 +304,7 @@ i2b2.ONT.view.search.initSearchOptions = function(){
filterType: "category"
});
}
+ $("#categorySubmenu").empty();
$(submenuOptions({"option": categories})).appendTo("#categorySubmenu");
// generate a list of coding systems options
@@ -300,6 +317,7 @@ i2b2.ONT.view.search.initSearchOptions = function(){
filterType: "coding"
});
}
+ $("#codingSubmenu").empty();
$(submenuOptions({"option": codingSystems})).appendTo("#codingSubmenu");
$("#liCat").hover(function(){
diff --git a/js-i2b2/cells/ONT/assets/Ontology.css b/js-i2b2/cells/ONT/assets/Ontology.css
index 235b4660..b93c0fd8 100644
--- a/js-i2b2/cells/ONT/assets/Ontology.css
+++ b/js-i2b2/cells/ONT/assets/Ontology.css
@@ -7,7 +7,7 @@
flex-direction: column;
position: absolute;
bottom: 0;
- top: 3.5em;
+ top: 5.5em;
left: 0;
right: 0;
height: auto;
@@ -18,6 +18,14 @@
white-space: pre-line;
}
+#i2b2TreeviewOntSearch {
+ background-color: #e4eff3;
+
+}
+
+#i2b2TreeviewOntSearch .list-group-item {
+ background-color: #e4eff3;
+}
#i2b2OntSearchStatus {
display: flex;
@@ -45,7 +53,7 @@ i.srTooltip.warn {
#i2b2FinderOnt {
position: absolute;
top: 0;
- height: 3.1rem;
+ height: 4.8rem;
border: solid 1px rgba(99, 117, 140, 0.28);
border-bottom: 0px;
border-top: none;
@@ -60,8 +68,9 @@ i.srTooltip.warn {
position: relative;
align-items: center;
display: flex;
- height: 100%;
+ height: 80%;
min-width: 22rem;
+ margin-bottom: 0.35em;
}
#i2b2FinderOnt .searchTermMain{
@@ -305,5 +314,17 @@ button.invert:hover{
vertical-align: middle;
line-height: normal;
}
+#ontSearchTreeToggle,
+#ontNavTreeToggle {
+ margin-bottom: 1em;
+ margin-top: 0.6em;
+ text-decoration: none;
+ color: #2782a3;
+}
+
+#i2b2FinderOnt .searchToggle {
+ float: right;
+ padding-right: 0.6em;
+}
diff --git a/js-i2b2/cells/ONT/assets/OntologyFinder.html b/js-i2b2/cells/ONT/assets/OntologyFinder.html
index 4de4b861..da17ddfd 100644
--- a/js-i2b2/cells/ONT/assets/OntologyFinder.html
+++ b/js-i2b2/cells/ONT/assets/OntologyFinder.html
@@ -43,4 +43,8 @@
+
diff --git a/js-i2b2/cells/ONT/templates/OntologyOptions.html b/js-i2b2/cells/ONT/templates/OntologyOptions.html
index 5e34db15..4398bbe5 100644
--- a/js-i2b2/cells/ONT/templates/OntologyOptions.html
+++ b/js-i2b2/cells/ONT/templates/OntologyOptions.html
@@ -54,5 +54,13 @@
{{/if}}
+
+ {{#if fullSearch}}
+
+ {{else}}
+
+ {{/if}}
+
+
diff --git a/js-i2b2/cells/ONT/templates/OntologyTermInfo.html b/js-i2b2/cells/ONT/templates/OntologyTermInfo.html
index be24d637..79618a76 100644
--- a/js-i2b2/cells/ONT/templates/OntologyTermInfo.html
+++ b/js-i2b2/cells/ONT/templates/OntologyTermInfo.html
@@ -70,7 +70,7 @@ 
{{{title}}}
{{else}}
To view term info:
-
-
- Right click a term and select “Show more info”, or +
- Click on a term, or
- Hover over a term in the Find Patients panel, and click the info icon