Skip to content

Commit 8b24745

Browse files
committed
Handling comparison not available for DGE table.
1 parent d51e06b commit 8b24745

File tree

4 files changed

+32
-6
lines changed

4 files changed

+32
-6
lines changed

NetExplorer/static/css/style.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2041,6 +2041,15 @@ kbd {
20412041
background-color: #FDD4D4;
20422042
}
20432043

2044+
#dge-table-notfound {
2045+
display: none;
2046+
margin: auto;
2047+
font-size: 18px;
2048+
padding: 8px;
2049+
width: 700px;
2050+
background-color: #FDD4D4;
2051+
}
2052+
20442053
#expression-plot-loading {
20452054
display: none;
20462055
position: absolute;

NetExplorer/static/js/planexp.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,15 @@ var PlanExp = (function() {
209209
'csrfmiddlewaretoken': '{{ csrf_token }}'
210210
},
211211
success: function(data) {
212-
targetDiv.html(data);
213-
targetDiv.hide();
214-
targetDiv.show(250);
212+
if (jQuery.isEmptyObject(data)) {
213+
targetDiv.hide();
214+
$("#dge-table-notfound").show(250);
215+
} else {
216+
$("#dge-table-notfound").hide();
217+
targetDiv.html(data);
218+
targetDiv.hide();
219+
targetDiv.show(250);
220+
}
215221
}
216222
});
217223
}

NetExplorer/templates/NetExplorer/planexp.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ <h4>Select conditions to compare</h4>
8080
</select>
8181

8282
</div>
83+
<div id="dge-table-notfound">
84+
<span class="glyphicon glyphicon-warning-sign"></span>
85+
Condition comparison not available.
86+
</div>
8387
<div id="planexp-dge-table">
8488
</div>
8589
</div> <!-- Differential expression table -->

NetExplorer/views/experiment_dge_table.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,19 @@ def experiment_dge_table(request):
1313
dataset = Dataset.objects.get(name=dataset_name)
1414
condition1 = Condition.objects.get(name=c1_name, experiment=experiment)
1515
condition2 = Condition.objects.get(name=c2_name, experiment=experiment)
16-
expression = ExpressionRelative.objects.filter(experiment=experiment, dataset=dataset, condition1=condition1, condition2=condition2).order_by('-fold_change')[:500]
16+
expression = ExpressionRelative.objects.filter(
17+
experiment=experiment, dataset=dataset,
18+
condition1=condition1, condition2=condition2).order_by('-fold_change')[:500]
1719
if not expression:
1820
# In case condition1 and condition2 are reversed in Database
1921
expression = ExpressionRelative.objects.filter(
2022
experiment=experiment, dataset=dataset,
21-
condition1=condition2, condition2=condition1).order_by('-fold_change')[:100]
22-
return render(request, 'NetExplorer/experiment_dge_table.html', { 'expressions' : expression, 'database': dataset })
23+
condition1=condition2, condition2=condition1).order_by('-fold_change')[:500]
24+
if not expression:
25+
response = {}
26+
return HttpResponse(json.dumps(response), content_type="application/json")
27+
else:
28+
response = { 'expressions' : expression, 'database': dataset }
29+
return render(request, 'NetExplorer/experiment_dge_table.html', response)
2330
else:
2431
return render(request, 'NetExplorer/404.html')

0 commit comments

Comments
 (0)